Downstreamed bug fix from @embroider/addon-blueprint#155 (#57)

ijlee2 · web-flow · commit 5c6fa8d12ef5 · 2023-07-17T14:11:41.000+02:00
* bugfix: Downstreamed changes from @embroider/addon-blueprint#155

* chore: Updated test fixtures

---------

Co-authored-by: ijlee2 &lt;ijlee2@users.noreply.github.com&gt;
diff --git a/src/blueprints/ember-addon/__addonLocation__/rollup.config.mjs b/src/blueprints/ember-addon/__addonLocation__/rollup.config.mjs
@@ -1,6 +1,5 @@
 import { Addon } from '@embroider/addon-dev/rollup';
 import { babel } from '@rollup/plugin-babel';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
 import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
@@ -42,11 +41,6 @@ export default {
       extensions,
     }),
 
-    // Allows rollup to resolve imports of files with the specified extensions
-    nodeResolve({
-      extensions,
-    }),
-
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 
diff --git a/src/migration/ember-addon/steps/update-addon-package-json/update-dev-dependencies.ts b/src/migration/ember-addon/steps/update-addon-package-json/update-dev-dependencies.ts
@@ -30,7 +30,6 @@ export function updateDevDependencies(
     '@babel/runtime',
     '@embroider/addon-dev',
     '@rollup/plugin-babel',
-    '@rollup/plugin-node-resolve',
     'concurrently',
     'rollup',
     'rollup-plugin-copy',
diff --git a/src/utils/blueprints/get-version.ts b/src/utils/blueprints/get-version.ts
@@ -11,7 +11,6 @@ const latestVersions = new Map([
   ['@embroider/addon-dev', '3.1.1'],
   ['@embroider/addon-shim', '1.8.5'],
   ['@rollup/plugin-babel', '6.0.3'],
-  ['@rollup/plugin-node-resolve', '15.1.0'],
   ['concurrently', '8.2.0'],
   ['ember-auto-import', '2.6.3'],
   ['ember-cli-babel', '7.26.11'],
diff --git a/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/package.json b/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/package.json
@@ -74,7 +74,6 @@
     "@babel/runtime": "^7.22.6",
     "@embroider/addon-dev": "^3.1.1",
     "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-node-resolve": "^15.1.0",
     "concurrently": "^7.6.0",
     "rollup": "^3.26.0",
     "rollup-plugin-copy": "^3.4.0"
diff --git a/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/rollup.config.mjs b/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/rollup.config.mjs
@@ -1,6 +1,5 @@
 import { Addon } from '@embroider/addon-dev/rollup';
 import { babel } from '@rollup/plugin-babel';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
 import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
@@ -42,11 +41,6 @@ export default {
       extensions,
     }),
 
-    // Allows rollup to resolve imports of files with the specified extensions
-    nodeResolve({
-      extensions,
-    }),
-
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 
diff --git a/tests/fixtures/ember-container-query-glint/output/ember-container-query/package.json b/tests/fixtures/ember-container-query-glint/output/ember-container-query/package.json
@@ -74,7 +74,6 @@
     "@babel/runtime": "^7.22.6",
     "@embroider/addon-dev": "^3.1.1",
     "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-node-resolve": "^15.1.0",
     "concurrently": "^7.6.0",
     "rollup": "^3.26.0",
     "rollup-plugin-copy": "^3.4.0"
diff --git a/tests/fixtures/ember-container-query-glint/output/ember-container-query/rollup.config.mjs b/tests/fixtures/ember-container-query-glint/output/ember-container-query/rollup.config.mjs
@@ -1,6 +1,5 @@
 import { Addon } from '@embroider/addon-dev/rollup';
 import { babel } from '@rollup/plugin-babel';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
 import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
@@ -42,11 +41,6 @@ export default {
       extensions,
     }),
 
-    // Allows rollup to resolve imports of files with the specified extensions
-    nodeResolve({
-      extensions,
-    }),
-
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 
diff --git a/tests/fixtures/ember-container-query-javascript/output/ember-container-query/package.json b/tests/fixtures/ember-container-query-javascript/output/ember-container-query/package.json
@@ -66,7 +66,6 @@
     "@babel/runtime": "^7.22.6",
     "@embroider/addon-dev": "^3.1.1",
     "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-node-resolve": "^15.1.0",
     "concurrently": "^7.6.0",
     "rollup": "^3.26.0",
     "rollup-plugin-copy": "^3.4.0"
diff --git a/tests/fixtures/ember-container-query-javascript/output/ember-container-query/rollup.config.mjs b/tests/fixtures/ember-container-query-javascript/output/ember-container-query/rollup.config.mjs
@@ -1,6 +1,5 @@
 import { Addon } from '@embroider/addon-dev/rollup';
 import { babel } from '@rollup/plugin-babel';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
 import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
@@ -42,11 +41,6 @@ export default {
       extensions,
     }),
 
-    // Allows rollup to resolve imports of files with the specified extensions
-    nodeResolve({
-      extensions,
-    }),
-
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 
diff --git a/tests/fixtures/ember-container-query-scoped/output/ember-container-query/package.json b/tests/fixtures/ember-container-query-scoped/output/ember-container-query/package.json
@@ -74,7 +74,6 @@
     "@babel/runtime": "^7.22.6",
     "@embroider/addon-dev": "^3.1.1",
     "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-node-resolve": "^15.1.0",
     "concurrently": "^7.6.0",
     "rollup": "^3.26.0",
     "rollup-plugin-copy": "^3.4.0"
diff --git a/tests/fixtures/ember-container-query-scoped/output/ember-container-query/rollup.config.mjs b/tests/fixtures/ember-container-query-scoped/output/ember-container-query/rollup.config.mjs
@@ -1,6 +1,5 @@
 import { Addon } from '@embroider/addon-dev/rollup';
 import { babel } from '@rollup/plugin-babel';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
 import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
@@ -42,11 +41,6 @@ export default {
       extensions,
     }),
 
-    // Allows rollup to resolve imports of files with the specified extensions
-    nodeResolve({
-      extensions,
-    }),
-
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 
diff --git a/tests/fixtures/ember-container-query-typescript/output/ember-container-query/package.json b/tests/fixtures/ember-container-query-typescript/output/ember-container-query/package.json
@@ -74,7 +74,6 @@
     "@babel/runtime": "^7.22.6",
     "@embroider/addon-dev": "^3.1.1",
     "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-node-resolve": "^15.1.0",
     "concurrently": "^7.6.0",
     "rollup": "^3.26.0",
     "rollup-plugin-copy": "^3.4.0"
diff --git a/tests/fixtures/ember-container-query-typescript/output/ember-container-query/rollup.config.mjs b/tests/fixtures/ember-container-query-typescript/output/ember-container-query/rollup.config.mjs
@@ -1,6 +1,5 @@
 import { Addon } from '@embroider/addon-dev/rollup';
 import { babel } from '@rollup/plugin-babel';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
 import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
@@ -42,11 +41,6 @@ export default {
       extensions,
     }),
 
-    // Allows rollup to resolve imports of files with the specified extensions
-    nodeResolve({
-      extensions,
-    }),
-
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 
diff --git a/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/package.json b/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/package.json
@@ -44,7 +44,6 @@
     "@babel/runtime": "^7.22.6",
     "@embroider/addon-dev": "^3.1.1",
     "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-node-resolve": "^15.1.0",
     "concurrently": "^7.6.0",
     "rollup": "^3.26.0",
     "rollup-plugin-copy": "^3.4.0"
diff --git a/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/rollup.config.mjs b/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/rollup.config.mjs
@@ -1,6 +1,5 @@
 import { Addon } from '@embroider/addon-dev/rollup';
 import { babel } from '@rollup/plugin-babel';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
 import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
@@ -42,11 +41,6 @@ export default {
       extensions,
     }),
 
-    // Allows rollup to resolve imports of files with the specified extensions
-    nodeResolve({
-      extensions,
-    }),
-
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 
diff --git a/tests/fixtures/new-v1-addon-javascript/output/new-v1-addon/package.json b/tests/fixtures/new-v1-addon-javascript/output/new-v1-addon/package.json
@@ -36,7 +36,6 @@
     "@babel/runtime": "^7.22.6",
     "@embroider/addon-dev": "^3.1.1",
     "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-node-resolve": "^15.1.0",
     "concurrently": "^7.6.0",
     "rollup": "^3.26.0",
     "rollup-plugin-copy": "^3.4.0"
diff --git a/tests/fixtures/new-v1-addon-javascript/output/new-v1-addon/rollup.config.mjs b/tests/fixtures/new-v1-addon-javascript/output/new-v1-addon/rollup.config.mjs
@@ -1,6 +1,5 @@
 import { Addon } from '@embroider/addon-dev/rollup';
 import { babel } from '@rollup/plugin-babel';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
 import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
@@ -42,11 +41,6 @@ export default {
       extensions,
     }),
 
-    // Allows rollup to resolve imports of files with the specified extensions
-    nodeResolve({
-      extensions,
-    }),
-
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 
diff --git a/tests/fixtures/new-v1-addon-npm/output/new-v1-addon/package.json b/tests/fixtures/new-v1-addon-npm/output/new-v1-addon/package.json
@@ -36,7 +36,6 @@
     "@babel/runtime": "^7.22.6",
     "@embroider/addon-dev": "^3.1.1",
     "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-node-resolve": "^15.1.0",
     "concurrently": "^7.6.0",
     "rollup": "^3.26.0",
     "rollup-plugin-copy": "^3.4.0"
diff --git a/tests/fixtures/new-v1-addon-npm/output/new-v1-addon/rollup.config.mjs b/tests/fixtures/new-v1-addon-npm/output/new-v1-addon/rollup.config.mjs
@@ -1,6 +1,5 @@
 import { Addon } from '@embroider/addon-dev/rollup';
 import { babel } from '@rollup/plugin-babel';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
 import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
@@ -42,11 +41,6 @@ export default {
       extensions,
     }),
 
-    // Allows rollup to resolve imports of files with the specified extensions
-    nodeResolve({
-      extensions,
-    }),
-
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 
diff --git a/tests/fixtures/new-v1-addon-pnpm/output/new-v1-addon/package.json b/tests/fixtures/new-v1-addon-pnpm/output/new-v1-addon/package.json
@@ -36,7 +36,6 @@
     "@babel/runtime": "^7.22.6",
     "@embroider/addon-dev": "^3.1.1",
     "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-node-resolve": "^15.1.0",
     "concurrently": "^7.6.0",
     "rollup": "^3.26.0",
     "rollup-plugin-copy": "^3.4.0"
diff --git a/tests/fixtures/new-v1-addon-pnpm/output/new-v1-addon/rollup.config.mjs b/tests/fixtures/new-v1-addon-pnpm/output/new-v1-addon/rollup.config.mjs
@@ -1,6 +1,5 @@
 import { Addon } from '@embroider/addon-dev/rollup';
 import { babel } from '@rollup/plugin-babel';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
 import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
@@ -42,11 +41,6 @@ export default {
       extensions,
     }),
 
-    // Allows rollup to resolve imports of files with the specified extensions
-    nodeResolve({
-      extensions,
-    }),
-
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 
diff --git a/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/package.json b/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/package.json
@@ -44,7 +44,6 @@
     "@babel/runtime": "^7.22.6",
     "@embroider/addon-dev": "^3.1.1",
     "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-node-resolve": "^15.1.0",
     "concurrently": "^7.6.0",
     "rollup": "^3.26.0",
     "rollup-plugin-copy": "^3.4.0"
diff --git a/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/rollup.config.mjs b/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/rollup.config.mjs
@@ -1,6 +1,5 @@
 import { Addon } from '@embroider/addon-dev/rollup';
 import { babel } from '@rollup/plugin-babel';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
 import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
@@ -42,11 +41,6 @@ export default {
       extensions,
     }),
 
-    // Allows rollup to resolve imports of files with the specified extensions
-    nodeResolve({
-      extensions,
-    }),
-
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 
diff --git a/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/rollup.config.mjs b/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/rollup.config.mjs
@@ -1,6 +1,5 @@
 import { Addon } from '@embroider/addon-dev/rollup';
 import { babel } from '@rollup/plugin-babel';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
 import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
@@ -42,11 +41,6 @@ export default {
       extensions,
     }),
 
-    // Allows rollup to resolve imports of files with the specified extensions
-    nodeResolve({
-      extensions,
-    }),
-
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 
diff --git a/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/rollup.config.mjs b/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/rollup.config.mjs
@@ -1,6 +1,5 @@
 import { Addon } from '@embroider/addon-dev/rollup';
 import { babel } from '@rollup/plugin-babel';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
 import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
@@ -42,11 +41,6 @@ export default {
       extensions,
     }),
 
-    // Allows rollup to resolve imports of files with the specified extensions
-    nodeResolve({
-      extensions,
-    }),
-
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 
diff --git a/tests/fixtures/steps/create-files-from-blueprints/javascript/output/ember-container-query/rollup.config.mjs b/tests/fixtures/steps/create-files-from-blueprints/javascript/output/ember-container-query/rollup.config.mjs
@@ -1,6 +1,5 @@
 import { Addon } from '@embroider/addon-dev/rollup';
 import { babel } from '@rollup/plugin-babel';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
 import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
@@ -42,11 +41,6 @@ export default {
       extensions,
     }),
 
-    // Allows rollup to resolve imports of files with the specified extensions
-    nodeResolve({
-      extensions,
-    }),
-
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 
diff --git a/tests/fixtures/steps/create-files-from-blueprints/npm/output/ember-container-query/rollup.config.mjs b/tests/fixtures/steps/create-files-from-blueprints/npm/output/ember-container-query/rollup.config.mjs
@@ -1,6 +1,5 @@
 import { Addon } from '@embroider/addon-dev/rollup';
 import { babel } from '@rollup/plugin-babel';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
 import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
@@ -42,11 +41,6 @@ export default {
       extensions,
     }),
 
-    // Allows rollup to resolve imports of files with the specified extensions
-    nodeResolve({
-      extensions,
-    }),
-
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 
diff --git a/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/ember-container-query/rollup.config.mjs b/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/ember-container-query/rollup.config.mjs
@@ -1,6 +1,5 @@
 import { Addon } from '@embroider/addon-dev/rollup';
 import { babel } from '@rollup/plugin-babel';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
 import copy from 'rollup-plugin-copy';
 
 const addon = new Addon({
@@ -42,11 +41,6 @@ export default {
       extensions,
     }),
 
-    // Allows rollup to resolve imports of files with the specified extensions
-    nodeResolve({
-      extensions,
-    }),
-
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 
diff --git a/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/rollup.config.mjs b/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/rollup.config.mjs
diff --git a/tests/fixtures/steps/create-files-from-blueprints/typescript/output/ember-container-query/rollup.config.mjs b/tests/fixtures/steps/create-files-from-blueprints/typescript/output/ember-container-query/rollup.config.mjs
diff --git a/tests/fixtures/steps/update-addon-package-json/customizations/output/packages/ember-container-query/package.json b/tests/fixtures/steps/update-addon-package-json/customizations/output/packages/ember-container-query/package.json
diff --git a/tests/fixtures/steps/update-addon-package-json/glint/output/ember-container-query/package.json b/tests/fixtures/steps/update-addon-package-json/glint/output/ember-container-query/package.json
diff --git a/tests/fixtures/steps/update-addon-package-json/javascript/output/ember-container-query/package.json b/tests/fixtures/steps/update-addon-package-json/javascript/output/ember-container-query/package.json
diff --git a/tests/fixtures/steps/update-addon-package-json/public-assets/output/ember-container-query/package.json b/tests/fixtures/steps/update-addon-package-json/public-assets/output/ember-container-query/package.json
diff --git a/tests/fixtures/steps/update-addon-package-json/scoped/output/ember-container-query/package.json b/tests/fixtures/steps/update-addon-package-json/scoped/output/ember-container-query/package.json
diff --git a/tests/fixtures/steps/update-addon-package-json/typescript/output/ember-container-query/package.json b/tests/fixtures/steps/update-addon-package-json/typescript/output/ember-container-query/package.json
