Skip to content

Commit 5177bb3

Browse files
chore(all): prepare release 2.0.0-rc.5
1 parent f09f5c0 commit 5177bb3

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

dist/PreserveModuleNamePlugin.js

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,25 @@ class PreserveModuleNamePlugin {
2727
modulesBeforeConcat.splice(i--, 1, ...m["modules"]);
2828
}
2929
for (let module of getPreservedModules(modules)) {
30-
let preserve = module[exports.preserveModuleName];
30+
// Even though it's imported by Aurelia, it's still possible that the module
31+
// became the _root_ of a ConcatenatedModule.
32+
// We use `constructor.name` rather than `instanceof` for compat. with Webpack 2.
33+
let realModule = module;
34+
if (module.constructor.name === "ConcatenatedModule")
35+
realModule = module["rootModule"];
36+
let preserve = realModule[exports.preserveModuleName];
3137
let id = typeof preserve === "string" ? preserve : null;
3238
// No absolute request to preserve, we try to normalize the module resource
33-
if (!id && module.resource)
34-
id = fixNodeModule(module, modulesBeforeConcat) ||
35-
makeModuleRelative(roots, module.resource) ||
36-
aliasRelative(alias, module.resource);
39+
if (!id && realModule.resource)
40+
id = fixNodeModule(realModule, modulesBeforeConcat) ||
41+
makeModuleRelative(roots, realModule.resource) ||
42+
aliasRelative(alias, realModule.resource);
3743
if (!id)
38-
throw new Error(`Can't figure out a normalized module name for ${module.rawRequest}, please call PLATFORM.moduleName() somewhere to help.`);
44+
throw new Error(`Can't figure out a normalized module name for ${realModule.rawRequest}, please call PLATFORM.moduleName() somewhere to help.`);
3945
// Remove default extensions
4046
normalizers.forEach(n => id = id.replace(n, ""));
4147
// Keep "async!" in front of code splits proxies, they are used by aurelia-loader
42-
if (/^async[?!]/.test(module.rawRequest))
48+
if (/^async[?!]/.test(realModule.rawRequest))
4349
id = "async!" + id;
4450
id = id.replace(/\\/g, "/");
4551
if (module.meta)

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aurelia-webpack-plugin",
3-
"version": "2.0.0-rc.4",
3+
"version": "2.0.0-rc.5",
44
"description": "A plugin for webpack that enables bundling Aurelia applications.",
55
"keywords": [
66
"aurelia",

0 commit comments

Comments
 (0)