diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 521c32c4df..d800afcc0c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,11 @@ on: - next - "v*" - "lts-*" + paths-ignore: + - "**.md" pull_request: + paths-ignore: + - "**.md" workflow_dispatch: merge_group: schedule: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c6f9721439..b8d1bf34a2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -32,10 +32,9 @@ jobs: - uses: pnpm/action-setup@v4 - uses: actions/setup-node@v6 with: - node-version: 22 + node-version: 24 registry-url: "https://registry.npmjs.org" cache: pnpm - - run: npm install -g npm@latest # ensure that the globally installed npm is new enough to support OIDC - run: pnpm install --frozen-lockfile - name: Publish to NPM # pass --github-prerelease when we are only branch other than release @@ -48,4 +47,4 @@ jobs: pnpm release-plan publish --github-prerelease fi env: - GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }} + GITHUB_AUTH: ${{ secrets.RELEASE_PLAN_GH_PAT }} diff --git a/CHANGELOG.md b/CHANGELOG.md index ffa2d64023..b707be94b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,55 @@ # ember-cli Changelog +## Release (2026-03-29) + +* ember-cli 6.11.2 (patch) +* @ember-tooling/classic-build-addon-blueprint 6.11.2 (patch) +* @ember-tooling/classic-build-app-blueprint 6.11.2 (patch) + +#### :bug: Bug Fix +* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint` + * [#10977](https://github.com/ember-cli/ember-cli/pull/10977) Backport: Enable use-ember-modules in blueprint optional-features.json ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent)) + +#### Committers: 1 +- NullVoxPopuli's reduced-access machine account for AI usage ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent)) + +## Release (2026-03-29) + +* ember-cli 6.11.1 (patch) +* @ember-tooling/classic-build-addon-blueprint 6.11.1 (patch) +* @ember-tooling/classic-build-app-blueprint 6.11.1 (patch) + +#### :bug: Bug Fix +* `@ember-tooling/classic-build-app-blueprint`, `ember-cli` + * [#10975](https://github.com/ember-cli/ember-cli/pull/10975) Backport: Update ember-cli-htmlbars to ^7.0.0 in app-blueprint ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent)) +* `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint`, `ember-cli` + * [#10974](https://github.com/ember-cli/ember-cli/pull/10974) Backport: Remove tracked-built-ins (it comes built in with ember-source 6.8+) ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent)) +* `ember-cli` + * [#10972](https://github.com/ember-cli/ember-cli/pull/10972) Support ember-source (ESM) -- without addon vendor paths ([@NullVoxPopuli](https://github.com/NullVoxPopuli)) + +#### Committers: 2 +- NullVoxPopuli's reduced-access machine account for AI usage ([@NullVoxPopuli-ai-agent](https://github.com/NullVoxPopuli-ai-agent)) +- [@NullVoxPopuli](https://github.com/NullVoxPopuli) + +## Release (2026-02-17) + +* ember-cli 6.11.0 (minor) +* @ember-tooling/classic-build-addon-blueprint 6.11.0 (minor) +* @ember-tooling/classic-build-app-blueprint 6.11.0 (minor) + +#### :rocket: Enhancement +* `ember-cli`, `@ember-tooling/classic-build-app-blueprint` + * [#10960](https://github.com/ember-cli/ember-cli/pull/10960) Promote Beta and update all dependencies for 6.11 release ([@mansona](https://github.com/mansona)) +* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint` + * [#10929](https://github.com/ember-cli/ember-cli/pull/10929) Prepare 6.11-beta ([@mansona](https://github.com/mansona)) + * [#10919](https://github.com/ember-cli/ember-cli/pull/10919) Prepare 6.11-alpha ([@mansona](https://github.com/mansona)) + +#### Committers: 1 +- Chris Manson ([@mansona](https://github.com/mansona)) + ## Release (2026-02-09) -* ember-cli 6.11.0-beta.2 (patch) +* ember-cli 6.10.2 (patch) #### :bug: Bug Fix * `ember-cli` @@ -11,7 +58,6 @@ #### :house: Internal * `ember-cli` - * [#10954](https://github.com/ember-cli/ember-cli/pull/10954) Merge release into beta ([@mansona](https://github.com/mansona)) * [#10952](https://github.com/ember-cli/ember-cli/pull/10952) add correct --publish-branch to pnpm publish ([@mansona](https://github.com/mansona)) * [#10951](https://github.com/ember-cli/ember-cli/pull/10951) Fix PR name for stable release-plan pull request ([@mansona](https://github.com/mansona)) * [#10950](https://github.com/ember-cli/ember-cli/pull/10950) [backport release] update release-plan for OIDC ([@mansona](https://github.com/mansona)) @@ -19,22 +65,19 @@ #### Committers: 1 - Chris Manson ([@mansona](https://github.com/mansona)) -## Release (2026-01-25) +## Release (2026-02-08) -* ember-cli 6.11.0-beta.1 (minor) -* @ember-tooling/classic-build-addon-blueprint 6.11.0-beta.1 (minor) -* @ember-tooling/classic-build-app-blueprint 6.11.0-beta.1 (minor) +* ember-cli 6.10.1 (patch) -#### :rocket: Enhancement -* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint` - * [#10923](https://github.com/ember-cli/ember-cli/pull/10923) Promote Beta and update all dependencies for 6.10 release ([@mansona](https://github.com/mansona)) - * [#10919](https://github.com/ember-cli/ember-cli/pull/10919) Prepare 6.11-alpha ([@mansona](https://github.com/mansona)) +#### :bug: Bug Fix +* `ember-cli` + * [#10949](https://github.com/ember-cli/ember-cli/pull/10949) [backport release] remove unused isbinaryfile from ember-cli package ([@mansona](https://github.com/mansona)) + * [#10940](https://github.com/ember-cli/ember-cli/pull/10940) [bugfix release] remove fixturify-project from dependencies ([@mansona](https://github.com/mansona)) #### :house: Internal -* `ember-cli`, `@ember-tooling/classic-build-addon-blueprint`, `@ember-tooling/classic-build-app-blueprint` - * [#10929](https://github.com/ember-cli/ember-cli/pull/10929) Prepare 6.11-beta ([@mansona](https://github.com/mansona)) - * [#10918](https://github.com/ember-cli/ember-cli/pull/10918) Prepare Stable Release ([@mansona](https://github.com/mansona)) - * [#10884](https://github.com/ember-cli/ember-cli/pull/10884) Prepare Alpha Release ([@mansona](https://github.com/mansona)) +* `ember-cli` + * [#10951](https://github.com/ember-cli/ember-cli/pull/10951) Fix PR name for stable release-plan pull request ([@mansona](https://github.com/mansona)) + * [#10950](https://github.com/ember-cli/ember-cli/pull/10950) [backport release] update release-plan for OIDC ([@mansona](https://github.com/mansona)) #### Committers: 1 - Chris Manson ([@mansona](https://github.com/mansona)) diff --git a/RELEASE.md b/RELEASE.md index 2451ede09c..9629d133dd 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -44,12 +44,17 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i - make sure to not update the version in the package.json during this step, this will be release-plan's job - make sure to not update the version in the `packages/app-blueprint/package.json`, or `packages/addon-blueprint/package.json` files during this step, this will be release-plan's job - make sure to not add the `release-plan` config section to the package.json during this step. We are releasing a real release so we don't want to configure release-plan to do a pre-release. + - commit the merge `git commit -am "promote beta to release"` - Update blueprint dependencies to latest. Note: ember-data needs to be updated only in the alpha version from now on, make sure to only update to the release version of what was in the beta. ``` node ./dev/update-blueprint-dependencies.js --ember-source=latest --ember-data= ``` +- run `pnpm lint:fix` +- update the @ember/app-blueprint dependency `pnpm i -w @ember/app-blueprint@latest` +- manually add a `~` back into the `@ember/app-blueprint` dependency in the root package.json +- run `pnpm install` to make sure the lock file is up to date - commit this update `git commit -am "update blueprint dependencies to latest"` - push and open a PR targeting `release` with a PR title like `Promote Beta and update all dependencies for 6.4 release` - mark this PR as an `enhancement` if it is a minor release @@ -59,6 +64,11 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i - Merge the `Prepare Release` branch when you are ready to release - Check the `Release Stable` GitHub action to make sure the release succeeded +### Finish the `@ember/app-blueprint` release + +- Update the `@ember/app-blueprint` `release` branch to use this new version of ember-cli +- continue the rest of the [@ember/app-blueprint release process](https://github.com/ember-cli/ember-app-blueprint/blob/main/RELEASE.md#release-ember-cli-and-update-that-dependency) until beta and alpha are released + ### Beta release from the `beta` branch - fetch latest from origin `git fetch` @@ -67,17 +77,20 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i - **make sure to not update the .release-plan file** this should only ever be changed by the release-plan github scripts - **make sure to not update any .github/workflows/plan-beta-release.yml file** this should still plan a beta release - **make sure to not update any .github/workflows/publish-beta.yml file** this should still publish a beta release - - make sure to not update the version in the package.json during this step, that step comes later + - make sure to not update the version in the `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json` during this step, that step comes later - make sure to not remove the `release-plan` config section to the `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json`, during this step. + - commit the merge `git commit -am "merge release into beta"` - merge master into this new branch too e.g. `git merge origin/master --no-ff` - **make sure to not update the .release-plan file** this should only ever be changed by the release-plan github scripts - **make sure to not update the CHANGELOG.md file** in this step. It should match the changelog on `origin/release` at this stage. - make sure not to update the `release-plan` config in `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json` + - make sure not to update the `@ember-tooling/blueprint-blueprint` versions (i.e. not workspace dependencies) in `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json` + - make sure not to add any files from `packages/blueprint-blueprint` or `packages/blueprint-model` in this merge (those files only exist on main) - commit the merge `git commit -am "merge master into beta"` - update the versions in package.jsons - update the alpha version in package.json to be a beta i.e. if the incoming merge is `"version": "6.6.0-alpha.3",` update it to `"version": "6.6.0-beta.0",` - - update the alpha version in `packages/addon-blueprint/package.json` to be a beta - - update the alpha version in `packages/app-blueprint/package.json` to be a beta + - update the alpha version in `packages/addon-blueprint/package.json` to be the same beta version + - update the alpha version in `packages/app-blueprint/package.json` to be the same beta version - update the `ember-cli` reference in `packages/app-blueprint/files/package.json` to be the same as the version you just put in the top level package.json - commit the version changes `git commit -am "update versions"` - Update blueprint dependencies to beta @@ -86,8 +99,10 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i node ./dev/update-blueprint-dependencies.js --ember-source=beta --ember-data= ``` +- run `pnpm lint:fix` - update the @ember/app-blueprint dependency `pnpm i -w @ember/app-blueprint@beta` - manually add a `~` back into the `@ember/app-blueprint` dependency in the root package.json +- run `pnpm install` to make sure the lock file is up to date - commit this update `git commit -am "update blueprint dependencies to beta"` - push and open a PR targeting `beta` with a PR title like `Prepare 6.5-beta` - mark this PR as an `enchancement` if the next beta is a minor release @@ -104,9 +119,9 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i - create a new branch to merge `beta` into `master` e.g. `git checkout --no-track -b merge-beta origin/master` - merge beta into this new branch e.g. `git merge origin/beta --no-ff` - **make sure to not update the .release-plan file** this should only ever be changed by the release-plan github scripts - - make sure to not update the version in the package.json during this step, that step comes later + - make sure to not update the version in the `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json` during this step, that step comes later - make sure to not update the `release-plan` config section to the `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json`, during this step. - - make sure not to update the `@ember-tooling/blueprint-blueprint` or `@ember-tooling/blueprint-model` away from being `workspace: *` dependencies. On master they always use the latest and don't use semver. + - make sure not to update the `@ember-tooling/blueprint-blueprint` or `@ember-tooling/blueprint-model` away from being `workspace: *` dependencies in `package.json`, `packages/addon-blueprint/package.json`, or `packages/app-blueprint/package.json`. On master they always use the latest and don't use semver. - **make sure to not update any .github/workflows/plan-release.yml file** this should still plan a beta release - **make sure to not update any .github/workflows/publish.yml file** this should still publish a beta release - **make sure to not update the CHANGELOG.md file** in this step. @@ -116,7 +131,8 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i - e.g. if the current alpha is `"version": "6.6.0-alpha.3",` update it to be `"version": "6.7.0-alpha.0",` - manually update the alpha version in `packages/addon-blueprint/package.json` to be the same alpha - manually update the alpha version in `packages/app-blueprint/package.json` to be the same alpha -- commit this change to the version in package.json: `git commit -am "update to the next alpha version"` +- update the `ember-cli` reference in `packages/app-blueprint/files/package.json` to be the same alpha +- commit this change `git commit -am "update to the next alpha version"` - Update blueprint dependencies to alpha ``` @@ -124,8 +140,10 @@ You can use [this saved search](https://github.com/ember-cli/ember-cli/pulls?q=i ``` - note: ember-data (aka warp-drive) should only ever be updated on master as a separate PR. It is no longer part of the release process +- run `pnpm lint:fix` - update the @ember/app-blueprint dependency `pnpm i -w @ember/app-blueprint@alpha` - make sure the app-blueprint still has a `~` after the above step +- run `pnpm install` to make sure the lock file is up to date - commit this update `git commit -am "update blueprint dependencies to alpha"` - push and open a PR targeting `master` with a PR title like `Prepare 6.6-alpha` - mark this PR as an `enchancement` if the next alpha is a minor release diff --git a/lib/broccoli/ember-app.js b/lib/broccoli/ember-app.js index 267a9ac10b..0de6c2e0d9 100644 --- a/lib/broccoli/ember-app.js +++ b/lib/broccoli/ember-app.js @@ -342,13 +342,15 @@ class EmberApp { this.vendorFiles = omitBy( merge( - { - 'ember.js': { - development: emberSource.paths.debug, - production: emberSource.paths.prod, - }, - 'ember-testing.js': [emberSource.paths.testing, { type: 'test' }], - }, + emberSource.paths + ? { + 'ember.js': { + development: emberSource.paths.debug, + production: emberSource.paths.prod, + }, + 'ember-testing.js': [emberSource.paths.testing, { type: 'test' }], + } + : {}, this.options.vendorFiles ), isNull diff --git a/lib/commands/test.js b/lib/commands/test.js index c9c22bb765..5dda94ff7d 100644 --- a/lib/commands/test.js +++ b/lib/commands/test.js @@ -4,16 +4,14 @@ const Command = require('../models/command'); const Watcher = require('../models/watcher'); const Builder = require('../models/builder'); const SilentError = require('silent-error'); +const os = require('os'); const path = require('path'); const Win = require('../utilities/windows-admin'); const fs = require('fs'); -const temp = require('temp'); const util = require('util'); const PortFinder = require('portfinder'); let getPort = util.promisify(PortFinder.getPort); -temp.track(); - let defaultPort = 7357; const ClassicOptions = [ @@ -99,7 +97,7 @@ module.exports = Command.extend({ }, tmp() { - return temp.mkdirSync('tests-dist-'); + return fs.mkdtempSync(path.join(os.tmpdir(), 'tests-dist-')); }, _generateCustomConfigs(options) { diff --git a/lib/tasks/install-blueprint.js b/lib/tasks/install-blueprint.js index 0a9237af74..f44c0418ab 100644 --- a/lib/tasks/install-blueprint.js +++ b/lib/tasks/install-blueprint.js @@ -3,8 +3,7 @@ const fs = require('fs-extra'); const Blueprint = require('../models/blueprint'); const Task = require('../models/task'); -const util = require('util'); -const temp = require('temp'); +const os = require('os'); const path = require('path'); const merge = require('lodash/merge'); const { execa } = require('execa'); @@ -17,11 +16,6 @@ const { isExperimentEnabled } = require('@ember-tooling/blueprint-model/utilitie const NOT_FOUND_REGEXP = /npm ERR! 404 {2}'(\S+)' is not in the npm registry/; -// Automatically track and cleanup temp files at exit -temp.track(); - -let mkdirTemp = util.promisify(temp.mkdir); - class InstallBlueprintTask extends Task { async run(options) { let cwd = process.cwd(); @@ -115,7 +109,7 @@ class InstallBlueprintTask extends Task { } _createTempFolder() { - return mkdirTemp('ember-cli'); + return fs.mkdtemp(path.join(os.tmpdir(), 'ember-cli-')); } _resolvePackageJSON(directoryPath) { diff --git a/package.json b/package.json index 38b4440018..1767a7c462 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-cli", - "version": "6.11.0-beta.2", + "version": "6.12.0-beta.0", "description": "Command line tool for developing ambitious ember.js apps", "keywords": [ "app", @@ -55,7 +55,7 @@ "@ember-tooling/blueprint-model": "^0.5.0", "@ember-tooling/classic-build-addon-blueprint": "workspace:*", "@ember-tooling/classic-build-app-blueprint": "workspace:*", - "@ember/app-blueprint": "~6.11.0-beta.2", + "@ember/app-blueprint": "~6.12.0-beta.1", "@pnpm/find-workspace-dir": "^1000.1.3", "babel-remove-types": "^1.0.2", "broccoli": "^4.0.0", @@ -128,7 +128,6 @@ "silent-error": "^1.1.1", "sort-package-json": "^3.6.0", "symlink-or-copy": "^1.3.1", - "temp": "0.9.4", "testem": "^3.17.0", "tiny-lr": "^2.0.0", "tree-sync": "^2.1.0", diff --git a/packages/addon-blueprint/files/config/optional-features.json b/packages/addon-blueprint/files/config/optional-features.json index b26286e2ec..f84cd7eed7 100644 --- a/packages/addon-blueprint/files/config/optional-features.json +++ b/packages/addon-blueprint/files/config/optional-features.json @@ -2,5 +2,6 @@ "application-template-wrapper": false, "default-async-observers": true, "jquery-integration": false, - "template-only-glimmer-components": true + "template-only-glimmer-components": true, + "use-ember-modules": true } diff --git a/packages/addon-blueprint/index.js b/packages/addon-blueprint/index.js index e6fea7bc89..167f159192 100644 --- a/packages/addon-blueprint/index.js +++ b/packages/addon-blueprint/index.js @@ -90,10 +90,6 @@ module.exports = { // @see https://github.com/emberjs/rfcs/blob/master/text/0811-element-modifiers.md#detailed-design delete contents.devDependencies['ember-modifier']; - // Per RFC #812, addons should not have this dependency. - // @see https://github.com/emberjs/rfcs/blob/master/text/0812-tracked-built-ins.md#detailed-design - delete contents.devDependencies['tracked-built-ins']; - // 100% of addons don't need ember-cli-app-version, make it opt-in instead delete contents.devDependencies['ember-cli-app-version']; @@ -248,6 +244,7 @@ module.exports = { embroider: false, lang: options.lang, emberData: options.emberData, + warpDrive: options.warpDrive ?? options.emberData ?? false, ciProvider: options.ciProvider, typescript: options.typescript, strict: options.strict, diff --git a/packages/addon-blueprint/package.json b/packages/addon-blueprint/package.json index dea51d5c8c..752f58f80b 100644 --- a/packages/addon-blueprint/package.json +++ b/packages/addon-blueprint/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/classic-build-addon-blueprint", - "version": "6.11.0-beta.1", + "version": "6.12.0-beta.0", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", @@ -15,10 +15,10 @@ "chalk": "^5.6.2", "ember-cli-normalize-entity-name": "^1.0.0", "ember-cli-string-utils": "^1.1.0", - "fs-extra": "^11.3.0", - "lodash": "^4.17.21", + "fs-extra": "^11.3.3", + "lodash": "^4.17.23", "silent-error": "^1.1.1", - "sort-package-json": "^2.12.0", + "sort-package-json": "^2.15.1", "walk-sync": "^3.0.0" }, "release-plan": { diff --git a/packages/app-blueprint/files/_js_eslint.config.mjs b/packages/app-blueprint/files/_js_eslint.config.mjs index a29e5cd3bd..e4c0229f9a 100644 --- a/packages/app-blueprint/files/_js_eslint.config.mjs +++ b/packages/app-blueprint/files/_js_eslint.config.mjs @@ -15,7 +15,8 @@ import globals from 'globals'; import js from '@eslint/js'; -import ember from 'eslint-plugin-ember/recommended'; +import ember from 'eslint-plugin-ember/recommended';<% if (warpDrive) { %> +import WarpDrive from 'eslint-plugin-warp-drive/recommended';<% } %> import eslintConfigPrettier from 'eslint-config-prettier'; import qunit from 'eslint-plugin-qunit'; import n from 'eslint-plugin-n'; @@ -38,7 +39,8 @@ export default [ eslintConfigPrettier, ember.configs.base, ember.configs.gjs, - /** + <% if (warpDrive) { %>...WarpDrive, + <% } %>/** * Ignores must be in their own object * https://eslint.org/docs/latest/use/configure/ignore */ diff --git a/packages/app-blueprint/files/_ts_eslint.config.mjs b/packages/app-blueprint/files/_ts_eslint.config.mjs index 5232ee68dd..31dd559784 100644 --- a/packages/app-blueprint/files/_ts_eslint.config.mjs +++ b/packages/app-blueprint/files/_ts_eslint.config.mjs @@ -19,7 +19,8 @@ import js from '@eslint/js'; import ts from 'typescript-eslint'; -import ember from 'eslint-plugin-ember/recommended'; +import ember from 'eslint-plugin-ember/recommended';<% if (warpDrive) { %> +import WarpDrive from 'eslint-plugin-warp-drive/recommended';<% } %> import eslintConfigPrettier from 'eslint-config-prettier'; import qunit from 'eslint-plugin-qunit'; @@ -54,7 +55,8 @@ export default ts.config( ember.configs.base, ember.configs.gjs, ember.configs.gts, - eslintConfigPrettier, + <% if (warpDrive) { %>...WarpDrive, + <% } %>eslintConfigPrettier, /** * Ignores must be in their own object * https://eslint.org/docs/latest/use/configure/ignore diff --git a/packages/app-blueprint/files/app/app.ts b/packages/app-blueprint/files/app/app.ts index ac9033799f..dea884f275 100644 --- a/packages/app-blueprint/files/app/app.ts +++ b/packages/app-blueprint/files/app/app.ts @@ -1,4 +1,4 @@ -<% if (emberData) { %>import '@warp-drive/ember/install'; +<% if (warpDrive) { %>import '@warp-drive/ember/install'; <% } %>import Application from '@ember/application'; import Resolver from 'ember-resolver'; import loadInitializers from 'ember-load-initializers'; diff --git a/packages/app-blueprint/files/app/services/store.ts b/packages/app-blueprint/files/app/services/store.ts new file mode 100644 index 0000000000..fae48c6060 --- /dev/null +++ b/packages/app-blueprint/files/app/services/store.ts @@ -0,0 +1,17 @@ +import { useLegacyStore } from '@warp-drive/legacy'; +import { JSONAPICache } from '@warp-drive/json-api'; + +const Store = useLegacyStore({ + linksMode: false, + cache: JSONAPICache, + handlers: [ + // -- your handlers here + ], + schemas: [ + // -- your schemas here + ], +}); + +type Store = InstanceType; + +export default Store; diff --git a/packages/app-blueprint/files/config/optional-features.json b/packages/app-blueprint/files/config/optional-features.json index 5329dd9913..756228612b 100644 --- a/packages/app-blueprint/files/config/optional-features.json +++ b/packages/app-blueprint/files/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/packages/app-blueprint/files/ember-cli-build.js b/packages/app-blueprint/files/ember-cli-build.js index 4680730da9..b6afacfe80 100644 --- a/packages/app-blueprint/files/ember-cli-build.js +++ b/packages/app-blueprint/files/ember-cli-build.js @@ -1,22 +1,25 @@ 'use strict'; const EmberApp = require('ember-cli/lib/broccoli/ember-app'); - +<% if (warpDrive) {%>const { setConfig } = require('@warp-drive/core/build-config'); +<% } %> module.exports = function (defaults) { const app = new EmberApp(defaults, { - <% if (emberData) {%>emberData: { - deprecations: { - // New projects can safely leave this deprecation disabled. - // If upgrading, to opt-into the deprecated behavior, set this to true and then follow: - // https://deprecations.emberjs.com/id/ember-data-deprecate-store-extends-ember-object - // before upgrading to Ember Data 6.0 - DEPRECATE_STORE_EXTENDS_EMBER_OBJECT: false, - }, - }, - <% } %><% if (typescript) {%>'ember-cli-babel': { enableTypeScriptTransform: true }, + <% if (typescript) {%>'ember-cli-babel': { enableTypeScriptTransform: true }, <% } %>// Add options here }); +<% if (warpDrive) {%> + setConfig(app, __dirname, { + // this should be the most recent . version for + // which all deprecations have been fully resolved + // and should be updated when that changes + compatWith: '5.8', + deprecations: { + // ... list individual deprecations that have been resolved here + }, + }); +<% } %> <% if (embroider) { %>const { Webpack } = require('@embroider/webpack'); return require('@embroider/compat').compatBuild(app, Webpack, { diff --git a/packages/app-blueprint/files/package.json b/packages/app-blueprint/files/package.json index 23ca25bdbb..3031f680c4 100644 --- a/packages/app-blueprint/files/package.json +++ b/packages/app-blueprint/files/package.json @@ -28,75 +28,78 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6<% if (typescript && emberData) { %>", - "@ember-data/adapter": "~5.7.0", - "@ember-data/graph": "~5.7.0", - "@ember-data/json-api": "~5.7.0", - "@ember-data/legacy-compat": "~5.7.0", - "@ember-data/model": "~5.7.0", - "@ember-data/request": "~5.7.0", - "@ember-data/request-utils": "~5.7.0", - "@ember-data/serializer": "~5.7.0", - "@ember-data/store": "~5.7.0", - "@warp-drive/ember": "~5.7.0<% } %>", + "@babel/plugin-proposal-decorators": "^7.29.0<% if (typescript && emberData) { %>", + "@ember-data/adapter": "~5.8.1", + "@ember-data/graph": "~5.8.1", + "@ember-data/json-api": "~5.8.1", + "@ember-data/legacy-compat": "~5.8.1", + "@ember-data/model": "~5.8.1", + "@ember-data/request": "~5.8.1", + "@ember-data/request-utils": "~5.8.1", + "@ember-data/serializer": "~5.8.1", + "@ember-data/store": "~5.8.1", + "@warp-drive/ember": "~5.8.1<% } %>", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1<% if (embroider) { %>", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9<% } %>", - "@embroider/macros": "^1.19.6<% if (embroider) { %>", + "@embroider/macros": "^1.20.2<% if (embroider) { %>", "@embroider/webpack": "^4.1.2<% } %>", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2<% if (typescript) { %>", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.3", + "@glint/template": "^1.7.7", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", - "@types/rsvp": "^4.0.9<% if (emberData) {%>", - "@warp-drive/core-types": "~5.7.0<% }} %>", + "@types/rsvp": "^4.0.9<% } %><% if (warpDrive) { %>", + "@warp-drive/core": "~5.8.1", + "@warp-drive/json-api": "~5.8.1", + "@warp-drive/legacy": "~5.8.1", + "@warp-drive/utilities": "~5.8.1<% } %>", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", - "ember-cli": "~6.11.0-beta.2", + "ember-auto-import": "^2.13.1", + "ember-cli": "~6.12.0-beta.0", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.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": "^6.3.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0<% if (!embroider) { %>", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2<% } %><% if (emberData) { %>", - "ember-data": "~5.7.0<% } %>", + "ember-data": "~5.8.1<% } %>", "ember-load-initializers": "^3.0.1", - "ember-modifier": "^4.2.2", + "ember-modifier": "^4.3.0", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0<% if (welcome) { %>", "ember-welcome-page": "^7.0.2<% } %>", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6<% if (warpDrive) { %>", + "eslint-plugin-warp-drive": "^5.8.1<% } %>", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", - "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0<% if (typescript) { %>", + "stylelint-config-standard": "^36.0.1<% if (typescript) { %>", "typescript": "^5.9.3", - "typescript-eslint": "^8.53.1<% } %>", - "webpack": "^5.104.1" + "typescript-eslint": "^8.58.0<% } %>", + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/packages/app-blueprint/files/tests/test-helper.ts b/packages/app-blueprint/files/tests/test-helper.ts index f5e1c9916e..4bc7e42f57 100644 --- a/packages/app-blueprint/files/tests/test-helper.ts +++ b/packages/app-blueprint/files/tests/test-helper.ts @@ -1,4 +1,5 @@ -import Application from '<%= modulePrefix %>/app'; +<% if (warpDrive) { %>import '@warp-drive/ember/install'; +<% } %>import Application from '<%= modulePrefix %>/app'; import config from '<%= modulePrefix %>/config/environment'; import * as QUnit from 'qunit'; import { setApplication } from '@ember/test-helpers'; diff --git a/packages/app-blueprint/index.js b/packages/app-blueprint/index.js index fdbce6cc9c..0cf9ff5371 100644 --- a/packages/app-blueprint/index.js +++ b/packages/app-blueprint/index.js @@ -80,6 +80,7 @@ module.exports = { embroider, lang: options.lang, emberData: options.emberData, + warpDrive: options.warpDrive ?? options.emberData ?? false, ciProvider: options.ciProvider, typescript: options.typescript, strict: options.strict, @@ -109,6 +110,10 @@ module.exports = { files = files.filter((file) => !file.includes('ember-data/')); } + if (!options.warpDrive && !options.emberData) { + files = files.filter((file) => !file.includes('services/store.ts')); + } + if (options.strict) { files = files.filter((file) => !file.endsWith('.hbs')); } else { diff --git a/packages/app-blueprint/package.json b/packages/app-blueprint/package.json index d8d9ab4d0e..72f1263d96 100644 --- a/packages/app-blueprint/package.json +++ b/packages/app-blueprint/package.json @@ -1,6 +1,6 @@ { "name": "@ember-tooling/classic-build-app-blueprint", - "version": "6.11.0-beta.1", + "version": "6.12.0-beta.0", "repository": { "type": "git", "url": "https://github.com/ember-cli/ember-cli.git", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3619239f02..38ddcd9d75 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ importers: specifier: workspace:* version: link:packages/app-blueprint '@ember/app-blueprint': - specifier: ~6.11.0-beta.2 - version: 6.11.0-beta.2 + specifier: ~6.12.0-beta.1 + version: 6.12.0-beta.1 '@pnpm/find-workspace-dir': specifier: ^1000.1.3 version: 1000.1.3 @@ -239,9 +239,6 @@ importers: symlink-or-copy: specifier: ^1.3.1 version: 1.3.1 - temp: - specifier: 0.9.4 - version: 0.9.4 testem: specifier: ^3.17.0 version: 3.17.0(bufferutil@4.0.8)(ejs@3.1.10)(handlebars@4.7.8)(underscore@1.13.7)(utf-8-validate@5.0.10) @@ -376,17 +373,17 @@ importers: specifier: ^1.1.0 version: 1.1.0 fs-extra: - specifier: ^11.3.0 - version: 11.3.0 + specifier: ^11.3.3 + version: 11.3.3 lodash: - specifier: ^4.17.21 - version: 4.17.21 + specifier: ^4.17.23 + version: 4.17.23 silent-error: specifier: ^1.1.1 version: 1.1.1 sort-package-json: - specifier: ^2.12.0 - version: 2.12.0 + specifier: ^2.15.1 + version: 2.15.1 walk-sync: specifier: ^3.0.0 version: 3.0.0 @@ -533,8 +530,8 @@ packages: '@ember-tooling/blueprint-model@0.5.0': resolution: {integrity: sha512-2zAebSmmzpUO2wt6EyfX5TlcmvB9cTkteuZ3QhPmXLMthUpU5nUifcz3hlYcXPK7WM0HdO9qL4GdGQCoxhzaGg==} - '@ember/app-blueprint@6.11.0-beta.2': - resolution: {integrity: sha512-TM7R6Uy82L+9fqH5+f26CRZ7voTq+/TEm44labmBIyWPWKtg+3CraWHhzrf6t9g8rKM38vl8ikS+J5380oBsgw==} + '@ember/app-blueprint@6.12.0-beta.1': + resolution: {integrity: sha512-lJKO+eKewS4KwyJiP2hgToLuPD051WGwz+uyt28BFMDOew2N3MM1CTwdbW0I1I7FXLjdCzoTRQDYlnk1F2Vn3w==} '@eslint-community/eslint-utils@4.4.1': resolution: {integrity: sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==} @@ -958,6 +955,7 @@ packages: '@xmldom/xmldom@0.8.10': resolution: {integrity: sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==} engines: {node: '>=10.0.0'} + deprecated: this version has critical issues, please update to the latest version abab@2.0.6: resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==} @@ -2028,10 +2026,6 @@ packages: resolution: {integrity: sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==} engines: {node: '>=0.10.0'} - detect-indent@7.0.1: - resolution: {integrity: sha512-Mc7QhQ8s+cLrnUfU/Ji94vG/r8M26m8f++vyres4ZoojaRDpZ1eSIh/EpzLNwlWuvzSZ3UbDFspjFvTDXe6e/g==} - engines: {node: '>=12.20'} - detect-indent@7.0.2: resolution: {integrity: sha512-y+8xyqdGLL+6sh0tVeHcfP/QDd8gUgbasolJJpY7NgeQGSZ739bDtSiaiDgtoicy+mtYB81dKLxO9xRhCyIB3A==} engines: {node: '>=12.20'} @@ -2436,14 +2430,6 @@ packages: fb-watchman@2.0.2: resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==} - fdir@6.4.2: - resolution: {integrity: sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==} - peerDependencies: - picomatch: ^3 || ^4 - peerDependenciesMeta: - picomatch: - optional: true - fdir@6.5.0: resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==} engines: {node: '>=12.0.0'} @@ -2623,10 +2609,6 @@ packages: resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} engines: {node: '>=12'} - fs-extra@11.3.0: - resolution: {integrity: sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==} - engines: {node: '>=14.14'} - fs-extra@11.3.3: resolution: {integrity: sha512-VWSRii4t0AFm6ixFFmLLx1t7wS1gh+ckoa84aOeapGum0h+EZd1EhEumSB+ZdDLnEPuucsVB9oB7cxJHap6Afg==} engines: {node: '>=14.14'} @@ -2763,11 +2745,13 @@ packages: glob@10.4.5: resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==} + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me hasBin: true glob@11.0.3: resolution: {integrity: sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==} engines: {node: 20 || >=22} + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me hasBin: true glob@13.0.0: @@ -2776,11 +2760,11 @@ packages: glob@5.0.15: resolution: {integrity: sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==} - deprecated: Glob versions prior to v9 are no longer supported + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} - deprecated: Glob versions prior to v9 are no longer supported + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me global-modules@1.0.0: resolution: {integrity: sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==} @@ -3316,8 +3300,8 @@ packages: isarray@2.0.5: resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==} - isbinaryfile@5.0.4: - resolution: {integrity: sha512-YKBKVkKhty7s8rxddb40oOkuP0NbaeXrQvLin6QMHL7Ypiy2RW9LwOVrVgZRyOrhQlayMd9t+D8yDy8MKFTSDQ==} + isbinaryfile@5.0.7: + resolution: {integrity: sha512-gnWD14Jh3FzS3CPhF0AxNOJ8CxqeblPTADzI38r0wt8ZyQl5edpy75myt08EG2oKvpyiqSqsx+Wkz9vtkbTqYQ==} engines: {node: '>= 18.0.0'} isexe@2.0.0: @@ -3557,6 +3541,9 @@ packages: lodash@4.17.21: resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==} + lodash@4.17.23: + resolution: {integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==} + log-symbols@2.2.0: resolution: {integrity: sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==} engines: {node: '>=4'} @@ -4469,11 +4456,6 @@ packages: rfdc@1.4.1: resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==} - rimraf@2.6.3: - resolution: {integrity: sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==} - deprecated: Rimraf versions prior to v4 are no longer supported - hasBin: true - rimraf@2.7.1: resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==} deprecated: Rimraf versions prior to v4 are no longer supported @@ -4719,8 +4701,8 @@ packages: sort-object-keys@2.0.1: resolution: {integrity: sha512-R89fO+z3x7hiKPXX5P0qim+ge6Y60AjtlW+QQpRozrrNcR1lw9Pkpm5MLB56HoNvdcLHL4wbpq16OcvGpEDJIg==} - sort-package-json@2.12.0: - resolution: {integrity: sha512-/HrPQAeeLaa+vbAH/znjuhwUluuiM/zL5XX9kop8UpDgjtyWKt43hGDk2vd/TBdDpzIyzIHVUgmYofzYrAQjew==} + sort-package-json@2.15.1: + resolution: {integrity: sha512-9x9+o8krTT2saA9liI4BljNjwAbvUnWf11Wq+i/iZt8nl2UGYnf3TH5uBydE7VALmP7AGwlfszuEeL8BDyb0YA==} hasBin: true sort-package-json@3.6.0: @@ -4949,10 +4931,7 @@ packages: tar@6.2.1: resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==} engines: {node: '>=10'} - - temp@0.9.4: - resolution: {integrity: sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==} - engines: {node: '>=6.0.0'} + deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me test-exclude@6.0.0: resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==} @@ -4993,10 +4972,6 @@ packages: tiny-lr@2.0.0: resolution: {integrity: sha512-f6nh0VMRvhGx4KCeK1lQ/jaL0Zdb5WdR+Jk8q9OSUQnaSDxAEGH1fgqLZ+cMl5EW3F2MGnCsalBO1IsnnogW1Q==} - tinyglobby@0.2.10: - resolution: {integrity: sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==} - engines: {node: '>=12.0.0'} - tinyglobby@0.2.15: resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==} engines: {node: '>=12.0.0'} @@ -5706,20 +5681,20 @@ snapshots: dependencies: chalk: 4.1.2 diff: 7.0.0 - isbinaryfile: 5.0.4 - lodash: 4.17.21 + isbinaryfile: 5.0.7 + lodash: 4.17.23 promise.hash.helper: 1.0.8 quick-temp: 0.1.9 silent-error: 1.1.1 transitivePeerDependencies: - supports-color - '@ember/app-blueprint@6.11.0-beta.2': + '@ember/app-blueprint@6.12.0-beta.1': dependencies: chalk: 4.1.2 ejs: 3.1.10 ember-cli-string-utils: 1.1.0 - lodash: 4.17.21 + lodash: 4.17.23 sort-package-json: 3.6.0 walk-sync: 3.0.0 @@ -6344,7 +6319,7 @@ snapshots: async@2.6.4: dependencies: - lodash: 4.17.21 + lodash: 4.17.23 async@3.2.6: {} @@ -7274,8 +7249,6 @@ snapshots: detect-file@1.0.0: {} - detect-indent@7.0.1: {} - detect-indent@7.0.2: {} detect-newline@4.0.1: {} @@ -7898,10 +7871,6 @@ snapshots: dependencies: bser: 2.1.1 - fdir@6.4.2(picomatch@4.0.2): - optionalDependencies: - picomatch: 4.0.2 - fdir@6.5.0(picomatch@4.0.3): optionalDependencies: picomatch: 4.0.3 @@ -8140,12 +8109,6 @@ snapshots: jsonfile: 6.1.0 universalify: 2.0.1 - fs-extra@11.3.0: - dependencies: - graceful-fs: 4.2.11 - jsonfile: 6.1.0 - universalify: 2.0.1 - fs-extra@11.3.3: dependencies: graceful-fs: 4.2.11 @@ -8194,7 +8157,7 @@ snapshots: dependencies: glob: 7.2.3 iconv-lite: 0.4.24 - lodash: 4.17.21 + lodash: 4.17.23 mkdirp: 0.5.6 rimraf: 2.7.1 @@ -8686,7 +8649,7 @@ snapshots: cli-width: 2.2.1 external-editor: 3.1.0 figures: 2.0.0 - lodash: 4.17.21 + lodash: 4.17.23 mute-stream: 0.0.7 run-async: 2.4.1 rxjs: 6.6.7 @@ -8905,7 +8868,7 @@ snapshots: isarray@2.0.5: {} - isbinaryfile@5.0.4: {} + isbinaryfile@5.0.7: {} isexe@2.0.0: {} @@ -9186,6 +9149,8 @@ snapshots: lodash@4.17.21: {} + lodash@4.17.23: {} + log-symbols@2.2.0: dependencies: chalk: 2.4.2 @@ -9968,7 +9933,7 @@ snapshots: quibble@0.9.2: dependencies: - lodash: 4.17.21 + lodash: 4.17.23 resolve: 1.22.11 quick-temp@0.1.9: @@ -10160,10 +10125,6 @@ snapshots: rfdc@1.4.1: {} - rimraf@2.6.3: - dependencies: - glob: 7.2.3 - rimraf@2.7.1: dependencies: glob: 7.2.3 @@ -10495,16 +10456,16 @@ snapshots: sort-object-keys@2.0.1: {} - sort-package-json@2.12.0: + sort-package-json@2.15.1: dependencies: - detect-indent: 7.0.1 + detect-indent: 7.0.2 detect-newline: 4.0.1 get-stdin: 9.0.0 git-hooks-list: 3.1.0 is-plain-obj: 4.1.0 semver: 7.7.3 sort-object-keys: 1.1.3 - tinyglobby: 0.2.10 + tinyglobby: 0.2.15 sort-package-json@3.6.0: dependencies: @@ -10756,11 +10717,6 @@ snapshots: mkdirp: 1.0.4 yallist: 4.0.0 - temp@0.9.4: - dependencies: - mkdirp: 0.5.6 - rimraf: 2.6.3 - test-exclude@6.0.0: dependencies: '@istanbuljs/schema': 0.1.3 @@ -10890,11 +10846,6 @@ snapshots: transitivePeerDependencies: - supports-color - tinyglobby@0.2.10: - dependencies: - fdir: 6.4.2(picomatch@4.0.2) - picomatch: 4.0.2 - tinyglobby@0.2.15: dependencies: fdir: 6.5.0(picomatch@4.0.3) diff --git a/tests/fixtures/addon/defaults/package.json b/tests/fixtures/addon/defaults/package.json index d690a13292..18367c97c0 100644 --- a/tests/fixtures/addon/defaults/package.json +++ b/tests/fixtures/addon/defaults/package.json @@ -30,27 +30,27 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "@babel/core": "^7.28.6", - "ember-cli-babel": "^8.2.0", - "ember-cli-htmlbars": "^6.3.0", + "@babel/core": "^7.29.0", + "ember-cli-babel": "^8.3.1", + "ember-cli-htmlbars": "^7.0.1", "ember-template-imports": "^4.4.0" }, "devDependencies": { "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.20.2", "@embroider/test-setup": "^4.0.0", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "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-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", @@ -58,25 +58,25 @@ "ember-load-initializers": "^3.0.1", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.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.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.104.1" + "webpack": "^5.105.4" }, "peerDependencies": { "ember-source": ">= 4.0.0" diff --git a/tests/fixtures/addon/pnpm/package.json b/tests/fixtures/addon/pnpm/package.json index 55e8e9a6c2..e42ae2d771 100644 --- a/tests/fixtures/addon/pnpm/package.json +++ b/tests/fixtures/addon/pnpm/package.json @@ -30,27 +30,27 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "@babel/core": "^7.28.6", - "ember-cli-babel": "^8.2.0", - "ember-cli-htmlbars": "^6.3.0", + "@babel/core": "^7.29.0", + "ember-cli-babel": "^8.3.1", + "ember-cli-htmlbars": "^7.0.1", "ember-template-imports": "^4.4.0" }, "devDependencies": { "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.20.2", "@embroider/test-setup": "^4.0.0", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "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-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", @@ -58,26 +58,26 @@ "ember-load-initializers": "^3.0.1", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.104.1" + "webpack": "^5.105.4" }, "peerDependencies": { "ember-source": ">= 4.0.0" diff --git a/tests/fixtures/addon/typescript/package.json b/tests/fixtures/addon/typescript/package.json index 9de8889ccb..64e7885d2a 100644 --- a/tests/fixtures/addon/typescript/package.json +++ b/tests/fixtures/addon/typescript/package.json @@ -48,33 +48,33 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "@babel/core": "^7.28.6", - "ember-cli-babel": "^8.2.0", - "ember-cli-htmlbars": "^6.3.0", + "@babel/core": "^7.29.0", + "ember-cli-babel": "^8.3.1", + "ember-cli-htmlbars": "^7.0.1", "ember-template-imports": "^4.4.0" }, "devDependencies": { "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.20.2", "@embroider/test-setup": "^4.0.0", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.3", + "@glint/template": "^1.7.7", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "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-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", @@ -82,28 +82,28 @@ "ember-load-initializers": "^3.0.1", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.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.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "rimraf": "^5.0.10", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", "typescript": "^5.9.3", - "typescript-eslint": "^8.53.1", - "webpack": "^5.104.1" + "typescript-eslint": "^8.58.0", + "webpack": "^5.105.4" }, "peerDependencies": { "ember-source": ">= 4.0.0" diff --git a/tests/fixtures/addon/yarn/package.json b/tests/fixtures/addon/yarn/package.json index 8e2aa91f0d..f674bdea9c 100644 --- a/tests/fixtures/addon/yarn/package.json +++ b/tests/fixtures/addon/yarn/package.json @@ -30,27 +30,27 @@ "test:ember-compatibility": "ember try:each" }, "dependencies": { - "@babel/core": "^7.28.6", - "ember-cli-babel": "^8.2.0", - "ember-cli-htmlbars": "^6.3.0", + "@babel/core": "^7.29.0", + "ember-cli-babel": "^8.3.1", + "ember-cli-htmlbars": "^7.0.1", "ember-template-imports": "^4.4.0" }, "devDependencies": { "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.20.2", "@embroider/test-setup": "^4.0.0", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "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-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", @@ -58,26 +58,26 @@ "ember-load-initializers": "^3.0.1", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-source-channel-url": "^3.0.0", "ember-template-lint": "^6.1.0", "ember-try": "^4.0.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "webpack": "^5.104.1" + "webpack": "^5.105.4" }, "peerDependencies": { "ember-source": ">= 4.0.0" diff --git a/tests/fixtures/app/defaults/package.json b/tests/fixtures/app/defaults/package.json index 20766c2a6b..5f4f607558 100644 --- a/tests/fixtures/app/defaults/package.json +++ b/tests/fixtures/app/defaults/package.json @@ -27,53 +27,52 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", - "@eslint/js": "^9.39.2", + "@embroider/macros": "^1.20.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.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": "^6.3.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", - "ember-modifier": "^4.2.2", + "ember-modifier": "^4.3.0", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider-no-ember-data/package.json b/tests/fixtures/app/embroider-no-ember-data/package.json index f128a2e560..51636a2f0a 100644 --- a/tests/fixtures/app/embroider-no-ember-data/package.json +++ b/tests/fixtures/app/embroider-no-ember-data/package.json @@ -27,53 +27,52 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.20.2", "@embroider/webpack": "^4.1.2", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.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": "^6.3.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-load-initializers": "^3.0.1", - "ember-modifier": "^4.2.2", + "ember-modifier": "^4.3.0", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider-no-welcome/package.json b/tests/fixtures/app/embroider-no-welcome/package.json index b5e388971a..ff67a39f23 100644 --- a/tests/fixtures/app/embroider-no-welcome/package.json +++ b/tests/fixtures/app/embroider-no-welcome/package.json @@ -27,53 +27,52 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.20.2", "@embroider/webpack": "^4.1.2", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.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": "^6.3.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", - "ember-modifier": "^4.2.2", + "ember-modifier": "^4.3.0", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "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.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider-pnpm/package.json b/tests/fixtures/app/embroider-pnpm/package.json index f07497b5fd..fe9eca5129 100644 --- a/tests/fixtures/app/embroider-pnpm/package.json +++ b/tests/fixtures/app/embroider-pnpm/package.json @@ -27,54 +27,53 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.20.2", "@embroider/webpack": "^4.1.2", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.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": "^6.3.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", - "ember-modifier": "^4.2.2", + "ember-modifier": "^4.3.0", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider-yarn/package.json b/tests/fixtures/app/embroider-yarn/package.json index e7e6362990..5b70f14dbe 100644 --- a/tests/fixtures/app/embroider-yarn/package.json +++ b/tests/fixtures/app/embroider-yarn/package.json @@ -27,54 +27,53 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.20.2", "@embroider/webpack": "^4.1.2", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.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": "^6.3.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", - "ember-modifier": "^4.2.2", + "ember-modifier": "^4.3.0", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/embroider/package.json b/tests/fixtures/app/embroider/package.json index b4a76d020f..63ea5b1bcc 100644 --- a/tests/fixtures/app/embroider/package.json +++ b/tests/fixtures/app/embroider/package.json @@ -27,54 +27,53 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.20.2", "@embroider/webpack": "^4.1.2", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.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": "^6.3.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", - "ember-modifier": "^4.2.2", + "ember-modifier": "^4.3.0", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/no-ember-data/package.json b/tests/fixtures/app/no-ember-data/package.json index 8702893bec..651d5ec16d 100644 --- a/tests/fixtures/app/no-ember-data/package.json +++ b/tests/fixtures/app/no-ember-data/package.json @@ -27,52 +27,51 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", - "@eslint/js": "^9.39.2", + "@embroider/macros": "^1.20.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.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": "^6.3.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", "ember-load-initializers": "^3.0.1", - "ember-modifier": "^4.2.2", + "ember-modifier": "^4.3.0", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/npm/package.json b/tests/fixtures/app/npm/package.json index 9248e02d15..480869c122 100644 --- a/tests/fixtures/app/npm/package.json +++ b/tests/fixtures/app/npm/package.json @@ -27,52 +27,51 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", - "@eslint/js": "^9.39.2", + "@embroider/macros": "^1.20.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.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": "^6.3.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", - "ember-modifier": "^4.2.2", + "ember-modifier": "^4.3.0", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "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.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/pnpm/package.json b/tests/fixtures/app/pnpm/package.json index 64689de45e..45754159f9 100644 --- a/tests/fixtures/app/pnpm/package.json +++ b/tests/fixtures/app/pnpm/package.json @@ -27,53 +27,52 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", - "@eslint/js": "^9.39.2", + "@embroider/macros": "^1.20.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.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": "^6.3.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", - "ember-modifier": "^4.2.2", + "ember-modifier": "^4.3.0", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/typescript-embroider-no-ember-data/package.json b/tests/fixtures/app/typescript-embroider-no-ember-data/package.json index e41e65a029..241cbcc570 100644 --- a/tests/fixtures/app/typescript-embroider-no-ember-data/package.json +++ b/tests/fixtures/app/typescript-embroider-no-ember-data/package.json @@ -28,61 +28,60 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.20.2", "@embroider/webpack": "^4.1.2", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.3", + "@glint/template": "^1.7.7", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.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": "^6.3.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-load-initializers": "^3.0.1", - "ember-modifier": "^4.2.2", + "ember-modifier": "^4.3.0", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "typescript": "^5.9.3", - "typescript-eslint": "^8.53.1", - "webpack": "^5.104.1" + "typescript-eslint": "^8.58.0", + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/typescript-embroider/package.json b/tests/fixtures/app/typescript-embroider/package.json index 9e51445964..0716910baa 100644 --- a/tests/fixtures/app/typescript-embroider/package.json +++ b/tests/fixtures/app/typescript-embroider/package.json @@ -28,73 +28,72 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", - "@ember-data/adapter": "~5.7.0", - "@ember-data/graph": "~5.7.0", - "@ember-data/json-api": "~5.7.0", - "@ember-data/legacy-compat": "~5.7.0", - "@ember-data/model": "~5.7.0", - "@ember-data/request": "~5.7.0", - "@ember-data/request-utils": "~5.7.0", - "@ember-data/serializer": "~5.7.0", - "@ember-data/store": "~5.7.0", - "@warp-drive/ember": "~5.7.0", + "@babel/plugin-proposal-decorators": "^7.29.0", + "@ember-data/adapter": "~5.8.1", + "@ember-data/graph": "~5.8.1", + "@ember-data/json-api": "~5.8.1", + "@ember-data/legacy-compat": "~5.8.1", + "@ember-data/model": "~5.8.1", + "@ember-data/request": "~5.8.1", + "@ember-data/request-utils": "~5.8.1", + "@ember-data/serializer": "~5.8.1", + "@ember-data/store": "~5.8.1", + "@warp-drive/ember": "~5.8.1", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", "@embroider/compat": "^3.9.3", "@embroider/core": "^3.5.9", - "@embroider/macros": "^1.19.6", + "@embroider/macros": "^1.20.2", "@embroider/webpack": "^4.1.2", - "@eslint/js": "^9.39.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.3", + "@glint/template": "^1.7.7", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", - "@warp-drive/core-types": "~5.7.0", + "@warp-drive/core-types": "~5.8.1", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.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": "^6.3.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", - "ember-modifier": "^4.2.2", + "ember-modifier": "^4.3.0", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "typescript": "^5.9.3", - "typescript-eslint": "^8.53.1", - "webpack": "^5.104.1" + "typescript-eslint": "^8.58.0", + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/typescript-no-ember-data/package.json b/tests/fixtures/app/typescript-no-ember-data/package.json index 8ec8509969..61a872f686 100644 --- a/tests/fixtures/app/typescript-no-ember-data/package.json +++ b/tests/fixtures/app/typescript-no-ember-data/package.json @@ -28,60 +28,59 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", - "@eslint/js": "^9.39.2", + "@embroider/macros": "^1.20.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.3", + "@glint/template": "^1.7.7", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.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": "^6.3.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", "ember-load-initializers": "^3.0.1", - "ember-modifier": "^4.2.2", + "ember-modifier": "^4.3.0", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "typescript": "^5.9.3", - "typescript-eslint": "^8.53.1", - "webpack": "^5.104.1" + "typescript-eslint": "^8.58.0", + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/typescript/package.json b/tests/fixtures/app/typescript/package.json index 8de430d7bd..594e00dbb8 100644 --- a/tests/fixtures/app/typescript/package.json +++ b/tests/fixtures/app/typescript/package.json @@ -28,72 +28,71 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", - "@ember-data/adapter": "~5.7.0", - "@ember-data/graph": "~5.7.0", - "@ember-data/json-api": "~5.7.0", - "@ember-data/legacy-compat": "~5.7.0", - "@ember-data/model": "~5.7.0", - "@ember-data/request": "~5.7.0", - "@ember-data/request-utils": "~5.7.0", - "@ember-data/serializer": "~5.7.0", - "@ember-data/store": "~5.7.0", - "@warp-drive/ember": "~5.7.0", + "@babel/plugin-proposal-decorators": "^7.29.0", + "@ember-data/adapter": "~5.8.1", + "@ember-data/graph": "~5.8.1", + "@ember-data/json-api": "~5.8.1", + "@ember-data/legacy-compat": "~5.8.1", + "@ember-data/model": "~5.8.1", + "@ember-data/request": "~5.8.1", + "@ember-data/request-utils": "~5.8.1", + "@ember-data/serializer": "~5.8.1", + "@ember-data/store": "~5.8.1", + "@warp-drive/ember": "~5.8.1", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", - "@eslint/js": "^9.39.2", + "@embroider/macros": "^1.20.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "@glint/environment-ember-loose": "^1.5.2", "@glint/environment-ember-template-imports": "^1.5.2", - "@glint/template": "^1.7.3", + "@glint/template": "^1.7.7", "@tsconfig/ember": "^3.0.12", "@types/qunit": "^2.19.13", "@types/rsvp": "^4.0.9", - "@warp-drive/core-types": "~5.7.0", + "@warp-drive/core-types": "~5.8.1", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.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": "^6.3.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", - "ember-modifier": "^4.2.2", + "ember-modifier": "^4.3.0", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", "typescript": "^5.9.3", - "typescript-eslint": "^8.53.1", - "webpack": "^5.104.1" + "typescript-eslint": "^8.58.0", + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/with-blueprint-override-lint-fail/package.json b/tests/fixtures/app/with-blueprint-override-lint-fail/package.json index ed74176c60..593d8a188c 100644 --- a/tests/fixtures/app/with-blueprint-override-lint-fail/package.json +++ b/tests/fixtures/app/with-blueprint-override-lint-fail/package.json @@ -66,8 +66,7 @@ "qunit-dom": "^1.6.0", "stylelint": "^16.10.0", "stylelint-config-standard": "^36.0.1", - "stylelint-prettier": "^5.0.2", - "tracked-built-ins": "^3.1.0" + "stylelint-prettier": "^5.0.2" }, "engines": { "node": ">= 20.19" diff --git a/tests/fixtures/app/yarn/package.json b/tests/fixtures/app/yarn/package.json index f74a4215a0..2813b67e64 100644 --- a/tests/fixtures/app/yarn/package.json +++ b/tests/fixtures/app/yarn/package.json @@ -27,53 +27,52 @@ "test:ember": "ember test" }, "devDependencies": { - "@babel/core": "^7.28.6", + "@babel/core": "^7.29.0", "@babel/eslint-parser": "^7.28.6", - "@babel/plugin-proposal-decorators": "^7.28.6", + "@babel/plugin-proposal-decorators": "^7.29.0", "@ember/optional-features": "^2.3.0", "@ember/test-helpers": "^5.4.1", - "@embroider/macros": "^1.19.6", - "@eslint/js": "^9.39.2", + "@embroider/macros": "^1.20.2", + "@eslint/js": "^9.39.4", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", "concurrently": "^9.2.1", - "ember-auto-import": "^2.12.0", + "ember-auto-import": "^2.13.1", "ember-cli": "~<%= emberCLIVersion %>", "ember-cli-app-version": "^7.0.0", - "ember-cli-babel": "^8.2.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": "^6.3.0", + "ember-cli-htmlbars": "^7.0.1", "ember-cli-inject-live-reload": "^2.1.0", "ember-cli-sri": "^2.1.1", "ember-cli-terser": "^4.0.2", - "ember-data": "~5.7.0", + "ember-data": "~5.8.1", "ember-load-initializers": "^3.0.1", - "ember-modifier": "^4.2.2", + "ember-modifier": "^4.3.0", "ember-page-title": "^9.0.3", "ember-qunit": "^9.0.4", - "ember-resolver": "^13.1.1", - "ember-source": "~6.11.0-beta.1", + "ember-resolver": "^13.2.0", + "ember-source": "~6.12.0", "ember-template-imports": "^4.4.0", "ember-template-lint": "^6.1.0", "ember-welcome-page": "^7.0.2", - "eslint": "^9.39.2", + "eslint": "^9.39.4", "eslint-config-prettier": "^9.1.2", "eslint-plugin-ember": "^12.7.5", - "eslint-plugin-n": "^17.23.2", - "eslint-plugin-qunit": "^8.2.5", + "eslint-plugin-n": "^17.24.0", + "eslint-plugin-qunit": "^8.2.6", "globals": "^15.15.0", "loader.js": "^4.7.0", "prettier": "^3.8.1", - "prettier-plugin-ember-template-tag": "^2.1.2", + "prettier-plugin-ember-template-tag": "^2.1.3", "qunit": "^2.25.0", "qunit-dom": "^3.5.0", "stylelint": "^16.26.1", "stylelint-config-standard": "^36.0.1", - "tracked-built-ins": "^3.4.0", - "webpack": "^5.104.1" + "webpack": "^5.105.4" }, "engines": { "node": ">= 20.19" diff --git a/tests/integration/utilities/clean-remove-test.js b/tests/integration/utilities/clean-remove-test.js index 319abef0f9..3a239830ef 100644 --- a/tests/integration/utilities/clean-remove-test.js +++ b/tests/integration/utilities/clean-remove-test.js @@ -2,7 +2,7 @@ const { expect } = require('chai'); const cleanRemove = require('../../../lib/utilities/clean-remove'); -const temp = require('temp'); +const os = require('os'); const path = require('path'); const fs = require('fs-extra'); @@ -13,7 +13,7 @@ describe('clean-remove', function () { let nestedPath = 'nested1/nested2'; beforeEach(function () { - tempDir = temp.mkdirSync('clean-remove'); + tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'clean-remove-')); process.chdir(tempDir); fileInfo = { diff --git a/tests/unit/utilities/insert-into-file-test.js b/tests/unit/utilities/insert-into-file-test.js index a6507cf69c..98d6c3f1a4 100644 --- a/tests/unit/utilities/insert-into-file-test.js +++ b/tests/unit/utilities/insert-into-file-test.js @@ -1,9 +1,9 @@ 'use strict'; const fs = require('fs-extra'); +const os = require('os'); const path = require('path'); -const temp = require('temp'); -const EOL = require('os').EOL; +const EOL = os.EOL; const insertIntoFile = require('../../../lib/utilities/insert-into-file'); const { expect } = require('chai'); @@ -12,7 +12,7 @@ describe('insertIntoFile()', function () { let tempDir, filePath; beforeEach(function () { - tempDir = temp.mkdirSync('insert-into-file-test'); + tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'insert-into-file-test-')); filePath = path.join(tempDir, 'foo-bar-baz.txt'); });