Merge pull request #211 from TheUltDev/patch-1

Fix Windows
yuanqing · Apr 3, 2024 · 5c32828 · 5c32828
2 parents 61a2f51 + 3cd359f
commit 5c32828
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/packages/build/src/utilities/build-bundles-async/build-bundles-async.ts b/packages/build/src/utilities/build-bundles-async/build-bundles-async.ts
@@ -1,4 +1,6 @@
 import { resolve } from 'node:path'
+import { platform } from 'node:os'
+import { pathToFileURL } from 'node:url'
 
 import {
   Config,
@@ -16,6 +18,8 @@ import { importFresh } from '../import-fresh.js'
 import { esbuildCssModulesPlugin } from './esbuild-css-modules-plugin.js'
 import { esbuildPreactCompatPlugin } from './esbuild-preact-compat-plugin.js'
 
+const isWindows = platform() === 'win32'
+
 interface EntryFile extends ConfigFile {
   commandId: string
 }
@@ -48,10 +52,13 @@ async function overrideEsbuildConfigAsync(
   buildOptions: BuildOptions,
   configGlobPattern: string
 ): Promise<BuildOptions> {
-  const filePaths = await globby(configGlobPattern, { absolute: true })
+  let filePaths = await globby(configGlobPattern, { absolute: true })
   if (filePaths.length === 0) {
     return buildOptions
   }
+  if (isWindows) {
+    filePaths = filePaths.map(p => pathToFileURL(p).href)
+  }
   const overrideEsbuildConfig:
     | OverrideEsbuildConfig
     | { default: OverrideEsbuildConfig } = await importFresh(filePaths[0])

diff --git a/packages/build/src/utilities/build-manifest-async.ts b/packages/build/src/utilities/build-manifest-async.ts
@@ -1,6 +1,8 @@
 /* eslint-disable sort-keys-fix/sort-keys-fix */
 
 import { resolve } from 'node:path'
+import { platform } from 'node:os'
+import { pathToFileURL } from 'node:url'
 
 import {
   Config,
@@ -22,6 +24,8 @@ import { globby } from 'globby'
 
 import { importFresh } from './import-fresh.js'
 
+const isWindows = platform() === 'win32'
+
 export async function buildManifestAsync(options: {
   config: Config
   minify: boolean
@@ -209,12 +213,15 @@ function createManifestNetworkAccess(
 async function overrideManifestAsync(
   manifest: Manifest
 ): Promise<Record<string, any>> {
-  const filePaths = await globby(constants.build.manifestConfigGlobPattern, {
+  let filePaths = await globby(constants.build.manifestConfigGlobPattern, {
     absolute: true
   })
   if (filePaths.length === 0) {
     return manifest
   }
+  if (isWindows) {
+    filePaths = filePaths.map(p => pathToFileURL(p).href)
+  }
   const { default: overrideManifest } = await importFresh(filePaths[0])
   return overrideManifest(manifest)
 }