Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(enhanced): support shared module layers #3276

Open
wants to merge 55 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
5b107fa
feat(enhanced): support layers
ScriptedAlchemy Nov 17, 2024
062706f
feat(enhanced): support layers
ScriptedAlchemy Nov 17, 2024
cfd9d01
feat(enhanced): layers for consume shared module
ScriptedAlchemy Nov 21, 2024
3e59c55
Merge branch 'main' into layers-support
ScriptedAlchemy Nov 21, 2024
536b110
Merge branch 'main' into layers-support
ScriptedAlchemy Nov 21, 2024
aed08e9
feat(enhanced): add issuerLayer support to consume shared
ScriptedAlchemy Nov 22, 2024
9fb164b
chore(enhanced): update test
ScriptedAlchemy Nov 25, 2024
a9d899c
chore(enhanced): update test
ScriptedAlchemy Nov 25, 2024
33a36d1
feat(enhanced): ConsumeSharedPlugin issuerLayer support
ScriptedAlchemy Nov 25, 2024
f0c5c50
chore: update tests for layer combos
ScriptedAlchemy Nov 25, 2024
578adbb
chore: update tests for layer combos
ScriptedAlchemy Nov 25, 2024
31f08d0
chore: update tests for layer combos
ScriptedAlchemy Nov 25, 2024
066ffa6
feat(enhanced): support direct layer
ScriptedAlchemy Nov 25, 2024
b70eb8d
Merge branch 'main' into layers-support
ScriptedAlchemy Nov 25, 2024
358ba00
fix(enhanced): update share options of share plugin
ScriptedAlchemy Nov 25, 2024
94d72ed
fix(enhanced): update share options of share plugin
ScriptedAlchemy Nov 25, 2024
91dbb12
chore(enhanced): refactor layers tests
ScriptedAlchemy Nov 25, 2024
514cf03
chore(enhanced): remove layer options from provider
ScriptedAlchemy Nov 25, 2024
359b0ca
Merge branch 'main' into consume-share-layers
ScriptedAlchemy Nov 25, 2024
24ef6d0
Delete .cursorrules
ScriptedAlchemy Nov 25, 2024
9d9bff2
feat(enhanced): support layers in consume share
ScriptedAlchemy Nov 26, 2024
40ae817
Merge branch 'main' into consume-share-layers
ScriptedAlchemy Nov 26, 2024
d1c68b3
fix(enhanced): rename requiredLayer to layer
ScriptedAlchemy Dec 2, 2024
22964f8
Merge remote-tracking branch 'origin/consume-share-layers' into consu…
ScriptedAlchemy Dec 2, 2024
9884030
Merge branch 'main' into consume-share-layers
ScriptedAlchemy Dec 2, 2024
3d8fa21
refactor(enhanced): pr review of consume share layering
ScriptedAlchemy Dec 3, 2024
69a2a52
Merge branch 'main' into consume-share-layers
ScriptedAlchemy Dec 3, 2024
04b8ffd
chore: locks
ScriptedAlchemy Dec 3, 2024
7852878
feat(enhanced): add request to consume share (#3307)
ScriptedAlchemy Dec 5, 2024
f35b1b1
Merge branch 'main' into consume-share-layers
ScriptedAlchemy Dec 5, 2024
b8df73e
chore: remove tt
ScriptedAlchemy Dec 9, 2024
b4b5a7b
chore: remove unused share
ScriptedAlchemy Dec 9, 2024
6f8f45e
refactor(enhanced): refactor type locations
ScriptedAlchemy Dec 10, 2024
875f516
feat(enhanced): ProvideSharedPlugin loader layer support (#3334)
ScriptedAlchemy Dec 12, 2024
673f6ca
Merge branch 'main' into consume-share-layers
ScriptedAlchemy Dec 12, 2024
20bae5b
chore: locks
ScriptedAlchemy Dec 12, 2024
a5774c8
chore(enhanced): add share plugin test
ScriptedAlchemy Dec 13, 2024
d44acbd
chore(enhanced): add share plugin test
ScriptedAlchemy Dec 13, 2024
1a33ac7
chore(enhanced): add share plugin test
ScriptedAlchemy Dec 13, 2024
1fc2b05
thing
ScriptedAlchemy Dec 13, 2024
29f6d73
thing
ScriptedAlchemy Dec 13, 2024
22127ee
chore(node): lint
ScriptedAlchemy Dec 13, 2024
8f9fb99
chore(node): lint
ScriptedAlchemy Dec 13, 2024
243f1bc
Merge branch 'main' into consume-share-layers
ScriptedAlchemy Dec 13, 2024
0c665be
feat(enhanced): layers support in module code generation (#3371)
ScriptedAlchemy Dec 29, 2024
ffdaf0b
chore: changeset
ScriptedAlchemy Dec 31, 2024
687365f
feat(enhanced): Layer via composite shareKey (#3415)
ScriptedAlchemy Dec 31, 2024
4ef6efb
Merge branch 'main' into consume-share-layers
ScriptedAlchemy Dec 31, 2024
81d2365
chore: locks
ScriptedAlchemy Dec 31, 2024
6f952fd
Merge branch 'main' into consume-share-layers
ScriptedAlchemy Jan 1, 2025
5fce760
chore: locks
ScriptedAlchemy Jan 1, 2025
1fba24f
fix(enhanced): cache consume module layer
ScriptedAlchemy Jan 2, 2025
7af571f
fix(nextjs-mf): enable app router shares and disable hard fail
ScriptedAlchemy Jan 2, 2025
7a178c0
chore: add host remote app router
ScriptedAlchemy Jan 2, 2025
10f2b73
feat(nextjs-mf): update module share for rsc
ScriptedAlchemy Jan 3, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .cursorrules
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# PersonaYou are a senior full-stack developer. One of those rare 10x developers that has incredible knowledge.# Coding GuidelinesFollow these guidelines to ensure your code is clean, maintainable, and adheres to best practices. Remember, less code is better. Lines of code = Debt.# Key Mindsets**1** **Simplicity**: Write simple and straightforward code.**2** **Readability**: Ensure your code is easy to read and understand.**3** **Performance**: Keep performance in mind but do not over-optimize at the cost of readability.**4** **Maintainability**: Write code that is easy to maintain and update.**5** **Testability**: Ensure your code is easy to test.**6** **Reusability**: Write reusable components and functions.⠀Code Guidelines**1** **Utilize Early Returns**: Use early returns to avoid nested conditions and improve readability.**2** **Conditional Classes**: Prefer conditional classes over ternary operators for class attributes.**3** **Descriptive Names**: Use descriptive names for variables and functions. Prefix event handler functions with "handle" (e.g., handleClick, handleKeyDown).**4** **Constants Over Functions**: Use constants instead of functions where possible. Define types if applicable.**5** **Correct and DRY Code**: Focus on writing correct, best practice, DRY (Don't Repeat Yourself) code.**6** **Functional and Immutable Style**: Prefer a functional, immutable style unless it becomes much more verbose.**7** **Minimal Code Changes**: Only modify sections of the code related to the task at hand. Avoid modifying unrelated pieces of code. Accomplish goals with minimal code changes.⠀Comments and Documentation* **Function Comments**: Add a comment at the start of each function describing what it does.* **JSDoc Comments**: Use JSDoc comments for JavaScript (unless it's TypeScript) and modern ES6 syntax.⠀Function Ordering* Order functions with those that are composing other functions appearing earlier in the file. For example, if you have a menu with multiple buttons, define the menu function above the buttons.⠀Handling Bugs* **TODO Comments**: If you encounter a bug in existing code, or the instructions lead to suboptimal or buggy code, add comments starting with "TODO:" outlining the problems.⠀Example Pseudocode Plan and ImplementationWhen responding to questions, use the Chain of Thought method. Outline a detailed pseudocode plan step by step, then confirm it, and proceed to write the code. Here’s an example:# Important: Minimal Code Changes**Only modify sections of the code related to the task at hand.****Avoid modifying unrelated pieces of code.****Avoid changing existing comments.****Avoid any kind of cleanup unless specifically instructed to.****Accomplish the goal with the minimum amount of code changes.****Code change = potential for bugs and technical debt.**Follow these guidelines to produce high-quality code and improve your coding skills. If you have any questions or need clarification, don’t hesitate to ask!
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"commit": "cz",
"docs": "typedoc",
"f": "nx format:write",
"enhanced:jest": "pnpm build && cd packages/enhanced && NODE_OPTIONS=--experimental-vm-modules npx jest test/ConfigTestCases.basictest.js",
"lint": "nx run-many --target=lint",
"test": "nx run-many --target=test",
"build": "nx run-many --target=build --parallel=5 --projects=tag:type:pkg",
Expand Down Expand Up @@ -228,6 +229,7 @@
"vue-tsc": "^2.0.26",
"wait-on": "^7.2.0",
"webpack": "5.93.0",
"webpack-cli": "^5.1.4",
"webpack-virtual-modules": "0.6.2",
"whatwg-fetch": "^3.6.20",
"yargs": "^17.7.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,12 @@ export interface ConsumesConfig {
* Do not accept shared module if version is not valid (defaults to yes, if local fallback module is available and shared module is not a singleton, otherwise no, has no effect if there is no required version specified).
*/
strictVersion?: boolean;
/**
* Issuer layer in which the module should be resolved.
*/
issuerLayer?: string;
/**
* Required layer for the shared module.
*/
requiredLayer?: string;
}
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,12 @@ export interface SharedConfig {
* Version of the provided module. Will replace lower matching versions, but not higher.
*/
version?: false | string;
/**
* Issuer layer in which the module should be resolved.
*/
issuerLayer?: string;
/**
* Required layer for the shared module.
*/
requiredLayer?: string;
}
27 changes: 24 additions & 3 deletions packages/enhanced/src/lib/sharing/ConsumeSharedModule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,18 @@ export type ConsumeOptions = {
* include the fallback module in a sync way
*/
eager: boolean;
/**
* Share a specific layer of the module, if the module supports layers
*/
layer?: string | null;
/**
* Issuer layer in which the module should be resolved
*/
issuerLayer?: string | null;
/**
* Required layer for the shared module
*/
requiredLayer?: string | null;
};

/**
Expand All @@ -91,6 +103,9 @@ export type ConsumeOptions = {
* @property {boolean} strictVersion don't use shared version even if version isn't valid
* @property {boolean} singleton use single global version
* @property {boolean} eager include the fallback module in a sync way
* @property {string | null=} layer Share a specific layer of the module, if the module supports layers
* @property {string | null=} issuerLayer Issuer layer in which the module should be resolved
* @property {string | null=} requiredLayer Required layer for the shared module
ScriptedAlchemy marked this conversation as resolved.
Show resolved Hide resolved
*/

const TYPES = new Set(['consume-shared']);
Expand All @@ -103,7 +118,11 @@ class ConsumeSharedModule extends Module {
* @param {ConsumeOptions} options consume options
*/
constructor(context: string, options: ConsumeOptions) {
super(WEBPACK_MODULE_TYPE_CONSUME_SHARED_MODULE, context);
super(
WEBPACK_MODULE_TYPE_CONSUME_SHARED_MODULE,
context,
options.layer ?? undefined,
);
this.options = options;
}

Expand All @@ -119,10 +138,11 @@ class ConsumeSharedModule extends Module {
strictVersion,
singleton,
eager,
layer,
} = this.options;
return `${WEBPACK_MODULE_TYPE_CONSUME_SHARED_MODULE}|${shareScope}|${shareKey}|${
requiredVersion && rangeToString(requiredVersion)
}|${strictVersion}|${importResolved}|${singleton}|${eager}`;
}|${strictVersion}|${importResolved}|${singleton}|${eager}|${layer}`;
}

/**
Expand All @@ -138,14 +158,15 @@ class ConsumeSharedModule extends Module {
strictVersion,
singleton,
eager,
layer,
} = this.options;
return `consume shared module (${shareScope}) ${shareKey}@${
requiredVersion ? rangeToString(requiredVersion) : '*'
}${strictVersion ? ' (strict)' : ''}${singleton ? ' (singleton)' : ''}${
importResolved
? ` (fallback: ${requestShortener.shorten(importResolved)})`
: ''
}${eager ? ' (eager)' : ''}`;
}${eager ? ' (eager)' : ''}${layer ? ` (${layer})` : ''}`;
}

/**
Expand Down
83 changes: 59 additions & 24 deletions packages/enhanced/src/lib/sharing/ConsumeSharedPlugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
normalizeWebpackPath,
} from '@module-federation/sdk/normalize-webpack-path';
import { isRequiredVersion } from '@module-federation/sdk';
import type { Compiler, Compilation } from 'webpack';
import type { Compiler, Compilation, Module } from 'webpack';
import { parseOptions } from '../container/options';
import { ConsumeOptions } from './ConsumeSharedModule';
import { ConsumeSharedPluginOptions } from '../../declarations/plugins/sharing/ConsumeSharedPlugin';
Expand All @@ -29,6 +29,7 @@ import ProvideForSharedDependency from './ProvideForSharedDependency';
import FederationRuntimePlugin from '../container/runtime/FederationRuntimePlugin';
import ShareRuntimeModule from './ShareRuntimeModule';
import type { SemVerRange } from 'webpack/lib/util/semver';
import type { ResolveData } from 'webpack/lib/NormalModuleFactory';

const ModuleNotFoundError = require(
normalizeWebpackPath('webpack/lib/ModuleNotFoundError'),
Expand All @@ -48,17 +49,8 @@ const createSchemaValidation = require(

const validate = createSchemaValidation(
//eslint-disable-next-line
require(
normalizeWebpackPath(
'webpack/schemas/plugins/sharing/ConsumeSharedPlugin.check.js',
),
),
() =>
require(
normalizeWebpackPath(
'webpack/schemas/plugins/sharing/ConsumeSharedPlugin.json',
),
),
require('../../schemas/sharing/ConsumeSharedPlugin.check.js'),
() => require('../../schemas/sharing/ConsumeSharedPlugin'),
{
name: 'Consume Shared Plugin',
baseDataPath: 'options',
Expand Down Expand Up @@ -94,6 +86,8 @@ class ConsumeSharedPlugin {
strictVersion: false,
singleton: false,
eager: false,
issuerLayer: undefined,
requiredLayer: undefined,
}
: // key is a request/key
// item is a version
Expand All @@ -107,6 +101,8 @@ class ConsumeSharedPlugin {
packageName: undefined,
singleton: false,
eager: false,
issuerLayer: undefined,
requiredLayer: undefined,
};
return result;
},
Expand All @@ -124,6 +120,8 @@ class ConsumeSharedPlugin {
packageName: item.packageName,
singleton: !!item.singleton,
eager: !!item.eager,
issuerLayer: item.issuerLayer ? item.issuerLayer : undefined,
requiredLayer: item.requiredLayer ? item.requiredLayer : undefined,
ScriptedAlchemy marked this conversation as resolved.
Show resolved Hide resolved
}),
);
}
Expand Down Expand Up @@ -296,33 +294,69 @@ class ConsumeSharedPlugin {

normalModuleFactory.hooks.factorize.tapPromise(
PLUGIN_NAME,
({ context, request, dependencies }) =>
async (resolveData: ResolveData): Promise<Module | undefined> => {
const { context, request, dependencies, contextInfo } = resolveData;
// wait for resolving to be complete
//@ts-ignore
promise.then(() => {
return promise.then(() => {
if (
dependencies[0] instanceof ConsumeSharedFallbackDependency ||
dependencies[0] instanceof ProvideForSharedDependency
) {
return;
}

// First try to match with layer-specific request
if (contextInfo.issuerLayer) {
// Try to find a layer-specific match
for (const [key, options] of unresolvedConsumes) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be handled in the unresolvedConsumes.get case below

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ive opened up a new PR with additional adjustments for this, it becomes hard to control due to how request is used.
I propose adding another option explicitly for controlling the request matching.

if (
options.issuerLayer === contextInfo.issuerLayer &&
(key === request ||
(options.import && options.import === request))
ScriptedAlchemy marked this conversation as resolved.
Show resolved Hide resolved
) {
return createConsumeSharedModule(context, request, {
...options,
layer: options.requiredLayer || contextInfo.issuerLayer,
});
}
}
}

// If no layer-specific match found, try regular matching
const match = unresolvedConsumes.get(request);
if (match !== undefined) {
return createConsumeSharedModule(context, request, match);
// Only use non-layer-specific match if it doesn't have issuerLayer
if (!match.issuerLayer) {
return createConsumeSharedModule(context, request, {
...match,
layer: match.requiredLayer || contextInfo.issuerLayer,
});
}
}

// Check prefixed consumes
for (const [prefix, options] of prefixedConsumes) {
if (request.startsWith(prefix)) {
const remainder = request.slice(prefix.length);
return createConsumeSharedModule(context, request, {
...options,
import: options.import
? options.import + remainder
: undefined,
shareKey: options.shareKey + remainder,
});
// Only use prefixed consume if layer matches or no layer specified
if (
!options.issuerLayer ||
options.issuerLayer === contextInfo.issuerLayer
) {
const remainder = request.slice(prefix.length);
return createConsumeSharedModule(context, request, {
...options,
import: options.import
? options.import + remainder
: undefined,
shareKey: options.shareKey + remainder,
layer: options.requiredLayer || contextInfo.issuerLayer,
});
}
}
}
}),
});
},
);
normalModuleFactory.hooks.createModule.tapPromise(
PLUGIN_NAME,
Expand All @@ -336,6 +370,7 @@ class ConsumeSharedPlugin {
if (resource) {
const options = resolvedConsumes.get(resource);
if (options !== undefined) {
//@ts-ignore
ScriptedAlchemy marked this conversation as resolved.
Show resolved Hide resolved
return createConsumeSharedModule(context, resource, options);
}
}
Expand Down
2 changes: 2 additions & 0 deletions packages/enhanced/src/lib/sharing/SharePlugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ class SharePlugin {
singleton: options.singleton,
packageName: options.packageName,
eager: options.eager,
issuerLayer: options.issuerLayer,
requiredLayer: options.requiredLayer,
},
}),
);
Expand Down
Loading
Loading