@modern-js/runtime 2.61.0 → 2.62.1

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

@@ -110,3 +110,37 @@ export declare const preResolvedFnStr = "function p(e,r){return void 0!==r?Promi
     };
  */
 export declare const mergeLoaderDataStr = "function mergeLoaderData(e,n){const r=n.reduce((function(e,{key:n,routerDataFnName:r,routerDataFnArgs:a}){const t=a.map((e=>{if(\"undefined\"!==e&&null!==e)return JSON.parse(e)}));return console.info(\"args\",t),{...e,[n]:_ROUTER_DATA[r](...t)}}),{});Object.assign(_ROUTER_DATA.loaderData[e],r)}";
+/**
+   * This original string is: ${setupFnStr};${resolveFnStr};${preResolvedFnStr};
+   * function mergeData (routeIdJsonStr, deferredKeyPromiseManifests) {
+      const source = deferredKeyPromiseManifests.reduce(function(o, {key, routerDataFnName, routerDataFnArgs }) {
+        return {...o, [key]: _ROUTER_DATA[routerDataFnName](...routerDataFnArgs)}
+      }, {});
+      Object.assign(_ROUTER_DATA.loaderData[routeIdJsonStr], source);
+    };
+   */
+export declare const initRouterDataAttrs = "_ROUTER_DATA.s = function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA.r[r]=_ROUTER_DATA.r[r]||{};return new Promise((function(A,R){_ROUTER_DATA.r[r][e]={resolve:A,reject:R}}))};_ROUTER_DATA.r = function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};_ROUTER_DATA.p = function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resolve(e)};function mergeLoaderData(e,n){const r=n.reduce((function(e,{key:n,routerDataFnName:r,routerDataFnArgs:a}){const t=a.map((e=>{if(\"undefined\"!==e&&null!==e)return JSON.parse(e)}));return console.info(\"args\",t),{...e,[n]:_ROUTER_DATA[r](...t)}}),{});Object.assign(_ROUTER_DATA.loaderData[e],r)}";
+/**
+  function runWindowFn() {
+    window[document.currentScript.getAttribute('data-fn-name')](...JSON.parse(document.currentScript.getAttribute('data-fn-args')))
+  }
+  function runRouterDataFn() {
+    _ROUTER_DATA[document.currentScript.getAttribute('data-fn-name')](...JSON.parse(document.currentScript.getAttribute('data-fn-args')))
+  }
+  function initRouterData(id) {
+    const ele = document.getElementById(id);
+    if (ele) {
+      try {
+        _ROUTER_DATA = JSON.parse(ele.textContent);
+      } catch(e) {
+        console.error("parse ".concat(id, " error"), t);
+        _ROUTER_DATA = {};
+      }
+    }
+  }
+  initRouterData();
+  ${initRouterDataAttrs}
+*/
+export declare const modernInline = "function runWindowFn(){window[document.currentScript.getAttribute(\"data-fn-name\")](...JSON.parse(document.currentScript.getAttribute(\"data-fn-args\")))}function runRouterDataFn(){_ROUTER_DATA[document.currentScript.getAttribute(\"data-fn-name\")](...JSON.parse(document.currentScript.getAttribute(\"data-fn-args\")))}function initRouterData(e){var r=document.getElementById(e);if(r)try{_ROUTER_DATA=JSON.parse(r.textContent)}catch(r){console.error(\"parse \".concat(e,\" error\"),t),_ROUTER_DATA={}}};initRouterData('__MODERN_ROUTER_DATA__');_ROUTER_DATA.s = function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA.r[r]=_ROUTER_DATA.r[r]||{};return new Promise((function(A,R){_ROUTER_DATA.r[r][e]={resolve:A,reject:R}}))};_ROUTER_DATA.r = function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};_ROUTER_DATA.p = function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resolve(e)};function mergeLoaderData(e,n){const r=n.reduce((function(e,{key:n,routerDataFnName:r,routerDataFnArgs:a}){const t=a.map((e=>{if(\"undefined\"!==e&&null!==e)return JSON.parse(e)}));return console.info(\"args\",t),{...e,[n]:_ROUTER_DATA[r](...t)}}),{});Object.assign(_ROUTER_DATA.loaderData[e],r)}";
+export declare const runRouterDataFnStr = "runRouterDataFn();";
+export declare const runWindowFnStr = "runWindowFn();";

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.61.0",
+  "version": "2.62.1",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -29,6 +29,7 @@
       "jsnext:source": "./src/index.ts",
       "default": "./dist/esm/index.js"
     },
+    "./package.json": "./package.json",
     "./types": "./types/index.d.ts",
     "./types/index": "./types/index.d.ts",
     "./types/router": "./types/router.d.ts",
@@ -199,11 +200,11 @@
     "react-is": "^18",
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.61.0",
-    "@modern-js/plugin-data-loader": "2.61.0",
-    "@modern-js/types": "2.61.0",
-    "@modern-js/runtime-utils": "2.61.0",
-    "@modern-js/utils": "2.61.0"
+    "@modern-js/plugin": "2.62.1",
+    "@modern-js/runtime-utils": "2.62.1",
+    "@modern-js/plugin-data-loader": "2.62.1",
+    "@modern-js/types": "2.62.1",
+    "@modern-js/utils": "2.62.1"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -211,7 +212,7 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rsbuild/core": "~1.1.0-beta.1",
+    "@rsbuild/core": "~1.1.0",
     "@testing-library/react": "^13.4.0",
     "@types/cookie": "0.6.0",
     "@types/invariant": "^2.2.30",
@@ -224,12 +225,13 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "ts-jest": "^29.1.0",
+    "ts-node": "^10.9.1",
     "typescript": "^5",
     "webpack": "^5.96.1",
-    "@modern-js/app-tools": "2.61.0",
-    "@modern-js/core": "2.61.0",
-    "@scripts/build": "2.61.0",
-    "@scripts/jest-config": "2.61.0"
+    "@modern-js/app-tools": "2.62.1",
+    "@modern-js/core": "2.62.1",
+    "@scripts/build": "2.62.1",
+    "@scripts/jest-config": "2.62.1"
   },
   "sideEffects": false,
   "publishConfig": {
@@ -240,7 +242,8 @@
   "scripts": {
     "dev": "modern-lib build --watch",
     "new": "modern-lib new",
-    "build": "modern-lib build",
+    "build": "modern-lib build && pnpm run gen-static",
+    "gen-static": "ts-node ./scripts/gen-static.ts",
     "test": "jest"
   }
 }

package/scripts/gen-static.ts

@@ -0,0 +1,26 @@
+import path from 'path';
+import { fs } from '@modern-js/utils';
+import {
+  modernInline,
+  runRouterDataFnStr,
+  runWindowFnStr,
+} from '../src/router/runtime/constants';
+
+(async () => {
+  const targetDir = path.join(__dirname, '../static');
+  await fs.ensureDir(targetDir);
+
+  const modernDefineInitPath = path.join(targetDir, 'modern-inline.js');
+  await fs.writeFile(modernDefineInitPath, modernInline, 'utf-8');
+
+  const runRouterDataFilePath = path.join(
+    targetDir,
+    'modern-run-router-data-fn.js',
+  );
+  await fs.writeFile(runRouterDataFilePath, runRouterDataFnStr, 'utf-8');
+
+  const runWindowFilePath = path.join(targetDir, 'modern-run-window-fn.js');
+  await fs.writeFile(runWindowFilePath, runWindowFnStr, 'utf-8');
+
+  console.info('Generate static files successfully');
+})();

package/static/modern-inline.js

@@ -0,0 +1 @@
+function runWindowFn(){window[document.currentScript.getAttribute("data-fn-name")](...JSON.parse(document.currentScript.getAttribute("data-fn-args")))}function runRouterDataFn(){_ROUTER_DATA[document.currentScript.getAttribute("data-fn-name")](...JSON.parse(document.currentScript.getAttribute("data-fn-args")))}function initRouterData(e){var r=document.getElementById(e);if(r)try{_ROUTER_DATA=JSON.parse(r.textContent)}catch(r){console.error("parse ".concat(e," error"),t),_ROUTER_DATA={}}};initRouterData('__MODERN_ROUTER_DATA__');_ROUTER_DATA.s = function s(r,e){_ROUTER_DATA.r=_ROUTER_DATA.r||{},_ROUTER_DATA.r[r]=_ROUTER_DATA.r[r]||{};return new Promise((function(A,R){_ROUTER_DATA.r[r][e]={resolve:A,reject:R}}))};_ROUTER_DATA.r = function r(e,r,o,A){A?_ROUTER_DATA.r[e][r].reject(A):_ROUTER_DATA.r[e][r].resolve(o)};_ROUTER_DATA.p = function p(e,r){return void 0!==r?Promise.reject(new Error(r.message)):Promise.resolve(e)};function mergeLoaderData(e,n){const r=n.reduce((function(e,{key:n,routerDataFnName:r,routerDataFnArgs:a}){const t=a.map((e=>{if("undefined"!==e&&null!==e)return JSON.parse(e)}));return console.info("args",t),{...e,[n]:_ROUTER_DATA[r](...t)}}),{});Object.assign(_ROUTER_DATA.loaderData[e],r)}

package/static/modern-run-router-data-fn.js

@@ -0,0 +1 @@
+runRouterDataFn();

package/static/modern-run-window-fn.js

@@ -0,0 +1 @@
+runWindowFn();