From 7f43e9f501b03838a1dbc5585f862e6bae822979 Mon Sep 17 00:00:00 2001 From: Isaac Lee <16869656+ijlee2@users.noreply.github.com> Date: Wed, 1 Apr 2026 13:07:31 +0200 Subject: [PATCH 1/4] chore: Updated dependencies (CI) --- .github/workflows/ci.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d74a36bc..a7038323 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: uses: actions/checkout@v6 - name: Set up pnpm - uses: pnpm/action-setup@v4 + uses: pnpm/action-setup@v5 - name: Use Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v6 @@ -52,7 +52,7 @@ jobs: uses: actions/checkout@v6 - name: Set up pnpm - uses: pnpm/action-setup@v4 + uses: pnpm/action-setup@v5 - name: Use Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v6 @@ -68,7 +68,7 @@ jobs: working-directory: 'docs-app' - name: Upload docs-app - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: dist path: docs-app/dist @@ -115,7 +115,7 @@ jobs: uses: actions/checkout@v6 - name: Set up pnpm - uses: pnpm/action-setup@v4 + uses: pnpm/action-setup@v5 - name: Use Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v6 @@ -127,7 +127,7 @@ jobs: run: pnpm install --frozen-lockfile - name: Download docs-app - uses: actions/download-artifact@v7 + uses: actions/download-artifact@v8 with: name: dist path: docs-app/dist @@ -156,7 +156,7 @@ jobs: uses: actions/checkout@v6 - name: Set up pnpm - uses: pnpm/action-setup@v4 + uses: pnpm/action-setup@v5 - name: Use Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v6 @@ -183,7 +183,7 @@ jobs: uses: actions/checkout@v6 - name: Set up pnpm - uses: pnpm/action-setup@v4 + uses: pnpm/action-setup@v5 - name: Use Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v6 @@ -193,7 +193,7 @@ jobs: - id: set-test-matrix name: Set test matrix - run: echo "matrix=$(pnpx -s @embroider/try list)" >> $GITHUB_OUTPUT + run: echo "matrix=$(pnpx @embroider/try list)" >> $GITHUB_OUTPUT working-directory: 'test-app' @@ -210,7 +210,7 @@ jobs: uses: actions/checkout@v6 - name: Set up pnpm - uses: pnpm/action-setup@v4 + uses: pnpm/action-setup@v5 - name: Use Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v6 @@ -219,7 +219,7 @@ jobs: node-version: ${{ env.NODE_VERSION }} - name: Make file changes - run: pnpm dlx @embroider/try apply ${{ matrix.name }} + run: pnpx @embroider/try apply ${{ matrix.name }} working-directory: 'test-app' - name: Install dependencies From 689ea6bd4352acd802a31c2f466e15cdb31f7e42 Mon Sep 17 00:00:00 2001 From: Isaac Lee <16869656+ijlee2@users.noreply.github.com> Date: Wed, 1 Apr 2026 13:07:51 +0200 Subject: [PATCH 2/4] refactor: Removed unused code --- test-app/.try.mjs | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/test-app/.try.mjs b/test-app/.try.mjs index cf92d419..e2e7bf03 100644 --- a/test-app/.try.mjs +++ b/test-app/.try.mjs @@ -1,63 +1,18 @@ -const dependenciesForCompatibility = { - // '@ember/optional-features': '^2.3.0', - // '@embroider/compat': '^4.1.13', - // 'ember-cli': '~6.10.0', - // 'ember-auto-import': '^2.12.0', -}; - -const filesForCompatibility = { - // 'config/optional-features.json': [ - // `{`, - // ` "application-template-wrapper": false,`, - // ` "default-async-observers": true,`, - // ` "jquery-integration": false,`, - // ` "no-implicit-route-model": true,`, - // ` "template-only-glimmer-components": true`, - // `}`, - // ].join('\n'), - // 'ember-cli-build.js': [ - // `const { compatBuild } = require('@embroider/compat');`, - // `const EmberApp = require('ember-cli/lib/broccoli/ember-app');`, - // ``, - // `module.exports = async function (defaults) {`, - // ` const { buildOnce } = await import('@embroider/vite');`, - // ``, - // ` const app = new EmberApp(defaults, {`, - // ` 'ember-cli-babel': {`, - // ` enableTypeScriptTransform: true,`, - // ` },`, - // ` });`, - // ``, - // ` return compatBuild(app, buildOnce);`, - // `};`, - // ].join('\n'), -}; - export default { packageManager: 'pnpm', scenarios: [ { - env: { - ENABLE_COMPAT_BUILD: true, - }, - files: filesForCompatibility, name: 'ember-lts-4.12', npm: { devDependencies: { - ...dependenciesForCompatibility, 'ember-source': '~4.12.0', }, }, }, { - env: { - ENABLE_COMPAT_BUILD: true, - }, - files: filesForCompatibility, name: 'ember-lts-5.12', npm: { devDependencies: { - ...dependenciesForCompatibility, 'ember-source': '~5.12.0', }, }, From bf87793334b2fb892f60366b15ef69c7bb6b1328 Mon Sep 17 00:00:00 2001 From: Isaac Lee <16869656+ijlee2@users.noreply.github.com> Date: Wed, 1 Apr 2026 13:08:44 +0200 Subject: [PATCH 3/4] chore: Skipped ember-beta and ember-canary to avoid issues with 7.0 pre-release --- test-app/.try.mjs | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/test-app/.try.mjs b/test-app/.try.mjs index e2e7bf03..6b7b9f25 100644 --- a/test-app/.try.mjs +++ b/test-app/.try.mjs @@ -33,21 +33,21 @@ export default { }, }, }, - { - name: 'ember-beta', - npm: { - devDependencies: { - 'ember-source': 'npm:ember-source@beta', - }, - }, - }, - { - name: 'ember-canary', - npm: { - devDependencies: { - 'ember-source': 'npm:ember-source@alpha', - }, - }, - }, + // { + // name: 'ember-beta', + // npm: { + // devDependencies: { + // 'ember-source': 'npm:ember-source@beta', + // }, + // }, + // }, + // { + // name: 'ember-canary', + // npm: { + // devDependencies: { + // 'ember-source': 'npm:ember-source@alpha', + // }, + // }, + // }, ], }; From cd85c7ec78bf9f12a30b7f8f8d2243a7c7bf559c Mon Sep 17 00:00:00 2001 From: Isaac Lee <16869656+ijlee2@users.noreply.github.com> Date: Wed, 1 Apr 2026 13:09:02 +0200 Subject: [PATCH 4/4] chore: Added changeset --- .changeset/fifty-parks-hope.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/fifty-parks-hope.md diff --git a/.changeset/fifty-parks-hope.md b/.changeset/fifty-parks-hope.md new file mode 100644 index 00000000..5765499a --- /dev/null +++ b/.changeset/fifty-parks-hope.md @@ -0,0 +1,6 @@ +--- +"ember-container-query": patch +"test-app": patch +--- + +Skipped ember-beta and ember-canary to avoid issues with 7.0 pre-release