fix(windows): normalize path in watcher

.github/workflows/nodejs.yml

@@ -32,6 +32,7 @@ jobs:
       - run: npm ci
       - run: npm run test --if-present
       - run: npx semantic-release
+        if: "!contains(github.event.head_commit.message, 'skip-release')"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

package.json

@@ -25,6 +25,7 @@
     "build:simple": "tsup src/cli-*.ts src/index.ts src/rollup.ts --clean --splitting"
   },
   "dependencies": {
+    "bundle-require": "^2.1.2",
     "cac": "^6.7.2",
     "chalk": "^4.1.0",
     "chokidar": "^3.5.1",
@@ -61,7 +62,6 @@
     "resolve": "^1.20.0",
     "rollup-plugin-dts": "^3.0.2",
     "rollup-plugin-hashbang": "^2.2.2",
-    "slash": "^4.0.0",
     "string-argv": "^0.3.1",
     "strip-json-comments": "^3.1.1",
     "svelte": "3.37.0",

src/cli-main.ts

@@ -2,8 +2,8 @@ import { readFileSync } from 'fs'
 import { join } from 'path'
 import { cac } from 'cac'
 import flat from 'flat'
-import slash from 'slash'
 import { Format, Options } from '.'
+import { slash } from './utils'
 
 function ensureArray(input: string): string[] {
   return Array.isArray(input) ? input : input.split(',')

src/index.ts

@@ -2,7 +2,7 @@ import path from 'path'
 import fs from 'fs'
 import { Worker } from 'worker_threads'
 import type { MarkRequired } from 'ts-essentials'
-import { removeFiles, debouncePromise } from './utils'
+import { removeFiles, debouncePromise, slash } from './utils'
 import { loadTsupConfig, resolveTsConfig } from './load'
 import glob from 'globby'
 import { handleError, PrettyError } from './errors'
@@ -242,6 +242,7 @@ export async function build(_options: Options) {
               ignored,
             })
             watcher.on('all', async (type, file) => {
+              file = slash(file)
               if (!buildDependencies.has(file)) return
 
               logger.info('CLI', `Change detected: ${type} ${file}`)

src/load.ts

@@ -2,7 +2,7 @@ import fs from 'fs'
 import { parse as parseJson } from 'jju/lib/parse'
 import JoyCon from 'joycon'
 import path from 'path'
-import { Loader } from 'esbuild'
+import { bundleRequire } from 'bundle-require'
 import stripJsonComments from 'strip-json-comments'
 import { defineConfig } from './'
 
@@ -65,79 +65,18 @@ export async function loadTsupConfig(
       return {}
     }
 
-    const config = await bundleConfig(configPath)
-    return { path: configPath, data: config }
+    const config = await bundleRequire({
+      filepath: configPath,
+    })
+    return {
+      path: configPath,
+      data: config.mod.tsup || config.mod.default || config.mod,
+    }
   }
 
   return {}
 }
 
-function removeFile(filepath: string) {
-  if (fs.existsSync(filepath)) {
-    fs.unlinkSync(filepath)
-  }
-}
-
-async function bundleConfig(configFile: string) {
-  const { build } = await import('esbuild')
-  const outFile = configFile.replace(/\.[a-z]+$/, '.bundled.cjs')
-  const readConfig = () => {
-    delete require.cache[outFile]
-    const result = require(outFile)
-    removeFile(outFile)
-    return result.tsup || result.default || result
-  }
-  try {
-    await build({
-      entryPoints: [configFile],
-      format: 'cjs',
-      outfile: outFile,
-      platform: 'node',
-      bundle: true,
-      plugins: [
-        {
-          name: 'ignore',
-          setup(build) {
-            build.onResolve({ filter: /.*/ }, (args) => {
-              if (!path.isAbsolute(args.path) && !/^[\.\/]/.test(args.path)) {
-                return { external: true }
-              }
-            })
-            build.onLoad(
-              { filter: /\.(js|ts|mjs|cjs|jsx|tsx)$/ },
-              async (args) => {
-                const contents = await fs.promises.readFile(args.path, 'utf8')
-                const ext = path.extname(args.path)
-                return {
-                  contents: contents
-                    .replace(
-                      /\b__dirname\b/g,
-                      JSON.stringify(path.dirname(args.path))
-                    )
-                    .replace(/\b__filename\b/g, JSON.stringify(args.path))
-                    .replace(
-                      /\bimport\.meta\.url\b/g,
-                      JSON.stringify(`file://${args.path}`)
-                    ),
-                  loader:
-                    ext === '.mjs' || ext === '.cjs'
-                      ? 'js'
-                      : (ext.slice(1) as Loader),
-                }
-              }
-            )
-          },
-        },
-      ],
-    })
-    const config = readConfig()
-    return config
-  } catch (error) {
-    removeFile(outFile)
-    throw error
-  }
-}
-
 export async function loadPkg(cwd: string) {
   const { data } = await joycon.load(['package.json'], cwd, path.dirname(cwd))
   return data || {}

src/utils.ts

@@ -2,11 +2,6 @@ import fs from 'fs'
 import glob from 'globby'
 import resolveFrom from 'resolve-from'
 
-// No backslash in path
-function slash(input: string) {
-  return input.replace(/\\/g, '/')
-}
-
 export type External =
   | string
   | RegExp
@@ -108,3 +103,15 @@ export function debouncePromise<T extends unknown[]>(
     }
   }
 }
+
+// Taken from https://github.com/sindresorhus/slash/blob/main/index.js (MIT)
+export function slash(path: string) {
+  const isExtendedLengthPath = /^\\\\\?\\/.test(path)
+  const hasNonAscii = /[^\u0000-\u0080]+/.test(path)
+
+  if (isExtendedLengthPath || hasNonAscii) {
+    return path
+  }
+
+  return path.replace(/\\/g, '/')
+}