@modern-js/server 2.54.5 → 2.54.6

package/dist/cjs/dev.js

@@ -34,14 +34,14 @@ const devPlugin = (options) => ({
     const dev = (0, import_helpers.getDevOptions)(options);
     return {
       async prepare() {
-        const { middlewares, distDirectory, routes, nodeServer, apiDirectory, sharedDirectory, serverBase } = api.useAppContext();
+        const { middlewares, distDirectory, nodeServer, apiDirectory, sharedDirectory, serverBase } = api.useAppContext();
         onHTTPUpgrade && (nodeServer === null || nodeServer === void 0 ? void 0 : nodeServer.on("upgrade", onHTTPUpgrade));
         const runner = api.useHookRunners();
         rsbuild === null || rsbuild === void 0 ? void 0 : rsbuild.onDevCompileDone(({ stats }) => {
           if (stats.toJson({
             all: false
           }).name !== "server") {
-            (0, import_helpers.onRepack)(distDirectory, runner, routes || []);
+            (0, import_helpers.onRepack)(distDirectory, runner);
           }
         });
         if (dev.watch) {

package/dist/cjs/helpers/repack.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,41 +15,22 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var repack_exports = {};
 __export(repack_exports, {
   onRepack: () => onRepack
 });
 module.exports = __toCommonJS(repack_exports);
-var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
 var import_fileReader = require("@modern-js/runtime-utils/fileReader");
-const getBundles = (routes) => {
-  return routes.filter((route) => route.isSSR).map((route) => route.bundle);
-};
-const cleanSSRCache = (distDir, routes) => {
-  const bundles = getBundles(routes);
-  bundles.forEach((bundle) => {
-    const filepath = import_path.default.join(distDir, bundle);
-    if (require.cache[filepath]) {
-      delete require.cache[filepath];
+const cleanSSRCache = (distDir) => {
+  Object.keys(require.cache).forEach((key) => {
+    if (key.startsWith(distDir)) {
+      delete require.cache[key];
     }
   });
-  const loadable = import_path.default.join(distDir, import_utils.LOADABLE_STATS_FILE);
-  if (require.cache[loadable]) {
-    delete require.cache[loadable];
-  }
 };
-const onRepack = (distDir, runner, routes) => {
-  cleanSSRCache(distDir, routes);
+const onRepack = (distDir, runner) => {
+  cleanSSRCache(distDir);
   import_fileReader.fileReader.reset();
   runner.reset({
     event: {

package/dist/esm/dev.js

@@ -15,11 +15,11 @@ var devPlugin = function(options) {
       return {
         prepare: function prepare() {
           return _async_to_generator(function() {
-            var _api_useAppContext, middlewares, distDirectory, routes, nodeServer, apiDirectory, sharedDirectory, serverBase, runner, watchOptions, watcher;
+            var _api_useAppContext, middlewares, distDirectory, nodeServer, apiDirectory, sharedDirectory, serverBase, runner, watchOptions, watcher;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
-                  _api_useAppContext = api.useAppContext(), middlewares = _api_useAppContext.middlewares, distDirectory = _api_useAppContext.distDirectory, routes = _api_useAppContext.routes, nodeServer = _api_useAppContext.nodeServer, apiDirectory = _api_useAppContext.apiDirectory, sharedDirectory = _api_useAppContext.sharedDirectory, serverBase = _api_useAppContext.serverBase;
+                  _api_useAppContext = api.useAppContext(), middlewares = _api_useAppContext.middlewares, distDirectory = _api_useAppContext.distDirectory, nodeServer = _api_useAppContext.nodeServer, apiDirectory = _api_useAppContext.apiDirectory, sharedDirectory = _api_useAppContext.sharedDirectory, serverBase = _api_useAppContext.serverBase;
                   onHTTPUpgrade && (nodeServer === null || nodeServer === void 0 ? void 0 : nodeServer.on("upgrade", onHTTPUpgrade));
                   runner = api.useHookRunners();
                   rsbuild === null || rsbuild === void 0 ? void 0 : rsbuild.onDevCompileDone(function(param) {
@@ -27,7 +27,7 @@ var devPlugin = function(options) {
                     if (stats.toJson({
                       all: false
                     }).name !== "server") {
-                      onRepack(distDirectory, runner, routes || []);
+                      onRepack(distDirectory, runner);
                     }
                   });
                   if (dev.watch) {

package/dist/esm/helpers/repack.js

@@ -1,28 +1,13 @@
-import path from "path";
-import { LOADABLE_STATS_FILE } from "@modern-js/utils";
 import { fileReader } from "@modern-js/runtime-utils/fileReader";
-var getBundles = function(routes) {
-  return routes.filter(function(route) {
-    return route.isSSR;
-  }).map(function(route) {
-    return route.bundle;
-  });
-};
-var cleanSSRCache = function(distDir, routes) {
-  var bundles = getBundles(routes);
-  bundles.forEach(function(bundle) {
-    var filepath = path.join(distDir, bundle);
-    if (require.cache[filepath]) {
-      delete require.cache[filepath];
+var cleanSSRCache = function(distDir) {
+  Object.keys(require.cache).forEach(function(key) {
+    if (key.startsWith(distDir)) {
+      delete require.cache[key];
     }
   });
-  var loadable = path.join(distDir, LOADABLE_STATS_FILE);
-  if (require.cache[loadable]) {
-    delete require.cache[loadable];
-  }
 };
-var onRepack = function(distDir, runner, routes) {
-  cleanSSRCache(distDir, routes);
+var onRepack = function(distDir, runner) {
+  cleanSSRCache(distDir);
   fileReader.reset();
   runner.reset({
     event: {

package/dist/esm-node/dev.js

@@ -11,14 +11,14 @@ const devPlugin = (options) => ({
     const dev = getDevOptions(options);
     return {
       async prepare() {
-        const { middlewares, distDirectory, routes, nodeServer, apiDirectory, sharedDirectory, serverBase } = api.useAppContext();
+        const { middlewares, distDirectory, nodeServer, apiDirectory, sharedDirectory, serverBase } = api.useAppContext();
         onHTTPUpgrade && (nodeServer === null || nodeServer === void 0 ? void 0 : nodeServer.on("upgrade", onHTTPUpgrade));
         const runner = api.useHookRunners();
         rsbuild === null || rsbuild === void 0 ? void 0 : rsbuild.onDevCompileDone(({ stats }) => {
           if (stats.toJson({
             all: false
           }).name !== "server") {
-            onRepack(distDirectory, runner, routes || []);
+            onRepack(distDirectory, runner);
           }
         });
         if (dev.watch) {

package/dist/esm-node/helpers/repack.js

@@ -1,24 +1,13 @@
-import path from "path";
-import { LOADABLE_STATS_FILE } from "@modern-js/utils";
 import { fileReader } from "@modern-js/runtime-utils/fileReader";
-const getBundles = (routes) => {
-  return routes.filter((route) => route.isSSR).map((route) => route.bundle);
-};
-const cleanSSRCache = (distDir, routes) => {
-  const bundles = getBundles(routes);
-  bundles.forEach((bundle) => {
-    const filepath = path.join(distDir, bundle);
-    if (require.cache[filepath]) {
-      delete require.cache[filepath];
+const cleanSSRCache = (distDir) => {
+  Object.keys(require.cache).forEach((key) => {
+    if (key.startsWith(distDir)) {
+      delete require.cache[key];
     }
   });
-  const loadable = path.join(distDir, LOADABLE_STATS_FILE);
-  if (require.cache[loadable]) {
-    delete require.cache[loadable];
-  }
 };
-const onRepack = (distDir, runner, routes) => {
-  cleanSSRCache(distDir, routes);
+const onRepack = (distDir, runner) => {
+  cleanSSRCache(distDir);
   fileReader.reset();
   runner.reset({
     event: {

package/dist/types/helpers/repack.d.ts

@@ -1,3 +1,2 @@
-import { ServerRoute } from '@modern-js/types';
 import { ServerHookRunner } from '@modern-js/server-core';
-export declare const onRepack: (distDir: string, runner: ServerHookRunner, routes: ServerRoute[]) => void;
+export declare const onRepack: (distDir: string, runner: ServerHookRunner) => void;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.54.5",
+  "version": "2.54.6",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -48,11 +48,11 @@
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.13.0",
-    "@modern-js/runtime-utils": "2.54.5",
-    "@modern-js/server-utils": "2.54.5",
-    "@modern-js/types": "2.54.5",
-    "@modern-js/utils": "2.54.5",
-    "@modern-js/server-core": "2.54.5"
+    "@modern-js/runtime-utils": "2.54.6",
+    "@modern-js/server-utils": "2.54.6",
+    "@modern-js/types": "2.54.6",
+    "@modern-js/utils": "2.54.6",
+    "@modern-js/server-core": "2.54.6"
   },
   "devDependencies": {
     "@rsbuild/core": "0.7.10",
@@ -68,8 +68,8 @@
     "typescript": "^5",
     "webpack": "^5.92.0",
     "websocket": "^1",
-    "@scripts/build": "2.54.5",
-    "@scripts/jest-config": "2.54.5"
+    "@scripts/build": "2.54.6",
+    "@scripts/jest-config": "2.54.6"
   },
   "peerDependencies": {
     "devcert": "^1.2.2",