Fix ember-try for <= 4.8

cibernox · Nov 12, 2024 · 966e51c · 966e51c
1 parent 2d99d9a
commit 966e51c
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,8 @@ jobs:
   lint:
     name: Lint
     runs-on: ubuntu-latest
-
+    timeout-minutes: 10
+
     steps:
       - uses: actions/checkout@v4
 
@@ -26,11 +27,14 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 18.x
-          cache: 'pnpm'
+          cache: pnpm
 
       - name: 'Install dependencies'
         run: pnpm install --frozen-lockfile
 
+      - run: pnpm build
+      - run: pnpm i -f # re-sync injected deps
+
       - name: Lint
         run: pnpm --filter ember-power-datepicker lint
 
@@ -41,43 +45,49 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      
+
       - uses: pnpm/action-setup@v3
         with:
           version: 8
-          
+
       - name: Install Node
         uses: actions/setup-node@v4
         with:
           node-version: 18.x
-          cache: 'pnpm'
-          
+          cache: pnpm
+
       - name: Install Dependencies
         run: pnpm install --frozen-lockfile
-
+
+      - run: pnpm build
+      - run: pnpm i -f # re-sync injected deps
+
       - name: Run Tests
         run: pnpm --filter test-app test:ember
-  
+
   floating:
     name: "Floating Dependencies"
     runs-on: ubuntu-latest
     needs: lint
 
     steps:
       - uses: actions/checkout@v4
-      
+
       - uses: pnpm/action-setup@v3
         with:
           version: 8
-          
+
       - uses: actions/setup-node@v4
         with:
           node-version: 18.x
-          cache: 'pnpm'
-          
+          cache: pnpm
+
       - name: Install Dependencies
         run: pnpm install --frozen-lockfile
-
+
+      - run: pnpm build
+      - run: pnpm i -f # re-sync injected deps
+
       - name: Run Tests
         run: pnpm --filter test-app test:ember
 
@@ -97,6 +107,8 @@ jobs:
           - ember-lts-4.12
           - ember-lts-5.4
           - ember-lts-5.8
+          - ember-lts-5.12
+          - glimmer-component-v1
           - ember-release
           - ember-beta
           - ember-canary
@@ -105,21 +117,24 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      
+
       - uses: pnpm/action-setup@v3
         with:
           version: 8
-          
+
       - name: Install Node
         uses: actions/setup-node@v4
         with:
           node-version: 18.x
-          cache: 'pnpm'
-          
+          cache: pnpm
+
       - name: Install Dependencies
         run: pnpm install --frozen-lockfile
-
+
+      - run: pnpm build
+      - run: pnpm i -f # re-sync injected deps
+
       - name: Run Tests
         env:
           EMBER_TRY_SCENARIO: ${{ matrix.try-scenario }}
-        run: pnpm --filter test-app test:ember-try $EMBER_TRY_SCENARIO
+        run: pnpm --filter test-app test:ember-try $EMBER_TRY_SCENARIO --skip-cleanup
diff --git a/package.json b/package.json
@@ -11,7 +11,6 @@
     "build:docs": "pnpm run --filter docs build",
     "lint": "pnpm run --filter '*' lint",
     "lint:fix": "pnpm run --filter '*' lint:fix",
-    "prepare": "pnpm run build",
     "start": "concurrently 'pnpm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow",
     "start:addon": "pnpm run --filter ember-power-datepicker start --no-watch.clearScreen",
     "start:docs": "pnpm run --filter docs start --preserveWatchOutput",

diff --git a/test-app/config/ember-try.js b/test-app/config/ember-try.js
@@ -12,6 +12,7 @@ module.exports = async function () {
         npm: {
           devDependencies: {
             '@ember/test-helpers': '^2.9.3',
+            '@glimmer/component': '^1.1.2',
             'ember-cli': '~4.12.2',
             'ember-qunit': '^6.2.0',
             'ember-resolver': '^8.0.0',
@@ -23,6 +24,7 @@ module.exports = async function () {
         name: 'ember-lts-4.4',
         npm: {
           devDependencies: {
+            '@glimmer/component': '^1.1.2',
             'ember-resolver': '^8.0.0',
             'ember-source': '~4.4.0',
           },
@@ -32,6 +34,7 @@ module.exports = async function () {
         name: 'ember-lts-4.8',
         npm: {
           devDependencies: {
+            '@glimmer/component': '^1.1.2',
             'ember-resolver': '^11.0.0',
             'ember-source': '~4.8.0',
           },
@@ -69,6 +72,14 @@ module.exports = async function () {
           },
         },
       },
+      {
+        name: 'glimmer-component-v1',
+        npm: {
+          devDependencies: {
+            '@glimmer/component': '^1.1.2',
+          },
+        },
+      },
       {
         name: 'ember-release',
         npm: {