Merge remote-tracking branch 'origin/master' into fix-blueprint

miragejs · Sep 13, 2023 · cbbd6cf · cbbd6cf
2 parents a5ab21e + 4936f1a
commit cbbd6cf
Show file tree

Hide file tree

Showing 75 changed files with 20,741 additions and 17,804 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,6 +1,6 @@
 version: 2
 updates:
 - package-ecosystem: npm
-  directory: "/packages/ember-cli-mirage/"
+  directory: "/"
   schedule:
     interval: daily
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,20 +19,26 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 14.x
-          cache: yarn
+          node-version: 16.x
+          cache: pnpm
 
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install
 
       - name: Lint
-        run: yarn workspace ember-cli-mirage lint
+        run: pnpm run lint
+        working-directory: packages/ember-cli-mirage
 
       - name: Run Tests
-        run: yarn workspace ember-cli-mirage test:ember
+        run: pnpm run test:ember
+        working-directory: packages/ember-cli-mirage
 
   floating:
     name: "Floating Dependencies"
@@ -41,16 +47,24 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+
+      - name: Install Node
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.x
-          cache: yarn
+          node-version: 16.x
+          cache: pnpm
+
+      - name: Update resolution-mode
+        run: echo "resolution-mode=highest" >> .npmrc
 
       - name: Install Dependencies
-        run: yarn install --no-lockfile
+        run: pnpm install --no-lockfile
 
       - name: Run Tests
-        run: yarn test:ember
+        run: pnpm run test:ember
         working-directory: packages/ember-cli-mirage
 
   test-docs:
@@ -59,19 +73,26 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: pnpm/action-setup@v2
         with:
-          node-version: 14.x
-          cache: yarn
+          version: 8
+
+      - name: Install Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+          cache: pnpm
 
       - name: Install Dependencies
-        run: yarn install --no-lockfile
+        run: pnpm install
 
       - name: Lint
-        run: yarn workspace ember-cli-mirage-docs lint
+        run: pnpm run lint
+        working-directory: packages/ember-cli-mirage-docs
 
       - name: Run Tests
-        run: yarn workspace ember-cli-mirage-docs test:ember
+        run: pnpm run test:ember
+        working-directory: packages/ember-cli-mirage-docs
 
   test-app-01:
     name: "Tests - Basic App"
@@ -80,20 +101,26 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 14.x
-          cache: yarn
+          node-version: 16.x
+          cache: pnpm
 
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install
 
       - name: Lint
-        run: yarn workspace basic-app lint
+        run: pnpm run lint
+        working-directory: test-packages/01-basic-app
 
       - name: Run Tests
-        run: yarn workspace basic-app test
+        run: pnpm run test
+        working-directory: test-packages/01-basic-app
 
   test-app-02:
     name: "Tests - App That Excludes Mirage"
@@ -102,20 +129,26 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 14.x
-          cache: yarn
+          node-version: 16.x
+          cache: pnpm
 
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install
 
       - name: Lint
-        run: yarn workspace app-that-excludes-mirage lint
+        run: pnpm run lint
+        working-directory: test-packages/02-app-that-excludes-mirage
 
       - name: Run Tests
-        run: yarn workspace app-that-excludes-mirage test
+        run: pnpm run test
+        working-directory: test-packages/02-app-that-excludes-mirage
 
   try-scenarios:
     name: ${{ matrix.try-scenario }}
@@ -127,28 +160,30 @@ jobs:
       fail-fast: false
       matrix:
         try-scenario:
-          - ember-lts-3.12
-          - ember-lts-3.16
-          - ember-lts-3.20
-          - ember-lts-3.24
           - ember-lts-3.28
+          - ember-lts-4.4
+          - ember-lts-4.8
+          - ember-lts-4.12
           - ember-release
           - ember-beta
           - ember-canary
-          - ember-classic
 #          - embroider-safe
 #          - embroider-optimized
 
     steps:
       - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 14.x
-          cache: yarn
+          node-version: 16.x
+          cache: pnpm
 
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install
 
       - name: Run Tests
         run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -8,21 +8,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 14.x
-          cache: yarn
+          node-version: 16.x
+          cache: pnpm
 
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install
 
       - name: Lint
-        run: yarn workspace ember-cli-mirage lint
+        run: pnpm run lint
+        working-directory: packages/ember-cli-mirage
 
       - name: Run Browser Tests
-        run: yarn workspace ember-cli-mirage test:ember
+        run: pnpm run test:ember
+        working-directory: packages/ember-cli-mirage
 
       - name: deploy docs
-        run: node_modules/.bin/ember deploy production
-        working-directory: packages/ember-cli-mirage
+        run: pnpm run deploy
+        working-directory: packages/ember-cli-mirage-docs
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,20 +10,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+
       - name: Install Node
         uses: actions/setup-node@v3
         with:
-          node-version: 14.x
-          cache: yarn
+          node-version: 16.x
+          cache: pnpm
 
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install
 
       - name: Lint
-        run: yarn workspace ember-cli-mirage lint
+        run: pnpm run lint
+        working-directory: packages/ember-cli-mirage
 
       - name: Run Tests
-        run: yarn workspace ember-cli-mirage test:ember
+        run: pnpm run test:ember
+        working-directory: packages/ember-cli-mirage
 
       - uses: JS-DevTools/npm-publish@v1
         with:

diff --git a/.npmrc b/.npmrc
@@ -0,0 +1,4 @@
+auto-install-peers=false
+dedupe-peer-dependents=false
+resolve-peers-from-workspace-root=false
+
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -16,8 +16,9 @@ To make more substantial changes, you'll want to be able to develop the docs sit
 
 ```shell
 git clone [email protected]:miragejs/ember-cli-mirage.git
-cd ember-cli-mirage/packages/ember-cli-mirage
-yarn install
+cd ember-cli-mirage
+pnpm install
+cd packages/ember-cli-mirage
 ember s
 ```
 
@@ -29,17 +30,18 @@ To help out with Mirage development, first pull down the project locally and ver
 
 ```
 git clone [email protected]:[your-name]/ember-cli-mirage.git
-cd ember-cli-mirage/packages/ember-cli-mirage
-yarn install
-ember test
+cd ember-cli-mirage
+pnpm install
+cd packages/ember-cli-mirage
+pnpm run test:ember
 ```
 
 If all tests pass, you should be all set. Checkout a new branch to start developing, then submit a PR when you're ready!
 
 ## Linting
 
-* `yarn lint`
-* `yarn lint:fix`
+* `pnpm run lint`
+* `pnpm run lint:fix`
 
 ## Running tests
 
@@ -52,4 +54,4 @@ If all tests pass, you should be all set. Checkout a new branch to start develop
 * `ember serve`
 * Visit the dummy application at [http://localhost:4200](http://localhost:4200).
 
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
+For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).
diff --git a/README.md b/README.md
@@ -22,6 +22,8 @@ A client-side server to develop, test and prototype your Ember CLI app.
 ember install ember-cli-mirage
 ```
 
+Has a peer dependency on [MirageJS](https://miragejs.com/) which is added to your projects `package.json` during installation.
+
 ## Feature requests
 
 Please open an issue and add a :+1: emoji reaction. We will use the number of reactions as votes to indicate community interest, which will in turn help us prioritize feature development.

diff --git a/RELEASE.md b/RELEASE.md
@@ -31,7 +31,7 @@ Once the prep work is completed, the actual release is straight forward:
 * First, ensure that you have installed your projects dependencies:
 
   ```sh
-  yarn install
+  pnpm install
   ```
 
 * Second, ensure that you have obtained a
@@ -50,7 +50,7 @@ Once the prep work is completed, the actual release is straight forward:
 * Do your release.
 
   ```sh
-  yarn release
+  pnpm run release
   ```
 
 [release-it](https://github.com/release-it/release-it/) manages the actual

diff --git a/package.json b/package.json
@@ -10,19 +10,12 @@
   },
   "license": "MIT",
   "author": "Sam Selikoff",
-  "workspaces": [
-    "packages/*",
-    "test-packages/*"
-  ],
   "scripts": {
     "release": "release-it",
-    "test": "cd packages/ember-cli-mirage && yarn test:ember"
+    "test": "cd packages/ember-cli-mirage && pnpm run test:ember"
   },
-  "resolutions": {
-    "@embroider/core": "1.6.0",
-    "@embroider/macros": "1.6.0",
-    "@embroider/shared-internals": "1.6.0",
-    "@embroider/util": "1.6.0",
+  "overrides": {
+    "ember-cli-babel": "7.26.11",
     "colors": "1.4.0",
     "favicons": "5.3.0"
   },
@@ -37,7 +30,7 @@
   "release-it": {
     "hooks": {
       "before:init": "cp CHANGELOG.md LICENSE.md README.md packages/ember-cli-mirage/",
-      "after:release": "cd packages/ember-cli-mirage-docs && yarn deploy"
+      "after:release": "cd packages/ember-cli-mirage-docs && pnpm run deploy"
     },
     "plugins": {
       "release-it-lerna-changelog": {
@@ -72,7 +65,7 @@
     "npm": false
   },
   "volta": {
-    "node": "14.19.1",
+    "node": "16.20.2",
     "yarn": "1.22.18"
   }
 }