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: revert "chore(docs): workaround netlify pnpm build issue (#11477)" #11759

Merged
merged 14 commits into from
Jan 20, 2023
Merged
5 changes: 3 additions & 2 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[build.environment]
NODE_VERSION = "16"
NPM_FLAGS = "--version" # prevent Netlify npm install
# don't need playwright for docs build
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1"
[build]
publish = "docs/.vitepress/dist"
command = "npx pnpm i --store=node_modules/.pnpm-store --frozen-lockfile && npm run ci-docs"
command = "pnpm ci-docs"
ignore = "./scripts/docs-check.sh"
2 changes: 1 addition & 1 deletion playground/ssr-resolve/__tests__/ssr-resolve.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ test.runIf(isBuild)('correctly resolve entrypoints', async () => {
new RegExp(`from ${_}@vitejs/test-entries/file.js${_}`),
)
expect(contents).toMatch(
new RegExp(`from ${_}@vitejs/test-pkg-exports/entry${_}`),
new RegExp(`from ${_}@vitejs/test-resolve-pkg-exports/entry${_}`),
)

await expect(import(`${testDir}/dist/main.mjs`)).resolves.toBeTruthy()
Expand Down
2 changes: 1 addition & 1 deletion playground/ssr-resolve/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import dirEntry from '@vitejs/test-entries/dir'
// no `exports` key, should resolve to entries/file.js
import fileEntry from '@vitejs/test-entries/file'
// has `exports` key, should resolve to pkg-exports/entry
import pkgExportsEntry from '@vitejs/test-pkg-exports/entry'
import pkgExportsEntry from '@vitejs/test-resolve-pkg-exports/entry'

export default `
entries/dir: ${dirEntry}
Expand Down
2 changes: 1 addition & 1 deletion playground/ssr-resolve/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
},
"dependencies": {
"@vitejs/test-entries": "file:./entries",
"@vitejs/test-pkg-exports": "file:./pkg-exports"
"@vitejs/test-resolve-pkg-exports": "file:./pkg-exports"
}
}
2 changes: 1 addition & 1 deletion playground/ssr-resolve/pkg-exports/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@vitejs/test-pkg-exports",
"name": "@vitejs/test-resolve-pkg-exports",
"private": true,
"version": "0.0.0",
"exports": {
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.