@umijs/core 4.0.11 → 4.0.14

package/dist/route/defineRoutes.js

@@ -33,7 +33,7 @@ function defineRoutes(callback) {
     const parentAbsPath = parentRoute == null ? void 0 : parentRoute.absPath;
     const absPath = [parentAbsPath, opts.path].join("/");
     const route = {
-      path: opts.path || "/",
+      path: absPath === "/" ? "/" : opts.path,
       id: (0, import_utils.createRouteId)(opts.file),
       parentId,
       file: opts.file,

package/dist/route/routesConfig.js

@@ -98,9 +98,14 @@ 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

package/dist/service/service.js

@@ -185,11 +185,13 @@ var Service = class {
     this.pkg = pkg;
     this.pkgPath = pkgPath || (0, import_path.join)(this.cwd, "package.json");
     const prefix = this.opts.frameworkName || import_constants.DEFAULT_FRAMEWORK_NAME;
+    const specifiedEnv = process.env[`${prefix}_ENV`.toUpperCase()];
+    (0, import_assert.default)(!specifiedEnv || specifiedEnv && !Object.values(import_constants.SHORT_ENV).includes(specifiedEnv), `${import_utils.chalk.yellow(Object.values(import_constants.SHORT_ENV).join(", "))} config files will be auto loaded by env, Do not configure ${import_utils.chalk.cyan(`process.env.${prefix}_ENV`)} with these values`);
     const configManager = new import_config.Config({
       cwd: this.cwd,
       env: this.env,
       defaultConfigFiles: this.opts.defaultConfigFiles,
-      specifiedEnv: process.env[`${prefix}_ENV`.toUpperCase()]
+      specifiedEnv
     });
     this.configManager = configManager;
     this.userConfig = configManager.getUserConfig().config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/core",
-  "version": "4.0.11",
+  "version": "4.0.14",
   "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.11",
-    "@umijs/utils": "4.0.11"
+    "@umijs/bundler-utils": "4.0.14",
+    "@umijs/utils": "4.0.14"
   },
   "devDependencies": {
     "dotenv": "16.0.0",