From 5c540b27b3847409558b6c79501c24dcb5aedc40 Mon Sep 17 00:00:00 2001 From: Bert De Block Date: Tue, 10 Dec 2024 20:21:04 +0100 Subject: [PATCH] Clean up everything related to Bower --- .eslintignore | 3 --- .gitignore | 1 - .npmignore | 5 ---- .../dependency-manager-adapter-factory.js | 8 ------ smoke-test-app/.eslintignore | 1 - smoke-test-app/.gitignore | 1 - smoke-test-app/.npmignore | 5 ---- smoke-test-app/.prettierignore | 1 - ...dependency-manager-adapter-factory-test.js | 27 ------------------- 9 files changed, 52 deletions(-) diff --git a/.eslintignore b/.eslintignore index 063359a6..a125cdd7 100644 --- a/.eslintignore +++ b/.eslintignore @@ -7,9 +7,6 @@ /dist/ /tmp/ -# dependencies -/bower_components/ - # misc /coverage/ !.* diff --git a/.gitignore b/.gitignore index d75ae83e..2d3d5313 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ /tmp/ # dependencies -/bower_components/ /node_modules/ # misc diff --git a/.npmignore b/.npmignore index b6f49496..21cc7ca7 100644 --- 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 index 742ed4f7..4e722bb1 100644 --- 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 index 1e1c5444..3bf6398e 100644 --- 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 index 8b026265..6292975a 100644 --- 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 index e45c4c96..c91e3dc8 100644 --- 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 index 8fd854d9..cbb750a1 100644 --- 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 index 5b5ba70b..b9676f99 100644 --- 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'] });