refactor: compatible with windows os

umijs · Sep 7, 2023 · c22d1c1 · c22d1c1
1 parent 973e231
commit c22d1c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/builder/bundless/loaders/index.ts b/src/builder/bundless/loaders/index.ts
@@ -1,3 +1,4 @@
+import { winPath } from '@umijs/utils';
 import fs from 'fs';
 import { runLoaders } from 'loader-runner';
 import type { IApi } from '../../../types';
@@ -63,6 +64,7 @@ export default async (
   const cacheRet = await cache.get(cacheKey, '');
 
   // use cache first
+  /* istanbul ignore if -- @preserve */
   if (cacheRet) {
     const tsconfig = /\.tsx?$/.test(fileAbsPath)
       ? getTsconfig(opts.cwd)
@@ -75,7 +77,7 @@ export default async (
         // FIXME: shit code for avoid invalid declaration value when tsconfig changed
         declaration:
           tsconfig?.options.declaration &&
-          tsconfig?.fileNames.includes(fileAbsPath),
+          tsconfig?.fileNames.includes(winPath(fileAbsPath)),
       },
     });
   }

diff --git a/src/builder/bundless/loaders/javascript/index.ts b/src/builder/bundless/loaders/javascript/index.ts
@@ -1,3 +1,4 @@
+import { winPath } from '@umijs/utils';
 import { getTsconfig } from '../../dts';
 import type { IBundlessLoader, IJSTransformer, ILoaderOutput } from '../types';
 
@@ -37,7 +38,7 @@ const jsLoader: IBundlessLoader = function (content) {
     : undefined;
   if (
     tsconfig?.options.declaration &&
-    tsconfig?.fileNames.includes(this.resource)
+    tsconfig?.fileNames.includes(winPath(this.resource))
   ) {
     outputOpts.declaration = true;
   }