Allow @ember/test-helpers v4 as dependency (#525)

* chore: allow test-helpers v4 peer * chore: and the other references * Update pnpm lock * Force v4.0.2 of test-helpers * Fix ci scripts * Try to fix ci * Try to fix ci * Update embroider & test-helpers dependency * Add injected for calendar * Revert changes (hold only inject) * Recover ci scripts --------- Co-authored-by: Brad Overton <[email protected]>
cibernox · Sep 9, 2024 · 1dd9854 · 1dd9854
1 parent 716ed65
commit 1dd9854
Show file tree

Hide file tree

Showing 8 changed files with 1,978 additions and 1,908 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,19 +17,22 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: pnpm/action-setup@v2.2.4
+      - uses: pnpm/action-setup@v3
         with:
           version: 8
 
-      - uses: actions/setup-node@v3
+      - 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-calendar lint
@@ -40,20 +43,23 @@ jobs:
     needs: lint
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: pnpm/action-setup@v2.2.4
+      - uses: pnpm/action-setup@v3
         with:
           version: 8
 
       - name: Install Node
-        uses: actions/setup-node@v3
+        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
@@ -64,19 +70,22 @@ jobs:
     needs: lint
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: pnpm/action-setup@v2.2.4
+      - uses: pnpm/action-setup@v3
         with:
           version: 8
 
-      - uses: actions/setup-node@v3
+      - 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
@@ -104,20 +113,23 @@ jobs:
           - embroider-optimized
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: pnpm/action-setup@v2.2.4
+      - uses: pnpm/action-setup@v3
         with:
           version: 8
 
       - name: Install Node
-        uses: actions/setup-node@v3
+        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:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -31,6 +31,9 @@ jobs:
 
       - name: 'Install dependencies'
         run: pnpm install --frozen-lockfile
+
+      - run: pnpm build
+      - run: pnpm i -f # re-sync injected deps
 
       - name: Lint
         run: pnpm --filter docs lint
@@ -56,6 +59,9 @@ jobs:
       - 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 docs test:ember
 
@@ -80,6 +86,9 @@ jobs:
 
       - 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 docs build

diff --git a/.github/workflows/push-dist.yml b/.github/workflows/push-dist.yml
@@ -25,11 +25,15 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 18
-          cache: pnpm
+          cache: 'pnpm'
       - name: Install Dependencies
         run: pnpm install --frozen-lockfile
+
+      - run: pnpm build
+      - run: pnpm i -f # re-sync injected deps
+
       - uses: kategengler/[email protected]
         with:
           branch: dist
           token: ${{ secrets.GITHUB_TOKEN }}
-          working-directory: 'ember-power-calendar'
+          working-directory: 'ember-power-calendar'
diff --git a/docs/package.json b/docs/package.json
@@ -25,12 +25,17 @@
     "test": "concurrently \"pnpm:lint\" \"pnpm:test:*\" --names \"lint,test:\"",
     "test:ember": "ember test"
   },
+  "dependenciesMeta": {
+    "ember-power-calendar": {
+      "injected": true
+    }
+  },
   "devDependencies": {
     "@babel/core": "^7.24.7",
     "@ember/optional-features": "^2.1.0",
     "@ember/string": "^3.1.1",
-    "@ember/test-helpers": "^3.3.0",
-    "@embroider/macros": "^1.16.4",
+    "@ember/test-helpers": "^4.0.4",
+    "@embroider/macros": "^1.16.6",
     "@embroider/test-setup": "^4.0.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",

diff --git a/ember-power-calendar/package.json b/ember-power-calendar/package.json
@@ -66,8 +66,8 @@
   "dependencies": {
     "@embroider/addon-shim": "^1.8.9",
     "decorator-transforms": "^2.0.0",
-    "@embroider/util": "^1.13.1",
-    "@embroider/macros": "^1.16.4",
+    "@embroider/util": "^1.13.2",
+    "@embroider/macros": "^1.16.6",
     "ember-assign-helper": "^0.5.0",
     "ember-element-helper": "^0.8.6",
     "ember-truth-helpers": "^4.0.3"
@@ -77,8 +77,8 @@
     "@babel/runtime": "^7.24.7",
     "@babel/plugin-transform-typescript": "^7.24.7",
     "@babel/preset-typescript": "^7.24.7",
-    "@ember/test-helpers": "^3.3.0",
-    "@embroider/addon-dev": "^4.3.1",
+    "@ember/test-helpers": "^4.0.4",
+    "@embroider/addon-dev": "^5.0.0",
     "@glint/core": "^1.4.0",
     "@glint/environment-ember-loose": "^1.4.0",
     "@glint/environment-ember-template-imports": "^1.4.0",
@@ -156,7 +156,7 @@
     }
   },
   "peerDependencies": {
-    "@ember/test-helpers": "^2.9.4 || ^3.2.1",
+    "@ember/test-helpers": "^2.9.4 || ^3.2.1 || ^4.0.4",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "ember-concurrency": "^4.0.2",

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-calendar start --no-watch.clearScreen",
     "start:docs": "pnpm run --filter docs start --preserveWatchOutput",