Merge pull request #1002 from bertdeblock/clean-up-everything-related…

…-to-bower Clean up everything related to Bower
ember-cli · Dec 10, 2024 · effd50b · effd50b
2 parents 1818a7e + 5c540b2
commit effd50b
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 52 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -7,9 +7,6 @@
 /dist/
 /tmp/
 
-# dependencies
-/bower_components/
-
 # misc
 /coverage/
 !.*

diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,6 @@
 /tmp/
 
 # dependencies
-/bower_components/
 /node_modules/
 
 # misc

diff --git a/.npmignore b/.npmignore
@@ -2,11 +2,7 @@
 /dist/
 /tmp/
 
-# dependencies
-/bower_components/
-
 # misc
-/.bowerrc
 /.editorconfig
 /.ember-cli
 /.env*
@@ -21,7 +17,6 @@
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig
-/bower.json
 /config/ember-try.js
 /ember-cli-build.js
 /testem.js

diff --git a/lib/utils/dependency-manager-adapter-factory.js b/lib/utils/dependency-manager-adapter-factory.js
@@ -7,7 +7,6 @@ const WorkspaceAdapter = require('../dependency-manager-adapters/workspace');
 module.exports = {
   generateFromConfig(config, root) {
     let hasNpm = false;
-    let hasBower = false;
     let adapters = [];
     if (!config || !config.scenarios) {
       return [];
@@ -17,15 +16,8 @@ module.exports = {
       if (scenario.npm) {
         hasNpm = true;
       }
-      if (scenario.bower || scenario.dependencies || scenario.devDependencies) {
-        hasBower = true;
-      }
     });
 
-    if (hasBower) {
-      throw new Error('[ember-try] bower configuration is no longer supported');
-    }
-
     if (config.useWorkspaces) {
       adapters.push(
         new WorkspaceAdapter({

diff --git a/smoke-test-app/.eslintignore b/smoke-test-app/.eslintignore
@@ -7,7 +7,6 @@
 /tmp/
 
 # dependencies
-/bower_components/
 /node_modules/
 
 # misc

diff --git a/smoke-test-app/.gitignore b/smoke-test-app/.gitignore
@@ -5,7 +5,6 @@
 /tmp/
 
 # dependencies
-/bower_components/
 /node_modules/
 
 # misc

diff --git a/smoke-test-app/.npmignore b/smoke-test-app/.npmignore
@@ -2,11 +2,7 @@
 /dist/
 /tmp/
 
-# dependencies
-/bower_components/
-
 # misc
-/.bowerrc
 /.editorconfig
 /.ember-cli
 /.env*
@@ -21,7 +17,6 @@
 /.template-lintrc.js
 /.travis.yml
 /.watchmanconfig
-/bower.json
 /CONTRIBUTING.md
 /ember-cli-build.js
 /testem.js

diff --git a/smoke-test-app/.prettierignore b/smoke-test-app/.prettierignore
@@ -7,7 +7,6 @@
 /tmp/
 
 # dependencies
-/bower_components/
 /node_modules/
 
 # misc

diff --git a/test/utils/dependency-manager-adapter-factory-test.js b/test/utils/dependency-manager-adapter-factory-test.js
@@ -35,33 +35,6 @@ describe('DependencyManagerAdapterFactory', () => {
       expect(adapters.length).to.equal(1);
     });
 
-    it('errors when it sees `bower` explicitly', () => {
-      expect(() => {
-        DependencyManagerAdapterFactory.generateFromConfig(
-          { scenarios: [{ bower: {}, npm: {} }] },
-          'here',
-        );
-      }).to.throw(/bower configuration is no longer supported/);
-    });
-
-    it('errors when there is only a legacy top-level dependencies', () => {
-      expect(() => {
-        DependencyManagerAdapterFactory.generateFromConfig(
-          { scenarios: [{ dependencies: {} }] },
-          'here',
-        );
-      }).to.throw(/bower configuration is no longer supported/);
-    });
-
-    it('errors when there is only a legacy top-level devDependencies', () => {
-      expect(() => {
-        DependencyManagerAdapterFactory.generateFromConfig(
-          { scenarios: [{ devDependencies: {} }] },
-          'here',
-        );
-      }).to.throw(/bower configuration is no longer supported/);
-    });
-
     it('creates only a workspace adapter when useWorkspaces is set to true', () => {
       writeJSONFile('package.json', { workspaces: ['packages/test'] });
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,9 +7,6 @@ @@
     /dist/
     /tmp/
-    # dependencies
-    /bower_components/
     # misc
     /coverage/
     !.*
@@ Expand Down @@