From 24a9710a9228b5a218bd210d08827fc01527703f Mon Sep 17 00:00:00 2001 From: kategengler <444218+kategengler@users.noreply.github.com> Date: Mon, 11 May 2026 10:22:14 +0000 Subject: [PATCH] Update smoke-tests/app-template --- pnpm-lock.yaml | 113 +++++++++++------- .../app-template/.github/workflows/ci.yml | 8 +- .../app-template/config/ember-cli-update.json | 2 +- .../config/optional-features.json | 3 +- smoke-tests/app-template/ember-cli-build.js | 1 + smoke-tests/app-template/package.json | 14 +-- 6 files changed, 85 insertions(+), 56 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 222e5c1baec..e8fc50a5669 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2802,7 +2802,7 @@ importers: specifier: ^1.20.2 version: 1.20.2(@babel/core@7.29.0) '@eslint/js': - specifier: ^9.39.2 + specifier: ^9.39.4 version: 9.39.4 '@glimmer/component': specifier: workspace:^ @@ -2818,7 +2818,7 @@ importers: version: 9.2.1 ember-auto-import: specifier: ^2.13.1 - version: 2.13.1(webpack@5.105.4) + version: 2.13.1(webpack@5.106.2) ember-cli: specifier: ~6.12.0 version: 6.12.0(@babel/core@7.29.0)(@types/node@22.19.15)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) @@ -2832,8 +2832,8 @@ importers: specifier: ^3.0.0 version: 3.0.0 ember-cli-dependency-checker: - specifier: ^3.3.3 - version: 3.3.3(ember-cli@6.12.0(@babel/core@7.29.0)(@types/node@22.19.15)) + specifier: ^3.4.0 + version: 3.4.0(@babel/core@7.29.0)(ember-cli@6.12.0(@babel/core@7.29.0)(@types/node@22.19.15))(eslint@9.39.4) ember-cli-deprecation-workflow: specifier: ^3.4.0 version: 3.4.0(ember-source@) @@ -2862,7 +2862,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:* @@ -2874,7 +2874,7 @@ importers: specifier: ^6.1.0 version: 6.1.0 eslint: - specifier: ^9.39.2 + specifier: ^9.39.4 version: 9.39.4 eslint-config-prettier: specifier: ^9.1.2 @@ -2898,8 +2898,8 @@ importers: specifier: ^3.8.1 version: 3.8.1 prettier-plugin-ember-template-tag: - specifier: ^2.1.3 - version: 2.1.3(prettier@3.8.1) + specifier: ^2.1.4 + version: 2.1.5(prettier@3.8.1) qunit: specifier: ^2.25.0 version: 2.25.0 @@ -2916,8 +2916,8 @@ importers: specifier: ^4.1.2 version: 4.1.2(@babel/core@7.29.0) webpack: - specifier: ^5.105.2 - version: 5.105.4 + specifier: ^5.106.0 + version: 5.106.2 smoke-tests/benchmark-app: devDependencies: @@ -7748,6 +7748,12 @@ packages: peerDependencies: ember-cli: ^3.2.0 || >=4.0.0 + ember-cli-dependency-checker@3.4.0: + resolution: {integrity: sha512-hlQRRCz2W2ZVg1l2Lz7zO0vfeYEXOYVc6hI1CUoy8mBvETauPtvo3Pi+CECUOa2kjXjyuNtclPc3ged6kNMumw==} + engines: {node: '>= 20'} + peerDependencies: + ember-cli: ^3.2.0 || >=4.0.0 + ember-cli-deprecation-workflow@3.4.0: resolution: {integrity: sha512-Ksrmib4mjD4xa0dqFgxJLBwkSp9EVYH6jSqe2NpODlBKEAZhsVzQj5wKPnC1dXfK3Erq/r1Fh3q4g46FZiCUiw==} engines: {node: '>= 18'} @@ -12292,6 +12298,16 @@ packages: webpack-cli: optional: true + webpack@5.106.2: + resolution: {integrity: sha512-wGN3qcrBQIFmQ/c0AiOAQBvrZ5lmY8vbbMv4Mxfgzqd/B6+9pXtLo73WuS1dSGXM5QYY3hZnIbvx+K1xxe6FyA==} + engines: {node: '>=10.13.0'} + hasBin: true + peerDependencies: + webpack-cli: '*' + peerDependenciesMeta: + webpack-cli: + optional: true + websocket-driver@0.7.4: resolution: {integrity: sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==} engines: {node: '>=0.8.0'} @@ -15974,7 +15990,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 +15999,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': {} @@ -16641,14 +16657,14 @@ snapshots: schema-utils: 2.7.1 webpack: 5.105.4(@swc/core@1.15.21) - babel-loader@8.4.1(@babel/core@7.29.0)(webpack@5.105.4): + babel-loader@8.4.1(@babel/core@7.29.0)(webpack@5.106.2): dependencies: '@babel/core': 7.29.0(supports-color@8.1.1) find-cache-dir: 3.3.2 loader-utils: 2.0.4 make-dir: 3.1.0 schema-utils: 2.7.1 - webpack: 5.105.4 + webpack: 5.106.2 babel-loader@9.2.1(@babel/core@7.29.0)(webpack@5.105.4(@swc/core@1.15.21)): dependencies: @@ -17820,7 +17836,7 @@ snapshots: semver: 7.7.4 webpack: 5.105.4(@swc/core@1.15.21) - css-loader@5.2.7(webpack@5.105.4): + css-loader@5.2.7(webpack@5.106.2): dependencies: icss-utils: 5.1.0(postcss@8.5.8) loader-utils: 2.0.4 @@ -17832,7 +17848,7 @@ snapshots: postcss-value-parser: 4.2.0 schema-utils: 3.3.0 semver: 7.7.4 - webpack: 5.105.4 + webpack: 5.106.2 css-tree@1.1.3: dependencies: @@ -18072,7 +18088,7 @@ snapshots: elegant-spinner@1.0.1: {} - ember-auto-import@2.13.1(webpack@5.105.4): + ember-auto-import@2.13.1(webpack@5.106.2): dependencies: '@babel/core': 7.29.0(supports-color@8.1.1) '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.29.0) @@ -18083,7 +18099,7 @@ snapshots: '@embroider/macros': 1.20.2(@babel/core@7.29.0) '@embroider/reverse-exports': 0.2.0 '@embroider/shared-internals': 2.9.2(supports-color@8.1.1) - babel-loader: 8.4.1(@babel/core@7.29.0)(webpack@5.105.4) + babel-loader: 8.4.1(@babel/core@7.29.0)(webpack@5.106.2) babel-plugin-ember-modules-api-polyfill: 3.5.0 babel-plugin-ember-template-compilation: 4.0.0 babel-plugin-htmlbars-inline-precompile: 5.3.1 @@ -18093,7 +18109,7 @@ snapshots: broccoli-merge-trees: 4.2.0 broccoli-plugin: 4.0.7 broccoli-source: 3.0.1 - css-loader: 5.2.7(webpack@5.105.4) + css-loader: 5.2.7(webpack@5.106.2) debug: 4.4.3(supports-color@8.1.1) fs-extra: 10.1.0 fs-tree-diff: 2.0.1 @@ -18101,14 +18117,14 @@ snapshots: is-subdir: 1.2.0 js-string-escape: 1.0.1 lodash: 4.17.23 - mini-css-extract-plugin: 2.10.2(webpack@5.105.4) + mini-css-extract-plugin: 2.10.2(webpack@5.106.2) minimatch: 3.1.5 parse5: 6.0.1 pkg-entry-points: 1.1.1 resolve: 1.22.11 resolve-package-path: 4.0.3 semver: 7.7.4 - style-loader: 2.0.0(webpack@5.105.4) + style-loader: 2.0.0(webpack@5.106.2) typescript-memoize: 1.1.1 walk-sync: 3.0.0 transitivePeerDependencies: @@ -18200,14 +18216,18 @@ snapshots: resolve: 1.22.11 semver: 5.7.2 - ember-cli-dependency-checker@3.3.3(ember-cli@6.12.0(@babel/core@7.29.0)(@types/node@22.19.15)): + ember-cli-dependency-checker@3.4.0(@babel/core@7.29.0)(ember-cli@6.12.0(@babel/core@7.29.0)(@types/node@22.19.15))(eslint@9.39.4): dependencies: - chalk: 2.4.2 + '@babel/eslint-parser': 7.28.6(@babel/core@7.29.0)(eslint@9.39.4) + chalk: 4.1.2 ember-cli: 6.12.0(@babel/core@7.29.0)(@types/node@22.19.15)(ejs@3.1.10)(handlebars@4.7.9)(underscore@1.13.8) find-yarn-workspace-root: 2.0.0 is-git-url: 1.0.0 - resolve: 1.22.11 - semver: 5.7.2 + resolve: 1.22.12 + semver: 7.7.4 + transitivePeerDependencies: + - '@babel/core' + - eslint ember-cli-deprecation-workflow@3.4.0(ember-source@): dependencies: @@ -19129,7 +19149,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 @@ -21189,14 +21209,14 @@ snapshots: mini-css-extract-plugin@2.10.2(webpack@5.105.4(@swc/core@1.15.21)): dependencies: schema-utils: 4.3.3 - tapable: 2.3.2 + tapable: 2.3.3 webpack: 5.105.4(@swc/core@1.15.21) - mini-css-extract-plugin@2.10.2(webpack@5.105.4): + mini-css-extract-plugin@2.10.2(webpack@5.106.2): dependencies: schema-utils: 4.3.3 - tapable: 2.3.2 - webpack: 5.105.4 + tapable: 2.3.3 + webpack: 5.106.2 minimatch@10.2.4: dependencies: @@ -21856,6 +21876,14 @@ snapshots: transitivePeerDependencies: - supports-color + prettier-plugin-ember-template-tag@2.1.5(prettier@3.8.1): + dependencies: + '@babel/traverse': 7.29.0(supports-color@8.1.1) + content-tag: 4.1.1 + prettier: 3.8.1 + transitivePeerDependencies: + - supports-color + prettier-plugin-ember-template-tag@2.1.5(prettier@3.8.3): dependencies: '@babel/traverse': 7.29.0(supports-color@8.1.1) @@ -22976,11 +23004,11 @@ snapshots: schema-utils: 3.3.0 webpack: 5.105.4(@swc/core@1.15.21) - style-loader@2.0.0(webpack@5.105.4): + style-loader@2.0.0(webpack@5.106.2): dependencies: loader-utils: 2.0.4 schema-utils: 3.3.0 - webpack: 5.105.4 + webpack: 5.106.2 styled_string@0.0.1: {} @@ -23144,13 +23172,13 @@ snapshots: optionalDependencies: '@swc/core': 1.15.21 - terser-webpack-plugin@5.4.0(webpack@5.105.4): + terser-webpack-plugin@5.4.0(webpack@5.106.2): dependencies: '@jridgewell/trace-mapping': 0.3.31 jest-worker: 27.5.1 schema-utils: 4.3.3 terser: 5.46.1 - webpack: 5.105.4 + webpack: 5.106.2 terser@5.46.1: dependencies: @@ -23874,7 +23902,7 @@ snapshots: webpack-sources@3.3.4: {} - webpack@5.105.4: + webpack@5.105.4(@swc/core@1.15.21): dependencies: '@types/eslint-scope': 3.7.7 '@types/estree': 1.0.8 @@ -23898,7 +23926,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 4.3.3 tapable: 2.3.2 - terser-webpack-plugin: 5.4.0(webpack@5.105.4) + terser-webpack-plugin: 5.4.0(@swc/core@1.15.21)(webpack@5.105.4(@swc/core@1.15.21)) watchpack: 2.5.1 webpack-sources: 3.3.4 transitivePeerDependencies: @@ -23906,10 +23934,10 @@ snapshots: - esbuild - uglify-js - webpack@5.105.4(@swc/core@1.15.21): + webpack@5.106.2: dependencies: '@types/eslint-scope': 3.7.7 - '@types/estree': 1.0.8 + '@types/estree': 1.0.9 '@types/json-schema': 7.0.15 '@webassemblyjs/ast': 1.14.1 '@webassemblyjs/wasm-edit': 1.14.1 @@ -23918,19 +23946,18 @@ snapshots: acorn-import-phases: 1.0.4(acorn@8.16.0) browserslist: 4.28.1 chrome-trace-event: 1.0.4 - enhanced-resolve: 5.20.1 + enhanced-resolve: 5.21.0 es-module-lexer: 2.0.0 eslint-scope: 5.1.1 events: 3.3.0 glob-to-regexp: 0.4.1 graceful-fs: 4.2.11 - json-parse-even-better-errors: 2.3.1 loader-runner: 4.3.1 - mime-types: 2.1.35 + mime-db: 1.54.0 neo-async: 2.6.2 schema-utils: 4.3.3 - tapable: 2.3.2 - terser-webpack-plugin: 5.4.0(@swc/core@1.15.21)(webpack@5.105.4(@swc/core@1.15.21)) + tapable: 2.3.3 + terser-webpack-plugin: 5.4.0(webpack@5.106.2) watchpack: 2.5.1 webpack-sources: 3.3.4 transitivePeerDependencies: diff --git a/smoke-tests/app-template/.github/workflows/ci.yml b/smoke-tests/app-template/.github/workflows/ci.yml index a18134befbd..8a43ff0d429 100644 --- a/smoke-tests/app-template/.github/workflows/ci.yml +++ b/smoke-tests/app-template/.github/workflows/ci.yml @@ -18,9 +18,9 @@ jobs: timeout-minutes: 10 steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v3 - name: Install Node - uses: actions/setup-node@v6 + uses: actions/setup-node@v3 with: node-version: 18 cache: npm @@ -35,9 +35,9 @@ jobs: timeout-minutes: 10 steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v3 - name: Install Node - uses: actions/setup-node@v6 + uses: actions/setup-node@v3 with: node-version: 18 cache: npm diff --git a/smoke-tests/app-template/config/ember-cli-update.json b/smoke-tests/app-template/config/ember-cli-update.json index e5993ab805e..606a779e385 100644 --- a/smoke-tests/app-template/config/ember-cli-update.json +++ b/smoke-tests/app-template/config/ember-cli-update.json @@ -3,7 +3,7 @@ "packages": [ { "name": "@ember-tooling/classic-build-app-blueprint", - "version": "6.11.0", + "version": "6.12.0", "blueprints": [ { "name": "@ember-tooling/classic-build-app-blueprint", diff --git a/smoke-tests/app-template/config/optional-features.json b/smoke-tests/app-template/config/optional-features.json index 5329dd9913b..756228612bc 100644 --- a/smoke-tests/app-template/config/optional-features.json +++ b/smoke-tests/app-template/config/optional-features.json @@ -3,5 +3,6 @@ "default-async-observers": true, "jquery-integration": false, "template-only-glimmer-components": true, - "no-implicit-route-model": true + "no-implicit-route-model": true, + "use-ember-modules": true } diff --git a/smoke-tests/app-template/ember-cli-build.js b/smoke-tests/app-template/ember-cli-build.js index ed991bd98f6..4eaa56b4fbc 100644 --- a/smoke-tests/app-template/ember-cli-build.js +++ b/smoke-tests/app-template/ember-cli-build.js @@ -7,5 +7,6 @@ module.exports = function (defaults) { // Add options here }); + return app.toTree(); }; diff --git a/smoke-tests/app-template/package.json b/smoke-tests/app-template/package.json index 853a2424210..e12a12e223c 100644 --- a/smoke-tests/app-template/package.json +++ b/smoke-tests/app-template/package.json @@ -33,7 +33,7 @@ "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/macros": "^1.20.2", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "workspace:^", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", @@ -43,7 +43,7 @@ "ember-cli-app-version": "^7.0.0", "ember-cli-babel": "^8.3.1", "ember-cli-clean-css": "^3.0.0", - "ember-cli-dependency-checker": "^3.3.3", + "ember-cli-dependency-checker": "^3.4.0", "ember-cli-deprecation-workflow": "^3.4.0", "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", @@ -53,11 +53,11 @@ "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-imports": "^4.4.0", "ember-template-lint": "^6.1.0", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", "eslint-plugin-n": "^17.24.0", @@ -65,13 +65,13 @@ "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.3", + "prettier-plugin-ember-template-tag": "^2.1.4", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^4.1.2", - "webpack": "^5.105.2" + "webpack": "^5.106.0", + "tracked-built-ins": "^4.1.2" }, "engines": { "node": ">= 20.19"