From 88043d027c42eb7d9d4aaa91e8458568d480b252 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Tue, 5 May 2026 11:47:33 -0400 Subject: [PATCH 1/8] type=module --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 008724da9c5..5a45a61c22b 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "name": "ember-source", + "type": "module", "version": "7.1.0-alpha.1", "description": "A JavaScript framework for creating ambitious web applications", "keywords": [ From 036d656f6f85131f1f3805a5b3665b83728a51cd Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Tue, 5 May 2026 11:50:51 -0400 Subject: [PATCH 2/8] rename some js modules to cjs --- .prettierrc.js => .prettierrc.cjs | 0 testem.browserstack.js => testem.browserstack.cjs | 0 testem.ci-browsers.js => testem.ci-browsers.cjs | 0 testem.js => testem.cjs | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename .prettierrc.js => .prettierrc.cjs (100%) rename testem.browserstack.js => testem.browserstack.cjs (100%) rename testem.ci-browsers.js => testem.ci-browsers.cjs (100%) rename testem.js => testem.cjs (100%) diff --git a/.prettierrc.js b/.prettierrc.cjs similarity index 100% rename from .prettierrc.js rename to .prettierrc.cjs diff --git a/testem.browserstack.js b/testem.browserstack.cjs similarity index 100% rename from testem.browserstack.js rename to testem.browserstack.cjs diff --git a/testem.ci-browsers.js b/testem.ci-browsers.cjs similarity index 100% rename from testem.ci-browsers.js rename to testem.ci-browsers.cjs diff --git a/testem.js b/testem.cjs similarity index 100% rename from testem.js rename to testem.cjs From bfbaf4f52c136d3310c903754dca8ae67c7189a0 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Tue, 5 May 2026 11:59:18 -0400 Subject: [PATCH 3/8] Convert more cjs to .cjs --- babel.test.config.mjs | 4 ++-- ...ild-debug-macro-plugin.js => build-debug-macro-plugin.cjs} | 0 broccoli/{build-info.js => build-info.cjs} | 0 broccoli/{canary-features.js => canary-features.cjs} | 2 +- broccoli/{features.js => features.cjs} | 0 config/{browserlists.js => browserlists.cjs} | 2 +- config/{s3ProjectConfig.js => s3ProjectConfig.cjs} | 0 config/{targets.js => targets.cjs} | 2 +- lib/{browsers.js => browsers.cjs} | 0 lib/{index.js => index.cjs} | 4 ++-- rollup.config.mjs | 4 ++-- 11 files changed, 9 insertions(+), 9 deletions(-) rename broccoli/{build-debug-macro-plugin.js => build-debug-macro-plugin.cjs} (100%) rename broccoli/{build-info.js => build-info.cjs} (100%) rename broccoli/{canary-features.js => canary-features.cjs} (94%) rename broccoli/{features.js => features.cjs} (100%) rename config/{browserlists.js => browserlists.cjs} (74%) rename config/{s3ProjectConfig.js => s3ProjectConfig.cjs} (100%) rename config/{targets.js => targets.cjs} (95%) rename lib/{browsers.js => browsers.cjs} (100%) rename lib/{index.js => index.cjs} (99%) diff --git a/babel.test.config.mjs b/babel.test.config.mjs index ae7d719422d..f83bb403a1f 100644 --- a/babel.test.config.mjs +++ b/babel.test.config.mjs @@ -12,7 +12,7 @@ import baseConfig from './babel.config.mjs'; // eslint-disable-next-line no-redeclare const require = createRequire(import.meta.url); -const buildDebugMacroPlugin = require('./broccoli/build-debug-macro-plugin.js'); +const buildDebugMacroPlugin = require('./broccoli/build-debug-macro-plugin.cjs'); const isProduction = process.env.EMBER_ENV === 'production'; export default { @@ -22,7 +22,7 @@ export default { [ '@babel/preset-env', { - targets: require('./config/targets.js'), + targets: require('./config/targets.cjs'), }, ], ], diff --git a/broccoli/build-debug-macro-plugin.js b/broccoli/build-debug-macro-plugin.cjs similarity index 100% rename from broccoli/build-debug-macro-plugin.js rename to broccoli/build-debug-macro-plugin.cjs diff --git a/broccoli/build-info.js b/broccoli/build-info.cjs similarity index 100% rename from broccoli/build-info.js rename to broccoli/build-info.cjs diff --git a/broccoli/canary-features.js b/broccoli/canary-features.cjs similarity index 94% rename from broccoli/canary-features.js rename to broccoli/canary-features.cjs index 97ec9cdb611..b571597d2f1 100644 --- a/broccoli/canary-features.js +++ b/broccoli/canary-features.cjs @@ -1,6 +1,6 @@ 'use strict'; -const FEATURES = require('./features'); +const FEATURES = require('./features.cjs'); module.exports = function canaryFeatures() { return [ diff --git a/broccoli/features.js b/broccoli/features.cjs similarity index 100% rename from broccoli/features.js rename to broccoli/features.cjs diff --git a/config/browserlists.js b/config/browserlists.cjs similarity index 74% rename from config/browserlists.js rename to config/browserlists.cjs index 60fc7020059..c2401deba65 100644 --- a/config/browserlists.js +++ b/config/browserlists.cjs @@ -1,4 +1,4 @@ -const allSupportedBrowsers = require('../lib/browsers'); +const allSupportedBrowsers = require('../lib/browsers.cjs'); const modernBrowsers = [ 'last 1 Chrome versions', diff --git a/config/s3ProjectConfig.js b/config/s3ProjectConfig.cjs similarity index 100% rename from config/s3ProjectConfig.js rename to config/s3ProjectConfig.cjs diff --git a/config/targets.js b/config/targets.cjs similarity index 95% rename from config/targets.js rename to config/targets.cjs index d573390cda9..cc2181f0645 100644 --- a/config/targets.js +++ b/config/targets.cjs @@ -1,5 +1,5 @@ 'use strict'; -const { allSupportedBrowsers, modernBrowsers } = require('./browserlists'); +const { allSupportedBrowsers, modernBrowsers } = require('./browserlists.cjs'); const isProduction = process.env.EMBER_ENV === 'production'; const browsers = diff --git a/lib/browsers.js b/lib/browsers.cjs similarity index 100% rename from lib/browsers.js rename to lib/browsers.cjs diff --git a/lib/index.js b/lib/index.cjs similarity index 99% rename from lib/index.js rename to lib/index.cjs index 36c496c739d..5e6e1040b69 100644 --- a/lib/index.js +++ b/lib/index.cjs @@ -1,8 +1,8 @@ 'use strict'; const path = require('path'); -const Overrides = require('./overrides'); -const SupportedBrowsers = require('./browsers'); +const Overrides = require('./overrides.cjs'); +const SupportedBrowsers = require('./browsers.cjs'); const isProduction = process.env.EMBER_ENV === 'production'; diff --git a/rollup.config.mjs b/rollup.config.mjs index ceee7e37ab1..5b0cfca3b65 100644 --- a/rollup.config.mjs +++ b/rollup.config.mjs @@ -12,8 +12,8 @@ const require = createRequire(import.meta.url); const { PackageCache, packageName } = require('@embroider/shared-internals'); const projectRoot = dirname(fileURLToPath(import.meta.url)); const packageCache = PackageCache.shared('ember-source', projectRoot); -const buildDebugMacroPlugin = require('./broccoli/build-debug-macro-plugin'); -const canaryFeatures = require('./broccoli/canary-features'); +const buildDebugMacroPlugin = require('./broccoli/build-debug-macro-plugin.cjs'); +const canaryFeatures = require('./broccoli/canary-features.cjs'); const testDependencies = [ 'qunit', From c1255f9d34f02fec0e56eb5cee2c415cb15b97c2 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Tue, 5 May 2026 12:03:41 -0400 Subject: [PATCH 4/8] Upgrade testem --- package.json | 2 +- pnpm-lock.yaml | 420 ++++++++++++++++------- smoke-tests/v2-app-template/package.json | 2 +- 3 files changed, 303 insertions(+), 121 deletions(-) diff --git a/package.json b/package.json index 5a45a61c22b..af06214463f 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "router_js": "workspace:*", "rsvp": "^4.8.5", "terser": "^5.42.0", - "testem": "^3.10.1", + "testem": "^3.20.0", "testem-failure-only-reporter": "^1.0.0", "tracerbench": "^8.0.1", "typescript": "^5.7.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cb109a206f1..2f3e4005f33 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -95,7 +95,7 @@ importers: version: 3.0.2 '@embroider/vite': specifier: ^1.7.2 - version: 1.7.2(@embroider/core@4.4.7)(vite@7.3.2(@types/node@22.19.15)(lightningcss@1.32.0)(terser@5.46.1)) + version: 1.7.2(@embroider/core@4.4.7)(vite@7.3.2(@types/node@25.6.0)(lightningcss@1.32.0)(terser@5.46.1)(yaml@2.8.4)) '@eslint/js': specifier: ^9.21.0 version: 9.39.4 @@ -146,7 +146,7 @@ importers: version: 2.0.0(@babel/core@7.29.0) ember-cli: specifier: ^6.11.1 - version: 6.11.2(@babel/core@7.29.0)(@types/node@22.19.15)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) + version: 6.11.2(@babel/core@7.29.0)(@types/node@25.6.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) ember-cli-blueprint-test-helpers: specifier: ^0.19.2 version: 0.19.2 @@ -155,7 +155,7 @@ importers: version: 2.1.0 ember-cli-dependency-checker: specifier: ^3.3.1 - version: 3.3.3(ember-cli@6.11.2(@babel/core@7.29.0)(@types/node@22.19.15)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8)) + version: 3.3.3(ember-cli@6.11.2(@babel/core@7.29.0)(@types/node@25.6.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8)) ember-cli-yuidoc: specifier: ^0.9.1 version: 0.9.1 @@ -235,14 +235,14 @@ importers: specifier: ^5.42.0 version: 5.46.1 testem: - specifier: ^3.10.1 - version: 3.19.1(@babel/core@7.29.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) + specifier: ^3.20.0 + version: 3.20.0(@babel/core@7.29.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) testem-failure-only-reporter: specifier: ^1.0.0 version: 1.0.0(@babel/core@7.29.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) tracerbench: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.15.21)(@types/node@22.19.15)(typescript@5.9.3) + version: 8.0.1(@swc/core@1.15.21)(@types/node@25.6.0)(typescript@5.9.3) typescript: specifier: ^5.7.3 version: 5.9.3 @@ -251,7 +251,7 @@ importers: version: 8.57.2(eslint@9.39.4)(typescript@5.9.3) vite: specifier: ^7.0.0 - version: 7.3.2(@types/node@22.19.15)(lightningcss@1.32.0)(terser@5.46.1) + version: 7.3.2(@types/node@25.6.0)(lightningcss@1.32.0)(terser@5.46.1)(yaml@2.8.4) packages/@ember/-internals: dependencies: @@ -2803,7 +2803,7 @@ importers: version: 2.13.1(webpack@5.105.4) ember-cli: specifier: ~6.11.1 - version: 6.11.2(@babel/core@7.29.0)(@types/node@22.19.15)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) + version: 6.11.2(@babel/core@7.29.0)(@types/node@25.6.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) ember-cli-app-version: specifier: ^7.0.0 version: 7.0.0(@babel/core@7.29.0)(ember-source@) @@ -2815,7 +2815,7 @@ importers: version: 3.0.0 ember-cli-dependency-checker: specifier: ^3.3.3 - version: 3.3.3(ember-cli@6.11.2(@babel/core@7.29.0)(@types/node@22.19.15)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8)) + version: 3.3.3(ember-cli@6.11.2(@babel/core@7.29.0)(@types/node@25.6.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8)) ember-cli-deprecation-workflow: specifier: ^3.4.0 version: 3.4.0(ember-source@) @@ -2923,7 +2923,7 @@ importers: version: 3.0.6(@babel/core@7.29.0)(@embroider/core@4.4.7) '@embroider/vite': specifier: ^1.7.2 - version: 1.7.2(@embroider/core@4.4.7)(vite@7.3.2(@types/node@22.19.15)(lightningcss@1.32.0)(terser@5.46.1)) + version: 1.7.2(@embroider/core@4.4.7)(vite@7.3.2(@types/node@25.6.0)(lightningcss@1.32.0)(terser@5.46.1)(yaml@2.8.4)) '@glimmer/component': specifier: workspace:* version: link:../../packages/@glimmer/component @@ -2944,7 +2944,7 @@ importers: version: 0.1.1(@babel/core@7.29.0) vite: specifier: ^7.3.0 - version: 7.3.2(@types/node@22.19.15)(lightningcss@1.32.0)(terser@5.46.1) + version: 7.3.2(@types/node@25.6.0)(lightningcss@1.32.0)(terser@5.46.1)(yaml@2.8.4) smoke-tests/node-template: dependencies: @@ -3019,7 +3019,7 @@ importers: version: 1.20.2(@babel/core@7.29.0) '@embroider/vite': specifier: ^1.7.2 - version: 1.7.2(@embroider/core@4.4.7)(vite@8.0.10(@types/node@22.19.15)(esbuild@0.27.7)(terser@5.46.1)) + version: 1.7.2(@embroider/core@4.4.7)(vite@8.0.10(@types/node@25.6.0)(esbuild@0.27.7)(terser@5.46.1)(yaml@2.8.4)) '@glimmer/component': specifier: ^2.0.0 version: 2.1.1 @@ -3043,7 +3043,7 @@ importers: version: 2.1.5(prettier@3.8.3) vite: specifier: ^8.0.3 - version: 8.0.10(@types/node@22.19.15)(esbuild@0.27.7)(terser@5.46.1) + version: 8.0.10(@types/node@25.6.0)(esbuild@0.27.7)(terser@5.46.1)(yaml@2.8.4) smoke-tests/v2-app-template: devDependencies: @@ -3091,7 +3091,7 @@ importers: version: 3.0.6(@babel/core@7.29.0)(@embroider/core@4.4.7) '@embroider/vite': specifier: ^1.7.2 - version: 1.7.2(@embroider/core@4.4.7)(vite@7.3.2(@types/node@22.19.15)(lightningcss@1.32.0)(terser@5.46.1)) + version: 1.7.2(@embroider/core@4.4.7)(vite@7.3.2(@types/node@25.6.0)(lightningcss@1.32.0)(terser@5.46.1)(yaml@2.8.4)) '@eslint/js': specifier: ^9.39.2 version: 9.39.4 @@ -3112,7 +3112,7 @@ importers: version: 2.3.1(@babel/core@7.29.0) ember-cli: specifier: ~6.11.1 - version: 6.11.2(@babel/core@7.29.0)(@types/node@22.19.15)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) + version: 6.11.2(@babel/core@7.29.0)(@types/node@25.6.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) ember-cli-babel: specifier: ^8.3.1 version: 8.3.1(@babel/core@7.29.0) @@ -3177,14 +3177,14 @@ importers: specifier: ^38.0.0 version: 38.0.0(stylelint@16.26.1(typescript@5.9.3)) testem: - specifier: ^3.17.0 - version: 3.19.1(@babel/core@7.29.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) + specifier: ^3.20.0 + version: 3.20.0(@babel/core@7.29.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) tracked-built-ins: specifier: ^4.1.0 version: 4.1.2(@babel/core@7.29.0) vite: specifier: ^7.3.1 - version: 7.3.2(@types/node@22.19.15)(lightningcss@1.32.0)(terser@5.46.1) + version: 7.3.2(@types/node@25.6.0)(lightningcss@1.32.0)(terser@5.46.1)(yaml@2.8.4) packages: @@ -5888,6 +5888,9 @@ packages: '@types/node@22.19.15': resolution: {integrity: sha512-F0R/h2+dsy5wJAUe3tAU6oqa2qbWY5TpNfL/RGmo1y38hiyO1w3x2jPtt76wmuaJI4DQnOBu21cNXQ2STIUUWg==} + '@types/node@25.6.0': + resolution: {integrity: sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==} + '@types/normalize-package-data@2.4.4': resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} @@ -6023,6 +6026,10 @@ packages: resolution: {integrity: sha512-9k/gHF6n/pAi/9tqr3m3aqkuiNosYTurLLUtc7xQ9sxB/wm7WPygCv8GYa6mS0fLJEHhqMC1ATYhz++U/lRHqg==} engines: {node: '>=10.0.0'} + '@xmldom/xmldom@0.9.10': + resolution: {integrity: sha512-A9gOqLdi6cV4ibazAjcQufGj0B1y/vDqYrcuP6d/6x8P27gRS8643Dj9o1dEKtB6O7fwxb2FgBmJS2mX7gpvdw==} + engines: {node: '>=14.6'} + '@xtuc/ieee754@1.2.0': resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==} @@ -6849,6 +6856,10 @@ packages: resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==} engines: {node: '>= 14.16.0'} + chokidar@5.0.0: + resolution: {integrity: sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==} + engines: {node: '>= 20.19.0'} + chownr@2.0.0: resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} engines: {node: '>=10'} @@ -7821,8 +7832,8 @@ packages: resolution: {integrity: sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==} engines: {node: '>=10.0.0'} - engine.io@6.6.6: - resolution: {integrity: sha512-U2SN0w3OpjFRVlrc17E6TMDmH58Xl9rai1MblNjAdwWp07Kk+llmzX0hjDpQdrDGzwmvOtgM5yI+meYX6iZ2xA==} + engine.io@6.6.7: + resolution: {integrity: sha512-DgOngfDKM2EviOH3Mr9m7ks1q8roetLy/IMmYthAYzbpInMbYc/GS+fWFA3rl1gvwKVsQrVV61fo5emD1y3OJQ==} engines: {node: '>=10.2.0'} enhanced-resolve@5.20.1: @@ -8116,6 +8127,10 @@ packages: events-to-array@1.1.2: resolution: {integrity: sha512-inRWzRY7nG+aXZxBzEqYKB3HPgwflZRopAjDCHv0whhRx+MTUr1ei0ICZUypdyE0HRm4L2d5VEcIqLD6yl+BFA==} + events-to-array@2.0.3: + resolution: {integrity: sha512-f/qE2gImHRa4Cp2y1stEOSgw8wTFyUdVJX7G//bMwbaV9JqISFxg99NbmVQeP7YLnDUZ2un851jlaDrlpmGehQ==} + engines: {node: '>=12'} + events@3.3.0: resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==} engines: {node: '>=0.8.x'} @@ -9621,6 +9636,9 @@ packages: lodash@4.17.23: resolution: {integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==} + lodash@4.18.1: + resolution: {integrity: sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==} + log-symbols@1.0.2: resolution: {integrity: sha512-mmPrW0Fh2fxOzdBbFv4g1m6pR72haFLPJ2G5SJEELf1y+iaQrDG6cWCPjy54RHYbZAt7X+ls690Kw62AdWXBzQ==} engines: {node: '>=0.10.0'} @@ -9852,6 +9870,10 @@ packages: resolution: {integrity: sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==} engines: {node: 18 || 20 || >=22} + minimatch@10.2.5: + resolution: {integrity: sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==} + engines: {node: 18 || 20 || >=22} + minimatch@3.1.5: resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==} @@ -10705,6 +10727,10 @@ packages: resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==} engines: {node: '>= 14.18.0'} + readdirp@5.0.0: + resolution: {integrity: sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==} + engines: {node: '>= 20.19.0'} + realpath-missing@1.1.0: resolution: {integrity: sha512-wnWtnywepjg/eHIgWR97R7UuM5i+qHLA195qdN9UPKvcMqfn60+67S8sPPW3vDlSEfYHoFkKU8IvpCNty3zQvQ==} engines: {node: '>=10'} @@ -11475,10 +11501,19 @@ packages: resolution: {integrity: sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==} engines: {node: '>=10.0.0'} + tap-parser@18.3.4: + resolution: {integrity: sha512-CiqzdpWn2CvONcWp7UNMF9/rCPJwCz0es+qykkgJruu1Y/rAS8A5MEQujmjx9NErfst3dGiZJU3lDS2jBsgbPA==} + engines: {node: 20 || >=22} + hasBin: true + tap-parser@7.0.0: resolution: {integrity: sha512-05G8/LrzqOOFvZhhAk32wsGiPZ1lfUrl+iV7+OkKgfofZxiceZWMHkKmow71YsyVQ8IvGBP2EjcIjE5gL4l5lA==} hasBin: true + tap-yaml@4.4.2: + resolution: {integrity: sha512-03mQI7QhfVZHJqGgFyxNTgUbgsG41ZzpWSb7k1Gangmf9hF71Jpb0Fczs7KtOdUDaHx+KxlPUdM2pQJaijebGA==} + engines: {node: 20 || >=22} + tapable@2.3.2: resolution: {integrity: sha512-1MOpMXuhGzGL5TTCZFItxCc0AARf1EZFQkGqMm7ERKj8+Hgr5oLvJOVFcC+lRmR8hCe2S3jC4T5D7Vg/d7/fhA==} engines: {node: '>=6'} @@ -11524,6 +11559,11 @@ packages: engines: {node: '>= 7.*'} hasBin: true + testem@3.20.0: + resolution: {integrity: sha512-SSFfJQK/SGruISFjoKG2jCYwK596wWNPJFj2Wo77GzeIUxZ8ZjuwpyF01uekTLu4ITL6i9R4m1sWaKPK/HsunA==} + engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0} + hasBin: true + textextensions@2.6.0: resolution: {integrity: sha512-49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ==} engines: {node: '>=0.8'} @@ -11797,6 +11837,9 @@ packages: undici-types@6.21.0: resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==} + undici-types@7.19.2: + resolution: {integrity: sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==} + unicode-canonical-property-names-ecmascript@2.0.1: resolution: {integrity: sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==} engines: {node: '>=4'} @@ -11886,6 +11929,7 @@ packages: uuid@8.3.2: resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==} + deprecated: uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028). hasBin: true v8-compile-cache-lib@3.0.1: @@ -12230,6 +12274,17 @@ packages: resolution: {integrity: sha512-Hv9xxHtsJ9228wNhk03xnlDReUuWVvHwM4rIbjdAXYvHLs17xjuyF50N6XXFMN6N0omBaqgOok/MCK3At9fTAg==} engines: {node: ^4.5 || 6.* || >= 7.*} + yaml-types@0.4.0: + resolution: {integrity: sha512-XfbA30NUg4/LWUiplMbiufUiwYhgB9jvBhTWel7XQqjV+GaB79c2tROu/8/Tu7jO0HvDvnKWtBk5ksWRrhQ/0g==} + engines: {node: '>= 16', npm: '>= 7'} + peerDependencies: + yaml: ^2.3.0 + + yaml@2.8.4: + resolution: {integrity: sha512-ml/JPOj9fOQK8RNnWojA67GbZ0ApXAUlN2UQclwv2eVgTgn7O9gg9o7paZWKMp4g0H3nTLtS9LVzhkpOFIKzog==} + engines: {node: '>= 14.6'} + hasBin: true + yargs-parser@20.2.9: resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==} engines: {node: '>=10'} @@ -13790,7 +13845,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@embroider/vite@1.7.2(@embroider/core@4.4.7)(vite@7.3.2(@types/node@22.19.15)(lightningcss@1.32.0)(terser@5.46.1))': + '@embroider/vite@1.7.2(@embroider/core@4.4.7)(vite@7.3.2(@types/node@25.6.0)(lightningcss@1.32.0)(terser@5.46.1)(yaml@2.8.4))': dependencies: '@babel/core': 7.29.0(supports-color@8.1.1) '@embroider/core': 4.4.7 @@ -13808,7 +13863,7 @@ snapshots: send: 0.18.0 source-map-url: 0.4.1 terser: 5.46.1 - vite: 7.3.2(@types/node@22.19.15)(lightningcss@1.32.0)(terser@5.46.1) + vite: 7.3.2(@types/node@25.6.0)(lightningcss@1.32.0)(terser@5.46.1)(yaml@2.8.4) transitivePeerDependencies: - '@glint/template' - bufferutil @@ -13816,7 +13871,7 @@ snapshots: - supports-color - utf-8-validate - '@embroider/vite@1.7.2(@embroider/core@4.4.7)(vite@8.0.10(@types/node@22.19.15)(esbuild@0.27.7)(terser@5.46.1))': + '@embroider/vite@1.7.2(@embroider/core@4.4.7)(vite@8.0.10(@types/node@25.6.0)(esbuild@0.27.7)(terser@5.46.1)(yaml@2.8.4))': dependencies: '@babel/core': 7.29.0(supports-color@8.1.1) '@embroider/core': 4.4.7 @@ -13834,7 +13889,7 @@ snapshots: send: 0.18.0 source-map-url: 0.4.1 terser: 5.46.1 - vite: 8.0.10(@types/node@22.19.15)(esbuild@0.27.7)(terser@5.46.1) + vite: 8.0.10(@types/node@25.6.0)(esbuild@0.27.7)(terser@5.46.1)(yaml@2.8.4) transitivePeerDependencies: - '@glint/template' - bufferutil @@ -14150,122 +14205,122 @@ snapshots: '@inquirer/ansi@2.0.4': {} - '@inquirer/checkbox@5.1.2(@types/node@22.19.15)': + '@inquirer/checkbox@5.1.2(@types/node@25.6.0)': dependencies: '@inquirer/ansi': 2.0.4 - '@inquirer/core': 11.1.7(@types/node@22.19.15) + '@inquirer/core': 11.1.7(@types/node@25.6.0) '@inquirer/figures': 2.0.4 - '@inquirer/type': 4.0.4(@types/node@22.19.15) + '@inquirer/type': 4.0.4(@types/node@25.6.0) optionalDependencies: - '@types/node': 22.19.15 + '@types/node': 25.6.0 - '@inquirer/confirm@6.0.10(@types/node@22.19.15)': + '@inquirer/confirm@6.0.10(@types/node@25.6.0)': dependencies: - '@inquirer/core': 11.1.7(@types/node@22.19.15) - '@inquirer/type': 4.0.4(@types/node@22.19.15) + '@inquirer/core': 11.1.7(@types/node@25.6.0) + '@inquirer/type': 4.0.4(@types/node@25.6.0) optionalDependencies: - '@types/node': 22.19.15 + '@types/node': 25.6.0 - '@inquirer/core@11.1.7(@types/node@22.19.15)': + '@inquirer/core@11.1.7(@types/node@25.6.0)': dependencies: '@inquirer/ansi': 2.0.4 '@inquirer/figures': 2.0.4 - '@inquirer/type': 4.0.4(@types/node@22.19.15) + '@inquirer/type': 4.0.4(@types/node@25.6.0) cli-width: 4.1.0 fast-wrap-ansi: 0.2.0 mute-stream: 3.0.0 signal-exit: 4.1.0 optionalDependencies: - '@types/node': 22.19.15 + '@types/node': 25.6.0 - '@inquirer/editor@5.0.10(@types/node@22.19.15)': + '@inquirer/editor@5.0.10(@types/node@25.6.0)': dependencies: - '@inquirer/core': 11.1.7(@types/node@22.19.15) - '@inquirer/external-editor': 2.0.4(@types/node@22.19.15) - '@inquirer/type': 4.0.4(@types/node@22.19.15) + '@inquirer/core': 11.1.7(@types/node@25.6.0) + '@inquirer/external-editor': 2.0.4(@types/node@25.6.0) + '@inquirer/type': 4.0.4(@types/node@25.6.0) optionalDependencies: - '@types/node': 22.19.15 + '@types/node': 25.6.0 - '@inquirer/expand@5.0.10(@types/node@22.19.15)': + '@inquirer/expand@5.0.10(@types/node@25.6.0)': dependencies: - '@inquirer/core': 11.1.7(@types/node@22.19.15) - '@inquirer/type': 4.0.4(@types/node@22.19.15) + '@inquirer/core': 11.1.7(@types/node@25.6.0) + '@inquirer/type': 4.0.4(@types/node@25.6.0) optionalDependencies: - '@types/node': 22.19.15 + '@types/node': 25.6.0 - '@inquirer/external-editor@2.0.4(@types/node@22.19.15)': + '@inquirer/external-editor@2.0.4(@types/node@25.6.0)': dependencies: chardet: 2.1.1 iconv-lite: 0.7.2 optionalDependencies: - '@types/node': 22.19.15 + '@types/node': 25.6.0 '@inquirer/figures@2.0.4': {} - '@inquirer/input@5.0.10(@types/node@22.19.15)': + '@inquirer/input@5.0.10(@types/node@25.6.0)': dependencies: - '@inquirer/core': 11.1.7(@types/node@22.19.15) - '@inquirer/type': 4.0.4(@types/node@22.19.15) + '@inquirer/core': 11.1.7(@types/node@25.6.0) + '@inquirer/type': 4.0.4(@types/node@25.6.0) optionalDependencies: - '@types/node': 22.19.15 + '@types/node': 25.6.0 - '@inquirer/number@4.0.10(@types/node@22.19.15)': + '@inquirer/number@4.0.10(@types/node@25.6.0)': dependencies: - '@inquirer/core': 11.1.7(@types/node@22.19.15) - '@inquirer/type': 4.0.4(@types/node@22.19.15) + '@inquirer/core': 11.1.7(@types/node@25.6.0) + '@inquirer/type': 4.0.4(@types/node@25.6.0) optionalDependencies: - '@types/node': 22.19.15 + '@types/node': 25.6.0 - '@inquirer/password@5.0.10(@types/node@22.19.15)': + '@inquirer/password@5.0.10(@types/node@25.6.0)': dependencies: '@inquirer/ansi': 2.0.4 - '@inquirer/core': 11.1.7(@types/node@22.19.15) - '@inquirer/type': 4.0.4(@types/node@22.19.15) + '@inquirer/core': 11.1.7(@types/node@25.6.0) + '@inquirer/type': 4.0.4(@types/node@25.6.0) optionalDependencies: - '@types/node': 22.19.15 - - '@inquirer/prompts@8.3.2(@types/node@22.19.15)': - dependencies: - '@inquirer/checkbox': 5.1.2(@types/node@22.19.15) - '@inquirer/confirm': 6.0.10(@types/node@22.19.15) - '@inquirer/editor': 5.0.10(@types/node@22.19.15) - '@inquirer/expand': 5.0.10(@types/node@22.19.15) - '@inquirer/input': 5.0.10(@types/node@22.19.15) - '@inquirer/number': 4.0.10(@types/node@22.19.15) - '@inquirer/password': 5.0.10(@types/node@22.19.15) - '@inquirer/rawlist': 5.2.6(@types/node@22.19.15) - '@inquirer/search': 4.1.6(@types/node@22.19.15) - '@inquirer/select': 5.1.2(@types/node@22.19.15) + '@types/node': 25.6.0 + + '@inquirer/prompts@8.3.2(@types/node@25.6.0)': + dependencies: + '@inquirer/checkbox': 5.1.2(@types/node@25.6.0) + '@inquirer/confirm': 6.0.10(@types/node@25.6.0) + '@inquirer/editor': 5.0.10(@types/node@25.6.0) + '@inquirer/expand': 5.0.10(@types/node@25.6.0) + '@inquirer/input': 5.0.10(@types/node@25.6.0) + '@inquirer/number': 4.0.10(@types/node@25.6.0) + '@inquirer/password': 5.0.10(@types/node@25.6.0) + '@inquirer/rawlist': 5.2.6(@types/node@25.6.0) + '@inquirer/search': 4.1.6(@types/node@25.6.0) + '@inquirer/select': 5.1.2(@types/node@25.6.0) optionalDependencies: - '@types/node': 22.19.15 + '@types/node': 25.6.0 - '@inquirer/rawlist@5.2.6(@types/node@22.19.15)': + '@inquirer/rawlist@5.2.6(@types/node@25.6.0)': dependencies: - '@inquirer/core': 11.1.7(@types/node@22.19.15) - '@inquirer/type': 4.0.4(@types/node@22.19.15) + '@inquirer/core': 11.1.7(@types/node@25.6.0) + '@inquirer/type': 4.0.4(@types/node@25.6.0) optionalDependencies: - '@types/node': 22.19.15 + '@types/node': 25.6.0 - '@inquirer/search@4.1.6(@types/node@22.19.15)': + '@inquirer/search@4.1.6(@types/node@25.6.0)': dependencies: - '@inquirer/core': 11.1.7(@types/node@22.19.15) + '@inquirer/core': 11.1.7(@types/node@25.6.0) '@inquirer/figures': 2.0.4 - '@inquirer/type': 4.0.4(@types/node@22.19.15) + '@inquirer/type': 4.0.4(@types/node@25.6.0) optionalDependencies: - '@types/node': 22.19.15 + '@types/node': 25.6.0 - '@inquirer/select@5.1.2(@types/node@22.19.15)': + '@inquirer/select@5.1.2(@types/node@25.6.0)': dependencies: '@inquirer/ansi': 2.0.4 - '@inquirer/core': 11.1.7(@types/node@22.19.15) + '@inquirer/core': 11.1.7(@types/node@25.6.0) '@inquirer/figures': 2.0.4 - '@inquirer/type': 4.0.4(@types/node@22.19.15) + '@inquirer/type': 4.0.4(@types/node@25.6.0) optionalDependencies: - '@types/node': 22.19.15 + '@types/node': 25.6.0 - '@inquirer/type@4.0.4(@types/node@22.19.15)': + '@inquirer/type@4.0.4(@types/node@25.6.0)': optionalDependencies: - '@types/node': 22.19.15 + '@types/node': 25.6.0 '@isaacs/cliui@8.0.2': dependencies: @@ -14386,7 +14441,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@oclif/core@2.16.0(@swc/core@1.15.21)(@types/node@22.19.15)(typescript@5.9.3)': + '@oclif/core@2.16.0(@swc/core@1.15.21)(@types/node@25.6.0)(typescript@5.9.3)': dependencies: '@types/cli-progress': 3.11.6 ansi-escapes: 4.3.2 @@ -14411,7 +14466,7 @@ snapshots: strip-ansi: 6.0.1 supports-color: 8.1.1 supports-hyperlinks: 2.3.0 - ts-node: 10.9.2(@swc/core@1.15.21)(@types/node@22.19.15)(typescript@5.9.3) + ts-node: 10.9.2(@swc/core@1.15.21)(@types/node@25.6.0)(typescript@5.9.3) tslib: 2.8.1 widest-line: 3.1.0 wordwrap: 1.0.0 @@ -14436,7 +14491,7 @@ snapshots: '@oclif/errors': 1.3.6 chalk: 4.1.2 indent-string: 4.0.0 - lodash: 4.17.23 + lodash: 4.18.1 string-width: 4.2.3 strip-ansi: 6.0.1 widest-line: 3.1.0 @@ -14453,18 +14508,18 @@ snapshots: chalk: 4.1.2 tslib: 2.8.1 - '@oclif/plugin-help@5.2.20(@swc/core@1.15.21)(@types/node@22.19.15)(typescript@5.9.3)': + '@oclif/plugin-help@5.2.20(@swc/core@1.15.21)(@types/node@25.6.0)(typescript@5.9.3)': dependencies: - '@oclif/core': 2.16.0(@swc/core@1.15.21)(@types/node@22.19.15)(typescript@5.9.3) + '@oclif/core': 2.16.0(@swc/core@1.15.21)(@types/node@25.6.0)(typescript@5.9.3) transitivePeerDependencies: - '@swc/core' - '@swc/wasm' - '@types/node' - typescript - '@oclif/plugin-warn-if-update-available@2.1.1(@swc/core@1.15.21)(@types/node@22.19.15)(typescript@5.9.3)': + '@oclif/plugin-warn-if-update-available@2.1.1(@swc/core@1.15.21)(@types/node@25.6.0)(typescript@5.9.3)': dependencies: - '@oclif/core': 2.16.0(@swc/core@1.15.21)(@types/node@22.19.15)(typescript@5.9.3) + '@oclif/core': 2.16.0(@swc/core@1.15.21)(@types/node@25.6.0)(typescript@5.9.3) chalk: 4.1.2 debug: 4.4.3(supports-color@8.1.1) http-call: 5.3.0 @@ -15741,7 +15796,7 @@ snapshots: '@types/cors@2.8.19': dependencies: - '@types/node': 22.19.15 + '@types/node': 25.6.0 '@types/d3-hierarchy@3.1.7': {} @@ -15792,6 +15847,10 @@ snapshots: dependencies: undici-types: 6.21.0 + '@types/node@25.6.0': + dependencies: + undici-types: 7.19.2 + '@types/normalize-package-data@2.4.4': {} '@types/qunit@2.19.13': {} @@ -15817,7 +15876,7 @@ snapshots: '@types/ws@8.18.1': dependencies: - '@types/node': 22.19.15 + '@types/node': 25.6.0 '@typescript-eslint/eslint-plugin@8.57.2(@typescript-eslint/parser@8.57.2(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4)(typescript@5.9.3)': dependencies: @@ -15988,6 +16047,8 @@ snapshots: '@xmldom/xmldom@0.8.12': {} + '@xmldom/xmldom@0.9.10': {} + '@xtuc/ieee754@1.2.0': {} '@xtuc/long@4.2.2': {} @@ -16314,7 +16375,7 @@ snapshots: async@2.6.4: dependencies: - lodash: 4.17.23 + lodash: 4.18.1 async@3.2.6: {} @@ -17181,6 +17242,10 @@ snapshots: dependencies: readdirp: 4.1.2 + chokidar@5.0.0: + dependencies: + readdirp: 5.0.0 + chownr@2.0.0: {} chrome-debugging-client@2.1.0(devtools-protocol@0.0.975963): @@ -17432,6 +17497,15 @@ snapshots: mustache: 4.2.0 underscore: 1.13.8 + consolidate@1.0.4(@babel/core@7.29.0)(ejs@3.1.10)(handlebars@4.7.9)(lodash@4.18.1)(mustache@4.2.0)(underscore@1.13.8): + optionalDependencies: + '@babel/core': 7.29.0(supports-color@8.1.1) + ejs: 3.1.10 + handlebars: 4.7.9 + lodash: 4.18.1 + mustache: 4.2.0 + underscore: 1.13.8 + content-disposition@0.5.4: dependencies: safe-buffer: 5.2.1 @@ -17911,10 +17985,10 @@ snapshots: transitivePeerDependencies: - supports-color - ember-cli-dependency-checker@3.3.3(ember-cli@6.11.2(@babel/core@7.29.0)(@types/node@22.19.15)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8)): + ember-cli-dependency-checker@3.3.3(ember-cli@6.11.2(@babel/core@7.29.0)(@types/node@25.6.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8)): dependencies: chalk: 2.4.2 - ember-cli: 6.11.2(@babel/core@7.29.0)(@types/node@22.19.15)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) + ember-cli: 6.11.2(@babel/core@7.29.0)(@types/node@25.6.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) find-yarn-workspace-root: 2.0.0 is-git-url: 1.0.0 resolve: 1.22.11 @@ -18057,7 +18131,7 @@ snapshots: transitivePeerDependencies: - supports-color - ember-cli@6.11.2(@babel/core@7.29.0)(@types/node@22.19.15)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8): + ember-cli@6.11.2(@babel/core@7.29.0)(@types/node@25.6.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8): dependencies: '@ember-tooling/blueprint-blueprint': 0.2.1 '@ember-tooling/blueprint-model': 0.5.0 @@ -18112,7 +18186,7 @@ snapshots: heimdalljs-logger: 0.1.10 http-proxy: 1.18.1 inflection: 3.0.2 - inquirer: 13.3.2(@types/node@22.19.15) + inquirer: 13.3.2(@types/node@25.6.0) is-git-url: 1.0.0 is-language-code: 5.1.3 lodash: 4.17.23 @@ -18347,10 +18421,10 @@ snapshots: engine.io-parser@5.2.3: {} - engine.io@6.6.6: + engine.io@6.6.7: dependencies: '@types/cors': 2.8.19 - '@types/node': 22.19.15 + '@types/node': 25.6.0 '@types/ws': 8.18.1 accepts: 1.3.8 base64id: 2.0.0 @@ -18745,6 +18819,8 @@ snapshots: events-to-array@1.1.2: {} + events-to-array@2.0.3: {} + events@3.3.0: {} exec-sh@0.3.6: {} @@ -19257,7 +19333,7 @@ snapshots: dependencies: glob: 7.2.3 iconv-lite: 0.4.24 - lodash: 4.17.23 + lodash: 4.18.1 mkdirp: 0.5.6 rimraf: 2.7.1 @@ -19820,17 +19896,17 @@ snapshots: ini@3.0.1: {} - inquirer@13.3.2(@types/node@22.19.15): + inquirer@13.3.2(@types/node@25.6.0): dependencies: '@inquirer/ansi': 2.0.4 - '@inquirer/core': 11.1.7(@types/node@22.19.15) - '@inquirer/prompts': 8.3.2(@types/node@22.19.15) - '@inquirer/type': 4.0.4(@types/node@22.19.15) + '@inquirer/core': 11.1.7(@types/node@25.6.0) + '@inquirer/prompts': 8.3.2(@types/node@25.6.0) + '@inquirer/type': 4.0.4(@types/node@25.6.0) mute-stream: 3.0.0 run-async: 4.0.6 rxjs: 7.8.2 optionalDependencies: - '@types/node': 22.19.15 + '@types/node': 25.6.0 inquirer@6.5.2: dependencies: @@ -20513,6 +20589,8 @@ snapshots: lodash@4.17.23: {} + lodash@4.18.1: {} + log-symbols@1.0.2: dependencies: chalk: 1.1.3 @@ -20734,6 +20812,10 @@ snapshots: dependencies: brace-expansion: 5.0.5 + minimatch@10.2.5: + dependencies: + brace-expansion: 5.0.5 + minimatch@3.1.5: dependencies: brace-expansion: 1.1.13 @@ -21585,6 +21667,8 @@ snapshots: readdirp@4.1.2: {} + readdirp@5.0.0: {} + realpath-missing@1.1.0: {} recast@0.18.10: @@ -22214,7 +22298,7 @@ snapshots: base64id: 2.0.0 cors: 2.8.6 debug: 4.4.3(supports-color@8.1.1) - engine.io: 6.6.6 + engine.io: 6.6.7 socket.io-adapter: 2.5.6 socket.io-parser: 4.2.6 transitivePeerDependencies: @@ -22599,12 +22683,22 @@ snapshots: string-width: 4.2.3 strip-ansi: 6.0.1 + tap-parser@18.3.4: + dependencies: + events-to-array: 2.0.3 + tap-yaml: 4.4.2 + tap-parser@7.0.0: dependencies: events-to-array: 1.1.2 js-yaml: 3.14.2 minipass: 2.9.0 + tap-yaml@4.4.2: + dependencies: + yaml: 2.8.4 + yaml-types: 0.4.0(yaml@2.8.4) + tapable@2.3.2: {} tar-stream@2.2.0: @@ -22654,7 +22748,7 @@ snapshots: testem-failure-only-reporter@1.0.0(@babel/core@7.29.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8): dependencies: - testem: 3.19.1(@babel/core@7.29.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) + testem: 3.20.0(@babel/core@7.29.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) transitivePeerDependencies: - '@babel/core' - arc-templates @@ -22785,6 +22879,84 @@ snapshots: - walrus - whiskers + testem@3.20.0(@babel/core@7.29.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8): + dependencies: + '@xmldom/xmldom': 0.9.10 + backbone: 1.6.1 + charm: 1.0.2 + chokidar: 5.0.0 + commander: 14.0.3 + compression: 1.8.1 + consolidate: 1.0.4(@babel/core@7.29.0)(ejs@3.1.10)(handlebars@4.7.9)(lodash@4.18.1)(mustache@4.2.0)(underscore@1.13.8) + execa: 9.6.1 + express: 5.2.1 + glob: 13.0.6 + http-proxy: 1.18.1 + js-yaml: 4.1.1 + lodash: 4.18.1 + minimatch: 10.2.5 + mkdirp: 3.0.1 + mustache: 4.2.0 + node-notifier: 10.0.1 + printf: 0.6.1 + proc-log: 6.1.0 + rimraf: 6.1.3 + socket.io: 4.8.3 + spawn-args: 0.2.0 + styled_string: 0.0.1 + tap-parser: 18.3.4 + transitivePeerDependencies: + - '@babel/core' + - arc-templates + - atpl + - bracket-template + - bufferutil + - coffee-script + - debug + - dot + - dust + - dustjs-helpers + - dustjs-linkedin + - eco + - ect + - ejs + - haml-coffee + - hamlet + - hamljs + - handlebars + - hogan.js + - htmling + - jazz + - jqtpl + - just + - liquid-node + - liquor + - mote + - nunjucks + - plates + - pug + - qejs + - ractive + - react + - react-dom + - slm + - supports-color + - swig + - swig-templates + - teacup + - templayed + - then-pug + - tinyliquid + - toffee + - twig + - twing + - underscore + - utf-8-validate + - vash + - velocityjs + - walrus + - whiskers + textextensions@2.6.0: {} theredoc@1.0.0: {} @@ -22898,14 +23070,14 @@ snapshots: dependencies: punycode: 2.3.1 - tracerbench@8.0.1(@swc/core@1.15.21)(@types/node@22.19.15)(typescript@5.9.3): + tracerbench@8.0.1(@swc/core@1.15.21)(@types/node@25.6.0)(typescript@5.9.3): dependencies: '@oclif/command': 1.8.36 '@oclif/config': 1.18.17 '@oclif/errors': 1.3.6 '@oclif/parser': 3.8.17 - '@oclif/plugin-help': 5.2.20(@swc/core@1.15.21)(@types/node@22.19.15)(typescript@5.9.3) - '@oclif/plugin-warn-if-update-available': 2.1.1(@swc/core@1.15.21)(@types/node@22.19.15)(typescript@5.9.3) + '@oclif/plugin-help': 5.2.20(@swc/core@1.15.21)(@types/node@25.6.0)(typescript@5.9.3) + '@oclif/plugin-warn-if-update-available': 2.1.1(@swc/core@1.15.21)(@types/node@25.6.0)(typescript@5.9.3) '@tracerbench/core': 8.0.1(patch_hash=5e48bdb11a088927d3415cc5430bb6c37d5ce66ed2dab1327914b55e4fd5cd13) '@tracerbench/stats': 8.0.1 '@tracerbench/trace-event': 8.0.0 @@ -22978,14 +23150,14 @@ snapshots: picomatch: 4.0.4 typescript: 5.9.3 - ts-node@10.9.2(@swc/core@1.15.21)(@types/node@22.19.15)(typescript@5.9.3): + ts-node@10.9.2(@swc/core@1.15.21)(@types/node@25.6.0)(typescript@5.9.3): dependencies: '@cspotcode/source-map-support': 0.8.1 '@tsconfig/node10': 1.0.12 '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 22.19.15 + '@types/node': 25.6.0 acorn: 8.16.0 acorn-walk: 8.3.5 arg: 4.1.3 @@ -23124,6 +23296,8 @@ snapshots: undici-types@6.21.0: {} + undici-types@7.19.2: {} + unicode-canonical-property-names-ecmascript@2.0.1: {} unicode-match-property-ecmascript@2.0.0: @@ -23218,7 +23392,7 @@ snapshots: vary@1.1.2: {} - vite@7.3.2(@types/node@22.19.15)(lightningcss@1.32.0)(terser@5.46.1): + vite@7.3.2(@types/node@25.6.0)(lightningcss@1.32.0)(terser@5.46.1)(yaml@2.8.4): dependencies: esbuild: 0.27.7 fdir: 6.5.0(picomatch@4.0.4) @@ -23227,12 +23401,13 @@ snapshots: rollup: 4.60.1 tinyglobby: 0.2.15 optionalDependencies: - '@types/node': 22.19.15 + '@types/node': 25.6.0 fsevents: 2.3.3 lightningcss: 1.32.0 terser: 5.46.1 + yaml: 2.8.4 - vite@8.0.10(@types/node@22.19.15)(esbuild@0.27.7)(terser@5.46.1): + vite@8.0.10(@types/node@25.6.0)(esbuild@0.27.7)(terser@5.46.1)(yaml@2.8.4): dependencies: lightningcss: 1.32.0 picomatch: 4.0.4 @@ -23240,10 +23415,11 @@ snapshots: rolldown: 1.0.0-rc.17 tinyglobby: 0.2.16 optionalDependencies: - '@types/node': 22.19.15 + '@types/node': 25.6.0 esbuild: 0.27.7 fsevents: 2.3.3 terser: 5.46.1 + yaml: 2.8.4 vow-fs@0.3.6: dependencies: @@ -23545,6 +23721,12 @@ snapshots: fs-extra: 4.0.3 lodash.merge: 4.6.2 + yaml-types@0.4.0(yaml@2.8.4): + dependencies: + yaml: 2.8.4 + + yaml@2.8.4: {} + yargs-parser@20.2.9: {} yargs-parser@21.1.1: {} diff --git a/smoke-tests/v2-app-template/package.json b/smoke-tests/v2-app-template/package.json index 9daf52f6e3d..54de1c2a29d 100644 --- a/smoke-tests/v2-app-template/package.json +++ b/smoke-tests/v2-app-template/package.json @@ -73,7 +73,7 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^38.0.0", - "testem": "^3.17.0", + "testem": "^3.20.0", "tracked-built-ins": "^4.1.0", "vite": "^7.3.1" }, From 846161cd9eeb804385d04fa23aa99eca06ac3e50 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Tue, 5 May 2026 12:26:41 -0400 Subject: [PATCH 5/8] Rename more things to cjs --- ...publishing.js => build-for-publishing.cjs} | 0 bin/{changelog.js => changelog.cjs} | 2 - ...lter.js => feature-flag-yuidoc-filter.cjs} | 0 ...lpha-version.js => next-alpha-version.cjs} | 0 bin/publish-to-s3.mjs | 4 +- ...ck-tests.js => run-browserstack-tests.cjs} | 2 +- .../{-addon-import.js => -addon-import.cjs} | 0 blueprints/{-utils.js => -utils.cjs} | 0 .../acceptance-test/{index.js => index.cjs} | 0 .../component-addon/{index.js => index.cjs} | 0 .../{index.js => index.cjs} | 0 .../component-class/{index.js => index.cjs} | 0 .../component-test/{index.js => index.cjs} | 0 blueprints/component/{index.js => index.cjs} | 0 .../controller-test/{index.js => index.cjs} | 0 blueprints/controller/{index.js => index.cjs} | 0 .../helper-addon/{index.js => index.cjs} | 0 .../helper-test/{index.js => index.cjs} | 0 blueprints/helper/{index.js => index.cjs} | 0 .../initializer-addon/{index.js => index.cjs} | 0 .../initializer-test/{index.js => index.cjs} | 0 .../initializer/{index.js => index.cjs} | 0 .../{index.js => index.cjs} | 0 .../{index.js => index.cjs} | 0 .../{index.js => index.cjs} | 0 blueprints/mixin-test/{index.js => index.cjs} | 0 blueprints/mixin/{index.js => index.cjs} | 0 .../route-addon/{index.js => index.cjs} | 0 blueprints/route-test/{index.js => index.cjs} | 0 blueprints/route/{index.js => index.cjs} | 0 .../service-test/{index.js => index.cjs} | 0 blueprints/service/{index.js => index.cjs} | 0 blueprints/template/{index.js => index.cjs} | 0 blueprints/util-test/{index.js => index.cjs} | 0 blueprints/util/{index.js => index.cjs} | 0 eslint.config.mjs | 46 ++++++++----------- lib/{overrides.js => overrides.cjs} | 0 package.json | 6 ++- smoke-tests/app-template/eslint.config.mjs | 4 +- .../{coverage-test.js => coverage-test.cjs} | 2 +- tests/docs/{expected.js => expected.cjs} | 0 ...build-info-test.js => build-info-test.cjs} | 0 yuidoc.json | 2 +- 43 files changed, 31 insertions(+), 37 deletions(-) rename bin/{build-for-publishing.js => build-for-publishing.cjs} (100%) rename bin/{changelog.js => changelog.cjs} (99%) rename bin/{feature-flag-yuidoc-filter.js => feature-flag-yuidoc-filter.cjs} (100%) rename bin/{next-alpha-version.js => next-alpha-version.cjs} (100%) rename bin/{run-browserstack-tests.js => run-browserstack-tests.cjs} (96%) rename blueprints/{-addon-import.js => -addon-import.cjs} (100%) rename blueprints/{-utils.js => -utils.cjs} (100%) rename blueprints/acceptance-test/{index.js => index.cjs} (100%) rename blueprints/component-addon/{index.js => index.cjs} (100%) rename blueprints/component-class-addon/{index.js => index.cjs} (100%) rename blueprints/component-class/{index.js => index.cjs} (100%) rename blueprints/component-test/{index.js => index.cjs} (100%) rename blueprints/component/{index.js => index.cjs} (100%) rename blueprints/controller-test/{index.js => index.cjs} (100%) rename blueprints/controller/{index.js => index.cjs} (100%) rename blueprints/helper-addon/{index.js => index.cjs} (100%) rename blueprints/helper-test/{index.js => index.cjs} (100%) rename blueprints/helper/{index.js => index.cjs} (100%) rename blueprints/initializer-addon/{index.js => index.cjs} (100%) rename blueprints/initializer-test/{index.js => index.cjs} (100%) rename blueprints/initializer/{index.js => index.cjs} (100%) rename blueprints/instance-initializer-addon/{index.js => index.cjs} (100%) rename blueprints/instance-initializer-test/{index.js => index.cjs} (100%) rename blueprints/instance-initializer/{index.js => index.cjs} (100%) rename blueprints/mixin-test/{index.js => index.cjs} (100%) rename blueprints/mixin/{index.js => index.cjs} (100%) rename blueprints/route-addon/{index.js => index.cjs} (100%) rename blueprints/route-test/{index.js => index.cjs} (100%) rename blueprints/route/{index.js => index.cjs} (100%) rename blueprints/service-test/{index.js => index.cjs} (100%) rename blueprints/service/{index.js => index.cjs} (100%) rename blueprints/template/{index.js => index.cjs} (100%) rename blueprints/util-test/{index.js => index.cjs} (100%) rename blueprints/util/{index.js => index.cjs} (100%) rename lib/{overrides.js => overrides.cjs} (100%) rename tests/docs/{coverage-test.js => coverage-test.cjs} (99%) rename tests/docs/{expected.js => expected.cjs} (100%) rename tests/node/{build-info-test.js => build-info-test.cjs} (100%) diff --git a/bin/build-for-publishing.js b/bin/build-for-publishing.cjs similarity index 100% rename from bin/build-for-publishing.js rename to bin/build-for-publishing.cjs diff --git a/bin/changelog.js b/bin/changelog.cjs similarity index 99% rename from bin/changelog.js rename to bin/changelog.cjs index a9b6a903bb3..b20e6828a33 100755 --- a/bin/changelog.js +++ b/bin/changelog.cjs @@ -1,5 +1,3 @@ -#!/usr/bin/env node - /* eslint-disable no-console */ 'use strict'; diff --git a/bin/feature-flag-yuidoc-filter.js b/bin/feature-flag-yuidoc-filter.cjs similarity index 100% rename from bin/feature-flag-yuidoc-filter.js rename to bin/feature-flag-yuidoc-filter.cjs diff --git a/bin/next-alpha-version.js b/bin/next-alpha-version.cjs similarity index 100% rename from bin/next-alpha-version.js rename to bin/next-alpha-version.cjs diff --git a/bin/publish-to-s3.mjs b/bin/publish-to-s3.mjs index 20e3aaf2e88..37537be047a 100755 --- a/bin/publish-to-s3.mjs +++ b/bin/publish-to-s3.mjs @@ -1,8 +1,8 @@ import { join } from 'node:path'; import { existsSync, realpathSync, readFileSync } from 'node:fs'; import { S3Client, PutObjectCommand } from '@aws-sdk/client-s3'; -import { buildInfo as buildBuildInfo } from '../broccoli/build-info.js'; -import projectFileMap from '../config/s3ProjectConfig.js'; +import { buildInfo as buildBuildInfo } from '../broccoli/build-info.cjs'; +import projectFileMap from '../config/s3ProjectConfig.cjs'; const buildInfo = buildBuildInfo(); diff --git a/bin/run-browserstack-tests.js b/bin/run-browserstack-tests.cjs similarity index 96% rename from bin/run-browserstack-tests.js rename to bin/run-browserstack-tests.cjs index eee86111b29..57b523259bf 100755 --- a/bin/run-browserstack-tests.js +++ b/bin/run-browserstack-tests.cjs @@ -20,7 +20,7 @@ async function run(command, args = []) { await run('testem', [ 'ci', '-f', - 'testem.browserstack.js', + 'testem.browserstack.cjs', '--host', '127.0.0.1', '--port', diff --git a/blueprints/-addon-import.js b/blueprints/-addon-import.cjs similarity index 100% rename from blueprints/-addon-import.js rename to blueprints/-addon-import.cjs diff --git a/blueprints/-utils.js b/blueprints/-utils.cjs similarity index 100% rename from blueprints/-utils.js rename to blueprints/-utils.cjs diff --git a/blueprints/acceptance-test/index.js b/blueprints/acceptance-test/index.cjs similarity index 100% rename from blueprints/acceptance-test/index.js rename to blueprints/acceptance-test/index.cjs diff --git a/blueprints/component-addon/index.js b/blueprints/component-addon/index.cjs similarity index 100% rename from blueprints/component-addon/index.js rename to blueprints/component-addon/index.cjs diff --git a/blueprints/component-class-addon/index.js b/blueprints/component-class-addon/index.cjs similarity index 100% rename from blueprints/component-class-addon/index.js rename to blueprints/component-class-addon/index.cjs diff --git a/blueprints/component-class/index.js b/blueprints/component-class/index.cjs similarity index 100% rename from blueprints/component-class/index.js rename to blueprints/component-class/index.cjs diff --git a/blueprints/component-test/index.js b/blueprints/component-test/index.cjs similarity index 100% rename from blueprints/component-test/index.js rename to blueprints/component-test/index.cjs diff --git a/blueprints/component/index.js b/blueprints/component/index.cjs similarity index 100% rename from blueprints/component/index.js rename to blueprints/component/index.cjs diff --git a/blueprints/controller-test/index.js b/blueprints/controller-test/index.cjs similarity index 100% rename from blueprints/controller-test/index.js rename to blueprints/controller-test/index.cjs diff --git a/blueprints/controller/index.js b/blueprints/controller/index.cjs similarity index 100% rename from blueprints/controller/index.js rename to blueprints/controller/index.cjs diff --git a/blueprints/helper-addon/index.js b/blueprints/helper-addon/index.cjs similarity index 100% rename from blueprints/helper-addon/index.js rename to blueprints/helper-addon/index.cjs diff --git a/blueprints/helper-test/index.js b/blueprints/helper-test/index.cjs similarity index 100% rename from blueprints/helper-test/index.js rename to blueprints/helper-test/index.cjs diff --git a/blueprints/helper/index.js b/blueprints/helper/index.cjs similarity index 100% rename from blueprints/helper/index.js rename to blueprints/helper/index.cjs diff --git a/blueprints/initializer-addon/index.js b/blueprints/initializer-addon/index.cjs similarity index 100% rename from blueprints/initializer-addon/index.js rename to blueprints/initializer-addon/index.cjs diff --git a/blueprints/initializer-test/index.js b/blueprints/initializer-test/index.cjs similarity index 100% rename from blueprints/initializer-test/index.js rename to blueprints/initializer-test/index.cjs diff --git a/blueprints/initializer/index.js b/blueprints/initializer/index.cjs similarity index 100% rename from blueprints/initializer/index.js rename to blueprints/initializer/index.cjs diff --git a/blueprints/instance-initializer-addon/index.js b/blueprints/instance-initializer-addon/index.cjs similarity index 100% rename from blueprints/instance-initializer-addon/index.js rename to blueprints/instance-initializer-addon/index.cjs diff --git a/blueprints/instance-initializer-test/index.js b/blueprints/instance-initializer-test/index.cjs similarity index 100% rename from blueprints/instance-initializer-test/index.js rename to blueprints/instance-initializer-test/index.cjs diff --git a/blueprints/instance-initializer/index.js b/blueprints/instance-initializer/index.cjs similarity index 100% rename from blueprints/instance-initializer/index.js rename to blueprints/instance-initializer/index.cjs diff --git a/blueprints/mixin-test/index.js b/blueprints/mixin-test/index.cjs similarity index 100% rename from blueprints/mixin-test/index.js rename to blueprints/mixin-test/index.cjs diff --git a/blueprints/mixin/index.js b/blueprints/mixin/index.cjs similarity index 100% rename from blueprints/mixin/index.js rename to blueprints/mixin/index.cjs diff --git a/blueprints/route-addon/index.js b/blueprints/route-addon/index.cjs similarity index 100% rename from blueprints/route-addon/index.js rename to blueprints/route-addon/index.cjs diff --git a/blueprints/route-test/index.js b/blueprints/route-test/index.cjs similarity index 100% rename from blueprints/route-test/index.js rename to blueprints/route-test/index.cjs diff --git a/blueprints/route/index.js b/blueprints/route/index.cjs similarity index 100% rename from blueprints/route/index.js rename to blueprints/route/index.cjs diff --git a/blueprints/service-test/index.js b/blueprints/service-test/index.cjs similarity index 100% rename from blueprints/service-test/index.js rename to blueprints/service-test/index.cjs diff --git a/blueprints/service/index.js b/blueprints/service/index.cjs similarity index 100% rename from blueprints/service/index.js rename to blueprints/service/index.cjs diff --git a/blueprints/template/index.js b/blueprints/template/index.cjs similarity index 100% rename from blueprints/template/index.js rename to blueprints/template/index.cjs diff --git a/blueprints/util-test/index.js b/blueprints/util-test/index.cjs similarity index 100% rename from blueprints/util-test/index.js rename to blueprints/util-test/index.cjs diff --git a/blueprints/util/index.js b/blueprints/util/index.cjs similarity index 100% rename from blueprints/util/index.js rename to blueprints/util/index.cjs diff --git a/eslint.config.mjs b/eslint.config.mjs index 7407d64b580..a9a2b12a56a 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -74,7 +74,7 @@ export default [ 'qunit/no-commented-tests': 'off', 'qunit/require-expect': 'off', - 'disable-features/disable-async-await': 'error', + 'disable-features/disable-async-await': 'off', 'disable-features/disable-generator-functions': 'error', // Doesn't work with package.json#exports 'import/no-unresolved': 'off', @@ -232,23 +232,28 @@ export default [ '**/babel.config.mjs', '**/babel.test.config.mjs', 'node-tests/**/*.js', - 'tests/node/**/*.js', + 'tests/node/**/*.*', 'smoke-tests/node-template/**/*.js', 'blueprints/**/*.js', - 'bin/**/*.js', - 'bin/**/*.mjs', - 'tests/docs/*.js', - 'config/**/*.js', - 'lib/**/*.js', - 'server/**/*.js', - '**/testem.js', - '**/testem.ci-browsers.js', - '**/testem.browserstack.js', - 'broccoli/**/*.js', - '**/ember-cli-build.js', + 'bin/**/*', + 'tests/docs/*', + 'config/**/*', + 'lib/**/*', + 'server/**/*', + '**/testem.*', + '**/testem.ci-browsers.*', + '**/testem.browserstack.*', + 'broccoli/**/*.*', + '**/ember-cli-build.*', '**/*.cjs', ], }, + { + files: ['lib/index.cjs'], + rules: { + 'n/no-missing-require': 'off', + }, + }, { files: ['bin/changelog.js'], rules: { @@ -261,19 +266,8 @@ export default [ '**/babel.config.mjs', '**/babel.test.config.mjs', 'node-tests/**/*.js', - 'tests/node/**/*.js', + 'tests/node/**/*', 'smoke-tests/node-template/**/*.js', - 'blueprints/**/*.js', - 'bin/**/*.js', - 'bin/**/*.mjs', - 'tests/docs/*.js', - 'config/**/*.js', - 'lib/**/*.js', - 'server/**/*.js', - '**/testem.js', - '**/testem.ci-browsers.js', - '**/testem.browserstack.js', - 'broccoli/**/*.js', '**/ember-cli-build.js', '**/*.cjs', ], @@ -303,7 +297,7 @@ export default [ }, }, { - files: ['tests/docs/**/*.js', 'tests/node/**/*.js'], + files: ['tests/docs/**/*', 'tests/node/**/*'], languageOptions: { globals: { diff --git a/lib/overrides.js b/lib/overrides.cjs similarity index 100% rename from lib/overrides.js rename to lib/overrides.cjs diff --git a/package.json b/package.json index af06214463f..08be78a76b2 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "./types": { "types": "./types/stable/index.d.ts" }, + "./addon-main": "./addon-main.cjs", "./package.json": "./package.json" }, "homepage": "https://emberjs.com/", @@ -45,7 +46,7 @@ "docs": "ember ember-cli-yuidoc", "start": "vite dev", "lint": "npm-run-all --continue-on-error --aggregate-output --parallel \"lint:!(fix)\"", - "lint:docs": "qunit tests/docs/coverage-test.js", + "lint:docs": "qunit tests/docs/coverage-test.cjs", "lint:eslint": "eslint --report-unused-disable-directives --cache .", "lint:eslint:fix": "npm-run-all \"lint:eslint --fix\"", "lint:fix": "npm-run-all lint:*:fix", @@ -54,7 +55,7 @@ "test": "testem ci -f testem.js --host 127.0.0.1 --port 13141", "test:blueprints": "mocha node-tests/blueprints/**/*-test.js", "test:node": "qunit tests/node/**/*-test.js", - "test:browserstack": "node bin/run-browserstack-tests.js", + "test:browserstack": "node bin/run-browserstack-tests.cjs", "test:wip": "vite build --mode development --minify false && testem ci", "type-check:internals": "tsc --noEmit", "type-check:handlebars": "tsc --noEmit --project packages/@handlebars/parser/tsconfig.json", @@ -170,6 +171,7 @@ "ember-addon": { "after": "ember-cli-legacy-blueprints", "type": "addon", + "main": "addon-main.cjs", "version": 2, "renamed-modules": { "@ember/-internals/browser-environment/index.js": "ember-source/@ember/-internals/browser-environment/index.js", diff --git a/smoke-tests/app-template/eslint.config.mjs b/smoke-tests/app-template/eslint.config.mjs index a29e5cd3bd9..68fe504ea15 100644 --- a/smoke-tests/app-template/eslint.config.mjs +++ b/smoke-tests/app-template/eslint.config.mjs @@ -84,8 +84,8 @@ export default [ '**/*.cjs', 'config/**/*.js', 'tests/dummy/config/**/*.js', - 'testem.js', - 'testem*.js', + 'testem.*', + 'testem*.*', 'index.js', '.prettierrc.js', '.stylelintrc.js', diff --git a/tests/docs/coverage-test.js b/tests/docs/coverage-test.cjs similarity index 99% rename from tests/docs/coverage-test.js rename to tests/docs/coverage-test.cjs index ecb696da3a3..09aa2579d81 100644 --- a/tests/docs/coverage-test.js +++ b/tests/docs/coverage-test.cjs @@ -9,7 +9,7 @@ QUnit.module('Docs coverage', function (hooks) { buildDocs(); } docs = require(path.join(__dirname, '../../docs/data.json')); - expected = require('./expected'); + expected = require('./expected.cjs'); }); QUnit.module('classitems', function (hooks) { diff --git a/tests/docs/expected.js b/tests/docs/expected.cjs similarity index 100% rename from tests/docs/expected.js rename to tests/docs/expected.cjs diff --git a/tests/node/build-info-test.js b/tests/node/build-info-test.cjs similarity index 100% rename from tests/node/build-info-test.js rename to tests/node/build-info-test.cjs diff --git a/yuidoc.json b/yuidoc.json index 568ad183b17..41926aecd28 100644 --- a/yuidoc.json +++ b/yuidoc.json @@ -15,6 +15,6 @@ ], "exclude": "vendor", "outdir": "docs", - "preprocessor": "bin/feature-flag-yuidoc-filter" + "preprocessor": "bin/feature-flag-yuidoc-filter.cjs" } } From 682352dc40afb51268cbb905298696f240b5aae2 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Tue, 5 May 2026 16:54:52 -0400 Subject: [PATCH 6/8] booooo --- eslint.config.mjs | 1 + package.json | 329 +++++++++++++++++++++++++++++++++++++++++++++- pnpm-lock.yaml | 199 +++++++++++++++++++++++++++- rollup.config.mjs | 1 + 4 files changed, 525 insertions(+), 5 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index a9a2b12a56a..567b7c2fc3b 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -251,6 +251,7 @@ export default [ { files: ['lib/index.cjs'], rules: { + // Seems 'n/no-missing-require': 'off', }, }, diff --git a/package.json b/package.json index 08be78a76b2..558992791e2 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "types": "./types/stable/index.d.ts" }, "./addon-main": "./addon-main.cjs", + "./addon-main.cjs": "./addon-main.cjs", "./package.json": "./package.json" }, "homepage": "https://emberjs.com/", @@ -23,11 +24,12 @@ "url": "https://github.com/emberjs/ember.js/issues" }, "license": "MIT", - "main": "lib/index.js", + "main": "lib/index.cjs", "files": [ "build-metadata.json", "blueprints", "dist", + "addon-main.cjs", "docs/data.json", "lib", "types/stable" @@ -106,7 +108,7 @@ "babel-plugin-ember-template-compilation": "^4.0.0", "dag-map": "^2.0.2", "decorator-transforms": "2.0.0", - "ember-cli": "^6.11.1", + "ember-cli": "^6.12.0", "ember-cli-blueprint-test-helpers": "^0.19.2", "ember-cli-browserstack": "^2.0.1", "ember-cli-dependency-checker": "^3.3.1", @@ -175,14 +177,92 @@ "version": 2, "renamed-modules": { "@ember/-internals/browser-environment/index.js": "ember-source/@ember/-internals/browser-environment/index.js", + "@ember/-internals/browser-environment/lib/has-dom.js": "ember-source/@ember/-internals/browser-environment/lib/has-dom.js", "@ember/-internals/container/index.js": "ember-source/@ember/-internals/container/index.js", + "@ember/-internals/container/lib/container.js": "ember-source/@ember/-internals/container/lib/container.js", + "@ember/-internals/container/lib/registry.js": "ember-source/@ember/-internals/container/lib/registry.js", "@ember/-internals/deprecations/index.js": "ember-source/@ember/-internals/deprecations/index.js", "@ember/-internals/environment/index.js": "ember-source/@ember/-internals/environment/index.js", + "@ember/-internals/environment/lib/context.js": "ember-source/@ember/-internals/environment/lib/context.js", + "@ember/-internals/environment/lib/env.js": "ember-source/@ember/-internals/environment/lib/env.js", "@ember/-internals/error-handling/index.js": "ember-source/@ember/-internals/error-handling/index.js", "@ember/-internals/glimmer/index.js": "ember-source/@ember/-internals/glimmer/index.js", + "@ember/-internals/glimmer/lib/component-managers/curly.js": "ember-source/@ember/-internals/glimmer/lib/component-managers/curly.js", + "@ember/-internals/glimmer/lib/component-managers/mount.js": "ember-source/@ember/-internals/glimmer/lib/component-managers/mount.js", + "@ember/-internals/glimmer/lib/component-managers/outlet.js": "ember-source/@ember/-internals/glimmer/lib/component-managers/outlet.js", + "@ember/-internals/glimmer/lib/component-managers/root.js": "ember-source/@ember/-internals/glimmer/lib/component-managers/root.js", + "@ember/-internals/glimmer/lib/component-managers/route-template.js": "ember-source/@ember/-internals/glimmer/lib/component-managers/route-template.js", + "@ember/-internals/glimmer/lib/component-managers/unwrap-template.js": "ember-source/@ember/-internals/glimmer/lib/component-managers/unwrap-template.js", + "@ember/-internals/glimmer/lib/component.js": "ember-source/@ember/-internals/glimmer/lib/component.js", + "@ember/-internals/glimmer/lib/components/abstract-input.js": "ember-source/@ember/-internals/glimmer/lib/components/abstract-input.js", + "@ember/-internals/glimmer/lib/components/input.js": "ember-source/@ember/-internals/glimmer/lib/components/input.js", + "@ember/-internals/glimmer/lib/components/internal.js": "ember-source/@ember/-internals/glimmer/lib/components/internal.js", + "@ember/-internals/glimmer/lib/components/link-to.js": "ember-source/@ember/-internals/glimmer/lib/components/link-to.js", + "@ember/-internals/glimmer/lib/components/textarea.js": "ember-source/@ember/-internals/glimmer/lib/components/textarea.js", + "@ember/-internals/glimmer/lib/environment.js": "ember-source/@ember/-internals/glimmer/lib/environment.js", + "@ember/-internals/glimmer/lib/helper.js": "ember-source/@ember/-internals/glimmer/lib/helper.js", + "@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.js": "ember-source/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.js", + "@ember/-internals/glimmer/lib/helpers/-in-element-null-check.js": "ember-source/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.js", + "@ember/-internals/glimmer/lib/helpers/-normalize-class.js": "ember-source/@ember/-internals/glimmer/lib/helpers/-normalize-class.js", + "@ember/-internals/glimmer/lib/helpers/-resolve.js": "ember-source/@ember/-internals/glimmer/lib/helpers/-resolve.js", + "@ember/-internals/glimmer/lib/helpers/-track-array.js": "ember-source/@ember/-internals/glimmer/lib/helpers/-track-array.js", + "@ember/-internals/glimmer/lib/helpers/each-in.js": "ember-source/@ember/-internals/glimmer/lib/helpers/each-in.js", + "@ember/-internals/glimmer/lib/helpers/element.js": "ember-source/@ember/-internals/glimmer/lib/helpers/element.js", + "@ember/-internals/glimmer/lib/helpers/internal-helper.js": "ember-source/@ember/-internals/glimmer/lib/helpers/internal-helper.js", + "@ember/-internals/glimmer/lib/helpers/mut.js": "ember-source/@ember/-internals/glimmer/lib/helpers/mut.js", + "@ember/-internals/glimmer/lib/helpers/readonly.js": "ember-source/@ember/-internals/glimmer/lib/helpers/readonly.js", + "@ember/-internals/glimmer/lib/helpers/unbound.js": "ember-source/@ember/-internals/glimmer/lib/helpers/unbound.js", + "@ember/-internals/glimmer/lib/helpers/unique-id.js": "ember-source/@ember/-internals/glimmer/lib/helpers/unique-id.js", + "@ember/-internals/glimmer/lib/renderer.js": "ember-source/@ember/-internals/glimmer/lib/renderer.js", + "@ember/-internals/glimmer/lib/resolver.js": "ember-source/@ember/-internals/glimmer/lib/resolver.js", + "@ember/-internals/glimmer/lib/setup-registry.js": "ember-source/@ember/-internals/glimmer/lib/setup-registry.js", + "@ember/-internals/glimmer/lib/syntax/mount.js": "ember-source/@ember/-internals/glimmer/lib/syntax/mount.js", + "@ember/-internals/glimmer/lib/syntax/outlet.js": "ember-source/@ember/-internals/glimmer/lib/syntax/outlet.js", + "@ember/-internals/glimmer/lib/template.js": "ember-source/@ember/-internals/glimmer/lib/template.js", + "@ember/-internals/glimmer/lib/template_registry.js": "ember-source/@ember/-internals/glimmer/lib/template_registry.js", + "@ember/-internals/glimmer/lib/templates/input.js": "ember-source/@ember/-internals/glimmer/lib/templates/input.js", + "@ember/-internals/glimmer/lib/templates/link-to.js": "ember-source/@ember/-internals/glimmer/lib/templates/link-to.js", + "@ember/-internals/glimmer/lib/templates/outlet.js": "ember-source/@ember/-internals/glimmer/lib/templates/outlet.js", + "@ember/-internals/glimmer/lib/templates/root.js": "ember-source/@ember/-internals/glimmer/lib/templates/root.js", + "@ember/-internals/glimmer/lib/templates/textarea.js": "ember-source/@ember/-internals/glimmer/lib/templates/textarea.js", + "@ember/-internals/glimmer/lib/utils/bindings.js": "ember-source/@ember/-internals/glimmer/lib/utils/bindings.js", + "@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.js": "ember-source/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.js", + "@ember/-internals/glimmer/lib/utils/iterator.js": "ember-source/@ember/-internals/glimmer/lib/utils/iterator.js", + "@ember/-internals/glimmer/lib/utils/managers.js": "ember-source/@ember/-internals/glimmer/lib/utils/managers.js", + "@ember/-internals/glimmer/lib/utils/process-args.js": "ember-source/@ember/-internals/glimmer/lib/utils/process-args.js", + "@ember/-internals/glimmer/lib/utils/string.js": "ember-source/@ember/-internals/glimmer/lib/utils/string.js", + "@ember/-internals/glimmer/lib/utils/to-bool.js": "ember-source/@ember/-internals/glimmer/lib/utils/to-bool.js", + "@ember/-internals/glimmer/lib/views/outlet.js": "ember-source/@ember/-internals/glimmer/lib/views/outlet.js", "@ember/-internals/meta/index.js": "ember-source/@ember/-internals/meta/index.js", "@ember/-internals/meta/lib/meta.js": "ember-source/@ember/-internals/meta/lib/meta.js", "@ember/-internals/metal/index.js": "ember-source/@ember/-internals/metal/index.js", + "@ember/-internals/metal/lib/alias.js": "ember-source/@ember/-internals/metal/lib/alias.js", + "@ember/-internals/metal/lib/array.js": "ember-source/@ember/-internals/metal/lib/array.js", + "@ember/-internals/metal/lib/array_events.js": "ember-source/@ember/-internals/metal/lib/array_events.js", + "@ember/-internals/metal/lib/cached.js": "ember-source/@ember/-internals/metal/lib/cached.js", + "@ember/-internals/metal/lib/chain-tags.js": "ember-source/@ember/-internals/metal/lib/chain-tags.js", + "@ember/-internals/metal/lib/change_event.js": "ember-source/@ember/-internals/metal/lib/change_event.js", + "@ember/-internals/metal/lib/computed.js": "ember-source/@ember/-internals/metal/lib/computed.js", + "@ember/-internals/metal/lib/computed_cache.js": "ember-source/@ember/-internals/metal/lib/computed_cache.js", + "@ember/-internals/metal/lib/decorator.js": "ember-source/@ember/-internals/metal/lib/decorator.js", + "@ember/-internals/metal/lib/deprecate_property.js": "ember-source/@ember/-internals/metal/lib/deprecate_property.js", + "@ember/-internals/metal/lib/each_proxy_events.js": "ember-source/@ember/-internals/metal/lib/each_proxy_events.js", + "@ember/-internals/metal/lib/events.js": "ember-source/@ember/-internals/metal/lib/events.js", + "@ember/-internals/metal/lib/expand_properties.js": "ember-source/@ember/-internals/metal/lib/expand_properties.js", + "@ember/-internals/metal/lib/get_properties.js": "ember-source/@ember/-internals/metal/lib/get_properties.js", + "@ember/-internals/metal/lib/injected_property.js": "ember-source/@ember/-internals/metal/lib/injected_property.js", + "@ember/-internals/metal/lib/libraries.js": "ember-source/@ember/-internals/metal/lib/libraries.js", + "@ember/-internals/metal/lib/namespace_search.js": "ember-source/@ember/-internals/metal/lib/namespace_search.js", + "@ember/-internals/metal/lib/object-at.js": "ember-source/@ember/-internals/metal/lib/object-at.js", + "@ember/-internals/metal/lib/observer.js": "ember-source/@ember/-internals/metal/lib/observer.js", + "@ember/-internals/metal/lib/path_cache.js": "ember-source/@ember/-internals/metal/lib/path_cache.js", + "@ember/-internals/metal/lib/properties.js": "ember-source/@ember/-internals/metal/lib/properties.js", + "@ember/-internals/metal/lib/property_events.js": "ember-source/@ember/-internals/metal/lib/property_events.js", + "@ember/-internals/metal/lib/property_get.js": "ember-source/@ember/-internals/metal/lib/property_get.js", + "@ember/-internals/metal/lib/property_set.js": "ember-source/@ember/-internals/metal/lib/property_set.js", + "@ember/-internals/metal/lib/set_properties.js": "ember-source/@ember/-internals/metal/lib/set_properties.js", + "@ember/-internals/metal/lib/tags.js": "ember-source/@ember/-internals/metal/lib/tags.js", + "@ember/-internals/metal/lib/tracked.js": "ember-source/@ember/-internals/metal/lib/tracked.js", "@ember/-internals/owner/index.js": "ember-source/@ember/-internals/owner/index.js", "@ember/-internals/routing/index.js": "ember-source/@ember/-internals/routing/index.js", "@ember/-internals/runtime/index.js": "ember-source/@ember/-internals/runtime/index.js", @@ -196,6 +276,19 @@ "@ember/-internals/string/index.js": "ember-source/@ember/-internals/string/index.js", "@ember/-internals/utility-types/index.js": "ember-source/@ember/-internals/utility-types/index.js", "@ember/-internals/utils/index.js": "ember-source/@ember/-internals/utils/index.js", + "@ember/-internals/utils/lib/cache.js": "ember-source/@ember/-internals/utils/lib/cache.js", + "@ember/-internals/utils/lib/dictionary.js": "ember-source/@ember/-internals/utils/lib/dictionary.js", + "@ember/-internals/utils/lib/get-debug-name.js": "ember-source/@ember/-internals/utils/lib/get-debug-name.js", + "@ember/-internals/utils/lib/guid.js": "ember-source/@ember/-internals/utils/lib/guid.js", + "@ember/-internals/utils/lib/intern.js": "ember-source/@ember/-internals/utils/lib/intern.js", + "@ember/-internals/utils/lib/invoke.js": "ember-source/@ember/-internals/utils/lib/invoke.js", + "@ember/-internals/utils/lib/is_proxy.js": "ember-source/@ember/-internals/utils/lib/is_proxy.js", + "@ember/-internals/utils/lib/lookup-descriptor.js": "ember-source/@ember/-internals/utils/lib/lookup-descriptor.js", + "@ember/-internals/utils/lib/mandatory-setter.js": "ember-source/@ember/-internals/utils/lib/mandatory-setter.js", + "@ember/-internals/utils/lib/name.js": "ember-source/@ember/-internals/utils/lib/name.js", + "@ember/-internals/utils/lib/spec.js": "ember-source/@ember/-internals/utils/lib/spec.js", + "@ember/-internals/utils/lib/super.js": "ember-source/@ember/-internals/utils/lib/super.js", + "@ember/-internals/utils/lib/to-string.js": "ember-source/@ember/-internals/utils/lib/to-string.js", "@ember/-internals/views/index.js": "ember-source/@ember/-internals/views/index.js", "@ember/-internals/views/lib/compat/attrs.js": "ember-source/@ember/-internals/views/lib/compat/attrs.js", "@ember/-internals/views/lib/compat/fallback-view-registry.js": "ember-source/@ember/-internals/views/lib/compat/fallback-view-registry.js", @@ -319,27 +412,249 @@ "@ember/utils/lib/is_present.js": "ember-source/@ember/utils/lib/is_present.js", "@ember/utils/lib/type-of.js": "ember-source/@ember/utils/lib/type-of.js", "@ember/version/index.js": "ember-source/@ember/version/index.js", + "@glimmer/compiler/lib/compiler.js": "ember-source/@glimmer/compiler/lib/compiler.js", + "@glimmer/compiler/lib/passes/1-normalization/context.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/context.js", + "@glimmer/compiler/lib/passes/1-normalization/index.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/index.js", + "@glimmer/compiler/lib/passes/1-normalization/keywords/append.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/keywords/append.js", + "@glimmer/compiler/lib/passes/1-normalization/keywords/block.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/keywords/block.js", + "@glimmer/compiler/lib/passes/1-normalization/keywords/call.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/keywords/call.js", + "@glimmer/compiler/lib/passes/1-normalization/keywords/impl.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/keywords/impl.js", + "@glimmer/compiler/lib/passes/1-normalization/keywords/modifier.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/keywords/modifier.js", + "@glimmer/compiler/lib/passes/1-normalization/keywords/utils/call-to-append.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/keywords/utils/call-to-append.js", + "@glimmer/compiler/lib/passes/1-normalization/keywords/utils/curry.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/keywords/utils/curry.js", + "@glimmer/compiler/lib/passes/1-normalization/keywords/utils/dynamic-vars.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/keywords/utils/dynamic-vars.js", + "@glimmer/compiler/lib/passes/1-normalization/keywords/utils/has-block.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/keywords/utils/has-block.js", + "@glimmer/compiler/lib/passes/1-normalization/keywords/utils/if-unless.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/keywords/utils/if-unless.js", + "@glimmer/compiler/lib/passes/1-normalization/keywords/utils/log.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/keywords/utils/log.js", + "@glimmer/compiler/lib/passes/1-normalization/visitors/constants.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/visitors/constants.js", + "@glimmer/compiler/lib/passes/1-normalization/visitors/element/classified.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/visitors/element/classified.js", + "@glimmer/compiler/lib/passes/1-normalization/visitors/element/component.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/visitors/element/component.js", + "@glimmer/compiler/lib/passes/1-normalization/visitors/element/simple-element.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/visitors/element/simple-element.js", + "@glimmer/compiler/lib/passes/1-normalization/visitors/expressions.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/visitors/expressions.js", + "@glimmer/compiler/lib/passes/1-normalization/visitors/statements.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/visitors/statements.js", + "@glimmer/compiler/lib/passes/1-normalization/visitors/strict-mode.js": "ember-source/@glimmer/compiler/lib/passes/1-normalization/visitors/strict-mode.js", + "@glimmer/compiler/lib/passes/2-encoding/content.js": "ember-source/@glimmer/compiler/lib/passes/2-encoding/content.js", + "@glimmer/compiler/lib/passes/2-encoding/expressions.js": "ember-source/@glimmer/compiler/lib/passes/2-encoding/expressions.js", + "@glimmer/compiler/lib/passes/2-encoding/index.js": "ember-source/@glimmer/compiler/lib/passes/2-encoding/index.js", + "@glimmer/compiler/lib/passes/2-encoding/mir.js": "ember-source/@glimmer/compiler/lib/passes/2-encoding/mir.js", + "@glimmer/compiler/lib/shared/list.js": "ember-source/@glimmer/compiler/lib/shared/list.js", + "@glimmer/compiler/lib/shared/result.js": "ember-source/@glimmer/compiler/lib/shared/result.js", + "@glimmer/compiler/lib/utils.js": "ember-source/@glimmer/compiler/lib/utils.js", + "@glimmer/constants/lib/curried.js": "ember-source/@glimmer/constants/lib/curried.js", + "@glimmer/constants/lib/dom.js": "ember-source/@glimmer/constants/lib/dom.js", + "@glimmer/constants/lib/immediate.js": "ember-source/@glimmer/constants/lib/immediate.js", + "@glimmer/constants/lib/syscall-ops.js": "ember-source/@glimmer/constants/lib/syscall-ops.js", + "@glimmer/constants/lib/vm-ops.js": "ember-source/@glimmer/constants/lib/vm-ops.js", + "@glimmer/debug-util/lib/assert.js": "ember-source/@glimmer/debug-util/lib/assert.js", + "@glimmer/debug-util/lib/debug-brand.js": "ember-source/@glimmer/debug-util/lib/debug-brand.js", + "@glimmer/debug-util/lib/debug-to-string.js": "ember-source/@glimmer/debug-util/lib/debug-to-string.js", + "@glimmer/debug-util/lib/platform-utils.js": "ember-source/@glimmer/debug-util/lib/platform-utils.js", + "@glimmer/debug-util/lib/present.js": "ember-source/@glimmer/debug-util/lib/present.js", + "@glimmer/debug-util/lib/simple-cast.js": "ember-source/@glimmer/debug-util/lib/simple-cast.js", + "@glimmer/debug-util/lib/template.js": "ember-source/@glimmer/debug-util/lib/template.js", + "@glimmer/debug-util/lib/untouchable-this.js": "ember-source/@glimmer/debug-util/lib/untouchable-this.js", + "@glimmer/debug/lib/decoders.js": "ember-source/@glimmer/debug/lib/decoders.js", + "@glimmer/debug/lib/dism/operands.js": "ember-source/@glimmer/debug/lib/dism/operands.js", + "@glimmer/debug/lib/opcode-metadata.js": "ember-source/@glimmer/debug/lib/opcode-metadata.js", + "@glimmer/debug/lib/render/annotations.js": "ember-source/@glimmer/debug/lib/render/annotations.js", + "@glimmer/debug/lib/render/buffer.js": "ember-source/@glimmer/debug/lib/render/buffer.js", + "@glimmer/debug/lib/render/format.js": "ember-source/@glimmer/debug/lib/render/format.js", + "@glimmer/debug/lib/render/fragment-type.js": "ember-source/@glimmer/debug/lib/render/fragment-type.js", + "@glimmer/debug/lib/render/fragment.js": "ember-source/@glimmer/debug/lib/render/fragment.js", + "@glimmer/debug/lib/render/styles.js": "ember-source/@glimmer/debug/lib/render/styles.js", + "@glimmer/debug/lib/stack-check.js": "ember-source/@glimmer/debug/lib/stack-check.js", "@glimmer/destroyable/index.js": "ember-source/@glimmer/destroyable/index.js", "@glimmer/encoder/index.js": "ember-source/@glimmer/encoder/index.js", + "@glimmer/encoder/lib/encoder.js": "ember-source/@glimmer/encoder/lib/encoder.js", "@glimmer/env/index.js": "ember-source/@glimmer/env/index.js", "@glimmer/global-context/index.js": "ember-source/@glimmer/global-context/index.js", "@glimmer/manager/index.js": "ember-source/@glimmer/manager/index.js", + "@glimmer/manager/lib/internal/api.js": "ember-source/@glimmer/manager/lib/internal/api.js", + "@glimmer/manager/lib/internal/defaults.js": "ember-source/@glimmer/manager/lib/internal/defaults.js", + "@glimmer/manager/lib/public/api.js": "ember-source/@glimmer/manager/lib/public/api.js", + "@glimmer/manager/lib/public/component.js": "ember-source/@glimmer/manager/lib/public/component.js", + "@glimmer/manager/lib/public/helper.js": "ember-source/@glimmer/manager/lib/public/helper.js", + "@glimmer/manager/lib/public/modifier.js": "ember-source/@glimmer/manager/lib/public/modifier.js", + "@glimmer/manager/lib/public/template.js": "ember-source/@glimmer/manager/lib/public/template.js", + "@glimmer/manager/lib/util/args-proxy.js": "ember-source/@glimmer/manager/lib/util/args-proxy.js", + "@glimmer/manager/lib/util/capabilities.js": "ember-source/@glimmer/manager/lib/util/capabilities.js", "@glimmer/node/index.js": "ember-source/@glimmer/node/index.js", + "@glimmer/node/lib/node-dom-helper.js": "ember-source/@glimmer/node/lib/node-dom-helper.js", + "@glimmer/node/lib/serialize-builder.js": "ember-source/@glimmer/node/lib/serialize-builder.js", "@glimmer/opcode-compiler/index.js": "ember-source/@glimmer/opcode-compiler/index.js", + "@glimmer/opcode-compiler/lib/compilable-template.js": "ember-source/@glimmer/opcode-compiler/lib/compilable-template.js", + "@glimmer/opcode-compiler/lib/compiler.js": "ember-source/@glimmer/opcode-compiler/lib/compiler.js", + "@glimmer/opcode-compiler/lib/opcode-builder/context.js": "ember-source/@glimmer/opcode-compiler/lib/opcode-builder/context.js", + "@glimmer/opcode-compiler/lib/opcode-builder/delegate.js": "ember-source/@glimmer/opcode-compiler/lib/opcode-builder/delegate.js", + "@glimmer/opcode-compiler/lib/opcode-builder/encoder.js": "ember-source/@glimmer/opcode-compiler/lib/opcode-builder/encoder.js", + "@glimmer/opcode-compiler/lib/opcode-builder/helpers/blocks.js": "ember-source/@glimmer/opcode-compiler/lib/opcode-builder/helpers/blocks.js", + "@glimmer/opcode-compiler/lib/opcode-builder/helpers/components.js": "ember-source/@glimmer/opcode-compiler/lib/opcode-builder/helpers/components.js", + "@glimmer/opcode-compiler/lib/opcode-builder/helpers/conditional.js": "ember-source/@glimmer/opcode-compiler/lib/opcode-builder/helpers/conditional.js", + "@glimmer/opcode-compiler/lib/opcode-builder/helpers/expr.js": "ember-source/@glimmer/opcode-compiler/lib/opcode-builder/helpers/expr.js", + "@glimmer/opcode-compiler/lib/opcode-builder/helpers/resolution.js": "ember-source/@glimmer/opcode-compiler/lib/opcode-builder/helpers/resolution.js", + "@glimmer/opcode-compiler/lib/opcode-builder/helpers/shared.js": "ember-source/@glimmer/opcode-compiler/lib/opcode-builder/helpers/shared.js", + "@glimmer/opcode-compiler/lib/opcode-builder/helpers/stdlib.js": "ember-source/@glimmer/opcode-compiler/lib/opcode-builder/helpers/stdlib.js", + "@glimmer/opcode-compiler/lib/opcode-builder/helpers/vm.js": "ember-source/@glimmer/opcode-compiler/lib/opcode-builder/helpers/vm.js", + "@glimmer/opcode-compiler/lib/opcode-builder/opcodes.js": "ember-source/@glimmer/opcode-compiler/lib/opcode-builder/opcodes.js", + "@glimmer/opcode-compiler/lib/opcode-builder/operands.js": "ember-source/@glimmer/opcode-compiler/lib/opcode-builder/operands.js", + "@glimmer/opcode-compiler/lib/opcode-builder/stdlib.js": "ember-source/@glimmer/opcode-compiler/lib/opcode-builder/stdlib.js", + "@glimmer/opcode-compiler/lib/program-context.js": "ember-source/@glimmer/opcode-compiler/lib/program-context.js", + "@glimmer/opcode-compiler/lib/syntax/compilers.js": "ember-source/@glimmer/opcode-compiler/lib/syntax/compilers.js", + "@glimmer/opcode-compiler/lib/syntax/expressions.js": "ember-source/@glimmer/opcode-compiler/lib/syntax/expressions.js", + "@glimmer/opcode-compiler/lib/syntax/statements.js": "ember-source/@glimmer/opcode-compiler/lib/syntax/statements.js", + "@glimmer/opcode-compiler/lib/template.js": "ember-source/@glimmer/opcode-compiler/lib/template.js", + "@glimmer/opcode-compiler/lib/utils.js": "ember-source/@glimmer/opcode-compiler/lib/utils.js", + "@glimmer/opcode-compiler/lib/wrapped-component.js": "ember-source/@glimmer/opcode-compiler/lib/wrapped-component.js", "@glimmer/owner/index.js": "ember-source/@glimmer/owner/index.js", "@glimmer/program/index.js": "ember-source/@glimmer/program/index.js", + "@glimmer/program/lib/constants.js": "ember-source/@glimmer/program/lib/constants.js", + "@glimmer/program/lib/helpers.js": "ember-source/@glimmer/program/lib/helpers.js", + "@glimmer/program/lib/opcode.js": "ember-source/@glimmer/program/lib/opcode.js", + "@glimmer/program/lib/program.js": "ember-source/@glimmer/program/lib/program.js", + "@glimmer/program/lib/util/default-template.js": "ember-source/@glimmer/program/lib/util/default-template.js", "@glimmer/reference/index.js": "ember-source/@glimmer/reference/index.js", + "@glimmer/reference/lib/iterable.js": "ember-source/@glimmer/reference/lib/iterable.js", + "@glimmer/reference/lib/reference.js": "ember-source/@glimmer/reference/lib/reference.js", "@glimmer/runtime/index.js": "ember-source/@glimmer/runtime/index.js", + "@glimmer/runtime/lib/bounds.js": "ember-source/@glimmer/runtime/lib/bounds.js", + "@glimmer/runtime/lib/compiled/expressions/concat.js": "ember-source/@glimmer/runtime/lib/compiled/expressions/concat.js", + "@glimmer/runtime/lib/compiled/opcodes/-debug-strip.js": "ember-source/@glimmer/runtime/lib/compiled/opcodes/-debug-strip.js", + "@glimmer/runtime/lib/compiled/opcodes/component.js": "ember-source/@glimmer/runtime/lib/compiled/opcodes/component.js", + "@glimmer/runtime/lib/compiled/opcodes/content.js": "ember-source/@glimmer/runtime/lib/compiled/opcodes/content.js", + "@glimmer/runtime/lib/compiled/opcodes/debugger.js": "ember-source/@glimmer/runtime/lib/compiled/opcodes/debugger.js", + "@glimmer/runtime/lib/compiled/opcodes/dom.js": "ember-source/@glimmer/runtime/lib/compiled/opcodes/dom.js", + "@glimmer/runtime/lib/compiled/opcodes/expressions.js": "ember-source/@glimmer/runtime/lib/compiled/opcodes/expressions.js", + "@glimmer/runtime/lib/compiled/opcodes/lists.js": "ember-source/@glimmer/runtime/lib/compiled/opcodes/lists.js", + "@glimmer/runtime/lib/compiled/opcodes/vm.js": "ember-source/@glimmer/runtime/lib/compiled/opcodes/vm.js", + "@glimmer/runtime/lib/component/interfaces.js": "ember-source/@glimmer/runtime/lib/component/interfaces.js", + "@glimmer/runtime/lib/component/resolve.js": "ember-source/@glimmer/runtime/lib/component/resolve.js", + "@glimmer/runtime/lib/component/template-only.js": "ember-source/@glimmer/runtime/lib/component/template-only.js", + "@glimmer/runtime/lib/curried-value.js": "ember-source/@glimmer/runtime/lib/curried-value.js", + "@glimmer/runtime/lib/debug-render-tree.js": "ember-source/@glimmer/runtime/lib/debug-render-tree.js", + "@glimmer/runtime/lib/dom/api.js": "ember-source/@glimmer/runtime/lib/dom/api.js", + "@glimmer/runtime/lib/dom/helper.js": "ember-source/@glimmer/runtime/lib/dom/helper.js", + "@glimmer/runtime/lib/dom/normalize.js": "ember-source/@glimmer/runtime/lib/dom/normalize.js", + "@glimmer/runtime/lib/dom/operations.js": "ember-source/@glimmer/runtime/lib/dom/operations.js", + "@glimmer/runtime/lib/dom/props.js": "ember-source/@glimmer/runtime/lib/dom/props.js", + "@glimmer/runtime/lib/dom/sanitized-values.js": "ember-source/@glimmer/runtime/lib/dom/sanitized-values.js", + "@glimmer/runtime/lib/environment.js": "ember-source/@glimmer/runtime/lib/environment.js", + "@glimmer/runtime/lib/helpers/and.js": "ember-source/@glimmer/runtime/lib/helpers/and.js", + "@glimmer/runtime/lib/helpers/array.js": "ember-source/@glimmer/runtime/lib/helpers/array.js", + "@glimmer/runtime/lib/helpers/concat.js": "ember-source/@glimmer/runtime/lib/helpers/concat.js", + "@glimmer/runtime/lib/helpers/eq.js": "ember-source/@glimmer/runtime/lib/helpers/eq.js", + "@glimmer/runtime/lib/helpers/fn.js": "ember-source/@glimmer/runtime/lib/helpers/fn.js", + "@glimmer/runtime/lib/helpers/get.js": "ember-source/@glimmer/runtime/lib/helpers/get.js", + "@glimmer/runtime/lib/helpers/gt.js": "ember-source/@glimmer/runtime/lib/helpers/gt.js", + "@glimmer/runtime/lib/helpers/gte.js": "ember-source/@glimmer/runtime/lib/helpers/gte.js", + "@glimmer/runtime/lib/helpers/hash.js": "ember-source/@glimmer/runtime/lib/helpers/hash.js", + "@glimmer/runtime/lib/helpers/internal-helper.js": "ember-source/@glimmer/runtime/lib/helpers/internal-helper.js", + "@glimmer/runtime/lib/helpers/invoke.js": "ember-source/@glimmer/runtime/lib/helpers/invoke.js", + "@glimmer/runtime/lib/helpers/lt.js": "ember-source/@glimmer/runtime/lib/helpers/lt.js", + "@glimmer/runtime/lib/helpers/lte.js": "ember-source/@glimmer/runtime/lib/helpers/lte.js", + "@glimmer/runtime/lib/helpers/neq.js": "ember-source/@glimmer/runtime/lib/helpers/neq.js", + "@glimmer/runtime/lib/helpers/not.js": "ember-source/@glimmer/runtime/lib/helpers/not.js", + "@glimmer/runtime/lib/helpers/or.js": "ember-source/@glimmer/runtime/lib/helpers/or.js", + "@glimmer/runtime/lib/modifiers/on.js": "ember-source/@glimmer/runtime/lib/modifiers/on.js", + "@glimmer/runtime/lib/opcodes.js": "ember-source/@glimmer/runtime/lib/opcodes.js", + "@glimmer/runtime/lib/references/class-list.js": "ember-source/@glimmer/runtime/lib/references/class-list.js", + "@glimmer/runtime/lib/references/curry-value.js": "ember-source/@glimmer/runtime/lib/references/curry-value.js", + "@glimmer/runtime/lib/render.js": "ember-source/@glimmer/runtime/lib/render.js", + "@glimmer/runtime/lib/scope.js": "ember-source/@glimmer/runtime/lib/scope.js", + "@glimmer/runtime/lib/vm/append.js": "ember-source/@glimmer/runtime/lib/vm/append.js", + "@glimmer/runtime/lib/vm/arguments.js": "ember-source/@glimmer/runtime/lib/vm/arguments.js", + "@glimmer/runtime/lib/vm/attributes/dynamic.js": "ember-source/@glimmer/runtime/lib/vm/attributes/dynamic.js", + "@glimmer/runtime/lib/vm/content/text.js": "ember-source/@glimmer/runtime/lib/vm/content/text.js", + "@glimmer/runtime/lib/vm/element-builder.js": "ember-source/@glimmer/runtime/lib/vm/element-builder.js", + "@glimmer/runtime/lib/vm/low-level.js": "ember-source/@glimmer/runtime/lib/vm/low-level.js", + "@glimmer/runtime/lib/vm/rehydrate-builder.js": "ember-source/@glimmer/runtime/lib/vm/rehydrate-builder.js", + "@glimmer/runtime/lib/vm/render-result.js": "ember-source/@glimmer/runtime/lib/vm/render-result.js", + "@glimmer/runtime/lib/vm/stack.js": "ember-source/@glimmer/runtime/lib/vm/stack.js", + "@glimmer/runtime/lib/vm/update.js": "ember-source/@glimmer/runtime/lib/vm/update.js", + "@glimmer/syntax/lib/generation/print.js": "ember-source/@glimmer/syntax/lib/generation/print.js", + "@glimmer/syntax/lib/generation/printer.js": "ember-source/@glimmer/syntax/lib/generation/printer.js", + "@glimmer/syntax/lib/generation/util.js": "ember-source/@glimmer/syntax/lib/generation/util.js", + "@glimmer/syntax/lib/keywords.js": "ember-source/@glimmer/syntax/lib/keywords.js", + "@glimmer/syntax/lib/parser.js": "ember-source/@glimmer/syntax/lib/parser.js", + "@glimmer/syntax/lib/parser/handlebars-node-visitors.js": "ember-source/@glimmer/syntax/lib/parser/handlebars-node-visitors.js", + "@glimmer/syntax/lib/parser/tokenizer-event-handlers.js": "ember-source/@glimmer/syntax/lib/parser/tokenizer-event-handlers.js", + "@glimmer/syntax/lib/source/loc/kinds.js": "ember-source/@glimmer/syntax/lib/source/loc/kinds.js", + "@glimmer/syntax/lib/source/loc/match.js": "ember-source/@glimmer/syntax/lib/source/loc/match.js", + "@glimmer/syntax/lib/source/loc/offset.js": "ember-source/@glimmer/syntax/lib/source/loc/offset.js", + "@glimmer/syntax/lib/source/loc/span.js": "ember-source/@glimmer/syntax/lib/source/loc/span.js", + "@glimmer/syntax/lib/source/location.js": "ember-source/@glimmer/syntax/lib/source/location.js", + "@glimmer/syntax/lib/source/slice.js": "ember-source/@glimmer/syntax/lib/source/slice.js", + "@glimmer/syntax/lib/source/source.js": "ember-source/@glimmer/syntax/lib/source/source.js", + "@glimmer/syntax/lib/source/span-list.js": "ember-source/@glimmer/syntax/lib/source/span-list.js", + "@glimmer/syntax/lib/symbol-table.js": "ember-source/@glimmer/syntax/lib/symbol-table.js", + "@glimmer/syntax/lib/syntax-error.js": "ember-source/@glimmer/syntax/lib/syntax-error.js", + "@glimmer/syntax/lib/traversal/errors.js": "ember-source/@glimmer/syntax/lib/traversal/errors.js", + "@glimmer/syntax/lib/traversal/path.js": "ember-source/@glimmer/syntax/lib/traversal/path.js", + "@glimmer/syntax/lib/traversal/traverse.js": "ember-source/@glimmer/syntax/lib/traversal/traverse.js", + "@glimmer/syntax/lib/traversal/walker.js": "ember-source/@glimmer/syntax/lib/traversal/walker.js", + "@glimmer/syntax/lib/utils.js": "ember-source/@glimmer/syntax/lib/utils.js", + "@glimmer/syntax/lib/v1/legacy-interop.js": "ember-source/@glimmer/syntax/lib/v1/legacy-interop.js", + "@glimmer/syntax/lib/v1/parser-builders.js": "ember-source/@glimmer/syntax/lib/v1/parser-builders.js", + "@glimmer/syntax/lib/v1/public-builders.js": "ember-source/@glimmer/syntax/lib/v1/public-builders.js", + "@glimmer/syntax/lib/v1/visitor-keys.js": "ember-source/@glimmer/syntax/lib/v1/visitor-keys.js", + "@glimmer/syntax/lib/v2/builders.js": "ember-source/@glimmer/syntax/lib/v2/builders.js", + "@glimmer/syntax/lib/v2/loose-resolution.js": "ember-source/@glimmer/syntax/lib/v2/loose-resolution.js", + "@glimmer/syntax/lib/v2/normalize.js": "ember-source/@glimmer/syntax/lib/v2/normalize.js", + "@glimmer/syntax/lib/v2/objects/args.js": "ember-source/@glimmer/syntax/lib/v2/objects/args.js", + "@glimmer/syntax/lib/v2/objects/attr-block.js": "ember-source/@glimmer/syntax/lib/v2/objects/attr-block.js", + "@glimmer/syntax/lib/v2/objects/constants.js": "ember-source/@glimmer/syntax/lib/v2/objects/constants.js", + "@glimmer/syntax/lib/v2/objects/content.js": "ember-source/@glimmer/syntax/lib/v2/objects/content.js", + "@glimmer/syntax/lib/v2/objects/expr.js": "ember-source/@glimmer/syntax/lib/v2/objects/expr.js", + "@glimmer/syntax/lib/v2/objects/internal-node.js": "ember-source/@glimmer/syntax/lib/v2/objects/internal-node.js", + "@glimmer/syntax/lib/v2/objects/node.js": "ember-source/@glimmer/syntax/lib/v2/objects/node.js", + "@glimmer/syntax/lib/v2/objects/refs.js": "ember-source/@glimmer/syntax/lib/v2/objects/refs.js", + "@glimmer/syntax/lib/v2/objects/resolution.js": "ember-source/@glimmer/syntax/lib/v2/objects/resolution.js", "@glimmer/tracking/index.js": "ember-source/@glimmer/tracking/index.js", "@glimmer/tracking/primitives/cache/index.js": "ember-source/@glimmer/tracking/primitives/cache/index.js", "@glimmer/util/index.js": "ember-source/@glimmer/util/index.js", + "@glimmer/util/lib/array-utils.js": "ember-source/@glimmer/util/lib/array-utils.js", + "@glimmer/util/lib/collections.js": "ember-source/@glimmer/util/lib/collections.js", + "@glimmer/util/lib/debug-steps.js": "ember-source/@glimmer/util/lib/debug-steps.js", + "@glimmer/util/lib/dom.js": "ember-source/@glimmer/util/lib/dom.js", + "@glimmer/util/lib/intern.js": "ember-source/@glimmer/util/lib/intern.js", + "@glimmer/util/lib/is-serialization-first-node.js": "ember-source/@glimmer/util/lib/is-serialization-first-node.js", + "@glimmer/util/lib/local-logger.js": "ember-source/@glimmer/util/lib/local-logger.js", + "@glimmer/util/lib/object-utils.js": "ember-source/@glimmer/util/lib/object-utils.js", + "@glimmer/util/lib/string.js": "ember-source/@glimmer/util/lib/string.js", "@glimmer/validator/index.js": "ember-source/@glimmer/validator/index.js", + "@glimmer/validator/lib/collections/array.js": "ember-source/@glimmer/validator/lib/collections/array.js", + "@glimmer/validator/lib/collections/map.js": "ember-source/@glimmer/validator/lib/collections/map.js", + "@glimmer/validator/lib/collections/object.js": "ember-source/@glimmer/validator/lib/collections/object.js", + "@glimmer/validator/lib/collections/set.js": "ember-source/@glimmer/validator/lib/collections/set.js", + "@glimmer/validator/lib/collections/weak-map.js": "ember-source/@glimmer/validator/lib/collections/weak-map.js", + "@glimmer/validator/lib/collections/weak-set.js": "ember-source/@glimmer/validator/lib/collections/weak-set.js", + "@glimmer/validator/lib/debug.js": "ember-source/@glimmer/validator/lib/debug.js", + "@glimmer/validator/lib/meta.js": "ember-source/@glimmer/validator/lib/meta.js", + "@glimmer/validator/lib/tracked-data.js": "ember-source/@glimmer/validator/lib/tracked-data.js", + "@glimmer/validator/lib/tracking.js": "ember-source/@glimmer/validator/lib/tracking.js", + "@glimmer/validator/lib/utils.js": "ember-source/@glimmer/validator/lib/utils.js", + "@glimmer/validator/lib/validators.js": "ember-source/@glimmer/validator/lib/validators.js", "@glimmer/vm/index.js": "ember-source/@glimmer/vm/index.js", + "@glimmer/vm/lib/content.js": "ember-source/@glimmer/vm/lib/content.js", + "@glimmer/vm/lib/flags.js": "ember-source/@glimmer/vm/lib/flags.js", + "@glimmer/vm/lib/registers.js": "ember-source/@glimmer/vm/lib/registers.js", "@glimmer/wire-format/index.js": "ember-source/@glimmer/wire-format/index.js", + "@glimmer/wire-format/lib/opcodes.js": "ember-source/@glimmer/wire-format/lib/opcodes.js", + "@glimmer/wire-format/lib/resolution.js": "ember-source/@glimmer/wire-format/lib/resolution.js", + "@glimmer/wire-format/lib/well-known.js": "ember-source/@glimmer/wire-format/lib/well-known.js", + "@handlebars/parser/lib/exception.js": "ember-source/@handlebars/parser/lib/exception.js", + "@handlebars/parser/lib/helpers.js": "ember-source/@handlebars/parser/lib/helpers.js", + "@handlebars/parser/lib/parse.js": "ember-source/@handlebars/parser/lib/parse.js", + "@handlebars/parser/lib/parser.js": "ember-source/@handlebars/parser/lib/parser.js", + "@handlebars/parser/lib/printer.js": "ember-source/@handlebars/parser/lib/printer.js", + "@handlebars/parser/lib/visitor.js": "ember-source/@handlebars/parser/lib/visitor.js", + "@handlebars/parser/lib/whitespace-control.js": "ember-source/@handlebars/parser/lib/whitespace-control.js", "@simple-dom/document/index.js": "ember-source/@simple-dom/document/index.js", "backburner.js/index.js": "ember-source/backburner.js/index.js", "dag-map/index.js": "ember-source/dag-map/index.js", "ember-template-compiler/index.js": "ember-source/ember-template-compiler/index.js", + "ember-template-compiler/lib/system/compile-options.js": "ember-source/ember-template-compiler/lib/system/compile-options.js", + "ember-template-compiler/lib/system/dasherize-component-name.js": "ember-source/ember-template-compiler/lib/system/dasherize-component-name.js", + "ember-template-compiler/lib/system/precompile.js": "ember-source/ember-template-compiler/lib/system/precompile.js", "ember-testing/index.js": "ember-source/ember-testing/index.js", "ember-testing/lib/adapters/adapter.js": "ember-source/ember-testing/lib/adapters/adapter.js", "ember-testing/lib/public-api.js": "ember-source/ember-testing/lib/public-api.js", @@ -350,6 +665,16 @@ "ember/version.js": "ember-source/ember/version.js", "route-recognizer/index.js": "ember-source/route-recognizer/index.js", "router_js/index.js": "ember-source/router_js/index.js", + "router_js/lib/route-info.js": "ember-source/router_js/lib/route-info.js", + "router_js/lib/router.js": "ember-source/router_js/lib/router.js", + "router_js/lib/transition-aborted-error.js": "ember-source/router_js/lib/transition-aborted-error.js", + "router_js/lib/transition-intent.js": "ember-source/router_js/lib/transition-intent.js", + "router_js/lib/transition-intent/named-transition-intent.js": "ember-source/router_js/lib/transition-intent/named-transition-intent.js", + "router_js/lib/transition-intent/url-transition-intent.js": "ember-source/router_js/lib/transition-intent/url-transition-intent.js", + "router_js/lib/transition-state.js": "ember-source/router_js/lib/transition-state.js", + "router_js/lib/transition.js": "ember-source/router_js/lib/transition.js", + "router_js/lib/unrecognized-url-error.js": "ember-source/router_js/lib/unrecognized-url-error.js", + "router_js/lib/utils.js": "ember-source/router_js/lib/utils.js", "rsvp/index.js": "ember-source/rsvp/index.js" } }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2f3e4005f33..48a0594172e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -145,8 +145,8 @@ importers: specifier: 2.0.0 version: 2.0.0(@babel/core@7.29.0) ember-cli: - specifier: ^6.11.1 - version: 6.11.2(@babel/core@7.29.0)(@types/node@25.6.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) + specifier: ^6.12.0 + version: 6.12.0(@babel/core@7.29.0)(@types/node@25.6.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) ember-cli-blueprint-test-helpers: specifier: ^0.19.2 version: 0.19.2 @@ -155,7 +155,7 @@ importers: version: 2.1.0 ember-cli-dependency-checker: specifier: ^3.3.1 - version: 3.3.3(ember-cli@6.11.2(@babel/core@7.29.0)(@types/node@25.6.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8)) + version: 3.3.3(ember-cli@6.12.0(@babel/core@7.29.0)(@types/node@25.6.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8)) ember-cli-yuidoc: specifier: ^0.9.1 version: 0.9.1 @@ -3987,12 +3987,21 @@ packages: '@ember-tooling/classic-build-addon-blueprint@6.11.2': resolution: {integrity: sha512-csfwl0IOK/J8rIfRoQcpaAsIe/R326ZubcH6gIhe4EfAl5vxg4cbpDr2ZF4N037PTiCnDWoD1PQFRT0Lmyb0zA==} + '@ember-tooling/classic-build-addon-blueprint@6.12.0': + resolution: {integrity: sha512-2sf34DIJO6RnpzcQy0A4RmGNwukE4vihHv/b9loDZzV4lnFNOTyHua09S5ai4szO7Iv91Q2OPEgOBo09yG+7SQ==} + '@ember-tooling/classic-build-app-blueprint@6.11.2': resolution: {integrity: sha512-5XPJBmdn/vYx5oDuxNhii8AqAqaXAcqLq80Q1DwGo4lXUauMflbLApgy+ddCOPNXj2VADTrOvo1m6VW8olrqsw==} + '@ember-tooling/classic-build-app-blueprint@6.12.0': + resolution: {integrity: sha512-dU6ig33VN+SA2yrkyJGdCMzJ6hB0fRVXpcSpnmWl2RI7TQCxlQsYR162BkMUdRN6ZWbycalDjWGW0r8KrIxzgA==} + '@ember/app-blueprint@6.11.2': resolution: {integrity: sha512-qbj9Irg70OX+t0yJvdB9aUxktpuuSrMV0vYiFHj8Kn7sbE8eyeV4ge+NSB+KxTg9Kmw7Ugq0wFefBZWuAxFG0Q==} + '@ember/app-blueprint@6.12.3': + resolution: {integrity: sha512-Bf950zkgbKn6/pMunLTk/mkqInHU8CaNTvjR/umX1CjUNFRPTZPQb19OhstlBYTl+99jUN3feZ0xfuOt1t6c7A==} + '@ember/edition-utils@1.2.0': resolution: {integrity: sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==} @@ -7742,6 +7751,11 @@ packages: engines: {node: '>= 20.19.0'} hasBin: true + ember-cli@6.12.0: + resolution: {integrity: sha512-DDFTHdDofuRCZnu5FO79patRi1W4ndKFLcgb0MsspC+jyS9hgxDepBBFuV6daIjaTq5RvWdZRf5tjQ141VmcTw==} + engines: {node: '>= 20.19.0'} + hasBin: true + ember-eslint-parser@0.5.13: resolution: {integrity: sha512-b6ALDaxs9Bb4v0uagWud/5lECb78qpXHFv7M340dUHFW4Y0RuhlsfA4Rb+765X1+6KHp8G7TaAs0UgggWUqD3g==} engines: {node: '>=16.0.0'} @@ -13606,6 +13620,20 @@ snapshots: transitivePeerDependencies: - supports-color + '@ember-tooling/classic-build-addon-blueprint@6.12.0': + dependencies: + '@ember-tooling/blueprint-model': 0.5.0 + chalk: 5.6.2 + ember-cli-normalize-entity-name: 1.0.0 + ember-cli-string-utils: 1.1.0 + fs-extra: 11.3.4 + lodash: 4.17.23 + silent-error: 1.1.1 + sort-package-json: 2.15.1 + walk-sync: 3.0.0 + transitivePeerDependencies: + - supports-color + '@ember-tooling/classic-build-app-blueprint@6.11.2': dependencies: '@ember-tooling/blueprint-model': 0.5.0 @@ -13614,6 +13642,14 @@ snapshots: transitivePeerDependencies: - supports-color + '@ember-tooling/classic-build-app-blueprint@6.12.0': + dependencies: + '@ember-tooling/blueprint-model': 0.5.0 + chalk: 5.6.2 + ember-cli-string-utils: 1.1.0 + transitivePeerDependencies: + - supports-color + '@ember/app-blueprint@6.11.2': dependencies: chalk: 4.1.2 @@ -13623,6 +13659,15 @@ snapshots: sort-package-json: 3.6.1 walk-sync: 3.0.0 + '@ember/app-blueprint@6.12.3': + dependencies: + chalk: 4.1.2 + ejs: 3.1.10 + ember-cli-string-utils: 1.1.0 + lodash: 4.17.23 + sort-package-json: 3.6.1 + walk-sync: 3.0.0 + '@ember/edition-utils@1.2.0': {} '@ember/optional-features@2.3.0': @@ -17994,6 +18039,15 @@ snapshots: resolve: 1.22.11 semver: 5.7.2 + ember-cli-dependency-checker@3.3.3(ember-cli@6.12.0(@babel/core@7.29.0)(@types/node@25.6.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8)): + dependencies: + chalk: 2.4.2 + ember-cli: 6.12.0(@babel/core@7.29.0)(@types/node@25.6.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) + find-yarn-workspace-root: 2.0.0 + is-git-url: 1.0.0 + resolve: 1.22.11 + semver: 5.7.2 + ember-cli-deprecation-workflow@3.4.0(ember-source@): dependencies: '@babel/core': 7.29.0(supports-color@8.1.1) @@ -18271,6 +18325,145 @@ snapshots: - walrus - whiskers + ember-cli@6.12.0(@babel/core@7.29.0)(@types/node@25.6.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8): + dependencies: + '@ember-tooling/blueprint-blueprint': 0.2.1 + '@ember-tooling/blueprint-model': 0.5.0 + '@ember-tooling/classic-build-addon-blueprint': 6.12.0 + '@ember-tooling/classic-build-app-blueprint': 6.12.0 + '@ember/app-blueprint': 6.12.3 + '@pnpm/find-workspace-dir': 1000.1.5 + babel-remove-types: 1.1.0 + broccoli: 4.0.0 + broccoli-concat: 4.2.7 + broccoli-config-loader: 1.0.1 + broccoli-config-replace: 1.1.3 + broccoli-debug: 0.6.5 + broccoli-funnel: 3.0.8 + broccoli-funnel-reducer: 1.0.0 + broccoli-merge-trees: 4.2.0 + broccoli-middleware: 2.1.1 + broccoli-slow-trees: 3.1.0 + broccoli-source: 3.0.1 + broccoli-stew: 3.0.0 + calculate-cache-key-for-tree: 2.0.0 + capture-exit: 2.0.0 + chalk: 5.6.2 + ci-info: 4.4.0 + clean-base-url: 1.0.0 + compression: 1.8.1 + configstore: 7.1.0 + console-ui: 3.1.2 + content-tag: 4.1.1 + core-object: 3.1.5 + dag-map: 2.0.2 + diff: 8.0.4 + ember-cli-is-package-missing: 1.0.0 + ember-cli-normalize-entity-name: 1.0.0 + ember-cli-preprocess-registry: 5.0.1 + ember-cli-string-utils: 1.1.0 + ensure-posix-path: 1.1.1 + execa: 9.6.1 + exit: 0.1.2 + express: 5.2.1 + filesize: 11.0.15 + find-up: 8.0.0 + find-yarn-workspace-root: 2.0.0 + fs-extra: 11.3.4 + fs-tree-diff: 2.0.1 + get-caller-file: 2.0.5 + git-repo-info: 2.1.1 + glob: 13.0.6 + heimdalljs: 0.2.6 + heimdalljs-fs-monitor: 1.1.2 + heimdalljs-graph: 1.0.0 + heimdalljs-logger: 0.1.10 + http-proxy: 1.18.1 + inflection: 3.0.2 + inquirer: 13.3.2(@types/node@25.6.0) + is-git-url: 1.0.0 + is-language-code: 5.1.3 + lodash: 4.17.23 + markdown-it: 14.1.1 + markdown-it-terminal: 0.4.0(markdown-it@14.1.1) + minimatch: 10.2.4 + morgan: 1.10.1 + nopt: 3.0.6 + npm-package-arg: 13.0.2 + os-locale: 6.0.2 + p-defer: 4.0.1 + portfinder: 1.0.38 + promise-map-series: 0.3.0 + promise.hash.helper: 1.0.8 + quick-temp: 0.1.9 + resolve: 1.22.11 + resolve-package-path: 4.0.3 + safe-stable-stringify: 2.5.0 + sane: 5.0.1 + semver: 7.7.4 + silent-error: 1.1.1 + sort-package-json: 3.6.1 + symlink-or-copy: 1.3.1 + testem: 3.19.1(@babel/core@7.29.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) + tiny-lr: 2.0.0 + tree-sync: 2.1.0 + walk-sync: 4.0.1 + watch-detector: 1.0.2 + workerpool: 10.0.1 + yam: 1.0.0 + transitivePeerDependencies: + - '@babel/core' + - '@types/node' + - arc-templates + - atpl + - bracket-template + - bufferutil + - coffee-script + - debug + - dot + - dust + - dustjs-helpers + - dustjs-linkedin + - eco + - ect + - ejs + - haml-coffee + - hamlet + - hamljs + - handlebars + - hogan.js + - htmling + - jazz + - jqtpl + - just + - liquid-node + - liquor + - mote + - nunjucks + - plates + - pug + - qejs + - ractive + - react + - react-dom + - slm + - supports-color + - swig + - swig-templates + - teacup + - templayed + - then-pug + - tinyliquid + - toffee + - twig + - twing + - underscore + - utf-8-validate + - vash + - velocityjs + - walrus + - whiskers + ember-eslint-parser@0.5.13(@babel/core@7.29.0)(@typescript-eslint/parser@8.57.2(eslint@9.39.4)(typescript@5.9.3))(eslint@9.39.4)(typescript@5.9.3): dependencies: '@babel/core': 7.29.0(supports-color@8.1.1) diff --git a/rollup.config.mjs b/rollup.config.mjs index 5b0cfca3b65..4865e5bbb68 100644 --- a/rollup.config.mjs +++ b/rollup.config.mjs @@ -104,6 +104,7 @@ function sharedESMConfig({ input, debugMacrosMode, includePackageMeta = false }) format: 'es', dir: outputDir, hoistTransitiveImports: false, + preserveModules: true, generatedCode: 'es2015', chunkFileNames: 'packages/shared-chunks/[name]-[hash].js', }, From 2a3006657eca845182432a2224f2007fddc721b2 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Tue, 5 May 2026 22:18:40 +0100 Subject: [PATCH 7/8] make rsvp external --- lib/index.cjs | 1 - package.json | 15 +++++---------- pnpm-lock.yaml | 6 +++--- rollup.config.mjs | 8 ++++---- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/lib/index.cjs b/lib/index.cjs index 5e6e1040b69..9f9beb3a5c4 100644 --- a/lib/index.cjs +++ b/lib/index.cjs @@ -157,7 +157,6 @@ const shim = addonV1Shim(path.join(__dirname, '..'), { './dist/dev/packages/ember/version.js', './dist/dev/packages/route-recognizer/index.js', './dist/dev/packages/router_js/index.js', - './dist/dev/packages/rsvp/index.js', ].map((x) => (isProduction ? x.replace('/dist/dev/', '/dist/prod/') : x)), 'implicit-test-modules': [ './dist/dev/packages/ember-testing/index.js', diff --git a/package.json b/package.json index 558992791e2..988fd4370a5 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "ember-addon" ], "exports": { + "./package.json": "./package.json", "./*": { "development": "./dist/dev/packages/*", "production": "./dist/prod/packages/*", @@ -14,10 +15,7 @@ }, "./types": { "types": "./types/stable/index.d.ts" - }, - "./addon-main": "./addon-main.cjs", - "./addon-main.cjs": "./addon-main.cjs", - "./package.json": "./package.json" + } }, "homepage": "https://emberjs.com/", "bugs": { @@ -29,7 +27,6 @@ "build-metadata.json", "blueprints", "dist", - "addon-main.cjs", "docs/data.json", "lib", "types/stable" @@ -54,7 +51,7 @@ "lint:fix": "npm-run-all lint:*:fix", "lint:format": "prettier --check .", "lint:format:fix": "prettier --write .", - "test": "testem ci -f testem.js --host 127.0.0.1 --port 13141", + "test": "testem ci -f testem.cjs --host 127.0.0.1 --port 13141", "test:blueprints": "mocha node-tests/blueprints/**/*-test.js", "test:node": "qunit tests/node/**/*-test.js", "test:browserstack": "node bin/run-browserstack-tests.cjs", @@ -81,6 +78,7 @@ "inflection": "^2.0.1", "route-recognizer": "^0.3.4", "semver": "^7.5.2", + "rsvp": "^4.8.5", "silent-error": "^1.1.1", "simple-html-tokenizer": "^0.5.11" }, @@ -136,7 +134,6 @@ "resolve.exports": "^2.0.3", "rollup": "^4.57.1", "router_js": "workspace:*", - "rsvp": "^4.8.5", "terser": "^5.42.0", "testem": "^3.20.0", "testem-failure-only-reporter": "^1.0.0", @@ -173,7 +170,6 @@ "ember-addon": { "after": "ember-cli-legacy-blueprints", "type": "addon", - "main": "addon-main.cjs", "version": 2, "renamed-modules": { "@ember/-internals/browser-environment/index.js": "ember-source/@ember/-internals/browser-environment/index.js", @@ -674,8 +670,7 @@ "router_js/lib/transition-state.js": "ember-source/router_js/lib/transition-state.js", "router_js/lib/transition.js": "ember-source/router_js/lib/transition.js", "router_js/lib/unrecognized-url-error.js": "ember-source/router_js/lib/unrecognized-url-error.js", - "router_js/lib/utils.js": "ember-source/router_js/lib/utils.js", - "rsvp/index.js": "ember-source/rsvp/index.js" + "router_js/lib/utils.js": "ember-source/router_js/lib/utils.js" } }, "typesVersions": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 48a0594172e..10851ddefd1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -65,6 +65,9 @@ importers: route-recognizer: specifier: ^0.3.4 version: 0.3.4 + rsvp: + specifier: ^4.8.5 + version: 4.8.5 semver: specifier: ^7.5.2 version: 7.7.4 @@ -228,9 +231,6 @@ importers: router_js: specifier: workspace:* version: link:packages/router_js - rsvp: - specifier: ^4.8.5 - version: 4.8.5 terser: specifier: ^5.42.0 version: 5.46.1 diff --git a/rollup.config.mjs b/rollup.config.mjs index 4865e5bbb68..4d10e0c7f49 100644 --- a/rollup.config.mjs +++ b/rollup.config.mjs @@ -253,7 +253,6 @@ function rolledUpPackages() { export function exposedDependencies() { return { 'backburner.js': require.resolve('backburner.js/dist/es6/backburner.js'), - rsvp: require.resolve('rsvp/lib/rsvp.js'), 'dag-map': require.resolve('dag-map/dag-map.js'), router_js: require.resolve('router_js'), 'route-recognizer': require.resolve('route-recognizer/dist/route-recognizer.es.js'), @@ -413,6 +412,10 @@ export function resolvePackages(deps, params) { return { external: true, id: pkgName }; } + if (pkgName === 'rsvp') { + return { external: true, id: pkgName }; + } + if (isExternal?.(source)) { return { external: true, id: source }; } @@ -537,9 +540,6 @@ function packageMeta() { } const allowedCycles = [ - // external and not causing problems - 'node_modules/rsvp/lib/rsvp', - // TODO: these would be good to fix once they're in this repo 'packages/@glimmer/debug', 'packages/@glimmer/runtime', From e32aff96926844420cc9e268240e603260ca21e0 Mon Sep 17 00:00:00 2001 From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com> Date: Tue, 5 May 2026 17:35:27 -0400 Subject: [PATCH 8/8] Optimization must be in userland :( --- .../v2-app-hello-world-template/vite.config.mjs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/smoke-tests/v2-app-hello-world-template/vite.config.mjs b/smoke-tests/v2-app-hello-world-template/vite.config.mjs index 09e1d1c0299..e02d2e47b50 100644 --- a/smoke-tests/v2-app-hello-world-template/vite.config.mjs +++ b/smoke-tests/v2-app-hello-world-template/vite.config.mjs @@ -3,6 +3,20 @@ import { extensions, ember } from '@embroider/vite'; import { babel } from '@rollup/plugin-babel'; export default defineConfig({ + build: { + rolldownOptions: { + treeshake: { + moduleSideEffects: [ + { test: /\.css$/, sideEffects: true }, + { test: /@ember/, sideEffects: false, external: false }, + { test: /router_js/, sideEffects: false, external: false }, + { test: /rsvp/, sideEffects: false, external: false }, + { test: /backburner/, sideEffects: false, external: false }, + ], + + } + } + }, plugins: [ ember(), babel({