@umijs/preset-umi 4.0.1 → 4.0.2

package/dist/features/configPlugins/schema.d.ts

@@ -1,2 +1,2 @@
-import type { Root } from '@umijs/core/compiled/@hapi/joi';
+import type { Root } from '@umijs/utils/compiled/@hapi/joi';
 export declare function getSchemas(): Record<string, (Joi: Root) => any>;

package/dist/features/configPlugins/schema.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSchemas = void 0;
+// sort-object-keys
 const utils_1 = require("@umijs/utils");
 function getSchemas() {
     return {

package/dist/features/ssr/ssr.js

@@ -4,7 +4,6 @@ const types_1 = require("@umijs/core/dist/types");
 const utils_1 = require("@umijs/utils");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const builder_1 = require("./builder/builder");
 const utils_2 = require("./utils");
 exports.default = (api) => {
     api.describe({
@@ -52,7 +51,8 @@ export { React };
         });
     });
     api.onBeforeCompiler(async () => {
-        await (0, builder_1.build)({
+        const { build } = (0, utils_1.importLazy)(require.resolve('./builder/builder'));
+        await build({
             api,
             watch: api.env === 'development',
         });

package/dist/features/tmpFiles/configTypes.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const joi_1 = __importDefault(require("@umijs/core/compiled/@hapi/joi"));
+const joi_1 = __importDefault(require("@umijs/utils/compiled/@hapi/joi"));
 // @ts-ignore
 const joi2types_1 = __importDefault(require("../../../compiled/joi2types"));
 exports.default = (api) => {

package/dist/features/tmpFiles/routes.js

@@ -159,7 +159,7 @@ exports.getRoutes = getRoutes;
 async function getRouteComponents(opts) {
     const imports = Object.keys(opts.routes)
         .map((key) => {
-        const useSuspense = true; // opts.api.appData.react.version.startsWith('18.');
+        const useSuspense = opts.api.appData.framework === 'react' ? true : false; // opts.api.appData.react.version.startsWith('18.');
         const route = opts.routes[key];
         if (!route.file) {
             return useSuspense

package/dist/features/tmpFiles/tmpFiles.js

@@ -302,6 +302,7 @@ export default function EmptyRoute() {
             path: 'core/route.tsx',
             tplPath: (0, path_1.join)(constants_1.TEMPLATES_DIR, 'route.tpl'),
             context: {
+                isReact: api.appData.framework === 'react',
                 isClientLoaderEnabled: !!api.config.clientLoader,
                 routes: JSON.stringify(clonedRoutes)
                     // "clientLoaders['foo']" > clientLoaders['foo']

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -21,20 +21,20 @@
   "scripts": {
     "build": "pnpm tsc",
     "build:deps": "umi-scripts bundleDeps",
-    "dev": "pnpm build -- --watch",
+    "dev": "pnpm build --watch",
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
     "@types/multer": "1.4.7",
-    "@umijs/ast": "4.0.1",
-    "@umijs/babel-preset-umi": "4.0.1",
-    "@umijs/bundler-utils": "4.0.1",
-    "@umijs/bundler-vite": "4.0.1",
-    "@umijs/bundler-webpack": "4.0.1",
-    "@umijs/core": "4.0.1",
-    "@umijs/renderer-react": "4.0.1",
-    "@umijs/server": "4.0.1",
-    "@umijs/utils": "4.0.1",
+    "@umijs/ast": "4.0.2",
+    "@umijs/babel-preset-umi": "4.0.2",
+    "@umijs/bundler-utils": "4.0.2",
+    "@umijs/bundler-vite": "4.0.2",
+    "@umijs/bundler-webpack": "4.0.2",
+    "@umijs/core": "4.0.2",
+    "@umijs/renderer-react": "4.0.2",
+    "@umijs/server": "4.0.2",
+    "@umijs/utils": "4.0.2",
     "core-js": "3.22.4",
     "current-script-polyfill": "1.0.0",
     "enhanced-resolve": "5.9.3",

package/templates/route.tpl

@@ -1,7 +1,9 @@
 {{#isClientLoaderEnabled}}
 import clientLoaders from './loaders.js';
 {{/isClientLoaderEnabled}}
+{{#isReact}}
 import React from 'react';
+{{/isReact}}
 
 export async function getRoutes() {
   return {