Skip to content

Commit 17c675e

Browse files
Merge pull request #108 from gossi/pnpm
Switch to `pnpm`
2 parents 1b948cb + f4f78a8 commit 17c675e

File tree

9 files changed

+14609
-14143
lines changed

9 files changed

+14609
-14143
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,25 @@ jobs:
2222
timeout-minutes: 10
2323

2424
steps:
25-
- uses: actions/checkout@v3
26-
- name: Set up Volta
27-
uses: volta-cli/action@v3
28-
- name: Install Dependencies
29-
run: yarn install --frozen-lockfile
25+
- name: Setup
26+
uses: wyvox/action@v1
3027
- name: Lint
31-
run: yarn lint
28+
run: pnpm lint
3229
- name: Run Tests
33-
run: yarn workspace test-app run test:ember
30+
run: pnpm test
3431

3532
floating:
3633
name: "Floating Dependencies"
3734
runs-on: ubuntu-latest
3835
timeout-minutes: 10
3936

4037
steps:
41-
- uses: actions/checkout@v3
42-
- name: Set up Volta
43-
uses: volta-cli/action@v3
44-
- name: Install Dependencies
45-
run: yarn install --no-lockfile
38+
- name: Setup
39+
uses: wyvox/action@v1
40+
with:
41+
pnpm-args: --no-frozen-lockfile
4642
- name: Run Tests
47-
run: yarn workspace test-app run test:ember
43+
run: pnpm test
4844

4945
try-scenarios:
5046
name: ${{ matrix.try-scenario }}
@@ -70,13 +66,10 @@ jobs:
7066
- embroider-optimized
7167

7268
steps:
73-
- uses: actions/checkout@v3
74-
- name: Set up Volta
75-
uses: volta-cli/action@v3
76-
- name: Install Dependencies
77-
run: yarn install --frozen-lockfile
78-
- name: Run Tests
79-
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
69+
- name: Setup
70+
uses: wyvox/action@v1
71+
- name: Try Scenario
72+
run: pnpm exec ember try:one ${{ matrix.try-scenario }} --skip-cleanup
8073
working-directory: test-app
8174

8275
publish:
@@ -85,18 +78,14 @@ jobs:
8578
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
8679
runs-on: ubuntu-latest
8780
steps:
88-
- name: Checkout
89-
uses: actions/checkout@v3
90-
- name: Set up Volta
91-
uses: volta-cli/action@v3
92-
- run: yarn install
93-
- run: yarn build
81+
- name: Setup
82+
uses: wyvox/action@v1
9483
- name: Set up npm
9584
run: |
9685
echo "//registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}"> ~/.npmrc
9786
npm whoami
9887
env:
9988
NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
10089
- name: Publish to npm
101-
run: npm publish
90+
run: pnpm publish
10291
working-directory: ember-element-helper

.npmrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
public-hoist-pattern[]=*prettier*
2+
public-hoist-pattern[]=*eslint*
3+
public-hoist-pattern[]=!@typescript-eslint/*
4+
public-hoist-pattern[]=*ember-template-lint*
5+
public-hoist-pattern[]=*stylelint*

ember-element-helper/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
"lint:fix": "concurrently 'npm:lint:js:fix'",
3131
"lint:js": "eslint . --cache",
3232
"lint:js:fix": "eslint . --fix",
33-
"pretest": "yarn run build",
33+
"pretest": "pnpm build",
3434
"test": "echo 'Addon does not have tests, run tests in test-app'",
35-
"prepare": "yarn run build",
36-
"prepublishOnly": "yarn run build"
35+
"prepare": "pnpm build",
36+
"prepublishOnly": "pnpm build"
3737
},
3838
"dependencies": {
3939
"@embroider/addon-shim": "1.8.3",
@@ -57,7 +57,7 @@
5757
"eslint-plugin-simple-import-sort": "7.0.0",
5858
"rollup": "2.77.0",
5959
"babel-eslint": "10.1.0",
60-
"eslint": "^7.0.0",
60+
"eslint": "^7.31.0",
6161
"@rollup/plugin-babel": "5.3.1"
6262
},
6363
"publishConfig": {

package.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,16 @@
88
"license": "MIT",
99
"author": "Godfrey Chan <godfrey@tilde.io>",
1010
"scripts": {
11-
"prepare": "yarn build",
12-
"build": "yarn workspace ember-element-helper run build",
11+
"build": "pnpm --filter ember-element-helper build",
1312
"start": "concurrently 'npm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow",
14-
"start:addon": "yarn workspace ember-element-helper run start",
15-
"start:test": "yarn workspace test-app run start",
16-
"lint": "yarn workspaces run lint",
17-
"lint:fix": "yarn workspaces run lint:fix",
18-
"test": "yarn workspaces run test"
13+
"start:addon": "pnpm --filter ember-element-helper start",
14+
"start:test": "pnpm --filter test-app start",
15+
"lint": "pnpm --filter '*' lint",
16+
"lint:fix": "pnpm --filter '*' lint:fix",
17+
"test": "pnpm --filter '*' test"
1918
},
2019
"volta": {
2120
"node": "14.21.3",
22-
"yarn": "1.22.19",
2321
"npm": "9.8.1"
2422
},
2523
"devDependencies": {

0 commit comments

Comments
 (0)