@umijs/preset-umi 4.0.18 → 4.0.19

package/dist/features/configPlugins/schema.js

@@ -34,6 +34,7 @@ function getSchemas() {
     history: (Joi) => Joi.object({
       type: Joi.string().valid("browser", "hash", "memory")
     }),
+    historyWithQuery: (Joi) => Joi.object(),
     links: (Joi) => Joi.array(),
     metas: (Joi) => Joi.array(),
     mountElementId: (Joi) => Joi.string(),

package/dist/features/tmpFiles/tmpFiles.js

@@ -88,7 +88,12 @@ var tmpFiles_default = (api) => {
             } : {}
           }
         },
-        include: [`${baseUrl}.umirc.ts`]
+        include: [
+          `${baseUrl}.umirc.ts`,
+          `${baseUrl}**/*.d.ts`,
+          `${baseUrl}**/*.ts`,
+          `${baseUrl}**/*.tsx`
+        ]
       }, null, 2)
     });
     api.writeTmpFile({
@@ -388,12 +393,13 @@ export default function EmptyRoute() {
       });
     }
     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;
       api.writeTmpFile({
         noPluginDir: true,
         path: "core/history.ts",
         tplPath: (0, import_path.join)(import_constants.TEMPLATES_DIR, "history.tpl"),
         context: {
-          rendererPath
+          historyPath
         }
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.18",
+  "version": "4.0.19",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -26,18 +26,19 @@
   },
   "dependencies": {
     "@types/multer": "1.4.7",
-    "@umijs/ast": "4.0.18",
-    "@umijs/babel-preset-umi": "4.0.18",
-    "@umijs/bundler-utils": "4.0.18",
-    "@umijs/bundler-vite": "4.0.18",
-    "@umijs/bundler-webpack": "4.0.18",
-    "@umijs/core": "4.0.18",
+    "@umijs/ast": "4.0.19",
+    "@umijs/babel-preset-umi": "4.0.19",
+    "@umijs/bundler-utils": "4.0.19",
+    "@umijs/bundler-vite": "4.0.19",
+    "@umijs/bundler-webpack": "4.0.19",
+    "@umijs/core": "4.0.19",
     "@umijs/did-you-know": "^1.0.0",
-    "@umijs/mfsu": "4.0.18",
-    "@umijs/plugin-run": "4.0.18",
-    "@umijs/renderer-react": "4.0.18",
-    "@umijs/server": "4.0.18",
-    "@umijs/utils": "4.0.18",
+    "@umijs/history": "5.3.0",
+    "@umijs/mfsu": "4.0.19",
+    "@umijs/plugin-run": "4.0.19",
+    "@umijs/renderer-react": "4.0.19",
+    "@umijs/server": "4.0.19",
+    "@umijs/utils": "4.0.19",
     "click-to-react-component": "^1.0.8",
     "core-js": "3.22.4",
     "current-script-polyfill": "1.0.0",

package/templates/history.tpl

@@ -1,4 +1,4 @@
-import { createHashHistory, createMemoryHistory, createBrowserHistory, History } from '{{{ rendererPath }}}';
+import { createHashHistory, createMemoryHistory, createBrowserHistory, History } from '{{{ historyPath }}}';
 
 let history: History;
 let basename: string = '/';
@@ -14,15 +14,15 @@ export function createHistory(opts: any) {
   if (opts.basename) {
     basename = opts.basename;
   }
-  history = {
-    ...h,
-    push(to, state) {
-      h.push(patchTo(to), state);
-    },
-    replace(to, state) {
-      h.replace(patchTo(to), state);
-    },
-  }
+  history = h;
+  const oldPush = h.push;
+  history.push = (to, state) => {
+    oldPush(patchTo(to), state);
+  };
+  const oldReplace = h.replace;
+  history.replace = (to, state) => {
+    oldReplace(patchTo(to), state);
+  };
   return h;
 }