feat(enhanced): align Webpack and Rspack layer support

.changeset/expose-import-array-normalization.md

@@ -0,0 +1,5 @@
+---
+'@module-federation/managers': patch
+---
+
+Preserve shorthand expose import arrays when normalizing manifest-enabled federation configuration.

.changeset/layered-shared-runtime-isolation.md

@@ -0,0 +1,7 @@
+---
+'@module-federation/runtime-core': patch
+'@module-federation/sdk': patch
+'@module-federation/webpack-bundler-runtime': patch
+---
+
+Preserve same-scope, same-version shared layer variants during runtime registration, selection, remote replacement, and snapshot asset matching. Keep unlayered share-scope entries compatible with older runtimes; layered requests prefer an exact layer and use an unlayered provider only when the requested layer is absent.

.changeset/resolved-shared-layer-selection.md

@@ -0,0 +1,5 @@
+---
+'@module-federation/enhanced': patch
+---
+
+Match relative and absolute shared requests by issuer layer so configurations for the same resolved source do not overwrite each other.

.changeset/rspack-layered-shared-metadata.md

@@ -0,0 +1,12 @@
+---
+'@module-federation/sdk': patch
+'@module-federation/managers': patch
+'@module-federation/manifest': patch
+'@module-federation/enhanced': patch
+---
+
+Preserve shared and exposed module layers when reading Rspack and webpack stats or regenerating manifests. Keep public expose aliases, resolved imports, requirements, and chunk assets associated, including multi-import exposes and disabled asset analysis.
+
+Support named expose layers in enhanced Webpack. Preserve module-rule precedence and assets for merged expose chunks, and accept the same layer configuration with manifests enabled or disabled.
+
+Resolve relative shared requests and fallbacks with an explicit issuer layer from the importing module's directory.

.github/workflows/devtools.yml

@@ -9,7 +9,7 @@ concurrency:
 
 jobs:
   main:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: 30
     steps:
       - name: Checkout Repository

.github/workflows/e2e-rstest.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   e2e-rstest:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: 30
     steps:
       - name: Checkout Repository

.github/workflows/e2e-treeshake.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   e2e-treeshake:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
       actions: read

apps/website-new/docs/en/configure/exposes.mdx

@@ -22,6 +22,8 @@ interface PluginExposesOptions {
 interface ExposesConfig {
   // File entry
   import: string;
+  // Layer in which to build the exposed module
+  layer?: string;
 }
 ```
 
@@ -42,3 +44,13 @@ module.exports = {
   ],
 };
 ```
+
+Use `layer` in the object form to build an exposed module in a named layer:
+
+```js
+exposes: {
+  './Server': { import: './src/Server.ts', layer: 'server' },
+}
+```
+
+Layer names must be nonempty. With Webpack, enable `experiments.layers`. Omitting `layer` preserves the bundler's existing layer behavior; string exposes continue to work unchanged.

apps/website-new/docs/zh/configure/exposes.mdx

@@ -23,6 +23,8 @@ interface PluginExposesOptions {
 interface ExposesConfig {
   // 文件入口
   import: string;
+  // 构建暴露模块时使用的层
+  layer?: string;
 }
 ```
 
@@ -43,3 +45,13 @@ module.exports = {
   ],
 };
 ```
+
+在对象形式中使用 `layer`，可以在指定的层中构建暴露模块：
+
+```js
+exposes: {
+  './Server': { import: './src/Server.ts', layer: 'server' },
+}
+```
+
+层名不能为空字符串。使用 Webpack 时，需要启用 `experiments.layers`。省略 `layer` 会保留构建工具现有的层行为；字符串形式的 exposes 配置继续保持原有行为。

packages/enhanced/src/lib/container/ContainerEntryModule.d.ts

@@ -20,6 +20,7 @@ export type ExposeOptions = {
    * custom chunk name for the exposed module
    */
   name: string;
+  layer?: string;
 };
 declare class ContainerEntryModule extends Module {
   private _name;

packages/enhanced/src/lib/container/ContainerEntryModule.ts

@@ -50,6 +50,7 @@ export type ExposeOptions = {
    * custom chunk name for the exposed module
    */
   name: string;
+  layer?: string;
 };
 
 class ContainerEntryModule extends Module {
@@ -169,7 +170,11 @@ class ContainerEntryModule extends Module {
       );
       let idx = 0;
       for (const request of options.import) {
-        const dep = new ContainerExposedDependency(name, request);
+        const dep = new ContainerExposedDependency(
+          name,
+          request,
+          options.layer,
+        );
         dep.loc = {
           name,
           index: idx++,

packages/enhanced/src/lib/container/ContainerExposedDependency.d.ts

@@ -5,12 +5,13 @@ import type {
 } from 'webpack/lib/dependencies/ModuleDependency';
 declare class ContainerExposedDependency extends dependencies.ModuleDependency {
   exposedName: string;
+  layer?: string;
   request: string;
   /**
    * @param {string} exposedName public name
    * @param {string} request request to module
    */
-  constructor(exposedName: string, request: string);
+  constructor(exposedName: string, request: string, layer?: string);
   get type(): string;
   get category(): string;
   /**

packages/enhanced/src/lib/container/ContainerExposedDependency.ts

@@ -16,15 +16,17 @@ import type {
 
 class ContainerExposedDependency extends dependencies.ModuleDependency {
   exposedName: string;
+  layer?: string;
   override request: string;
 
   /**
    * @param {string} exposedName public name
    * @param {string} request request to module
    */
-  constructor(exposedName: string, request: string) {
+  constructor(exposedName: string, request: string, layer?: string) {
     super(request);
     this.exposedName = exposedName;
+    this.layer = layer;
     this.request = request;
   }
 
@@ -48,6 +50,7 @@ class ContainerExposedDependency extends dependencies.ModuleDependency {
    */
   override serialize(context: ObjectSerializerContext): void {
     context.write(this.exposedName);
+    context.write(this.layer);
     super.serialize(context);
   }
 
@@ -56,6 +59,7 @@ class ContainerExposedDependency extends dependencies.ModuleDependency {
    */
   override deserialize(context: ObjectDeserializerContext): void {
     this.exposedName = context.read();
+    this.layer = context.read();
     super.deserialize(context);
   }
 }

packages/enhanced/src/lib/container/ContainerPlugin.ts

@@ -58,6 +58,7 @@ class ContainerPlugin {
         (item) => ({
           import: Array.isArray(item.import) ? item.import : [item.import],
           name: item.name || undefined,
+          ...(item.layer !== undefined ? { layer: item.layer } : {}),
         }),
       ),
       runtimePlugins: options.runtimePlugins,
@@ -297,10 +298,19 @@ class ContainerPlugin {
           new ContainerEntryModuleFactory(),
         );
 
-        compilation.dependencyFactories.set(
-          ContainerExposedDependency,
-          normalModuleFactory,
-        );
+        compilation.dependencyFactories.set(ContainerExposedDependency, {
+          create(data, callback) {
+            const dependency = data
+              .dependencies[0] as ContainerExposedDependency;
+            if (dependency.layer !== undefined) {
+              data.contextInfo = {
+                ...data.contextInfo,
+                issuerLayer: dependency.layer,
+              };
+            }
+            normalModuleFactory.create(data, callback);
+          },
+        });
 
         if (!compilation.dependencyFactories.has(EntryDependency)) {
           compilation.dependencyFactories.set(

packages/enhanced/src/lib/sharing/ConsumeSharedPlugin.ts

@@ -199,7 +199,9 @@ class ConsumeSharedPlugin {
       compilation.warnings.push(error);
     };
     const directFallback =
-      config.import && DIRECT_FALLBACK_REGEX.test(config.import);
+      config.import &&
+      DIRECT_FALLBACK_REGEX.test(config.import) &&
+      (!config.issuerLayer || ABSOLUTE_PATH_REGEX.test(config.import));
     const packageName =
       config.packageName ??
       (ABSOLUTE_PATH_REGEX.test(request)
@@ -631,7 +633,7 @@ class ConsumeSharedPlugin {
         );
         normalModuleFactory.hooks.createModule.tapPromise(
           PLUGIN_NAME,
-          ({ resource }, { context, dependencies }) => {
+          ({ resource }, { context, dependencies, contextInfo }) => {
             // BIND `this` for createConsumeSharedModule call
             const boundCreateConsumeSharedModule =
               this.createConsumeSharedModule.bind(this);
@@ -642,7 +644,13 @@ class ConsumeSharedPlugin {
               return Promise.resolve();
             }
             if (resource) {
-              const options = resolvedConsumes.get(resource);
+              const options =
+                resolvedConsumes.get(
+                  createLookupKeyForSharing(resource, contextInfo.issuerLayer),
+                ) ||
+                resolvedConsumes.get(
+                  createLookupKeyForSharing(resource, undefined),
+                );
               if (options !== undefined) {
                 // Use the bound function
                 return boundCreateConsumeSharedModule(

packages/enhanced/src/lib/sharing/resolveMatchedConfigs.ts

@@ -56,7 +56,11 @@ export async function resolveMatchedConfigs<T extends ConsumeOptions>(
   await Promise.all(
     configs.map(([request, config]) => {
       const resolveRequest = config.request || request;
-      if (RELATIVE_REQUEST_REGEX.test(resolveRequest)) {
+      if (config.issuerLayer && RELATIVE_REQUEST_REGEX.test(resolveRequest)) {
+        // A layered relative consume is resolved where its issuer imports it.
+        unresolved.set(createCompositeKey(resolveRequest, config), config);
+        return undefined;
+      } else if (RELATIVE_REQUEST_REGEX.test(resolveRequest)) {
         // relative request
         return new Promise<void>((resolve) => {
           resolver.resolve(
@@ -74,14 +78,17 @@ export async function resolveMatchedConfigs<T extends ConsumeOptions>(
                 );
                 return resolve();
               }
-              resolved.set(result as string, config);
+              resolved.set(
+                createCompositeKey(result as string, config),
+                config,
+              );
               resolve();
             },
           );
         });
       } else if (ABSOLUTE_PATH_REGEX.test(resolveRequest)) {
         // absolute path
-        resolved.set(resolveRequest, config);
+        resolved.set(createCompositeKey(resolveRequest, config), config);
         return undefined;
       } else if (resolveRequest.endsWith('/')) {
         // module request prefix

packages/enhanced/src/schemas/container/ContainerPlugin.check.ts

@@ -53,7 +53,7 @@ function n(
       {
         const s = l;
         for (const t in r)
-          if ('import' !== t && 'name' !== t)
+          if ('import' !== t && 'name' !== t && 'layer' !== t)
             return ((n.errors = [{ params: { additionalProperty: t } }]), !1);
         if (s === l) {
           if (void 0 !== r.import) {
@@ -98,13 +98,25 @@ function n(
             ((l = u), null !== i && (u ? (i.length = u) : (i = null)));
             var f = a === l;
           } else f = !0;
-          if (f)
+          if (f) {
             if (void 0 !== r.name) {
               const t = l;
               if ('string' != typeof r.name)
                 return ((n.errors = [{ params: { type: 'string' } }]), !1);
               f = t === l;
             } else f = !0;
+            if (f)
+              if (void 0 !== r.layer) {
+                let t = r.layer;
+                const e = l;
+                if (l === e) {
+                  if ('string' != typeof t)
+                    return ((n.errors = [{ params: { type: 'string' } }]), !1);
+                  if (t.length < 1) return ((n.errors = [{ params: {} }]), !1);
+                }
+                f = e === l;
+              } else f = !0;
+          }
         }
       }
     }

packages/enhanced/src/schemas/container/ContainerPlugin.json

@@ -70,6 +70,11 @@
         "name": {
           "description": "Custom chunk name for the exposed module.",
           "type": "string"
+        },
+        "layer": {
+          "description": "Layer in which to build the exposed module.",
+          "type": "string",
+          "minLength": 1
         }
       },
       "required": ["import"]

packages/enhanced/src/schemas/container/ContainerPlugin.ts

@@ -83,6 +83,11 @@ export default {
           description: 'Custom chunk name for the exposed module.',
           type: 'string',
         },
+        layer: {
+          description: 'Layer in which to build the exposed module.',
+          type: 'string',
+          minLength: 1,
+        },
       },
       required: ['import'],
     },

packages/enhanced/src/schemas/container/ModuleFederationPlugin.check.ts

@@ -44,6 +44,7 @@ const t = {
             ],
           },
           name: { type: 'string' },
+          layer: { type: 'string', minLength: 1 },
         },
         required: ['import'],
       },
@@ -607,7 +608,7 @@ function i(
       {
         const r = l;
         for (const t in e)
-          if ('import' !== t && 'name' !== t)
+          if ('import' !== t && 'name' !== t && 'layer' !== t)
             return ((i.errors = [{ params: { additionalProperty: t } }]), !1);
         if (r === l) {
           if (void 0 !== e.import) {
@@ -652,13 +653,25 @@ function i(
             ((l = u), null !== a && (u ? (a.length = u) : (a = null)));
             var f = n === l;
           } else f = !0;
-          if (f)
+          if (f) {
             if (void 0 !== e.name) {
               const t = l;
               if ('string' != typeof e.name)
                 return ((i.errors = [{ params: { type: 'string' } }]), !1);
               f = t === l;
             } else f = !0;
+            if (f)
+              if (void 0 !== e.layer) {
+                let t = e.layer;
+                const r = l;
+                if (l === r) {
+                  if ('string' != typeof t)
+                    return ((i.errors = [{ params: { type: 'string' } }]), !1);
+                  if (t.length < 1) return ((i.errors = [{ params: {} }]), !1);
+                }
+                f = r === l;
+              } else f = !0;
+          }
         }
       }
     }