From 94c3ac3201bead9ea412ec34ba92f3942ea070b9 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 22 Oct 2025 18:25:43 -0400
Subject: [PATCH 1/6] Add packageManager field to package.json

Fix condition syntax
---
 files/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/package.json b/files/package.json
index d5e7a23..246b1fc 100644
--- a/files/package.json
+++ b/files/package.json
@@ -76,6 +76,7 @@
     "typescript-eslint": "^8.19.1<% } %>",
     "vite": "^7.1.9"
   },
+  "packageManager": "<%= packageManager %>@<%= pnpm ? '10.19.0' : npm ? '11.6.2' : 'latest' %>",
   "ember": {
     "edition": "octane"
   },

From a607c56c927fc1fb3c18882e15866326169bea61 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 25 Oct 2025 13:21:33 -0400
Subject: [PATCH 2/6] Revert "Add packageManager field to package.json"

This reverts commit 94c3ac3201bead9ea412ec34ba92f3942ea070b9.
---
 files/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/files/package.json b/files/package.json
index 246b1fc..d5e7a23 100644
--- a/files/package.json
+++ b/files/package.json
@@ -76,7 +76,6 @@
     "typescript-eslint": "^8.19.1<% } %>",
     "vite": "^7.1.9"
   },
-  "packageManager": "<%= packageManager %>@<%= pnpm ? '10.19.0' : npm ? '11.6.2' : 'latest' %>",
   "ember": {
     "edition": "octane"
   },

From 477c225d360df546f3954c7aa036f64c5896f89c Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 25 Oct 2025 13:46:15 -0400
Subject: [PATCH 3/6] add pnpm version to CI

---
 files/.github/workflows/ci.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/files/.github/workflows/ci.yml b/files/.github/workflows/ci.yml
index a728a7c..e1b4b48 100644
--- a/files/.github/workflows/ci.yml
+++ b/files/.github/workflows/ci.yml
@@ -19,7 +19,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4<% if (pnpm) { %>
-      - uses: pnpm/action-setup@v4<% } %>
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 10<% } %>
       - uses: actions/setup-node@v4
         with:
           node-version: 22
@@ -38,7 +40,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4<% if (pnpm) { %>
-      - uses: pnpm/action-setup@v4<% } %>
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 10<% } %>
       - uses: actions/setup-node@v4
         with:
           node-version: 22
@@ -60,7 +64,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4<% if (pnpm) { %>
-      - uses: pnpm/action-setup@v4<% } %>
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 10<% } %>
       - uses: actions/setup-node@v4
         with:
           node-version: 22
@@ -81,7 +87,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4<% if (pnpm) { %>
-      - uses: pnpm/action-setup@v4<% } %>
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 10<% } %>
       - uses: actions/setup-node@v4
         with:
           node-version: 22

From 54b13e8d2f6fa3feab51b18f48a7d26fcffb148c Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 25 Oct 2025 13:48:34 -0400
Subject: [PATCH 4/6] Update fixture

---
 tests/fixtures/pnpm/.github/workflows/ci.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/tests/fixtures/pnpm/.github/workflows/ci.yml b/tests/fixtures/pnpm/.github/workflows/ci.yml
index 1961de9..da234df 100644
--- a/tests/fixtures/pnpm/.github/workflows/ci.yml
+++ b/tests/fixtures/pnpm/.github/workflows/ci.yml
@@ -20,6 +20,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
+        with:
+          version: 10
       - uses: actions/setup-node@v4
         with:
           node-version: 22
@@ -39,6 +41,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
+        with:
+          version: 10
       - uses: actions/setup-node@v4
         with:
           node-version: 22
@@ -50,8 +54,7 @@ jobs:
       # For the Try Scenarios
       - id: set-matrix
         run: |
-           echo "matrix=$(pnpm -s dlx @embroider/try list)" >> $GITHUB_OUTPUT
-          
+          echo "matrix=$(pnpm -s dlx @embroider/try list)" >> $GITHUB_OUTPUT
 
   floating:
     name: "Floating Dependencies"
@@ -61,6 +64,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
+        with:
+          version: 10
       - uses: actions/setup-node@v4
         with:
           node-version: 22
@@ -82,18 +87,20 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
+        with:
+          version: 10
       - uses: actions/setup-node@v4
         with:
           node-version: 22
           cache: pnpm
       - name: Apply Scenario
         run: |
-           pnpm dlx @embroider/try apply ${{ matrix.name }}
-          
+          pnpm dlx @embroider/try apply ${{ matrix.name }}
+
       - name: Install Dependencies
         run: pnpm install --no-lockfile
       - name: Run Tests
         run: |
           pnpm test
-          
+
         env: ${{ matrix.env }}

From c30309fd2838e75f15e0356c8f8794f7149dac22 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 25 Oct 2025 14:27:12 -0400
Subject: [PATCH 5/6] Reduce diff

---
 files/.github/workflows/ci.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/files/.github/workflows/ci.yml b/files/.github/workflows/ci.yml
index e1b4b48..eb0690c 100644
--- a/files/.github/workflows/ci.yml
+++ b/files/.github/workflows/ci.yml
@@ -54,8 +54,7 @@ jobs:
       # For the Try Scenarios
       - id: set-matrix
         run: |
-          <% if (pnpm) { %> echo "matrix=$(pnpm -s dlx @embroider/try list)" >> $GITHUB_OUTPUT<% } %>
-          <% if (npm) { %> echo "matrix=$(npx @embroider/try list)" >> $GITHUB_OUTPUT<% } %>
+          <% if (pnpm) { %>echo "matrix=$(pnpm -s dlx @embroider/try list)" >> $GITHUB_OUTPUT<% } %><% if (npm) { %>echo "matrix=$(npx @embroider/try list)" >> $GITHUB_OUTPUT<% } %>
 
   floating:
     name: "Floating Dependencies"
@@ -96,12 +95,11 @@ jobs:
           cache: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm' %>
       - name: Apply Scenario
         run: |
-          <% if (pnpm) { %> pnpm dlx @embroider/try apply ${{ matrix.name }}<% } %>
-          <% if (npm) { %> npx @embroider/try apply ${{ matrix.name }}<% } %>
+          <% if (pnpm) { %>pnpm dlx @embroider/try apply ${{ matrix.name }}<% } %>
+          <% if (npm) { %>npx @embroider/try apply ${{ matrix.name }}<% } %>
       - name: Install Dependencies
         run: <%= pnpm ? 'pnpm install --no-lockfile' : yarn ? 'yarn install --no-lockfile' : 'npm install --no-package-lock' %>
       - name: Run Tests
         run: |
-          <% if (pnpm) { %>pnpm test<% } %>
-          <% if (npm) { %>npm test<% } %>
+          <% if (pnpm) { %>pnpm test<% } %><% if (npm) { %>npm test<% } %>
         env: ${{ matrix.env }}

From 6eb19f88c40a933f7317c156a7ec5669e9286f23 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Sat, 25 Oct 2025 14:30:43 -0400
Subject: [PATCH 6/6] This formatting is a mess

---
 files/.github/workflows/ci.yml                  |  6 ++----
 tests/fixtures/default/.github/workflows/ci.yml | 12 +++---------
 tests/fixtures/pnpm/.github/workflows/ci.yml    | 10 +++-------
 tests/fixtures/yarn/.github/workflows/ci.yml    |  2 +-
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/files/.github/workflows/ci.yml b/files/.github/workflows/ci.yml
index eb0690c..fe27edc 100644
--- a/files/.github/workflows/ci.yml
+++ b/files/.github/workflows/ci.yml
@@ -53,8 +53,7 @@ jobs:
         run: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm run' %> test
       # For the Try Scenarios
       - id: set-matrix
-        run: |
-          <% if (pnpm) { %>echo "matrix=$(pnpm -s dlx @embroider/try list)" >> $GITHUB_OUTPUT<% } %><% if (npm) { %>echo "matrix=$(npx @embroider/try list)" >> $GITHUB_OUTPUT<% } %>
+        run: <% if (pnpm) { %>echo "matrix=$(pnpm -s dlx @embroider/try list)" >> $GITHUB_OUTPUT<% } %><% if (npm) { %>echo "matrix=$(npx @embroider/try list)" >> $GITHUB_OUTPUT<% } %>
 
   floating:
     name: "Floating Dependencies"
@@ -100,6 +99,5 @@ jobs:
       - name: Install Dependencies
         run: <%= pnpm ? 'pnpm install --no-lockfile' : yarn ? 'yarn install --no-lockfile' : 'npm install --no-package-lock' %>
       - name: Run Tests
-        run: |
-          <% if (pnpm) { %>pnpm test<% } %><% if (npm) { %>npm test<% } %>
+        run: <% if (pnpm) { %>pnpm test<% } %><% if (npm) { %>npm test<% } %>
         env: ${{ matrix.env }}
diff --git a/tests/fixtures/default/.github/workflows/ci.yml b/tests/fixtures/default/.github/workflows/ci.yml
index 32879a6..0d95bc2 100644
--- a/tests/fixtures/default/.github/workflows/ci.yml
+++ b/tests/fixtures/default/.github/workflows/ci.yml
@@ -47,9 +47,7 @@ jobs:
         run: npm run test
       # For the Try Scenarios
       - id: set-matrix
-        run: |
-          
-           echo "matrix=$(npx @embroider/try list)" >> $GITHUB_OUTPUT
+        run: echo "matrix=$(npx @embroider/try list)" >> $GITHUB_OUTPUT
 
   floating:
     name: "Floating Dependencies"
@@ -83,13 +81,9 @@ jobs:
           node-version: 22
           cache: npm
       - name: Apply Scenario
-        run: |
-          
-           npx @embroider/try apply ${{ matrix.name }}
+        run: npx @embroider/try apply ${{ matrix.name }}
       - name: Install Dependencies
         run: npm install --no-package-lock
       - name: Run Tests
-        run: |
-          
-          npm test
+        run: npm test
         env: ${{ matrix.env }}
diff --git a/tests/fixtures/pnpm/.github/workflows/ci.yml b/tests/fixtures/pnpm/.github/workflows/ci.yml
index da234df..70f6b1f 100644
--- a/tests/fixtures/pnpm/.github/workflows/ci.yml
+++ b/tests/fixtures/pnpm/.github/workflows/ci.yml
@@ -53,8 +53,7 @@ jobs:
         run: pnpm test
       # For the Try Scenarios
       - id: set-matrix
-        run: |
-          echo "matrix=$(pnpm -s dlx @embroider/try list)" >> $GITHUB_OUTPUT
+        run: echo "matrix=$(pnpm -s dlx @embroider/try list)" >> $GITHUB_OUTPUT
 
   floating:
     name: "Floating Dependencies"
@@ -94,13 +93,10 @@ jobs:
           node-version: 22
           cache: pnpm
       - name: Apply Scenario
-        run: |
-          pnpm dlx @embroider/try apply ${{ matrix.name }}
+        run: pnpm dlx @embroider/try apply ${{ matrix.name }}
 
       - name: Install Dependencies
         run: pnpm install --no-lockfile
       - name: Run Tests
-        run: |
-          pnpm test
-
+        run: pnpm test
         env: ${{ matrix.env }}
diff --git a/tests/fixtures/yarn/.github/workflows/ci.yml b/tests/fixtures/yarn/.github/workflows/ci.yml
index 3b1d325..19f98ca 100644
--- a/tests/fixtures/yarn/.github/workflows/ci.yml
+++ b/tests/fixtures/yarn/.github/workflows/ci.yml
@@ -63,7 +63,7 @@ jobs:
   try-scenarios:
     name: ${{ matrix.try-scenario }}
     runs-on: ubuntu-latest
-    needs: 'test'
+    needs: "test"
     timeout-minutes: 10
 
     strategy: