Skip to content

Commit 021b12f

Browse files
manucorporatmanucorporat
authored
chore: using pnpm (QwikDev#2120)
1 parent 7ea10c6 commit 021b12f

30 files changed

+6891
-10709
lines changed

‎.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"ghcr.io/devcontainers/features/rust:1": {}
2323
},
2424
"waitFor": "onCreateCommand",
25-
"updateContentCommand": "yarn",
25+
"updateContentCommand": "pnpm install",
2626
"forwardPorts": [3300, 9229],
2727
"customizations": {
2828
"codespaces": {

‎.github/workflows/ci.yml

+59-28
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,24 @@ jobs:
6363
- name: Checkout
6464
uses: actions/checkout@v3
6565

66+
- uses: pnpm/[email protected]
67+
with:
68+
version: 7
69+
6670
- name: Setup Node
6771
uses: actions/setup-node@v3
6872
with:
6973
node-version: 16.x
70-
cache: 'yarn'
74+
cache: 'pnpm'
7175
registry-url: https://registry.npmjs.org/
7276

7377
- run: corepack enable
7478

7579
- name: Install NPM Dependencies
76-
run: yarn install --immutable --network-timeout 300000
80+
run: pnpm install --frozen-lockfile
7781

7882
- name: Build Package
79-
run: yarn tsm scripts/index.ts --tsc --build --cli --api --set-dist-tag="${{ github.event.inputs.disttag }}"
83+
run: pnpm tsm scripts/index.ts --tsc --build --cli --api --set-dist-tag="${{ github.event.inputs.disttag }}"
8084

8185
- name: Print Package Dist Build
8286
run: tree packages/qwik/dist/
@@ -99,7 +103,7 @@ jobs:
99103
if-no-files-found: error
100104

101105
- name: Build Eslint rules
102-
run: yarn tsm scripts/index.ts --eslint
106+
run: pnpm tsm scripts/index.ts --eslint
103107

104108
- name: Print Eslint rules Dist Build
105109
run: tree packages/eslint-plugin-qwik/dist/
@@ -126,12 +130,15 @@ jobs:
126130
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
127131
uses: actions/checkout@v3
128132

133+
- uses: pnpm/[email protected]
134+
with:
135+
version: 7
129136
- name: Setup Node
130137
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
131138
uses: actions/setup-node@v3
132139
with:
133140
node-version: 16.x
134-
cache: 'yarn'
141+
cache: 'pnpm'
135142
registry-url: https://registry.npmjs.org/
136143

137144
- if: ${{ needs.changes.outputs.fullbuild == 'true' }}
@@ -164,11 +171,15 @@ jobs:
164171

165172
- name: Install NPM Dependencies
166173
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
167-
run: yarn install --immutable --network-timeout 300000
174+
run: pnpm install --frozen-lockfile
175+
176+
- uses: jetli/[email protected]
177+
with:
178+
version: 'v0.10.3'
168179

169180
- name: Build WASM
170181
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
171-
run: yarn tsm scripts/index.ts --wasm --set-dist-tag="${{ github.event.inputs.disttag }}"
182+
run: pnpm tsm scripts/index.ts --wasm --set-dist-tag="${{ github.event.inputs.disttag }}"
172183

173184
- name: Print WASM Dist Build
174185
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
@@ -189,18 +200,18 @@ jobs:
189200
settings:
190201
- host: macos-latest
191202
target: x86_64-apple-darwin
192-
build: yarn tsm scripts/index.ts --platform-binding
203+
build: pnpm tsm scripts/index.ts --platform-binding
193204

194205
- host: macos-latest
195206
target: aarch64-apple-darwin
196207
build: |
197208
export SDKROOT=$(xcrun -sdk macosx11.1 --show-sdk-path)
198209
export MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.1 --show-sdk-platform-version)
199-
yarn tsm scripts/index.ts --platform-binding --platform-target=aarch64-apple-darwin
210+
pnpm tsm scripts/index.ts --platform-binding --platform-target=aarch64-apple-darwin
200211
201212
- host: windows-latest
202213
target: x86_64-pc-windows-msvc
203-
build: yarn tsm scripts/index.ts --platform-binding
214+
build: pnpm tsm scripts/index.ts --platform-binding
204215

205216
name: Build ${{ matrix.settings.target }}
206217
runs-on: ${{ matrix.settings.host }}
@@ -212,12 +223,16 @@ jobs:
212223
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
213224
uses: actions/checkout@v3
214225

226+
- uses: pnpm/[email protected]
227+
with:
228+
version: 7
229+
215230
- name: Setup Node
216231
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
217232
uses: actions/setup-node@v3
218233
with:
219234
node-version: 16.x
220-
cache: 'yarn'
235+
cache: 'pnpm'
221236
registry-url: https://registry.npmjs.org/
222237

223238
- if: ${{ needs.changes.outputs.fullbuild == 'true' }}
@@ -264,7 +279,7 @@ jobs:
264279

265280
- name: Install NPM Dependencies
266281
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
267-
run: yarn install --immutable --network-timeout 300000
282+
run: pnpm install --frozen-lockfile
268283

269284
- name: Build Platform Binding
270285
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
@@ -345,11 +360,15 @@ jobs:
345360
- name: Checkout
346361
uses: actions/checkout@v3
347362

363+
- uses: pnpm/[email protected]
364+
with:
365+
version: 7
366+
348367
- name: Setup Node
349368
uses: actions/setup-node@v3
350369
with:
351370
node-version: 16.x
352-
cache: 'yarn'
371+
cache: 'pnpm'
353372
registry-url: https://registry.npmjs.org/
354373

355374
- run: corepack enable
@@ -373,18 +392,18 @@ jobs:
373392
mv dist-dev-eslint-plugin-qwik/* packages/eslint-plugin-qwik/dist/
374393
375394
- name: Install NPM Dependencies
376-
run: yarn install --immutable --network-timeout 300000
395+
run: pnpm install --frozen-lockfile
377396

378397
- name: Dry-Run Publish @builder.io/qwik
379398
if: ${{ github.event_name != 'workflow_dispatch' }}
380-
run: yarn tsm scripts/index.ts --set-dist-tag="${{ github.event.inputs.disttag }}" --release --dry-run
399+
run: pnpm tsm scripts/index.ts --set-dist-tag="${{ github.event.inputs.disttag }}" --release --dry-run
381400
env:
382401
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
383402
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
384403

385404
- name: Publish @builder.io/qwik
386405
if: ${{ github.event_name == 'workflow_dispatch' }}
387-
run: yarn tsm scripts/index.ts --set-dist-tag="${{ github.event.inputs.disttag }}" --release
406+
run: pnpm tsm scripts/index.ts --set-dist-tag="${{ github.event.inputs.disttag }}" --release
388407
env:
389408
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
390409
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -393,7 +412,7 @@ jobs:
393412
if: ${{ needs.changes.outputs.fullbuild == 'true' && github.event_name == 'push' }}
394413
env:
395414
API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
396-
run: yarn run qwik-save-artifacts
415+
run: pnpm run qwik-save-artifacts
397416

398417
############ E2E TEST ############
399418
test-e2e:
@@ -419,12 +438,16 @@ jobs:
419438
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
420439
uses: actions/checkout@v3
421440

441+
- uses: pnpm/[email protected]
442+
with:
443+
version: 7
444+
422445
- name: Setup Node ${{ matrix.settings.node }}
423446
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
424447
uses: actions/setup-node@v3
425448
with:
426449
node-version: ${{ matrix.settings.node }}
427-
cache: 'yarn'
450+
cache: 'pnpm'
428451
registry-url: https://registry.npmjs.org/
429452

430453
- if: ${{ needs.changes.outputs.fullbuild == 'true' }}
@@ -447,19 +470,19 @@ jobs:
447470
448471
- name: Install NPM Dependencies
449472
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
450-
run: yarn install --immutable --network-timeout 300000
473+
run: pnpm install --frozen-lockfile
451474

452475
- name: Install Playwright
453476
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
454477
run: npx playwright install ${{ matrix.settings.browser }} && npx playwright install-deps ${{ matrix.settings.browser }}
455478

456479
- name: Playwright E2E Tests
457480
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
458-
run: yarn run test.e2e.${{ matrix.settings.browser }}
481+
run: pnpm run test.e2e.${{ matrix.settings.browser }}
459482

460483
- name: Validate Create Qwik Cli
461484
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
462-
run: yarn cli.validate
485+
run: pnpm cli.validate
463486

464487
############ UNIT TEST ############
465488
test-unit:
@@ -472,20 +495,24 @@ jobs:
472495
- name: Checkout
473496
uses: actions/checkout@v3
474497

498+
- uses: pnpm/[email protected]
499+
with:
500+
version: 7
501+
475502
- name: Setup Node
476503
uses: actions/setup-node@v3
477504
with:
478505
node-version: 16.x
479-
cache: 'yarn'
506+
cache: 'pnpm'
480507
registry-url: https://registry.npmjs.org/
481508

482509
- run: corepack enable
483510

484511
- name: Install NPM Dependencies
485-
run: yarn install --immutable --network-timeout 300000
512+
run: pnpm install --frozen-lockfile
486513

487514
- name: Unit Tests
488-
run: yarn run test.unit
515+
run: pnpm run test.unit
489516

490517
########### VALIDATE RUST ############
491518
validate-rust:
@@ -560,22 +587,26 @@ jobs:
560587
- name: Checkout
561588
uses: actions/checkout@v3
562589

590+
- uses: pnpm/[email protected]
591+
with:
592+
version: 7
593+
563594
- name: Setup Node
564595
uses: actions/setup-node@v3
565596
with:
566597
node-version: 16.x
567-
cache: 'yarn'
598+
cache: 'pnpm'
568599
registry-url: https://registry.npmjs.org/
569600

570601
- run: corepack enable
571602

572603
- name: Install NPM Dependencies
573-
run: yarn install --immutable --network-timeout 300000
604+
run: pnpm install --frozen-lockfile
574605

575606
- name: Prettier Check
576607
if: ${{ always() }}
577-
run: yarn run lint.prettier
608+
run: pnpm run lint.prettier
578609

579610
- name: ESLint Check
580611
if: ${{ always() }}
581-
run: yarn run lint.eslint
612+
run: pnpm run lint.eslint

‎.github/workflows/release-qwik-city.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,29 @@ jobs:
2121
- name: Checkout
2222
uses: actions/checkout@v3
2323

24+
- uses: pnpm/[email protected]
25+
with:
26+
version: 7
27+
2428
- name: Setup Node
2529
uses: actions/setup-node@v3
2630
with:
2731
node-version: 16.x
28-
cache: 'yarn'
32+
cache: 'pnpm'
2933
registry-url: https://registry.npmjs.org/
3034

3135
- run: corepack enable
3236

3337
- name: Install NPM Dependencies
34-
run: yarn install --immutable --network-timeout 300000
38+
run: pnpm install --frozen-lockfile
3539

3640
- name: Test Qwik City
37-
run: cd packages/qwik-city && yarn test
41+
run: cd packages/qwik-city && pnpm test
3842

3943
- name: Build Qwik City
40-
run: cd packages/qwik-city && yarn build
44+
run: cd packages/qwik-city && pnpm build
4145

4246
- name: Publish Qwik City
43-
run: cd packages/qwik-city && yarn tsm scripts/release.ts --set-dist-tag="${{ github.event.inputs.disttag }}"
47+
run: cd packages/qwik-city && pnpm tsm scripts/release.ts --set-dist-tag="${{ github.event.inputs.disttag }}"
4448
env:
4549
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

‎.npmrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
engine-strict=true

‎.prettierignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
.history
77
.yarn
88
.yarnrc.yml
9+
pnpm-lock.yaml
910
.mf
1011
dist
1112
dist-dev
@@ -26,4 +27,4 @@ packages/docs/src/routes/**/*.mdx
2627
starters/**/*.js
2728

2829
# TODO: Figure out why this doesn't pass in CI
29-
packages/qwik/src/core/props/props.ts
30+
packages/qwik/src/core/props/props.ts

0 commit comments

Comments
 (0)