Skip to content

Commit 39d730e

Browse files
committedJan 28, 2023
Pin development node to v16, and switch to pnpm
1 parent 7d520dc commit 39d730e

File tree

8 files changed

+13693
-12912
lines changed

8 files changed

+13693
-12912
lines changed
 

‎.github/actions/setup-job/action.yml

+5-7
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ description: Setup node and install dependencies using the package manager
33
runs:
44
using: "composite"
55
steps:
6-
# - uses: pnpm/action-setup@v2.2.4
7-
# with:
8-
# version: 7
6+
- uses: pnpm/action-setup@v2.2.4
7+
with:
8+
version: 7
99
- uses: actions/setup-node@v3
1010
with:
11-
cache: 'yarn'
12-
# cache: 'pnpm'
11+
cache: 'pnpm'
1312
- name: 'Install dependencies'
1413
shell: 'bash'
15-
run: yarn install --frozen-lockfile
16-
# run: pnpm install
14+
run: pnpm install

‎.github/workflows/ci.yml

+10-8
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
- uses: actions/checkout@v3
2121
- uses: ./.github/actions/setup-job
2222
- name: Lint Addon
23-
run: yarn lint
23+
run: pnpm lint
2424
working-directory: addon
2525
- name: Lint Test App
26-
run: yarn lint
26+
run: pnpm lint
2727
working-directory: test-app
2828
- name: Lint Docs
29-
run: yarn lint
29+
run: pnpm lint
3030
working-directory: docs
3131

3232
test:
@@ -38,7 +38,7 @@ jobs:
3838
- uses: actions/checkout@v3
3939
- uses: ./.github/actions/setup-job
4040
- name: Run Tests
41-
run: yarn test:ember
41+
run: pnpm test:ember
4242
working-directory: test-app
4343

4444
docs:
@@ -50,7 +50,7 @@ jobs:
5050
- uses: actions/checkout@v3
5151
- uses: ./.github/actions/setup-job
5252
- name: Run Tests
53-
run: yarn test:ember
53+
run: pnpm test:ember
5454
working-directory: docs
5555

5656
floating:
@@ -62,9 +62,11 @@ jobs:
6262
- uses: actions/checkout@v3
6363
- uses: actions/setup-node@v3
6464
- name: Install Dependencies
65-
run: yarn install --no-lockfile
65+
run: |
66+
rm pnpm-lock.yaml
67+
pnpm install
6668
- name: Run Tests
67-
run: yarn test:ember
69+
run: pnpm test:ember
6870
working-directory: test-app
6971

7072
try-scenarios:
@@ -90,5 +92,5 @@ jobs:
9092
- uses: actions/checkout@v3
9193
- uses: ./.github/actions/setup-job
9294
- name: Run Tests
93-
run: ../node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
95+
run: pnpm ember try:one ${{ matrix.try-scenario }}
9496
working-directory: test-app

‎docs/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"test:all": "ember try:each"
2525
},
2626
"devDependencies": {
27+
"@babel/core": "^7.20.12",
2728
"@ember/optional-features": "^2.0.0",
2829
"@ember/test-helpers": "^2.6.0",
2930
"@ember/test-waiters": "^3.0.1",
@@ -48,9 +49,9 @@
4849
"ember-modifier": "^3.2.0",
4950
"ember-qunit": "mydea/ember-qunit#fn/ember-auto-import-v2-node-12",
5051
"ember-resolver": "^8.0.3",
52+
"ember-sortable": "workspace:../ember-sortable",
5153
"ember-source": "^4.2.0",
5254
"ember-source-channel-url": "^3.0.0",
53-
"ember-sortable": "*",
5455
"ember-template-lint": "^4.2.0",
5556
"ember-test-selectors": "^6.0.0",
5657
"eslint": "^7.32.0",

‎package.json

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
{
22
"version": "0.0.0",
33
"private": true,
4-
"workspaces": ["addon", "docs", "test-app"],
54
"repository": {
65
"type": "git",
76
"url": "https://github.com/adopted-ember-addons/ember-sortable"
87
},
98
"scripts": {
10-
"prepare": "cd addon && yarn build",
9+
"prepare": "cd addon && pnpm build",
1110
"release": "cd addon && release-it",
12-
"test": "cd test-app && yarn test:ember"
11+
"test": "cd test-app && pnpm test:ember"
1312
},
1413
"volta": {
15-
"node": "14.19.2",
14+
"node": "16.19.0",
1615
"yarn": "1.22.18"
1716
}
1817
}

‎pnpm-lock.yaml

+13,667
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pnpm-workspace.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
packages:
2+
- addon
3+
- test-app
4+
- docs

‎test-app/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"test:all": "ember try:each"
2424
},
2525
"devDependencies": {
26+
"@babel/core": "^7.20.12",
2627
"@ember/optional-features": "^2.0.0",
2728
"@ember/test-helpers": "^2.6.0",
2829
"@ember/test-waiters": "^3.0.1",
@@ -48,7 +49,7 @@
4849
"ember-resolver": "^8.0.3",
4950
"ember-source": "^4.2.0",
5051
"ember-source-channel-url": "^3.0.0",
51-
"ember-sortable": "*",
52+
"ember-sortable": "workspace:../ember-sortable",
5253
"ember-template-lint": "^4.2.0",
5354
"ember-test-selectors": "^6.0.0",
5455
"ember-try": "^2.0.0",

‎yarn.lock

-12,891
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.