diff --git a/package.json b/package.json index d0162d327db..204460fc8ab 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "@babel/types": "^7.22.5", "@embroider/macros": "^1.20.2", "@embroider/shared-internals": "^3.0.2", - "@embroider/vite": "^1.7.1", + "@embroider/vite": "^1.7.2", "@eslint/js": "^9.21.0", "@glimmer/component": "workspace:*", "@rollup/plugin-babel": "^6.0.4", @@ -157,10 +157,7 @@ "esbuild" ], "patchedDependencies": { - "@tracerbench/core@8.0.1": "patches/@tracerbench__core@8.0.1.patch", - "@embroider/compat@4.1.16": "patches/@embroider__compat@4.1.16.patch", - "ember-cli-htmlbars@7.0.0": "patches/ember-cli-htmlbars@7.0.0.patch", - "ember-auto-import@2.13.0": "patches/ember-auto-import@2.13.0.patch" + "@tracerbench/core@8.0.1": "patches/@tracerbench__core@8.0.1.patch" } }, "peerDependencies": { diff --git a/patches/@embroider__compat@4.1.16.patch b/patches/@embroider__compat@4.1.16.patch deleted file mode 100644 index 5fa0ca1be7c..00000000000 --- a/patches/@embroider__compat@4.1.16.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/dist/src/compat-app.js b/dist/src/compat-app.js -index e22220b687d2434136227e16c15bf1826a483c98..53c0036eb17403e93e9bb5d248047afefc412ec7 100644 ---- a/dist/src/compat-app.js -+++ b/dist/src/compat-app.js -@@ -241,10 +241,15 @@ class CompatApp { - // - // The template compiler is still here so that apps using a V2 ember can - // still app.import the traditional runtime template compiler. -- trees.push((0, broccoli_file_creator_1.default)('vendor/ember/ember.js', () => '')); -- trees.push((0, broccoli_file_creator_1.default)('vendor/ember/ember-testing.js', () => '')); -- const templateCompilerSrc = (0, fs_1.readFileSync)((0, path_1.join)(emberSource.root, 'dist/ember-template-compiler.js'), 'utf8'); -- trees.push((0, broccoli_file_creator_1.default)('vendor/ember/ember-template-compiler.js', () => templateCompilerSrc)); -+ // -+ // When ember-source no longer provides `paths` (v7+), these legacy vendor -+ // files are not needed at all — ember-source is fully ESM. -+ if (emberSource.paths) { -+ trees.push((0, broccoli_file_creator_1.default)('vendor/ember/ember.js', () => '')); -+ trees.push((0, broccoli_file_creator_1.default)('vendor/ember/ember-testing.js', () => '')); -+ const templateCompilerSrc = (0, fs_1.readFileSync)((0, path_1.join)(emberSource.root, 'dist/ember-template-compiler.js'), 'utf8'); -+ trees.push((0, broccoli_file_creator_1.default)('vendor/ember/ember-template-compiler.js', () => templateCompilerSrc)); -+ } - } - if (this.vendorTree) { - trees.push((0, broccoli_funnel_1.default)(this.vendorTree, { diff --git a/patches/ember-auto-import@2.13.0.patch b/patches/ember-auto-import@2.13.0.patch deleted file mode 100644 index b34561ecf63..00000000000 --- a/patches/ember-auto-import@2.13.0.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/js/package.js b/js/package.js -index 91c757199e649b581e3064130f35f45d2af771a4..26d3e8bde91cd085e7a035a8520c8485e660be24 100644 ---- a/js/package.js -+++ b/js/package.js -@@ -413,7 +413,8 @@ class Package { - } - let ensureModuleApiPolyfill = semver_1.default.satisfies(emberSource.pkg.version, '<3.27.0', { includePrerelease: true }); - let templateCompilerPath = emberSource.absolutePaths -- .templateCompiler; -+ ? emberSource.absolutePaths.templateCompiler -+ : require.resolve('ember-source/ember-template-compiler/index.js'); - const babelPluginPrecompile = ensureModuleApiPolyfill - ? [ - require.resolve('babel-plugin-htmlbars-inline-precompile'), diff --git a/patches/ember-cli-htmlbars@7.0.0.patch b/patches/ember-cli-htmlbars@7.0.0.patch deleted file mode 100644 index 73db7560585..00000000000 --- a/patches/ember-cli-htmlbars@7.0.0.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/lib/ember-addon-main.js b/lib/ember-addon-main.js -index 71c809a11baa57fcc78f10e08176e5d34eaeb62b..6f162e6c4435df6041e943b6382b42272173f206 100644 ---- a/lib/ember-addon-main.js -+++ b/lib/ember-addon-main.js -@@ -105,7 +105,13 @@ module.exports = { - ); - } - -- return ember.absolutePaths.templateCompiler; -+ if (ember.absolutePaths) { -+ return ember.absolutePaths.templateCompiler; -+ } -+ -+ // v7+ ember-source no longer provides absolutePaths; resolve through -+ // the package exports map -+ return require.resolve('ember-source/ember-template-compiler/index.js'); - }, - - astPlugins() { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 14d3312104b..7d1142bb301 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,18 +12,9 @@ overrides: ember-cli-babel: ^8.3.1 patchedDependencies: - '@embroider/compat@4.1.16': - hash: 7abfb78c7600805f2951947c7fccb186fe063686cc3074501a91cd8f025bdf6f - path: patches/@embroider__compat@4.1.16.patch '@tracerbench/core@8.0.1': hash: 5e48bdb11a088927d3415cc5430bb6c37d5ce66ed2dab1327914b55e4fd5cd13 path: patches/@tracerbench__core@8.0.1.patch - ember-auto-import@2.13.0: - hash: ec8437cb1a9213741af03bade3fc56541ab5120a3f2e979f8d1abfd490f54604 - path: patches/ember-auto-import@2.13.0.patch - ember-cli-htmlbars@7.0.0: - hash: c09818a05c987d71c1bb858496ab119ab7b2be6f82468ffda0f60d668561baac - path: patches/ember-cli-htmlbars@7.0.0.patch importers: @@ -109,8 +100,8 @@ importers: specifier: ^3.0.2 version: 3.0.2 '@embroider/vite': - specifier: ^1.7.1 - version: 1.7.1(@embroider/core@4.4.7)(vite@5.4.21(@types/node@22.19.15)(terser@5.46.0)) + specifier: ^1.7.2 + version: 1.7.2(@embroider/core@4.4.7)(vite@5.4.21(@types/node@22.19.15)(terser@5.46.0)) '@eslint/js': specifier: ^9.21.0 version: 9.39.3 @@ -2796,8 +2787,8 @@ importers: specifier: ^9.2.1 version: 9.2.1 ember-auto-import: - specifier: ^2.13.0 - version: 2.13.0(patch_hash=ec8437cb1a9213741af03bade3fc56541ab5120a3f2e979f8d1abfd490f54604)(webpack@5.105.4) + specifier: ^2.13.1 + version: 2.13.1(webpack@5.105.4) ember-cli: specifier: ~6.11.1 version: 6.11.1(@babel/core@7.29.0)(@types/node@22.19.15)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) @@ -2818,7 +2809,7 @@ importers: version: 3.4.0(ember-source@) ember-cli-htmlbars: specifier: ^7.0.0 - version: 7.0.0(patch_hash=c09818a05c987d71c1bb858496ab119ab7b2be6f82468ffda0f60d668561baac)(@babel/core@7.29.0)(ember-source@) + version: 7.0.1(@babel/core@7.29.0)(ember-source@) ember-cli-inject-live-reload: specifier: ^2.1.0 version: 2.1.0 @@ -2919,8 +2910,8 @@ importers: specifier: ^3.0.6 version: 3.0.6(@babel/core@7.29.0)(@embroider/core@4.4.7) '@embroider/vite': - specifier: ^1.7.1 - version: 1.7.1(@embroider/core@4.4.7)(vite@7.3.1(@types/node@22.19.15)(terser@5.46.1)) + specifier: ^1.7.2 + version: 1.7.2(@embroider/core@4.4.7)(vite@7.3.1(@types/node@22.19.15)(terser@5.46.1)) '@glimmer/component': specifier: workspace:* version: link:../../packages/@glimmer/component @@ -2958,8 +2949,8 @@ importers: smoke-tests/scenarios: devDependencies: '@embroider/compat': - specifier: ^4.1.16 - version: 4.1.16(patch_hash=7abfb78c7600805f2951947c7fccb186fe063686cc3074501a91cd8f025bdf6f)(@embroider/core@4.4.7) + specifier: ^4.1.17 + version: 4.1.17(@embroider/core@4.4.7) '@embroider/core': specifier: ^4.4.7 version: 4.4.7 @@ -3024,8 +3015,8 @@ importers: specifier: ^4.1.1 version: 4.1.1(@babel/core@7.29.0) '@embroider/compat': - specifier: ^4.1.16 - version: 4.1.16(patch_hash=7abfb78c7600805f2951947c7fccb186fe063686cc3074501a91cd8f025bdf6f)(@embroider/core@4.4.7) + specifier: ^4.1.17 + version: 4.1.17(@embroider/core@4.4.7) '@embroider/config-meta-loader': specifier: ^1.0.0 version: 1.0.0 @@ -3042,8 +3033,8 @@ importers: specifier: ^3.0.6 version: 3.0.6(@babel/core@7.29.0)(@embroider/core@4.4.7) '@embroider/vite': - specifier: ^1.7.1 - version: 1.7.1(@embroider/core@4.4.7)(vite@7.3.1(@types/node@22.19.15)(terser@5.46.1)) + specifier: ^1.7.2 + version: 1.7.2(@embroider/core@4.4.7)(vite@7.3.1(@types/node@22.19.15)(terser@5.46.1)) '@eslint/js': specifier: ^9.39.2 version: 9.39.3 @@ -3986,8 +3977,8 @@ packages: peerDependencies: '@embroider/core': ^3.5.9 - '@embroider/compat@4.1.16': - resolution: {integrity: sha512-zVOMF/MeB2/nGP2Lp/JPibyG3+9S6hp8EAbP5z9raqbQ2yyk/c7bCjWPhzmWl78xQQuLeemWFTaohchGETHnmw==} + '@embroider/compat@4.1.17': + resolution: {integrity: sha512-MjjtChtKXMNit2xmjPpxtK+f0kNHW2ao5lDhbkSdKjCcYghMvWYdbe5hdX+3QknyaZxDy4LW2dEHCWm3fhVtlg==} engines: {node: '>= 20.19.*'} hasBin: true peerDependencies: @@ -4040,8 +4031,8 @@ packages: resolution: {integrity: sha512-/SusdG+zgosc3t+9sPFVKSFOYyiSgLfXOT6lYNWoG1YtnhWDxlK4S8leZ0jhcVjemdaHln5rTyxCnq8oFLxqpQ==} engines: {node: 12.* || 14.* || >= 16} - '@embroider/vite@1.7.1': - resolution: {integrity: sha512-WeGdY/zrI4kM/sxBAVomVHs9gJFxVjKKAwWtONHV4XvH89ejCGMpriXZSo23xwodLYnaEfnf5UnmtCrfoGqvzA==} + '@embroider/vite@1.7.2': + resolution: {integrity: sha512-sRzIZzqYP8NYKnD3ycrfhPFxRJ8z2dcaeA2gcK9IM7x4GPjNDhAAqB5KFTnxgPFCuEKsC3O1CqkW91d+CuiAhg==} peerDependencies: '@embroider/core': ^4.4.7 vite: '>= 5.2.0' @@ -7608,8 +7599,8 @@ packages: resolution: {integrity: sha512-B+ZM+RXvRqQaAmkMlO/oSe5nMUOaUnyfGYCEHoR8wrXsZR2mA0XVibsxV1bvTwxdRWah1PkQqso2EzhILGHtEQ==} engines: {node: '>=0.10.0'} - ember-auto-import@2.13.0: - resolution: {integrity: sha512-P6COSWDDC6qpgNdc33PyAubhTHUkKc1gUfP2oR4BZoHhUVoEMHiSOECHISd5a2J8DaNrcpFcZmjgb1vJ2ydkjw==} + ember-auto-import@2.13.1: + resolution: {integrity: sha512-MjxJK2nfCJmmQI/rju2TrycmAa1AxmTarfvygbcrrgW0s4WeZHtbGXCO2z1lW9wfrShqeTo/o+3Mgk+9xcDTWg==} engines: {node: 12.* || 14.* || >= 16} ember-cli-app-version@7.0.0: @@ -7663,8 +7654,8 @@ packages: resolution: {integrity: sha512-N9Y80oZfcfWLsqickMfRd9YByVcTGyhYRnYQ2XVPVrp6jyUyOeRWmEAPh7ERSXpp8Ws4hr/JB9QVQrn/yZa+Ag==} engines: {node: 12.* || 14.* || >= 16} - ember-cli-htmlbars@7.0.0: - resolution: {integrity: sha512-6BFxD19eZY+K62JLBDIKb8fXV29+QBrcT5QH4iHi8xseERX9SEWnYej9FpqL2QuoGjaTGml6QOvu9QlSTDYdVw==} + ember-cli-htmlbars@7.0.1: + resolution: {integrity: sha512-bNVAwTvBOmk7KjGCN0Vq81w8FAWQ1zXwCS1CUUHTeWdcFypRsv0qUEkTtwxho4H3BYaoqMCXPS45Js9WWtEXYw==} engines: {node: '>= 20'} peerDependencies: '@babel/core': '>= 7' @@ -13653,7 +13644,7 @@ snapshots: - supports-color - webpack - '@embroider/compat@4.1.16(patch_hash=7abfb78c7600805f2951947c7fccb186fe063686cc3074501a91cd8f025bdf6f)(@embroider/core@4.4.7)': + '@embroider/compat@4.1.17(@embroider/core@4.4.7)': dependencies: '@babel/code-frame': 7.29.0 '@babel/core': 7.29.0(supports-color@8.1.1) @@ -13820,7 +13811,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@embroider/vite@1.7.1(@embroider/core@4.4.7)(vite@5.4.21(@types/node@22.19.15)(terser@5.46.0))': + '@embroider/vite@1.7.2(@embroider/core@4.4.7)(vite@5.4.21(@types/node@22.19.15)(terser@5.46.0))': dependencies: '@babel/core': 7.29.0(supports-color@8.1.1) '@embroider/core': 4.4.7 @@ -13846,7 +13837,7 @@ snapshots: - supports-color - utf-8-validate - '@embroider/vite@1.7.1(@embroider/core@4.4.7)(vite@7.3.1(@types/node@22.19.15)(terser@5.46.1))': + '@embroider/vite@1.7.2(@embroider/core@4.4.7)(vite@7.3.1(@types/node@22.19.15)(terser@5.46.1))': dependencies: '@babel/core': 7.29.0(supports-color@8.1.1) '@embroider/core': 4.4.7 @@ -17706,7 +17697,7 @@ snapshots: elegant-spinner@1.0.1: {} - ember-auto-import@2.13.0(patch_hash=ec8437cb1a9213741af03bade3fc56541ab5120a3f2e979f8d1abfd490f54604)(webpack@5.105.4): + ember-auto-import@2.13.1(webpack@5.105.4): dependencies: '@babel/core': 7.29.0(supports-color@8.1.1) '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.29.0) @@ -17871,7 +17862,7 @@ snapshots: transitivePeerDependencies: - supports-color - ember-cli-htmlbars@7.0.0(patch_hash=c09818a05c987d71c1bb858496ab119ab7b2be6f82468ffda0f60d668561baac)(@babel/core@7.29.0)(ember-source@): + ember-cli-htmlbars@7.0.1(@babel/core@7.29.0)(ember-source@): dependencies: '@babel/core': 7.29.0(supports-color@8.1.1) '@ember/edition-utils': 1.2.0 @@ -18248,7 +18239,7 @@ snapshots: ember-tracked-storage-polyfill@1.0.0(@babel/core@7.29.0)(ember-source@): dependencies: ember-cli-babel: 8.3.1(@babel/core@7.29.0) - ember-cli-htmlbars: 7.0.0(patch_hash=c09818a05c987d71c1bb858496ab119ab7b2be6f82468ffda0f60d668561baac)(@babel/core@7.29.0)(ember-source@) + ember-cli-htmlbars: 7.0.1(@babel/core@7.29.0)(ember-source@) transitivePeerDependencies: - '@babel/core' - ember-source diff --git a/smoke-tests/app-template/package.json b/smoke-tests/app-template/package.json index ccf1a72fec5..8552458d1c4 100644 --- a/smoke-tests/app-template/package.json +++ b/smoke-tests/app-template/package.json @@ -38,14 +38,14 @@ "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.13.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~6.11.1", "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", "ember-cli-dependency-checker": "^3.3.3", "ember-cli-deprecation-workflow": "^3.4.0", - "ember-cli-htmlbars": "^7.0.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", diff --git a/smoke-tests/benchmark-app/package.json b/smoke-tests/benchmark-app/package.json index 336752ad016..c5d26558137 100644 --- a/smoke-tests/benchmark-app/package.json +++ b/smoke-tests/benchmark-app/package.json @@ -25,7 +25,7 @@ "@embroider/core": "^4.4.7", "@embroider/macros": "^1.20.2", "@embroider/router": "^3.0.6", - "@embroider/vite": "^1.7.1", + "@embroider/vite": "^1.7.2", "@glimmer/component": "workspace:*", "@rollup/plugin-babel": "^6.1.0", "babel-plugin-ember-template-compilation": "^4.0.0", diff --git a/smoke-tests/scenarios/package.json b/smoke-tests/scenarios/package.json index d80f26d4b38..5fdfc5ae2b1 100644 --- a/smoke-tests/scenarios/package.json +++ b/smoke-tests/scenarios/package.json @@ -2,7 +2,7 @@ "name": "ember-source-scenarios", "private": true, "devDependencies": { - "@embroider/compat": "^4.1.16", + "@embroider/compat": "^4.1.17", "@embroider/core": "^4.4.7", "@embroider/webpack": "^4.1.2", "@swc-node/register": "^1.6.8", diff --git a/smoke-tests/v2-app-template/package.json b/smoke-tests/v2-app-template/package.json index f46f378c249..9daf52f6e3d 100644 --- a/smoke-tests/v2-app-template/package.json +++ b/smoke-tests/v2-app-template/package.json @@ -38,13 +38,13 @@ "@ember/string": "^4.0.1", "@ember/test-helpers": "^5.4.1", "@ember/test-waiters": "^4.1.1", - "@embroider/compat": "^4.1.16", + "@embroider/compat": "^4.1.17", "@embroider/config-meta-loader": "^1.0.0", "@embroider/core": "^4.4.7", "@embroider/legacy-inspector-support": "^0.1.3", "@embroider/macros": "^1.20.2", "@embroider/router": "^3.0.6", - "@embroider/vite": "^1.7.1", + "@embroider/vite": "^1.7.2", "@eslint/js": "^9.39.2", "@glimmer/component": "workspace:^", "@rollup/plugin-babel": "^6.1.0",