@umijs/bundler-vite 4.7.7 → 4.7.8

package/compiled/@vitejs/plugin-legacy/package.json

@@ -1 +1 @@
-{"name":"@vitejs/plugin-legacy","version":"4.1.1","author":"Evan You","license":"MIT","types":"./dist/index.d.ts"}
+{"name":"@vitejs/plugin-legacy","version":"7.2.1","author":"Evan You","license":"MIT"}

package/dist/server/plugins/middlewares.d.ts

@@ -0,0 +1,2 @@
+import type { Plugin } from '../../../compiled/vite';
+export default function middlewaresPlugin(middlewares: any[]): Plugin;

package/dist/server/plugins/middlewares.js

@@ -0,0 +1,73 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/server/plugins/middlewares.ts
+var middlewares_exports = {};
+__export(middlewares_exports, {
+  default: () => middlewaresPlugin
+});
+module.exports = __toCommonJS(middlewares_exports);
+var originalUrlKey = Symbol("bundler-vite:original-url");
+function resolveMiddleware(middleware) {
+  const resolved = middleware.toString().includes("{ compiler }") ? middleware({}) : middleware;
+  return Array.isArray(resolved) ? resolved : [resolved];
+}
+function stripBase(url, base) {
+  if (base === "/") {
+    return url;
+  }
+  const basePath = new URL(base, "http://vite.local").pathname.replace(
+    /\/$/,
+    ""
+  );
+  const pathname = url.split("?")[0];
+  if (pathname === basePath || pathname.startsWith(`${basePath}/`)) {
+    return url.slice(basePath.length) || "/";
+  }
+  return url;
+}
+function captureOriginalUrl(base) {
+  return function bundlerViteCaptureOriginalUrl(req, _res, next) {
+    req[originalUrlKey] = stripBase(req.url, base);
+    next();
+  };
+}
+function preserveOriginalUrl(middleware) {
+  return function bundlerViteAfterMiddleware(req, res, next) {
+    const viteUrl = req.url;
+    req.url = req[originalUrlKey] ?? req.url;
+    middleware(req, res, (err) => {
+      req.url = viteUrl;
+      next(err);
+    });
+  };
+}
+function middlewaresPlugin(middlewares) {
+  return {
+    name: "bundler-vite:middlewares",
+    enforce: "pre",
+    configureServer(server) {
+      server.middlewares.use(captureOriginalUrl(server.config.base));
+      return () => {
+        middlewares.flatMap(resolveMiddleware).forEach((middleware) => {
+          server.middlewares.use(preserveOriginalUrl(middleware));
+        });
+      };
+    }
+  };
+}

package/dist/server/server.d.ts

@@ -21,7 +21,7 @@ interface IOpts {
     onDevCompileDone?: (args: {
         time: number;
         isFirstCompile: boolean;
-        stats: HmrContext['modules'] | DepOptimizationMetadata;
+        stats: HmrContext['modules'] | DepOptimizationMetadata | undefined;
     }) => Promise<void> | void;
     onBeforeMiddleware?: Function;
 }

package/dist/server/server.js

@@ -37,6 +37,7 @@ var import_express = __toESM(require("@umijs/bundler-utils/compiled/express"));
 var import_utils = require("@umijs/utils");
 var import_http = __toESM(require("http"));
 var import_vite = require("../../compiled/vite");
+var import_middlewares = __toESM(require("./plugins/middlewares"));
 var import_onHotUpdate = __toESM(require("./plugins/onHotUpdate"));
 async function createServer(opts) {
   var _a, _b;
@@ -55,9 +56,11 @@ async function createServer(opts) {
   }
   const vite = await (0, import_vite.createServer)({
     ...viteConfig,
-    // use `handleHotUpdate` vite hook to workaround `onDevCompileDone` umi hook
-    ...typeof onDevCompileDone === "function" ? {
-      plugins: viteConfig.plugins.concat([
+    plugins: [
+      ...viteConfig.plugins || [],
+      ...((_a = opts.afterMiddlewares) == null ? void 0 : _a.length) ? [(0, import_middlewares.default)(opts.afterMiddlewares)] : [],
+      // use `handleHotUpdate` vite hook to workaround `onDevCompileDone` umi hook
+      ...typeof onDevCompileDone === "function" ? [
         (0, import_onHotUpdate.default)(async (modules) => {
           await onDevCompileDone({
             time: 0,
@@ -65,32 +68,17 @@ async function createServer(opts) {
             stats: modules
           });
         })
-      ])
-    } : {},
+      ] : []
+    ],
     server: { ...viteConfigServer, middlewareMode: true }
   });
-  (_a = opts.beforeMiddlewares) == null ? void 0 : _a.forEach((m) => app.use(m));
+  (_b = opts.beforeMiddlewares) == null ? void 0 : _b.forEach((m) => app.use(m));
   if (opts.onBeforeMiddleware) {
     opts.onBeforeMiddleware(app);
   }
   if (userConfig.proxy) {
     (0, import_bundler_utils.createProxy)(userConfig.proxy, app);
   }
-  if ((_b = opts.afterMiddlewares) == null ? void 0 : _b.length) {
-    vite.middlewares.stack.some((s, i) => {
-      if (s.handle.name === "viteSpaFallbackMiddleware") {
-        const afterStacks = opts.afterMiddlewares.map((m) => ({
-          route: "",
-          // TODO: FIXME
-          // see: https://github.com/umijs/umi/commit/34d4e4e26a20ff5c7393eab5d3db363cca541379#diff-3a996a9e7a2f94fc8f23c6efed1447eed9567e36ed622bd8547a58e5415087f7R164
-          handle: app.use(m.toString().includes(`{ compiler }`) ? m({}) : m)
-        }));
-        vite.middlewares.stack.splice(i, 0, ...afterStacks);
-        return true;
-      }
-      return false;
-    });
-  }
   app.use(vite.middlewares);
   const server = userConfig.https ? await (0, import_bundler_utils.createHttpsServer)(app, userConfig.https) : import_http.default.createServer(app);
   if (!server) {
@@ -99,12 +87,12 @@ async function createServer(opts) {
   const protocol = userConfig.https ? "https:" : "http:";
   const port = opts.port || 8e3;
   server.listen(port, async () => {
+    var _a2;
     if (typeof onDevCompileDone === "function") {
       await onDevCompileDone({
         time: +/* @__PURE__ */ new Date() - startTms,
         isFirstCompile: true,
-        // @ts-ignore
-        stats: vite._optimizeDepsMetadata
+        stats: (_a2 = vite.environments.client.depsOptimizer) == null ? void 0 : _a2.metadata
       });
     }
     const banner = (0, import_utils.getDevBanner)(protocol, opts.host, port);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-vite",
-  "version": "4.7.7",
+  "version": "4.7.8",
   "description": "@umijs/bundler-vite",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/bundler-vite#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -21,22 +21,23 @@
   ],
   "dependencies": {
     "@svgr/core": "6.5.1",
-    "@vitejs/plugin-react": "4.0.0",
+    "@vitejs/plugin-react": "5.2.0",
     "core-js": "3.34.0",
     "less": "4.1.3",
     "postcss-preset-env": "7.5.0",
-    "rollup-plugin-visualizer": "5.9.0",
+    "rollup-plugin-visualizer": "6.0.11",
     "systemjs": "^6.14.1",
-    "vite": "4.5.2",
-    "@umijs/utils": "4.7.7",
-    "@umijs/bundler-utils": "4.7.7",
-    "@umijs/bundler-webpack": "4.7.7"
+    "terser": "5.49.0",
+    "vite": "7.3.6",
+    "@umijs/bundler-utils": "4.7.8",
+    "@umijs/bundler-webpack": "4.7.8",
+    "@umijs/utils": "4.7.8"
   },
   "devDependencies": {
     "@types/caniuse-lite": "1.0.5",
-    "@vitejs/plugin-legacy": "4.1.1",
+    "@vitejs/plugin-legacy": "7.2.1",
     "caniuse-lite": "1.0.30001792",
-    "rollup": "3.7.0",
+    "rollup": "4.62.2",
     "rollup-plugin-copy": "3.4.0"
   },
   "publishConfig": {
@@ -69,6 +70,9 @@
       "esbuild",
       "foo",
       "fs-extra"
+    ],
+    "excludeDtsDeps": [
+      "@vitejs/plugin-legacy"
     ]
   },
   "scripts": {