@umijs/preset-umi 4.0.70 → 4.0.71

package/dist/commands/build.js

@@ -130,6 +130,9 @@ umi build --clean
       let stats;
       if (api.config.vite) {
         stats = await bundlerVite.build(opts);
+      } else if (process.env.OKAM) {
+        const { build } = require(process.env.OKAM);
+        stats = await build(opts);
       } else {
         const absOutputPath = (0, import_path.resolve)(
           opts.cwd,

package/dist/commands/generators/prettier.js

@@ -43,9 +43,9 @@ var prettier_default = (api) => {
     fn: async () => {
       const h = new import_utils2.GeneratorHelper(api);
       h.addDevDeps({
-        prettier: "^2",
-        "prettier-plugin-organize-imports": "^2",
-        "prettier-plugin-packagejson": "^2"
+        prettier: "^2.8.8",
+        "prettier-plugin-organize-imports": "^3.2.2",
+        "prettier-plugin-packagejson": "^2.4.3"
       });
       (0, import_fs.writeFileSync)(
         (0, import_path.join)(api.cwd, ".prettierrc"),

package/dist/features/esbuildHelperChecker/esbuildHelperChecker.js

@@ -98,6 +98,8 @@ var esbuildHelperChecker_default = (api) => {
     }
   });
   api.onBuildComplete(async ({ err }) => {
+    if (process.env.OKAM)
+      return;
     if (err)
       return;
     const jsMinifier = api.config.jsMinifier || "esbuild";

package/dist/features/icons/icons.js

@@ -323,7 +323,7 @@ interface IUmiIconProps extends React.SVGAttributes<SVGElement> {
 }
 
 export const Icon = React.forwardRef<HTMLSpanElement, IUmiIconProps>((props, ref) => {
-  const { icon, hover, style, className = '' , rotate, flip, ...extraProps } = props;
+  const { icon, hover, style, className = '' , rotate, spin, flip, ...extraProps } = props;
   const iconName = normalizeIconName(alias[icon] || icon);
   const Component = iconsMap[iconName];
   if (!Component) {
@@ -331,7 +331,7 @@ export const Icon = React.forwardRef<HTMLSpanElement, IUmiIconProps>((props, ref
     return null;
   }
   const HoverComponent = hover ? iconsMap[normalizeIconName(alias[hover] || hover)] : null;
-  const cls = props.spin ? 'umiIconLoadingCircle' : undefined;
+  const cls = spin ? 'umiIconLoadingCircle' : undefined;
   const svgStyle = {};
   const transform: string[] = [];
   if (rotate) {

package/dist/features/tmpFiles/tmpFiles.js

@@ -475,13 +475,15 @@ if (process.env.NODE_ENV === 'development') {
       });
     }
     if (api.appData.framework === "react") {
-      const historyPath = api.config.historyWithQuery ? (0, import_utils.winPath)((0, import_path.dirname)(require.resolve("@umijs/history/package.json"))) : rendererPath;
+      const { historyWithQuery, reactRouter5Compat } = api.config;
+      const historyPath = historyWithQuery ? (0, import_utils.winPath)((0, import_path.dirname)(require.resolve("@umijs/history/package.json"))) : rendererPath;
       api.writeTmpFile({
         noPluginDir: true,
         path: "core/history.ts",
         tplPath: (0, import_path.join)(import_constants.TEMPLATES_DIR, "history.tpl"),
         context: {
-          historyPath
+          historyPath,
+          reactRouter5Compat
         }
       });
       api.writeTmpFile({
@@ -489,7 +491,8 @@ if (process.env.NODE_ENV === 'development') {
         path: "core/historyIntelli.ts",
         tplPath: (0, import_path.join)(import_constants.TEMPLATES_DIR, "historyIntelli.tpl"),
         context: {
-          historyPath
+          historyPath,
+          reactRouter5Compat
         }
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.70",
+  "version": "4.0.71",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -37,21 +37,21 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/babel-preset-umi": "4.0.70",
-    "@umijs/ast": "4.0.70",
-    "@umijs/bundler-utils": "4.0.70",
-    "@umijs/bundler-esbuild": "4.0.70",
-    "@umijs/bundler-webpack": "4.0.70",
-    "@umijs/bundler-vite": "4.0.70",
-    "@umijs/core": "4.0.70",
+    "@umijs/bundler-esbuild": "4.0.71",
+    "@umijs/bundler-utils": "4.0.71",
+    "@umijs/ast": "4.0.71",
+    "@umijs/bundler-vite": "4.0.71",
+    "@umijs/babel-preset-umi": "4.0.71",
+    "@umijs/bundler-webpack": "4.0.71",
+    "@umijs/core": "4.0.71",
     "@umijs/did-you-know": "1.0.3",
-    "@umijs/plugin-run": "4.0.70",
-    "@umijs/mfsu": "4.0.70",
-    "@umijs/renderer-react": "4.0.70",
-    "@umijs/server": "4.0.70",
-    "@umijs/ui": "3.0.1",
-    "@umijs/utils": "4.0.70",
-    "@umijs/zod2ts": "4.0.70"
+    "@umijs/mfsu": "4.0.71",
+    "@umijs/plugin-run": "4.0.71",
+    "@umijs/renderer-react": "4.0.71",
+    "@umijs/server": "4.0.71",
+    "@umijs/utils": "4.0.71",
+    "@umijs/zod2ts": "4.0.71",
+    "@umijs/ui": "3.0.1"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",

package/templates/history.tpl

@@ -16,6 +16,12 @@ export function createHistory(opts: any) {
     basename = opts.basename;
   }
 
+{{#reactRouter5Compat}}
+  h.goBack = function() {
+    h.back();
+  };
+{{/reactRouter5Compat}}
+
   history = {
     ...h,
     push(to, state) {

package/templates/historyIntelli.tpl

@@ -71,9 +71,17 @@ type UmiTo = UmiPathname | UmiPath
 
 type UmiPush = (to: UmiTo, state?: any) => void
 type UmiReplace = (to: UmiTo, state?: any) => void
+{{#reactRouter5Compat}}
+type UmiGoBack = () => void
+{{/reactRouter5Compat}}
+
+
 export interface UmiHistory extends History {
   push: UmiPush
   replace: UmiReplace
+{{#reactRouter5Compat}}
+  goBack: UmiGoBack
+{{/reactRouter5Compat}}
 }
 
 // --- type utils ---