@modern-js/runtime 2.60.2 → 2.60.4

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/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-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/types/core/compatible.d.ts

@@ -11,7 +11,7 @@ export type CreateAppOptions = {
     runtime?: typeof runtime;
     props?: any;
 };
-export declare const createApp: ({ plugins, runtime, props: globalProps, }: CreateAppOptions) => (App?: React.ComponentType<any>) => (props: any) => JSX.Element;
+export declare const createApp: ({ plugins, runtime, props: globalProps, }: CreateAppOptions) => (App?: React.ComponentType<any>) => (props: any) => React.JSX.Element;
 type BootStrap<T = unknown> = (App: React.ComponentType, id: string | HTMLElement | RuntimeContext, root?: any, ReactDOM?: {
     render?: Renderer;
     hydrate?: Renderer;

package/dist/types/core/server/react/no-ssr-cache/index.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare const NoSSRCache: () => JSX.Element;
+import React from 'react';
+export declare const NoSSRCache: () => React.JSX.Element;

package/dist/types/document/Body.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare function Body(props: React.DOMAttributes<HTMLBodyElement>): JSX.Element;
+export declare function Body(props: React.DOMAttributes<HTMLBodyElement>): React.JSX.Element;

package/dist/types/document/Comment.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
+import React from 'react';
 export declare function Comment(props: {
     comment?: string;
     children?: string;
-}): JSX.Element;
+}): React.JSX.Element;

package/dist/types/document/Head.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
+import React from 'react';
 export declare function Head(props: {
     children?: any;
-}): JSX.Element;
-export declare function DefaultHead(): JSX.Element;
+}): React.JSX.Element;
+export declare function DefaultHead(): React.JSX.Element;

package/dist/types/document/Html.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 export declare function Html(props: {
     children: any[];
-} & React.HtmlHTMLAttributes<HTMLHtmlElement>): JSX.Element;
+} & React.HtmlHTMLAttributes<HTMLHtmlElement>): React.JSX.Element;

package/dist/types/document/Links.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare function Links(): JSX.Element;
+import React from 'react';
+export declare function Links(): React.JSX.Element;

package/dist/types/document/Root.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 export declare function Root(props: {
     rootId?: string;
-} & React.DOMAttributes<HTMLDivElement>): JSX.Element;
+} & React.DOMAttributes<HTMLDivElement>): React.JSX.Element;
 export declare function DefaultRoot(props: {
     children?: any;
-}): JSX.Element;
+}): React.JSX.Element;

package/dist/types/document/Script.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 export declare function Script(props: {
     content: () => void;
-}): JSX.Element;
+}): React.JSX.Element;

package/dist/types/document/Scripts.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare function Scripts(): JSX.Element;
+import React from 'react';
+export declare function Scripts(): React.JSX.Element;

package/dist/types/document/Style.d.ts

@@ -2,4 +2,4 @@ import React from 'react';
 export declare function Style(props: {
     children?: string;
     content?: string;
-} & React.DOMAttributes<HTMLStyleElement>): JSX.Element;
+} & React.DOMAttributes<HTMLStyleElement>): React.JSX.Element;

package/dist/types/document/Title.d.ts

@@ -1,2 +1,2 @@
 /// <reference types="react" />
-export declare function Title(): JSX.Element;
+export declare function Title(): import("react").JSX.Element;

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

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare const DefaultNotFound: () => JSX.Element;
+import React from 'react';
+export declare const DefaultNotFound: () => React.JSX.Element;

package/dist/types/router/runtime/DeferredDataScripts.node.d.ts

@@ -7,5 +7,5 @@ import type { StaticHandlerContext } from '@modern-js/runtime-utils/remix-router
 declare const DeferredDataScripts: (props?: {
     nonce?: string;
     context: StaticHandlerContext;
-}) => JSX.Element | null;
+}) => import("react").JSX.Element | null;
 export default DeferredDataScripts;

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

@@ -7,4 +7,4 @@ export interface WithRouterProps<Params extends {
     params: Params;
     navigate: ReturnType<typeof useNavigate>;
 }
-export declare const withRouter: <Props extends WithRouterProps<{}>>(Component: React.ComponentType<Props>) => (props: Omit<Props, keyof WithRouterProps<{}>>) => JSX.Element;
+export declare const withRouter: <Props extends WithRouterProps<{}>>(Component: React.ComponentType<Props>) => (props: Omit<Props, keyof WithRouterProps<{}>>) => React.JSX.Element;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.60.2",
+  "version": "2.60.4",
   "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-data-loader": "2.60.2",
-    "@modern-js/plugin": "2.60.2",
-    "@modern-js/runtime-utils": "2.60.2",
-    "@modern-js/utils": "2.60.2",
-    "@modern-js/types": "2.60.2"
+    "@modern-js/plugin": "2.60.4",
+    "@modern-js/plugin-data-loader": "2.60.4",
+    "@modern-js/runtime-utils": "2.60.4",
+    "@modern-js/types": "2.60.4",
+    "@modern-js/utils": "2.60.4"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -211,7 +211,7 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rsbuild/core": "1.0.7",
+    "@rsbuild/core": "~1.0.11",
     "@testing-library/react": "^13.4.0",
     "@types/cookie": "0.6.0",
     "@types/invariant": "^2.2.30",
@@ -225,11 +225,11 @@
     "react-dom": "^18",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "webpack": "^5.94.0",
-    "@modern-js/core": "2.60.2",
-    "@scripts/jest-config": "2.60.2",
-    "@scripts/build": "2.60.2",
-    "@modern-js/app-tools": "2.60.2"
+    "webpack": "^5.95.0",
+    "@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": {