From 8e69b317f82798affaf0e49c8fa61b89d3c74eb0 Mon Sep 17 00:00:00 2001 From: Isaac Lee <16869656+ijlee2@users.noreply.github.com> Date: Thu, 5 Mar 2026 16:25:10 +0100 Subject: [PATCH 1/3] chore: Installed @embroider/try --- .github/workflows/ci.yml | 4 ++-- pnpm-lock.yaml | 9 +++++++++ test-app/package.json | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d74a36bc..ac5410db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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=$(pnpm try list)" >> $GITHUB_OUTPUT working-directory: 'test-app' @@ -219,7 +219,7 @@ jobs: node-version: ${{ env.NODE_VERSION }} - name: Make file changes - run: pnpm dlx @embroider/try apply ${{ matrix.name }} + run: pnpm try apply ${{ matrix.name }} working-directory: 'test-app' - name: Install dependencies diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index db317353..3be384ac 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -351,6 +351,9 @@ importers: '@embroider/router': specifier: ^3.0.6 version: 3.0.6(@babel/core@7.29.0)(@embroider/core@4.4.3(@glint/template@1.7.4))(@glint/template@1.7.4) + '@embroider/try': + specifier: ^1.0.1 + version: 1.0.1 '@embroider/vite': specifier: ^1.5.1 version: 1.5.2(@embroider/core@4.4.3(@glint/template@1.7.4))(@glint/template@1.7.4)(rollup@4.59.0)(vite@7.3.1(@types/node@25.3.0)(jiti@2.6.1)(terser@5.46.0)(yaml@2.8.2)) @@ -1313,6 +1316,10 @@ packages: resolution: {integrity: sha512-/SusdG+zgosc3t+9sPFVKSFOYyiSgLfXOT6lYNWoG1YtnhWDxlK4S8leZ0jhcVjemdaHln5rTyxCnq8oFLxqpQ==} engines: {node: 12.* || 14.* || >= 16} + '@embroider/try@1.0.1': + resolution: {integrity: sha512-nGocbIshzndQEHuEAYFXMB3KIrfpPNg5TUBrZ20zJXRcNpoi1NRFMyjyMPAsGZ1/D7MsDu5i99qidUzuU0u1sg==} + hasBin: true + '@embroider/vite@1.5.2': resolution: {integrity: sha512-vaD2rSugRGAsBgoF6a098JqyL8grPAoPTx627wvxfUhE5uW19hGi7ybpTD3Zlkn4pKNKR9k9tPW3sP1Cnvbm4A==} peerDependencies: @@ -9403,6 +9410,8 @@ snapshots: transitivePeerDependencies: - supports-color + '@embroider/try@1.0.1': {} + '@embroider/vite@1.5.2(@embroider/core@4.4.3(@glint/template@1.7.4))(@glint/template@1.7.4)(rollup@4.59.0)(vite@7.3.1(@types/node@25.3.0)(jiti@2.6.1)(terser@5.46.0)(yaml@2.8.2))': dependencies: '@babel/core': 7.29.0(supports-color@8.1.1) diff --git a/test-app/package.json b/test-app/package.json index 55086e35..cdad25d9 100644 --- a/test-app/package.json +++ b/test-app/package.json @@ -49,6 +49,7 @@ "@embroider/config-meta-loader": "^1.0.0", "@embroider/core": "^4.4.3", "@embroider/router": "^3.0.6", + "@embroider/try": "^1.0.1", "@embroider/vite": "^1.5.1", "@glimmer/component": "^2.0.0", "@glimmer/tracking": "^1.1.2", From da5f65637f2e4f7d78a9f48fc8ce0dbd8f9bd8fe Mon Sep 17 00:00:00 2001 From: Isaac Lee <16869656+ijlee2@users.noreply.github.com> Date: Thu, 5 Mar 2026 16:26:04 +0100 Subject: [PATCH 2/3] chore: Added changeset --- .changeset/dark-nights-argue.md | 5 +++++ pnpm-lock.yaml | 1 + 2 files changed, 6 insertions(+) create mode 100644 .changeset/dark-nights-argue.md diff --git a/.changeset/dark-nights-argue.md b/.changeset/dark-nights-argue.md new file mode 100644 index 00000000..6fdef06e --- /dev/null +++ b/.changeset/dark-nights-argue.md @@ -0,0 +1,5 @@ +--- +"test-app": patch +--- + +Installed @embroider/try diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3be384ac..e9066ae7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2946,6 +2946,7 @@ packages: basic-ftp@5.1.0: resolution: {integrity: sha512-RkaJzeJKDbaDWTIPiJwubyljaEPwpVWkm9Rt5h9Nd6h7tEXTJ3VB4qxdZBioV7JO5yLUaOKwz7vDOzlncUsegw==} engines: {node: '>=10.0.0'} + deprecated: Security vulnerability fixed in 5.2.0, please upgrade better-path-resolve@1.0.0: resolution: {integrity: sha512-pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g==} From 2163b144acdad2f3fde437d7ce7a99f7aa384c1c Mon Sep 17 00:00:00 2001 From: Isaac Lee <16869656+ijlee2@users.noreply.github.com> Date: Thu, 5 Mar 2026 16:30:06 +0100 Subject: [PATCH 3/3] chore: Tested changing bin instead --- .github/workflows/ci.yml | 4 ++-- patches/@embroider__try.patch | 15 +++++++++++++++ pnpm-lock.yaml | 9 +++++++-- pnpm-workspace.yaml | 3 +++ 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 patches/@embroider__try.patch diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac5410db..ad2267e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -193,7 +193,7 @@ jobs: - id: set-test-matrix name: Set test matrix - run: echo "matrix=$(pnpm try list)" >> $GITHUB_OUTPUT + run: echo "matrix=$(pnpm embroider-try list)" >> $GITHUB_OUTPUT working-directory: 'test-app' @@ -219,7 +219,7 @@ jobs: node-version: ${{ env.NODE_VERSION }} - name: Make file changes - run: pnpm try apply ${{ matrix.name }} + run: pnpm embroider-try apply ${{ matrix.name }} working-directory: 'test-app' - name: Install dependencies diff --git a/patches/@embroider__try.patch b/patches/@embroider__try.patch new file mode 100644 index 00000000..00f8ef21 --- /dev/null +++ b/patches/@embroider__try.patch @@ -0,0 +1,15 @@ +diff --git a/package.json b/package.json +index a8b93ee7b54ea8712b517539ca0eb2b2a1eb8c54..38933c3a8f5603d864e63640506246b226dad682 100644 +--- a/package.json ++++ b/package.json +@@ -7,7 +7,9 @@ + "license": "MIT", + "author": "Edward Faulkner ", + "type": "module", +- "bin": "cli.js", ++ "bin": { ++ "embroider-try": "cli.js" ++ }, + "devDependencies": { + "release-plan": "^0.17.4" + }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e9066ae7..d55d449b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,11 @@ settings: autoInstallPeers: false excludeLinksFromLockfile: false +patchedDependencies: + '@embroider/try': + hash: 73561463b704021dfaa8d66132c59e610a6b06ce5ff0c4e52a1c2296381d1c4b + path: patches/@embroider__try.patch + importers: .: @@ -353,7 +358,7 @@ importers: version: 3.0.6(@babel/core@7.29.0)(@embroider/core@4.4.3(@glint/template@1.7.4))(@glint/template@1.7.4) '@embroider/try': specifier: ^1.0.1 - version: 1.0.1 + version: 1.0.1(patch_hash=73561463b704021dfaa8d66132c59e610a6b06ce5ff0c4e52a1c2296381d1c4b) '@embroider/vite': specifier: ^1.5.1 version: 1.5.2(@embroider/core@4.4.3(@glint/template@1.7.4))(@glint/template@1.7.4)(rollup@4.59.0)(vite@7.3.1(@types/node@25.3.0)(jiti@2.6.1)(terser@5.46.0)(yaml@2.8.2)) @@ -9411,7 +9416,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@embroider/try@1.0.1': {} + '@embroider/try@1.0.1(patch_hash=73561463b704021dfaa8d66132c59e610a6b06ce5ff0c4e52a1c2296381d1c4b)': {} '@embroider/vite@1.5.2(@embroider/core@4.4.3(@glint/template@1.7.4))(@glint/template@1.7.4)(rollup@4.59.0)(vite@7.3.1(@types/node@25.3.0)(jiti@2.6.1)(terser@5.46.0)(yaml@2.8.2))': dependencies: diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index acfd2914..93841b9a 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -2,3 +2,6 @@ packages: - docs-app - packages/ember-container-query - test-app + +patchedDependencies: + '@embroider/try': patches/@embroider__try.patch