fix(enhanced): update share options of share plugin

Author: ScriptedAlchemy

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

@@ -139,11 +139,10 @@ class ConsumeSharedModule extends Module {
       singleton,
       eager,
       layer,
-      issuerLayer,
     } = this.options;
     return `${WEBPACK_MODULE_TYPE_CONSUME_SHARED_MODULE}|${shareScope}|${shareKey}|${
       requiredVersion && rangeToString(requiredVersion)
-    }|${strictVersion}|${importResolved}|${singleton}|${eager}|${layer}|${issuerLayer}`;
+    }|${strictVersion}|${importResolved}|${singleton}|${eager}|${layer}`;
   }
 
   /**
@@ -160,17 +159,14 @@ class ConsumeSharedModule extends Module {
       singleton,
       eager,
       layer,
-      issuerLayer,
     } = this.options;
     return `consume shared module (${shareScope}) ${shareKey}@${
       requiredVersion ? rangeToString(requiredVersion) : '*'
     }${strictVersion ? ' (strict)' : ''}${singleton ? ' (singleton)' : ''}${
       importResolved
         ? ` (fallback: ${requestShortener.shorten(importResolved)})`
         : ''
-    }${eager ? ' (eager)' : ''}${layer ? ` (${layer})` : ''}${
-      issuerLayer ? ` (issuer: ${issuerLayer})` : ''
-    }`;
+    }${eager ? ' (eager)' : ''}${layer ? ` (${layer})` : ''}`;
   }
 
   /**

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

@@ -68,8 +68,6 @@ class SharePlugin {
           requiredVersion: options.requiredVersion,
           strictVersion: options.strictVersion,
           singleton: options.singleton,
-          issuerLayer: options.issuerLayer,
-          requiredLayer: options.requiredLayer,
         },
       }));
     //@ts-ignore

packages/enhanced/test/configCases/sharing/layers/.gitignore packages/enhanced/test/configCases/sharing/layers-consume-entry/.gitignore

@@ -0,0 +1 @@
+export * from 'react';

packages/enhanced/test/configCases/sharing/layers-consume-entry/async-boundary.js

@@ -0,0 +1,5 @@
+it('should load module with correct layer from entry layer', async () => {
+  const { version, layer } = await import('./async-boundary');
+  expect(version).toBe('1.0.0');
+  expect(layer).toBe('module-layer');
+});

packages/enhanced/test/configCases/sharing/layers-consume-entry/index-test.js

@@ -0,0 +1 @@
+import './index-test';

packages/enhanced/test/configCases/sharing/layers-consume-entry/index.js

@@ -1,7 +1,4 @@
 module.exports = function layerLoader(source) {
   // Inject the layer name as an export
-  return [
-    source,
-    'export const layer = "react-layer";'
-  ].join('\n');
+  return [source, 'export const layer = "module-layer";'].join('\n');
 };

packages/enhanced/test/configCases/sharing/layers/layer-exporter.js packages/enhanced/test/configCases/sharing/layers-consume-entry/layer-exporter.js

@@ -0,0 +1,39 @@
+const { ConsumeSharedPlugin } = require('../../../../dist/src');
+const path = require('path');
+
+module.exports = {
+  mode: 'development',
+  devtool: false,
+  entry: {
+    main: {
+      import: './index.js',
+      layer: 'entry-layer',
+    },
+  },
+  experiments: {
+    layers: true,
+  },
+  module: {
+    rules: [
+      {
+        test: /async-boundary\.js$/,
+        issuerLayer: 'entry-layer',
+        use: [
+          {
+            loader: path.resolve(__dirname, './layer-exporter.js'),
+          },
+        ],
+      },
+    ],
+  },
+  plugins: [
+    new ConsumeSharedPlugin({
+      consumes: {
+        react: {
+          singleton: true,
+          shareKey: 'react',
+        },
+      },
+    }),
+  ],
+};

packages/enhanced/test/configCases/sharing/layers/node_modules/react/index.js packages/enhanced/test/configCases/sharing/layers-consume-entry/node_modules/react/index.js

@@ -0,0 +1 @@
+node_modules/.federation

packages/enhanced/test/configCases/sharing/layers/node_modules/react/index2.js packages/enhanced/test/configCases/sharing/layers-consume-entry/node_modules/react/index2.js

@@ -0,0 +1 @@
+export * from 'react';

packages/enhanced/test/configCases/sharing/layers/package.json packages/enhanced/test/configCases/sharing/layers-consume-entry/package.json

@@ -1,7 +1,4 @@
 module.exports = function layerLoader(source) {
   // Inject the layer name as an export
-  return [
-    source,
-    'export const layer = "differing-layer";'
-  ].join('\n');
+  return [source, 'export const layer = "differing-layer";'].join('\n');
 };

packages/enhanced/test/configCases/sharing/layers/test.config.js packages/enhanced/test/configCases/sharing/layers-consume-entry/test.config.js

@@ -1,11 +1,11 @@
 it('Module graph should have a layer different layer', async () => {
-  const {version, layer} = (await import('react'));
+  const { version, layer } = await import('react');
   expect(version).toBe('1.0.0');
   expect(layer).toBe('differing-layer');
 });
 
 it('Module graph should have a layer set explicitly thats not the inherited issuerLayer', async () => {
-  const {dix, layer} = (await import('react/index2'));
+  const { dix, layer } = await import('react/index2');
   expect(dix).toBe('1.0.0');
   expect(layer).toBe('explicit-layer');
 });

packages/enhanced/test/configCases/sharing/layers-consume-entry/webpack.config.js

@@ -1,7 +1,4 @@
 module.exports = function layerLoader(source) {
   // Inject the layer name as an export
-  return [
-    source,
-    'export const layer = "explicit-layer";'
-  ].join('\n');
+  return [source, 'export const layer = "explicit-layer";'].join('\n');
 };

packages/enhanced/test/configCases/sharing/layers-consume-loader/.gitignore

@@ -1,5 +1,5 @@
 it('Module Graph should have layerd share', async () => {
-  const {version, layer} = (await import('./async-boundary'));
+  const { version, layer } = await import('./async-boundary');
   expect(version).toBe('1.0.0');
   expect(layer).toBe('react-layer');
 });

packages/enhanced/test/configCases/sharing/layers-consume-loader/async-boundary.js

@@ -0,0 +1,3 @@
+import './index-test';
+import './other-test';
+import './differing-test';

packages/enhanced/test/configCases/sharing/layers/differing-layer.js packages/enhanced/test/configCases/sharing/layers-consume-loader/differing-layer.js

@@ -0,0 +1,4 @@
+module.exports = function layerLoader(source) {
+  // Inject the layer name as an export
+  return [source, 'export const layer = "react-layer";'].join('\n');
+};

packages/enhanced/test/configCases/sharing/layers/differing-test.js packages/enhanced/test/configCases/sharing/layers-consume-loader/differing-test.js

@@ -1,5 +1,5 @@
 it('Module Graph should unlayered share', async () => {
-  const {version, layer} = (await import('./async-boundary'));
+  const { version, layer } = await import('./async-boundary');
   expect(version).toBe('1.0.0');
   expect(layer).toBeUndefined();
 });

packages/enhanced/test/configCases/sharing/layers/explicit-layer.js packages/enhanced/test/configCases/sharing/layers-consume-loader/explicit-layer.js

@@ -0,0 +1 @@
+import './other-test';

packages/enhanced/test/configCases/sharing/layers/index-test.js packages/enhanced/test/configCases/sharing/layers-consume-loader/index-test.js

@@ -0,0 +1,11 @@
+{
+  "name": "layered-react-test",
+  "version": "1.0.0",
+  "private": true,
+  "scripts": {
+    "build": "webpack --config=webpack.config.js"
+  },
+  "dependencies": {
+    "react": "1.0.0"
+  }
+}

packages/enhanced/test/configCases/sharing/layers-consume-loader/index.js

@@ -0,0 +1,6 @@
+module.exports = {
+  layers: true,
+  findBundle: function () {
+    return ['bundle0.js'];
+  },
+};