Merge pull request #751 from adopted-ember-addons/pnpm

switch to pnpm
adopted-ember-addons · Feb 26, 2024 · 99ecd30 · 99ecd30
2 parents 98c962f + f9543ea
commit 99ecd30
Show file tree

Hide file tree

Showing 9 changed files with 13,795 additions and 13,448 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,34 +18,40 @@ jobs:
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v3
+        with:
+          version: 7
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 14.x
-          cache: yarn
+          cache: pnpm
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile --ignore-engines
+        run: pnpm install --frozen-lockfile
       - name: Lint
-        run: yarn lint
+        run: pnpm lint
       - name: Run Tests
-        run: yarn test:ember
+        run: pnpm test:ember
 
   floating:
     name: "Floating Dependencies"
     runs-on: ubuntu-latest
     timeout-minutes: 10
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v3
+        with:
+          version: 7
+      - uses: actions/setup-node@v4
         with:
           node-version: 14.x
-          cache: yarn
+          cache: pnpm
       - name: Install Dependencies
-        run: yarn install --no-lockfile --ignore-engines
+        run: pnpm install --no-lockfile
       - name: Run Tests
-        run: yarn test:ember
+        run: pnpm test:ember
 
   try-scenarios:
     name: ${{ matrix.try-scenario }}
@@ -68,13 +74,16 @@ jobs:
           # - embroider-optimized
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v3
+        with:
+          version: 7
       - name: Install Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 14.x
-          cache: yarn
+          cache: pnpm
       - name: Install Dependencies
-        run: yarn install --frozen-lockfile --ignore-engines
+        run: pnpm install --frozen-lockfile
       - name: Run Tests
         run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+auto-install-peers=false
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -4,12 +4,12 @@
 
 * `git clone <repository-url>`
 * `cd ember-cp-validations`
-* `yarn install`
+* `pnpm install`
 
 ## Linting
 
-* `yarn lint`
-* `yarn lint:fix`
+* `pnpm lint`
+* `pnpm lint:fix`
 
 ## Running tests
 

diff --git a/addon/-private/ember-internals.js b/addon/-private/ember-internals.js
@@ -1,10 +1,11 @@
-import { isClassicDecorator, descriptorForDecorator,  } from '@ember/-internals/metal';
+import {
+  isClassicDecorator,
+  descriptorForDecorator,
+} from '@ember/-internals/metal';
 
 export function getDependentKeys(descriptorOrDecorator) {
   if (descriptorForDecorator) {
-    let descriptor = descriptorForDecorator(
-      descriptorOrDecorator
-    );
+    let descriptor = descriptorForDecorator(descriptorOrDecorator);
     return descriptor._dependentKeys || [descriptor.altKey];
   } else {
     return descriptorOrDecorator._dependentKeys;

diff --git a/package.json b/package.json
@@ -62,6 +62,7 @@
     "@ember/test-helpers": "^2.9.3",
     "@embroider/test-setup": "^2.1.1",
     "@fortawesome/ember-fontawesome": "^1.0.0",
+    "@fortawesome/fontawesome-svg-core": "^6.5.1",
     "@fortawesome/free-brands-svg-icons": "^6.4.0",
     "@fortawesome/free-solid-svg-icons": "^6.4.0",
     "@glimmer/component": "^1.1.2",
@@ -90,7 +91,7 @@
     "ember-source": "~4.12.0",
     "ember-source-channel-url": "^3.0.0",
     "ember-template-lint": "^5.7.2",
-    "ember-try": "^2.0.0",
+    "ember-try": "^3.0.0",
     "eslint": "^8.37.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-ember": "^11.5.0",
@@ -109,8 +110,8 @@
     "webpack": "^5.78.0"
   },
   "peerDependencies": {
-    "ember-source": ">= 3.28.0",
-    "ember-data": "*"
+    "ember-data": "*",
+    "ember-source": ">= 3.28.0"
   },
   "peerDependenciesMeta": {
     "ember-data": {