@umijs/core 4.0.9 → 4.0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
19
19
  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));
20
20
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
21
21
 
22
- // config.ts
22
+ // src/config/config.ts
23
23
  var config_exports = {};
24
24
  __export(config_exports, {
25
25
  Config: () => Config
@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
18
 
19
- // utils.ts
19
+ // src/config/utils.ts
20
20
  var utils_exports = {};
21
21
  __export(utils_exports, {
22
22
  addExt: () => addExt,
package/dist/constants.js CHANGED
@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
18
 
19
- // constants.ts
19
+ // src/constants.ts
20
20
  var constants_exports = {};
21
21
  __export(constants_exports, {
22
22
  DEFAULT_CONFIG_FILES: () => DEFAULT_CONFIG_FILES,
package/dist/index.js CHANGED
@@ -17,7 +17,7 @@ var __copyProps = (to, from, except, desc) => {
17
17
  var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
18
18
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
19
 
20
- // index.ts
20
+ // src/index.ts
21
21
  var src_exports = {};
22
22
  __export(src_exports, {
23
23
  Env: () => import_types.Env,
@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
18
 
19
- // defineRoutes.ts
19
+ // src/route/defineRoutes.ts
20
20
  var defineRoutes_exports = {};
21
21
  __export(defineRoutes_exports, {
22
22
  defineRoutes: () => defineRoutes
@@ -13,7 +13,7 @@ var __copyProps = (to, from, except, desc) => {
13
13
  var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
14
14
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
15
15
 
16
- // route.ts
16
+ // src/route/route.ts
17
17
  var route_exports = {};
18
18
  module.exports = __toCommonJS(route_exports);
19
19
  __reExport(route_exports, require("./routesConfig"), module.exports);
@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
18
 
19
- // routeUtils.ts
19
+ // src/route/routeUtils.ts
20
20
  var routeUtils_exports = {};
21
21
  __export(routeUtils_exports, {
22
22
  addParentRoute: () => addParentRoute
@@ -48,7 +48,7 @@ var __copyProps = (to, from, except, desc) => {
48
48
  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));
49
49
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
50
50
 
51
- // routesConfig.ts
51
+ // src/route/routesConfig.ts
52
52
  var routesConfig_exports = {};
53
53
  __export(routesConfig_exports, {
54
54
  getConfigRoutes: () => getConfigRoutes
@@ -82,7 +82,7 @@ function transformRoute(opts) {
82
82
  let absPath = opts.route.path;
83
83
  if ((absPath == null ? void 0 : absPath.charAt(0)) !== "/") {
84
84
  const parentAbsPath = opts.parentId ? opts.memo.ret[opts.parentId].absPath.replace(/\/+$/, "/") : "/";
85
- absPath = parentAbsPath + absPath;
85
+ absPath = `${parentAbsPath}${endsWithStar(parentAbsPath) ? "" : absPath}`;
86
86
  }
87
87
  opts.memo.ret[id] = __spreadProps(__spreadValues(__spreadProps(__spreadValues({}, routeProps), {
88
88
  path: opts.route.path
@@ -106,7 +106,7 @@ function transformRoute(opts) {
106
106
  onResolveComponent: opts.onResolveComponent
107
107
  });
108
108
  parentId = id2;
109
- path = "";
109
+ path = endsWithStar(path) ? "*" : "";
110
110
  });
111
111
  opts.memo.ret[id].parentId = parentId;
112
112
  opts.memo.ret[id].path = path;
@@ -122,6 +122,9 @@ function transformRoute(opts) {
122
122
  }
123
123
  return { id };
124
124
  }
125
+ function endsWithStar(str) {
126
+ return str.endsWith("*");
127
+ }
125
128
  // Annotate the CommonJS export names for ESM import in node:
126
129
  0 && (module.exports = {
127
130
  getConfigRoutes
@@ -33,7 +33,7 @@ var __copyProps = (to, from, except, desc) => {
33
33
  };
34
34
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
35
35
 
36
- // routesConvention.ts
36
+ // src/route/routesConvention.ts
37
37
  var routesConvention_exports = {};
38
38
  __export(routesConvention_exports, {
39
39
  getConventionRoutes: () => getConventionRoutes
@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
18
 
19
- // utils.ts
19
+ // src/route/utils.ts
20
20
  var utils_exports = {};
21
21
  __export(utils_exports, {
22
22
  byLongestFirst: () => byLongestFirst,
@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
18
 
19
- // command.ts
19
+ // src/service/command.ts
20
20
  var command_exports = {};
21
21
  __export(command_exports, {
22
22
  Command: () => Command
@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
18
 
19
- // env.ts
19
+ // src/service/env.ts
20
20
  var env_exports = {};
21
21
  __export(env_exports, {
22
22
  loadEnv: () => loadEnv
@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
18
 
19
- // generatePlugin.ts
19
+ // src/service/generatePlugin.ts
20
20
  var generatePlugin_exports = {};
21
21
  __export(generatePlugin_exports, {
22
22
  default: () => generatePlugin_default
@@ -30,7 +30,7 @@ var __copyProps = (to, from, except, desc) => {
30
30
  };
31
31
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
32
32
 
33
- // generator.ts
33
+ // src/service/generator.ts
34
34
  var generator_exports = {};
35
35
  __export(generator_exports, {
36
36
  GeneratorType: () => GeneratorType,
@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
19
19
  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));
20
20
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
21
21
 
22
- // hook.ts
22
+ // src/service/hook.ts
23
23
  var hook_exports = {};
24
24
  __export(hook_exports, {
25
25
  Hook: () => Hook
@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
18
 
19
- // path.ts
19
+ // src/service/path.ts
20
20
  var path_exports = {};
21
21
  __export(path_exports, {
22
22
  getPaths: () => getPaths
@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
19
19
  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));
20
20
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
21
21
 
22
- // plugin.ts
22
+ // src/service/plugin.ts
23
23
  var plugin_exports = {};
24
24
  __export(plugin_exports, {
25
25
  Plugin: () => Plugin
@@ -36,7 +36,7 @@ var __copyProps = (to, from, except, desc) => {
36
36
  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));
37
37
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
38
38
 
39
- // pluginAPI.ts
39
+ // src/service/pluginAPI.ts
40
40
  var pluginAPI_exports = {};
41
41
  __export(pluginAPI_exports, {
42
42
  PluginAPI: () => PluginAPI
@@ -19,7 +19,7 @@ var __copyProps = (to, from, except, desc) => {
19
19
  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));
20
20
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
21
21
 
22
- // service.ts
22
+ // src/service/service.ts
23
23
  var service_exports = {};
24
24
  __export(service_exports, {
25
25
  Service: () => Service
@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
18
 
19
- // servicePlugin.ts
19
+ // src/service/servicePlugin.ts
20
20
  var servicePlugin_exports = {};
21
21
  __export(servicePlugin_exports, {
22
22
  default: () => servicePlugin_default
@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
18
 
19
- // utils.ts
19
+ // src/service/utils.ts
20
20
  var utils_exports = {};
21
21
  __export(utils_exports, {
22
22
  isPromise: () => isPromise,
package/dist/types.js CHANGED
@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
16
16
  };
17
17
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
18
 
19
- // types.ts
19
+ // src/types.ts
20
20
  var types_exports = {};
21
21
  __export(types_exports, {
22
22
  ApplyPluginsType: () => ApplyPluginsType,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@umijs/core",
3
- "version": "4.0.9",
3
+ "version": "4.0.10",
4
4
  "homepage": "https://github.com/umijs/umi/tree/master/packages/core#readme",
5
5
  "bugs": "https://github.com/umijs/umi/issues",
6
6
  "repository": {
@@ -21,8 +21,8 @@
21
21
  "test": "umi-scripts jest-turbo"
22
22
  },
23
23
  "dependencies": {
24
- "@umijs/bundler-utils": "4.0.9",
25
- "@umijs/utils": "4.0.9"
24
+ "@umijs/bundler-utils": "4.0.10",
25
+ "@umijs/utils": "4.0.10"
26
26
  },
27
27
  "devDependencies": {
28
28
  "dotenv": "16.0.0",