Skip to content

Commit ac0733f

Browse files
authored
chore: revert "chore(docs): workaround netlify pnpm build issue (#11477)" (#11759)
1 parent c56b954 commit ac0733f

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

netlify.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[build.environment]
22
NODE_VERSION = "16"
3-
NPM_FLAGS = "--version" # prevent Netlify npm install
3+
# don't need playwright for docs build
4+
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1"
45
[build]
56
publish = "docs/.vitepress/dist"
6-
command = "npx pnpm i --store=node_modules/.pnpm-store --frozen-lockfile && npm run ci-docs"
7+
command = "pnpm ci-docs"
78
ignore = "./scripts/docs-check.sh"

playground/ssr-resolve/__tests__/ssr-resolve.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ test.runIf(isBuild)('correctly resolve entrypoints', async () => {
1212
new RegExp(`from ${_}@vitejs/test-entries/file.js${_}`),
1313
)
1414
expect(contents).toMatch(
15-
new RegExp(`from ${_}@vitejs/test-pkg-exports/entry${_}`),
15+
new RegExp(`from ${_}@vitejs/test-resolve-pkg-exports/entry${_}`),
1616
)
1717

1818
await expect(import(`${testDir}/dist/main.mjs`)).resolves.toBeTruthy()

playground/ssr-resolve/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import dirEntry from '@vitejs/test-entries/dir'
33
// no `exports` key, should resolve to entries/file.js
44
import fileEntry from '@vitejs/test-entries/file'
55
// has `exports` key, should resolve to pkg-exports/entry
6-
import pkgExportsEntry from '@vitejs/test-pkg-exports/entry'
6+
import pkgExportsEntry from '@vitejs/test-resolve-pkg-exports/entry'
77

88
export default `
99
entries/dir: ${dirEntry}

playground/ssr-resolve/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
},
99
"dependencies": {
1010
"@vitejs/test-entries": "file:./entries",
11-
"@vitejs/test-pkg-exports": "file:./pkg-exports"
11+
"@vitejs/test-resolve-pkg-exports": "file:./pkg-exports"
1212
}
1313
}

playground/ssr-resolve/pkg-exports/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@vitejs/test-pkg-exports",
2+
"name": "@vitejs/test-resolve-pkg-exports",
33
"private": true,
44
"version": "0.0.0",
55
"exports": {

pnpm-lock.yaml

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)