Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade to pnpm v7 #8041

Merged
merged 21 commits into from
May 11, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
chore: update
  • Loading branch information
antfu committed May 6, 2022
commit f6210352447fdb11d987a0a58b91cedaaf587e50
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ jobs:
run: pnpm run test-unit

- name: Test serve
run: pnpm run test-serve -- --runInBand
run: pnpm run test-serve --runInBand

- name: Test build
run: pnpm run test-build -- --runInBand
run: pnpm run test-build --runInBand

lint:
timeout-minutes: 10
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Some errors are masked and hidden away because of the layers of abstraction and

1. Add a `debugger` statement to the `scripts/jestPerTestSetup.ts` -> `afterAll` hook. This will pause execution before the tests quit and the Playwright browser instance exits.

1. Run the tests with the `debug-serve` script command which will enable remote debugging: `pnpm run debug-serve -- --runInBand resolve`.
1. Run the tests with the `debug-serve` script command which will enable remote debugging: `pnpm run debug-serve --runInBand resolve`.

1. Wait for inspector devtools to open in your browser and the debugger to attach.

Expand Down Expand Up @@ -77,11 +77,11 @@ Each integration test can be run under either dev server mode or build mode.

- `pnpm test` by default runs every integration test in both serve and build mode, and also unit tests.

- `pnpm run test-serve` runs tests only under serve mode. This is just calling `jest` so you can pass any Jest flags to this command. Since Jest will attempt to run tests in parallel, if your machine has many cores this may cause flaky test failures with multiple Playwright instances running at the same time. You can force the tests to run in series with `pnpm run test-serve -- --runInBand`.
- `pnpm run test-serve` runs tests only under serve mode. This is just calling `jest` so you can pass any Jest flags to this command. Since Jest will attempt to run tests in parallel, if your machine has many cores this may cause flaky test failures with multiple Playwright instances running at the same time. You can force the tests to run in series with `pnpm run test-serve --runInBand`.

- `pnpm run test-build` runs tests only under build mode.

- You can also use `pnpm run test-serve -- [match]` or `pnpm run test-build -- [match]` to run tests in a specific playground package, e.g. `pnpm run test-serve -- asset` will run tests for both `playground/asset` and `vite/src/node/__tests__/asset` under serve mode and `vite/src/node/__tests__/**/*` just run in serve mode.
- You can also use `pnpm run test-serve [match]` or `pnpm run test-build [match]` to run tests in a specific playground package, e.g. `pnpm run test-serve asset` will run tests for both `playground/asset` and `vite/src/node/__tests__/asset` under serve mode and `vite/src/node/__tests__/**/*` just run in serve mode.

Note package matching is not available for the `pnpm test` script, which always runs all tests.

Expand All @@ -91,7 +91,7 @@ Other than tests under `packages/playground/` for integration tests, packages mi

- `pnpm run test-unit` runs unit tests under each package.

- You can also use `pnpm run test-unit -- [match]` to run related tests.
- You can also use `pnpm run test-unit [match]` to run related tests.

### Test Env and Helpers

Expand Down
17 changes: 16 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,27 @@
"ci-docs": "run-s build-vite build-plugin-vue build-docs"
},
"devDependencies": {
"@jest/types": "^28.0.2",
"@microsoft/api-extractor": "^7.23.0",
"@types/babel__core": "^7.1.19",
"@types/convert-source-map": "^1.5.2",
"@types/cross-spawn": "^6.0.2",
"@types/debug": "^4.1.7",
"@types/estree": "^0.0.51",
"@types/etag": "^1.8.1",
"@types/fs-extra": "^9.0.13",
"@types/hash-sum": "^1.0.0",
"@types/jest": "^27.4.1",
"@types/less": "^3.0.3",
"@types/micromatch": "^4.0.2",
"@types/mime": "^2.0.3",
"@types/node": "^17.0.25",
"@types/prompts": "^2.0.14",
"@types/resolve": "^1.20.2",
"@types/sass": "~1.43.1",
"@types/semver": "^7.3.9",
"@types/stylus": "^0.48.37",
"@types/ws": "^8.5.3",
"@typescript-eslint/eslint-plugin": "^5.21.0",
"@typescript-eslint/parser": "^5.21.0",
"conventional-changelog-cli": "^2.2.2",
Expand Down Expand Up @@ -87,7 +102,7 @@
"eslint --ext .ts"
]
},
"packageManager": "pnpm@6.32.11",
"packageManager": "pnpm@7.0.0",
"pnpm": {
"overrides": {
"vite": "workspace:*",
Expand Down
1 change: 0 additions & 1 deletion packages/plugin-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
},
"devDependencies": {
"@rollup/pluginutils": "^4.2.1",
"@types/hash-sum": "^1.0.0",
"debug": "^4.3.4",
"hash-sum": "^2.0.0",
"rollup": "^2.59.0",
Expand Down
13 changes: 0 additions & 13 deletions packages/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,6 @@
"@rollup/plugin-node-resolve": "13.2.1",
"@rollup/plugin-typescript": "^8.3.2",
"@rollup/pluginutils": "^4.2.1",
"@types/convert-source-map": "^1.5.2",
"@types/cross-spawn": "^6.0.2",
"@types/debug": "^4.1.7",
"@types/estree": "^0.0.51",
"@types/etag": "^1.8.1",
"@types/less": "^3.0.3",
"@types/micromatch": "^4.0.2",
"@types/mime": "^2.0.3",
"@types/node": "^17.0.25",
"@types/resolve": "^1.20.2",
"@types/sass": "~1.43.1",
"@types/stylus": "^0.48.37",
"@types/ws": "^8.5.3",
"@vue/compiler-dom": "^3.2.33",
"acorn": "^8.7.1",
"cac": "6.7.9",
Expand Down
Loading