fix: always apply #build windows fix when externals.trace is disa…

…bled
unjs · Apr 11, 2022 · 1ec2ee4 · 1ec2ee4
1 parent e78f598
commit 1ec2ee4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 23 deletions.
diff --git a/src/presets/nitro-dev.ts b/src/presets/nitro-dev.ts
@@ -1,5 +1,3 @@
-import { pathToFileURL } from 'url'
-import { isWindows } from 'std-env'
 import { defineNitroPreset } from '../preset'
 
 export const nitroDev = defineNitroPreset({
@@ -10,13 +8,5 @@ export const nitroDev = defineNitroPreset({
   },
   externals: { trace: false },
   inlineDynamicImports: true, // externals plugin limitation
-  sourceMap: true,
-  hooks: {
-    'nitro:rollup:before' (nitro) {
-      if (isWindows) {
-        // Windows dynamic imports should be file:// url
-        nitro.options.alias['#build'] = pathToFileURL(nitro.options.buildDir).href
-      }
-    }
-  }
+  sourceMap: true
 })
diff --git a/src/presets/nitro-prerender.ts b/src/presets/nitro-prerender.ts
@@ -1,5 +1,3 @@
-import { pathToFileURL } from 'url'
-import { isWindows } from 'std-env'
 import { defineNitroPreset } from '../preset'
 
 export const nitroPrerender = defineNitroPreset({
@@ -8,13 +6,5 @@ export const nitroPrerender = defineNitroPreset({
   output: {
     serverDir: '{{ buildDir }}/prerender'
   },
-  externals: { trace: false },
-  hooks: {
-    'nitro:rollup:before' (nitro) {
-      if (isWindows) {
-        // Windows dynamic imports should be file:// url
-        nitro.options.alias['#build'] = pathToFileURL(nitro.options.buildDir).href
-      }
-    }
-  }
+  externals: { trace: false }
 })
diff --git a/src/rollup/config.ts b/src/rollup/config.ts
@@ -1,3 +1,4 @@
+import { pathToFileURL } from 'url'
 import { dirname, join, relative, resolve } from 'pathe'
 import type { InputOptions, OutputOptions } from 'rollup'
 import defu from 'defu'
@@ -11,6 +12,7 @@ import replace from '@rollup/plugin-replace'
 import virtual from '@rollup/plugin-virtual'
 import wasmPlugin from '@rollup/plugin-wasm'
 import inject from '@rollup/plugin-inject'
+import { isWindows } from 'std-env'
 import { visualizer } from 'rollup-plugin-visualizer'
 import * as unenv from 'unenv'
 import type { Preset } from 'unenv'
@@ -221,10 +223,15 @@ export const plugins = [
   }))
 
   // https://github.com/rollup/plugins/tree/master/packages/alias
+  let buildDir = nitro.options.buildDir
+  // Windows (native) dynamic imports should be file:// urr
+  if (isWindows && (nitro.options.externals.trace === false)) {
+    buildDir = pathToFileURL(buildDir).href
+  }
   rollupConfig.plugins.push(alias({
     entries: resolveAliases({
       '#nitro': runtimeDir,
-      '#build': nitro.options.buildDir,
+      '#build': buildDir,
       '~': nitro.options.srcDir,
       '@/': nitro.options.srcDir,
       '~~': nitro.options.rootDir,