From 8cb6316727c445c971192856a5275d5d57edae36 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sun, 6 Sep 2026 18:11:18 +0100 Subject: [PATCH 1/6] renable release scenario --- pnpm-lock.yaml | 480 +++++++++++++++++- .../ember-cli-fastboot-test.mjs | 2 +- test-packages/test-scenarios/package.json | 5 + test-packages/test-scenarios/scenarios.mjs | 18 +- 4 files changed, 493 insertions(+), 12 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5f82e051..d465bd8d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -745,6 +745,9 @@ importers: '@ember/string': specifier: ^4.0.1 version: 4.0.1 + '@ember/test-helpers': + specifier: ^5.4.3 + version: 5.4.3(@babel/core@7.29.7) body-parser: specifier: ^1.18.3 version: 1.20.3 @@ -772,18 +775,27 @@ importers: ember-cli-head-1.0: specifier: npm:ember-cli-head@^1.0.0 version: ember-cli-head@1.0.0 + ember-cli-htmlbars: + specifier: ^7.0.0 + version: 7.0.1(@babel/core@7.29.7)(ember-source@7.2.0(@glimmer/component@2.1.1)) + ember-cli-latest: + specifier: npm:ember-cli@latest + version: ember-cli@7.2.0(@babel/core@7.29.7)(@types/node@24.5.2)(ejs@3.1.10)(handlebars@4.7.8)(underscore@1.13.7) ember-data-5.8: specifier: npm:ember-data@~5.8.0 - version: ember-data@5.8.2(@babel/core@7.29.7)(@ember/test-helpers@5.4.3(@babel/core@7.29.7))(@ember/test-waiters@4.1.2)(ember-inflector@4.0.3(ember-source@6.12.0(@glimmer/component@2.1.1)(rsvp@4.8.5)))(qunit@2.24.1) + version: ember-data@5.8.2(@babel/core@7.29.7)(@ember/test-helpers@5.4.3(@babel/core@7.29.7))(@ember/test-waiters@4.1.2)(ember-inflector@4.0.3(ember-source@7.2.0(@glimmer/component@2.1.1)))(qunit@2.24.1) ember-page-title: specifier: ^9.0.3 version: 9.0.3 + ember-qunit: + specifier: ^9.1.0 + version: 9.1.0(@ember/test-helpers@5.4.3(@babel/core@7.29.7))(qunit@2.24.1) ember-resolver: specifier: ^13.2.0 version: 13.2.0 ember-service-import-polyfill: specifier: ^1.0.0 - version: 1.0.0(ember-source@6.12.0(@glimmer/component@2.1.1)(rsvp@4.8.5)) + version: 1.0.0(ember-source@7.2.0(@glimmer/component@2.1.1)) ember-source-3.16: specifier: npm:ember-source@~3.16.0 version: ember-source@3.16.10(@babel/core@7.29.7) @@ -799,6 +811,9 @@ importers: ember-source-6.12: specifier: npm:ember-source@~6.12.0 version: ember-source@6.12.0(@glimmer/component@2.1.1)(rsvp@4.8.5) + ember-source-latest: + specifier: npm:ember-source@latest + version: ember-source@7.2.0(@glimmer/component@2.1.1) eslint: specifier: ^8.48.0 version: 8.57.1 @@ -1235,6 +1250,12 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 + '@babel/plugin-syntax-typescript@7.29.7': + resolution: {integrity: sha512-ngr+82Sh0xMz25TPCZi+nC2iTzjfCdWS2ONXTp/PtSCHCgaCNBpdMqgvJ2ccdLlClVZ7sisIgB914j/JFe+RZA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + '@babel/plugin-syntax-unicode-sets-regex@7.18.6': resolution: {integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==} engines: {node: '>=6.9.0'} @@ -1805,6 +1826,12 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 + '@babel/plugin-transform-typescript@7.29.7': + resolution: {integrity: sha512-jK52h8LaLc7JarhQV2ofeFMts4H7vnOXnqZNA6fYglBTZewRBE51KWt3BUltW1P+KoPsYkHoJeXePuz4zo2LMw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + '@babel/plugin-transform-typescript@7.4.5': resolution: {integrity: sha512-RPB/YeGr4ZrFKNwfuQRlMf2lxoCUaU01MTw39/OFE/RiL8HDjtn68BwEPft1P7JN4akyEmjGWAMNldOV7o9V2g==} peerDependencies: @@ -2088,18 +2115,33 @@ packages: '@ember-tooling/blueprint-blueprint@0.2.1': resolution: {integrity: sha512-eZ5qicL3gfFFbmzLaSiEWPSmoRUJGnqg+dQmU0R81vv+0Ni7W/cS7MXx1l4HpN9B7Yg4M9GgdQTkeJnb6abQug==} + '@ember-tooling/blueprint-blueprint@0.3.0': + resolution: {integrity: sha512-9mwMGda8OC9oEJbvxnXX1DT5ZFR6YQumfmPwV+uUJCbGsaUkgr1UeTkcpgdL+Izvb4kjF/+BWcOtnaSvmR7Yig==} + '@ember-tooling/blueprint-model@0.5.0': resolution: {integrity: sha512-2zAebSmmzpUO2wt6EyfX5TlcmvB9cTkteuZ3QhPmXLMthUpU5nUifcz3hlYcXPK7WM0HdO9qL4GdGQCoxhzaGg==} + '@ember-tooling/blueprint-model@0.7.1': + resolution: {integrity: sha512-UqibAm7MWkSNdAnBfq2i36jaQpUjCvhdcRFiT+oWWXer5WgaoYFVJ+kHs5Ux2i42kCWjsztercepOEm+BhOyQw==} + '@ember-tooling/classic-build-addon-blueprint@6.12.0': resolution: {integrity: sha512-2sf34DIJO6RnpzcQy0A4RmGNwukE4vihHv/b9loDZzV4lnFNOTyHua09S5ai4szO7Iv91Q2OPEgOBo09yG+7SQ==} + '@ember-tooling/classic-build-addon-blueprint@7.2.0': + resolution: {integrity: sha512-/pUXRe2k6pZ4YVNAVMZfMdN00GUJgNrerNY2eajhUNgtTfQvdmK8MBNUNQ7e1fBC+x0UptR7lmQtVssDy2uKWw==} + '@ember-tooling/classic-build-app-blueprint@6.12.0': resolution: {integrity: sha512-dU6ig33VN+SA2yrkyJGdCMzJ6hB0fRVXpcSpnmWl2RI7TQCxlQsYR162BkMUdRN6ZWbycalDjWGW0r8KrIxzgA==} + '@ember-tooling/classic-build-app-blueprint@7.2.0': + resolution: {integrity: sha512-7CsesB6uM+0Ca1RqvzzHb+elXC7Bv2tj+t6KVEhhcDEqfyxvmtzjm4fnsO3g0hmFhm4buhJ+StyIiyd3owP1Lw==} + '@ember/app-blueprint@6.12.3': resolution: {integrity: sha512-Bf950zkgbKn6/pMunLTk/mkqInHU8CaNTvjR/umX1CjUNFRPTZPQb19OhstlBYTl+99jUN3feZ0xfuOt1t6c7A==} + '@ember/app-blueprint@7.2.1': + resolution: {integrity: sha512-Nxyirrm6rAnZwZUZlTahR34vyFpRYL8zGAbztBKu1kgXvl3TIceDjXgCxjRLFciNM6k/LGQOkkK5doNVxsT++w==} + '@ember/edition-utils@1.2.0': resolution: {integrity: sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==} @@ -3952,6 +3994,9 @@ packages: babel-remove-types@1.1.0: resolution: {integrity: sha512-2wszSY8Pll8uefPFrJcOb2cP67epjpDnLADtzgQ9u1WgFJmBdJAkx5MGISjFCg/56Q8YgzA/o9RBMpScjhf+dw==} + babel-remove-types@2.0.0: + resolution: {integrity: sha512-HHLQOs/c2h//gl7f5VDa/r1Nd2gIk0kgzC1v01BSCEK5IJu1Zc4/fUj5uYCzC8Q0NWiucCgWKr9a43qmHkY6oA==} + babel-runtime@6.26.0: resolution: {integrity: sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==} @@ -4100,6 +4145,10 @@ packages: resolution: {integrity: sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==} engines: {node: 18 || 20 || >=22} + brace-expansion@5.0.9: + resolution: {integrity: sha512-ScQ4IuvIEF1TMlP7Zt+vjJ//9zlPb2SDcxWxM3bk8s6t6GGdJ7KO1dCcTidOPJKePW30LE/2cT7wCyPho9/Wxg==} + engines: {node: 20 || >=22} + braces@1.8.5: resolution: {integrity: sha512-xU7bpz2ytJl1bH9cgIurjpg/n8Gohy9GTw81heDYLJQ4RU60dlyJsa+atVF2pI0yMMvKxI9HkKwjePCj5XI1hw==} engines: {node: '>=0.10.0'} @@ -4157,12 +4206,19 @@ packages: resolution: {integrity: sha512-dFB5ATPwOyV8S2I7a07HxCoutoq23oY//LhM6Mou86cWUTB174rND5aQLR7Fu8FjFFLxoTbkk7y0VPITJ1IQrw==} engines: {node: 10.* || >= 12.*} + broccoli-concat@4.2.7: + resolution: {integrity: sha512-JePfBFwHtZ2FR33PBZQA99/hQ4idIbZ205rH84Jw6vgkuKDRVXWVzZP2gvR2WXugXaQ1fj3+yO04b0QsstNHzQ==} + engines: {node: 10.* || >= 12.*} + broccoli-config-loader@1.0.1: resolution: {integrity: sha512-MDKYQ50rxhn+g17DYdfzfEM9DjTuSGu42Db37A8TQHQe8geYEcUZ4SQqZRgzdAI3aRQNlA1yBHJfOeGmOjhLIg==} broccoli-config-replace@1.1.2: resolution: {integrity: sha512-qLlEY3V7p3ZWJNRPdPgwIM77iau1qR03S9BupMMFngjzBr7S6RSzcg96HbCYXmW9gfTbjRm9FC4CQT81SBusZg==} + broccoli-config-replace@1.1.3: + resolution: {integrity: sha512-gWGS2h/2VyJnD9tI1/HzRsXLOptnt7tu+KLpfPuxd+DBcdswn/i0kyVrTxQpFy+C5eo2hBn672QAEZzf/7LlAA==} + broccoli-debug@0.6.5: resolution: {integrity: sha512-RIVjHvNar9EMCLDW/FggxFRXqpjhncM/3qq87bn/y+/zR9tqEkHvTqbyOc4QnB97NO2m6342w4wGkemkaeOuWg==} @@ -4211,6 +4267,10 @@ packages: resolution: {integrity: sha512-BK8aPhQpOLsHWiftrqXQr84XsvzUqeaN4PlCQOYg5yM0M+WKAHtX2WFXmicSQZOVgKDyh5aeoNTFkHjBAEBzwQ==} engines: {node: 6.* || 8.* || >= 10.*} + broccoli-middleware@2.1.2: + resolution: {integrity: sha512-hdJ5mPwvsQI/eDZbpztfaA0DNINqp/aHzEz4lPG8WCVOXUfbFdbiWO7nMu3v+mmwTcgRD2e8I4DVQ9J2AoYnPQ==} + engines: {node: 6.* || 8.* || >= 10.*} + broccoli-module-normalizer@1.3.0: resolution: {integrity: sha512-0idZCOtdVG6xXoQ36Psc1ApMCr3lW5DB+WEAOEwHcUoESIBHzwcRPQTxheGIjZ5o0hxpsRYAUH5x0ErtNezbrQ==} engines: {node: '>=4'} @@ -4806,6 +4866,10 @@ packages: resolution: {integrity: sha512-N4oog6YJWbR9kGyXvS7jEykLDXIE2C0ILYqNBZBp9iwiJpoCBWYsuAdW6PPFn6w06jjnC+3JstVvWHO4cZqvRg==} engines: {node: '>=18'} + configstore@8.0.0: + resolution: {integrity: sha512-U51WPZg+o6FDFhBCV6yYFEspGMCoHvCgJSGFw9AwsW2u75gYBPoDlYca5XfDs4TdMUu3/y0R6FFdvvgyH31mKQ==} + engines: {node: '>=20'} + connect@3.7.0: resolution: {integrity: sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==} engines: {node: '>= 0.10.0'} @@ -5539,6 +5603,10 @@ packages: dot-case@3.0.4: resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==} + dot-prop@10.2.0: + resolution: {integrity: sha512-BTJ9aZYL3vCfZlZOBLy9v8TUqWGQ0pzFnygKwFZt5udj6viBoFIBviKPUoZLDCPn1FoXffv6McQFDenrm5Krfw==} + engines: {node: '>=20'} + dot-prop@5.3.0: resolution: {integrity: sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==} engines: {node: '>=8'} @@ -5813,6 +5881,11 @@ packages: engines: {node: '>= 20.19.0'} hasBin: true + ember-cli@7.2.0: + resolution: {integrity: sha512-EafquLJ+EVHz0nNo32NWwAfHr5UxTXn9zdlukuKZFSFrR4G6RRStmBPQ5O0bLSaQVDtU+jOe5gGTHSS4Xy3uQA==} + engines: {node: '>= 20.19.0'} + hasBin: true + ember-compatibility-helpers@1.2.7: resolution: {integrity: sha512-BtkjulweiXo9c3yVWrtexw2dTmBrvavD/xixNC6TKOBdrixUwU+6nuOO9dufDWsMxoid7MvtmDpzc9+mE8PdaA==} engines: {node: 10.* || >= 12.*} @@ -5976,6 +6049,12 @@ packages: peerDependencies: '@glimmer/component': '>= 1.1.2' + ember-source@7.2.0: + resolution: {integrity: sha512-pWjYFeM76vAgiFvqrBacAsQh94vTIy8SC1X2S3goULJHJ5/tVWAZ2NtaLFx9oZd3/Lk0gGRdsCMla9rQY58vyw==} + engines: {node: '>= 20.19'} + peerDependencies: + '@glimmer/component': '>= 1.1.2' + ember-template-imports@3.4.2: resolution: {integrity: sha512-OS8TUVG2kQYYwP3netunLVfeijPoOKIs1SvPQRTNOQX4Pu8xGGBEZmrv0U1YTnQn12Eg+p6w/0UdGbUnITjyzw==} engines: {node: 12.* || >= 14} @@ -6919,6 +6998,10 @@ packages: resolution: {integrity: sha512-w8ZNZr2mKIc7qeNaQ9AVPT1+iFaI+Avd4xudVOvdDJ8VytREi1Ft5Ih7hd9jjehod8vAM5GMsfQ/TpPf4EyoEA==} engines: {node: '>=14.14'} + fs-extra@11.4.0: + resolution: {integrity: sha512-EQsFzMUJkCKGr1ePqlYADkIUmHW1s3ZXr5Yqy6wbGrfUCphpl2maM/kyOIRA2HpP3AaFQTZXD4ldjek+nccddA==} + engines: {node: '>=14.14'} + fs-extra@4.0.3: resolution: {integrity: sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==} @@ -7893,6 +7976,10 @@ packages: resolution: {integrity: sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==} engines: {node: '>=0.10.0'} + is-safe-filename@0.1.1: + resolution: {integrity: sha512-4SrR7AdnY11LHfDKTZY1u6Ga3RuxZdl3YKWWShO5iyuG5h8QS4GD2tOb04peBJ5I7pXbR+CGBNEhTcwK+FzN3g==} + engines: {node: '>=20'} + is-set@2.0.3: resolution: {integrity: sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==} engines: {node: '>= 0.4'} @@ -7996,6 +8083,10 @@ packages: resolution: {integrity: sha512-I+NmIfBHUl+r2wcDd6JwE9yWje/PIVY/R5/CmV8dXLZd5K+L9X2klAOwfAHNnondLXkbHyTAleQAWonpTJBTtw==} engines: {node: '>= 18.0.0'} + isbinaryfile@5.0.7: + resolution: {integrity: sha512-gnWD14Jh3FzS3CPhF0AxNOJ8CxqeblPTADzI38r0wt8ZyQl5edpy75myt08EG2oKvpyiqSqsx+Wkz9vtkbTqYQ==} + engines: {node: '>= 18.0.0'} + isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} @@ -8712,6 +8803,10 @@ packages: resolution: {integrity: sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==} engines: {node: 18 || 20 || >=22} + minimatch@10.2.6: + resolution: {integrity: sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==} + engines: {node: 18 || 20 || >=22} + minimatch@3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} @@ -8877,6 +8972,10 @@ packages: resolution: {integrity: sha512-223dMRJtI/l25dJKWpgij2cMtywuG/WiUKXdvwfbhGKBhy1puASqXwFzmWZ7+K73vUPoR7SS2Qz2cI/g9MKw0A==} engines: {node: '>= 0.8.0'} + morgan@1.12.0: + resolution: {integrity: sha512-OHpTRQwn2ezasILW8iKe+Yww1XsfWsZIpUOLF7RDb2g5GwO3trPaRwi7+8BDiJ7HFx2Kg2mfUdCBcVhwYlOz2g==} + engines: {node: '>= 0.8.0'} + mout@1.2.4: resolution: {integrity: sha512-mZb9uOruMWgn/fw28DG4/yE3Kehfk1zKCLhuDU2O3vlKdnBBr4XaOCqVTflJ5aODavGUPqFHZgrFX3NJVuxGhQ==} @@ -10346,6 +10445,9 @@ packages: resolution: {integrity: sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==} engines: {node: '>= 10.13.0'} + semver-deprecate@1.1.0: + resolution: {integrity: sha512-5AcYPbRIw9vs80YkyRxmm3Lbe88STkwNIpTKKX0Kxyy/T0yR05BTZ6JhV9B5pjTyc81SjztcFPY93kDPRFwlyA==} + semver@5.7.2: resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==} hasBin: true @@ -10936,6 +11038,10 @@ packages: resolution: {integrity: sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==} engines: {node: '>=10.0.0'} + tagged-tag@1.0.0: + resolution: {integrity: sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==} + engines: {node: '>=20'} + tap-parser@18.3.4: resolution: {integrity: sha512-CiqzdpWn2CvONcWp7UNMF9/rCPJwCz0es+qykkgJruu1Y/rAS8A5MEQujmjx9NErfst3dGiZJU3lDS2jBsgbPA==} engines: {node: 20 || >=22} @@ -11228,6 +11334,10 @@ packages: resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==} engines: {node: '>=16'} + type-fest@5.9.0: + resolution: {integrity: sha512-yANm3Jr3GiJ1qgJlxGAVxTOIcEOk1rhQHamlXtnrCK7EHP4HeM9OGxtMg/W7HFdrVzw/ZWJKGVIJusVH85sLtw==} + engines: {node: '>=20'} + type-is@1.6.18: resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==} engines: {node: '>= 0.6'} @@ -12310,6 +12420,11 @@ snapshots: '@babel/core': 7.29.7 '@babel/helper-plugin-utils': 7.29.7 + '@babel/plugin-syntax-typescript@7.29.7(@babel/core@7.29.7)': + dependencies: + '@babel/core': 7.29.7 + '@babel/helper-plugin-utils': 7.29.7 + '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.29.7)': dependencies: '@babel/core': 7.29.7 @@ -12939,6 +13054,17 @@ snapshots: transitivePeerDependencies: - supports-color + '@babel/plugin-transform-typescript@7.29.7(@babel/core@7.29.7)': + dependencies: + '@babel/core': 7.29.7 + '@babel/helper-annotate-as-pure': 7.29.7 + '@babel/helper-create-class-features-plugin': 7.29.7(@babel/core@7.29.7) + '@babel/helper-plugin-utils': 7.29.7 + '@babel/helper-skip-transparent-expression-wrappers': 7.29.7 + '@babel/plugin-syntax-typescript': 7.29.7(@babel/core@7.29.7) + transitivePeerDependencies: + - supports-color + '@babel/plugin-transform-typescript@7.4.5(@babel/core@7.29.7)': dependencies: '@babel/core': 7.29.7 @@ -13521,13 +13647,13 @@ snapshots: - '@babel/core' - supports-color - '@ember-data/request-utils@5.8.2(@babel/core@7.29.7)(ember-inflector@4.0.3(ember-source@6.12.0(@glimmer/component@2.1.1)(rsvp@4.8.5)))': + '@ember-data/request-utils@5.8.2(@babel/core@7.29.7)(ember-inflector@4.0.3(ember-source@7.2.0(@glimmer/component@2.1.1)))': dependencies: '@embroider/macros': 1.20.5 '@warp-drive/core': 5.8.2(@babel/core@7.29.7) '@warp-drive/utilities': 5.8.2(@warp-drive/core@5.8.2(@babel/core@7.29.7)) optionalDependencies: - ember-inflector: 4.0.3(ember-source@6.12.0(@glimmer/component@2.1.1)(rsvp@4.8.5)) + ember-inflector: 4.0.3(ember-source@7.2.0(@glimmer/component@2.1.1)) transitivePeerDependencies: - '@babel/core' - '@glint/template' @@ -13638,6 +13764,8 @@ snapshots: '@ember-tooling/blueprint-blueprint@0.2.1': {} + '@ember-tooling/blueprint-blueprint@0.3.0': {} + '@ember-tooling/blueprint-model@0.5.0': dependencies: chalk: 4.1.2 @@ -13650,6 +13778,30 @@ snapshots: transitivePeerDependencies: - supports-color + '@ember-tooling/blueprint-model@0.7.1': + dependencies: + babel-remove-types: 2.0.0 + chalk: 5.6.2 + content-tag: 4.2.0 + core-object: 3.1.5 + diff: 8.0.4 + ember-cli-normalize-entity-name: 1.0.0 + ember-cli-string-utils: 1.1.0 + fs-extra: 11.4.0 + heimdalljs-logger: 0.1.10 + inflection: 3.0.2 + isbinaryfile: 5.0.7 + lodash: 4.18.1 + markdown-it: 14.3.0 + markdown-it-terminal: 0.4.0(markdown-it@14.3.0) + minimatch: 10.2.6 + promise.hash.helper: 1.0.8 + quick-temp: 0.1.9 + silent-error: 1.1.1 + walk-sync: 4.0.2 + transitivePeerDependencies: + - supports-color + '@ember-tooling/classic-build-addon-blueprint@6.12.0': dependencies: '@ember-tooling/blueprint-model': 0.5.0 @@ -13664,6 +13816,20 @@ snapshots: transitivePeerDependencies: - supports-color + '@ember-tooling/classic-build-addon-blueprint@7.2.0': + dependencies: + '@ember-tooling/blueprint-model': 0.7.1 + chalk: 5.6.2 + ember-cli-normalize-entity-name: 1.0.0 + ember-cli-string-utils: 1.1.0 + fs-extra: 11.4.0 + lodash: 4.18.1 + 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.12.0': dependencies: '@ember-tooling/blueprint-model': 0.5.0 @@ -13672,6 +13838,14 @@ snapshots: transitivePeerDependencies: - supports-color + '@ember-tooling/classic-build-app-blueprint@7.2.0': + dependencies: + '@ember-tooling/blueprint-model': 0.7.1 + chalk: 5.6.2 + ember-cli-string-utils: 1.1.0 + transitivePeerDependencies: + - supports-color + '@ember/app-blueprint@6.12.3': dependencies: chalk: 4.1.2 @@ -13681,6 +13855,14 @@ snapshots: sort-package-json: 3.7.1 walk-sync: 3.0.0 + '@ember/app-blueprint@7.2.1': + dependencies: + ejs: 3.1.10 + ember-cli-string-utils: 1.1.0 + lodash: 4.18.1 + sort-package-json: 3.7.1 + walk-sync: 4.0.2 + '@ember/edition-utils@1.2.0': {} '@ember/optional-features@1.3.0': @@ -16272,6 +16454,15 @@ snapshots: transitivePeerDependencies: - supports-color + babel-remove-types@2.0.0: + dependencies: + '@babel/core': 7.29.7 + '@babel/plugin-syntax-decorators': 7.29.7(@babel/core@7.29.7) + '@babel/plugin-transform-typescript': 7.29.7(@babel/core@7.29.7) + prettier: 3.9.5 + transitivePeerDependencies: + - supports-color + babel-runtime@6.26.0: dependencies: core-js: 2.6.12 @@ -16478,6 +16669,10 @@ snapshots: dependencies: balanced-match: 4.0.4 + brace-expansion@5.0.9: + dependencies: + balanced-match: 4.0.4 + braces@1.8.5: dependencies: expand-range: 1.8.2 @@ -16647,6 +16842,19 @@ snapshots: transitivePeerDependencies: - supports-color + broccoli-concat@4.2.7: + dependencies: + broccoli-debug: 0.6.5 + broccoli-plugin: 4.0.7 + ensure-posix-path: 1.1.1 + fast-sourcemap-concat: 2.1.1 + find-index: 1.1.1 + fs-extra: 8.1.0 + fs-tree-diff: 2.0.1 + lodash: 4.18.1 + transitivePeerDependencies: + - supports-color + broccoli-config-loader@1.0.1: dependencies: broccoli-caching-writer: 3.0.3 @@ -16662,6 +16870,14 @@ snapshots: transitivePeerDependencies: - supports-color + broccoli-config-replace@1.1.3: + dependencies: + broccoli-plugin: 1.3.1 + debug: 2.6.9 + fs-extra: 0.24.0 + transitivePeerDependencies: + - supports-color + broccoli-debug@0.6.5: dependencies: broccoli-plugin: 1.3.1 @@ -16794,6 +17010,13 @@ snapshots: has-ansi: 3.0.0 mime-types: 2.1.35 + broccoli-middleware@2.1.2: + dependencies: + ansi-html: 0.0.9 + handlebars: 4.7.8 + has-ansi: 3.0.0 + mime-types: 2.1.35 + broccoli-module-normalizer@1.3.0: dependencies: broccoli-plugin: 1.3.1 @@ -17778,6 +18001,14 @@ snapshots: graceful-fs: 4.2.11 xdg-basedir: 5.1.0 + configstore@8.0.0: + dependencies: + atomically: 2.1.1 + dot-prop: 10.2.0 + graceful-fs: 4.2.11 + is-safe-filename: 0.1.1 + xdg-basedir: 5.1.0 + connect@3.7.0: dependencies: debug: 2.6.9 @@ -18193,6 +18424,10 @@ snapshots: no-case: 3.0.4 tslib: 2.8.1 + dot-prop@10.2.0: + dependencies: + type-fest: 5.9.0 + dot-prop@5.3.0: dependencies: is-obj: 2.0.0 @@ -18756,6 +18991,23 @@ snapshots: transitivePeerDependencies: - supports-color + ember-cli-htmlbars@7.0.1(@babel/core@7.29.7)(ember-source@7.2.0(@glimmer/component@2.1.1)): + dependencies: + '@babel/core': 7.29.7 + '@ember/edition-utils': 1.2.0 + babel-plugin-ember-template-compilation: 2.4.1 + broccoli-debug: 0.6.5 + broccoli-persistent-filter: 3.1.3 + broccoli-plugin: 4.0.7 + ember-source: 7.2.0(@glimmer/component@2.1.1) + fs-tree-diff: 2.0.1 + heimdalljs-logger: 0.1.10 + js-string-escape: 1.0.1 + silent-error: 1.1.1 + walk-sync: 4.0.2 + transitivePeerDependencies: + - supports-color + ember-cli-inject-live-reload@2.1.0: dependencies: clean-base-url: 1.0.0 @@ -19801,6 +20053,146 @@ snapshots: - walrus - whiskers + ember-cli@7.2.0(@babel/core@7.29.7)(@types/node@24.5.2)(ejs@3.1.10)(handlebars@4.7.8)(underscore@1.13.7): + dependencies: + '@ember-tooling/blueprint-blueprint': 0.3.0 + '@ember-tooling/blueprint-model': 0.7.1 + '@ember-tooling/classic-build-addon-blueprint': 7.2.0 + '@ember-tooling/classic-build-app-blueprint': 7.2.0 + '@ember/app-blueprint': 7.2.1 + '@pnpm/find-workspace-dir': 1000.1.5 + babel-remove-types: 2.0.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.2 + 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: 8.0.0 + console-ui: 3.1.2 + content-tag: 4.2.0 + 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.22 + find-up: 8.0.0 + find-yarn-workspace-root: 2.0.0 + fs-extra: 11.4.0 + 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.4.3(@types/node@24.5.2) + is-git-url: 1.0.0 + is-language-code: 5.1.3 + lodash: 4.18.1 + markdown-it: 14.3.0 + markdown-it-terminal: 0.4.0(markdown-it@14.3.0) + minimatch: 10.2.6 + morgan: 1.12.0 + 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.12 + resolve-package-path: 4.0.3 + safe-stable-stringify: 2.5.0 + sane: 5.0.1 + semver: 7.8.5 + semver-deprecate: 1.1.0 + silent-error: 1.1.1 + sort-package-json: 3.7.1 + symlink-or-copy: 1.3.1 + testem: 3.20.1(@babel/core@7.29.7)(ejs@3.1.10)(handlebars@4.7.8)(underscore@1.13.7) + tiny-lr: 2.0.0 + tree-sync: 2.1.0 + walk-sync: 4.0.2 + watch-detector: 1.0.2 + workerpool: 10.0.3 + 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-compatibility-helpers@1.2.7(@babel/core@7.29.7): dependencies: babel-plugin-debug-macros: 0.2.0(@babel/core@7.29.7) @@ -19853,7 +20245,7 @@ snapshots: - ember-source - supports-color - ember-data@5.8.2(@babel/core@7.29.7)(@ember/test-helpers@5.4.3(@babel/core@7.29.7))(@ember/test-waiters@4.1.2)(ember-inflector@4.0.3(ember-source@6.12.0(@glimmer/component@2.1.1)(rsvp@4.8.5)))(qunit@2.24.1): + ember-data@5.8.2(@babel/core@7.29.7)(@ember/test-helpers@5.4.3(@babel/core@7.29.7))(@ember/test-waiters@4.1.2)(ember-inflector@4.0.3(ember-source@7.2.0(@glimmer/component@2.1.1)))(qunit@2.24.1): dependencies: '@ember-data/adapter': 5.8.2(@babel/core@7.29.7) '@ember-data/debug': 5.8.2(@babel/core@7.29.7) @@ -19862,7 +20254,7 @@ snapshots: '@ember-data/legacy-compat': 5.8.2(@babel/core@7.29.7) '@ember-data/model': 5.8.2(@babel/core@7.29.7) '@ember-data/request': 5.8.2(@babel/core@7.29.7) - '@ember-data/request-utils': 5.8.2(@babel/core@7.29.7)(ember-inflector@4.0.3(ember-source@6.12.0(@glimmer/component@2.1.1)(rsvp@4.8.5))) + '@ember-data/request-utils': 5.8.2(@babel/core@7.29.7)(ember-inflector@4.0.3(ember-source@7.2.0(@glimmer/component@2.1.1))) '@ember-data/serializer': 5.8.2(@babel/core@7.29.7) '@ember-data/store': 5.8.2(@babel/core@7.29.7)(@ember-data/tracking@5.8.2(@babel/core@7.29.7)(@ember/test-waiters@4.1.2))(@ember/test-waiters@4.1.2) '@ember-data/tracking': 5.8.2(@babel/core@7.29.7)(@ember/test-waiters@4.1.2) @@ -19956,10 +20348,10 @@ snapshots: transitivePeerDependencies: - supports-color - ember-inflector@4.0.3(ember-source@6.12.0(@glimmer/component@2.1.1)(rsvp@4.8.5)): + ember-inflector@4.0.3(ember-source@7.2.0(@glimmer/component@2.1.1)): dependencies: ember-cli-babel: 7.26.11 - ember-source: 6.12.0(@glimmer/component@2.1.1)(rsvp@4.8.5) + ember-source: 7.2.0(@glimmer/component@2.1.1) transitivePeerDependencies: - supports-color optional: true @@ -20030,6 +20422,15 @@ snapshots: - webpack-cli - webpack-command + ember-qunit@9.1.0(@ember/test-helpers@5.4.3(@babel/core@7.29.7))(qunit@2.24.1): + dependencies: + '@ember/test-helpers': 5.4.3(@babel/core@7.29.7) + '@embroider/addon-shim': 1.10.3 + qunit: 2.24.1 + qunit-theme-ember: 1.0.0 + transitivePeerDependencies: + - supports-color + ember-qunit@9.1.0(@ember/test-helpers@5.4.3(@babel/core@7.29.7))(qunit@2.26.0): dependencies: '@ember/test-helpers': 5.4.3(@babel/core@7.29.7) @@ -20063,12 +20464,12 @@ snapshots: transitivePeerDependencies: - supports-color - ember-service-import-polyfill@1.0.0(ember-source@6.12.0(@glimmer/component@2.1.1)(rsvp@4.8.5)): + ember-service-import-polyfill@1.0.0(ember-source@7.2.0(@glimmer/component@2.1.1)): dependencies: '@babel/core': 7.29.7 ember-cli-babel: 8.3.1(@babel/core@7.29.7) ember-cli-version-checker: 5.1.2 - ember-source: 6.12.0(@glimmer/component@2.1.1)(rsvp@4.8.5) + ember-source: 7.2.0(@glimmer/component@2.1.1) transitivePeerDependencies: - supports-color @@ -20291,6 +20692,30 @@ snapshots: - rsvp - supports-color + ember-source@7.2.0(@glimmer/component@2.1.1): + dependencies: + '@babel/core': 7.29.7 + '@embroider/addon-shim': 1.10.3 + '@glimmer/component': 2.1.1 + '@simple-dom/interface': 1.4.0 + backburner.js: 2.8.0 + broccoli-file-creator: 2.1.1 + chalk: 4.1.2 + ember-cli-babel: 8.3.1(@babel/core@7.29.7) + ember-cli-get-component-path-option: 1.0.0 + ember-cli-normalize-entity-name: 1.0.0 + ember-cli-path-utils: 1.0.0 + ember-cli-string-utils: 1.1.0 + ember-cli-typescript-blueprint-polyfill: 0.1.0 + ember-router-generator: 2.0.0 + inflection: 2.0.1 + route-recognizer: 0.3.4 + semver: 7.8.5 + silent-error: 1.1.1 + simple-html-tokenizer: 0.5.11 + transitivePeerDependencies: + - supports-color + ember-template-imports@3.4.2: dependencies: babel-import-util: 0.2.0 @@ -21825,6 +22250,12 @@ snapshots: jsonfile: 6.2.0 universalify: 2.0.1 + fs-extra@11.4.0: + dependencies: + graceful-fs: 4.2.11 + jsonfile: 6.2.0 + universalify: 2.0.1 + fs-extra@4.0.3: dependencies: graceful-fs: 4.2.11 @@ -22956,6 +23387,8 @@ snapshots: is-retry-allowed@1.2.0: {} + is-safe-filename@0.1.1: {} + is-set@2.0.3: {} is-shared-array-buffer@1.0.4: @@ -23034,6 +23467,8 @@ snapshots: isbinaryfile@5.0.6: {} + isbinaryfile@5.0.7: {} + isexe@2.0.0: {} isexe@3.1.1: {} @@ -23866,6 +24301,10 @@ snapshots: dependencies: brace-expansion: 5.0.7 + minimatch@10.2.6: + dependencies: + brace-expansion: 5.0.9 + minimatch@3.1.2: dependencies: brace-expansion: 1.1.12 @@ -24025,6 +24464,16 @@ snapshots: transitivePeerDependencies: - supports-color + morgan@1.12.0: + dependencies: + basic-auth: 2.0.1 + debug: 2.6.9 + depd: 2.0.0 + on-finished: 2.4.1 + on-headers: 1.1.0 + transitivePeerDependencies: + - supports-color + mout@1.2.4: {} move-concurrently@1.0.1: @@ -25599,6 +26048,11 @@ snapshots: ajv-formats: 2.1.1 ajv-keywords: 5.1.0(ajv@8.17.1) + semver-deprecate@1.1.0: + dependencies: + chalk: 5.6.2 + semver: 7.8.5 + semver@5.7.2: {} semver@6.3.1: {} @@ -26387,6 +26841,8 @@ snapshots: string-width: 4.2.3 strip-ansi: 6.0.1 + tagged-tag@1.0.0: {} + tap-parser@18.3.4: dependencies: events-to-array: 2.0.3 @@ -26845,6 +27301,10 @@ snapshots: type-fest@4.41.0: {} + type-fest@5.9.0: + dependencies: + tagged-tag: 1.0.0 + type-is@1.6.18: dependencies: media-typer: 0.3.0 diff --git a/test-packages/test-scenarios/ember-cli-fastboot-test.mjs b/test-packages/test-scenarios/ember-cli-fastboot-test.mjs index 6a265817..c91b43d3 100644 --- a/test-packages/test-scenarios/ember-cli-fastboot-test.mjs +++ b/test-packages/test-scenarios/ember-cli-fastboot-test.mjs @@ -51,7 +51,7 @@ appScenarios return process.stop(); }); - test(`provides sandbox globals with ender mode ${renderMode}`, async function (assert) { + test(`provides sandbox globals with render mode ${renderMode}`, async function (assert) { process = await emberServe( app, renderMode === 'rehydrate' diff --git a/test-packages/test-scenarios/package.json b/test-packages/test-scenarios/package.json index 33e4fdc2..974d47f7 100644 --- a/test-packages/test-scenarios/package.json +++ b/test-packages/test-scenarios/package.json @@ -10,6 +10,7 @@ }, "devDependencies": { "@ember/string": "^4.0.1", + "@ember/test-helpers": "^5.4.3", "body-parser": "^1.18.3", "chai": "^4.3.7", "ember-cli-3.16": "npm:ember-cli@~3.16.0", @@ -17,10 +18,13 @@ "ember-cli-4.12": "npm:ember-cli@~4.12.0", "ember-cli-5.12": "npm:ember-cli@~5.12.0", "ember-cli-6.12": "npm:ember-cli@~6.12.0", + "ember-cli-latest": "npm:ember-cli@latest", "ember-cli-head": "^2.0.0", "ember-cli-head-1.0": "npm:ember-cli-head@^1.0.0", + "ember-cli-htmlbars": "^7.0.0", "ember-data-5.8": "npm:ember-data@~5.8.0", "ember-page-title": "^9.0.3", + "ember-qunit": "^9.1.0", "ember-resolver": "^13.2.0", "ember-service-import-polyfill": "^1.0.0", "ember-source-3.16": "npm:ember-source@~3.16.0", @@ -28,6 +32,7 @@ "ember-source-4.12": "npm:ember-source@~4.12.0", "ember-source-5.12": "npm:ember-source@~5.12.0", "ember-source-6.12": "npm:ember-source@~6.12.0", + "ember-source-latest": "npm:ember-source@latest", "eslint": "^8.48.0", "eslint-config-prettier": "^9.0.0", "eslint-plugin-n": "^16.0.1", diff --git a/test-packages/test-scenarios/scenarios.mjs b/test-packages/test-scenarios/scenarios.mjs index 4add1fa9..f941534e 100644 --- a/test-packages/test-scenarios/scenarios.mjs +++ b/test-packages/test-scenarios/scenarios.mjs @@ -58,6 +58,21 @@ async function lts_6_12(project) { project.linkDevDependency('ember-page-title', { baseDir: '.' }); } +/** + * @param {Project} project + */ +async function release(project) { + project.linkDevDependency('ember-source', { baseDir: '.', resolveName: 'ember-source-latest' }); + project.linkDevDependency('ember-cli', { baseDir: '.', resolveName: 'ember-cli-latest' }); + project.linkDevDependency('ember-data', { baseDir: '.', resolveName: 'ember-data-5.8' }); + project.linkDevDependency('@ember/string', { baseDir: '.' }); + project.linkDevDependency('ember-resolver', { baseDir: '.' }); + project.linkDevDependency('ember-page-title', { baseDir: '.' }); + project.linkDevDependency('ember-cli-htmlbars', { baseDir: '.' }); + project.linkDevDependency('@ember/test-helpers', { baseDir: '.' }); + project.linkDevDependency('ember-qunit', { baseDir: '.' }); +} + /** * * @param {Scenarios} scenarios @@ -70,8 +85,9 @@ function supportMatrix(scenarios) { lts_4_12, lts_5_12, lts_6_12, + release, // TODO add these when they are working - // release, + // beta, // canary, }); } From fb7373a746a976498c74b01a52f01e5622e92ccf Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Sun, 6 Sep 2026 23:24:23 +0100 Subject: [PATCH 2/6] fix service injections --- pnpm-lock.yaml | 233 ++++++++++-------- .../classic-app-template/package.json | 1 + .../fastboot-config-location-test.mjs | 2 - .../fastboot-express-middleware-test.mjs | 2 - .../test-scenarios/fastboot-shoebox-test.mjs | 2 - .../app/controllers/list-cookies.js | 6 +- .../app/controllers/list-headers.js | 6 +- .../app/controllers/list-query-params.js | 6 +- .../app/controllers/show-body.js | 6 +- .../app/controllers/show-host.js | 6 +- .../app/controllers/show-method.js | 6 +- .../app/controllers/show-path.js | 6 +- .../app/controllers/show-protocol.js | 6 +- .../fixtures/request-details/app/router.js | 14 +- .../app/routes/list-cookies.js | 10 +- .../app/routes/list-headers.js | 10 +- .../app/routes/list-query-params.js | 10 +- .../request-details/app/routes/show-body.js | 10 +- .../request-details/app/routes/show-host.js | 10 +- .../request-details/app/routes/show-method.js | 10 +- .../request-details/app/routes/show-path.js | 10 +- .../app/routes/show-protocol.js | 10 +- .../test-scenarios/integration-tests-test.mjs | 3 - test-packages/test-scenarios/package.json | 2 + test-packages/test-scenarios/scenarios.mjs | 2 + 25 files changed, 204 insertions(+), 185 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d465bd8d..e49e727e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -490,6 +490,9 @@ importers: ember-resolver: specifier: ^8.0.3 version: 8.1.0(@babel/core@7.29.7) + ember-service-import-polyfill: + specifier: ^1.0.0 + version: 1.0.0(ember-source@3.28.12(@babel/core@7.29.7)) ember-source: specifier: ~3.28.8 version: 3.28.12(@babel/core@7.29.7) @@ -742,6 +745,9 @@ importers: test-packages/test-scenarios: devDependencies: + '@babel/core': + specifier: ^7.29.7 + version: 7.29.7 '@ember/string': specifier: ^4.0.1 version: 4.0.1 @@ -769,6 +775,9 @@ importers: ember-cli-6.12: specifier: npm:ember-cli@~6.12.0 version: ember-cli@6.12.0(@babel/core@7.29.7)(@types/node@24.5.2)(ejs@3.1.10)(handlebars@4.7.8)(underscore@1.13.7) + ember-cli-babel: + specifier: ^8.3.2 + version: 8.3.2(@babel/core@7.29.7) ember-cli-head: specifier: ^2.0.0 version: 2.0.0 @@ -921,12 +930,6 @@ packages: resolution: {integrity: sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==} engines: {node: '>=6.9.0'} - '@babel/helper-create-class-features-plugin@7.28.3': - resolution: {integrity: sha512-V9f6ZFIYSLNEbuGA/92uOvYsGCJNsuA8ESZ4ldc09bWk/j8H8TKiPw8Mk1eG6olpnO0ALHJmYfZvF4MEE4gajg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - '@babel/helper-create-class-features-plugin@7.29.7': resolution: {integrity: sha512-IY3ZD9Tmooqr3TUhc3DUWxiuo8xx1DWLhd5M7hQ+ZWJamqM2BbalrBJb2MisSLoYorOj75U03qULCxQTY9r3hg==} engines: {node: '>=6.9.0'} @@ -963,10 +966,6 @@ packages: resolution: {integrity: sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==} engines: {node: '>=6.9.0'} - '@babel/helper-member-expression-to-functions@7.27.1': - resolution: {integrity: sha512-E5chM8eWjTp/aNoVpcbfM7mLxu9XGLWYise2eBKGQomAk/Mb4XoxyqXTZbuTohbsl8EKqdlMhnDI2CCLfcs9wA==} - engines: {node: '>=6.9.0'} - '@babel/helper-member-expression-to-functions@7.29.7': resolution: {integrity: sha512-j+7JYmk1JYDtACIGj0QJqqWZjoUpMoEikQGADMaHgCMCSDqd2+P32rfcibUNrGOMWrlzK1WJBdxrB3JJQZwWtg==} engines: {node: '>=6.9.0'} @@ -985,10 +984,6 @@ packages: peerDependencies: '@babel/core': ^7.0.0 - '@babel/helper-optimise-call-expression@7.27.1': - resolution: {integrity: sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==} - engines: {node: '>=6.9.0'} - '@babel/helper-optimise-call-expression@7.29.7': resolution: {integrity: sha512-+kmGVjcT9RGYzoDwdwEqEvGgKe3BYq+O1iGzjFubaNgZHwYHP6lsF2Yghf4kEuv9BV7tYDZ913aBW9am6YKong==} engines: {node: '>=6.9.0'} @@ -1013,12 +1008,6 @@ packages: peerDependencies: '@babel/core': ^7.0.0 - '@babel/helper-replace-supers@7.27.1': - resolution: {integrity: sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - '@babel/helper-replace-supers@7.29.7': resolution: {integrity: sha512-atfGXWSeCiF4DnKZIfmJfQRkSw9b9gNNXR1kqKjbhG4pGYCOnkp8OcTB8E3NXjBu8NpheSnOeNKz8KT7UNFTmQ==} engines: {node: '>=6.9.0'} @@ -1760,6 +1749,12 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 + '@babel/plugin-transform-runtime@7.29.7': + resolution: {integrity: sha512-xmAscdE/AsqRW7vutbPNoUmu/nF5SrLKPs7aoJgEjo35lLKA/Bc0i2rMv/hr1+Y0o1bQCiVtith3u2vdgRL39Q==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + '@babel/plugin-transform-shorthand-properties@7.27.1': resolution: {integrity: sha512-N/wH1vcn4oYawbJ13Y/FxcQrWk63jhfNa7jef0ih7PHSIHX2LB7GWE1rkPrOnka9kwMxb6hMl19p7lidA+EHmQ==} engines: {node: '>=6.9.0'} @@ -1923,6 +1918,10 @@ packages: resolution: {integrity: sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==} engines: {node: '>=6.9.0'} + '@babel/runtime@7.29.7': + resolution: {integrity: sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==} + engines: {node: '>=6.9.0'} + '@babel/template@7.29.7': resolution: {integrity: sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==} engines: {node: '>=6.9.0'} @@ -4365,6 +4364,9 @@ packages: resolution: {integrity: sha512-NXfi+Vas24n3Ivo21GvENTI55qxKu7OwKRnCLWXld8MiLiQKQlWIq28eoARaFj0lTUFwUa4jKZeA7fW9PiWQeg==} engines: {node: 8.* || >= 10.*} + broccoli-string-replace@0.1.2: + resolution: {integrity: sha512-QHESTrrrPlKuXQNWsvXawSQbV2g34wCZ5oKgd6bntdOuN8VHxbg1BCBHqVY5HxXJhWelimgGxj3vI7ECkyij8g==} + broccoli-templater@2.0.2: resolution: {integrity: sha512-71KpNkc7WmbEokTQpGcbGzZjUIY1NSVa3GB++KFKAfx5SZPUozCOsBlSTwxcv8TLoCAqbBnsX5AQPgg6vJ2l9g==} engines: {node: 6.* || >= 8.*} @@ -5702,6 +5704,12 @@ packages: peerDependencies: '@babel/core': ^7.12.0 + ember-cli-babel@8.3.2: + resolution: {integrity: sha512-Thvqx+jwGYhimYbkkL0gwhwMlhghTIR3uQ9R0yNaTjBIttZIfSWJ/2W40kaJlwhnsElXq7zbFjZcff22p6nzCg==} + engines: {node: 16.* || 18.* || >= 20} + peerDependencies: + '@babel/core': ^7.12.0 + ember-cli-clean-css@3.0.0: resolution: {integrity: sha512-BbveJCyRvzzkaTH1llLW+MpHe/yzA5zpHOpMIg2vp/3JD9mban9zUm7lphaB0TSpPuMuby9rAhTI8pgXq0ifIA==} engines: {node: 16.* || >= 18} @@ -12032,19 +12040,6 @@ snapshots: lru-cache: 5.1.1 semver: 6.3.1 - '@babel/helper-create-class-features-plugin@7.28.3(@babel/core@7.29.7)': - dependencies: - '@babel/core': 7.29.7 - '@babel/helper-annotate-as-pure': 7.29.7 - '@babel/helper-member-expression-to-functions': 7.27.1 - '@babel/helper-optimise-call-expression': 7.27.1 - '@babel/helper-replace-supers': 7.27.1(@babel/core@7.29.7) - '@babel/helper-skip-transparent-expression-wrappers': 7.29.7 - '@babel/traverse': 7.29.7 - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - '@babel/helper-create-class-features-plugin@7.29.7(@babel/core@7.29.7)': dependencies: '@babel/core': 7.29.7 @@ -12098,13 +12093,6 @@ snapshots: '@babel/helper-globals@7.29.7': {} - '@babel/helper-member-expression-to-functions@7.27.1': - dependencies: - '@babel/traverse': 7.29.7 - '@babel/types': 7.29.7 - transitivePeerDependencies: - - supports-color - '@babel/helper-member-expression-to-functions@7.29.7': dependencies: '@babel/traverse': 7.29.7 @@ -12135,10 +12123,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-optimise-call-expression@7.27.1': - dependencies: - '@babel/types': 7.29.7 - '@babel/helper-optimise-call-expression@7.29.7': dependencies: '@babel/types': 7.29.7 @@ -12165,15 +12149,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/helper-replace-supers@7.27.1(@babel/core@7.29.7)': - dependencies: - '@babel/core': 7.29.7 - '@babel/helper-member-expression-to-functions': 7.29.7 - '@babel/helper-optimise-call-expression': 7.29.7 - '@babel/traverse': 7.29.7 - transitivePeerDependencies: - - supports-color - '@babel/helper-replace-supers@7.29.7(@babel/core@7.29.7)': dependencies: '@babel/core': 7.29.7 @@ -12225,7 +12200,7 @@ snapshots: '@babel/highlight@7.25.9': dependencies: - '@babel/helper-validator-identifier': 7.27.1 + '@babel/helper-validator-identifier': 7.29.7 chalk: 2.4.2 js-tokens: 4.0.0 picocolors: 1.1.1 @@ -12287,7 +12262,7 @@ snapshots: '@babel/core': 7.29.7 '@babel/helper-plugin-utils': 7.29.7 '@babel/helper-skip-transparent-expression-wrappers': 7.29.7 - '@babel/plugin-transform-optional-chaining': 7.27.1(@babel/core@7.29.7) + '@babel/plugin-transform-optional-chaining': 7.29.7(@babel/core@7.29.7) transitivePeerDependencies: - supports-color @@ -12428,7 +12403,7 @@ snapshots: '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.29.7)': dependencies: '@babel/core': 7.29.7 - '@babel/helper-create-regexp-features-plugin': 7.27.1(@babel/core@7.29.7) + '@babel/helper-create-regexp-features-plugin': 7.29.7(@babel/core@7.29.7) '@babel/helper-plugin-utils': 7.29.7 '@babel/plugin-transform-arrow-functions@7.27.1(@babel/core@7.29.7)': @@ -12621,7 +12596,7 @@ snapshots: dependencies: '@babel/core': 7.29.7 '@babel/helper-plugin-utils': 7.29.7 - '@babel/plugin-transform-destructuring': 7.28.0(@babel/core@7.29.7) + '@babel/plugin-transform-destructuring': 7.29.7(@babel/core@7.29.7) transitivePeerDependencies: - supports-color @@ -12847,8 +12822,8 @@ snapshots: '@babel/core': 7.29.7 '@babel/helper-compilation-targets': 7.29.7 '@babel/helper-plugin-utils': 7.29.7 - '@babel/plugin-transform-destructuring': 7.28.0(@babel/core@7.29.7) - '@babel/plugin-transform-parameters': 7.27.7(@babel/core@7.29.7) + '@babel/plugin-transform-destructuring': 7.29.7(@babel/core@7.29.7) + '@babel/plugin-transform-parameters': 7.29.7(@babel/core@7.29.7) '@babel/traverse': 7.29.7 transitivePeerDependencies: - supports-color @@ -12987,6 +12962,18 @@ snapshots: transitivePeerDependencies: - supports-color + '@babel/plugin-transform-runtime@7.29.7(@babel/core@7.29.7)': + dependencies: + '@babel/core': 7.29.7 + '@babel/helper-module-imports': 7.29.7 + '@babel/helper-plugin-utils': 7.29.7 + babel-plugin-polyfill-corejs2: 0.4.17(@babel/core@7.29.7) + babel-plugin-polyfill-corejs3: 0.13.0(@babel/core@7.29.7) + babel-plugin-polyfill-regenerator: 0.6.8(@babel/core@7.29.7) + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + '@babel/plugin-transform-shorthand-properties@7.27.1(@babel/core@7.29.7)': dependencies: '@babel/core': 7.29.7 @@ -13069,14 +13056,14 @@ snapshots: dependencies: '@babel/core': 7.29.7 '@babel/helper-plugin-utils': 7.29.7 - '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.29.7) + '@babel/plugin-syntax-typescript': 7.29.7(@babel/core@7.29.7) '@babel/plugin-transform-typescript@7.5.5(@babel/core@7.29.7)': dependencies: '@babel/core': 7.29.7 - '@babel/helper-create-class-features-plugin': 7.28.3(@babel/core@7.29.7) - '@babel/helper-plugin-utils': 7.27.1 - '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.29.7) + '@babel/helper-create-class-features-plugin': 7.29.7(@babel/core@7.29.7) + '@babel/helper-plugin-utils': 7.29.7 + '@babel/plugin-syntax-typescript': 7.29.7(@babel/core@7.29.7) transitivePeerDependencies: - supports-color @@ -13085,7 +13072,7 @@ snapshots: '@babel/core': 7.29.7 '@babel/helper-create-class-features-plugin': 7.29.7(@babel/core@7.29.7) '@babel/helper-plugin-utils': 7.29.7 - '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.29.7) + '@babel/plugin-syntax-typescript': 7.29.7(@babel/core@7.29.7) transitivePeerDependencies: - supports-color @@ -13306,6 +13293,8 @@ snapshots: '@babel/runtime@7.28.4': {} + '@babel/runtime@7.29.7': {} + '@babel/template@7.29.7': dependencies: '@babel/code-frame': 7.29.7 @@ -13582,7 +13571,7 @@ snapshots: npm-git-info: 1.0.3 rimraf: 3.0.2 rsvp: 4.8.5 - semver: 7.7.2 + semver: 7.8.5 silent-error: 1.1.1 transitivePeerDependencies: - '@babel/core' @@ -13614,7 +13603,7 @@ snapshots: npm-git-info: 1.0.3 rimraf: 3.0.2 rsvp: 4.8.5 - semver: 7.7.2 + semver: 7.8.5 silent-error: 1.1.1 transitivePeerDependencies: - '@babel/core' @@ -13915,15 +13904,16 @@ snapshots: '@ember/string@4.0.1': {} - '@ember/test-helpers@1.7.3': + '@ember/test-helpers@1.7.3(@babel/core@7.29.7)': dependencies: broccoli-debug: 0.6.5 broccoli-funnel: 2.0.2 - ember-assign-polyfill: 2.7.3 + ember-assign-polyfill: 2.7.3(@babel/core@7.29.7) ember-cli-babel: 7.26.11 ember-cli-htmlbars-inline-precompile: 2.1.0(ember-cli-babel@7.26.11) ember-test-waiters: 1.2.0 transitivePeerDependencies: + - '@babel/core' - supports-color '@ember/test-helpers@2.9.6(@babel/core@7.29.7)(ember-source@3.28.12(@babel/core@7.29.7))': @@ -13959,7 +13949,7 @@ snapshots: calculate-cache-key-for-tree: 2.0.0 ember-cli-babel: 7.26.11 ember-cli-version-checker: 5.1.2 - semver: 7.7.2 + semver: 7.8.5 transitivePeerDependencies: - supports-color @@ -14004,7 +13994,7 @@ snapshots: js-string-escape: 1.0.1 lodash: 4.17.21 resolve-package-path: 4.0.3 - semver: 7.7.2 + semver: 7.8.5 typescript-memoize: 1.1.1 '@embroider/shared-internals@2.9.1': @@ -14019,7 +14009,7 @@ snapshots: minimatch: 3.1.2 pkg-entry-points: 1.1.1 resolve-package-path: 4.0.3 - semver: 7.7.2 + semver: 7.8.5 typescript-memoize: 1.1.1 transitivePeerDependencies: - supports-color @@ -14037,7 +14027,7 @@ snapshots: pkg-entry-points: 1.1.1 resolve-package-path: 4.0.3 resolve.exports: 2.0.3 - semver: 7.7.2 + semver: 7.8.5 typescript-memoize: 1.1.1 transitivePeerDependencies: - supports-color @@ -15234,7 +15224,7 @@ snapshots: '@types/minimatch@6.0.0': dependencies: - minimatch: 9.0.5 + minimatch: 10.2.6 '@types/node@24.5.2': dependencies: @@ -16188,8 +16178,8 @@ snapshots: babel-plugin-polyfill-corejs3@0.13.0(@babel/core@7.29.7): dependencies: '@babel/core': 7.29.7 - '@babel/helper-define-polyfill-provider': 0.6.5(@babel/core@7.29.7) - core-js-compat: 3.45.1 + '@babel/helper-define-polyfill-provider': 0.6.8(@babel/core@7.29.7) + core-js-compat: 3.49.0 transitivePeerDependencies: - supports-color @@ -17256,6 +17246,13 @@ snapshots: transitivePeerDependencies: - supports-color + broccoli-string-replace@0.1.2: + dependencies: + broccoli-persistent-filter: 1.4.6 + minimatch: 3.1.5 + transitivePeerDependencies: + - supports-color + broccoli-templater@2.0.2: dependencies: broccoli-plugin: 1.3.1 @@ -17487,7 +17484,7 @@ snapshots: builtins@5.1.0: dependencies: - semver: 7.7.2 + semver: 7.8.5 bytes@1.0.0: {} @@ -18191,7 +18188,7 @@ snapshots: postcss-modules-values: 4.0.0(postcss@8.5.6) postcss-value-parser: 4.2.0 schema-utils: 3.3.0 - semver: 7.7.2 + semver: 7.8.5 webpack: 5.101.3 css-loader@5.2.7(webpack@5.108.4): @@ -18205,7 +18202,7 @@ snapshots: postcss-modules-values: 4.0.0(postcss@8.5.6) postcss-value-parser: 4.2.0 schema-utils: 3.3.0 - semver: 7.7.2 + semver: 7.8.5 webpack: 5.108.4 css-tree@2.3.1: @@ -18485,11 +18482,12 @@ snapshots: minimalistic-assert: 1.0.1 minimalistic-crypto-utils: 1.0.1 - ember-assign-polyfill@2.7.3: + ember-assign-polyfill@2.7.3(@babel/core@7.29.7): dependencies: - ember-cli-babel: 7.26.11 + ember-cli-babel: 8.3.2(@babel/core@7.29.7) ember-cli-version-checker: 2.2.0 transitivePeerDependencies: + - '@babel/core' - supports-color ember-auto-import@1.12.2: @@ -18820,6 +18818,40 @@ snapshots: transitivePeerDependencies: - supports-color + ember-cli-babel@8.3.2(@babel/core@7.29.7): + dependencies: + '@babel/core': 7.29.7 + '@babel/helper-compilation-targets': 7.29.7 + '@babel/plugin-proposal-decorators': 7.29.7(@babel/core@7.29.7) + '@babel/plugin-transform-class-properties': 7.29.7(@babel/core@7.29.7) + '@babel/plugin-transform-class-static-block': 7.29.7(@babel/core@7.29.7) + '@babel/plugin-transform-modules-amd': 7.29.7(@babel/core@7.29.7) + '@babel/plugin-transform-private-methods': 7.29.7(@babel/core@7.29.7) + '@babel/plugin-transform-private-property-in-object': 7.29.7(@babel/core@7.29.7) + '@babel/plugin-transform-runtime': 7.29.7(@babel/core@7.29.7) + '@babel/plugin-transform-typescript': 7.29.7(@babel/core@7.29.7) + '@babel/preset-env': 7.29.7(@babel/core@7.29.7) + '@babel/runtime': 7.29.7 + amd-name-resolver: 1.3.1 + babel-plugin-debug-macros: 0.3.4(@babel/core@7.29.7) + babel-plugin-ember-data-packages-polyfill: 0.1.2 + babel-plugin-ember-modules-api-polyfill: 3.5.0 + babel-plugin-module-resolver: 5.0.2 + broccoli-babel-transpiler: 8.0.2(@babel/core@7.29.7) + broccoli-debug: 0.6.5 + broccoli-funnel: 3.0.8 + broccoli-source: 3.0.1 + broccoli-string-replace: 0.1.2 + calculate-cache-key-for-tree: 2.0.0 + clone: 2.1.2 + ember-cli-babel-plugin-helpers: 1.1.1 + ember-cli-version-checker: 5.1.2 + ensure-posix-path: 1.1.1 + resolve-package-path: 4.0.3 + semver: 7.8.5 + transitivePeerDependencies: + - supports-color + ember-cli-clean-css@3.0.0: dependencies: broccoli-persistent-filter: 3.1.3 @@ -18968,7 +19000,7 @@ snapshots: hash-for-dep: 1.5.1 heimdalljs-logger: 0.1.10 js-string-escape: 1.0.1 - semver: 7.7.2 + semver: 7.8.5 silent-error: 1.1.1 walk-sync: 2.2.0 transitivePeerDependencies: @@ -19143,7 +19175,7 @@ snapshots: fs-extra: 9.1.0 resolve: 1.22.12 rsvp: 4.8.5 - semver: 7.7.2 + semver: 7.8.5 stagehand: 1.0.1 walk-sync: 2.2.0 transitivePeerDependencies: @@ -20393,7 +20425,7 @@ snapshots: ember-qunit@4.6.0(@babel/core@7.29.7): dependencies: - '@ember/test-helpers': 1.7.3 + '@ember/test-helpers': 1.7.3(@babel/core@7.29.7) broccoli-funnel: 2.0.2 broccoli-merge-trees: 3.0.2 common-tags: 1.8.2 @@ -20458,16 +20490,25 @@ snapshots: ember-router-generator@2.0.0: dependencies: - '@babel/parser': 7.28.4 - '@babel/traverse': 7.28.4 + '@babel/parser': 7.29.7 + '@babel/traverse': 7.29.7 recast: 0.18.10 transitivePeerDependencies: - supports-color + ember-service-import-polyfill@1.0.0(ember-source@3.28.12(@babel/core@7.29.7)): + dependencies: + '@babel/core': 7.29.7 + ember-cli-babel: 8.3.2(@babel/core@7.29.7) + ember-cli-version-checker: 5.1.2 + ember-source: 3.28.12(@babel/core@7.29.7) + transitivePeerDependencies: + - supports-color + ember-service-import-polyfill@1.0.0(ember-source@7.2.0(@glimmer/component@2.1.1)): dependencies: '@babel/core': 7.29.7 - ember-cli-babel: 8.3.1(@babel/core@7.29.7) + ember-cli-babel: 8.3.2(@babel/core@7.29.7) ember-cli-version-checker: 5.1.2 ember-source: 7.2.0(@glimmer/component@2.1.1) transitivePeerDependencies: @@ -20640,7 +20681,7 @@ snapshots: broccoli-merge-trees: 4.2.0 chalk: 4.1.2 ember-auto-import: 2.13.1 - ember-cli-babel: 8.3.1(@babel/core@7.29.7) + ember-cli-babel: 8.3.2(@babel/core@7.29.7) ember-cli-get-component-path-option: 1.0.0 ember-cli-is-package-missing: 1.0.0 ember-cli-normalize-entity-name: 1.0.0 @@ -20673,7 +20714,7 @@ snapshots: broccoli-funnel: 3.0.8 broccoli-merge-trees: 4.2.0 chalk: 4.1.2 - ember-cli-babel: 8.3.1(@babel/core@7.29.7) + ember-cli-babel: 8.3.2(@babel/core@7.29.7) ember-cli-get-component-path-option: 1.0.0 ember-cli-is-package-missing: 1.0.0 ember-cli-normalize-entity-name: 1.0.0 @@ -20701,7 +20742,7 @@ snapshots: backburner.js: 2.8.0 broccoli-file-creator: 2.1.1 chalk: 4.1.2 - ember-cli-babel: 8.3.1(@babel/core@7.29.7) + ember-cli-babel: 8.3.2(@babel/core@7.29.7) ember-cli-get-component-path-option: 1.0.0 ember-cli-normalize-entity-name: 1.0.0 ember-cli-path-utils: 1.0.0 @@ -20834,7 +20875,7 @@ snapshots: lodash: 4.17.21 package-json: 6.5.0 remote-git-tags: 3.0.0 - semver: 7.7.2 + semver: 7.8.5 transitivePeerDependencies: - encoding @@ -21075,12 +21116,12 @@ snapshots: eslint-compat-utils@0.5.1(eslint@8.57.1): dependencies: eslint: 8.57.1 - semver: 7.7.2 + semver: 7.8.5 eslint-compat-utils@0.5.1(eslint@9.39.5): dependencies: eslint: 9.39.5 - semver: 7.7.2 + semver: 7.8.5 eslint-config-prettier@6.15.0(eslint@6.8.0): dependencies: @@ -22531,7 +22572,7 @@ snapshots: dependencies: inflight: 1.0.6 inherits: 2.0.4 - minimatch: 3.1.2 + minimatch: 3.1.5 once: 1.4.0 path-is-absolute: 1.0.1 @@ -24612,7 +24653,7 @@ snapshots: dependencies: growly: 1.3.0 is-wsl: 2.2.0 - semver: 7.7.2 + semver: 7.8.5 shellwords: 0.1.1 uuid: 8.3.2 which: 2.0.2 @@ -25971,7 +26012,7 @@ snapshots: anymatch: 1.3.2 exec-sh: 0.2.2 fb-watchman: 2.0.2 - minimatch: 3.1.2 + minimatch: 3.1.5 minimist: 1.2.8 walker: 1.0.8 watch: 0.10.0 @@ -27531,7 +27572,7 @@ snapshots: validate-peer-dependencies@1.2.0: dependencies: resolve-package-path: 3.1.0 - semver: 7.7.2 + semver: 7.8.5 vary@1.1.2: {} diff --git a/test-packages/classic-app-template/package.json b/test-packages/classic-app-template/package.json index bd43bafa..f67c52d2 100644 --- a/test-packages/classic-app-template/package.json +++ b/test-packages/classic-app-template/package.json @@ -43,6 +43,7 @@ "ember-page-title": "^6.2.2", "ember-qunit": "^5.1.5", "ember-resolver": "^8.0.3", + "ember-service-import-polyfill": "^1.0.0", "ember-source": "~3.28.8", "ember-template-lint": "^3.15.0", "eslint": "^7.32.0", diff --git a/test-packages/test-scenarios/fastboot-config-location-test.mjs b/test-packages/test-scenarios/fastboot-config-location-test.mjs index a48547bb..696b3ff0 100644 --- a/test-packages/test-scenarios/fastboot-config-location-test.mjs +++ b/test-packages/test-scenarios/fastboot-config-location-test.mjs @@ -9,8 +9,6 @@ const { module: Qmodule, test } = qunit; appScenarios .map('fastboot-config-location', (project) => { - // this test app has the service import itself so we need the polyfill to do its work - project.linkDevDependency('ember-service-import-polyfill', { baseDir: '.' }); merge(project.files, { app: { routes: { diff --git a/test-packages/test-scenarios/fastboot-express-middleware-test.mjs b/test-packages/test-scenarios/fastboot-express-middleware-test.mjs index be42dccd..3d01e87f 100644 --- a/test-packages/test-scenarios/fastboot-express-middleware-test.mjs +++ b/test-packages/test-scenarios/fastboot-express-middleware-test.mjs @@ -23,8 +23,6 @@ Object.assign(qunit.assert, { appScenarios .map('fastboot-express-middleware', (project) => { - // this test app has the service import itself so we need the polyfill to do its work - project.linkDevDependency('ember-service-import-polyfill', { baseDir: '.' }); merge(project.files, { app: { routes: { diff --git a/test-packages/test-scenarios/fastboot-shoebox-test.mjs b/test-packages/test-scenarios/fastboot-shoebox-test.mjs index 52e3d479..d5f7614f 100644 --- a/test-packages/test-scenarios/fastboot-shoebox-test.mjs +++ b/test-packages/test-scenarios/fastboot-shoebox-test.mjs @@ -9,8 +9,6 @@ const { module: Qmodule, test } = qunit; appScenarios .map('fastboot-shoebox-test', (project) => { - // this test app has the service import itself so we need the polyfill to do its work - project.linkDevDependency('ember-service-import-polyfill', { baseDir: '.' }); merge(project.files, { app: { routes: { diff --git a/test-packages/test-scenarios/fixtures/request-details/app/controllers/list-cookies.js b/test-packages/test-scenarios/fixtures/request-details/app/controllers/list-cookies.js index e91338c6..3592f706 100644 --- a/test-packages/test-scenarios/fixtures/request-details/app/controllers/list-cookies.js +++ b/test-packages/test-scenarios/fixtures/request-details/app/controllers/list-cookies.js @@ -1,5 +1,3 @@ -/* eslint-disable ember/new-module-imports, prettier/prettier */ -import Ember from "ember"; +import Controller from '@ember/controller'; -export default Ember.Controller.extend({ -}); +export default class extends Controller {} diff --git a/test-packages/test-scenarios/fixtures/request-details/app/controllers/list-headers.js b/test-packages/test-scenarios/fixtures/request-details/app/controllers/list-headers.js index e91338c6..3592f706 100644 --- a/test-packages/test-scenarios/fixtures/request-details/app/controllers/list-headers.js +++ b/test-packages/test-scenarios/fixtures/request-details/app/controllers/list-headers.js @@ -1,5 +1,3 @@ -/* eslint-disable ember/new-module-imports, prettier/prettier */ -import Ember from "ember"; +import Controller from '@ember/controller'; -export default Ember.Controller.extend({ -}); +export default class extends Controller {} diff --git a/test-packages/test-scenarios/fixtures/request-details/app/controllers/list-query-params.js b/test-packages/test-scenarios/fixtures/request-details/app/controllers/list-query-params.js index e91338c6..3592f706 100644 --- a/test-packages/test-scenarios/fixtures/request-details/app/controllers/list-query-params.js +++ b/test-packages/test-scenarios/fixtures/request-details/app/controllers/list-query-params.js @@ -1,5 +1,3 @@ -/* eslint-disable ember/new-module-imports, prettier/prettier */ -import Ember from "ember"; +import Controller from '@ember/controller'; -export default Ember.Controller.extend({ -}); +export default class extends Controller {} diff --git a/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-body.js b/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-body.js index e91338c6..3592f706 100644 --- a/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-body.js +++ b/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-body.js @@ -1,5 +1,3 @@ -/* eslint-disable ember/new-module-imports, prettier/prettier */ -import Ember from "ember"; +import Controller from '@ember/controller'; -export default Ember.Controller.extend({ -}); +export default class extends Controller {} diff --git a/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-host.js b/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-host.js index e91338c6..3592f706 100644 --- a/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-host.js +++ b/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-host.js @@ -1,5 +1,3 @@ -/* eslint-disable ember/new-module-imports, prettier/prettier */ -import Ember from "ember"; +import Controller from '@ember/controller'; -export default Ember.Controller.extend({ -}); +export default class extends Controller {} diff --git a/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-method.js b/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-method.js index e91338c6..3592f706 100644 --- a/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-method.js +++ b/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-method.js @@ -1,5 +1,3 @@ -/* eslint-disable ember/new-module-imports, prettier/prettier */ -import Ember from "ember"; +import Controller from '@ember/controller'; -export default Ember.Controller.extend({ -}); +export default class extends Controller {} diff --git a/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-path.js b/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-path.js index e91338c6..3592f706 100644 --- a/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-path.js +++ b/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-path.js @@ -1,5 +1,3 @@ -/* eslint-disable ember/new-module-imports, prettier/prettier */ -import Ember from "ember"; +import Controller from '@ember/controller'; -export default Ember.Controller.extend({ -}); +export default class extends Controller {} diff --git a/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-protocol.js b/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-protocol.js index e91338c6..3592f706 100644 --- a/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-protocol.js +++ b/test-packages/test-scenarios/fixtures/request-details/app/controllers/show-protocol.js @@ -1,5 +1,3 @@ -/* eslint-disable ember/new-module-imports, prettier/prettier */ -import Ember from "ember"; +import Controller from '@ember/controller'; -export default Ember.Controller.extend({ -}); +export default class extends Controller {} diff --git a/test-packages/test-scenarios/fixtures/request-details/app/router.js b/test-packages/test-scenarios/fixtures/request-details/app/router.js index 1d16cdd2..9e282381 100644 --- a/test-packages/test-scenarios/fixtures/request-details/app/router.js +++ b/test-packages/test-scenarios/fixtures/request-details/app/router.js @@ -1,12 +1,12 @@ -/* eslint-disable ember/new-module-imports, prettier/prettier */ -import Ember from 'ember'; +import EmberRouter from '@ember/routing/router'; import config from './config/environment'; -var Router = Ember.Router.extend({ - location: config.locationType -}); +export default class Router extends EmberRouter { + location = config.locationType; + rootURL = config.rootURL; +} -Router.map(function() { +Router.map(function () { this.route('list-cookies'); this.route('list-headers'); this.route('list-query-params'); @@ -16,5 +16,3 @@ Router.map(function() { this.route('show-path'); this.route('show-protocol'); }); - -export default Router; diff --git a/test-packages/test-scenarios/fixtures/request-details/app/routes/list-cookies.js b/test-packages/test-scenarios/fixtures/request-details/app/routes/list-cookies.js index 8c4feaa1..21205ae0 100644 --- a/test-packages/test-scenarios/fixtures/request-details/app/routes/list-cookies.js +++ b/test-packages/test-scenarios/fixtures/request-details/app/routes/list-cookies.js @@ -1,12 +1,12 @@ -/* eslint-disable ember/new-module-imports, ember/no-get, prettier/prettier */ -import Ember from "ember"; +import Route from '@ember/routing/route'; +import { service } from '@ember/service'; -export default Ember.Route.extend({ - fastboot: Ember.inject.service(), +export default class extends Route { + @service fastboot; model() { return { cookies: this.get('fastboot.request.cookies') }; } -}); +}; diff --git a/test-packages/test-scenarios/fixtures/request-details/app/routes/list-headers.js b/test-packages/test-scenarios/fixtures/request-details/app/routes/list-headers.js index d87b32f6..e3435856 100644 --- a/test-packages/test-scenarios/fixtures/request-details/app/routes/list-headers.js +++ b/test-packages/test-scenarios/fixtures/request-details/app/routes/list-headers.js @@ -1,12 +1,12 @@ -/* eslint-disable ember/new-module-imports, ember/no-get, prettier/prettier */ -import Ember from 'ember'; +import Route from '@ember/routing/route'; +import { service } from '@ember/service'; -export default Ember.Route.extend({ - fastboot: Ember.inject.service(), +export default class extends Route { + @service fastboot; model() { return { desiredHeader: this.get('fastboot.request.headers').get('X-Fastboot-Info') }; } -}); +}; diff --git a/test-packages/test-scenarios/fixtures/request-details/app/routes/list-query-params.js b/test-packages/test-scenarios/fixtures/request-details/app/routes/list-query-params.js index 75985384..97f3f744 100644 --- a/test-packages/test-scenarios/fixtures/request-details/app/routes/list-query-params.js +++ b/test-packages/test-scenarios/fixtures/request-details/app/routes/list-query-params.js @@ -1,12 +1,12 @@ -/* eslint-disable ember/new-module-imports, ember/no-get, prettier/prettier */ -import Ember from 'ember'; +import Route from '@ember/routing/route'; +import { service } from '@ember/service'; -export default Ember.Route.extend({ - fastboot: Ember.inject.service(), +export default class extends Route { + @service fastboot; model() { return { queryParams: this.get('fastboot.request.queryParams') }; } -}); +}; diff --git a/test-packages/test-scenarios/fixtures/request-details/app/routes/show-body.js b/test-packages/test-scenarios/fixtures/request-details/app/routes/show-body.js index 11befb61..d5abd37c 100644 --- a/test-packages/test-scenarios/fixtures/request-details/app/routes/show-body.js +++ b/test-packages/test-scenarios/fixtures/request-details/app/routes/show-body.js @@ -1,12 +1,12 @@ -/* eslint-disable ember/new-module-imports, ember/no-get, prettier/prettier */ -import Ember from 'ember'; +import Route from '@ember/routing/route'; +import { service } from '@ember/service'; -export default Ember.Route.extend({ - fastboot: Ember.inject.service(), +export default class extends Route { + @service fastboot; model() { return { body: this.get('fastboot.request.body') }; } -}); +}; diff --git a/test-packages/test-scenarios/fixtures/request-details/app/routes/show-host.js b/test-packages/test-scenarios/fixtures/request-details/app/routes/show-host.js index db143b71..5a9f6d81 100644 --- a/test-packages/test-scenarios/fixtures/request-details/app/routes/show-host.js +++ b/test-packages/test-scenarios/fixtures/request-details/app/routes/show-host.js @@ -1,12 +1,12 @@ -/* eslint-disable ember/new-module-imports, ember/no-get, prettier/prettier */ -import Ember from 'ember'; +import Route from '@ember/routing/route'; +import { service } from '@ember/service'; -export default Ember.Route.extend({ - fastboot: Ember.inject.service(), +export default class extends Route { + @service fastboot; model() { return { host: this.get('fastboot.request.host') }; } -}); +}; diff --git a/test-packages/test-scenarios/fixtures/request-details/app/routes/show-method.js b/test-packages/test-scenarios/fixtures/request-details/app/routes/show-method.js index 51258e5c..c1ab4c92 100644 --- a/test-packages/test-scenarios/fixtures/request-details/app/routes/show-method.js +++ b/test-packages/test-scenarios/fixtures/request-details/app/routes/show-method.js @@ -1,12 +1,12 @@ -/* eslint-disable ember/new-module-imports, ember/no-get, prettier/prettier */ -import Ember from 'ember'; +import Route from '@ember/routing/route'; +import { service } from '@ember/service'; -export default Ember.Route.extend({ - fastboot: Ember.inject.service(), +export default class extends Route { + @service fastboot; model() { return { method: this.get('fastboot.request.method') }; } -}); +}; diff --git a/test-packages/test-scenarios/fixtures/request-details/app/routes/show-path.js b/test-packages/test-scenarios/fixtures/request-details/app/routes/show-path.js index 82658fd3..32788884 100644 --- a/test-packages/test-scenarios/fixtures/request-details/app/routes/show-path.js +++ b/test-packages/test-scenarios/fixtures/request-details/app/routes/show-path.js @@ -1,12 +1,12 @@ -/* eslint-disable ember/new-module-imports, ember/no-get, prettier/prettier */ -import Ember from 'ember'; +import Route from '@ember/routing/route'; +import { service } from '@ember/service'; -export default Ember.Route.extend({ - fastboot: Ember.inject.service(), +export default class extends Route { + @service fastboot; model() { return { path: this.get('fastboot.request.path') }; } -}); +}; diff --git a/test-packages/test-scenarios/fixtures/request-details/app/routes/show-protocol.js b/test-packages/test-scenarios/fixtures/request-details/app/routes/show-protocol.js index 6af545b3..75783683 100644 --- a/test-packages/test-scenarios/fixtures/request-details/app/routes/show-protocol.js +++ b/test-packages/test-scenarios/fixtures/request-details/app/routes/show-protocol.js @@ -1,12 +1,12 @@ -/* eslint-disable ember/new-module-imports, ember/no-get, prettier/prettier */ -import Ember from 'ember'; +import Route from '@ember/routing/route'; +import { service } from '@ember/service'; -export default Ember.Route.extend({ - fastboot: Ember.inject.service(), +export default class extends Route { + @service fastboot; model() { return { protocol: this.get('fastboot.request.protocol') }; } -}); +}; diff --git a/test-packages/test-scenarios/integration-tests-test.mjs b/test-packages/test-scenarios/integration-tests-test.mjs index 7a0cd4c0..375f1638 100644 --- a/test-packages/test-scenarios/integration-tests-test.mjs +++ b/test-packages/test-scenarios/integration-tests-test.mjs @@ -25,9 +25,6 @@ appScenarios } else { project.linkDependency('ember-cli-head', { baseDir: './' }); } - - // this test app has the service import itself so we need the polyfill to do its work - project.linkDevDependency('ember-service-import-polyfill', { baseDir: '.' }); }) .forEachScenario((scenario) => { Qmodule(scenario.name, function (hooks) { diff --git a/test-packages/test-scenarios/package.json b/test-packages/test-scenarios/package.json index 974d47f7..ebc0b90d 100644 --- a/test-packages/test-scenarios/package.json +++ b/test-packages/test-scenarios/package.json @@ -9,6 +9,7 @@ "lint:fix": "eslint . --fix" }, "devDependencies": { + "@babel/core": "^7.29.7", "@ember/string": "^4.0.1", "@ember/test-helpers": "^5.4.3", "body-parser": "^1.18.3", @@ -19,6 +20,7 @@ "ember-cli-5.12": "npm:ember-cli@~5.12.0", "ember-cli-6.12": "npm:ember-cli@~6.12.0", "ember-cli-latest": "npm:ember-cli@latest", + "ember-cli-babel": "^8.3.2", "ember-cli-head": "^2.0.0", "ember-cli-head-1.0": "npm:ember-cli-head@^1.0.0", "ember-cli-htmlbars": "^7.0.0", diff --git a/test-packages/test-scenarios/scenarios.mjs b/test-packages/test-scenarios/scenarios.mjs index f941534e..0afb492b 100644 --- a/test-packages/test-scenarios/scenarios.mjs +++ b/test-packages/test-scenarios/scenarios.mjs @@ -71,6 +71,8 @@ async function release(project) { project.linkDevDependency('ember-cli-htmlbars', { baseDir: '.' }); project.linkDevDependency('@ember/test-helpers', { baseDir: '.' }); project.linkDevDependency('ember-qunit', { baseDir: '.' }); + project.linkDevDependency('ember-cli-babel', { baseDir: '.' }); + project.linkDevDependency('@babel/core', { baseDir: '.' }); } /** From 86f0440786af1e9faae5b2baa27ba191533e816a Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Mon, 7 Sep 2026 11:42:18 +0100 Subject: [PATCH 3/6] fix config location test --- .../classic-app-template/config/environment.js | 2 +- .../fastboot-config-location-test.mjs | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/test-packages/classic-app-template/config/environment.js b/test-packages/classic-app-template/config/environment.js index 7a8c43e5..34ecbc99 100644 --- a/test-packages/classic-app-template/config/environment.js +++ b/test-packages/classic-app-template/config/environment.js @@ -5,7 +5,7 @@ module.exports = function (environment) { modulePrefix: 'classic-app-template', environment, rootURL: '/', - locationType: 'auto', + locationType: 'history', EmberENV: { FEATURES: { // Here you can enable experimental features on an ember canary build diff --git a/test-packages/test-scenarios/fastboot-config-location-test.mjs b/test-packages/test-scenarios/fastboot-config-location-test.mjs index 696b3ff0..1048942f 100644 --- a/test-packages/test-scenarios/fastboot-config-location-test.mjs +++ b/test-packages/test-scenarios/fastboot-config-location-test.mjs @@ -25,11 +25,6 @@ appScenarios } } `, - 'test-passed.js': ` - import Ember from 'ember'; - - export default Ember.Route.extend({}); - `, }, templates: { 'test-passed.hbs': `

The Test Passed!

@@ -37,16 +32,18 @@ appScenarios

All redirection tests should be set up to redirect here.

`, }, 'router.js': ` - import Ember from 'ember'; + import EmberRouter from '@ember/routing/router'; + import config from './config/environment'; - let Router = Ember.Router; + export default class Router extends EmberRouter { + location = config.locationType; + rootURL = config.rootURL; + } Router.map(function() { this.route('redirect-on-transition-to'); this.route('test-passed'); }); - - export default Router; `, }, config: { From b56880700d2d57db09f3dbfbc03c7d0254b80580 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Mon, 7 Sep 2026 23:33:47 +0100 Subject: [PATCH 4/6] skip release --- test-packages/test-scenarios/custom-output-paths-test.mjs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test-packages/test-scenarios/custom-output-paths-test.mjs b/test-packages/test-scenarios/custom-output-paths-test.mjs index ee5cfe70..dd06aedd 100644 --- a/test-packages/test-scenarios/custom-output-paths-test.mjs +++ b/test-packages/test-scenarios/custom-output-paths-test.mjs @@ -10,7 +10,8 @@ import './helpers/qunit-assertions.mjs'; appScenarios // output paths were deprecated and removed in 6.0 - .skip('lts_6.12') + .skip('lts_6_12') + .skip('release') .map('custom-output-paths', (project) => { project.mergeFiles({ 'ember-cli-build.js': `var EmberApp = require('ember-cli/lib/broccoli/ember-app'); From 45b35c4ee1a5c9b5b65abe4722f85f1c755eb20b Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Thu, 10 Sep 2026 22:02:00 +0100 Subject: [PATCH 5/6] fix release location test --- pnpm-lock.yaml | 31 +++++++++++++------ .../app/routes/noop-replace-with.js | 2 +- .../app/routes/noop-transition-to.js | 2 +- .../app/routes/redirect-on-replace-with.js | 2 +- .../app/routes/redirect-on-transition-to.js | 2 +- test-packages/test-scenarios/package.json | 6 ++-- test-packages/test-scenarios/scenarios.mjs | 2 ++ 7 files changed, 32 insertions(+), 15 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e49e727e..f9d197f2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -754,6 +754,9 @@ importers: '@ember/test-helpers': specifier: ^5.4.3 version: 5.4.3(@babel/core@7.29.7) + '@glimmer/component': + specifier: ^2.1.1 + version: 2.1.1 body-parser: specifier: ^1.18.3 version: 1.20.3 @@ -779,8 +782,8 @@ importers: specifier: ^8.3.2 version: 8.3.2(@babel/core@7.29.7) ember-cli-head: - specifier: ^2.0.0 - version: 2.0.0 + specifier: ^3.0.0 + version: 3.0.1(ember-source@7.2.0(@glimmer/component@2.1.1)) ember-cli-head-1.0: specifier: npm:ember-cli-head@^1.0.0 version: ember-cli-head@1.0.0 @@ -793,6 +796,9 @@ importers: ember-data-5.8: specifier: npm:ember-data@~5.8.0 version: ember-data@5.8.2(@babel/core@7.29.7)(@ember/test-helpers@5.4.3(@babel/core@7.29.7))(@ember/test-waiters@4.1.2)(ember-inflector@4.0.3(ember-source@7.2.0(@glimmer/component@2.1.1)))(qunit@2.24.1) + ember-load-initializers: + specifier: ^3.0.1 + version: 3.0.1(ember-source@7.2.0(@glimmer/component@2.1.1)) ember-page-title: specifier: ^9.0.3 version: 9.0.3 @@ -5743,9 +5749,9 @@ packages: resolution: {integrity: sha512-7gj8H/KSF+e4pxSKxj9F8hq9PUt2vOjCaOvRdxdmyoHnko4QbiUnv8ASpXuop+m15eNIUGOlaLrJJ3jM8oQEUw==} engines: {node: 10.* || >= 12} - ember-cli-head@2.0.0: - resolution: {integrity: sha512-i9qwljBlpzU/ei0xN+FiCHUvU1ZdjVXk0OzRKoeMZJK3m4p29CvB095klT0q+PigvYFYHIyTaeSWmbgjP8CZiw==} - engines: {node: 12.* || >= 14} + ember-cli-head@3.0.1: + resolution: {integrity: sha512-I1pbmFjHN6LrYxMSieoIB/YQc8tVwyabpF+3XzKb/gEe0TQWGKdaE9ETxwGkY6EGHjEZ+8jouknnXBqCFsZrqw==} + engines: {node: '>= 22.13.0'} ember-cli-htmlbars-inline-precompile@2.1.0: resolution: {integrity: sha512-BylIHduwQkncPhnj0ZyorBuljXbTzLgRo6kuHf1W+IHFxThFl2xG+r87BVwsqx4Mn9MTgW9SE0XWjwBJcSWd6Q==} @@ -18928,12 +18934,15 @@ snapshots: transitivePeerDependencies: - supports-color - ember-cli-head@2.0.0: + ember-cli-head@3.0.1(ember-source@7.2.0(@glimmer/component@2.1.1)): dependencies: - ember-cli-babel: 7.26.11 - ember-cli-htmlbars: 5.7.2 - ember-in-element-polyfill: 1.0.1 + '@babel/core': 7.29.7 + broccoli-persistent-filter: 3.1.3 + ember-cli-babel: 8.3.2(@babel/core@7.29.7) + ember-cli-htmlbars: 7.0.1(@babel/core@7.29.7)(ember-source@7.2.0(@glimmer/component@2.1.1)) + ember-cli-version-checker: 5.1.2 transitivePeerDependencies: + - ember-source - supports-color ember-cli-htmlbars-inline-precompile@2.1.0(ember-cli-babel@7.26.11): @@ -20400,6 +20409,10 @@ snapshots: dependencies: ember-source: 6.12.0(@glimmer/component@2.1.1)(rsvp@4.8.5) + ember-load-initializers@3.0.1(ember-source@7.2.0(@glimmer/component@2.1.1)): + dependencies: + ember-source: 7.2.0(@glimmer/component@2.1.1) + ember-maybe-import-regenerator@0.1.6(@babel/core@7.29.7): dependencies: broccoli-funnel: 1.2.0 diff --git a/test-packages/test-scenarios/fixtures/fastboot-location/app/routes/noop-replace-with.js b/test-packages/test-scenarios/fixtures/fastboot-location/app/routes/noop-replace-with.js index e8ac00f2..ab6d3dff 100644 --- a/test-packages/test-scenarios/fixtures/fastboot-location/app/routes/noop-replace-with.js +++ b/test-packages/test-scenarios/fixtures/fastboot-location/app/routes/noop-replace-with.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class extends Route { @service router; diff --git a/test-packages/test-scenarios/fixtures/fastboot-location/app/routes/noop-transition-to.js b/test-packages/test-scenarios/fixtures/fastboot-location/app/routes/noop-transition-to.js index 84d9c66f..50062e38 100644 --- a/test-packages/test-scenarios/fixtures/fastboot-location/app/routes/noop-transition-to.js +++ b/test-packages/test-scenarios/fixtures/fastboot-location/app/routes/noop-transition-to.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class extends Route { @service router; diff --git a/test-packages/test-scenarios/fixtures/fastboot-location/app/routes/redirect-on-replace-with.js b/test-packages/test-scenarios/fixtures/fastboot-location/app/routes/redirect-on-replace-with.js index b5f56215..69a85686 100644 --- a/test-packages/test-scenarios/fixtures/fastboot-location/app/routes/redirect-on-replace-with.js +++ b/test-packages/test-scenarios/fixtures/fastboot-location/app/routes/redirect-on-replace-with.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class extends Route { @service router; diff --git a/test-packages/test-scenarios/fixtures/fastboot-location/app/routes/redirect-on-transition-to.js b/test-packages/test-scenarios/fixtures/fastboot-location/app/routes/redirect-on-transition-to.js index 0e60d75a..5684cbe8 100644 --- a/test-packages/test-scenarios/fixtures/fastboot-location/app/routes/redirect-on-transition-to.js +++ b/test-packages/test-scenarios/fixtures/fastboot-location/app/routes/redirect-on-transition-to.js @@ -1,5 +1,5 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; +import { service } from '@ember/service'; export default class extends Route { @service router; diff --git a/test-packages/test-scenarios/package.json b/test-packages/test-scenarios/package.json index ebc0b90d..3c368154 100644 --- a/test-packages/test-scenarios/package.json +++ b/test-packages/test-scenarios/package.json @@ -12,6 +12,7 @@ "@babel/core": "^7.29.7", "@ember/string": "^4.0.1", "@ember/test-helpers": "^5.4.3", + "@glimmer/component": "^2.1.1", "body-parser": "^1.18.3", "chai": "^4.3.7", "ember-cli-3.16": "npm:ember-cli@~3.16.0", @@ -19,12 +20,13 @@ "ember-cli-4.12": "npm:ember-cli@~4.12.0", "ember-cli-5.12": "npm:ember-cli@~5.12.0", "ember-cli-6.12": "npm:ember-cli@~6.12.0", - "ember-cli-latest": "npm:ember-cli@latest", "ember-cli-babel": "^8.3.2", - "ember-cli-head": "^2.0.0", + "ember-cli-head": "^3.0.0", "ember-cli-head-1.0": "npm:ember-cli-head@^1.0.0", "ember-cli-htmlbars": "^7.0.0", + "ember-cli-latest": "npm:ember-cli@latest", "ember-data-5.8": "npm:ember-data@~5.8.0", + "ember-load-initializers": "^3.0.1", "ember-page-title": "^9.0.3", "ember-qunit": "^9.1.0", "ember-resolver": "^13.2.0", diff --git a/test-packages/test-scenarios/scenarios.mjs b/test-packages/test-scenarios/scenarios.mjs index 0afb492b..af9f0dfe 100644 --- a/test-packages/test-scenarios/scenarios.mjs +++ b/test-packages/test-scenarios/scenarios.mjs @@ -73,6 +73,8 @@ async function release(project) { project.linkDevDependency('ember-qunit', { baseDir: '.' }); project.linkDevDependency('ember-cli-babel', { baseDir: '.' }); project.linkDevDependency('@babel/core', { baseDir: '.' }); + project.linkDevDependency('@glimmer/component', { baseDir: '.' }); + project.linkDevDependency('ember-load-initializers', { baseDir: '.' }); } /** From 8ae33f4f52439eb23991283cc9634c1e66e6de44 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Thu, 10 Sep 2026 22:10:44 +0100 Subject: [PATCH 6/6] skip onerror test in release --- test-packages/test-scenarios/oneerror-per-visit-test.mjs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test-packages/test-scenarios/oneerror-per-visit-test.mjs b/test-packages/test-scenarios/oneerror-per-visit-test.mjs index a5e469df..6ca0af32 100644 --- a/test-packages/test-scenarios/oneerror-per-visit-test.mjs +++ b/test-packages/test-scenarios/oneerror-per-visit-test.mjs @@ -7,6 +7,8 @@ import buildFastboot from './helpers/build-fastboot.mjs'; const { module: Qmodule, test } = qunit; appScenarios + // Ember.onerror was removed in 7 https://deprecations.emberjs.com/id/deprecate-import-onerror-from-ember + .skip('release') .map('oneerror-per-visit', (project) => { merge(project.files, { app: {