@modern-js/runtime 2.63.0 → 2.63.1

package/dist/cjs/cli/template.js

@@ -89,7 +89,7 @@ const runtimeGlobalContext = ({ srcDirectory, internalSrcAlias, metaName, entry,
   return `import { setGlobalContext } from '@${metaName}/runtime/context'
 
 import App from '${// We need to get the path of App.tsx here, but the entry is `src/entry.tsx`
-  (0, import_utils.formatImportPath)(customEntry ? entry.replace("entry.tsx", "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(".tsx", ""))}';
+  (0, import_utils.formatImportPath)(customEntry ? entry.replace(/entry\.[tj]sx/, "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(/\.[tj]sx/, ""))}';
 
 setGlobalContext({
   App,

package/dist/cjs/router/runtime/plugin.node.js

@@ -109,9 +109,11 @@ const routerPlugin = (userConfig = {}) => {
           if (routerContext instanceof Response) {
             return interrupt(routerContext);
           }
-          if (routerContext.statusCode >= 500 && routerContext.statusCode < 600 && loaderFailureMode === "clientRender") {
+          if (routerContext.statusCode >= 500 && routerContext.statusCode < 600 && // TODO: if loaderFailureMode is not 'errroBoundary', error log will not be printed.
+          loaderFailureMode === "clientRender") {
             routerContext.statusCode = 200;
-            throw routerContext.errors[0];
+            const errors = Object.values(routerContext.errors);
+            throw errors[0];
           }
           const router = (0, import_router.createStaticRouter)(routes, routerContext);
           context.routerContext = routerContext;

package/dist/esm/cli/template.js

@@ -44,7 +44,7 @@ var runtimeRegister = function(param) {
 };
 var runtimeGlobalContext = function(param) {
   var srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias, metaName = param.metaName, entry = param.entry, customEntry = param.customEntry;
-  return "import { setGlobalContext } from '@".concat(metaName, "/runtime/context'\n\nimport App from '").concat(formatImportPath(customEntry ? entry.replace("entry.tsx", "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(".tsx", "")), "';\n\nsetGlobalContext({\n  App,\n});");
+  return "import { setGlobalContext } from '@".concat(metaName, "/runtime/context'\n\nimport App from '").concat(formatImportPath(customEntry ? entry.replace(/entry\.[tj]sx/, "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(/\.[tj]sx/, "")), "';\n\nsetGlobalContext({\n  App,\n});");
 };
 export {
   index,

package/dist/esm/router/runtime/plugin.node.js

@@ -40,7 +40,7 @@ var routerPlugin = function() {
       return {
         beforeRender: function beforeRender(context, interrupt) {
           return _async_to_generator(function() {
-            var _context_ssrContext, _context_ssrContext_onTiming, _context_ssrContext1, pluginConfig, _merge, _merge_basename, basename, routesConfig, createRoutes, _context_ssrContext2, request, ssrMode, nonce, _context_ssrContext_loaderFailureMode, loaderFailureMode, baseUrl, _basename, reporter, requestContext, runner, routes, query, remixRequest, end, routerContext, cost, router;
+            var _context_ssrContext, _context_ssrContext_onTiming, _context_ssrContext1, pluginConfig, _merge, _merge_basename, basename, routesConfig, createRoutes, _context_ssrContext2, request, ssrMode, nonce, _context_ssrContext_loaderFailureMode, loaderFailureMode, baseUrl, _basename, reporter, requestContext, runner, routes, query, remixRequest, end, routerContext, cost, errors, router;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -98,9 +98,11 @@ var routerPlugin = function() {
                       interrupt(routerContext)
                     ];
                   }
-                  if (routerContext.statusCode >= 500 && routerContext.statusCode < 600 && loaderFailureMode === "clientRender") {
+                  if (routerContext.statusCode >= 500 && routerContext.statusCode < 600 && // TODO: if loaderFailureMode is not 'errroBoundary', error log will not be printed.
+                  loaderFailureMode === "clientRender") {
                     routerContext.statusCode = 200;
-                    throw routerContext.errors[0];
+                    errors = Object.values(routerContext.errors);
+                    throw errors[0];
                   }
                   router = createStaticRouter(routes, routerContext);
                   context.routerContext = routerContext;

package/dist/esm-node/cli/template.js

@@ -53,7 +53,7 @@ const runtimeGlobalContext = ({ srcDirectory, internalSrcAlias, metaName, entry,
   return `import { setGlobalContext } from '@${metaName}/runtime/context'
 
 import App from '${// We need to get the path of App.tsx here, but the entry is `src/entry.tsx`
-  formatImportPath(customEntry ? entry.replace("entry.tsx", "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(".tsx", ""))}';
+  formatImportPath(customEntry ? entry.replace(/entry\.[tj]sx/, "App").replace(srcDirectory, internalSrcAlias) : entry.replace(srcDirectory, internalSrcAlias).replace(/\.[tj]sx/, ""))}';
 
 setGlobalContext({
   App,

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

@@ -75,9 +75,11 @@ const routerPlugin = (userConfig = {}) => {
           if (routerContext instanceof Response) {
             return interrupt(routerContext);
           }
-          if (routerContext.statusCode >= 500 && routerContext.statusCode < 600 && loaderFailureMode === "clientRender") {
+          if (routerContext.statusCode >= 500 && routerContext.statusCode < 600 && // TODO: if loaderFailureMode is not 'errroBoundary', error log will not be printed.
+          loaderFailureMode === "clientRender") {
             routerContext.statusCode = 200;
-            throw routerContext.errors[0];
+            const errors = Object.values(routerContext.errors);
+            throw errors[0];
           }
           const router = createStaticRouter(routes, routerContext);
           context.routerContext = routerContext;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.63.0",
+  "version": "2.63.1",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -200,11 +200,11 @@
     "react-is": "^18",
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.63.0",
-    "@modern-js/plugin-data-loader": "2.63.0",
-    "@modern-js/types": "2.63.0",
-    "@modern-js/utils": "2.63.0",
-    "@modern-js/runtime-utils": "2.63.0"
+    "@modern-js/plugin-data-loader": "2.63.1",
+    "@modern-js/runtime-utils": "2.63.1",
+    "@modern-js/plugin": "2.63.1",
+    "@modern-js/types": "2.63.1",
+    "@modern-js/utils": "2.63.1"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -212,7 +212,7 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rsbuild/core": "~1.1.5",
+    "@rsbuild/core": "1.1.8",
     "@testing-library/react": "^13.4.0",
     "@types/cookie": "0.6.0",
     "@types/invariant": "^2.2.30",
@@ -228,10 +228,10 @@
     "ts-node": "^10.9.1",
     "typescript": "^5",
     "webpack": "^5.96.1",
-    "@modern-js/app-tools": "2.63.0",
-    "@scripts/jest-config": "2.63.0",
-    "@modern-js/core": "2.63.0",
-    "@scripts/build": "2.63.0"
+    "@modern-js/app-tools": "2.63.1",
+    "@scripts/build": "2.63.1",
+    "@modern-js/core": "2.63.1",
+    "@scripts/jest-config": "2.63.1"
   },
   "sideEffects": false,
   "publishConfig": {