@modern-js/runtime 2.63.2 → 2.63.3

package/dist/cjs/core/server/string/loadable.js

@@ -80,8 +80,18 @@ class LoadableCollector {
     if (!this.extractor) {
       return;
     }
-    const { extractor } = this;
-    const chunks = extractor.getChunkAssets(extractor.chunks);
+    const { extractor, options } = this;
+    const { entryName, config } = options;
+    const asyncChunks = [];
+    if (config.enableAsyncEntry) {
+      try {
+        asyncChunks.push(...extractor.getChunkAssets([
+          `async-${entryName}`
+        ]));
+      } catch (e) {
+      }
+    }
+    const chunks = [].concat(asyncChunks).concat(extractor.getChunkAssets(extractor.chunks));
     const scriptChunks = generateChunks(chunks, "js");
     const styleChunks = generateChunks(chunks, "css");
     this.emitLoadableScripts(extractor);
@@ -132,7 +142,7 @@ class LoadableCollector {
     chunkSet.jsChunk += scripts.filter((script) => Boolean(script)).join("");
   }
   async emitStyleAssets(chunks) {
-    const { template, chunkSet, config } = this.options;
+    const { template, chunkSet, config, entryName } = this.options;
     const { enableInlineStyles } = config;
     const atrributes = (0, import_utils.attributesToString)(this.generateAttributes());
     const linkRegExp = /<link .*?href="([^"]+)".*?>/g;

package/dist/esm/core/server/string/loadable.js

@@ -3,6 +3,7 @@ import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _create_class } from "@swc/helpers/_/_create_class";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { ChunkExtractor } from "@loadable/server";
 import { attributesToString, checkIsNode } from "../utils";
@@ -83,7 +84,7 @@ var LoadableCollector = /* @__PURE__ */ function() {
   _proto.effect = function effect() {
     var _this = this;
     return _async_to_generator(function() {
-      var extractor, chunks, scriptChunks, styleChunks;
+      var extractor, options, entryName, config, asyncChunks, _asyncChunks, chunks, scriptChunks, styleChunks;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
@@ -92,8 +93,19 @@ var LoadableCollector = /* @__PURE__ */ function() {
                 2
               ];
             }
-            extractor = _this.extractor;
-            chunks = extractor.getChunkAssets(extractor.chunks);
+            extractor = _this.extractor, options = _this.options;
+            entryName = options.entryName, config = options.config;
+            asyncChunks = [];
+            if (config.enableAsyncEntry) {
+              try {
+                ;
+                (_asyncChunks = asyncChunks).push.apply(_asyncChunks, _to_consumable_array(extractor.getChunkAssets([
+                  "async-".concat(entryName)
+                ])));
+              } catch (e) {
+              }
+            }
+            chunks = [].concat(asyncChunks).concat(extractor.getChunkAssets(extractor.chunks));
             scriptChunks = generateChunks(chunks, "js");
             styleChunks = generateChunks(chunks, "css");
             _this.emitLoadableScripts(extractor);
@@ -220,11 +232,11 @@ var LoadableCollector = /* @__PURE__ */ function() {
   _proto.emitStyleAssets = function emitStyleAssets(chunks) {
     var _this = this;
     return _async_to_generator(function() {
-      var _this_options, template, chunkSet, config, enableInlineStyles, atrributes, linkRegExp, matchs, existedLinks, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, match, css;
+      var _this_options, template, chunkSet, config, entryName, enableInlineStyles, atrributes, linkRegExp, matchs, existedLinks, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, match, css;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
-            _this_options = _this.options, template = _this_options.template, chunkSet = _this_options.chunkSet, config = _this_options.config;
+            _this_options = _this.options, template = _this_options.template, chunkSet = _this_options.chunkSet, config = _this_options.config, entryName = _this_options.entryName;
             enableInlineStyles = config.enableInlineStyles;
             atrributes = attributesToString(_this.generateAttributes());
             linkRegExp = /<link .*?href="([^"]+)".*?>/g;

package/dist/esm-node/core/server/string/loadable.js

@@ -47,8 +47,18 @@ class LoadableCollector {
     if (!this.extractor) {
       return;
     }
-    const { extractor } = this;
-    const chunks = extractor.getChunkAssets(extractor.chunks);
+    const { extractor, options } = this;
+    const { entryName, config } = options;
+    const asyncChunks = [];
+    if (config.enableAsyncEntry) {
+      try {
+        asyncChunks.push(...extractor.getChunkAssets([
+          `async-${entryName}`
+        ]));
+      } catch (e) {
+      }
+    }
+    const chunks = [].concat(asyncChunks).concat(extractor.getChunkAssets(extractor.chunks));
     const scriptChunks = generateChunks(chunks, "js");
     const styleChunks = generateChunks(chunks, "css");
     this.emitLoadableScripts(extractor);
@@ -99,7 +109,7 @@ class LoadableCollector {
     chunkSet.jsChunk += scripts.filter((script) => Boolean(script)).join("");
   }
   async emitStyleAssets(chunks) {
-    const { template, chunkSet, config } = this.options;
+    const { template, chunkSet, config, entryName } = this.options;
     const { enableInlineStyles } = config;
     const atrributes = attributesToString(this.generateAttributes());
     const linkRegExp = /<link .*?href="([^"]+)".*?>/g;

package/dist/types/core/server/string/loadable.d.ts

@@ -2,8 +2,8 @@ import type { ReactElement } from 'react';
 import type { ChunkSet, Collector } from './types';
 declare module '@loadable/server' {
     interface ChunkExtractor {
-        chunks: Chunk;
-        getChunkAssets: (chunks: Chunk) => Chunk[];
+        chunks: string[];
+        getChunkAssets: (chunks: string[]) => Chunk[];
     }
 }
 export interface LoadableCollectorOptions {
@@ -20,6 +20,7 @@ export interface LoadableCollectorConfig {
     enableInlineStyles?: boolean | RegExp;
     enableInlineScripts?: boolean | RegExp;
     crossorigin?: boolean | 'anonymous' | 'use-credentials';
+    enableAsyncEntry?: boolean;
 }
 export declare class LoadableCollector implements Collector {
     private options;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.63.2",
+  "version": "2.63.3",
   "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.2",
-    "@modern-js/types": "2.63.2",
-    "@modern-js/utils": "2.63.2",
-    "@modern-js/runtime-utils": "2.63.2",
-    "@modern-js/plugin-data-loader": "2.63.2"
+    "@modern-js/plugin": "2.63.3",
+    "@modern-js/plugin-data-loader": "2.63.3",
+    "@modern-js/types": "2.63.3",
+    "@modern-js/runtime-utils": "2.63.3",
+    "@modern-js/utils": "2.63.3"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -212,7 +212,7 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rsbuild/core": "1.1.9",
+    "@rsbuild/core": "1.1.10",
     "@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.97.1",
-    "@modern-js/app-tools": "2.63.2",
-    "@modern-js/core": "2.63.2",
-    "@scripts/build": "2.63.2",
-    "@scripts/jest-config": "2.63.2"
+    "@modern-js/app-tools": "2.63.3",
+    "@modern-js/core": "2.63.3",
+    "@scripts/build": "2.63.3",
+    "@scripts/jest-config": "2.63.3"
   },
   "sideEffects": false,
   "publishConfig": {