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.

Sign up for GitHub

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

Jump to bottom

fix #16561 #16562

Merged
merged 12 commits into from Apr 5, 2023
Merged

fix #16561 #16562

Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e45b75f
fix #16561
long76 Dec 14, 2022
7b07887
fix some lint
long76 Dec 14, 2022
0239355
fix: lint
long76 Dec 22, 2022
d371a69
fix library options
long76 Dec 22, 2022
3db5440
update snap
long76 Dec 22, 2022
eb7eb0b
fix types.d.ts
long76 Jan 1, 2023
e402736
update snap
long76 Jan 1, 2023
8c20d74
replace globalObject to amdContainer, add tests
long76 Jan 2, 2023
a966338
add test amd-container-require
long76 Mar 23, 2023
c5ac0d3
Merge branch 'main' into patch-1
long76 Mar 25, 2023
595e1cb
fix WebpackOptions.check.js
long76 Mar 25, 2023
4eaa6ab
update snapshot after merge
long76 Mar 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 14 additions & 6 deletions lib/library/AmdLibraryPlugin.js
View file
Open in desktop
Expand Up @@ -52,7 +52,7 @@ class AmdLibraryPlugin extends AbstractLibraryPlugin {
* @returns {T | false} preprocess as needed by overriding
*/
parseOptions(library) {
const { name } = library;
const { name, globalObject } = library;
if (this.requireAsWrapper) {
if (name) {
throw new Error(
Expand All @@ -66,8 +66,13 @@ class AmdLibraryPlugin extends AbstractLibraryPlugin {
);
}
}
let globalObjectPrefix = "";
if (globalObject) {
globalObjectPrefix = `${globalObject}.`;
}
return {
name: /** @type {string=} */ (name)
name: /** @type {string=} */ (name),
globalObjectPrefix: /** @type {string=} */ (globalObjectPrefix)
};
}

Expand Down Expand Up @@ -113,7 +118,7 @@ class AmdLibraryPlugin extends AbstractLibraryPlugin {

if (this.requireAsWrapper) {
return new ConcatSource(
`require(${externalsDepsArray}, ${fnStart}`,
`${options.globalObjectPrefix}require(${externalsDepsArray}, ${fnStart}`,
source,
`${fnEnd});`
);
Expand All @@ -123,18 +128,18 @@ class AmdLibraryPlugin extends AbstractLibraryPlugin {
});

return new ConcatSource(
`define(${JSON.stringify(name)}, ${externalsDepsArray}, ${fnStart}`,
`${options.globalObjectPrefix}define(${JSON.stringify(name)}, ${externalsDepsArray}, ${fnStart}`,
source,
`${fnEnd});`
);
} else if (externalsArguments) {
return new ConcatSource(
`define(${externalsDepsArray}, ${fnStart}`,
`${options.globalObjectPrefix}define(${externalsDepsArray}, ${fnStart}`,
source,
`${fnEnd});`
);
} else {
return new ConcatSource(`define(${fnStart}`, source, `${fnEnd});`);
return new ConcatSource(`${options.globalObjectPrefix}define(${fnStart}`, source, `${fnEnd});`);
}
}

Expand All @@ -155,6 +160,9 @@ class AmdLibraryPlugin extends AbstractLibraryPlugin {
chunk
});
hash.update(name);
} else if (options.globalObject) {
hash.update("globalObjected");
hash.update(options.globalObject);
}
}
}
Expand Down