Skip to content

Commit

Permalink
Merge pull request #5997 from filipesilva/concatenated-module-identifier
Browse files Browse the repository at this point in the history
Use shorter identifier for ConcatenatedModules
  • Loading branch information
sokra committed Nov 22, 2017
2 parents 46a6c34 + aef6f19 commit 20759bb
Showing 1 changed file with 15 additions and 6 deletions.
21 changes: 15 additions & 6 deletions lib/optimize/ConcatenatedModule.js
Expand Up @@ -7,6 +7,7 @@
const Module = require("../Module");
const Template = require("../Template");
const Parser = require("../Parser");
const crypto = require("crypto");
const acorn = require("acorn");
const escope = require("escope");
const ReplaceSource = require("webpack-sources/lib/ReplaceSource");
Expand Down Expand Up @@ -210,6 +211,7 @@ class ConcatenatedModule extends Module {
Object.assign(this.assets, m.assets);
}
}
this._identifier = this._createIdentifier();
}

get modules() {
Expand All @@ -219,12 +221,7 @@ class ConcatenatedModule extends Module {
}

identifier() {
return this._orderedConcatenationList.map(info => {
switch(info.type) {
case "concatenated":
return info.module.identifier();
}
}).filter(Boolean).join(" ");
return this._identifier;
}

readableIdentifier(requestShortener) {
Expand Down Expand Up @@ -297,6 +294,18 @@ class ConcatenatedModule extends Module {
return list;
}

_createIdentifier() {
const orderedConcatenationListIdentifiers = this._orderedConcatenationList.map(info => {
switch(info.type) {
case "concatenated":
return info.module.identifier();
}
}).filter(Boolean).join(" ");
const hash = crypto.createHash("md5");
hash.update(orderedConcatenationListIdentifiers);
return this.rootModule.identifier() + " " + hash.digest("hex");
}

source(dependencyTemplates, outputOptions, requestShortener) {
// Metainfo for each module
const modulesWithInfo = this._orderedConcatenationList.map((info, idx) => {
Expand Down

0 comments on commit 20759bb

Please sign in to comment.