Skip to content

Commit

Permalink
fix(vite): remove resolveId workaround and update vite-node (#21423)
Browse files Browse the repository at this point in the history
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel Roe <daniel@roe.dev>
  • Loading branch information
renovate[bot] and danielroe committed Jun 7, 2023
1 parent 6d59a02 commit 5872015
Show file tree
Hide file tree
Showing 9 changed files with 71 additions and 67 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -74,7 +74,7 @@
"typescript": "5.0.4",
"ufo": "1.1.2",
"vite": "4.3.9",
"vitest": "0.31.4",
"vitest": "0.32.0",
"vue": "3.3.4",
"vue-eslint-parser": "9.3.0",
"vue-tsc": "1.6.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/kit/package.json
Expand Up @@ -46,7 +46,7 @@
"nitropack": "2.4.1",
"unbuild": "latest",
"vite": "4.3.9",
"vitest": "0.31.4",
"vitest": "0.32.0",
"webpack": "5.85.1"
},
"engines": {
Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt/package.json
Expand Up @@ -112,7 +112,7 @@
"acorn": "8.8.2",
"unbuild": "latest",
"vite": "4.3.9",
"vitest": "0.31.4"
"vitest": "0.32.0"
},
"peerDependencies": {
"@parcel/watcher": "^2.1.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/test-utils/package.json
Expand Up @@ -36,12 +36,12 @@
"@jest/globals": "29.5.0",
"playwright": "1.34.3",
"unbuild": "latest",
"vitest": "0.31.4"
"vitest": "0.32.0"
},
"peerDependencies": {
"@jest/globals": "^29.5.0",
"playwright": "^1.34.3",
"vitest": "^0.30.0 || ^0.31.0",
"vitest": "^0.30.0 || ^0.31.0 || ^0.32.0",
"vue": "^3.3.4"
},
"peerDependenciesMeta": {
Expand Down
2 changes: 1 addition & 1 deletion packages/vite/package.json
Expand Up @@ -57,7 +57,7 @@
"ufo": "^1.1.2",
"unplugin": "^1.3.1",
"vite": "~4.3.9",
"vite-node": "^0.31.4",
"vite-node": "^0.32.0",
"vite-plugin-checker": "^0.6.0",
"vue-bundle-renderer": "^1.0.3"
},
Expand Down
10 changes: 3 additions & 7 deletions packages/vite/src/runtime/vite-node.mjs
Expand Up @@ -33,14 +33,10 @@ export default async (ssrContext) => {
}

function createRunner () {
const _importers = new Map()
return new ViteNodeRunner({
root: viteNodeOptions.root, // Equals to Nuxt `srcDir`
base: viteNodeOptions.base,
resolveId (id, importer) { _importers.set(id, importer) },
async fetchModule (id) {
const importer = _importers.get(id)
_importers.delete(id)
id = id.replace(/\/\//g, '/') // TODO: fix in vite-node
return await viteNodeFetch('/module/' + encodeURI(id)).catch((err) => {
const errorData = err?.data?.data
Expand All @@ -49,7 +45,7 @@ function createRunner () {
}
let _err
try {
const { message, stack } = formatViteError(errorData, id, importer)
const { message, stack } = formatViteError(errorData, id)
_err = createError({
statusMessage: 'Vite Error',
message,
Expand All @@ -76,7 +72,7 @@ function createRunner () {
* @param id {string}
* @param importer {string}

Check warning on line 73 in packages/vite/src/runtime/vite-node.mjs

View workflow job for this annotation

GitHub Actions / lint

@param "importer" does not match an existing function parameter
*/
function formatViteError (errorData, id, importer) {
function formatViteError (errorData, id) {
const errorCode = errorData.name || errorData.reasonCode || errorData.code
const frame = errorData.frame || errorData.source || errorData.pluginCode

Expand All @@ -99,7 +95,7 @@ function formatViteError (errorData, id, importer) {

const stack = [
message,
`at ${loc} ${importer ? `(imported from ${importer})` : ''}`,
`at ${loc}`,
errorData.stack
].filter(Boolean).join('\n')

Expand Down
110 changes: 59 additions & 51 deletions pnpm-lock.yaml

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

0 comments on commit 5872015

Please sign in to comment.