Skip to content

Commit ec487d1

Browse files
authored
Merge pull request #789 from ember-cli/pnpm
swap to pnpm
2 parents 962e05a + 71d1aa6 commit ec487d1

6 files changed

Lines changed: 16340 additions & 13678 deletions

File tree

.github/workflows/ci.yml

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@ jobs:
1616
runs-on: ubuntu-latest
1717

1818
steps:
19-
- uses: actions/checkout@v3
20-
- uses: actions/setup-node@v3
19+
- uses: actions/checkout@v6
20+
- uses: pnpm/action-setup@v4
21+
- uses: actions/setup-node@v6
2122
with:
2223
node-version: 20.x
23-
- name: install dependencies
24-
run: yarn install --frozen-lockfile
25-
- name: lint:js
26-
run: yarn lint:js
27-
- name: lint:hbs
28-
run: yarn lint:hbs
24+
cache: pnpm
25+
- run: pnpm install --frozen-lockfile
26+
- run: pnpm lint:js
27+
- run: pnpm lint:hbs
2928

3029
test:
3130
name: Tests
@@ -38,16 +37,15 @@ jobs:
3837
node-version: [20.x, 24.x]
3938

4039
steps:
41-
- uses: actions/checkout@v3
42-
- uses: actions/setup-node@v3
40+
- uses: actions/checkout@v6
41+
- uses: pnpm/action-setup@v4
42+
- uses: actions/setup-node@v6
4343
with:
4444
node-version: ${{ matrix.node-version }}
45-
- name: install dependencies
46-
run: yarn install --ignore-engines --frozen-lockfile
47-
- name: node tests
48-
run: yarn test:node
49-
- name: ember test
50-
run: yarn test:ember
45+
cache: pnpm
46+
- run: pnpm install
47+
- run: pnpm test:node
48+
- run: pnpm test:ember
5149

5250
floating-dependencies:
5351
name: Floating Deps
@@ -56,16 +54,15 @@ jobs:
5654
needs: [test, lint]
5755

5856
steps:
59-
- uses: actions/checkout@v3
60-
- uses: actions/setup-node@v3
57+
- uses: actions/checkout@v6
58+
- uses: pnpm/action-setup@v4
59+
- uses: actions/setup-node@v6
6160
with:
6261
node-version: 20.x
63-
- name: install dependencies
64-
run: yarn install --ignore-lockfile
65-
- name: node tests
66-
run: yarn test:node
67-
- name: ember test
68-
run: yarn test:ember
62+
cache: pnpm
63+
- run: pnpm install --no-lockfile
64+
- run: pnpm test:node
65+
- run: pnpm test:ember
6966

7067
try-scenarios:
7168
name: ${{ matrix.ember-try-scenario }}
@@ -86,13 +83,14 @@ jobs:
8683
- embroider-optimized
8784

8885
steps:
89-
- uses: actions/checkout@v3
90-
- uses: actions/setup-node@v3
86+
- uses: actions/checkout@v6
87+
- uses: pnpm/action-setup@v4
88+
- uses: actions/setup-node@v6
9189
with:
9290
node-version: 20.x
93-
- name: install dependencies
94-
run: yarn install
91+
cache: pnpm
92+
- run: pnpm install
9593
- name: test
9694
env:
9795
EMBER_TRY_SCENARIO: ${{ matrix.ember-try-scenario }}
98-
run: node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
96+
run: pnpm ember try:one $EMBER_TRY_SCENARIO

node-tests/colocated-test.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ const ColocatedTemplateCompiler = require('../lib/colocated-broccoli-plugin');
44
const ColocatedBabelPlugin = require.resolve('../lib/colocated-babel-plugin');
55
const BroccoliPersistentFilter = require('broccoli-persistent-filter');
66
const babel = require('@babel/core');
7-
const TypescriptTransform = require.resolve(
8-
'@babel/plugin-transform-typescript',
9-
);
7+
const TypescriptTransform =
8+
require.resolve('@babel/plugin-transform-typescript');
109
const {
1110
createTempDir,
1211
createBuilder: _createBuilder,

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
"loader.js": "^4.7.0",
8888
"mocha": "^8.4.0",
8989
"module-name-inliner": "link:./tests/dummy/lib/module-name-inliner",
90+
"normalize.css": "^8.0.1",
9091
"prettier": "^3.1.1",
9192
"qunit": "^2.20.0",
9293
"qunit-dom": "^2.0.0",
@@ -134,5 +135,6 @@
134135
"npm": {
135136
"publish": false
136137
}
137-
}
138+
},
139+
"packageManager": "pnpm@10.28.2"
138140
}

0 commit comments

Comments
 (0)