Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-24 06:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(vite): pass modulesDir to isExternal (#21966)

Browse Source
This commit is contained in:
Daniel Roe 2023-07-06 14:22:31 +01:00 committed by GitHub
parent d590c85c35
commit 1605a532a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/vite/src/dev-bundler.ts
View File

@ -229,7 +229,7 @@ export async function initViteDevBundler (ctx: ViteBuildContext, onBuild: () =>
const viteServer = ctx.ssrServer! const viteServer = ctx.ssrServer!
const options: TransformOptions = { const options: TransformOptions = {
viteServer, viteServer,
isExternal: createIsExternal(viteServer, ctx.nuxt.options.rootDir) isExternal: createIsExternal(viteServer, ctx.nuxt.options.rootDir, ctx.nuxt.options.modulesDir)
} }
// Build and watch // Build and watch

3
packages/vite/src/utils/external.ts
View File

@ -2,7 +2,7 @@ import type { ExternalsOptions } from 'externality'
import { ExternalsDefaults, isExternal } from 'externality' import { ExternalsDefaults, isExternal } from 'externality'
import type { ViteDevServer } from 'vite' import type { ViteDevServer } from 'vite'
export function createIsExternal (viteServer: ViteDevServer, rootDir: string) { export function createIsExternal (viteServer: ViteDevServer, rootDir: string, modulesDirs?: string[]) {
const externalOpts: ExternalsOptions = { const externalOpts: ExternalsOptions = {
inline: [ inline: [
/virtual:/, /virtual:/,
@ -15,6 +15,7 @@ export function createIsExternal (viteServer: ViteDevServer, rootDir: string) {
/node_modules/ /node_modules/
], ],
resolve: { resolve: {
modules: modulesDirs,
type: 'module', type: 'module',
extensions: ['.ts', '.js', '.json', '.vue', '.mjs', '.jsx', '.tsx', '.wasm'] extensions: ['.ts', '.js', '.json', '.vue', '.mjs', '.jsx', '.tsx', '.wasm']
} }

2
packages/vite/src/vite-node.ts
View File

@ -128,7 +128,7 @@ function createViteNodeApp (ctx: ViteBuildContext, invalidates: Set<string> = ne
web: [] web: []
} }
}) })
const isExternal = createIsExternal(viteServer, ctx.nuxt.options.rootDir) const isExternal = createIsExternal(viteServer, ctx.nuxt.options.rootDir, ctx.nuxt.options.modulesDir)
node.shouldExternalize = async (id: string) => { node.shouldExternalize = async (id: string) => {
const result = await isExternal(id) const result = await isExternal(id)
if (result?.external) { if (result?.external) {