@umijs/preset-umi 4.0.37 → 4.0.39

package/dist/commands/dev/dev.js

@@ -327,24 +327,18 @@ PORT=8888 umi dev
     memo.ip = import_utils.address.ip();
     return memo;
   });
-  const restartServer = () => {
-    var _a;
-    import_utils.logger.info(`Restart dev server with port ${api.appData.port}...`);
-    (0, import_watch.unwatch)();
-    (_a = process.send) == null ? void 0 : _a.call(process, {
-      type: "RESTART",
-      payload: {
-        port: api.appData.port
-      }
-    });
-  };
-  process.on("UMI_RESTART_SERVER", () => {
-    restartServer();
-  });
   api.registerMethod({
     name: "restartServer",
     fn() {
-      restartServer();
+      var _a;
+      import_utils.logger.info(`Restart dev server with port ${api.appData.port}...`);
+      (0, import_watch.unwatch)();
+      (_a = process.send) == null ? void 0 : _a.call(process, {
+        type: "RESTART",
+        payload: {
+          port: api.appData.port
+        }
+      });
     }
   });
   api.modifyViteConfig((viteConfig) => {

package/dist/features/apiRoute/request.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import type { IncomingMessage } from 'http';
 import type { IRoute } from '../../types';
 declare class UmiApiRequest {

package/dist/features/tmpFiles/tmpFiles.js

@@ -482,7 +482,7 @@ export default function EmptyRoute() {
         }
       }
       exports.push("// plugins types.d.ts");
-      for (const plugin of plugins) {
+      for (const plugin of allPlugins) {
         const file = (0, import_utils.winPath)((0, import_path.join)(api.paths.absTmpPath, plugin, "types.d.ts"));
         if ((0, import_fs.existsSync)(file)) {
           const noSuffixFile = file.replace(/\.ts$/, "");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.37",
+  "version": "4.0.39",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -25,19 +25,19 @@
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
-    "@umijs/ast": "4.0.37",
-    "@umijs/babel-preset-umi": "4.0.37",
-    "@umijs/bundler-utils": "4.0.37",
-    "@umijs/bundler-vite": "4.0.37",
-    "@umijs/bundler-webpack": "4.0.37",
-    "@umijs/core": "4.0.37",
+    "@umijs/ast": "4.0.39",
+    "@umijs/babel-preset-umi": "4.0.39",
+    "@umijs/bundler-utils": "4.0.39",
+    "@umijs/bundler-vite": "4.0.39",
+    "@umijs/bundler-webpack": "4.0.39",
+    "@umijs/core": "4.0.39",
     "@umijs/did-you-know": "^1.0.0",
     "@umijs/history": "5.3.1",
-    "@umijs/mfsu": "4.0.37",
-    "@umijs/plugin-run": "4.0.37",
-    "@umijs/renderer-react": "4.0.37",
-    "@umijs/server": "4.0.37",
-    "@umijs/utils": "4.0.37",
+    "@umijs/mfsu": "4.0.39",
+    "@umijs/plugin-run": "4.0.39",
+    "@umijs/renderer-react": "4.0.39",
+    "@umijs/server": "4.0.39",
+    "@umijs/utils": "4.0.39",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "click-to-react-component": "^1.0.8",
     "core-js": "3.22.4",

package/templates/history.tpl

@@ -1,3 +1,4 @@
+// @ts-ignore
 import { createHashHistory, createMemoryHistory, createBrowserHistory, History } from '{{{ historyPath }}}';
 
 let history: History;
@@ -18,10 +19,10 @@ export function createHistory(opts: any) {
   history = {
     ...h,
     push(to, state) {
-      h.push(patchTo(to, h), state);
+      h.push(patchTo(to, h, basename), state);
     },
     replace(to, state) {
-      h.replace(patchTo(to, h), state);
+      h.replace(patchTo(to, h, basename), state);
     },
     get location() {
       return h.location;
@@ -38,16 +39,20 @@ export function createHistory(opts: any) {
 // Refs:
 // https://github.com/remix-run/history/blob/3e9dab4/packages/history/index.ts#L484
 // https://github.com/remix-run/history/blob/dev/docs/api-reference.md#to
-function patchTo(to: any, h: History) {
+function patchTo(to: any, h: History, basename: string) {
   if (typeof to === 'string') {
-    return `${stripLastSlash(basename)}${to}`;
+    if (isAbsolute(to)) {
+      return `${stripLastSlash(basename)}${to}`;
+    } else {
+      return `${stripLastSlash(basename)}${resolvePath(to, h, basename)}`;
+    }
   } else if (typeof to === 'object') {
 
     const currentPathname = h.location.pathname;
 
     return {
       ...to,
-      pathname: to.pathname? `${stripLastSlash(basename)}${to.pathname}` : currentPathname,
+      pathname: to.pathname ? `${stripLastSlash(basename)}${resolvePath(to.pathname, h, basename)}` : currentPathname,
     };
   } else {
     throw new Error(`Unexpected to: ${to}`);
@@ -57,5 +62,87 @@ function patchTo(to: any, h: History) {
 function stripLastSlash(path) {
   return path.slice(-1) === '/' ? path.slice(0, -1) : path;
 }
+function resolvePath(pathname: string, h: History, basename:string ){
+  let fromPath= h.location.pathname
+
+  if(basename ==='/' || basename ===''){
+  }else{
+    fromPath = fromPath.replace(new RegExp(`^${stripLastSlash(basename)}`), '') || '/'
+  }
+
+  return resolvePathname(pathname, fromPath)
+}
+
+function isAbsolute(pathname:string): boolean {
+  return pathname.charAt(0) === '/';
+}
+
+// About 1.5x faster than the two-arg version of Array#splice()
+function spliceOne(list: any[], index:number) {
+  for (var i = index, k = i + 1, n = list.length; k < n; i += 1, k += 1) {
+    list[i] = list[k];
+  }
+
+  list.pop();
+}
+
+function resolvePathname(to: string, from :string = ''): string {
+
+  const toParts = (to && to.split('/')) || [];
+  let fromParts = (from && from.split('/')) || [];
+
+  const isToAbs = to && isAbsolute(to);
+  const isFromAbs = from && isAbsolute(from);
+  const mustEndAbs = isToAbs || isFromAbs;
+
+  if (to && isAbsolute(to)) {
+    // to is absolute
+    fromParts = toParts;
+  } else if (toParts.length) {
+    // to is relative, drop the filename
+    fromParts.pop();
+    fromParts = fromParts.concat(toParts);
+  }
+
+  if (!fromParts.length) return '/';
+
+  let hasTrailingSlash;
+  if (fromParts.length) {
+    const last = fromParts[fromParts.length - 1];
+    hasTrailingSlash = last === '.' || last === '..' || last === '';
+  } else {
+    hasTrailingSlash = false;
+  }
+
+  let up = 0;
+  for (let i = fromParts.length; i >= 0; i--) {
+    const part = fromParts[i];
+
+    if (part === '.') {
+      spliceOne(fromParts, i);
+    } else if (part === '..') {
+      spliceOne(fromParts, i);
+      up++;
+    } else if (up) {
+      spliceOne(fromParts, i);
+      up--;
+    }
+  }
+
+  if (!mustEndAbs) for (; up--; up) fromParts.unshift('..');
+
+  if (
+    mustEndAbs &&
+    fromParts[0] !== '' &&
+    (!fromParts[0] || !isAbsolute(fromParts[0]))
+  )
+    fromParts.unshift('');
+
+  let result = fromParts.join('/');
+
+  if (hasTrailingSlash && result.substr(-1) !== '/') result += '/';
+
+  return result;
+}
 
 export { history };