fix: vite base config

package.json

@@ -57,8 +57,8 @@
     "watcher": "^2.3.0"
   },
   "devDependencies": {
-    "@minko-fe/eslint-config": "^1.2.33",
-    "@minko-fe/tsconfig": "^1.2.33",
+    "@minko-fe/eslint-config": "^1.2.35",
+    "@minko-fe/tsconfig": "^1.2.35",
     "@types/debug": "^4.1.8",
     "@types/fs-extra": "^11.0.1",
     "@types/mock-fs": "^4.13.1",

playground/spa/public-typescript/manifest.json

@@ -1,5 +1,5 @@
 {
-  "test": "/out/test.e29e5748.js",
-  "haha": "/out/haha.bdaaba63.js",
-  "index": "/out/index.a7db5a4b.js"
+  "test": "/spa/out/test.e29e5748.js",
+  "haha": "/spa/out/haha.bdaaba63.js",
+  "index": "/spa/out/index.e69fd919.js"
 }

playground/spa/src/App.tsx

@@ -1,5 +1,4 @@
 import { useState } from 'react'
-import manifest from '../public-typescript/manifest.json'
 import reactLogo from './assets/react.svg'
 import './App.css'
 

playground/spa/vite.config.ts

@@ -6,6 +6,7 @@ import manifest from './public-typescript/manifest.json'
 
 // https://vitejs.dev/config/
 export default defineConfig((env) => ({
+  base: '/spa',
   define: {
     haha: JSON.stringify('custom define!'),
     app: JSON.stringify({ hello: 'world' }),

src/helper/AbsCacheProcessor.ts

@@ -1,6 +1,7 @@
 import { normalizePath } from 'vite'
 import createDebug from 'debug'
 import type { ManifestCache } from './ManifestCache'
+import type { TGlobalConfig } from './GlobalConfigBuilder'
 
 const debug = createDebug('vite-plugin-public-typescript:AbsCacheProcessor ===> ')
 
@@ -45,23 +46,23 @@ export abstract class AbsCacheProcessor {
     await this.addNewJs({ code, tsFileName, contentHash })
   }
 
-  setCache(
-    args: IAddFile,
-    config: {
-      outputDir: string
-    },
-  ) {
+  setCache(args: IAddFile, config: TGlobalConfig) {
     const { contentHash, code = '', tsFileName } = args
-    const { outputDir } = config
+    const {
+      outputDir,
+      viteConfig: { base },
+    } = config
+
+    const outputDirPrefix = base + outputDir
 
     function getOutputPath(p: string, hash?: string) {
       hash = hash ? `.${hash}` : ''
       return normalizePath(`${p}/${tsFileName}${hash}.js`)
     }
 
-    let outputPath = getOutputPath(outputDir)
+    let outputPath = getOutputPath(outputDirPrefix)
     if (contentHash) {
-      outputPath = getOutputPath(outputDir, contentHash)
+      outputPath = getOutputPath(outputDirPrefix, contentHash)
     }
 
     this.cache.set({

src/helper/FileCacheProcessor.ts

@@ -6,7 +6,7 @@ import { assert } from './assert'
 import { globalConfigBuilder } from './GlobalConfigBuilder'
 import { AbsCacheProcessor } from './AbsCacheProcessor'
 import type { IAddFile, IDeleteFile } from './AbsCacheProcessor'
-import { findAllOldJsFile, writeFile } from './utils'
+import { findAllOldJsFile, stripBase, writeFile } from './utils'
 import type { ManifestCache } from './ManifestCache'
 
 const debug = createDebug('FileCacheProcessor ===> ')
@@ -67,14 +67,14 @@ export class FileCacheProcessor extends AbsCacheProcessor {
   async addNewJs(args: IAddFile): Promise<void> {
     const { code = '' } = args
     const {
-      viteConfig: { publicDir },
+      viteConfig: { publicDir, base },
     } = globalConfigBuilder.get()
 
     const outPath = this.setCache(args, globalConfigBuilder.get())
 
-    const fp = normalizePath(path.join(publicDir, outPath))
+    const fp = normalizePath(path.join(publicDir, stripBase(outPath, base)))
 
-    await fs.ensureDir(path.dirname(fp))
+    fs.ensureDirSync(path.dirname(fp))
 
     writeFile(fp, code)
   }

src/helper/utils.ts

@@ -159,8 +159,14 @@ export function validateOptions(options: Required<VPPTPluginOptions>) {
   }
 }
 
+export function stripBase(path: string, base: string): string {
+  const devBase = base[base.length - 1] === '/' ? base : `${base}/`
+  return path.startsWith(devBase) ? path.slice(devBase.length - 1) : path
+}
+
 // normalize dir path
-export function normalizeDirPath(dir: string) {
+export function normalizeAssetsDirPath(dir: string, base: string) {
+  dir = stripBase(dir, base)
   if (dir.startsWith('/')) {
     dir = dir.slice(1)
   }

src/index.ts

@@ -15,7 +15,7 @@ import {
   findAllOldJsFile,
   getInputDir,
   isEmptyObject,
-  normalizeDirPath,
+  normalizeAssetsDirPath,
   reloadPage,
   removeOldJsFiles,
   validateOptions,
@@ -258,7 +258,7 @@ export default function publicTypescript(options: VPPTPluginOptions = {}) {
           Object.keys(c).forEach((key) => {
             this.emitFile({
               type: 'asset',
-              fileName: normalizeDirPath(`${c[key].path}`),
+              fileName: normalizeAssetsDirPath(`${c[key].path}`, viteConfig.base),
               source: c[key]._code,
             })
           })