Merge pull request #351 from charlesfries/remove-bower

Remove bower
funkensturm · Jun 28, 2022 · 88417b5 · 88417b5
2 parents 5a8d5a6 + c454251
commit 88417b5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 35 deletions.
diff --git a/.bowerrc b/.bowerrc
diff --git a/index.js b/index.js
@@ -27,24 +27,13 @@ module.exports = {
 
     // determine if ember-data is present
     let checker = new VersionChecker(this);
-    let bowerDep = checker.for('ember-data', 'bower');
     let npmDep = checker.for('ember-data', 'npm');
 
     if (
-      (
-        bowerDep.version && (
-          bowerDep.satisfies('>= 1.13.0') ||
-          bowerDep.satisfies('>= 2.0.0') ||
-          bowerDep.gt('2.0.0')
-        )
-      ) ||
-      (
-        npmDep.version  && (
-          npmDep.satisfies('>= 1.13.0') ||
-          npmDep.satisfies('>= 2.0.0') ||
-          npmDep.gt('2.0.0')
-        )
-      )
+      npmDep.version &&
+      (npmDep.satisfies('>= 1.13.0') ||
+        npmDep.satisfies('>= 2.0.0') ||
+        npmDep.gt('2.0.0'))
     ) {
       this.hasEmberData = true;
     }
@@ -64,21 +53,6 @@ module.exports = {
         this.needsFileExport = true;
       }
     }
-
-    // Inform the user about the transition to npm dependencies
-    if (this.needsFileExport && !options.ignoreBlobWarning) {
-      let bowerDeps = this.project.bowerDependencies();
-
-      if (bowerDeps['blob-polyfill']) {
-        this._warn('Please remove `blob-polyfill` from `bower.json`. As of ' +
-                   'Ember localStorage 1.4.0 the `blob-polyfill` NPM ' +
-                   'package is a dependency. If other code depends on the ' +
-                   'bower package add `ignoreBlobWarning: true` to ' +
-                   '`ember-local-storage` config in `environment.js` to ' +
-                   'ignore this warning.'
-                  );
-      }
-    }
   },
 
   included: function included(app) {

diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
@@ -24,7 +24,6 @@ module.exports = function (environment) {
 
     'ember-local-storage': {
       fileExport: true,
-      // ignoreBlobWarning: true,
     },
   };
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,6 @@ module.exports = function (environment) { @@
         'ember-local-storage': {
           fileExport: true,
-          // ignoreBlobWarning: true,
         },
       };
@@ Expand Down @@