Merge pull request #2321 from brunoocasali/remove-esa-version

Remove ESA version from ember inspector
mainmatter · Sep 24, 2021 · d9cac59 · d9cac59
2 parents 41a7134 + 15690d7
commit d9cac59
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 333 deletions.
diff --git a/packages/classic-test-app/config/environment.js b/packages/classic-test-app/config/environment.js
@@ -46,8 +46,6 @@ module.exports = function(environment) {
     fastboot: {
       hostWhitelist: [/^localhost:\d+$/]
     },
-
-    esaVersion: require('../../../package.json').version,
   };
 
   if (environment === 'development') {

diff --git a/packages/ember-simple-auth/index.js b/packages/ember-simple-auth/index.js
@@ -3,37 +3,26 @@
 /* eslint-env node */
 /* eslint-disable no-var, object-shorthand, prefer-template */
 
-var writeFile = require('broccoli-file-creator');
-var version = require('./package.json').version;
 var path = require('path');
 var Funnel = require('broccoli-funnel');
-var MergeTrees = require('broccoli-merge-trees');
 
 module.exports = {
   name: 'ember-simple-auth',
 
-  included: function() {
+  included() {
     this._super.included.apply(this, arguments);
     this._ensureThisImport();
 
-    this.import('vendor/ember-simple-auth/register-version.js');
     this.import('vendor/base64.js');
   },
 
   treeForVendor() {
-    var content = "Ember.libraries.register('Ember Simple Auth', '" + version + "');";
-    var registerVersionTree = writeFile(
-      'ember-simple-auth/register-version.js',
-      content
-    );
-    var base64Tree = new Funnel(path.dirname(require.resolve('base-64')), {
+    return new Funnel(path.dirname(require.resolve('base-64')), {
       files: ['base64.js']
     });
-
-    return MergeTrees([registerVersionTree, base64Tree]);
   },
 
-  _ensureThisImport: function() {
+  _ensureThisImport() {
     if (!this.import) {
       this._findHost = function findHostShim() {
         var current = this;

diff --git a/packages/ember-simple-auth/package.json b/packages/ember-simple-auth/package.json
@@ -23,9 +23,7 @@
   },
   "dependencies": {
     "base-64": "^0.1.0",
-    "broccoli-file-creator": "^2.0.0",
     "broccoli-funnel": "^1.2.0 || ^2.0.0",
-    "broccoli-merge-trees": "^2.0.0 || ^3.0.0",
     "ember-cli-babel": "^7.20.5",
     "ember-cli-is-package-missing": "^1.0.0",
     "ember-cookies": "^0.5.0",

diff --git a/packages/ember-simple-auth/tests/dummy/config/environment.js b/packages/ember-simple-auth/tests/dummy/config/environment.js
@@ -21,8 +21,6 @@ module.exports = function(environment) {
       // Here you can pass flags/options to your application instance
       // when it is created
     },
-
-    esaVersion: require('../../../package.json').version
   };
 
   if (environment === 'development') {

diff --git a/packages/ember-simple-auth/tests/unit/register-version-test.js b/packages/ember-simple-auth/tests/unit/register-version-test.js
diff --git a/packages/test-app/config/environment.js b/packages/test-app/config/environment.js
@@ -46,8 +46,6 @@ module.exports = function(environment) {
     fastboot: {
       hostWhitelist: [/^localhost:\d+$/]
     },
-
-    esaVersion: require('../../../package.json').version,
   };
 
   if (environment === 'development') {