Skip to content

Commit

Permalink
fix #16561
Browse files Browse the repository at this point in the history
  • Loading branch information
long76 committed Dec 14, 2022
1 parent 4b4ca3b commit e45b75f
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions lib/library/AmdLibraryPlugin.js
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

0 comments on commit e45b75f

Please sign in to comment.