Completely updated React, fixed #11, (hopefully)

This commit is contained in:
2018-03-04 19:11:49 -05:00
parent 6e0afd6e2a
commit 34e5f5139a
13674 changed files with 333464 additions and 473223 deletions

View File

@@ -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");
@@ -142,6 +143,7 @@ function getPathInAst(ast, node) {
}
function enterNode(n) {
if(!n) return undefined;
const r = n.range;
if(r) {
if(r[0] <= nr[0] && r[1] >= nr[1]) {
@@ -210,6 +212,7 @@ class ConcatenatedModule extends Module {
Object.assign(this.assets, m.assets);
}
}
this._identifier = this._createIdentifier();
}
get modules() {
@@ -219,12 +222,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) {
@@ -297,6 +295,19 @@ class ConcatenatedModule extends Module {
return list;
}
_createIdentifier() {
let orderedConcatenationListIdentifiers = "";
for(let i = 0; i < this._orderedConcatenationList.length; i++) {
if(this._orderedConcatenationList[i].type === "concatenated") {
orderedConcatenationListIdentifiers += this._orderedConcatenationList[i].module.identifier();
orderedConcatenationListIdentifiers += " ";
}
}
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) => {