Compare commits

...

2 Commits

Author SHA1 Message Date
Justin Carrus
73dfee5a4f
fix: don't handle module ID that begin with \0 (#530) 2024-06-15 22:03:45 +08:00
alex8088
b3185d7fc5 feat: resolve import.meta.[dirname|filename] to support CommonJS format 2024-06-15 21:49:51 +08:00
3 changed files with 17 additions and 5 deletions

View File

@ -18,7 +18,7 @@ import { build } from 'esbuild'
import { electronMainVitePlugin, electronPreloadVitePlugin, electronRendererVitePlugin } from './plugins/electron'
import assetPlugin from './plugins/asset'
import workerPlugin from './plugins/worker'
import importMetaUrlPlugin from './plugins/importMetaUrl'
import importMetaPlugin from './plugins/importMeta'
import esmShimPlugin from './plugins/esm'
import modulePathPlugin from './plugins/modulePath'
import { isObject, isFilePathESM } from './utils'
@ -151,7 +151,7 @@ export async function resolveConfig(
assetPlugin(),
workerPlugin(),
modulePathPlugin(),
importMetaUrlPlugin(),
importMetaPlugin(),
esmShimPlugin()
])
@ -168,7 +168,7 @@ export async function resolveConfig(
mergePlugins(preloadViteConfig, [
...electronPreloadVitePlugin({ root }),
assetPlugin(),
importMetaUrlPlugin(),
importMetaPlugin(),
esmShimPlugin()
])

View File

@ -87,6 +87,12 @@ export default function assetPlugin(): Plugin {
return wasmHelperCode
}
if (id.startsWith('\0')) {
// Rollup convention, this id should be handled by the
// plugin that marked it with \0
return
}
const assetResolved = resolveAsset(id)
if (!assetResolved) {
return

View File

@ -1,14 +1,20 @@
import type { Plugin } from 'vite'
export default function importMetaUrlPlugin(): Plugin {
export default function importMetaPlugin(): Plugin {
return {
name: 'vite:import-meta-url',
name: 'vite:import-meta',
apply: 'build',
enforce: 'pre',
resolveImportMeta(property, { format }): string | null {
if (property === 'url' && format === 'cjs') {
return `require("url").pathToFileURL(__filename).href`
}
if (property === 'filename' && format === 'cjs') {
return `__filename`
}
if (property === 'dirname' && format === 'cjs') {
return `__dirname`
}
return null
}
}