@modern-js/runtime 2.23.1 → 2.24.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @modern-js/runtime
 
+## 2.24.0
+
+### Patch Changes
+
+- c882fbd: feat: support config main entry name
+
+  feat: 支持配置主入口名称
+
+- 56693a3: fix(plugin-ssr): ssr script、link should add some attrs, like ["defer", "crossorigin"]
+  fix(plugin-ssr): ssr script,link 标签应该添加像 ["defer", "crossorigin"] 属性
+- Updated dependencies [c882fbd]
+- Updated dependencies [4a82c3b]
+  - @modern-js/types@2.24.0
+  - @modern-js/utils@2.24.0
+  - @modern-js/plugin@2.24.0
+
 ## 2.23.1
 
 ### Patch Changes

package/dist/cjs/router/cli/index.js

@@ -54,10 +54,10 @@ const _default = () => {
           ];
         },
         modifyEntryImports({ entrypoint, imports }) {
-          const { entryName, fileSystemRoutes } = entrypoint;
+          const { entryName, isMainEntry, fileSystemRoutes } = entrypoint;
           const userConfig = api.useResolvedConfigContext();
           const { packageName } = api.useAppContext();
-          const runtimeConfig = (0, _utils.getEntryOptions)(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
+          const runtimeConfig = (0, _utils.getEntryOptions)(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName);
           runtimeConfigMap.set(entryName, runtimeConfig);
           if (runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) {
             if (!(0, _utils.isRouterV5)(userConfig)) {

package/dist/cjs/ssr/cli/index.js

@@ -93,14 +93,14 @@ const _default = () => {
           };
         },
         modifyEntryImports({ entrypoint, imports }) {
-          const { entryName, fileSystemRoutes } = entrypoint;
+          const { entryName, isMainEntry, fileSystemRoutes } = entrypoint;
           const userConfig = api.useResolvedConfigContext();
           const { packageName, entrypoints } = api.useAppContext();
           pluginsExportsUtils.addExport(`export { default as ssr } from '@modern-js/runtime/ssr'`);
-          const ssrConfig = (0, _utils.getEntryOptions)(entryName, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
+          const ssrConfig = (0, _utils.getEntryOptions)(entryName, isMainEntry, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
           if (typeof ssrConfig === "object" && ssrConfig.mode === "stream") {
             var _ref;
-            const runtimeConfig = (0, _utils.getEntryOptions)(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
+            const runtimeConfig = (0, _utils.getEntryOptions)(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName);
             if (((_ref = runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) === null || _ref === void 0 ? void 0 : _ref.mode) === "react-router-5") {
               throw new Error(`router v5 plugin doesn't support streaming SSR, check your config 'runtime.router'`);
             }
@@ -128,11 +128,15 @@ const _default = () => {
         modifyEntryRuntimePlugins({ entrypoint, plugins, bundlerConfigs }) {
           if (ssrConfigMap.get(entrypoint.entryName)) {
             var _bundlerConfigs_find, _bundlerConfigs_find_output;
-            const chunkLoadingGlobal = (_bundlerConfigs_find = bundlerConfigs === null || bundlerConfigs === void 0 ? void 0 : bundlerConfigs.find((config) => config.name === "client")) === null || _bundlerConfigs_find === void 0 ? void 0 : (_bundlerConfigs_find_output = _bundlerConfigs_find.output) === null || _bundlerConfigs_find_output === void 0 ? void 0 : _bundlerConfigs_find_output.chunkLoadingGlobal;
+            const chunkLoadingGlobal = (_bundlerConfigs_find = bundlerConfigs === null || bundlerConfigs === void 0 ? void 0 : bundlerConfigs.find((config2) => config2.name === "client")) === null || _bundlerConfigs_find === void 0 ? void 0 : (_bundlerConfigs_find_output = _bundlerConfigs_find.output) === null || _bundlerConfigs_find_output === void 0 ? void 0 : _bundlerConfigs_find_output.chunkLoadingGlobal;
+            const config = api.useResolvedConfigContext();
+            const { crossorigin, scriptLoading } = config.html;
             plugins.push({
               name: PLUGIN_IDENTIFIER,
               options: JSON.stringify({
                 ...ssrConfigMap.get(entrypoint.entryName) || {},
+                crossorigin,
+                scriptLoading,
                 chunkLoadingGlobal
               })
             });

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

@@ -33,18 +33,26 @@ const toHtml = (jsx, renderer, next) => {
   chunksMap.js = (chunksMap.js || "") + (0, _utils1.getLoadableScripts)(extractor);
   for (const v of chunks) {
     const fileType = extname(v.url).slice(1);
+    const attributes = {};
+    const { crossorigin, scriptLoading = "defer" } = config;
+    if (crossorigin && (0, _utils.isCrossOrigin)(v.url, host)) {
+      attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
+    }
+    switch (scriptLoading) {
+      case "defer":
+        attributes.defer = true;
+        break;
+      case "module":
+        attributes.type = "module";
+        break;
+      default:
+    }
     if (fileType === "js") {
-      const attributes = {
-        nonce
-      };
-      const { crossorigin } = config;
-      if (crossorigin && (0, _utils.isCrossOrigin)(v.url, host)) {
-        attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
-      }
+      attributes.nonce = nonce;
       const attrsStr = (0, _utils1.attributesToString)(attributes);
       chunksMap[fileType] += `<script${attrsStr} src="${v.url}"></script>`;
     } else if (fileType === "css") {
-      chunksMap[fileType] += `<link href="${v.url}" rel="stylesheet" />`;
+      chunksMap[fileType] += `<link${attributes} href="${v.url}" rel="stylesheet" />`;
     }
   }
   return html;

package/dist/cjs/state/cli/index.js

@@ -33,10 +33,10 @@ const _default = () => {
         },
         modifyEntryImports({ entrypoint, imports }) {
           var _getEntryOptions;
-          const { entryName } = entrypoint;
+          const { entryName, isMainEntry } = entrypoint;
           const userConfig = api.useResolvedConfigContext();
           const { packageName } = api.useAppContext();
-          const stateConfig = (_getEntryOptions = (0, _utils.getEntryOptions)(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
+          const stateConfig = (_getEntryOptions = (0, _utils.getEntryOptions)(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
           stateConfigMap.set(entryName, stateConfig);
           if (stateConfig) {
             imports.push({

package/dist/esm/router/cli/index.js

@@ -47,10 +47,10 @@ export default function() {
         },
         modifyEntryImports: function modifyEntryImports(param) {
           var entrypoint = param.entrypoint, imports = param.imports;
-          var entryName = entrypoint.entryName, fileSystemRoutes = entrypoint.fileSystemRoutes;
+          var entryName = entrypoint.entryName, isMainEntry = entrypoint.isMainEntry, fileSystemRoutes = entrypoint.fileSystemRoutes;
           var userConfig = api.useResolvedConfigContext();
           var packageName = api.useAppContext().packageName;
-          var runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
+          var runtimeConfig = getEntryOptions(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName);
           runtimeConfigMap.set(entryName, runtimeConfig);
           if (runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) {
             if (!isV5(userConfig)) {

package/dist/esm/ssr/cli/index.js

@@ -106,14 +106,14 @@ export default function() {
         },
         modifyEntryImports: function modifyEntryImports(param) {
           var entrypoint = param.entrypoint, imports = param.imports;
-          var entryName = entrypoint.entryName, fileSystemRoutes = entrypoint.fileSystemRoutes;
+          var entryName = entrypoint.entryName, isMainEntry = entrypoint.isMainEntry, fileSystemRoutes = entrypoint.fileSystemRoutes;
           var userConfig = api.useResolvedConfigContext();
           var _api_useAppContext = api.useAppContext(), packageName = _api_useAppContext.packageName, entrypoints = _api_useAppContext.entrypoints;
           pluginsExportsUtils.addExport("export { default as ssr } from '@modern-js/runtime/ssr'");
-          var ssrConfig = getEntryOptions(entryName, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
+          var ssrConfig = getEntryOptions(entryName, isMainEntry, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
           if (typeof ssrConfig === "object" && ssrConfig.mode === "stream") {
             var _ref;
-            var runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
+            var runtimeConfig = getEntryOptions(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName);
             if (((_ref = runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) === null || _ref === void 0 ? void 0 : _ref.mode) === "react-router-5") {
               throw new Error("router v5 plugin doesn't support streaming SSR, check your config 'runtime.router'");
             }
@@ -142,12 +142,16 @@ export default function() {
           var entrypoint = param.entrypoint, plugins = param.plugins, bundlerConfigs = param.bundlerConfigs;
           if (ssrConfigMap.get(entrypoint.entryName)) {
             var _bundlerConfigs_find, _bundlerConfigs_find_output;
-            var chunkLoadingGlobal = (_bundlerConfigs_find = bundlerConfigs === null || bundlerConfigs === void 0 ? void 0 : bundlerConfigs.find(function(config) {
-              return config.name === "client";
+            var chunkLoadingGlobal = (_bundlerConfigs_find = bundlerConfigs === null || bundlerConfigs === void 0 ? void 0 : bundlerConfigs.find(function(config2) {
+              return config2.name === "client";
             })) === null || _bundlerConfigs_find === void 0 ? void 0 : (_bundlerConfigs_find_output = _bundlerConfigs_find.output) === null || _bundlerConfigs_find_output === void 0 ? void 0 : _bundlerConfigs_find_output.chunkLoadingGlobal;
+            var config = api.useResolvedConfigContext();
+            var _config_html = config.html, crossorigin = _config_html.crossorigin, scriptLoading = _config_html.scriptLoading;
             plugins.push({
               name: PLUGIN_IDENTIFIER,
               options: JSON.stringify(_object_spread_props(_object_spread({}, ssrConfigMap.get(entrypoint.entryName) || {}), {
+                crossorigin: crossorigin,
+                scriptLoading: scriptLoading,
                 chunkLoadingGlobal: chunkLoadingGlobal
               }))
             });

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

@@ -26,18 +26,26 @@ export var toHtml = function(jsx, renderer, next) {
     for (var _iterator = chunks[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
       var v = _step.value;
       var fileType = extname(v.url).slice(1);
+      var attributes = {};
+      var crossorigin = config.crossorigin, _config_scriptLoading = config.scriptLoading, scriptLoading = _config_scriptLoading === void 0 ? "defer" : _config_scriptLoading;
+      if (crossorigin && isCrossOrigin(v.url, host)) {
+        attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
+      }
+      switch (scriptLoading) {
+        case "defer":
+          attributes.defer = true;
+          break;
+        case "module":
+          attributes.type = "module";
+          break;
+        default:
+      }
       if (fileType === "js") {
-        var attributes = {
-          nonce: nonce
-        };
-        var crossorigin = config.crossorigin;
-        if (crossorigin && isCrossOrigin(v.url, host)) {
-          attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
-        }
+        attributes.nonce = nonce;
         var attrsStr = attributesToString(attributes);
         chunksMap[fileType] += "<script".concat(attrsStr, ' src="').concat(v.url, '"></script>');
       } else if (fileType === "css") {
-        chunksMap[fileType] += '<link href="'.concat(v.url, '" rel="stylesheet" />');
+        chunksMap[fileType] += "<link".concat(attributes, ' href="').concat(v.url, '" rel="stylesheet" />');
       }
     }
   } catch (err) {

package/dist/esm/state/cli/index.js

@@ -24,10 +24,10 @@ export default function() {
         modifyEntryImports: function modifyEntryImports(param) {
           var entrypoint = param.entrypoint, imports = param.imports;
           var _getEntryOptions;
-          var entryName = entrypoint.entryName;
+          var entryName = entrypoint.entryName, isMainEntry = entrypoint.isMainEntry;
           var userConfig = api.useResolvedConfigContext();
           var packageName = api.useAppContext().packageName;
-          var stateConfig = (_getEntryOptions = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
+          var stateConfig = (_getEntryOptions = getEntryOptions(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
           stateConfigMap.set(entryName, stateConfig);
           if (stateConfig) {
             imports.push({

package/dist/esm-node/router/cli/index.js

@@ -44,10 +44,10 @@ export default () => {
           ];
         },
         modifyEntryImports({ entrypoint, imports }) {
-          const { entryName, fileSystemRoutes } = entrypoint;
+          const { entryName, isMainEntry, fileSystemRoutes } = entrypoint;
           const userConfig = api.useResolvedConfigContext();
           const { packageName } = api.useAppContext();
-          const runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
+          const runtimeConfig = getEntryOptions(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName);
           runtimeConfigMap.set(entryName, runtimeConfig);
           if (runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) {
             if (!isV5(userConfig)) {

package/dist/esm-node/ssr/cli/index.js

@@ -82,14 +82,14 @@ export default () => {
           };
         },
         modifyEntryImports({ entrypoint, imports }) {
-          const { entryName, fileSystemRoutes } = entrypoint;
+          const { entryName, isMainEntry, fileSystemRoutes } = entrypoint;
           const userConfig = api.useResolvedConfigContext();
           const { packageName, entrypoints } = api.useAppContext();
           pluginsExportsUtils.addExport(`export { default as ssr } from '@modern-js/runtime/ssr'`);
-          const ssrConfig = getEntryOptions(entryName, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
+          const ssrConfig = getEntryOptions(entryName, isMainEntry, userConfig.server.ssr, userConfig.server.ssrByEntries, packageName);
           if (typeof ssrConfig === "object" && ssrConfig.mode === "stream") {
             var _ref;
-            const runtimeConfig = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName);
+            const runtimeConfig = getEntryOptions(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName);
             if (((_ref = runtimeConfig === null || runtimeConfig === void 0 ? void 0 : runtimeConfig.router) === null || _ref === void 0 ? void 0 : _ref.mode) === "react-router-5") {
               throw new Error(`router v5 plugin doesn't support streaming SSR, check your config 'runtime.router'`);
             }
@@ -117,11 +117,15 @@ export default () => {
         modifyEntryRuntimePlugins({ entrypoint, plugins, bundlerConfigs }) {
           if (ssrConfigMap.get(entrypoint.entryName)) {
             var _bundlerConfigs_find, _bundlerConfigs_find_output;
-            const chunkLoadingGlobal = (_bundlerConfigs_find = bundlerConfigs === null || bundlerConfigs === void 0 ? void 0 : bundlerConfigs.find((config) => config.name === "client")) === null || _bundlerConfigs_find === void 0 ? void 0 : (_bundlerConfigs_find_output = _bundlerConfigs_find.output) === null || _bundlerConfigs_find_output === void 0 ? void 0 : _bundlerConfigs_find_output.chunkLoadingGlobal;
+            const chunkLoadingGlobal = (_bundlerConfigs_find = bundlerConfigs === null || bundlerConfigs === void 0 ? void 0 : bundlerConfigs.find((config2) => config2.name === "client")) === null || _bundlerConfigs_find === void 0 ? void 0 : (_bundlerConfigs_find_output = _bundlerConfigs_find.output) === null || _bundlerConfigs_find_output === void 0 ? void 0 : _bundlerConfigs_find_output.chunkLoadingGlobal;
+            const config = api.useResolvedConfigContext();
+            const { crossorigin, scriptLoading } = config.html;
             plugins.push({
               name: PLUGIN_IDENTIFIER,
               options: JSON.stringify({
                 ...ssrConfigMap.get(entrypoint.entryName) || {},
+                crossorigin,
+                scriptLoading,
                 chunkLoadingGlobal
               })
             });

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

@@ -23,18 +23,26 @@ export const toHtml = (jsx, renderer, next) => {
   chunksMap.js = (chunksMap.js || "") + getLoadableScripts(extractor);
   for (const v of chunks) {
     const fileType = extname(v.url).slice(1);
+    const attributes = {};
+    const { crossorigin, scriptLoading = "defer" } = config;
+    if (crossorigin && isCrossOrigin(v.url, host)) {
+      attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
+    }
+    switch (scriptLoading) {
+      case "defer":
+        attributes.defer = true;
+        break;
+      case "module":
+        attributes.type = "module";
+        break;
+      default:
+    }
     if (fileType === "js") {
-      const attributes = {
-        nonce
-      };
-      const { crossorigin } = config;
-      if (crossorigin && isCrossOrigin(v.url, host)) {
-        attributes.crossorigin = crossorigin === true ? "anonymous" : crossorigin;
-      }
+      attributes.nonce = nonce;
       const attrsStr = attributesToString(attributes);
       chunksMap[fileType] += `<script${attrsStr} src="${v.url}"></script>`;
     } else if (fileType === "css") {
-      chunksMap[fileType] += `<link href="${v.url}" rel="stylesheet" />`;
+      chunksMap[fileType] += `<link${attributes} href="${v.url}" rel="stylesheet" />`;
     }
   }
   return html;

package/dist/esm-node/state/cli/index.js

@@ -23,10 +23,10 @@ export default () => {
         },
         modifyEntryImports({ entrypoint, imports }) {
           var _getEntryOptions;
-          const { entryName } = entrypoint;
+          const { entryName, isMainEntry } = entrypoint;
           const userConfig = api.useResolvedConfigContext();
           const { packageName } = api.useAppContext();
-          const stateConfig = (_getEntryOptions = getEntryOptions(entryName, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
+          const stateConfig = (_getEntryOptions = getEntryOptions(entryName, isMainEntry, userConfig.runtime, userConfig.runtimeByEntries, packageName)) === null || _getEntryOptions === void 0 ? void 0 : _getEntryOptions.state;
           stateConfigMap.set(entryName, stateConfig);
           if (stateConfig) {
             imports.push({

package/dist/types/ssr/serverRender/types.d.ts

@@ -7,6 +7,7 @@ export type ModernSSRReactComponent = React.ComponentType<any>;
 export { RuntimeContext, RenderLevel };
 export type SSRPluginConfig = {
   crossorigin?: boolean | 'anonymous' | 'use-credentials';
+  scriptLoading?: 'defer' | 'blocking' | 'module';
   chunkLoadingGlobal?: string;
 } & Exclude<ServerUserConfig['ssr'], boolean>;
 export type ServerRenderOptions = {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.23.1",
+  "version": "2.24.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -169,9 +169,9 @@
     "redux-logger": "^3.0.6",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/plugin": "2.23.1",
-    "@modern-js/types": "2.23.1",
-    "@modern-js/utils": "2.23.1"
+    "@modern-js/plugin": "2.24.0",
+    "@modern-js/utils": "2.24.0",
+    "@modern-js/types": "2.24.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -192,11 +192,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.82.1",
-    "@modern-js/app-tools": "2.23.1",
-    "@modern-js/core": "2.23.1",
-    "@modern-js/server-core": "2.23.1",
-    "@scripts/build": "2.23.1",
-    "@scripts/jest-config": "2.23.1"
+    "@modern-js/app-tools": "2.24.0",
+    "@modern-js/core": "2.24.0",
+    "@modern-js/server-core": "2.24.0",
+    "@scripts/build": "2.24.0",
+    "@scripts/jest-config": "2.24.0"
   },
   "sideEffects": false,
   "modernConfig": {},