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

fix: don't try to discover shared item version in case of custom version or invalid package name #131

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ describe('normalizeModuleFederationOption', () => {
scope: 'default',
version: '1.0.0',
shareConfig: {
requiredVersion: '*',
requiredVersion: '^1.0.0',
singleton: false,
strictVersion: false,
},
Expand Down
33 changes: 18 additions & 15 deletions src/utils/normalizeModuleFederationOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,15 @@ export interface ShareItem {
shareConfig: SharedConfig;
}

function removePathFromNpmPackage(packageString: string): string {
function removePathFromNpmPackage(packageString: string): string | undefined {
// 匹配npm包名的正则表达式,忽略路径部分
const regex = /^(?:@[^/]+\/)?[^/]+/;
const regex = /^(?:@[^/]+\/)?\w[^/]+/;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

A valid package starts with a letter.


// 使用正则表达式匹配并提取包名
const match = packageString.match(regex);

// 返回匹配到的包名,如果没有匹配到则返回原字符串
return match ? match[0] : packageString;
return match?.[0];
}

function normalizeShareItem(
Expand All @@ -130,12 +130,18 @@ function normalizeShareItem(
strictVersion?: boolean;
}
): ShareItem {
let version: string | undefined;
try {
version = require(path.join(removePathFromNpmPackage(key), 'package.json')).version;
} catch (e) {
console.log(e);
let { version, requiredVersion }: any = typeof shareItem === 'object' ? shareItem : {};
if (!version) {
const npmPackage = removePathFromNpmPackage(key);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Aliases probably should take precedence over packages.

if (npmPackage) {
try {
version = require(path.join(npmPackage, 'package.json')).version;
} catch (e) {
console.log(e);
}
}
}
requiredVersion ??= version ? `^${version}` : '*';
if (typeof shareItem === 'string') {
return {
name: shareItem,
Expand All @@ -144,18 +150,18 @@ function normalizeShareItem(
from: '',
shareConfig: {
singleton: false,
requiredVersion: version ? `^${version}` : '*',
requiredVersion,
},
};
}
return {
name: key,
from: '',
version: shareItem.version || version,
version: shareItem.version ?? version,
scope: shareItem.shareScope || 'default',
shareConfig: {
singleton: shareItem.singleton || false,
requiredVersion: shareItem.requiredVersion || (version ? `^${version}` : '*'),
requiredVersion,
strictVersion: !!shareItem.strictVersion,
},
};
Expand Down Expand Up @@ -313,10 +319,7 @@ export function getNormalizeModuleFederationOptions() {

export function getNormalizeShareItem(key: string) {
const options = getNormalizeModuleFederationOptions();
const shareItem =
options.shared[removePathFromNpmPackage(key)] ||
options.shared[removePathFromNpmPackage(key) + '/'];
return shareItem;
return options.shared[key];
Copy link
Contributor Author

Choose a reason for hiding this comment

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

removePathFromNpmPackage() doesn't looks to be applied when creating the shared object.

}

export function normalizeModuleFederationOptions(
Expand Down