Try pnpm test waiters peer deps

.github/workflows/ci.yml

@@ -20,9 +20,19 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: volta-cli/action@v1
-      - run: yarn install
-      - run: yarn test
-        working-directory: ./testing/build
+      - name: Cache pnpm modules
+        uses: actions/cache@v2
+        with:
+          path: ~/.pnpm-store
+          key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-
+
+      - uses: pnpm/[email protected]
+        with:
+          version: 6.32.1
+      - run: pnpm install
+      - run: pnpm --filter ember-resources-build-test test
 
 
   tests:
@@ -41,12 +51,20 @@ jobs:
       - uses: volta-cli/action@v1
         with:
           node-version: ${{ matrix.node }}
+      - name: Cache pnpm modules
+        uses: actions/cache@v2
+        with:
+          path: ~/.pnpm-store
+          key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-
 
-      - run: yarn install
-
+      - uses: pnpm/[email protected]
+        with:
+          version: 6.32.1
+      - run: pnpm install
       - name: Test with ${{ matrix.node }}
-        run: yarn ember test
-        working-directory: ./testing/ember-app
+        run: pnpm --filter ember-app run ember:test
 
   # floating-dependencies:
   #   if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
@@ -94,16 +112,23 @@ jobs:
       - uses: volta-cli/action@v1
         with:
           node-version: 12.x
-      - name: install dependencies
-        run: yarn install
+      - name: Cache pnpm modules
+        uses: actions/cache@v2
+        with:
+          path: ~/.pnpm-store
+          key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-
+
+      - uses: pnpm/[email protected]
+        with:
+          version: 6.32.1
+
+      - run: pnpm install
       - name: test
+        working-directory: testing/ember-app
         run: |
-          cd ember-resources
-          yarn build
-          yarn link
-          cd ../testing/ember-app
-          # ember-try does the other side of the link
-          yarn ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
+          node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
 
   publish:
     name: Release
@@ -116,15 +141,20 @@ jobs:
         with:
           persist-credentials: false
       - uses: volta-cli/action@v1
-      - uses: actions/cache@v2
+      - name: Cache pnpm modules
+        uses: actions/cache@v2
         with:
-          path: '**/node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}
-      - run: yarn install
+          path: ~/.pnpm-store
+          key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-
 
+      - uses: pnpm/[email protected]
+        with:
+          version: 6.32.1
+      - run: pnpm install
       - name: Release
-        run: yarn semantic-release
-        working-directory: ./ember-resources
+        run: pnpm --filter ember-resources exec semantic-release
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint.yml

@@ -21,11 +21,18 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - uses: volta-cli/action@v1
-    - uses: actions/cache@v2
+    - name: Cache pnpm modules
+      uses: actions/cache@v2
       with:
-        path: '**/node_modules'
-        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
-    - run: yarn install
+        path: ~/.pnpm-store
+        key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+        restore-keys: |
+          ${{ runner.os }}-
+
+    - uses: pnpm/[email protected]
+      with:
+        version: 6.32.1
+        run_install: true
 
   source:
     if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
@@ -36,12 +43,20 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: volta-cli/action@v1
-      - uses: actions/cache@v2
+      - name: Cache pnpm modules
+        uses: actions/cache@v2
+        with:
+          path: ~/.pnpm-store
+          key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-
+
+      - uses: pnpm/[email protected]
         with:
-          path: '**/node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+          version: 6.32.1
+          run_install: true
       - name: ESLint
-        run: yarn lint:js
+        run: pnpm run lint:js
         working-directory: ./ember-resources
 
   test_app:
@@ -53,12 +68,20 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: volta-cli/action@v1
-      - uses: actions/cache@v2
+      - name: Cache pnpm modules
+        uses: actions/cache@v2
         with:
-          path: '**/node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+          path: ~/.pnpm-store
+          key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-
+
+      - uses: pnpm/[email protected]
+        with:
+          version: 6.32.1
+          run_install: true
       - name: ESLint
-        run: yarn lint:js
+        run: pnpm run lint:js
         working-directory: ./testing/ember-app
 
   tooling:
@@ -72,13 +95,21 @@ jobs:
       - uses: volta-cli/action@v1
         with:
           node-version: 12 # min-supported
-      - uses: actions/cache@v2
+      - name: Cache pnpm modules
+        uses: actions/cache@v2
+        with:
+          path: ~/.pnpm-store
+          key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-
+
+      - uses: pnpm/[email protected]
         with:
-          path: '**/node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+          version: 6.32.1
+          run_install: true
 
       - name: Semantic Release
-        run: yarn semantic-release --dry-run
+        run: pnpm exec semantic-release --dry-run
         working-directory: ./ember-resources
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

ember-resources/package.json

@@ -38,7 +38,9 @@
   },
   "dependencies": {
     "@embroider/addon-shim": "^1.2.0",
-    "@embroider/macros": "^1.2.0",
+    "@embroider/macros": "^1.2.0"
+  },
+  "peerDependencies": {
     "@ember/test-waiters": "^3.0.0"
   },
   "devDependencies": {
@@ -48,6 +50,7 @@
     "@babel/plugin-syntax-decorators": "7.17.0",
     "@babel/plugin-transform-runtime": "^7.17.0",
     "@babel/preset-typescript": "7.16.7",
+    "@ember/test-waiters": "^3.0.0",
     "@embroider/addon-dev": "1.2.0",
     "@nullvoxpopuli/eslint-configs": "^2.1.1",
     "@semantic-release/changelog": "^5.0.0",
@@ -106,6 +109,7 @@
       "@semantic-release/git"
     ]
   },
+  "packageManager": "[email protected]",
   "volta": {
     "extends": "../package.json"
   }

package.json

@@ -9,10 +9,10 @@
   "license": "MIT",
   "author": "NullVoxPopuli",
   "scripts": {
-    "build": "yarn workspace ember-resources build",
-    "build:docs": "yarn workspace docs docs:collect",
-    "start:docs": "yarn build:docs --watch",
-    "prepare": "yarn build"
+    "build": "pnpm run --filter ember-resources build",
+    "build:docs": "pnpm run --filter docs docs:collect",
+    "start:docs": "pnpm run build:docs --watch",
+    "prepare": "pnpm run build"
   },
   "resolutions": {
     "@embroider/addon-shim": "1.2.0"
@@ -37,6 +37,12 @@
     "yarn": "1.22.17",
     "npm": "8.5.2"
   },
+  "packageManager": "[email protected]",
+  "pnpm": {
+    "overrides": {
+      "@embroider/addon-shim": "1.2.0"
+    }
+  },
   "engines": {
     "node": ">= 12"
   }