@lynx-js/react-webpack-plugin 0.9.3 → 0.9.4

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @lynx-js/react-webpack-plugin
 
+## 0.9.4
+
+### Patch Changes
+
+- Support the unified `debug-metadata.json` format and depend on `@lynx-js/debug-metadata`. ([#2642](https://github.com/lynx-family/lynx-stack/pull/2642))
+
+- Prefix Lynx runtime module names with `webpack/runtime/` (e.g. `Lynx async chunks` → `webpack/runtime/lynx async chunks`), matching the path-structured naming of the bundler's built-in runtime modules. The previous bare names had no path segment, so when they appear as a source-map `sources` entry under a `file://` module-filename template they collapsed into an invalid URL authority (the space-containing name became the host) and broke `SourceMapConsumer` parsing. ([#2642](https://github.com/lynx-family/lynx-stack/pull/2642))
+
+- Widen peer ranges to admit the new minor versions of `@lynx-js/template-webpack-plugin` (^0.12.0) and `@lynx-js/rspeedy` (^0.15.0) shipping with the unified `debug-metadata.json` feature. ([#2642](https://github.com/lynx-family/lynx-stack/pull/2642))
+
+- Updated dependencies [[`a839d59`](https://github.com/lynx-family/lynx-stack/commit/a839d59b7f477a86f2cd10215d0b754264e54425), [`d3201df`](https://github.com/lynx-family/lynx-stack/commit/d3201dfa57964bfe6c8c52a803aeeb0fca1f2d27), [`409594b`](https://github.com/lynx-family/lynx-stack/commit/409594b9c51bb0c13f01c7d3f16949b27ebfdced), [`353363e`](https://github.com/lynx-family/lynx-stack/commit/353363e52dca3b252b39b34a3a87ce840dd308f3)]:
+  - @lynx-js/debug-metadata@0.1.0
+
 ## 0.9.3
 
 ### Patch Changes

package/lib/LynxProcessEvalResultRuntimeModule.js

@@ -2,7 +2,7 @@ import { RuntimeGlobals as LynxRuntimeGlobals } from '@lynx-js/webpack-runtime-g
 export function createLynxProcessEvalResultRuntimeModule(webpack) {
     return class LynxProcessEvalResultRuntimeModule extends webpack.RuntimeModule {
         constructor() {
-            super('Lynx process eval result', webpack.RuntimeModule.STAGE_ATTACH);
+            super('webpack/runtime/lynx process eval result', webpack.RuntimeModule.STAGE_ATTACH);
         }
         generate() {
             const chunk = this.chunk;

package/lib/ReactWebpackPlugin.d.ts

@@ -10,6 +10,8 @@ export interface ModuleWithElementTemplateBuildInfo {
     modules?: Iterable<ModuleWithElementTemplateBuildInfo>;
 }
 export declare function collectElementTemplatesFromModule(module: ModuleWithElementTemplateBuildInfo): ElementTemplateBuildInfo[];
+export declare function mergeElementTemplate(elementTemplates: Record<string, Record<string, unknown>>, templateId: string, compiledTemplate: Record<string, unknown>): void;
+export declare function mergeElementTemplatesFromModule(elementTemplates: Record<string, Record<string, unknown>>, module: ModuleWithElementTemplateBuildInfo): void;
 /**
  * The options for ReactWebpackPlugin
  *

package/lib/ReactWebpackPlugin.js

@@ -23,6 +23,51 @@ export function collectElementTemplatesFromModule(module) {
     }
     return elementTemplates;
 }
+function isPlainRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function areCompiledTemplateValuesEqual(left, right) {
+    if (Object.is(left, right)) {
+        return true;
+    }
+    if (Array.isArray(left) || Array.isArray(right)) {
+        if (!Array.isArray(left)
+            || !Array.isArray(right)
+            || left.length !== right.length) {
+            return false;
+        }
+        return left.every((value, index) => areCompiledTemplateValuesEqual(value, right[index]));
+    }
+    if (isPlainRecord(left) || isPlainRecord(right)) {
+        if (!isPlainRecord(left) || !isPlainRecord(right)) {
+            return false;
+        }
+        const leftKeys = Object.keys(left).sort();
+        const rightKeys = Object.keys(right).sort();
+        if (leftKeys.length !== rightKeys.length) {
+            return false;
+        }
+        return leftKeys.every((key, index) => key === rightKeys[index]
+            && areCompiledTemplateValuesEqual(left[key], right[key]));
+    }
+    return false;
+}
+export function mergeElementTemplate(elementTemplates, templateId, compiledTemplate) {
+    const existingTemplate = elementTemplates[templateId];
+    if (!existingTemplate) {
+        elementTemplates[templateId] = compiledTemplate;
+        return;
+    }
+    if (areCompiledTemplateValuesEqual(existingTemplate, compiledTemplate)) {
+        return;
+    }
+    throw new Error(`Element Template id collision for ${templateId}: same template id has different compiledTemplate content.`);
+}
+export function mergeElementTemplatesFromModule(elementTemplates, module) {
+    for (const { templateId, compiledTemplate } of collectElementTemplatesFromModule(module)) {
+        mergeElementTemplate(elementTemplates, templateId, compiledTemplate);
+    }
+}
 /**
  * ReactWebpackPlugin allows using ReactLynx with webpack
  *
@@ -172,8 +217,6 @@ class ReactWebpackPlugin {
                         .forEach(name => this.#updateMainThreadInfo(compilation, name));
                 });
             });
-            // TODO: replace LynxTemplatePlugin types with Rspack
-            // @ts-expect-error Rspack x Webpack compilation not match
             const hooks = LynxTemplatePlugin.getLynxTemplatePluginHooks(compilation);
             const { RawSource, ConcatSource } = compiler.webpack.sources;
             hooks.beforeEncode.tap(this.constructor.name, (args) => {
@@ -242,10 +285,10 @@ class ReactWebpackPlugin {
                 hooks.beforeEncode.tap(`${this.constructor.name}.ElementTemplate`, (args) => {
                     const elementTemplates = {};
                     for (const module of compilation.modules) {
-                        for (const { templateId, compiledTemplate } of collectElementTemplatesFromModule(module)) {
-                            elementTemplates[templateId] = compiledTemplate;
-                        }
+                        mergeElementTemplatesFromModule(elementTemplates, module);
                     }
+                    args.encodeData.sourceContent.config['enableUnifyFixedBehavior'] =
+                        true;
                     args.encodeData.elementTemplate = elementTemplates;
                     return args;
                 });

package/lib/loaders/main-thread.js

@@ -2,7 +2,7 @@
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
 import { createRequire } from 'node:module';
-import { UI_SOURCE_MAP_RECORDS_BUILD_INFO } from '@lynx-js/template-webpack-plugin';
+import { UI_SOURCE_MAP_RECORDS_BUILD_INFO } from '@lynx-js/debug-metadata';
 import { getMainThreadTransformOptions } from './options.js';
 export const ELEMENT_TEMPLATE_BUILD_INFO = 'lynx:element-templates';
 const mainThreadLoader = function (content, sourceMap) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lynx-js/react-webpack-plugin",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "A webpack plugin for ReactLynx",
   "keywords": [
     "webpack",
@@ -34,22 +34,23 @@
   ],
   "dependencies": {
     "tiny-invariant": "^1.3.3",
+    "@lynx-js/debug-metadata": "^0.1.0",
     "@lynx-js/webpack-runtime-globals": "0.0.6"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "7.58.2",
-    "@rspack/core": "1.7.9",
+    "@rspack/core": "2.0.8",
+    "@rspack/lite-tapable": "1.1.0",
+    "@rstest/core": "0.10.5",
     "css-loader": "^7.1.4",
     "swc-loader": "^0.2.7",
-    "webpack": "^5.105.2",
-    "@lynx-js/css-extract-webpack-plugin": "0.7.1",
-    "@lynx-js/react": "0.121.1",
-    "@lynx-js/template-webpack-plugin": "0.11.2",
+    "@lynx-js/css-extract-webpack-plugin": "0.8.0",
+    "@lynx-js/react": "0.121.2",
     "@lynx-js/test-tools": "0.0.0",
-    "@lynx-js/vitest-setup": "0.0.0"
+    "@lynx-js/template-webpack-plugin": "0.12.0"
   },
   "peerDependencies": {
-    "@lynx-js/template-webpack-plugin": "^0.4.0 || ^0.5.0 || ^0.6.0 || ^0.7.0 || ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0"
+    "@lynx-js/template-webpack-plugin": "^0.4.0 || ^0.5.0 || ^0.6.0 || ^0.7.0 || ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0"
   },
   "peerDependenciesMeta": {
     "@lynx-js/react": {
@@ -61,6 +62,6 @@
   },
   "scripts": {
     "api-extractor": "api-extractor run --verbose",
-    "test": "pnpm -w run test --project webpack/react"
+    "test": "rstest"
   }
 }