@umijs/preset-umi 4.0.87 → 4.0.89

package/dist/features/appData/appData.js

@@ -86,6 +86,7 @@ var appData_default = (api) => {
     memo.globalJS = globalJS;
     memo.overridesCSS = overridesCSS;
     memo.globalLoading = globalLoading;
+    memo.bundler = "webpack";
     const gitDir = findGitDir(api.paths.cwd);
     if (gitDir) {
       const git = {};

package/dist/features/legacy/legacy.js

@@ -86,6 +86,7 @@ var legacy_default = (api) => {
   api.modifyConfig({
     stage: Number.MAX_SAFE_INTEGER,
     fn: (memo) => {
+      var _a, _b;
       const { userConfig } = api;
       const { buildOnly = true, nodeModulesTransform = true } = pluginConfig;
       if (api.env === import_types.Env.development) {
@@ -116,9 +117,10 @@ var legacy_default = (api) => {
       memo.srcTranspiler = import_types.Transpiler.babel;
       memo.jsMinifier = import_types.JSMinifier.terser;
       memo.cssMinifier = import_types.CSSMinifier.cssnano;
+      const ieTarget = ((_a = userConfig.targets) == null ? void 0 : _a.ie) || ((_b = api.config.targets) == null ? void 0 : _b.ie) || 11;
       memo.targets = {
         ...userConfig.targets,
-        ie: 11
+        ie: ieTarget
       };
       import_utils.logger.info(
         `${legacyModeLabel} is enabled, we automatically modify the ${[

package/dist/features/overrides/compileLess.d.ts

@@ -1 +1,7 @@
-export declare function compileLess(lessContent: string, filePath: string, modifyVars?: Record<string, string>, alias?: Record<string, string>): Promise<string>;
+export declare function compileLess(opts: {
+    lessContent: string;
+    filePath: string;
+    modifyVars: Record<string, string>;
+    alias: Record<string, string>;
+    targetPath: string;
+}): Promise<string>;

package/dist/features/overrides/compileLess.js

@@ -33,14 +33,22 @@ __export(compileLess_exports, {
 });
 module.exports = __toCommonJS(compileLess_exports);
 var import_less = __toESM(require("@umijs/bundler-utils/compiled/less"));
-async function compileLess(lessContent, filePath, modifyVars = {}, alias = {}) {
+var import_utils = require("@umijs/utils");
+async function compileLess(opts) {
+  const {
+    lessContent,
+    filePath,
+    modifyVars = {},
+    alias = {},
+    targetPath
+  } = opts;
+  const resolvePlugin = new (require("less-plugin-resolve"))({
+    aliases: alias,
+    urlRewriteTargetPath: (0, import_utils.winPath)(targetPath)
+  });
   const result = await import_less.default.render(lessContent, {
     filename: filePath,
-    plugins: [
-      new (require("less-plugin-resolve"))({
-        aliases: alias
-      })
-    ],
+    plugins: [resolvePlugin],
     javascriptEnabled: true,
     modifyVars
   });

package/dist/features/overrides/{compileLess.manullytest.js → compileLess.testScript.js}

@@ -21,42 +21,53 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// src/features/overrides/compileLess.manullytest.ts
-var import_assert = __toESM(require("assert"));
+// src/features/overrides/compileLess.testScript.ts
 var import_fs = __toESM(require("fs"));
 var import_path = require("path");
 var import_compileLess = require("./compileLess");
 var fixturesDir = (0, import_path.join)(__dirname, "../../../fixtures");
-(async () => {
+var run = async () => {
   const filePath = (0, import_path.join)(fixturesDir, "overrides/less/index.less");
+  const targetPath = (0, import_path.join)(fixturesDir, "overrides/less/output/index.css");
   const modifyVars = {
     "primary-color": "#1DA57A"
   };
   const alias = {
     barbar: (0, import_path.join)(filePath, "../node_modules/bar")
   };
-  const result = await (0, import_compileLess.compileLess)(
-    import_fs.default.readFileSync(filePath, "utf-8"),
+  const content = import_fs.default.readFileSync(filePath, "utf-8");
+  const result = await (0, import_compileLess.compileLess)({
+    lessContent: content,
     filePath,
     modifyVars,
-    alias
-  );
-  (0, import_assert.default)(
-    result.includes(
-      `
+    alias,
+    targetPath
+  });
+  const expectContained = `
 .bar {
   color: red;
 }
 .foo {
   color: red;
 }
+.img {
+  background: url('../assets/img.png');
+}
 .a {
   aaa: green;
   bbb: #1DA57A;
 }
-  `.trim()
-    )
-  );
-})().catch((e) => {
+.img {
+  border-image: url('../assets/img.png');
+}
+`.trim();
+  if (!result.includes(expectContained)) {
+    throw new Error(
+      `result not contains the expect content, result: ${result}`
+    );
+  }
+};
+run().catch((e) => {
   console.error(e);
+  process.exit(1);
 });

package/dist/features/overrides/overrides.js

@@ -40,22 +40,25 @@ var overrides_default = (api) => {
       let content = (0, import_fs.readFileSync)(filePath, "utf-8");
       if (content === cachedContent)
         return;
+      const subPath = "core/overrides.css";
+      const targetPath = (0, import_path.join)(api.paths.absTmpPath, subPath);
       const isLess = filePath.endsWith(".less");
       if (isLess) {
-        content = await (0, import_compileLess.compileLess)(
-          content,
+        content = await (0, import_compileLess.compileLess)({
+          lessContent: content,
           filePath,
-          {
+          modifyVars: {
             ...api.config.theme,
             ...(_a = api.config.lessLoader) == null ? void 0 : _a.modifyVars
           },
-          api.config.alias
-        );
+          alias: api.config.alias,
+          targetPath
+        });
       }
       content = await (0, import_transform.transform)(content, filePath);
       api.writeTmpFile({
-        path: "core/overrides.css",
-        content,
+        path: subPath,
+        content: content || "/* empty */",
         noPluginDir: true
       });
       cachedContent = content;

package/dist/features/overrides/transform.js

@@ -77,7 +77,9 @@ async function transform(cssContent, filePath) {
   const result = await require("postcss")([
     selectorPlugin,
     importPlugin
-  ]).process(cssContent, {});
+  ]).process(cssContent, {
+    from: "overrides.css"
+  });
   return result.css;
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/features/ssr/ssr.js

@@ -80,6 +80,10 @@ var ssr_default = (api) => {
       }
     }
   ]);
+  const serverPackagePath = (0, import_path.dirname)(
+    require.resolve("@umijs/server/package.json")
+  );
+  const ssrTypesPath = (0, import_path.join)(serverPackagePath, "./dist/types");
   api.onGenerateFiles(() => {
     api.writeTmpFile({
       noPluginDir: true,
@@ -110,6 +114,21 @@ export function useServerInsertedHTML(callback: () => React.ReactNode): void {
     addInsertedServerHTMLCallback(callback);
   }
 }
+`
+    });
+    api.writeTmpFile({
+      path: "types.d.ts",
+      content: `
+export type {
+  // server loader
+  IServerLoaderArgs,
+  UmiRequest,
+  ServerLoader,
+  // metadata loader
+  MetadataLoader,
+  IMetadata,
+  IMetaTag,
+} from '${(0, import_utils.winPath)(ssrTypesPath)}'
 `
     });
   });

package/dist/features/ssr/webpack/webpack.js

@@ -33,10 +33,10 @@ __export(webpack_exports, {
 });
 module.exports = __toCommonJS(webpack_exports);
 var bundlerWebpack = __toESM(require("@umijs/bundler-webpack"));
+var import_types = require("@umijs/bundler-webpack/dist/types");
 var import_utils = require("@umijs/utils");
 var import_path = require("path");
 var import_utils2 = require("../utils");
-var import_types = require("@umijs/bundler-webpack/dist/types");
 var build2 = async (api, opts) => {
   import_utils.logger.wait("[SSR] Compiling...");
   const now = (/* @__PURE__ */ new Date()).getTime();
@@ -59,8 +59,10 @@ var build2 = async (api, opts) => {
     memo.target("node");
     memo.name("umi");
     memo.devtool(false);
-    memo.output.path((0, import_path.dirname)(absOutputFile)).filename(useHash ? "umi.[contenthash:8].server.js" : "umi.server.js").chunkFilename(
-      useHash ? "umi.[contenthash:8].server.js" : "umi.server.js"
+    memo.output.path((0, import_path.dirname)(absOutputFile)).filename(
+      useHash ? "[name].[contenthash:8].server.js" : "[name].server.js"
+    ).chunkFilename(
+      useHash ? "[name].[contenthash:8].server.js" : "[name].server.js"
     ).libraryTarget("commonjs2");
     memo.plugins.delete("progress-plugin");
     memo.optimization.minimize(false);

package/dist/features/tmpFiles/routes.js

@@ -156,6 +156,7 @@ async function getRoutes(opts) {
         }) : [];
         if (enableSSR) {
           routes[id].hasServerLoader = exports.includes("serverLoader");
+          routes[id].hasMetadataLoader = exports.includes("metadataLoader");
         }
         if (enableClientLoader && exports.includes("clientLoader")) {
           routes[id].clientLoader = `clientLoaders['${id}']`;

package/dist/features/tmpFiles/tmpFiles.js

@@ -539,6 +539,8 @@ if (process.env.NODE_ENV === 'development') {
         })
       );
       const exports = [];
+      const beforeExports = [];
+      const afterExports = [];
       const exportMembers = ["default"];
       exports.push("// @umijs/renderer-*");
       exports.push(
@@ -547,7 +549,7 @@ if (process.env.NODE_ENV === 'development') {
           exportMembers
         })).join(", ")} } from '${rendererPath}';`
       );
-      exports.push(`export type {  History } from '${rendererPath}'`);
+      exports.push(`export type { History } from '${rendererPath}'`);
       exports.push("// umi/client/client/plugin");
       const umiPluginPath = (0, import_utils.winPath)((0, import_path.join)(umiDir, "client/client/plugin.js"));
       exports.push(
@@ -573,10 +575,14 @@ if (process.env.NODE_ENV === 'development') {
       if (api.config.test !== false && api.appData.framework === "react") {
         if (process.env.NODE_ENV === "test" || // development is for TestBrowser's type
         process.env.NODE_ENV === "development") {
-          exports.push(`export { TestBrowser } from './testBrowser';`);
+          afterExports.push(
+            `// test`,
+            `export { TestBrowser } from './testBrowser';`
+          );
         }
       }
       if (api.appData.framework === "react") {
+        exports.push("// react ssr");
         if (api.config.ssr) {
           exports.push(
             `export { useServerInsertedHTML } from './core/serverInsertedHTMLContext';`
@@ -587,7 +593,7 @@ if (process.env.NODE_ENV === 'development') {
           );
         }
       }
-      exports.push("// plugins");
+      beforeExports.push("// plugins");
       const allPlugins = (0, import_fs.readdirSync)(api.paths.absTmpPath).filter(
         (file) => file.startsWith("plugin-")
       );
@@ -609,19 +615,19 @@ if (process.env.NODE_ENV === 'development') {
           exportMembers
         });
         if (pluginExports.length) {
-          exports.push(
+          beforeExports.push(
             `export { ${pluginExports.join(", ")} } from '${(0, import_utils.winPath)(
               (0, import_path.join)(api.paths.absTmpPath, plugin)
             )}';`
           );
         }
       }
-      exports.push("// plugins types.d.ts");
+      beforeExports.push("// plugins types.d.ts");
       for (const plugin of allPlugins) {
         const file = (0, import_utils.winPath)((0, import_path.join)(api.paths.absTmpPath, plugin, "types.d.ts"));
         if ((0, import_fs.existsSync)(file)) {
           const noSuffixFile = file.replace(/\.ts$/, "");
-          exports.push(`export * from '${noSuffixFile}';`);
+          beforeExports.push(`export * from '${noSuffixFile}';`);
         }
       }
       let pluginIndex = 0;
@@ -652,7 +658,9 @@ if (process.env.NODE_ENV === 'development') {
           runtimeConfigType
         }
       });
-      exports.unshift(
+      beforeExports.unshift(
+        // `app.ts` should be in the first, otherwise it will be circular dependency
+        `// defineApp`,
         `export { defineApp } from './core/defineApp'`,
         // https://javascript.plainenglish.io/leveraging-type-only-imports-and-exports-with-typescript-3-8-5c1be8bd17fb
         `export type { RuntimeConfig } from './core/defineApp'`
@@ -660,7 +668,7 @@ if (process.env.NODE_ENV === 'development') {
       api.writeTmpFile({
         noPluginDir: true,
         path: "exports.ts",
-        content: exports.join("\n")
+        content: [...beforeExports, ...exports, ...afterExports].join("\n")
       });
     },
     stage: 1e4

package/dist/features/vite/vite.js

@@ -32,6 +32,10 @@ var vite_default = (api) => {
     },
     enableBy: api.EnableBy.config
   });
+  api.modifyAppData((memo) => {
+    memo.bundler = "vite";
+    return memo;
+  });
   api.modifyConfig((memo) => {
     memo.alias["@fs"] = api.cwd;
     return memo;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.87",
+  "version": "4.0.89",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -30,7 +30,7 @@
     "enhanced-resolve": "5.9.3",
     "fast-glob": "3.2.12",
     "html-webpack-plugin": "5.5.0",
-    "less-plugin-resolve": "1.0.0",
+    "less-plugin-resolve": "1.0.2",
     "path-to-regexp": "1.7.0",
     "postcss": "^8.4.21",
     "postcss-prefix-selector": "1.16.0",
@@ -39,21 +39,21 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/ast": "4.0.87",
-    "@umijs/bundler-utils": "4.0.87",
-    "@umijs/bundler-vite": "4.0.87",
+    "@umijs/ast": "4.0.89",
+    "@umijs/bundler-esbuild": "4.0.89",
+    "@umijs/bundler-utils": "4.0.89",
+    "@umijs/babel-preset-umi": "4.0.89",
+    "@umijs/bundler-vite": "4.0.89",
+    "@umijs/core": "4.0.89",
+    "@umijs/mfsu": "4.0.89",
+    "@umijs/renderer-react": "4.0.89",
+    "@umijs/bundler-webpack": "4.0.89",
+    "@umijs/plugin-run": "4.0.89",
+    "@umijs/zod2ts": "4.0.89",
+    "@umijs/utils": "4.0.89",
+    "@umijs/server": "4.0.89",
     "@umijs/did-you-know": "1.0.3",
-    "@umijs/core": "4.0.87",
-    "@umijs/bundler-esbuild": "4.0.87",
-    "@umijs/babel-preset-umi": "4.0.87",
-    "@umijs/mfsu": "4.0.87",
-    "@umijs/bundler-webpack": "4.0.87",
-    "@umijs/ui": "3.0.1",
-    "@umijs/renderer-react": "4.0.87",
-    "@umijs/utils": "4.0.87",
-    "@umijs/server": "4.0.87",
-    "@umijs/zod2ts": "4.0.87",
-    "@umijs/plugin-run": "4.0.87"
+    "@umijs/ui": "3.0.1"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",