From 80509ebcc435fdefbfe72f018d717ecf3df1a6f0 Mon Sep 17 00:00:00 2001 From: Isaac Lee <16869656+ijlee2@users.noreply.github.com> Date: Wed, 20 Dec 2023 17:43:26 +0100 Subject: [PATCH] Downstreamed changes from @embroider/addon-blueprint@2.11.0 (#71) * feature: Replaced Babel plugins with decorator-transforms * chore: Updated test fixtures * feature: Updated latestVersions * chore: Updated test fixtures * feature: Reconfigured TypeScript and Glint * chore: Updated test fixtures --------- Co-authored-by: ijlee2 --- .../__addonLocation__/babel.config.json | 11 ++++++--- .../unpublished-development-types/index.d.ts | 1 + .../update-dependencies.ts | 2 +- .../update-dev-dependencies.ts | 3 --- src/steps/update-addon-tsconfig-json.ts | 1 + src/utils/blueprints/get-version.ts | 24 +++++++++---------- .../ember-container-query/babel.config.json | 11 ++++++--- .../ember-container-query/package.json | 16 ++++++------- .../ember-container-query/tsconfig.json | 3 ++- .../unpublished-development-types/index.d.ts | 1 + .../ember-container-query/babel.config.json | 11 ++++++--- .../output/ember-container-query/package.json | 16 ++++++------- .../ember-container-query/tsconfig.json | 3 ++- .../unpublished-development-types/index.d.ts | 1 + .../ember-container-query/babel.config.json | 11 ++++++--- .../output/ember-container-query/package.json | 14 +++++------ .../ember-container-query/babel.config.json | 11 ++++++--- .../output/ember-container-query/package.json | 16 ++++++------- .../ember-container-query/tsconfig.json | 3 ++- .../unpublished-development-types/index.d.ts | 1 + .../ember-container-query/babel.config.json | 11 ++++++--- .../output/ember-container-query/package.json | 16 ++++++------- .../ember-container-query/tsconfig.json | 3 ++- .../packages/new-v1-addon/babel.config.json | 11 ++++++--- .../output/packages/new-v1-addon/package.json | 16 ++++++------- .../packages/new-v1-addon/tsconfig.json | 3 ++- .../output/new-v1-addon/babel.config.json | 11 ++++++--- .../output/new-v1-addon/package.json | 14 +++++------ .../output/new-v1-addon/babel.config.json | 11 ++++++--- .../output/new-v1-addon/package.json | 14 +++++------ .../output/new-v1-addon/babel.config.json | 11 ++++++--- .../output/new-v1-addon/package.json | 14 +++++------ .../output/new-v1-addon/babel.config.json | 11 ++++++--- .../output/new-v1-addon/package.json | 16 ++++++------- .../output/new-v1-addon/tsconfig.json | 3 ++- .../ember-container-query/babel.config.json | 11 ++++++--- .../unpublished-development-types/index.d.ts | 1 + .../ember-container-query/babel.config.json | 11 ++++++--- .../unpublished-development-types/index.d.ts | 1 + .../ember-container-query/babel.config.json | 11 ++++++--- .../ember-container-query/babel.config.json | 11 ++++++--- .../ember-container-query/babel.config.json | 11 ++++++--- .../ember-container-query/babel.config.json | 11 ++++++--- .../unpublished-development-types/index.d.ts | 1 + .../ember-container-query/babel.config.json | 11 ++++++--- .../ember-container-query/package.json | 16 ++++++------- .../output/ember-container-query/package.json | 16 ++++++------- .../output/ember-container-query/package.json | 14 +++++------ .../output/ember-container-query/package.json | 16 ++++++------- .../output/ember-container-query/package.json | 16 ++++++------- .../output/ember-container-query/package.json | 16 ++++++------- .../ember-container-query/tsconfig.json | 3 ++- .../ember-container-query/tsconfig.json | 3 ++- .../ember-container-query/tsconfig.json | 3 ++- .../ember-container-query/tsconfig.json | 3 ++- 55 files changed, 291 insertions(+), 220 deletions(-) diff --git a/src/blueprints/ember-addon/__addonLocation__/babel.config.json b/src/blueprints/ember-addon/__addonLocation__/babel.config.json index 51e50fe7..196f9d9f 100644 --- a/src/blueprints/ember-addon/__addonLocation__/babel.config.json +++ b/src/blueprints/ember-addon/__addonLocation__/babel.config.json @@ -9,7 +9,6 @@ } ], <% } %> "@embroider/addon-dev/template-colocation-plugin", - "@babel/plugin-transform-class-static-block", [ "babel-plugin-ember-template-compilation", { @@ -17,7 +16,13 @@ "transforms": [] } ], - ["@babel/plugin-proposal-decorators", { "version": "legacy" }], - "@babel/plugin-transform-class-properties" + [ + "module:decorator-transforms", + { + "runtime": { + "import": "decorator-transforms/runtime" + } + } + ] ] } diff --git a/src/blueprints/ember-addon/__addonLocation__/unpublished-development-types/index.d.ts b/src/blueprints/ember-addon/__addonLocation__/unpublished-development-types/index.d.ts index 72ab4637..88a3cc2d 100644 --- a/src/blueprints/ember-addon/__addonLocation__/unpublished-development-types/index.d.ts +++ b/src/blueprints/ember-addon/__addonLocation__/unpublished-development-types/index.d.ts @@ -2,6 +2,7 @@ // These will *not* be published as part of your addon, so be careful that your published code does not rely on them! <% if (options.packages.addon.hasGlint) { %> import '@glint/environment-ember-loose'; +// import '@glint/environment-ember-template-imports'; declare module '@glint/environment-ember-loose/registry' { // Remove this once entries have been added! 👇 diff --git a/src/steps/update-addon-package-json/update-dependencies.ts b/src/steps/update-addon-package-json/update-dependencies.ts index a8b70689..999c1e01 100644 --- a/src/steps/update-addon-package-json/update-dependencies.ts +++ b/src/steps/update-addon-package-json/update-dependencies.ts @@ -24,7 +24,7 @@ export function updateDependencies( dependencies.delete(packageName); }); - const packagesToInstall = ['@embroider/addon-shim']; + const packagesToInstall = ['@embroider/addon-shim', 'decorator-transforms']; packagesToInstall.forEach((packageName) => { const version = getVersion(packageName, options); diff --git a/src/steps/update-addon-package-json/update-dev-dependencies.ts b/src/steps/update-addon-package-json/update-dev-dependencies.ts index ce2c3b72..6a5b336a 100644 --- a/src/steps/update-addon-package-json/update-dev-dependencies.ts +++ b/src/steps/update-addon-package-json/update-dev-dependencies.ts @@ -25,9 +25,6 @@ export function updateDevDependencies( const packagesToInstall = new Set([ '@babel/core', - '@babel/plugin-proposal-decorators', - '@babel/plugin-transform-class-properties', - '@babel/plugin-transform-class-static-block', '@babel/runtime', '@embroider/addon-dev', '@rollup/plugin-babel', diff --git a/src/steps/update-addon-tsconfig-json.ts b/src/steps/update-addon-tsconfig-json.ts index a36fd85e..67bd0441 100644 --- a/src/steps/update-addon-tsconfig-json.ts +++ b/src/steps/update-addon-tsconfig-json.ts @@ -21,6 +21,7 @@ function setCompilerOptions( compilerOptions.set('allowImportingTsExtensions', true); compilerOptions.set('allowJs', true); compilerOptions.set('declarationDir', 'declarations'); + compilerOptions.set('rootDir', './src'); if (!packages.addon.hasGlint) { compilerOptions.set('declaration', true); diff --git a/src/utils/blueprints/get-version.ts b/src/utils/blueprints/get-version.ts index a66ef647..b36c031d 100644 --- a/src/utils/blueprints/get-version.ts +++ b/src/utils/blueprints/get-version.ts @@ -3,25 +3,23 @@ import { decideVersion } from '@codemod-utils/blueprints'; import type { Options } from '../../types/index.js'; const latestVersions = new Map([ - ['@babel/core', '7.23.2'], - ['@babel/plugin-proposal-decorators', '7.22.15'], - ['@babel/plugin-transform-class-properties', '7.22.5'], - ['@babel/plugin-transform-class-static-block', '7.22.11'], - ['@babel/plugin-transform-typescript', '7.22.15'], - ['@babel/runtime', '7.23.2'], - ['@embroider/addon-dev', '4.1.1'], - ['@embroider/addon-shim', '1.8.6'], - ['@embroider/test-setup', '3.0.2'], + ['@babel/core', '7.23.6'], + ['@babel/plugin-transform-typescript', '7.23.6'], + ['@babel/runtime', '7.23.6'], + ['@embroider/addon-dev', '4.1.3'], + ['@embroider/addon-shim', '1.8.7'], + ['@embroider/test-setup', '3.0.3'], ['@rollup/plugin-babel', '6.0.4'], - ['@tsconfig/ember', '3.0.2'], + ['@tsconfig/ember', '3.0.3'], ['babel-plugin-ember-template-compilation', '2.2.1'], ['concurrently', '8.2.2'], - ['ember-auto-import', '2.6.3'], + ['decorator-transforms', '1.0.1'], + ['ember-auto-import', '2.7.1'], ['ember-cli-babel', '8.1.0'], ['ember-cli-htmlbars', '6.3.0'], - ['rollup', '4.3.0'], + ['rollup', '4.9.1'], ['rollup-plugin-copy', '3.5.0'], - ['typescript', '5.2.2'], + ['typescript', '5.3.3'], ]); export function getVersion(packageName: string, options: Options): string { diff --git a/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/babel.config.json b/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/babel.config.json index af176e1d..f6cb36b0 100644 --- a/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/babel.config.json +++ b/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/babel.config.json @@ -9,7 +9,6 @@ } ], "@embroider/addon-dev/template-colocation-plugin", - "@babel/plugin-transform-class-static-block", [ "babel-plugin-ember-template-compilation", { @@ -17,7 +16,13 @@ "transforms": [] } ], - ["@babel/plugin-proposal-decorators", { "version": "legacy" }], - "@babel/plugin-transform-class-properties" + [ + "module:decorator-transforms", + { + "runtime": { + "import": "decorator-transforms/runtime" + } + } + ] ] } 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 index f1035a09..1a51f8c9 100644 --- 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 @@ -58,25 +58,23 @@ } }, "dependencies": { - "@embroider/addon-shim": "^1.8.6", + "@embroider/addon-shim": "^1.8.7", + "decorator-transforms": "^1.0.1", "ember-element-helper": "^0.6.1", "ember-modifier": "^3.2.7", "ember-resize-observer-service": "^1.1.0", "ember-test-selectors": "^6.0.0" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/plugin-proposal-decorators": "^7.22.15", - "@babel/plugin-transform-class-properties": "^7.22.5", - "@babel/plugin-transform-class-static-block": "^7.22.11", - "@babel/plugin-transform-typescript": "^7.22.15", - "@babel/runtime": "^7.23.2", - "@embroider/addon-dev": "^4.1.1", + "@babel/core": "^7.23.6", + "@babel/plugin-transform-typescript": "^7.23.6", + "@babel/runtime": "^7.23.6", + "@embroider/addon-dev": "^4.1.3", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^2.0.0", "babel-plugin-ember-template-compilation": "^2.2.1", "concurrently": "^7.6.0", - "rollup": "^4.3.0", + "rollup": "^4.9.1", "rollup-plugin-copy": "^3.5.0", "typescript": "^4.9.4" }, diff --git a/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/tsconfig.json b/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/tsconfig.json index b3e213dc..e1c09030 100644 --- a/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/tsconfig.json +++ b/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/tsconfig.json @@ -3,7 +3,8 @@ "compilerOptions": { "allowImportingTsExtensions": true, "allowJs": true, - "declarationDir": "declarations" + "declarationDir": "declarations", + "rootDir": "./src" }, "include": [ "src/**/*", diff --git a/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/unpublished-development-types/index.d.ts b/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/unpublished-development-types/index.d.ts index b7d610a3..adcd1027 100644 --- a/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/unpublished-development-types/index.d.ts +++ b/tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/unpublished-development-types/index.d.ts @@ -2,6 +2,7 @@ // These will *not* be published as part of your addon, so be careful that your published code does not rely on them! import '@glint/environment-ember-loose'; +// import '@glint/environment-ember-template-imports'; declare module '@glint/environment-ember-loose/registry' { // Remove this once entries have been added! 👇 diff --git a/tests/fixtures/ember-container-query-glint/output/ember-container-query/babel.config.json b/tests/fixtures/ember-container-query-glint/output/ember-container-query/babel.config.json index af176e1d..f6cb36b0 100644 --- a/tests/fixtures/ember-container-query-glint/output/ember-container-query/babel.config.json +++ b/tests/fixtures/ember-container-query-glint/output/ember-container-query/babel.config.json @@ -9,7 +9,6 @@ } ], "@embroider/addon-dev/template-colocation-plugin", - "@babel/plugin-transform-class-static-block", [ "babel-plugin-ember-template-compilation", { @@ -17,7 +16,13 @@ "transforms": [] } ], - ["@babel/plugin-proposal-decorators", { "version": "legacy" }], - "@babel/plugin-transform-class-properties" + [ + "module:decorator-transforms", + { + "runtime": { + "import": "decorator-transforms/runtime" + } + } + ] ] } 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 index f1035a09..1a51f8c9 100644 --- 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 @@ -58,25 +58,23 @@ } }, "dependencies": { - "@embroider/addon-shim": "^1.8.6", + "@embroider/addon-shim": "^1.8.7", + "decorator-transforms": "^1.0.1", "ember-element-helper": "^0.6.1", "ember-modifier": "^3.2.7", "ember-resize-observer-service": "^1.1.0", "ember-test-selectors": "^6.0.0" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/plugin-proposal-decorators": "^7.22.15", - "@babel/plugin-transform-class-properties": "^7.22.5", - "@babel/plugin-transform-class-static-block": "^7.22.11", - "@babel/plugin-transform-typescript": "^7.22.15", - "@babel/runtime": "^7.23.2", - "@embroider/addon-dev": "^4.1.1", + "@babel/core": "^7.23.6", + "@babel/plugin-transform-typescript": "^7.23.6", + "@babel/runtime": "^7.23.6", + "@embroider/addon-dev": "^4.1.3", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^2.0.0", "babel-plugin-ember-template-compilation": "^2.2.1", "concurrently": "^7.6.0", - "rollup": "^4.3.0", + "rollup": "^4.9.1", "rollup-plugin-copy": "^3.5.0", "typescript": "^4.9.4" }, diff --git a/tests/fixtures/ember-container-query-glint/output/ember-container-query/tsconfig.json b/tests/fixtures/ember-container-query-glint/output/ember-container-query/tsconfig.json index b3e213dc..e1c09030 100644 --- a/tests/fixtures/ember-container-query-glint/output/ember-container-query/tsconfig.json +++ b/tests/fixtures/ember-container-query-glint/output/ember-container-query/tsconfig.json @@ -3,7 +3,8 @@ "compilerOptions": { "allowImportingTsExtensions": true, "allowJs": true, - "declarationDir": "declarations" + "declarationDir": "declarations", + "rootDir": "./src" }, "include": [ "src/**/*", diff --git a/tests/fixtures/ember-container-query-glint/output/ember-container-query/unpublished-development-types/index.d.ts b/tests/fixtures/ember-container-query-glint/output/ember-container-query/unpublished-development-types/index.d.ts index b7d610a3..adcd1027 100644 --- a/tests/fixtures/ember-container-query-glint/output/ember-container-query/unpublished-development-types/index.d.ts +++ b/tests/fixtures/ember-container-query-glint/output/ember-container-query/unpublished-development-types/index.d.ts @@ -2,6 +2,7 @@ // These will *not* be published as part of your addon, so be careful that your published code does not rely on them! import '@glint/environment-ember-loose'; +// import '@glint/environment-ember-template-imports'; declare module '@glint/environment-ember-loose/registry' { // Remove this once entries have been added! 👇 diff --git a/tests/fixtures/ember-container-query-javascript/output/ember-container-query/babel.config.json b/tests/fixtures/ember-container-query-javascript/output/ember-container-query/babel.config.json index ed03c322..e5ff3e5f 100644 --- a/tests/fixtures/ember-container-query-javascript/output/ember-container-query/babel.config.json +++ b/tests/fixtures/ember-container-query-javascript/output/ember-container-query/babel.config.json @@ -1,7 +1,6 @@ { "plugins": [ "@embroider/addon-dev/template-colocation-plugin", - "@babel/plugin-transform-class-static-block", [ "babel-plugin-ember-template-compilation", { @@ -9,7 +8,13 @@ "transforms": [] } ], - ["@babel/plugin-proposal-decorators", { "version": "legacy" }], - "@babel/plugin-transform-class-properties" + [ + "module:decorator-transforms", + { + "runtime": { + "import": "decorator-transforms/runtime" + } + } + ] ] } 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 index de08ab9a..3b68d2e5 100644 --- 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 @@ -53,23 +53,21 @@ } }, "dependencies": { - "@embroider/addon-shim": "^1.8.6", + "@embroider/addon-shim": "^1.8.7", + "decorator-transforms": "^1.0.1", "ember-element-helper": "^0.6.1", "ember-modifier": "^3.2.7", "ember-resize-observer-service": "^1.1.0", "ember-test-selectors": "^6.0.0" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/plugin-proposal-decorators": "^7.20.7", - "@babel/plugin-transform-class-properties": "^7.22.5", - "@babel/plugin-transform-class-static-block": "^7.22.11", - "@babel/runtime": "^7.23.2", - "@embroider/addon-dev": "^4.1.1", + "@babel/core": "^7.23.6", + "@babel/runtime": "^7.23.6", + "@embroider/addon-dev": "^4.1.3", "@rollup/plugin-babel": "^6.0.4", "babel-plugin-ember-template-compilation": "^2.2.1", "concurrently": "^7.6.0", - "rollup": "^4.3.0", + "rollup": "^4.9.1", "rollup-plugin-copy": "^3.5.0" }, "engines": { diff --git a/tests/fixtures/ember-container-query-scoped/output/ember-container-query/babel.config.json b/tests/fixtures/ember-container-query-scoped/output/ember-container-query/babel.config.json index af176e1d..f6cb36b0 100644 --- a/tests/fixtures/ember-container-query-scoped/output/ember-container-query/babel.config.json +++ b/tests/fixtures/ember-container-query-scoped/output/ember-container-query/babel.config.json @@ -9,7 +9,6 @@ } ], "@embroider/addon-dev/template-colocation-plugin", - "@babel/plugin-transform-class-static-block", [ "babel-plugin-ember-template-compilation", { @@ -17,7 +16,13 @@ "transforms": [] } ], - ["@babel/plugin-proposal-decorators", { "version": "legacy" }], - "@babel/plugin-transform-class-properties" + [ + "module:decorator-transforms", + { + "runtime": { + "import": "decorator-transforms/runtime" + } + } + ] ] } 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 index fb0917cb..25c24126 100644 --- 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 @@ -58,25 +58,23 @@ } }, "dependencies": { - "@embroider/addon-shim": "^1.8.6", + "@embroider/addon-shim": "^1.8.7", + "decorator-transforms": "^1.0.1", "ember-element-helper": "^0.6.1", "ember-modifier": "^3.2.7", "ember-resize-observer-service": "^1.1.0", "ember-test-selectors": "^6.0.0" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/plugin-proposal-decorators": "^7.22.15", - "@babel/plugin-transform-class-properties": "^7.22.5", - "@babel/plugin-transform-class-static-block": "^7.22.11", - "@babel/plugin-transform-typescript": "^7.22.15", - "@babel/runtime": "^7.23.2", - "@embroider/addon-dev": "^4.1.1", + "@babel/core": "^7.23.6", + "@babel/plugin-transform-typescript": "^7.23.6", + "@babel/runtime": "^7.23.6", + "@embroider/addon-dev": "^4.1.3", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^2.0.0", "babel-plugin-ember-template-compilation": "^2.2.1", "concurrently": "^7.6.0", - "rollup": "^4.3.0", + "rollup": "^4.9.1", "rollup-plugin-copy": "^3.5.0", "typescript": "^4.9.4" }, diff --git a/tests/fixtures/ember-container-query-scoped/output/ember-container-query/tsconfig.json b/tests/fixtures/ember-container-query-scoped/output/ember-container-query/tsconfig.json index b3e213dc..e1c09030 100644 --- a/tests/fixtures/ember-container-query-scoped/output/ember-container-query/tsconfig.json +++ b/tests/fixtures/ember-container-query-scoped/output/ember-container-query/tsconfig.json @@ -3,7 +3,8 @@ "compilerOptions": { "allowImportingTsExtensions": true, "allowJs": true, - "declarationDir": "declarations" + "declarationDir": "declarations", + "rootDir": "./src" }, "include": [ "src/**/*", diff --git a/tests/fixtures/ember-container-query-scoped/output/ember-container-query/unpublished-development-types/index.d.ts b/tests/fixtures/ember-container-query-scoped/output/ember-container-query/unpublished-development-types/index.d.ts index b7d610a3..adcd1027 100644 --- a/tests/fixtures/ember-container-query-scoped/output/ember-container-query/unpublished-development-types/index.d.ts +++ b/tests/fixtures/ember-container-query-scoped/output/ember-container-query/unpublished-development-types/index.d.ts @@ -2,6 +2,7 @@ // These will *not* be published as part of your addon, so be careful that your published code does not rely on them! import '@glint/environment-ember-loose'; +// import '@glint/environment-ember-template-imports'; declare module '@glint/environment-ember-loose/registry' { // Remove this once entries have been added! 👇 diff --git a/tests/fixtures/ember-container-query-typescript/output/ember-container-query/babel.config.json b/tests/fixtures/ember-container-query-typescript/output/ember-container-query/babel.config.json index af176e1d..f6cb36b0 100644 --- a/tests/fixtures/ember-container-query-typescript/output/ember-container-query/babel.config.json +++ b/tests/fixtures/ember-container-query-typescript/output/ember-container-query/babel.config.json @@ -9,7 +9,6 @@ } ], "@embroider/addon-dev/template-colocation-plugin", - "@babel/plugin-transform-class-static-block", [ "babel-plugin-ember-template-compilation", { @@ -17,7 +16,13 @@ "transforms": [] } ], - ["@babel/plugin-proposal-decorators", { "version": "legacy" }], - "@babel/plugin-transform-class-properties" + [ + "module:decorator-transforms", + { + "runtime": { + "import": "decorator-transforms/runtime" + } + } + ] ] } 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 index b2884323..39ddf9f9 100644 --- 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 @@ -58,25 +58,23 @@ } }, "dependencies": { - "@embroider/addon-shim": "^1.8.6", + "@embroider/addon-shim": "^1.8.7", + "decorator-transforms": "^1.0.1", "ember-element-helper": "^0.6.1", "ember-modifier": "^3.2.7", "ember-resize-observer-service": "^1.1.0", "ember-test-selectors": "^6.0.0" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/plugin-proposal-decorators": "^7.22.15", - "@babel/plugin-transform-class-properties": "^7.22.5", - "@babel/plugin-transform-class-static-block": "^7.22.11", - "@babel/plugin-transform-typescript": "^7.22.15", - "@babel/runtime": "^7.23.2", - "@embroider/addon-dev": "^4.1.1", + "@babel/core": "^7.23.6", + "@babel/plugin-transform-typescript": "^7.23.6", + "@babel/runtime": "^7.23.6", + "@embroider/addon-dev": "^4.1.3", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^2.0.0", "babel-plugin-ember-template-compilation": "^2.2.1", "concurrently": "^7.6.0", - "rollup": "^4.3.0", + "rollup": "^4.9.1", "rollup-plugin-copy": "^3.5.0", "typescript": "^4.9.4" }, diff --git a/tests/fixtures/ember-container-query-typescript/output/ember-container-query/tsconfig.json b/tests/fixtures/ember-container-query-typescript/output/ember-container-query/tsconfig.json index 3cdebfe8..571b3336 100644 --- a/tests/fixtures/ember-container-query-typescript/output/ember-container-query/tsconfig.json +++ b/tests/fixtures/ember-container-query-typescript/output/ember-container-query/tsconfig.json @@ -6,7 +6,8 @@ "declaration": true, "declarationDir": "declarations", "emitDeclarationOnly": true, - "noEmit": false + "noEmit": false, + "rootDir": "./src" }, "include": [ "src/**/*", diff --git a/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/babel.config.json b/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/babel.config.json index af176e1d..f6cb36b0 100644 --- a/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/babel.config.json +++ b/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/babel.config.json @@ -9,7 +9,6 @@ } ], "@embroider/addon-dev/template-colocation-plugin", - "@babel/plugin-transform-class-static-block", [ "babel-plugin-ember-template-compilation", { @@ -17,7 +16,13 @@ "transforms": [] } ], - ["@babel/plugin-proposal-decorators", { "version": "legacy" }], - "@babel/plugin-transform-class-properties" + [ + "module:decorator-transforms", + { + "runtime": { + "import": "decorator-transforms/runtime" + } + } + ] ] } 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 index a6a720df..2a249508 100644 --- 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 @@ -32,21 +32,19 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "@embroider/addon-shim": "^1.8.6" + "@embroider/addon-shim": "^1.8.7", + "decorator-transforms": "^1.0.1" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/plugin-proposal-decorators": "^7.22.15", - "@babel/plugin-transform-class-properties": "^7.22.5", - "@babel/plugin-transform-class-static-block": "^7.22.11", - "@babel/plugin-transform-typescript": "^7.22.15", - "@babel/runtime": "^7.23.2", - "@embroider/addon-dev": "^4.1.1", + "@babel/core": "^7.23.6", + "@babel/plugin-transform-typescript": "^7.23.6", + "@babel/runtime": "^7.23.6", + "@embroider/addon-dev": "^4.1.3", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^2.0.0", "babel-plugin-ember-template-compilation": "^2.2.1", "concurrently": "^7.6.0", - "rollup": "^4.3.0", + "rollup": "^4.9.1", "rollup-plugin-copy": "^3.5.0", "typescript": "^4.9.4" }, diff --git a/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/tsconfig.json b/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/tsconfig.json index 3cdebfe8..571b3336 100644 --- a/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/tsconfig.json +++ b/tests/fixtures/new-v1-addon-customizations/output/packages/new-v1-addon/tsconfig.json @@ -6,7 +6,8 @@ "declaration": true, "declarationDir": "declarations", "emitDeclarationOnly": true, - "noEmit": false + "noEmit": false, + "rootDir": "./src" }, "include": [ "src/**/*", diff --git a/tests/fixtures/new-v1-addon-javascript/output/new-v1-addon/babel.config.json b/tests/fixtures/new-v1-addon-javascript/output/new-v1-addon/babel.config.json index ed03c322..e5ff3e5f 100644 --- a/tests/fixtures/new-v1-addon-javascript/output/new-v1-addon/babel.config.json +++ b/tests/fixtures/new-v1-addon-javascript/output/new-v1-addon/babel.config.json @@ -1,7 +1,6 @@ { "plugins": [ "@embroider/addon-dev/template-colocation-plugin", - "@babel/plugin-transform-class-static-block", [ "babel-plugin-ember-template-compilation", { @@ -9,7 +8,13 @@ "transforms": [] } ], - ["@babel/plugin-proposal-decorators", { "version": "legacy" }], - "@babel/plugin-transform-class-properties" + [ + "module:decorator-transforms", + { + "runtime": { + "import": "decorator-transforms/runtime" + } + } + ] ] } 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 index 35074267..4760a749 100644 --- 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 @@ -27,19 +27,17 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "@embroider/addon-shim": "^1.8.6" + "@embroider/addon-shim": "^1.8.7", + "decorator-transforms": "^1.0.1" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/plugin-proposal-decorators": "^7.22.15", - "@babel/plugin-transform-class-properties": "^7.22.5", - "@babel/plugin-transform-class-static-block": "^7.22.11", - "@babel/runtime": "^7.23.2", - "@embroider/addon-dev": "^4.1.1", + "@babel/core": "^7.23.6", + "@babel/runtime": "^7.23.6", + "@embroider/addon-dev": "^4.1.3", "@rollup/plugin-babel": "^6.0.4", "babel-plugin-ember-template-compilation": "^2.2.1", "concurrently": "^7.6.0", - "rollup": "^4.3.0", + "rollup": "^4.9.1", "rollup-plugin-copy": "^3.5.0" }, "peerDependencies": { diff --git a/tests/fixtures/new-v1-addon-npm/output/new-v1-addon/babel.config.json b/tests/fixtures/new-v1-addon-npm/output/new-v1-addon/babel.config.json index ed03c322..e5ff3e5f 100644 --- a/tests/fixtures/new-v1-addon-npm/output/new-v1-addon/babel.config.json +++ b/tests/fixtures/new-v1-addon-npm/output/new-v1-addon/babel.config.json @@ -1,7 +1,6 @@ { "plugins": [ "@embroider/addon-dev/template-colocation-plugin", - "@babel/plugin-transform-class-static-block", [ "babel-plugin-ember-template-compilation", { @@ -9,7 +8,13 @@ "transforms": [] } ], - ["@babel/plugin-proposal-decorators", { "version": "legacy" }], - "@babel/plugin-transform-class-properties" + [ + "module:decorator-transforms", + { + "runtime": { + "import": "decorator-transforms/runtime" + } + } + ] ] } 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 index 35074267..4760a749 100644 --- 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 @@ -27,19 +27,17 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "@embroider/addon-shim": "^1.8.6" + "@embroider/addon-shim": "^1.8.7", + "decorator-transforms": "^1.0.1" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/plugin-proposal-decorators": "^7.22.15", - "@babel/plugin-transform-class-properties": "^7.22.5", - "@babel/plugin-transform-class-static-block": "^7.22.11", - "@babel/runtime": "^7.23.2", - "@embroider/addon-dev": "^4.1.1", + "@babel/core": "^7.23.6", + "@babel/runtime": "^7.23.6", + "@embroider/addon-dev": "^4.1.3", "@rollup/plugin-babel": "^6.0.4", "babel-plugin-ember-template-compilation": "^2.2.1", "concurrently": "^7.6.0", - "rollup": "^4.3.0", + "rollup": "^4.9.1", "rollup-plugin-copy": "^3.5.0" }, "peerDependencies": { diff --git a/tests/fixtures/new-v1-addon-pnpm/output/new-v1-addon/babel.config.json b/tests/fixtures/new-v1-addon-pnpm/output/new-v1-addon/babel.config.json index ed03c322..e5ff3e5f 100644 --- a/tests/fixtures/new-v1-addon-pnpm/output/new-v1-addon/babel.config.json +++ b/tests/fixtures/new-v1-addon-pnpm/output/new-v1-addon/babel.config.json @@ -1,7 +1,6 @@ { "plugins": [ "@embroider/addon-dev/template-colocation-plugin", - "@babel/plugin-transform-class-static-block", [ "babel-plugin-ember-template-compilation", { @@ -9,7 +8,13 @@ "transforms": [] } ], - ["@babel/plugin-proposal-decorators", { "version": "legacy" }], - "@babel/plugin-transform-class-properties" + [ + "module:decorator-transforms", + { + "runtime": { + "import": "decorator-transforms/runtime" + } + } + ] ] } 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 index 35074267..4760a749 100644 --- 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 @@ -27,19 +27,17 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "@embroider/addon-shim": "^1.8.6" + "@embroider/addon-shim": "^1.8.7", + "decorator-transforms": "^1.0.1" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/plugin-proposal-decorators": "^7.22.15", - "@babel/plugin-transform-class-properties": "^7.22.5", - "@babel/plugin-transform-class-static-block": "^7.22.11", - "@babel/runtime": "^7.23.2", - "@embroider/addon-dev": "^4.1.1", + "@babel/core": "^7.23.6", + "@babel/runtime": "^7.23.6", + "@embroider/addon-dev": "^4.1.3", "@rollup/plugin-babel": "^6.0.4", "babel-plugin-ember-template-compilation": "^2.2.1", "concurrently": "^7.6.0", - "rollup": "^4.3.0", + "rollup": "^4.9.1", "rollup-plugin-copy": "^3.5.0" }, "peerDependencies": { diff --git a/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/babel.config.json b/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/babel.config.json index af176e1d..f6cb36b0 100644 --- a/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/babel.config.json +++ b/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/babel.config.json @@ -9,7 +9,6 @@ } ], "@embroider/addon-dev/template-colocation-plugin", - "@babel/plugin-transform-class-static-block", [ "babel-plugin-ember-template-compilation", { @@ -17,7 +16,13 @@ "transforms": [] } ], - ["@babel/plugin-proposal-decorators", { "version": "legacy" }], - "@babel/plugin-transform-class-properties" + [ + "module:decorator-transforms", + { + "runtime": { + "import": "decorator-transforms/runtime" + } + } + ] ] } 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 index a6a720df..2a249508 100644 --- 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 @@ -32,21 +32,19 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "@embroider/addon-shim": "^1.8.6" + "@embroider/addon-shim": "^1.8.7", + "decorator-transforms": "^1.0.1" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/plugin-proposal-decorators": "^7.22.15", - "@babel/plugin-transform-class-properties": "^7.22.5", - "@babel/plugin-transform-class-static-block": "^7.22.11", - "@babel/plugin-transform-typescript": "^7.22.15", - "@babel/runtime": "^7.23.2", - "@embroider/addon-dev": "^4.1.1", + "@babel/core": "^7.23.6", + "@babel/plugin-transform-typescript": "^7.23.6", + "@babel/runtime": "^7.23.6", + "@embroider/addon-dev": "^4.1.3", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^2.0.0", "babel-plugin-ember-template-compilation": "^2.2.1", "concurrently": "^7.6.0", - "rollup": "^4.3.0", + "rollup": "^4.9.1", "rollup-plugin-copy": "^3.5.0", "typescript": "^4.9.4" }, diff --git a/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/tsconfig.json b/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/tsconfig.json index 3cdebfe8..571b3336 100644 --- a/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/tsconfig.json +++ b/tests/fixtures/new-v1-addon-typescript/output/new-v1-addon/tsconfig.json @@ -6,7 +6,8 @@ "declaration": true, "declarationDir": "declarations", "emitDeclarationOnly": true, - "noEmit": false + "noEmit": false, + "rootDir": "./src" }, "include": [ "src/**/*", diff --git a/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/babel.config.json b/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/babel.config.json index af176e1d..f6cb36b0 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/babel.config.json +++ b/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/babel.config.json @@ -9,7 +9,6 @@ } ], "@embroider/addon-dev/template-colocation-plugin", - "@babel/plugin-transform-class-static-block", [ "babel-plugin-ember-template-compilation", { @@ -17,7 +16,13 @@ "transforms": [] } ], - ["@babel/plugin-proposal-decorators", { "version": "legacy" }], - "@babel/plugin-transform-class-properties" + [ + "module:decorator-transforms", + { + "runtime": { + "import": "decorator-transforms/runtime" + } + } + ] ] } diff --git a/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/unpublished-development-types/index.d.ts b/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/unpublished-development-types/index.d.ts index b7d610a3..adcd1027 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/unpublished-development-types/index.d.ts +++ b/tests/fixtures/steps/create-files-from-blueprints/customizations/output/packages/ember-container-query/unpublished-development-types/index.d.ts @@ -2,6 +2,7 @@ // These will *not* be published as part of your addon, so be careful that your published code does not rely on them! import '@glint/environment-ember-loose'; +// import '@glint/environment-ember-template-imports'; declare module '@glint/environment-ember-loose/registry' { // Remove this once entries have been added! 👇 diff --git a/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/babel.config.json b/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/babel.config.json index af176e1d..f6cb36b0 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/babel.config.json +++ b/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/babel.config.json @@ -9,7 +9,6 @@ } ], "@embroider/addon-dev/template-colocation-plugin", - "@babel/plugin-transform-class-static-block", [ "babel-plugin-ember-template-compilation", { @@ -17,7 +16,13 @@ "transforms": [] } ], - ["@babel/plugin-proposal-decorators", { "version": "legacy" }], - "@babel/plugin-transform-class-properties" + [ + "module:decorator-transforms", + { + "runtime": { + "import": "decorator-transforms/runtime" + } + } + ] ] } diff --git a/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/unpublished-development-types/index.d.ts b/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/unpublished-development-types/index.d.ts index b7d610a3..adcd1027 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/unpublished-development-types/index.d.ts +++ b/tests/fixtures/steps/create-files-from-blueprints/glint/output/ember-container-query/unpublished-development-types/index.d.ts @@ -2,6 +2,7 @@ // These will *not* be published as part of your addon, so be careful that your published code does not rely on them! import '@glint/environment-ember-loose'; +// import '@glint/environment-ember-template-imports'; declare module '@glint/environment-ember-loose/registry' { // Remove this once entries have been added! 👇 diff --git a/tests/fixtures/steps/create-files-from-blueprints/javascript/output/ember-container-query/babel.config.json b/tests/fixtures/steps/create-files-from-blueprints/javascript/output/ember-container-query/babel.config.json index ed03c322..e5ff3e5f 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/javascript/output/ember-container-query/babel.config.json +++ b/tests/fixtures/steps/create-files-from-blueprints/javascript/output/ember-container-query/babel.config.json @@ -1,7 +1,6 @@ { "plugins": [ "@embroider/addon-dev/template-colocation-plugin", - "@babel/plugin-transform-class-static-block", [ "babel-plugin-ember-template-compilation", { @@ -9,7 +8,13 @@ "transforms": [] } ], - ["@babel/plugin-proposal-decorators", { "version": "legacy" }], - "@babel/plugin-transform-class-properties" + [ + "module:decorator-transforms", + { + "runtime": { + "import": "decorator-transforms/runtime" + } + } + ] ] } diff --git a/tests/fixtures/steps/create-files-from-blueprints/npm/output/ember-container-query/babel.config.json b/tests/fixtures/steps/create-files-from-blueprints/npm/output/ember-container-query/babel.config.json index af176e1d..f6cb36b0 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/npm/output/ember-container-query/babel.config.json +++ b/tests/fixtures/steps/create-files-from-blueprints/npm/output/ember-container-query/babel.config.json @@ -9,7 +9,6 @@ } ], "@embroider/addon-dev/template-colocation-plugin", - "@babel/plugin-transform-class-static-block", [ "babel-plugin-ember-template-compilation", { @@ -17,7 +16,13 @@ "transforms": [] } ], - ["@babel/plugin-proposal-decorators", { "version": "legacy" }], - "@babel/plugin-transform-class-properties" + [ + "module:decorator-transforms", + { + "runtime": { + "import": "decorator-transforms/runtime" + } + } + ] ] } diff --git a/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/ember-container-query/babel.config.json b/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/ember-container-query/babel.config.json index af176e1d..f6cb36b0 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/ember-container-query/babel.config.json +++ b/tests/fixtures/steps/create-files-from-blueprints/pnpm/output/ember-container-query/babel.config.json @@ -9,7 +9,6 @@ } ], "@embroider/addon-dev/template-colocation-plugin", - "@babel/plugin-transform-class-static-block", [ "babel-plugin-ember-template-compilation", { @@ -17,7 +16,13 @@ "transforms": [] } ], - ["@babel/plugin-proposal-decorators", { "version": "legacy" }], - "@babel/plugin-transform-class-properties" + [ + "module:decorator-transforms", + { + "runtime": { + "import": "decorator-transforms/runtime" + } + } + ] ] } diff --git a/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/babel.config.json b/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/babel.config.json index af176e1d..f6cb36b0 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/babel.config.json +++ b/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/babel.config.json @@ -9,7 +9,6 @@ } ], "@embroider/addon-dev/template-colocation-plugin", - "@babel/plugin-transform-class-static-block", [ "babel-plugin-ember-template-compilation", { @@ -17,7 +16,13 @@ "transforms": [] } ], - ["@babel/plugin-proposal-decorators", { "version": "legacy" }], - "@babel/plugin-transform-class-properties" + [ + "module:decorator-transforms", + { + "runtime": { + "import": "decorator-transforms/runtime" + } + } + ] ] } diff --git a/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/unpublished-development-types/index.d.ts b/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/unpublished-development-types/index.d.ts index b7d610a3..adcd1027 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/unpublished-development-types/index.d.ts +++ b/tests/fixtures/steps/create-files-from-blueprints/scoped/output/ember-container-query/unpublished-development-types/index.d.ts @@ -2,6 +2,7 @@ // These will *not* be published as part of your addon, so be careful that your published code does not rely on them! import '@glint/environment-ember-loose'; +// import '@glint/environment-ember-template-imports'; declare module '@glint/environment-ember-loose/registry' { // Remove this once entries have been added! 👇 diff --git a/tests/fixtures/steps/create-files-from-blueprints/typescript/output/ember-container-query/babel.config.json b/tests/fixtures/steps/create-files-from-blueprints/typescript/output/ember-container-query/babel.config.json index af176e1d..f6cb36b0 100644 --- a/tests/fixtures/steps/create-files-from-blueprints/typescript/output/ember-container-query/babel.config.json +++ b/tests/fixtures/steps/create-files-from-blueprints/typescript/output/ember-container-query/babel.config.json @@ -9,7 +9,6 @@ } ], "@embroider/addon-dev/template-colocation-plugin", - "@babel/plugin-transform-class-static-block", [ "babel-plugin-ember-template-compilation", { @@ -17,7 +16,13 @@ "transforms": [] } ], - ["@babel/plugin-proposal-decorators", { "version": "legacy" }], - "@babel/plugin-transform-class-properties" + [ + "module:decorator-transforms", + { + "runtime": { + "import": "decorator-transforms/runtime" + } + } + ] ] } 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 index f1035a09..1a51f8c9 100644 --- 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 @@ -58,25 +58,23 @@ } }, "dependencies": { - "@embroider/addon-shim": "^1.8.6", + "@embroider/addon-shim": "^1.8.7", + "decorator-transforms": "^1.0.1", "ember-element-helper": "^0.6.1", "ember-modifier": "^3.2.7", "ember-resize-observer-service": "^1.1.0", "ember-test-selectors": "^6.0.0" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/plugin-proposal-decorators": "^7.22.15", - "@babel/plugin-transform-class-properties": "^7.22.5", - "@babel/plugin-transform-class-static-block": "^7.22.11", - "@babel/plugin-transform-typescript": "^7.22.15", - "@babel/runtime": "^7.23.2", - "@embroider/addon-dev": "^4.1.1", + "@babel/core": "^7.23.6", + "@babel/plugin-transform-typescript": "^7.23.6", + "@babel/runtime": "^7.23.6", + "@embroider/addon-dev": "^4.1.3", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^2.0.0", "babel-plugin-ember-template-compilation": "^2.2.1", "concurrently": "^7.6.0", - "rollup": "^4.3.0", + "rollup": "^4.9.1", "rollup-plugin-copy": "^3.5.0", "typescript": "^4.9.4" }, 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 index f1035a09..1a51f8c9 100644 --- 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 @@ -58,25 +58,23 @@ } }, "dependencies": { - "@embroider/addon-shim": "^1.8.6", + "@embroider/addon-shim": "^1.8.7", + "decorator-transforms": "^1.0.1", "ember-element-helper": "^0.6.1", "ember-modifier": "^3.2.7", "ember-resize-observer-service": "^1.1.0", "ember-test-selectors": "^6.0.0" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/plugin-proposal-decorators": "^7.22.15", - "@babel/plugin-transform-class-properties": "^7.22.5", - "@babel/plugin-transform-class-static-block": "^7.22.11", - "@babel/plugin-transform-typescript": "^7.22.15", - "@babel/runtime": "^7.23.2", - "@embroider/addon-dev": "^4.1.1", + "@babel/core": "^7.23.6", + "@babel/plugin-transform-typescript": "^7.23.6", + "@babel/runtime": "^7.23.6", + "@embroider/addon-dev": "^4.1.3", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^2.0.0", "babel-plugin-ember-template-compilation": "^2.2.1", "concurrently": "^7.6.0", - "rollup": "^4.3.0", + "rollup": "^4.9.1", "rollup-plugin-copy": "^3.5.0", "typescript": "^4.9.4" }, 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 index de08ab9a..3b68d2e5 100644 --- 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 @@ -53,23 +53,21 @@ } }, "dependencies": { - "@embroider/addon-shim": "^1.8.6", + "@embroider/addon-shim": "^1.8.7", + "decorator-transforms": "^1.0.1", "ember-element-helper": "^0.6.1", "ember-modifier": "^3.2.7", "ember-resize-observer-service": "^1.1.0", "ember-test-selectors": "^6.0.0" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/plugin-proposal-decorators": "^7.20.7", - "@babel/plugin-transform-class-properties": "^7.22.5", - "@babel/plugin-transform-class-static-block": "^7.22.11", - "@babel/runtime": "^7.23.2", - "@embroider/addon-dev": "^4.1.1", + "@babel/core": "^7.23.6", + "@babel/runtime": "^7.23.6", + "@embroider/addon-dev": "^4.1.3", "@rollup/plugin-babel": "^6.0.4", "babel-plugin-ember-template-compilation": "^2.2.1", "concurrently": "^7.6.0", - "rollup": "^4.3.0", + "rollup": "^4.9.1", "rollup-plugin-copy": "^3.5.0" }, "engines": { 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 index 79472ceb..73946473 100644 --- 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 @@ -58,25 +58,23 @@ } }, "dependencies": { - "@embroider/addon-shim": "^1.8.6", + "@embroider/addon-shim": "^1.8.7", + "decorator-transforms": "^1.0.1", "ember-element-helper": "^0.6.1", "ember-modifier": "^3.2.7", "ember-resize-observer-service": "^1.1.0", "ember-test-selectors": "^6.0.0" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/plugin-proposal-decorators": "^7.22.15", - "@babel/plugin-transform-class-properties": "^7.22.5", - "@babel/plugin-transform-class-static-block": "^7.22.11", - "@babel/plugin-transform-typescript": "^7.22.15", - "@babel/runtime": "^7.23.2", - "@embroider/addon-dev": "^4.1.1", + "@babel/core": "^7.23.6", + "@babel/plugin-transform-typescript": "^7.23.6", + "@babel/runtime": "^7.23.6", + "@embroider/addon-dev": "^4.1.3", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^2.0.0", "babel-plugin-ember-template-compilation": "^2.2.1", "concurrently": "^7.6.0", - "rollup": "^4.3.0", + "rollup": "^4.9.1", "rollup-plugin-copy": "^3.5.0", "typescript": "^4.9.4" }, 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 index fb0917cb..25c24126 100644 --- 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 @@ -58,25 +58,23 @@ } }, "dependencies": { - "@embroider/addon-shim": "^1.8.6", + "@embroider/addon-shim": "^1.8.7", + "decorator-transforms": "^1.0.1", "ember-element-helper": "^0.6.1", "ember-modifier": "^3.2.7", "ember-resize-observer-service": "^1.1.0", "ember-test-selectors": "^6.0.0" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/plugin-proposal-decorators": "^7.22.15", - "@babel/plugin-transform-class-properties": "^7.22.5", - "@babel/plugin-transform-class-static-block": "^7.22.11", - "@babel/plugin-transform-typescript": "^7.22.15", - "@babel/runtime": "^7.23.2", - "@embroider/addon-dev": "^4.1.1", + "@babel/core": "^7.23.6", + "@babel/plugin-transform-typescript": "^7.23.6", + "@babel/runtime": "^7.23.6", + "@embroider/addon-dev": "^4.1.3", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^2.0.0", "babel-plugin-ember-template-compilation": "^2.2.1", "concurrently": "^7.6.0", - "rollup": "^4.3.0", + "rollup": "^4.9.1", "rollup-plugin-copy": "^3.5.0", "typescript": "^4.9.4" }, 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 index b2884323..39ddf9f9 100644 --- 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 @@ -58,25 +58,23 @@ } }, "dependencies": { - "@embroider/addon-shim": "^1.8.6", + "@embroider/addon-shim": "^1.8.7", + "decorator-transforms": "^1.0.1", "ember-element-helper": "^0.6.1", "ember-modifier": "^3.2.7", "ember-resize-observer-service": "^1.1.0", "ember-test-selectors": "^6.0.0" }, "devDependencies": { - "@babel/core": "^7.23.2", - "@babel/plugin-proposal-decorators": "^7.22.15", - "@babel/plugin-transform-class-properties": "^7.22.5", - "@babel/plugin-transform-class-static-block": "^7.22.11", - "@babel/plugin-transform-typescript": "^7.22.15", - "@babel/runtime": "^7.23.2", - "@embroider/addon-dev": "^4.1.1", + "@babel/core": "^7.23.6", + "@babel/plugin-transform-typescript": "^7.23.6", + "@babel/runtime": "^7.23.6", + "@embroider/addon-dev": "^4.1.3", "@rollup/plugin-babel": "^6.0.4", "@tsconfig/ember": "^2.0.0", "babel-plugin-ember-template-compilation": "^2.2.1", "concurrently": "^7.6.0", - "rollup": "^4.3.0", + "rollup": "^4.9.1", "rollup-plugin-copy": "^3.5.0", "typescript": "^4.9.4" }, diff --git a/tests/fixtures/steps/update-addon-tsconfig-json/customizations/output/packages/ember-container-query/tsconfig.json b/tests/fixtures/steps/update-addon-tsconfig-json/customizations/output/packages/ember-container-query/tsconfig.json index e76dd27e..f45d5fb9 100644 --- a/tests/fixtures/steps/update-addon-tsconfig-json/customizations/output/packages/ember-container-query/tsconfig.json +++ b/tests/fixtures/steps/update-addon-tsconfig-json/customizations/output/packages/ember-container-query/tsconfig.json @@ -3,7 +3,8 @@ "compilerOptions": { "allowImportingTsExtensions": true, "allowJs": true, - "declarationDir": "declarations" + "declarationDir": "declarations", + "rootDir": "./src" }, "include": [ "src/**/*", diff --git a/tests/fixtures/steps/update-addon-tsconfig-json/glint/output/ember-container-query/tsconfig.json b/tests/fixtures/steps/update-addon-tsconfig-json/glint/output/ember-container-query/tsconfig.json index b3e213dc..e1c09030 100644 --- a/tests/fixtures/steps/update-addon-tsconfig-json/glint/output/ember-container-query/tsconfig.json +++ b/tests/fixtures/steps/update-addon-tsconfig-json/glint/output/ember-container-query/tsconfig.json @@ -3,7 +3,8 @@ "compilerOptions": { "allowImportingTsExtensions": true, "allowJs": true, - "declarationDir": "declarations" + "declarationDir": "declarations", + "rootDir": "./src" }, "include": [ "src/**/*", diff --git a/tests/fixtures/steps/update-addon-tsconfig-json/scoped/output/ember-container-query/tsconfig.json b/tests/fixtures/steps/update-addon-tsconfig-json/scoped/output/ember-container-query/tsconfig.json index b3e213dc..e1c09030 100644 --- a/tests/fixtures/steps/update-addon-tsconfig-json/scoped/output/ember-container-query/tsconfig.json +++ b/tests/fixtures/steps/update-addon-tsconfig-json/scoped/output/ember-container-query/tsconfig.json @@ -3,7 +3,8 @@ "compilerOptions": { "allowImportingTsExtensions": true, "allowJs": true, - "declarationDir": "declarations" + "declarationDir": "declarations", + "rootDir": "./src" }, "include": [ "src/**/*", diff --git a/tests/fixtures/steps/update-addon-tsconfig-json/typescript/output/ember-container-query/tsconfig.json b/tests/fixtures/steps/update-addon-tsconfig-json/typescript/output/ember-container-query/tsconfig.json index 3cdebfe8..571b3336 100644 --- a/tests/fixtures/steps/update-addon-tsconfig-json/typescript/output/ember-container-query/tsconfig.json +++ b/tests/fixtures/steps/update-addon-tsconfig-json/typescript/output/ember-container-query/tsconfig.json @@ -6,7 +6,8 @@ "declaration": true, "declarationDir": "declarations", "emitDeclarationOnly": true, - "noEmit": false + "noEmit": false, + "rootDir": "./src" }, "include": [ "src/**/*",