@umijs/core 4.0.9 → 4.0.12

package/dist/config/config.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// config.ts
+// src/config/config.ts
 var config_exports = {};
 __export(config_exports, {
   Config: () => Config

package/dist/config/utils.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// utils.ts
+// src/config/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
   addExt: () => addExt,

package/dist/constants.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// constants.ts
+// src/constants.ts
 var constants_exports = {};
 __export(constants_exports, {
   DEFAULT_CONFIG_FILES: () => DEFAULT_CONFIG_FILES,

package/dist/index.js

@@ -17,7 +17,7 @@ var __copyProps = (to, from, except, desc) => {
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// index.ts
+// src/index.ts
 var src_exports = {};
 __export(src_exports, {
   Env: () => import_types.Env,

package/dist/route/defineRoutes.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// defineRoutes.ts
+// src/route/defineRoutes.ts
 var defineRoutes_exports = {};
 __export(defineRoutes_exports, {
   defineRoutes: () => defineRoutes

package/dist/route/route.js

@@ -13,7 +13,7 @@ var __copyProps = (to, from, except, desc) => {
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// route.ts
+// src/route/route.ts
 var route_exports = {};
 module.exports = __toCommonJS(route_exports);
 __reExport(route_exports, require("./routesConfig"), module.exports);

package/dist/route/routeUtils.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// routeUtils.ts
+// src/route/routeUtils.ts
 var routeUtils_exports = {};
 __export(routeUtils_exports, {
   addParentRoute: () => addParentRoute

package/dist/route/routesConfig.js

@@ -48,7 +48,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// routesConfig.ts
+// src/route/routesConfig.ts
 var routesConfig_exports = {};
 __export(routesConfig_exports, {
   getConfigRoutes: () => getConfigRoutes
@@ -82,7 +82,7 @@ function transformRoute(opts) {
   let absPath = opts.route.path;
   if ((absPath == null ? void 0 : absPath.charAt(0)) !== "/") {
     const parentAbsPath = opts.parentId ? opts.memo.ret[opts.parentId].absPath.replace(/\/+$/, "/") : "/";
-    absPath = parentAbsPath + absPath;
+    absPath = `${parentAbsPath}${endsWithStar(parentAbsPath) ? "" : absPath}`;
   }
   opts.memo.ret[id] = __spreadProps(__spreadValues(__spreadProps(__spreadValues({}, routeProps), {
     path: opts.route.path
@@ -98,15 +98,20 @@ function transformRoute(opts) {
   if (wrappers == null ? void 0 : wrappers.length) {
     let parentId = opts.parentId;
     let path = opts.route.path;
+    let layout = opts.route.layout;
     wrappers.forEach((wrapper) => {
       const { id: id2 } = transformRoute({
-        route: { path, component: wrapper, isWrapper: true },
+        route: __spreadValues({
+          path,
+          component: wrapper,
+          isWrapper: true
+        }, layout === false ? { layout: false } : {}),
         parentId,
         memo: opts.memo,
         onResolveComponent: opts.onResolveComponent
       });
       parentId = id2;
-      path = "";
+      path = endsWithStar(path) ? "*" : "";
     });
     opts.memo.ret[id].parentId = parentId;
     opts.memo.ret[id].path = path;
@@ -122,6 +127,9 @@ function transformRoute(opts) {
   }
   return { id };
 }
+function endsWithStar(str) {
+  return str.endsWith("*");
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getConfigRoutes

package/dist/route/routesConvention.js

@@ -33,7 +33,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// routesConvention.ts
+// src/route/routesConvention.ts
 var routesConvention_exports = {};
 __export(routesConvention_exports, {
   getConventionRoutes: () => getConventionRoutes

package/dist/route/utils.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// utils.ts
+// src/route/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
   byLongestFirst: () => byLongestFirst,

package/dist/service/command.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// command.ts
+// src/service/command.ts
 var command_exports = {};
 __export(command_exports, {
   Command: () => Command

package/dist/service/env.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// env.ts
+// src/service/env.ts
 var env_exports = {};
 __export(env_exports, {
   loadEnv: () => loadEnv

package/dist/service/generatePlugin.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// generatePlugin.ts
+// src/service/generatePlugin.ts
 var generatePlugin_exports = {};
 __export(generatePlugin_exports, {
   default: () => generatePlugin_default

package/dist/service/generator.js

@@ -30,7 +30,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// generator.ts
+// src/service/generator.ts
 var generator_exports = {};
 __export(generator_exports, {
   GeneratorType: () => GeneratorType,

package/dist/service/hook.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// hook.ts
+// src/service/hook.ts
 var hook_exports = {};
 __export(hook_exports, {
   Hook: () => Hook

package/dist/service/path.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// path.ts
+// src/service/path.ts
 var path_exports = {};
 __export(path_exports, {
   getPaths: () => getPaths

package/dist/service/plugin.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// plugin.ts
+// src/service/plugin.ts
 var plugin_exports = {};
 __export(plugin_exports, {
   Plugin: () => Plugin

package/dist/service/pluginAPI.js

@@ -36,7 +36,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// pluginAPI.ts
+// src/service/pluginAPI.ts
 var pluginAPI_exports = {};
 __export(pluginAPI_exports, {
   PluginAPI: () => PluginAPI

package/dist/service/service.js

@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// service.ts
+// src/service/service.ts
 var service_exports = {};
 __export(service_exports, {
   Service: () => Service

package/dist/service/servicePlugin.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// servicePlugin.ts
+// src/service/servicePlugin.ts
 var servicePlugin_exports = {};
 __export(servicePlugin_exports, {
   default: () => servicePlugin_default

package/dist/service/utils.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// utils.ts
+// src/service/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
   isPromise: () => isPromise,

package/dist/types.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// types.ts
+// src/types.ts
 var types_exports = {};
 __export(types_exports, {
   ApplyPluginsType: () => ApplyPluginsType,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/core",
-  "version": "4.0.9",
+  "version": "4.0.12",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/core#readme",
   "bugs": "https://github.com/umijs/umi/issues",
   "repository": {
@@ -21,8 +21,8 @@
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.9",
-    "@umijs/utils": "4.0.9"
+    "@umijs/bundler-utils": "4.0.12",
+    "@umijs/utils": "4.0.12"
   },
   "devDependencies": {
     "dotenv": "16.0.0",