Merge pull request #917 from ember-fastboot/use-pnpm

move to pnpm

Author: mansona

.github/workflows/ci.yml

@@ -22,83 +22,89 @@ jobs:
   test-all-packages:
     name: Ember Tests
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 15
 
     strategy:
+      fail-fast: false
       matrix:
         node-version: [16.x, 14.x]
         os: [ubuntu-latest, windows-latest]
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 7
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: yarn
-      - name: Yarn Install
-        run: yarn install --ignore-engines --frozen-lockfile
-      - name: Run ember-cli-fastboot Tests
-        run: yarn workspace ember-cli-fastboot test:ember
+          cache: pnpm
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm test:ember-cli-fastboot
       - name: Run fastboot Tests
         if: ${{ matrix.os != 'windows-latest' }}
-        run: yarn workspace fastboot test
-      - name: Run fastboot-express-middleware Tests
-        run: yarn workspace fastboot-express-middleware test
-      - name: Run fastboot-app-server Tests
-        run: yarn workspace fastboot-app-server test:mocha
+        run: pnpm test:fastboot
+      - run: pnpm test:fastboot-express-middleware
+      - run: pnpm test:fastboot-app-server
 
   integration-tests:
     name: Integration Tests
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 15
 
     strategy:
+      fail-fast: false
       matrix:
         node-version: [16.x, 14.x]
         os: [ubuntu-latest, windows-latest]
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+            version: 7
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: yarn
-      - name: Yarn Install
-        run: yarn install --ignore-engines --frozen-lockfile
-      - name: Integration Tests
-        run: yarn workspace integration-tests test
+          cache: pnpm
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm test:integration
 
   test-packages:
     name: Test Packages
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 15
 
     strategy:
+      fail-fast: false
       matrix:
         node-version: [16.x, 14.x]
         os: [ubuntu-latest, windows-latest]
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+            version: 7
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: yarn
-      - name: Yarn Install
-        run: yarn install --ignore-engines --frozen-lockfile
-      - name: Basic App
-        run: yarn workspace basic-app test:mocha
-      - name: Custom App
-        run: yarn workspace custom-fastboot-app test:mocha
-      - name: Run ember-cli-fastboot-testing-app Tests
-        run: yarn workspace ember-cli-fastboot-testing-app test:ember
+          cache: pnpm
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm --filter basic-app test:mocha
+      - run: pnpm --filter custom-fastboot-app test:mocha
+      - run: pnpm --filter ember-cli-fastboot-testing-app test:ember
 
   test-legacy-mocha:
     name: Legacy Mocha Tests - ${{ matrix.node-version }}
     runs-on: ubuntu-latest
+    timeout-minutes: 15
 
     strategy:
       fail-fast: false
@@ -107,17 +113,17 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+            version: 7
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: volta-cli/action@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-      - name: Yarn Install
-        run: |
-          yarn install --ignore-engines --frozen-lockfile
-      - name: Run Mocha Tests
-        run: |
-          yarn workspace ember-cli-fastboot test:mocha
+          cache: pnpm
+      - run: pnpm install --frozen-lockfile
+      - run: pnpm --filter ember-cli-fastboot test:mocha
 
   try-scenarios:
     name: "ember-try for ember-cli-fastboot: ${{ matrix.ember-try-scenario }}"
@@ -144,11 +150,14 @@ jobs:
           - ember-release-no-deprecations
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+            version: 7
+      - uses: actions/setup-node@v3
         with:
           node-version: 14
-          cache: yarn
-      - run: yarn install --ignore-engines --frozen-lockfile
+          cache: pnpm
+      - run: pnpm install --frozen-lockfile
       - name: test
-        run: yarn workspace ember-cli-fastboot ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup
+        run: pnpm --filter ember-cli-fastboot exec ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup

.gitignore

@@ -18,6 +18,6 @@ node_modules/
 yarn-error.log
 
 # ember-try
-/.node_modules.ember-try/
-/bower.json.ember-try
-/package.json.ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

package.json

@@ -5,24 +5,20 @@
     "type": "git",
     "url": "[email protected]:ember-fastboot/ember-cli-fastboot.git"
   },
-  "workspaces": [
-    "packages/*",
-    "test-packages/*"
-  ],
   "scripts": {
     "test": "npm-run-all test:*",
-    "test:ember-cli-fastboot": "yarn workspace ember-cli-fastboot test:ember",
-    "test:fastboot": "yarn workspace fastboot test",
-    "test:fastboot-express-middleware": "yarn workspace fastboot-express-middleware test",
-    "test:fastboot-app-server": "yarn workspace fastboot-app-server test:mocha",
-    "test:integration": "yarn workspace integration-tests test",
-    "test:extra": "yarn workspace basic-app test:mocha && yarn workspace custom-fastboot-app test:mocha"
+    "test:ember-cli-fastboot": "pnpm --filter ember-cli-fastboot test:ember",
+    "test:fastboot": "pnpm --filter fastboot test",
+    "test:fastboot-express-middleware": "pnpm --filter fastboot-express-middleware test",
+    "test:fastboot-app-server": "pnpm --filter fastboot-app-server test:mocha",
+    "test:integration": "pnpm --filter integration-tests test",
+    "test:extra": "pnpm --filter basic-app test:mocha && pnpm --filter custom-fastboot-app test:mocha"
   },
   "devDependencies": {
+    "@release-it-plugins/lerna-changelog": "^5.0.0",
+    "@release-it-plugins/workspaces": "^3.2.0",
     "npm-run-all": "^4.1.5",
-    "release-it": "^14.2.2",
-    "release-it-lerna-changelog": "^3.1.0",
-    "release-it-yarn-workspaces": "^2.0.0"
+    "release-it": "^14.2.2"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -33,7 +29,7 @@
         "infile": "CHANGELOG.md",
         "launchEditor": true
       },
-      "release-it-yarn-workspaces": {
+      "@release-it-plugins/workspaces": {
         "workspaces": [
           "packages/*"
         ],

packages/ember-cli-fastboot/config/ember-try.js

@@ -5,11 +5,7 @@ const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
 
 module.exports = async function () {
   return {
-    useYarn: true,
-    // don't use default `--no-lockfile` option, which has been causing these to fail
-    buildManagerOptions(/* scenario */) {
-      return ['--ignore-engines'];
-    },
+    usePnpm: true,
     scenarios: [
       {
         name: 'ember-lts-3.16',

packages/ember-cli-fastboot/package.json

@@ -58,10 +58,10 @@
     "body-parser": "^1.18.3",
     "broccoli-asset-rev": "^3.0.0",
     "broccoli-test-helper": "^1.5.0",
-    "co": "4.6.0",
     "chai": "^4.3.4",
     "chai-fs": "^2.0.0",
     "chai-string": "^1.4.0",
+    "co": "4.6.0",
     "ember-auto-import": "^2.2.1",
     "ember-cli": "~4.1.0",
     "ember-cli-addon-tests": "^0.11.1",
@@ -81,7 +81,7 @@
     "ember-source": "~3.26.1",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^3.2.0",
-    "ember-try": "^1.4.0",
+    "ember-try": "^2.0.0",
     "eslint": "^7.23.0",
     "eslint-config-prettier": "^8.1.0",
     "eslint-plugin-ember": "^10.3.0",

packages/fastboot-express-middleware/test/fixtures/empty-package-json/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "foo": "0.0.0"
+    "foo": "workspace:*"
   },
   "fastboot": {
     "appName": "app-with-dependencies",

packages/fastboot/test/fixtures/app-with-dependencies/package.json

@@ -1,3 +1,3 @@
 {
-  "name": "foo"
+  "name": "empty-package-json"
 }