diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 222e5c1baec..89c705466c8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3075,11 +3075,11 @@ importers: specifier: ^7.29.0 version: 7.29.0(@babel/core@7.29.0) '@babel/runtime': - specifier: ^7.28.6 + specifier: ^7.29.2 version: 7.29.2 '@ember/optional-features': - specifier: ^2.3.0 - version: 2.3.0 + specifier: ^3.0.0 + version: 3.0.0(@types/node@22.19.15) '@ember/string': specifier: ^4.0.1 version: 4.0.1 @@ -3109,16 +3109,16 @@ 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@8.0.10(@types/node@22.19.15)(esbuild@0.27.7)(terser@5.46.1)) '@eslint/js': - specifier: ^9.39.2 + specifier: ^9.39.4 version: 9.39.4 '@glimmer/component': specifier: workspace:^ version: link:../../packages/@glimmer/component '@rollup/plugin-babel': - specifier: ^6.1.0 - version: 6.1.0(@babel/core@7.29.0)(rollup@4.60.3) + specifier: ^7.0.0 + version: 7.0.0(@babel/core@7.29.0)(rollup@4.60.3) babel-plugin-ember-template-compilation: specifier: ^4.0.0 version: 4.0.0 @@ -3135,8 +3135,8 @@ importers: specifier: ^8.3.1 version: 8.3.1(@babel/core@7.29.0) ember-cli-deprecation-workflow: - specifier: ^4.0.0 - version: 4.0.1(@babel/core@7.29.0) + specifier: ^3.4.0 + version: 3.4.0(ember-source@) ember-load-initializers: specifier: ^3.0.1 version: 3.0.1(ember-source@) @@ -3150,7 +3150,7 @@ importers: specifier: ^9.0.4 version: 9.0.4(@babel/core@7.29.0)(@ember/test-helpers@5.4.1(@babel/core@7.29.0))(qunit@2.25.0) ember-resolver: - specifier: ^13.1.1 + specifier: ^13.2.0 version: 13.2.0 ember-source: specifier: workspace:* @@ -3159,7 +3159,7 @@ importers: specifier: ^7.9.3 version: 7.9.3 eslint: - specifier: ^9.39.2 + specifier: ^9.39.4 version: 9.39.4 eslint-config-prettier: specifier: ^10.1.8 @@ -3195,14 +3195,14 @@ importers: specifier: ^38.0.0 version: 38.0.0(stylelint@16.26.1(typescript@5.9.3)) testem: - specifier: ^3.17.0 + specifier: ^3.19.1 version: 3.19.1(@babel/core@7.29.0)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) tracked-built-ins: - specifier: ^4.1.0 + specifier: ^4.1.2 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) + specifier: ^8.0.10 + version: 8.0.10(@types/node@22.19.15)(esbuild@0.27.7)(terser@5.46.1) tests/node-vitest: dependencies: @@ -4045,6 +4045,10 @@ packages: resolution: {integrity: sha512-+M8CkPledQEaDbfIlwlq6Phgpm5jdT3a6WVDJk7b/zadw5xAJkuQKVK7DgR0SFgHGiWlyn6a8AU5p2mCA706RA==} engines: {node: 10.* || 12.* || >= 14} + '@ember/optional-features@3.0.0': + resolution: {integrity: sha512-HMQqZoBb16I4NyHfQglIYjopSG6folcEJah2WPa0FuolWRA/8cS5ozQmFK5BQx7cijTQJxj6viLpQK9KrXuYdw==} + engines: {node: '>= 20.19'} + '@ember/string@4.0.1': resolution: {integrity: sha512-VWeng8BSWrIsdPfffOQt/bKwNKJL7+37gPFh/6iZZ9bke+S83kKqkS30poo4bTGfRcMnvAE0ie7txom+iDu81Q==} @@ -4576,12 +4580,6 @@ packages: resolution: {integrity: sha512-F5z53uvRIF4dYfFfJP3a2Cqg+4P1dgJchJsFnsZE0eZp0LK8X7g2J0CsJHRgns+skpXOlM7n5vFGwkWCWj8qJg==} engines: {node: 12.* || >= 14} - '@napi-rs/wasm-runtime@1.1.2': - resolution: {integrity: sha512-sNXv5oLJ7ob93xkZ1XnxisYhGYXfaG9f65/ZgYuAu3qt7b3NadcOEhLvx28hv31PgX8SZJRYrAIPQilQmFpLVw==} - peerDependencies: - '@emnapi/core': ^1.7.1 - '@emnapi/runtime': ^1.7.1 - '@napi-rs/wasm-runtime@1.1.4': resolution: {integrity: sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==} peerDependencies: @@ -7754,9 +7752,6 @@ packages: peerDependencies: ember-source: '>= 3.28.0' - ember-cli-deprecation-workflow@4.0.1: - resolution: {integrity: sha512-XJzUZVXyb6/nFKU7GzGRlHlcAl4KtkioBTjfuIHp1aysbRZ6XxYLSPtP090EbOxQBtYwAPsH2kPAtPS86tL2RA==} - ember-cli-get-component-path-option@1.0.0: resolution: {integrity: sha512-k47TDwcJ2zPideBCZE8sCiShSxQSpebY2BHcX2DdipMmBox5gsfyVrbKJWIHeSTTKyEUgmBIvQkqTOozEziCZA==} @@ -13841,6 +13836,16 @@ snapshots: transitivePeerDependencies: - supports-color + '@ember/optional-features@3.0.0(@types/node@22.19.15)': + dependencies: + ember-cli-version-checker: 5.1.2 + inquirer: 13.3.2(@types/node@22.19.15) + silent-error: 1.1.1 + tinyglobby: 0.2.16 + transitivePeerDependencies: + - '@types/node' + - supports-color + '@ember/string@4.0.1': {} '@ember/test-helpers@5.4.1(@babel/core@7.29.0)': @@ -14536,13 +14541,6 @@ snapshots: tslib: 2.8.1 upath: 2.0.1 - '@napi-rs/wasm-runtime@1.1.2(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': - dependencies: - '@emnapi/core': 1.10.0 - '@emnapi/runtime': 1.10.0 - '@tybys/wasm-util': 0.10.1 - optional: true - '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': dependencies: '@emnapi/core': 1.10.0 @@ -14805,7 +14803,7 @@ snapshots: '@oxc-resolver/binding-wasm32-wasi@11.19.1(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': dependencies: - '@napi-rs/wasm-runtime': 1.1.2(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) + '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) transitivePeerDependencies: - '@emnapi/core' - '@emnapi/runtime' @@ -15974,7 +15972,7 @@ snapshots: '@types/eslint-scope@3.7.7': dependencies: '@types/eslint': 9.6.1 - '@types/estree': 1.0.8 + '@types/estree': 1.0.9 '@types/eslint@8.56.12': dependencies: @@ -15983,7 +15981,7 @@ snapshots: '@types/eslint@9.6.1': dependencies: - '@types/estree': 1.0.8 + '@types/estree': 1.0.9 '@types/json-schema': 7.0.15 '@types/estree@1.0.8': {} @@ -15992,7 +15990,7 @@ snapshots: '@types/fs-extra@9.0.13': dependencies: - '@types/node': 20.19.37 + '@types/node': 22.19.15 '@types/glob@9.0.0': dependencies: @@ -16031,13 +16029,13 @@ snapshots: '@types/rimraf@3.0.2': dependencies: '@types/glob': 9.0.0 - '@types/node': 20.19.37 + '@types/node': 22.19.15 '@types/rsvp@4.0.9': {} '@types/ssri@7.1.5': dependencies: - '@types/node': 20.19.37 + '@types/node': 22.19.15 '@types/supports-color@8.1.3': {} @@ -17808,13 +17806,13 @@ snapshots: css-loader@5.2.7(webpack@5.105.4(@swc/core@1.15.21)): dependencies: - icss-utils: 5.1.0(postcss@8.5.8) + icss-utils: 5.1.0(postcss@8.5.13) loader-utils: 2.0.4 - postcss: 8.5.8 - postcss-modules-extract-imports: 3.1.0(postcss@8.5.8) - postcss-modules-local-by-default: 4.2.0(postcss@8.5.8) - postcss-modules-scope: 3.2.1(postcss@8.5.8) - postcss-modules-values: 4.0.0(postcss@8.5.8) + postcss: 8.5.13 + postcss-modules-extract-imports: 3.1.0(postcss@8.5.13) + postcss-modules-local-by-default: 4.2.0(postcss@8.5.13) + postcss-modules-scope: 3.2.1(postcss@8.5.13) + postcss-modules-values: 4.0.0(postcss@8.5.13) postcss-value-parser: 4.2.0 schema-utils: 3.3.0 semver: 7.7.4 @@ -17822,13 +17820,13 @@ snapshots: css-loader@5.2.7(webpack@5.105.4): dependencies: - icss-utils: 5.1.0(postcss@8.5.8) + icss-utils: 5.1.0(postcss@8.5.13) loader-utils: 2.0.4 - postcss: 8.5.8 - postcss-modules-extract-imports: 3.1.0(postcss@8.5.8) - postcss-modules-local-by-default: 4.2.0(postcss@8.5.8) - postcss-modules-scope: 3.2.1(postcss@8.5.8) - postcss-modules-values: 4.0.0(postcss@8.5.8) + postcss: 8.5.13 + postcss-modules-extract-imports: 3.1.0(postcss@8.5.13) + postcss-modules-local-by-default: 4.2.0(postcss@8.5.13) + postcss-modules-scope: 3.2.1(postcss@8.5.13) + postcss-modules-values: 4.0.0(postcss@8.5.13) postcss-value-parser: 4.2.0 schema-utils: 3.3.0 semver: 7.7.4 @@ -18217,14 +18215,6 @@ snapshots: transitivePeerDependencies: - supports-color - ember-cli-deprecation-workflow@4.0.1(@babel/core@7.29.0): - dependencies: - '@embroider/addon-shim': 1.10.2 - decorator-transforms: 2.3.2(@babel/core@7.29.0) - transitivePeerDependencies: - - '@babel/core' - - supports-color - ember-cli-get-component-path-option@1.0.0: {} ember-cli-htmlbars@6.3.0: @@ -19129,7 +19119,7 @@ snapshots: '@humanfs/node': 0.16.7 '@humanwhocodes/module-importer': 1.0.1 '@humanwhocodes/retry': 0.4.3 - '@types/estree': 1.0.8 + '@types/estree': 1.0.9 ajv: 6.14.0 chalk: 4.1.2 cross-spawn: 7.0.6 @@ -20232,9 +20222,9 @@ snapshots: dependencies: safer-buffer: 2.1.2 - icss-utils@5.1.0(postcss@8.5.8): + icss-utils@5.1.0(postcss@8.5.13): dependencies: - postcss: 8.5.8 + postcss: 8.5.13 ieee754@1.2.1: {} @@ -21798,26 +21788,26 @@ snapshots: possible-typed-array-names@1.1.0: {} - postcss-modules-extract-imports@3.1.0(postcss@8.5.8): + postcss-modules-extract-imports@3.1.0(postcss@8.5.13): dependencies: - postcss: 8.5.8 + postcss: 8.5.13 - postcss-modules-local-by-default@4.2.0(postcss@8.5.8): + postcss-modules-local-by-default@4.2.0(postcss@8.5.13): dependencies: - icss-utils: 5.1.0(postcss@8.5.8) - postcss: 8.5.8 + icss-utils: 5.1.0(postcss@8.5.13) + postcss: 8.5.13 postcss-selector-parser: 7.1.1 postcss-value-parser: 4.2.0 - postcss-modules-scope@3.2.1(postcss@8.5.8): + postcss-modules-scope@3.2.1(postcss@8.5.13): dependencies: - postcss: 8.5.8 + postcss: 8.5.13 postcss-selector-parser: 7.1.1 - postcss-modules-values@4.0.0(postcss@8.5.8): + postcss-modules-values@4.0.0(postcss@8.5.13): dependencies: - icss-utils: 5.1.0(postcss@8.5.8) - postcss: 8.5.8 + icss-utils: 5.1.0(postcss@8.5.13) + postcss: 8.5.13 postcss-resolve-nested-selector@0.1.6: {} diff --git a/smoke-tests/v2-app-template/.gitignore b/smoke-tests/v2-app-template/.gitignore index 8f9eac26660..0932cd84037 100644 --- a/smoke-tests/v2-app-template/.gitignore +++ b/smoke-tests/v2-app-template/.gitignore @@ -14,12 +14,5 @@ /testem.log /yarn-error.log -# ember-try -/.node_modules.ember-try/ -/npm-shrinkwrap.json.ember-try -/package.json.ember-try -/package-lock.json.ember-try -/yarn.lock.ember-try - # broccoli-debug /DEBUG/ diff --git a/smoke-tests/v2-app-template/.prettierrc.mjs b/smoke-tests/v2-app-template/.prettierrc.mjs index de1d43fbd5c..9cc6b3dbcfd 100644 --- a/smoke-tests/v2-app-template/.prettierrc.mjs +++ b/smoke-tests/v2-app-template/.prettierrc.mjs @@ -1,36 +1,11 @@ export default { plugins: ['prettier-plugin-ember-template-tag'], - singleQuote: true, overrides: [ { - files: ['*.js', '*.ts', '*.cjs', '.mjs', '.cts', '.mts', '.cts'], - options: { - trailingComma: 'es5', - }, - }, - { - files: ['*.html'], - options: { - singleQuote: false, - }, - }, - { - files: ['*.json'], - options: { - singleQuote: false, - }, - }, - { - files: ['*.hbs'], - options: { - singleQuote: false, - }, - }, - { - files: ['*.gjs', '*.gts'], + files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}', options: { + singleQuote: true, templateSingleQuote: false, - trailingComma: 'es5', }, }, ], diff --git a/smoke-tests/v2-app-template/app/config/environment.js b/smoke-tests/v2-app-template/app/config/environment.js index 155d9fc6678..bc8089d69a9 100644 --- a/smoke-tests/v2-app-template/app/config/environment.js +++ b/smoke-tests/v2-app-template/app/config/environment.js @@ -5,23 +5,23 @@ const config = loadConfigFromMeta('v2-app-template'); assert( 'config is not an object', - typeof config === 'object' && config !== null + typeof config === 'object' && config !== null, ); assert( 'modulePrefix was not detected on your config', - 'modulePrefix' in config && typeof config.modulePrefix === 'string' + 'modulePrefix' in config && typeof config.modulePrefix === 'string', ); assert( 'locationType was not detected on your config', - 'locationType' in config && typeof config.locationType === 'string' + 'locationType' in config && typeof config.locationType === 'string', ); assert( 'rootURL was not detected on your config', - 'rootURL' in config && typeof config.rootURL === 'string' + 'rootURL' in config && typeof config.rootURL === 'string', ); assert( 'APP was not detected on your config', - 'APP' in config && typeof config.APP === 'object' + 'APP' in config && typeof config.APP === 'object', ); export default config; diff --git a/smoke-tests/v2-app-template/config/ember-cli-update.json b/smoke-tests/v2-app-template/config/ember-cli-update.json index d5c5da122af..a823003f195 100644 --- a/smoke-tests/v2-app-template/config/ember-cli-update.json +++ b/smoke-tests/v2-app-template/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "@ember/app-blueprint", - "version": "6.11.1", + "version": "6.12.3", "blueprints": [ { "name": "@ember/app-blueprint", @@ -11,7 +11,6 @@ "options": [ "--no-welcome", "--ci-provider=github", - "--no-ember-data", "--no-warp-drive" ] } diff --git a/smoke-tests/v2-app-template/ember-cli-build.js b/smoke-tests/v2-app-template/ember-cli-build.js deleted file mode 100644 index f15213a43ca..00000000000 --- a/smoke-tests/v2-app-template/ember-cli-build.js +++ /dev/null @@ -1,14 +0,0 @@ -'use strict'; - -const EmberApp = require('ember-cli/lib/broccoli/ember-app'); -const { compatBuild } = require('@embroider/compat'); - -module.exports = async function (defaults) { - const { buildOnce } = await import('@embroider/vite'); - - let app = new EmberApp(defaults, { - // Add options here - }); - - return compatBuild(app, buildOnce); -}; diff --git a/smoke-tests/v2-app-template/ember-cli-build.mjs b/smoke-tests/v2-app-template/ember-cli-build.mjs new file mode 100644 index 00000000000..9015aeb1013 --- /dev/null +++ b/smoke-tests/v2-app-template/ember-cli-build.mjs @@ -0,0 +1,12 @@ +import EmberApp from 'ember-cli/lib/broccoli/ember-app.js'; +import { compatBuild } from '@embroider/compat'; + +export default async function (defaults) { + const { buildOnce } = await import('@embroider/vite'); + + const app = new EmberApp(defaults, { + // Add options here + }); + + return compatBuild(app, buildOnce); +} diff --git a/smoke-tests/v2-app-template/eslint.config.mjs b/smoke-tests/v2-app-template/eslint.config.mjs index 9d78c96df0e..11217a1ef8d 100644 --- a/smoke-tests/v2-app-template/eslint.config.mjs +++ b/smoke-tests/v2-app-template/eslint.config.mjs @@ -58,6 +58,7 @@ export default defineConfig([ }, }, { + ...qunit.configs.recommended, files: ['tests/**/*-test.{js,gjs}'], plugins: { qunit, @@ -67,7 +68,8 @@ export default defineConfig([ * CJS node files */ { - files: ['**/*.cjs', 'config/**/*.js', 'ember-cli-build.js'], + ...n.configs['flat/recommended-script'], + files: ['**/*.cjs', 'config/**/*.js'], plugins: { n, }, @@ -84,6 +86,7 @@ export default defineConfig([ * ESM node files */ { + ...n.configs['flat/recommended-module'], files: ['**/*.mjs'], plugins: { n, diff --git a/smoke-tests/v2-app-template/package.json b/smoke-tests/v2-app-template/package.json index 49ea8737327..84903f775df 100644 --- a/smoke-tests/v2-app-template/package.json +++ b/smoke-tests/v2-app-template/package.json @@ -33,8 +33,8 @@ "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", "@babel/plugin-transform-runtime": "^7.29.0", - "@babel/runtime": "^7.28.6", - "@ember/optional-features": "^2.3.0", + "@babel/runtime": "^7.29.2", + "@ember/optional-features": "^3.0.0", "@ember/string": "^4.0.1", "@ember/test-helpers": "^5.4.1", "@ember/test-waiters": "^4.1.1", @@ -45,23 +45,23 @@ "@embroider/macros": "^1.20.2", "@embroider/router": "^3.0.6", "@embroider/vite": "^1.7.2", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "workspace:^", - "@rollup/plugin-babel": "^6.1.0", - "babel-plugin-ember-template-compilation": "^4.0.0", + "@rollup/plugin-babel": "^7.0.0", + "babel-plugin-ember-template-compilation": "^3.1.0", "concurrently": "^9.2.1", "decorator-transforms": "^2.3.1", "ember-cli": "~6.12.0", "ember-cli-babel": "^8.3.1", - "ember-cli-deprecation-workflow": "^4.0.0", + "ember-cli-deprecation-workflow": "^3.4.0", "ember-load-initializers": "^3.0.1", "ember-modifier": "^4.3.0", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", + "ember-resolver": "^13.2.0", "ember-source": "workspace:*", "ember-template-lint": "^7.9.3", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^10.1.8", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -73,12 +73,12 @@ "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^38.0.0", - "testem": "^3.17.0", - "tracked-built-ins": "^4.1.0", - "vite": "^7.3.1" + "testem": "^3.19.1", + "vite": "^8.0.10", + "tracked-built-ins": "^4.1.2" }, "engines": { - "node": ">= 20" + "node": ">= 20.19.0" }, "ember": { "edition": "octane"