@modern-js/runtime 3.1.3 → 3.1.5

package/dist/cjs/cli/ssr/loadable-bundler-plugin.js

@@ -38,6 +38,11 @@ __webpack_require__.d(__webpack_exports__, {
 const external_path_namespaceObject = require("path");
 var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
 const utils_namespaceObject = require("@modern-js/utils");
+const normalizeChunkId = (id)=>'string' == typeof id && /^\d+$/.test(id) ? Number(id) : id;
+const normalizeChunkGroup = (group)=>({
+        ...group,
+        chunks: (group.chunks || []).map(normalizeChunkId)
+    });
 class LoadablePlugin {
     apply(compiler) {
         this.compiler = compiler;
@@ -66,13 +71,19 @@ class LoadablePlugin {
             outputPath: true,
             publicPath: true
         });
+        const namedChunkGroups = {};
+        for (const [name, group] of Object.entries(stats.namedChunkGroups || {}))namedChunkGroups[name] = normalizeChunkGroup(group);
+        const entrypoints = {};
+        for (const [name, ep] of Object.entries(stats.entrypoints || {}))entrypoints[name] = normalizeChunkGroup(ep);
         const output = {
             ...stats,
+            namedChunkGroups,
+            entrypoints,
             generator: 'loadable-components',
             chunks: [
                 ...stats.chunks || []
             ].map((chunk)=>({
-                    id: chunk.id,
+                    id: normalizeChunkId(chunk.id),
                     files: [
                         ...chunk.files || []
                     ]

package/dist/cjs/cli/template.js

@@ -93,7 +93,7 @@ const entryForCSRWithRSC = ({ metaName, entryName, urlPath = '/', mountId = 'roo
 
   setServerCallback(callServer);
 
-  const handleRedirectResponse = (res: Response) => {
+  const handleRedirectResponse = (res) => {
     const { headers } = res;
     const location = headers.get('X-Modernjs-Redirect');
     const baseUrl = headers.get('X-Modernjs-BaseUrl');
@@ -189,7 +189,7 @@ const runtimeGlobalContextForRSCServer = ({ metaName })=>`
   import { setGlobalContext } from '@${metaName}/runtime/context';
   import AppProxy from './AppProxy';
 
-  const DefaultRoot = ({ children }: { children?: ReactNode }) =>
+  const DefaultRoot = ({ children }) =>
     createElement(Fragment, null, children);
 
 
@@ -212,7 +212,7 @@ const runtimeGlobalContextForRSCClient = ({ metaName, customEntry })=>`
 
    ${customEntry ? 'setServerCallback(callServer);' : ''}
 
-   ${customEntry ? `const handleRedirectResponse = (res: Response) => {
+   ${customEntry ? `const handleRedirectResponse = (res) => {
      const { headers } = res;
      const location = headers.get('X-Modernjs-Redirect');
      const baseUrl = headers.get('X-Modernjs-BaseUrl');
@@ -237,7 +237,7 @@ const runtimeGlobalContextForRSCClient = ({ metaName, customEntry })=>`
      callServer: callServer,
    })`};` : ''}
 
-   const DefaultRoot = ({ children }: { children?: ReactNode }) =>
+   const DefaultRoot = ({ children }) =>
      createElement(Fragment, null, children);
 
    ${customEntry ? 'const RSCRoot = () => createElement(RscClientRoot, { rscPayload: data });' : ''}

package/dist/cjs/router/cli/code/utils.js

@@ -48,8 +48,8 @@ var external_fs_default = /*#__PURE__*/ __webpack_require__.n(external_fs_namesp
 const external_path_namespaceObject = require("path");
 var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
 const utils_namespaceObject = require("@modern-js/utils");
+const core_namespaceObject = require("@swc/core");
 const external_es_module_lexer_namespaceObject = require("es-module-lexer");
-const external_esbuild_namespaceObject = require("esbuild");
 const external_constants_js_namespaceObject = require("../constants.js");
 const walkDirectory = (dir)=>external_fs_default().readdirSync(dir).reduce((previous, filename)=>{
         const filePath = external_path_default().join(dir, filename);
@@ -79,13 +79,30 @@ const replaceWithAlias = (base, filePath, alias)=>{
 const parseModule = async ({ source, filename })=>{
     let content = source;
     if (utils_namespaceObject.JS_EXTENSIONS.some((ext)=>filename.endsWith(ext))) {
-        const result = await (0, external_esbuild_namespaceObject.transform)(content, {
-            loader: external_path_default().extname(filename).slice(1),
-            format: 'esm',
-            tsconfigRaw: {
-                compilerOptions: {
-                    experimentalDecorators: true
-                }
+        const ext = external_path_default().extname(filename);
+        const isTs = '.ts' === ext || '.tsx' === ext;
+        const isJsx = '.jsx' === ext || '.tsx' === ext;
+        const result = await (0, core_namespaceObject.transform)(content, {
+            filename,
+            isModule: true,
+            module: {
+                type: 'es6'
+            },
+            jsc: {
+                parser: isTs ? {
+                    syntax: "typescript",
+                    tsx: isJsx,
+                    decorators: true
+                } : {
+                    syntax: "ecmascript",
+                    jsx: isJsx,
+                    decorators: true
+                },
+                transform: {
+                    legacyDecorator: true
+                },
+                target: 'es2022',
+                keepClassNames: true
             }
         });
         content = result.code;

package/dist/esm/cli/ssr/loadable-bundler-plugin.mjs

@@ -1,5 +1,10 @@
 import path_0 from "path";
 import { fs } from "@modern-js/utils";
+const normalizeChunkId = (id)=>'string' == typeof id && /^\d+$/.test(id) ? Number(id) : id;
+const normalizeChunkGroup = (group)=>({
+        ...group,
+        chunks: (group.chunks || []).map(normalizeChunkId)
+    });
 class LoadablePlugin {
     apply(compiler) {
         this.compiler = compiler;
@@ -28,13 +33,19 @@ class LoadablePlugin {
             outputPath: true,
             publicPath: true
         });
+        const namedChunkGroups = {};
+        for (const [name, group] of Object.entries(stats.namedChunkGroups || {}))namedChunkGroups[name] = normalizeChunkGroup(group);
+        const entrypoints = {};
+        for (const [name, ep] of Object.entries(stats.entrypoints || {}))entrypoints[name] = normalizeChunkGroup(ep);
         const output = {
             ...stats,
+            namedChunkGroups,
+            entrypoints,
             generator: 'loadable-components',
             chunks: [
                 ...stats.chunks || []
             ].map((chunk)=>({
-                    id: chunk.id,
+                    id: normalizeChunkId(chunk.id),
                     files: [
                         ...chunk.files || []
                     ]

package/dist/esm/cli/template.mjs

@@ -48,7 +48,7 @@ const entryForCSRWithRSC = ({ metaName, entryName, urlPath = '/', mountId = 'roo
 
   setServerCallback(callServer);
 
-  const handleRedirectResponse = (res: Response) => {
+  const handleRedirectResponse = (res) => {
     const { headers } = res;
     const location = headers.get('X-Modernjs-Redirect');
     const baseUrl = headers.get('X-Modernjs-BaseUrl');
@@ -144,7 +144,7 @@ const runtimeGlobalContextForRSCServer = ({ metaName })=>`
   import { setGlobalContext } from '@${metaName}/runtime/context';
   import AppProxy from './AppProxy';
 
-  const DefaultRoot = ({ children }: { children?: ReactNode }) =>
+  const DefaultRoot = ({ children }) =>
     createElement(Fragment, null, children);
 
 
@@ -167,7 +167,7 @@ const runtimeGlobalContextForRSCClient = ({ metaName, customEntry })=>`
 
    ${customEntry ? 'setServerCallback(callServer);' : ''}
 
-   ${customEntry ? `const handleRedirectResponse = (res: Response) => {
+   ${customEntry ? `const handleRedirectResponse = (res) => {
      const { headers } = res;
      const location = headers.get('X-Modernjs-Redirect');
      const baseUrl = headers.get('X-Modernjs-BaseUrl');
@@ -192,7 +192,7 @@ const runtimeGlobalContextForRSCClient = ({ metaName, customEntry })=>`
      callServer: callServer,
    })`};` : ''}
 
-   const DefaultRoot = ({ children }: { children?: ReactNode }) =>
+   const DefaultRoot = ({ children }) =>
      createElement(Fragment, null, children);
 
    ${customEntry ? 'const RSCRoot = () => createElement(RscClientRoot, { rscPayload: data });' : ''}

package/dist/esm/router/cli/code/utils.mjs

@@ -1,8 +1,8 @@
 import fs from "fs";
 import path from "path";
 import { JS_EXTENSIONS, fs as utils_fs, normalizeToPosixPath } from "@modern-js/utils";
+import { transform } from "@swc/core";
 import { parse } from "es-module-lexer";
-import { transform } from "esbuild";
 import { ACTION_EXPORT_NAME, LOADER_EXPORT_NAME } from "../constants.mjs";
 const walkDirectory = (dir)=>fs.readdirSync(dir).reduce((previous, filename)=>{
         const filePath = path.join(dir, filename);
@@ -32,13 +32,30 @@ const replaceWithAlias = (base, filePath, alias)=>{
 const parseModule = async ({ source, filename })=>{
     let content = source;
     if (JS_EXTENSIONS.some((ext)=>filename.endsWith(ext))) {
+        const ext = path.extname(filename);
+        const isTs = '.ts' === ext || '.tsx' === ext;
+        const isJsx = '.jsx' === ext || '.tsx' === ext;
         const result = await transform(content, {
-            loader: path.extname(filename).slice(1),
-            format: 'esm',
-            tsconfigRaw: {
-                compilerOptions: {
-                    experimentalDecorators: true
-                }
+            filename,
+            isModule: true,
+            module: {
+                type: 'es6'
+            },
+            jsc: {
+                parser: isTs ? {
+                    syntax: "typescript",
+                    tsx: isJsx,
+                    decorators: true
+                } : {
+                    syntax: "ecmascript",
+                    jsx: isJsx,
+                    decorators: true
+                },
+                transform: {
+                    legacyDecorator: true
+                },
+                target: 'es2022',
+                keepClassNames: true
             }
         });
         content = result.code;

package/dist/esm-node/cli/ssr/loadable-bundler-plugin.mjs

@@ -1,6 +1,11 @@
 import "node:module";
 import path_0 from "path";
 import { fs } from "@modern-js/utils";
+const normalizeChunkId = (id)=>'string' == typeof id && /^\d+$/.test(id) ? Number(id) : id;
+const normalizeChunkGroup = (group)=>({
+        ...group,
+        chunks: (group.chunks || []).map(normalizeChunkId)
+    });
 class LoadablePlugin {
     apply(compiler) {
         this.compiler = compiler;
@@ -29,13 +34,19 @@ class LoadablePlugin {
             outputPath: true,
             publicPath: true
         });
+        const namedChunkGroups = {};
+        for (const [name, group] of Object.entries(stats.namedChunkGroups || {}))namedChunkGroups[name] = normalizeChunkGroup(group);
+        const entrypoints = {};
+        for (const [name, ep] of Object.entries(stats.entrypoints || {}))entrypoints[name] = normalizeChunkGroup(ep);
         const output = {
             ...stats,
+            namedChunkGroups,
+            entrypoints,
             generator: 'loadable-components',
             chunks: [
                 ...stats.chunks || []
             ].map((chunk)=>({
-                    id: chunk.id,
+                    id: normalizeChunkId(chunk.id),
                     files: [
                         ...chunk.files || []
                     ]

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

@@ -49,7 +49,7 @@ const entryForCSRWithRSC = ({ metaName, entryName, urlPath = '/', mountId = 'roo
 
   setServerCallback(callServer);
 
-  const handleRedirectResponse = (res: Response) => {
+  const handleRedirectResponse = (res) => {
     const { headers } = res;
     const location = headers.get('X-Modernjs-Redirect');
     const baseUrl = headers.get('X-Modernjs-BaseUrl');
@@ -145,7 +145,7 @@ const runtimeGlobalContextForRSCServer = ({ metaName })=>`
   import { setGlobalContext } from '@${metaName}/runtime/context';
   import AppProxy from './AppProxy';
 
-  const DefaultRoot = ({ children }: { children?: ReactNode }) =>
+  const DefaultRoot = ({ children }) =>
     createElement(Fragment, null, children);
 
 
@@ -168,7 +168,7 @@ const runtimeGlobalContextForRSCClient = ({ metaName, customEntry })=>`
 
    ${customEntry ? 'setServerCallback(callServer);' : ''}
 
-   ${customEntry ? `const handleRedirectResponse = (res: Response) => {
+   ${customEntry ? `const handleRedirectResponse = (res) => {
      const { headers } = res;
      const location = headers.get('X-Modernjs-Redirect');
      const baseUrl = headers.get('X-Modernjs-BaseUrl');
@@ -193,7 +193,7 @@ const runtimeGlobalContextForRSCClient = ({ metaName, customEntry })=>`
      callServer: callServer,
    })`};` : ''}
 
-   const DefaultRoot = ({ children }: { children?: ReactNode }) =>
+   const DefaultRoot = ({ children }) =>
      createElement(Fragment, null, children);
 
    ${customEntry ? 'const RSCRoot = () => createElement(RscClientRoot, { rscPayload: data });' : ''}

package/dist/esm-node/router/cli/code/utils.mjs

@@ -2,8 +2,8 @@ import "node:module";
 import fs from "fs";
 import path from "path";
 import { JS_EXTENSIONS, fs as utils_fs, normalizeToPosixPath } from "@modern-js/utils";
+import { transform } from "@swc/core";
 import { parse } from "es-module-lexer";
-import { transform } from "esbuild";
 import { ACTION_EXPORT_NAME, LOADER_EXPORT_NAME } from "../constants.mjs";
 const walkDirectory = (dir)=>fs.readdirSync(dir).reduce((previous, filename)=>{
         const filePath = path.join(dir, filename);
@@ -33,13 +33,30 @@ const replaceWithAlias = (base, filePath, alias)=>{
 const parseModule = async ({ source, filename })=>{
     let content = source;
     if (JS_EXTENSIONS.some((ext)=>filename.endsWith(ext))) {
+        const ext = path.extname(filename);
+        const isTs = '.ts' === ext || '.tsx' === ext;
+        const isJsx = '.jsx' === ext || '.tsx' === ext;
         const result = await transform(content, {
-            loader: path.extname(filename).slice(1),
-            format: 'esm',
-            tsconfigRaw: {
-                compilerOptions: {
-                    experimentalDecorators: true
-                }
+            filename,
+            isModule: true,
+            module: {
+                type: 'es6'
+            },
+            jsc: {
+                parser: isTs ? {
+                    syntax: "typescript",
+                    tsx: isJsx,
+                    decorators: true
+                } : {
+                    syntax: "ecmascript",
+                    jsx: isJsx,
+                    decorators: true
+                },
+                transform: {
+                    legacyDecorator: true
+                },
+                target: 'es2022',
+                keepClassNames: true
             }
         });
         content = result.code;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.1.3",
+  "version": "3.1.5",
   "engines": {
     "node": ">=20"
   },
@@ -204,23 +204,23 @@
     "@loadable/component": "5.16.7",
     "@loadable/server": "5.16.7",
     "@swc/helpers": "^0.5.17",
+    "@swc/core": "1.15.11",
     "@swc/plugin-loadable-components": "^11.5.0",
     "@types/loadable__component": "^5.13.10",
     "@types/react-helmet": "^6.1.11",
     "cookie": "0.7.2",
     "entities": "^7.0.1",
     "es-module-lexer": "^1.7.0",
-    "esbuild": "0.25.5",
     "invariant": "^2.2.4",
     "isbot": "3.8.0",
     "react-helmet": "^6.1.0",
     "react-is": "^18.3.1",
-    "@modern-js/plugin": "3.1.3",
-    "@modern-js/runtime-utils": "3.1.3",
-    "@modern-js/render": "3.1.3",
-    "@modern-js/plugin-data-loader": "3.1.3",
-    "@modern-js/utils": "3.1.3",
-    "@modern-js/types": "3.1.3"
+    "@modern-js/render": "3.1.5",
+    "@modern-js/plugin": "3.1.5",
+    "@modern-js/plugin-data-loader": "3.1.5",
+    "@modern-js/runtime-utils": "3.1.5",
+    "@modern-js/types": "3.1.5",
+    "@modern-js/utils": "3.1.5"
   },
   "peerDependencies": {
     "react": ">=17.0.2",
@@ -228,8 +228,8 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rsbuild/core": "2.0.0-rc.0",
-    "@rslib/core": "0.21.0",
+    "@rsbuild/core": "2.0.0",
+    "@rslib/core": "0.21.2",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
     "@types/cookie": "0.6.0",
@@ -240,9 +240,9 @@
     "react-dom": "^19.2.4",
     "ts-node": "^10.9.2",
     "typescript": "^5",
-    "@modern-js/app-tools": "3.1.3",
     "@modern-js/rslib": "2.68.10",
-    "@scripts/rstest-config": "2.66.0"
+    "@scripts/rstest-config": "2.66.0",
+    "@modern-js/app-tools": "3.1.5"
   },
   "sideEffects": false,
   "publishConfig": {