@lynx-js/web-core-server 0.15.4 → 0.15.5

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @lynx-js/web-core-server
 
+## 0.15.5
+
+### Patch Changes
+
+- fix: load main-thread chunk in ESM format ([#1437](https://github.com/lynx-family/lynx-stack/pull/1437))
+
+  See [nodejs/node#59362](https://github.com/nodejs/node/issues/59362) for more details.
+
 ## 0.15.4
 
 ### Patch Changes

package/dist/index.js

@@ -145,7 +145,7 @@ var __webpack_modules__ = {
     },
     "../web-style-transformer/dist/standard_bg.wasm": function(module, exports, __webpack_require__) {
         var WEBPACK_IMPORTED_MODULE_0 = __webpack_require__("../web-style-transformer/dist/standard_bg.js");
-        module.exports = __webpack_require__.v(exports, module.id, "e2b9bfa6543ca3e1", {
+        module.exports = __webpack_require__.v(exports, module.id, "8e708eec9c98f88c", {
             "./standard_bg.js": {
                 __wbg_fromCharCode_5493f9b25e1ce0a1: WEBPACK_IMPORTED_MODULE_0.sy,
                 __wbg_new_78feb108b6472713: WEBPACK_IMPORTED_MODULE_0.a9,
@@ -612,6 +612,7 @@ const callLepusMethodEndpoint = createRpcEndpoint('callLepusMethod', false, true
 createRpcEndpoint('multiThreadExposureChangedEndpoint', false, false);
 createRpcEndpoint('__invokeUIMethod', false, true);
 createRpcEndpoint('__setNativeProps', false, true);
+createRpcEndpoint('__getPathInfo', false, true);
 createRpcEndpoint('nativeModulesCall', false, true);
 createRpcEndpoint('napiModulesCall', false, true, true);
 const getCustomSectionsEndpoint = createRpcEndpoint('getCustomSections', false, true);
@@ -786,43 +787,35 @@ const backgroundInjectWithBind = [
     'Card',
     'Component'
 ];
-async function generateJavascriptUrl(obj, injectVars, injectWithBind, muteableVars, createJsModuleUrl, templateName) {
-    injectVars = injectVars.concat(muteableVars);
-    const generateModuleContent = (content)=>[
-            '//# allFunctionsCalledOnLoad\n',
-            'globalThis.module.exports = function(lynx_runtime) {',
-            'const module= {exports:{}};let exports = module.exports;',
-            'var {',
-            injectVars.join(','),
-            '} = lynx_runtime;',
-            ...injectWithBind.map((nm)=>`const ${nm} = lynx_runtime.${nm}?.bind(lynx_runtime);`),
-            ';var globDynamicComponentEntry = \'__Card__\';',
-            'var {__globalProps} = lynx;',
-            'lynx_runtime._updateVars=()=>{',
-            ...muteableVars.map((nm)=>`${nm} = lynx_runtime.__lynxGlobalBindingValues.${nm};`),
-            '};\n',
-            content,
-            '\n return module.exports;}'
-        ].join('');
-    const processEntry = templateName ? async ([name, content])=>[
+const generateModuleContent = (content, injectVars, injectWithBind, muteableVars, isESM)=>[
+        '//# allFunctionsCalledOnLoad\n',
+        isESM ? 'export default ' : 'globalThis.module.exports =',
+        'function(lynx_runtime) {',
+        'const module= {exports:{}};let exports = module.exports;',
+        'var {',
+        injectVars.join(','),
+        '} = lynx_runtime;',
+        ...injectWithBind.map((nm)=>`const ${nm} = lynx_runtime.${nm}?.bind(lynx_runtime);`),
+        ';var globDynamicComponentEntry = \'__Card__\';',
+        'var {__globalProps} = lynx;',
+        'lynx_runtime._updateVars=()=>{',
+        ...muteableVars.map((nm)=>`${nm} = lynx_runtime.__lynxGlobalBindingValues.${nm};`),
+        '};\n',
+        content,
+        '\n return module.exports;}'
+    ].join('');
+async function generateJavascriptUrl(obj, injectVars, injectWithBind, muteableVars, createJsModuleUrl, isESM, templateName) {
+    const processEntry = async ([name, content])=>[
             name,
-            await createJsModuleUrl(generateModuleContent(content), `${templateName}-${name.replaceAll('/', '')}.js`)
-        ] : async ([name, content])=>[
-            name,
-            await createJsModuleUrl(generateModuleContent(content))
+            await createJsModuleUrl(generateModuleContent(content, injectVars.concat(muteableVars), injectWithBind, muteableVars, isESM), `${templateName}-${name.replaceAll('/', '')}.js`)
         ];
     return Promise.all(Object.entries(obj).filter(([_, content])=>'string' == typeof content).map(processEntry)).then(Object.fromEntries);
 }
 async function generateTemplate(template, createJsModuleUrl, templateName) {
-    if (!templateName) return {
-        ...template,
-        lepusCode: await generateJavascriptUrl(template.lepusCode, mainThreadInjectVars, [], globalMuteableVars, createJsModuleUrl),
-        manifest: await generateJavascriptUrl(template.manifest, backgroundInjectVars, backgroundInjectWithBind, [], createJsModuleUrl)
-    };
     return {
         ...template,
-        lepusCode: await generateJavascriptUrl(template.lepusCode, mainThreadInjectVars, [], globalMuteableVars, createJsModuleUrl, templateName),
-        manifest: await generateJavascriptUrl(template.manifest, backgroundInjectVars, backgroundInjectWithBind, [], createJsModuleUrl, templateName)
+        lepusCode: await generateJavascriptUrl(template.lepusCode, mainThreadInjectVars, [], globalMuteableVars, createJsModuleUrl, true, templateName),
+        manifest: await generateJavascriptUrl(template.manifest, backgroundInjectVars, backgroundInjectWithBind, [], createJsModuleUrl, false, templateName)
     };
 }
 function registerCallLepusMethodHandler(rpc, runtime) {
@@ -1975,14 +1968,10 @@ function prepareMainThreadAPIs(backgroundThreadRpc, rootDom, createElement, comm
                 cachedModule
             ];
             {
-                Object.assign(globalThis, {
-                    module: {}
-                });
-                await import(url);
-                const module = globalThis.module;
-                Object.assign(globalThis, {
-                    module: {}
-                });
+                const { default: evaluateModule } = await import(url);
+                const module = {
+                    exports: evaluateModule
+                };
                 moduleCache[url] = module;
                 return [
                     name,

package/dist/legacy-wasm-chunk.js

@@ -161,7 +161,7 @@ export const __webpack_modules__ = {
     },
     "../web-style-transformer/dist/legacy_bg.wasm": function(module, exports, __webpack_require__) {
         var WEBPACK_IMPORTED_MODULE_0 = __webpack_require__("../web-style-transformer/dist/legacy_bg.js");
-        module.exports = __webpack_require__.v(exports, module.id, "82481b55abcd3d16", {
+        module.exports = __webpack_require__.v(exports, module.id, "1d0f646c207811d4", {
             "./legacy_bg.js": {
                 __wbg_fromCharCode_5493f9b25e1ce0a1: WEBPACK_IMPORTED_MODULE_0.sy,
                 __wbg_new_78feb108b6472713: WEBPACK_IMPORTED_MODULE_0.a9,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lynx-js/web-core-server",
-  "version": "0.15.4",
+  "version": "0.15.5",
   "private": false,
   "description": "",
   "keywords": [],
@@ -24,10 +24,10 @@
   ],
   "devDependencies": {
     "@lynx-js/offscreen-document": "0.1.3",
-    "@lynx-js/web-constants": "0.15.4",
-    "@lynx-js/web-elements-template": "0.8.3",
-    "@lynx-js/web-mainthread-apis": "0.15.4",
-    "@lynx-js/web-worker-rpc": "0.15.4"
+    "@lynx-js/web-constants": "0.15.5",
+    "@lynx-js/web-elements-template": "0.8.4",
+    "@lynx-js/web-mainthread-apis": "0.15.5",
+    "@lynx-js/web-worker-rpc": "0.15.5"
   },
   "scripts": {
     "build": "rslib build",