@umijs/preset-umi 4.2.9 → 4.2.10

package/dist/commands/dev/dev.js

@@ -271,6 +271,7 @@ PORT=8888 umi dev
       };
       if (((_b = api.config.mfsu) == null ? void 0 : _b.strategy) === "eager") {
         srcCodeCache = new import_LazySourceCodeCache.LazySourceCodeCache({
+          root: api.paths.cwd,
           cwd: api.paths.absSrcPath,
           cachePath: (0, import_path.join)(
             api.paths.absNodeModulesPath,

package/dist/commands/mfsu/util.js

@@ -93,6 +93,7 @@ var MFSUUtilBase = class {
     };
     if (((_a = api.config.mfsu) == null ? void 0 : _a.strategy) === "eager") {
       srcCodeCache = new import_LazySourceCodeCache.LazySourceCodeCache({
+        root: api.paths.cwd,
         cwd: api.paths.absSrcPath,
         cachePath: (0, import_path.join)(
           api.paths.absNodeModulesPath,

package/dist/features/prepare/build.js

@@ -35,13 +35,16 @@ module.exports = __toCommonJS(build_exports);
 var import_watchRebuild = require("@umijs/bundler-esbuild/dist/plugins/watchRebuild");
 var import_esbuild = __toESM(require("@umijs/bundler-utils/compiled/esbuild"));
 var import_utils = require("@umijs/utils");
+var import_fs = require("fs");
 var import_path = __toESM(require("path"));
+var import_constant = require("../../libs/folderCache/constant");
 var import_esbuildAliasPlugin = require("./esbuildPlugins/esbuildAliasPlugin");
 var import_esbuildExternalPlugin = require("./esbuildPlugins/esbuildExternalPlugin");
 async function build(opts) {
   var _a;
   const outdir = import_path.default.join(import_path.default.dirname(opts.entryPoints[0]), "out");
   const alias = ((_a = opts.config) == null ? void 0 : _a.alias) || {};
+  const tsconfig = (0, import_fs.existsSync)(import_path.default.join(opts.config.cwd, "tsconfig.json")) ? "tsconfig.json" : void 0;
   const buildOptions = {
     // 需要指定 absWorkingDir 兼容 APP_ROOT 的情况
     absWorkingDir: opts.config.cwd,
@@ -50,13 +53,14 @@ async function build(opts) {
     target: "esnext",
     loader: {
       // use tsx loader for js/jsx/ts/tsx files
-      // since only ts support decorator
-      ...possibleExtUsingEmptyLoader,
+      // since only ts support paramDecorator
+      ...import_constant.possibleExtUsingEmptyLoader,
       ".js": "tsx",
       ".jsx": "tsx",
       ".ts": "ts",
       ".tsx": "tsx"
     },
+    tsconfig,
     // do I need this?
     // incremental: true,
     bundle: true,
@@ -98,36 +102,6 @@ async function build(opts) {
     return [result, void 0];
   }
 }
-var possibleExtUsingEmptyLoader = {
-  ".aac": "empty",
-  ".css": "empty",
-  ".less": "empty",
-  ".sass": "empty",
-  ".scss": "empty",
-  ".eot": "empty",
-  ".flac": "empty",
-  ".gif": "empty",
-  ".htm": "empty",
-  ".html": "empty",
-  ".ico": "empty",
-  ".icon": "empty",
-  ".jpeg": "empty",
-  ".jpg": "empty",
-  ".empty": "empty",
-  ".mdx": "empty",
-  ".mp3": "empty",
-  ".mp4": "empty",
-  ".ogg": "empty",
-  ".otf": "empty",
-  ".png": "empty",
-  ".svg": "empty",
-  ".ttf": "empty",
-  ".wav": "empty",
-  ".webm": "empty",
-  ".webp": "empty",
-  ".woff": "empty",
-  ".woff2": "empty"
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   build

package/dist/libs/folderCache/LazySourceCodeCache.d.ts

@@ -13,9 +13,12 @@ export declare class LazySourceCodeCache {
     private ignores;
     fileContentCache: FileContentCache;
     private pendingFilesEvents;
+    private root;
+    private tsConfigRaw;
     constructor(opts: {
         cwd: string;
         cachePath: string;
+        root: string;
     });
     init(files: string[]): Promise<void>;
     initWithScan(): Promise<void>;

package/dist/libs/folderCache/LazySourceCodeCache.js

@@ -46,6 +46,8 @@ var LazySourceCodeCache = class {
     this.ignores = import_constant.DEFAULT_SRC_IGNORES;
     this.fileContentCache = {};
     this.pendingFilesEvents = [];
+    this.tsConfigRaw = "{}";
+    this.root = opts.root;
     this.srcPath = opts.cwd;
     this.cachePath = opts.cachePath;
     this.folderWatch = new import_FolderWatch.FolderWatch({
@@ -57,6 +59,16 @@ var LazySourceCodeCache = class {
     this.folderWatch.listen((e) => {
       this.pendingFilesEvents.push(e);
     });
+    try {
+      this.tsConfigRaw = (0, import_fs.readFileSync)(
+        (0, import_path.join)(this.root, "tsconfig.json"),
+        "utf-8"
+      );
+    } catch (e) {
+      import_utils.logger.debug(
+        "load project tsconfig.json failed, fallback to empty config"
+      );
+    }
   }
   async init(files) {
     await Promise.all([import_es_module_lexer.init, this.folderWatch.init()]);
@@ -156,7 +168,8 @@ var LazySourceCodeCache = class {
     const loaded = {};
     await esbuildTransform(files, {
       srcPath: this.srcPath,
-      cachePath: this.cachePath
+      cachePath: this.cachePath,
+      tsconfigRaw: this.tsConfigRaw
     });
     for (const f of files) {
       let newFile = (0, import_path.join)(this.cachePath, (0, import_path.relative)(this.srcPath, f));
@@ -177,12 +190,13 @@ async function esbuildTransform(files, opts) {
       outdir: opts.cachePath,
       outbase: opts.srcPath,
       loader: {
+        ...import_constant.possibleExtUsingEmptyLoader,
         // in case some js using some feature, eg: decorator
         ".js": "tsx",
         ".jsx": "tsx"
       },
       logLevel: "error",
-      tsconfig: (0, import_path.join)(__dirname, "empty.tsconfig.json")
+      tsconfigRaw: opts.tsconfigRaw
     });
   } catch (e) {
     if (((_a = e.errors) == null ? void 0 : _a.length) || ((_b = e.warnings) == null ? void 0 : _b.length)) {

package/dist/libs/folderCache/constant.d.ts

@@ -1 +1,31 @@
 export declare const DEFAULT_SRC_IGNORES: string[];
+export declare const possibleExtUsingEmptyLoader: {
+    readonly '.aac': "empty";
+    readonly '.css': "empty";
+    readonly '.less': "empty";
+    readonly '.sass': "empty";
+    readonly '.scss': "empty";
+    readonly '.eot': "empty";
+    readonly '.flac': "empty";
+    readonly '.gif': "empty";
+    readonly '.htm': "empty";
+    readonly '.html': "empty";
+    readonly '.ico': "empty";
+    readonly '.icon': "empty";
+    readonly '.jpeg': "empty";
+    readonly '.jpg': "empty";
+    readonly '.empty': "empty";
+    readonly '.mdx': "empty";
+    readonly '.mp3': "empty";
+    readonly '.mp4': "empty";
+    readonly '.ogg': "empty";
+    readonly '.otf': "empty";
+    readonly '.png': "empty";
+    readonly '.svg': "empty";
+    readonly '.ttf': "empty";
+    readonly '.wav': "empty";
+    readonly '.webm': "empty";
+    readonly '.webp': "empty";
+    readonly '.woff': "empty";
+    readonly '.woff2': "empty";
+};

package/dist/libs/folderCache/constant.js

@@ -19,7 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/libs/folderCache/constant.ts
 var constant_exports = {};
 __export(constant_exports, {
-  DEFAULT_SRC_IGNORES: () => DEFAULT_SRC_IGNORES
+  DEFAULT_SRC_IGNORES: () => DEFAULT_SRC_IGNORES,
+  possibleExtUsingEmptyLoader: () => possibleExtUsingEmptyLoader
 });
 module.exports = __toCommonJS(constant_exports);
 var DEFAULT_SRC_IGNORES = [
@@ -35,7 +36,38 @@ var DEFAULT_SRC_IGNORES = [
   "**/jest.config.{ts,js}",
   "**/jest-setup.{ts,js}"
 ];
+var possibleExtUsingEmptyLoader = {
+  ".aac": "empty",
+  ".css": "empty",
+  ".less": "empty",
+  ".sass": "empty",
+  ".scss": "empty",
+  ".eot": "empty",
+  ".flac": "empty",
+  ".gif": "empty",
+  ".htm": "empty",
+  ".html": "empty",
+  ".ico": "empty",
+  ".icon": "empty",
+  ".jpeg": "empty",
+  ".jpg": "empty",
+  ".empty": "empty",
+  ".mdx": "empty",
+  ".mp3": "empty",
+  ".mp4": "empty",
+  ".ogg": "empty",
+  ".otf": "empty",
+  ".png": "empty",
+  ".svg": "empty",
+  ".ttf": "empty",
+  ".wav": "empty",
+  ".webm": "empty",
+  ".webp": "empty",
+  ".woff": "empty",
+  ".woff2": "empty"
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  DEFAULT_SRC_IGNORES
+  DEFAULT_SRC_IGNORES,
+  possibleExtUsingEmptyLoader
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.2.9",
+  "version": "4.2.10",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -21,7 +21,7 @@
   "dependencies": {
     "@iconify/utils": "2.1.1",
     "@svgr/core": "6.5.1",
-    "@umijs/bundler-mako": "0.5.3",
+    "@umijs/bundler-mako": "0.5.4",
     "@umijs/es-module-parser": "0.0.7",
     "@umijs/history": "5.3.1",
     "babel-plugin-dynamic-import-node": "2.3.3",
@@ -41,21 +41,21 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/ast": "4.2.9",
-    "@umijs/babel-preset-umi": "4.2.9",
-    "@umijs/bundler-esbuild": "4.2.9",
-    "@umijs/bundler-utils": "4.2.9",
-    "@umijs/bundler-vite": "4.2.9",
-    "@umijs/bundler-webpack": "4.2.9",
-    "@umijs/core": "4.2.9",
+    "@umijs/ast": "4.2.10",
+    "@umijs/bundler-esbuild": "4.2.10",
+    "@umijs/babel-preset-umi": "4.2.10",
+    "@umijs/bundler-utils": "4.2.10",
+    "@umijs/bundler-vite": "4.2.10",
+    "@umijs/core": "4.2.10",
+    "@umijs/bundler-webpack": "4.2.10",
     "@umijs/did-you-know": "1.0.3",
-    "@umijs/mfsu": "4.2.9",
-    "@umijs/plugin-run": "4.2.9",
-    "@umijs/renderer-react": "4.2.9",
-    "@umijs/server": "4.2.9",
+    "@umijs/mfsu": "4.2.10",
+    "@umijs/renderer-react": "4.2.10",
+    "@umijs/plugin-run": "4.2.10",
+    "@umijs/server": "4.2.10",
     "@umijs/ui": "3.0.1",
-    "@umijs/utils": "4.2.9",
-    "@umijs/zod2ts": "4.2.9"
+    "@umijs/utils": "4.2.10",
+    "@umijs/zod2ts": "4.2.10"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",