@modern-js/runtime 2.38.0 → 2.39.1

package/dist/cjs/router/runtime/utils.js

@@ -160,7 +160,7 @@ function deserializeErrors(errors) {
   const serialized = {};
   for (const [key, val] of entries) {
     if (val && val.__type === "RouteErrorResponse") {
-      serialized[key] = new import_remix_router.ErrorResponse(val.status, val.statusText, val.data, val.internal === true);
+      serialized[key] = new import_remix_router.UNSAFE_ErrorResponseImpl(val.status, val.statusText, val.data, val.internal === true);
     } else if (val && val.__type === "Error") {
       const error = new Error(val.message);
       error.stack = val.stack;

package/dist/cjs/ssr/serverRender/renderToString/loadable.js

@@ -1,7 +1,9 @@
 "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)
@@ -15,6 +17,14 @@ 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 loadable_exports = {};
 __export(loadable_exports, {
@@ -23,8 +33,7 @@ __export(loadable_exports, {
 module.exports = __toCommonJS(loadable_exports);
 var import_define_property = require("@swc/helpers/_/_define_property");
 var import_server = require("@loadable/server");
-var import_utils = require("@modern-js/utils");
-var import_utils2 = require("../utils");
+var import_utils = require("../utils");
 const extname = (uri) => {
   if (typeof uri !== "string" || !uri.includes(".")) {
     return "";
@@ -43,6 +52,10 @@ const checkIsInline = (chunk, enableInline) => {
     return false;
   }
 };
+const checkIsNode = () => {
+  var _process_release;
+  return typeof process !== "undefined" && ((_process_release = process.release) === null || _process_release === void 0 ? void 0 : _process_release.name) === "node";
+};
 class LoadableCollector {
   get existsAssets() {
     var _routeManifest_routeAssets_entryName, _routeManifest_routeAssets;
@@ -92,7 +105,7 @@ class LoadableCollector {
       defer: scriptLoading === "defer" ? true : void 0,
       type: scriptLoading === "module" ? "module" : void 0
     };
-    const attributes = (0, import_utils2.attributesToString)(this.generateAttributes({
+    const attributes = (0, import_utils.attributesToString)(this.generateAttributes({
       nonce,
       ...scriptLoadingAtr
     }));
@@ -100,31 +113,37 @@ class LoadableCollector {
       var _this_existsAssets;
       const jsChunkReg = new RegExp(`<script .*src="${chunk.url}".*>`);
       return !jsChunkReg.test(template) && !((_this_existsAssets = this.existsAssets) === null || _this_existsAssets === void 0 ? void 0 : _this_existsAssets.includes(chunk.path));
-    }).map((chunk) => {
-      if (checkIsInline(chunk, enableInlineScripts)) {
+    }).map(async (chunk) => {
+      if (checkIsInline(chunk, enableInlineScripts) && checkIsNode()) {
+        const fs = await Promise.resolve().then(() => __toESM(require("node:fs/promises")));
         const filepath = chunk.path;
-        return import_utils.fs.readFile(filepath, "utf-8").then((content) => `<script>${content}</script>`);
+        return fs.readFile(filepath, "utf-8").then((content) => `<script>${content}</script>`).catch((_) => {
+          return "";
+        });
       } else {
         return `<script${attributes} src="${chunk.url}"></script>`;
       }
     }));
-    chunksMap.js += scripts.join("");
+    chunksMap.js += scripts.filter((script) => Boolean(script)).join("");
   }
   async emitStyleAssets(chunks) {
     const { template, result: { chunksMap }, config: { enableInlineStyles } } = this.options;
-    const atrributes = (0, import_utils2.attributesToString)(this.generateAttributes());
+    const atrributes = (0, import_utils.attributesToString)(this.generateAttributes());
     const css = await Promise.all(chunks.filter((chunk) => {
       var _this_existsAssets;
       const cssChunkReg = new RegExp(`<link .*href="${chunk.url}".*>`);
       return !cssChunkReg.test(template) && !((_this_existsAssets = this.existsAssets) === null || _this_existsAssets === void 0 ? void 0 : _this_existsAssets.includes(chunk.path));
-    }).map((chunk) => {
-      if (checkIsInline(chunk, enableInlineStyles)) {
-        return import_utils.fs.readFile(chunk.path).then((content) => `<style>${content}</style>`);
+    }).map(async (chunk) => {
+      if (checkIsInline(chunk, enableInlineStyles) && checkIsNode()) {
+        const fs = await Promise.resolve().then(() => __toESM(require("node:fs/promises")));
+        return fs.readFile(chunk.path).then((content) => `<style>${content}</style>`).catch((_) => {
+          return "";
+        });
       } else {
         return `<link${atrributes} href="${chunk.url}" rel="stylesheet" />`;
       }
     }));
-    chunksMap.css += css.join("");
+    chunksMap.css += css.filter((css2) => Boolean(css2)).join("");
   }
   generateAttributes(extraAtr = {}) {
     const { config } = this.options;

package/dist/esm/router/runtime/utils.js

@@ -5,7 +5,7 @@ import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Route, isRouteErrorResponse } from "@modern-js/runtime-utils/router";
-import { ErrorResponse } from "@modern-js/runtime-utils/remix-router";
+import { UNSAFE_ErrorResponseImpl as ErrorResponseImpl } from "@modern-js/runtime-utils/remix-router";
 import { renderNestedRoute } from "@modern-js/runtime-utils/browser";
 import { DefaultNotFound } from "./DefaultNotFound";
 import DeferredDataScripts from "./DeferredDataScripts";
@@ -167,7 +167,7 @@ function deserializeErrors(errors) {
     for (var _iterator = entries[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
       var _step_value = _sliced_to_array(_step.value, 2), key = _step_value[0], val = _step_value[1];
       if (val && val.__type === "RouteErrorResponse") {
-        serialized[key] = new ErrorResponse(val.status, val.statusText, val.data, val.internal === true);
+        serialized[key] = new ErrorResponseImpl(val.status, val.statusText, val.data, val.internal === true);
       } else if (val && val.__type === "Error") {
         var error = new Error(val.message);
         error.stack = val.stack;

package/dist/esm/ssr/serverRender/renderToString/loadable.js

@@ -6,7 +6,6 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { ChunkExtractor } from "@loadable/server";
-import { fs } from "@modern-js/utils";
 import { attributesToString } from "../utils";
 var extname = function(uri) {
   if (typeof uri !== "string" || !uri.includes(".")) {
@@ -32,6 +31,10 @@ var checkIsInline = function(chunk, enableInline) {
     return false;
   }
 };
+var checkIsNode = function() {
+  var _process_release;
+  return typeof process !== "undefined" && ((_process_release = process.release) === null || _process_release === void 0 ? void 0 : _process_release.name) === "node";
+};
 var LoadableCollector = /* @__PURE__ */ function() {
   "use strict";
   function LoadableCollector2(options) {
@@ -146,20 +149,54 @@ var LoadableCollector = /* @__PURE__ */ function() {
                     var _this_existsAssets;
                     var jsChunkReg = new RegExp('<script .*src="'.concat(chunk.url, '".*>'));
                     return !jsChunkReg.test(template) && !((_this_existsAssets = _this.existsAssets) === null || _this_existsAssets === void 0 ? void 0 : _this_existsAssets.includes(chunk.path));
-                  }).map(function(chunk) {
-                    if (checkIsInline(chunk, enableInlineScripts)) {
-                      var filepath = chunk.path;
-                      return fs.readFile(filepath, "utf-8").then(function(content) {
-                        return "<script>".concat(content, "</script>");
+                  }).map(function() {
+                    var _ref = _async_to_generator(function(chunk) {
+                      var fs, filepath;
+                      return _ts_generator(this, function(_state2) {
+                        switch (_state2.label) {
+                          case 0:
+                            if (!(checkIsInline(chunk, enableInlineScripts) && checkIsNode()))
+                              return [
+                                3,
+                                2
+                              ];
+                            return [
+                              4,
+                              import("node:fs/promises")
+                            ];
+                          case 1:
+                            fs = _state2.sent();
+                            filepath = chunk.path;
+                            return [
+                              2,
+                              fs.readFile(filepath, "utf-8").then(function(content) {
+                                return "<script>".concat(content, "</script>");
+                              }).catch(function(_) {
+                                return "";
+                              })
+                            ];
+                          case 2:
+                            return [
+                              2,
+                              "<script".concat(attributes, ' src="').concat(chunk.url, '"></script>')
+                            ];
+                          case 3:
+                            return [
+                              2
+                            ];
+                        }
                       });
-                    } else {
-                      return "<script".concat(attributes, ' src="').concat(chunk.url, '"></script>');
-                    }
-                  }))
+                    });
+                    return function(chunk) {
+                      return _ref.apply(this, arguments);
+                    };
+                  }()))
                 ];
               case 1:
                 scripts = _state.sent();
-                chunksMap.js += scripts.join("");
+                chunksMap.js += scripts.filter(function(script) {
+                  return Boolean(script);
+                }).join("");
                 return [
                   2
                 ];
@@ -185,19 +222,53 @@ var LoadableCollector = /* @__PURE__ */ function() {
                     var _this_existsAssets;
                     var cssChunkReg = new RegExp('<link .*href="'.concat(chunk.url, '".*>'));
                     return !cssChunkReg.test(template) && !((_this_existsAssets = _this.existsAssets) === null || _this_existsAssets === void 0 ? void 0 : _this_existsAssets.includes(chunk.path));
-                  }).map(function(chunk) {
-                    if (checkIsInline(chunk, enableInlineStyles)) {
-                      return fs.readFile(chunk.path).then(function(content) {
-                        return "<style>".concat(content, "</style>");
+                  }).map(function() {
+                    var _ref = _async_to_generator(function(chunk) {
+                      var fs;
+                      return _ts_generator(this, function(_state2) {
+                        switch (_state2.label) {
+                          case 0:
+                            if (!(checkIsInline(chunk, enableInlineStyles) && checkIsNode()))
+                              return [
+                                3,
+                                2
+                              ];
+                            return [
+                              4,
+                              import("node:fs/promises")
+                            ];
+                          case 1:
+                            fs = _state2.sent();
+                            return [
+                              2,
+                              fs.readFile(chunk.path).then(function(content) {
+                                return "<style>".concat(content, "</style>");
+                              }).catch(function(_) {
+                                return "";
+                              })
+                            ];
+                          case 2:
+                            return [
+                              2,
+                              "<link".concat(atrributes, ' href="').concat(chunk.url, '" rel="stylesheet" />')
+                            ];
+                          case 3:
+                            return [
+                              2
+                            ];
+                        }
                       });
-                    } else {
-                      return "<link".concat(atrributes, ' href="').concat(chunk.url, '" rel="stylesheet" />');
-                    }
-                  }))
+                    });
+                    return function(chunk) {
+                      return _ref.apply(this, arguments);
+                    };
+                  }()))
                 ];
               case 1:
                 css = _state.sent();
-                chunksMap.css += css.join("");
+                chunksMap.css += css.filter(function(css2) {
+                  return Boolean(css2);
+                }).join("");
                 return [
                   2
                 ];

package/dist/esm-node/router/runtime/utils.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Route, isRouteErrorResponse } from "@modern-js/runtime-utils/router";
-import { ErrorResponse } from "@modern-js/runtime-utils/remix-router";
+import { UNSAFE_ErrorResponseImpl as ErrorResponseImpl } from "@modern-js/runtime-utils/remix-router";
 import { renderNestedRoute } from "@modern-js/runtime-utils/browser";
 import { DefaultNotFound } from "./DefaultNotFound";
 import DeferredDataScripts from "./DeferredDataScripts";
@@ -121,7 +121,7 @@ function deserializeErrors(errors) {
   const serialized = {};
   for (const [key, val] of entries) {
     if (val && val.__type === "RouteErrorResponse") {
-      serialized[key] = new ErrorResponse(val.status, val.statusText, val.data, val.internal === true);
+      serialized[key] = new ErrorResponseImpl(val.status, val.statusText, val.data, val.internal === true);
     } else if (val && val.__type === "Error") {
       const error = new Error(val.message);
       error.stack = val.stack;

package/dist/esm-node/ssr/serverRender/renderToString/loadable.js

@@ -1,6 +1,5 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { ChunkExtractor } from "@loadable/server";
-import { fs } from "@modern-js/utils";
 import { attributesToString } from "../utils";
 const extname = (uri) => {
   if (typeof uri !== "string" || !uri.includes(".")) {
@@ -20,6 +19,10 @@ const checkIsInline = (chunk, enableInline) => {
     return false;
   }
 };
+const checkIsNode = () => {
+  var _process_release;
+  return typeof process !== "undefined" && ((_process_release = process.release) === null || _process_release === void 0 ? void 0 : _process_release.name) === "node";
+};
 class LoadableCollector {
   get existsAssets() {
     var _routeManifest_routeAssets_entryName, _routeManifest_routeAssets;
@@ -77,15 +80,18 @@ class LoadableCollector {
       var _this_existsAssets;
       const jsChunkReg = new RegExp(`<script .*src="${chunk.url}".*>`);
       return !jsChunkReg.test(template) && !((_this_existsAssets = this.existsAssets) === null || _this_existsAssets === void 0 ? void 0 : _this_existsAssets.includes(chunk.path));
-    }).map((chunk) => {
-      if (checkIsInline(chunk, enableInlineScripts)) {
+    }).map(async (chunk) => {
+      if (checkIsInline(chunk, enableInlineScripts) && checkIsNode()) {
+        const fs = await import("node:fs/promises");
         const filepath = chunk.path;
-        return fs.readFile(filepath, "utf-8").then((content) => `<script>${content}</script>`);
+        return fs.readFile(filepath, "utf-8").then((content) => `<script>${content}</script>`).catch((_) => {
+          return "";
+        });
       } else {
         return `<script${attributes} src="${chunk.url}"></script>`;
       }
     }));
-    chunksMap.js += scripts.join("");
+    chunksMap.js += scripts.filter((script) => Boolean(script)).join("");
   }
   async emitStyleAssets(chunks) {
     const { template, result: { chunksMap }, config: { enableInlineStyles } } = this.options;
@@ -94,14 +100,17 @@ class LoadableCollector {
       var _this_existsAssets;
       const cssChunkReg = new RegExp(`<link .*href="${chunk.url}".*>`);
       return !cssChunkReg.test(template) && !((_this_existsAssets = this.existsAssets) === null || _this_existsAssets === void 0 ? void 0 : _this_existsAssets.includes(chunk.path));
-    }).map((chunk) => {
-      if (checkIsInline(chunk, enableInlineStyles)) {
-        return fs.readFile(chunk.path).then((content) => `<style>${content}</style>`);
+    }).map(async (chunk) => {
+      if (checkIsInline(chunk, enableInlineStyles) && checkIsNode()) {
+        const fs = await import("node:fs/promises");
+        return fs.readFile(chunk.path).then((content) => `<style>${content}</style>`).catch((_) => {
+          return "";
+        });
       } else {
         return `<link${atrributes} href="${chunk.url}" rel="stylesheet" />`;
       }
     }));
-    chunksMap.css += css.join("");
+    chunksMap.css += css.filter((css2) => Boolean(css2)).join("");
   }
   generateAttributes(extraAtr = {}) {
     const { config } = this.options;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.38.0",
+  "version": "2.39.1",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -171,10 +171,10 @@
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/plugin": "2.38.0",
-    "@modern-js/types": "2.38.0",
-    "@modern-js/utils": "2.38.0",
-    "@modern-js/runtime-utils": "2.38.0"
+    "@modern-js/plugin": "2.39.1",
+    "@modern-js/types": "2.39.1",
+    "@modern-js/utils": "2.39.1",
+    "@modern-js/runtime-utils": "2.39.1"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -195,11 +195,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.88.1",
-    "@modern-js/app-tools": "2.38.0",
-    "@modern-js/core": "2.38.0",
-    "@modern-js/server-core": "2.38.0",
-    "@scripts/build": "2.38.0",
-    "@scripts/jest-config": "2.38.0"
+    "@modern-js/app-tools": "2.39.1",
+    "@modern-js/core": "2.39.1",
+    "@modern-js/server-core": "2.39.1",
+    "@scripts/build": "2.39.1",
+    "@scripts/jest-config": "2.39.1"
   },
   "sideEffects": false,
   "publishConfig": {