@modern-js/runtime 2.60.3 → 2.60.5-alpha.0

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

@@ -110,10 +110,15 @@ class LoadableCollector {
       nonce,
       ...scriptLoadingAtr
     }));
+    const jsScriptRegExp = /<script .*?src="([^"]+)".*?>/g;
+    const matchs = template.matchAll(jsScriptRegExp);
+    const existedScript = [];
+    for (const match of matchs) {
+      existedScript.push(match[1]);
+    }
     const scripts = await Promise.all(chunks.filter((chunk) => {
       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));
+      return !existedScript.includes(chunk.url) && !((_this_existsAssets = this.existsAssets) === null || _this_existsAssets === void 0 ? void 0 : _this_existsAssets.includes(chunk.path));
     }).map(async (chunk) => {
       const script = `<script${attributes} src="${chunk.url}"></script>`;
       if ((0, import_utils.checkIsNode)() && checkIsInline(chunk, enableInlineScripts)) {
@@ -130,10 +135,15 @@ class LoadableCollector {
     const { template, chunkSet, config } = this.options;
     const { enableInlineStyles } = config;
     const atrributes = (0, import_utils.attributesToString)(this.generateAttributes());
+    const linkRegExp = /<link .*?href="([^"]+)".*?>/g;
+    const matchs = template.matchAll(linkRegExp);
+    const existedLinks = [];
+    for (const match of matchs) {
+      existedLinks.push(match[1]);
+    }
     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));
+      return !existedLinks.includes(chunk.url) && !((_this_existsAssets = this.existsAssets) === null || _this_existsAssets === void 0 ? void 0 : _this_existsAssets.includes(chunk.path));
     }).map(async (chunk) => {
       const link = `<link${atrributes} href="${chunk.url}" rel="stylesheet" />`;
       if ((0, import_utils.checkIsNode)() && checkIsInline(chunk, enableInlineStyles)) {

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

@@ -18,12 +18,15 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var hooks_exports = {};
 __export(hooks_exports, {
+  beforeCreateRouts: () => beforeCreateRouts,
   modifyRoutes: () => modifyRoutes
 });
 module.exports = __toCommonJS(hooks_exports);
 var import_plugin = require("@modern-js/plugin");
 const modifyRoutes = (0, import_plugin.createWaterfall)();
+const beforeCreateRouts = (0, import_plugin.createAsyncInterruptWorkflow)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  beforeCreateRouts,
   modifyRoutes
 });

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

@@ -61,7 +61,8 @@ const routerPlugin = (userConfig = {}) => {
   return {
     name: "@modern-js/plugin-router",
     registerHook: {
-      modifyRoutes: import_hooks.modifyRoutes
+      modifyRoutes: import_hooks.modifyRoutes,
+      beforeCreateRouts: import_hooks.beforeCreateRouts
     },
     setup: (api) => {
       let finalRouteConfig = {};
@@ -84,6 +85,8 @@ const routerPlugin = (userConfig = {}) => {
           const { reporter } = context.ssrContext;
           const requestContext = (0, import_node.createRequestContext)((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.loaderContext);
           requestContext.set(import_node.reporterCtx, reporter);
+          const runner = api.useHookRunners();
+          await runner.beforeCreateRouts(context);
           let routes = createRoutes ? createRoutes() : (0, import_router2.createRoutesFromElements)((0, import_utils.renderRoutes)({
             routesConfig: finalRouteConfig,
             ssrMode,
@@ -92,7 +95,6 @@ const routerPlugin = (userConfig = {}) => {
             },
             reporter
           }));
-          const runner = api.useHookRunners();
           routes = runner.modifyRoutes(routes);
           const { query } = (0, import_remix_router.createStaticHandler)(routes, {
             basename: _basename

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

@@ -133,7 +133,7 @@ var LoadableCollector = /* @__PURE__ */ function() {
   _proto.emitScriptAssets = function emitScriptAssets(chunks) {
     var _this = this;
     return _async_to_generator(function() {
-      var _this_options, template, nonce, chunkSet, config, _config_scriptLoading, scriptLoading, enableInlineScripts, scriptLoadingAtr, attributes, scripts;
+      var _this_options, template, nonce, chunkSet, config, _config_scriptLoading, scriptLoading, enableInlineScripts, scriptLoadingAtr, attributes, jsScriptRegExp, matchs, existedScript, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, match, scripts;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
@@ -147,12 +147,34 @@ var LoadableCollector = /* @__PURE__ */ function() {
             attributes = attributesToString(_this.generateAttributes(_object_spread({
               nonce
             }, scriptLoadingAtr)));
+            jsScriptRegExp = /<script .*?src="([^"]+)".*?>/g;
+            matchs = template.matchAll(jsScriptRegExp);
+            existedScript = [];
+            _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+            try {
+              for (_iterator = matchs[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+                match = _step.value;
+                existedScript.push(match[1]);
+              }
+            } catch (err) {
+              _didIteratorError = true;
+              _iteratorError = err;
+            } finally {
+              try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                  _iterator.return();
+                }
+              } finally {
+                if (_didIteratorError) {
+                  throw _iteratorError;
+                }
+              }
+            }
             return [
               4,
               Promise.all(chunks.filter(function(chunk) {
                 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));
+                return !existedScript.includes(chunk.url) && !((_this_existsAssets = _this.existsAssets) === null || _this_existsAssets === void 0 ? void 0 : _this_existsAssets.includes(chunk.path));
               }).map(function() {
                 var _ref = _async_to_generator(function(chunk) {
                   var script;
@@ -198,19 +220,41 @@ 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, css;
+      var _this_options, template, chunkSet, config, 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;
             enableInlineStyles = config.enableInlineStyles;
             atrributes = attributesToString(_this.generateAttributes());
+            linkRegExp = /<link .*?href="([^"]+)".*?>/g;
+            matchs = template.matchAll(linkRegExp);
+            existedLinks = [];
+            _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+            try {
+              for (_iterator = matchs[Symbol.iterator](); !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+                match = _step.value;
+                existedLinks.push(match[1]);
+              }
+            } catch (err) {
+              _didIteratorError = true;
+              _iteratorError = err;
+            } finally {
+              try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                  _iterator.return();
+                }
+              } finally {
+                if (_didIteratorError) {
+                  throw _iteratorError;
+                }
+              }
+            }
             return [
               4,
               Promise.all(chunks.filter(function(chunk) {
                 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));
+                return !existedLinks.includes(chunk.url) && !((_this_existsAssets = _this.existsAssets) === null || _this_existsAssets === void 0 ? void 0 : _this_existsAssets.includes(chunk.path));
               }).map(function() {
                 var _ref = _async_to_generator(function(chunk) {
                   var link;

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

@@ -1,5 +1,7 @@
-import { createWaterfall } from "@modern-js/plugin";
+import { createAsyncInterruptWorkflow, createWaterfall } from "@modern-js/plugin";
 var modifyRoutes = createWaterfall();
+var beforeCreateRouts = createAsyncInterruptWorkflow();
 export {
+  beforeCreateRouts,
   modifyRoutes
 };

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

@@ -16,7 +16,7 @@ import { JSX_SHELL_STREAM_END_MARK } from "../../common";
 import { RuntimeReactContext } from "../../core";
 import { getGlobalLayoutApp, getGlobalRoutes } from "../../core/context";
 import DeferredDataScripts from "./DeferredDataScripts.node";
-import { modifyRoutes as modifyRoutesHook } from "./hooks";
+import { beforeCreateRouts as beforeCreateRoutsHook, modifyRoutes as modifyRoutesHook } from "./hooks";
 import { renderRoutes, urlJoin } from "./utils";
 function createRemixReuqest(request) {
   var method = "GET";
@@ -33,14 +33,15 @@ var routerPlugin = function() {
   return {
     name: "@modern-js/plugin-router",
     registerHook: {
-      modifyRoutes: modifyRoutesHook
+      modifyRoutes: modifyRoutesHook,
+      beforeCreateRouts: beforeCreateRoutsHook
     },
     setup: function(api) {
       var finalRouteConfig = {};
       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, routes, runner, 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, router;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -61,6 +62,13 @@ var routerPlugin = function() {
                   reporter = context.ssrContext.reporter;
                   requestContext = createRequestContext((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.loaderContext);
                   requestContext.set(reporterCtx, reporter);
+                  runner = api.useHookRunners();
+                  return [
+                    4,
+                    runner.beforeCreateRouts(context)
+                  ];
+                case 1:
+                  _state.sent();
                   routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
                     routesConfig: finalRouteConfig,
                     ssrMode,
@@ -69,7 +77,6 @@ var routerPlugin = function() {
                     },
                     reporter
                   }));
-                  runner = api.useHookRunners();
                   routes = runner.modifyRoutes(routes);
                   query = createStaticHandler(routes, {
                     basename: _basename
@@ -82,7 +89,7 @@ var routerPlugin = function() {
                       requestContext
                     })
                   ];
-                case 1:
+                case 2:
                   routerContext = _state.sent();
                   cost = end();
                   (_context_ssrContext1 = context.ssrContext) === null || _context_ssrContext1 === void 0 ? void 0 : (_context_ssrContext_onTiming = _context_ssrContext1.onTiming) === null || _context_ssrContext_onTiming === void 0 ? void 0 : _context_ssrContext_onTiming.call(_context_ssrContext1, LOADER_REPORTER_NAME, cost);

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

@@ -77,10 +77,15 @@ class LoadableCollector {
       nonce,
       ...scriptLoadingAtr
     }));
+    const jsScriptRegExp = /<script .*?src="([^"]+)".*?>/g;
+    const matchs = template.matchAll(jsScriptRegExp);
+    const existedScript = [];
+    for (const match of matchs) {
+      existedScript.push(match[1]);
+    }
     const scripts = await Promise.all(chunks.filter((chunk) => {
       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));
+      return !existedScript.includes(chunk.url) && !((_this_existsAssets = this.existsAssets) === null || _this_existsAssets === void 0 ? void 0 : _this_existsAssets.includes(chunk.path));
     }).map(async (chunk) => {
       const script = `<script${attributes} src="${chunk.url}"></script>`;
       if (checkIsNode() && checkIsInline(chunk, enableInlineScripts)) {
@@ -97,10 +102,15 @@ class LoadableCollector {
     const { template, chunkSet, config } = this.options;
     const { enableInlineStyles } = config;
     const atrributes = attributesToString(this.generateAttributes());
+    const linkRegExp = /<link .*?href="([^"]+)".*?>/g;
+    const matchs = template.matchAll(linkRegExp);
+    const existedLinks = [];
+    for (const match of matchs) {
+      existedLinks.push(match[1]);
+    }
     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));
+      return !existedLinks.includes(chunk.url) && !((_this_existsAssets = this.existsAssets) === null || _this_existsAssets === void 0 ? void 0 : _this_existsAssets.includes(chunk.path));
     }).map(async (chunk) => {
       const link = `<link${atrributes} href="${chunk.url}" rel="stylesheet" />`;
       if (checkIsNode() && checkIsInline(chunk, enableInlineStyles)) {

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

@@ -1,5 +1,7 @@
-import { createWaterfall } from "@modern-js/plugin";
+import { createAsyncInterruptWorkflow, createWaterfall } from "@modern-js/plugin";
 const modifyRoutes = createWaterfall();
+const beforeCreateRouts = createAsyncInterruptWorkflow();
 export {
+  beforeCreateRouts,
   modifyRoutes
 };

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

@@ -11,7 +11,7 @@ import { JSX_SHELL_STREAM_END_MARK } from "../../common";
 import { RuntimeReactContext } from "../../core";
 import { getGlobalLayoutApp, getGlobalRoutes } from "../../core/context";
 import DeferredDataScripts from "./DeferredDataScripts.node";
-import { modifyRoutes as modifyRoutesHook } from "./hooks";
+import { beforeCreateRouts as beforeCreateRoutsHook, modifyRoutes as modifyRoutesHook } from "./hooks";
 import { renderRoutes, urlJoin } from "./utils";
 function createRemixReuqest(request) {
   const method = "GET";
@@ -27,7 +27,8 @@ const routerPlugin = (userConfig = {}) => {
   return {
     name: "@modern-js/plugin-router",
     registerHook: {
-      modifyRoutes: modifyRoutesHook
+      modifyRoutes: modifyRoutesHook,
+      beforeCreateRouts: beforeCreateRoutsHook
     },
     setup: (api) => {
       let finalRouteConfig = {};
@@ -50,6 +51,8 @@ const routerPlugin = (userConfig = {}) => {
           const { reporter } = context.ssrContext;
           const requestContext = createRequestContext((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.loaderContext);
           requestContext.set(reporterCtx, reporter);
+          const runner = api.useHookRunners();
+          await runner.beforeCreateRouts(context);
           let routes = createRoutes ? createRoutes() : createRoutesFromElements(renderRoutes({
             routesConfig: finalRouteConfig,
             ssrMode,
@@ -58,7 +61,6 @@ const routerPlugin = (userConfig = {}) => {
             },
             reporter
           }));
-          const runner = api.useHookRunners();
           routes = runner.modifyRoutes(routes);
           const { query } = createStaticHandler(routes, {
             basename: _basename

package/dist/types/router/runtime/hooks.d.ts

@@ -1,3 +1,5 @@
 import type { RouteObject } from '@modern-js/runtime-utils/router';
+import type { RuntimeContext } from '../../core';
 declare const modifyRoutes: import("@modern-js/plugin").Waterfall<RouteObject[]>;
-export { modifyRoutes };
+declare const beforeCreateRouts: import("@modern-js/plugin").AsyncInterruptWorkflow<RuntimeContext, void>;
+export { modifyRoutes, beforeCreateRouts };

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.60.3",
+  "version": "2.60.5-alpha.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -190,7 +190,7 @@
     "@types/loadable__component": "^5.13.4",
     "@types/react-helmet": "^6.1.2",
     "@types/styled-components": "^5.1.14",
-    "cookie": "0.5.0",
+    "cookie": "0.7.2",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.17.19",
     "invariant": "^2.2.4",
@@ -199,11 +199,11 @@
     "react-is": "^18",
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.60.3",
-    "@modern-js/plugin-data-loader": "2.60.3",
-    "@modern-js/runtime-utils": "2.60.3",
-    "@modern-js/utils": "2.60.3",
-    "@modern-js/types": "2.60.3"
+    "@modern-js/plugin": "2.60.4",
+    "@modern-js/runtime-utils": "2.60.4",
+    "@modern-js/types": "2.60.4",
+    "@modern-js/utils": "2.60.4",
+    "@modern-js/plugin-data-loader": "2.60.4"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -221,21 +221,20 @@
     "@types/node": "^14",
     "@types/react-side-effect": "^1.1.1",
     "jest": "^29",
-    "react": "^18",
-    "react-dom": "^18",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.95.0",
-    "@modern-js/app-tools": "2.60.3",
-    "@scripts/build": "2.60.3",
-    "@modern-js/core": "2.60.3",
-    "@scripts/jest-config": "2.60.3"
+    "@modern-js/app-tools": "2.60.4",
+    "@scripts/build": "2.60.4",
+    "@modern-js/core": "2.60.4",
+    "@scripts/jest-config": "2.60.4"
   },
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "provenance": true
+    "access": "public"
   },
   "scripts": {
     "dev": "modern-lib build --watch",