Skip to content

Commit

Permalink
Merge branch 'master' into deps/extract-text-webpack-plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
@sokra
sokra committed Jul 24, 2017
2 parents f296790 + e72a88a commit 838d416
Show file tree
Hide file tree
Showing 17 changed files with 545 additions and 405 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
View file
Expand Up @@ -36,6 +36,7 @@ module.exports = {
"space-before-function-paren": ["error", "never"],
"space-before-blocks": "error",
"object-curly-spacing": ["error", "always"],
"indent": "off",
"keyword-spacing": ["error", {
"after": false,
"overrides": {
Expand Down
2 changes: 1 addition & 1 deletion bin/convert-argv.js
View file
Expand Up @@ -300,7 +300,7 @@ module.exports = function(yargs, argv, convertOptions) {
binding += "-loader";
}
var rule = {
test: new RegExp("\\." + name.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&") + "$"),
test: new RegExp("\\." + name.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&") + "$"), // eslint-disable-line no-useless-escape
loader: binding
};
if(arg === "module-bind-pre") {
Expand Down
4 changes: 2 additions & 2 deletions lib/MultiCompiler.js
View file
Expand Up @@ -46,8 +46,8 @@ module.exports = class MultiCompiler extends Tapable {
get outputPath() {
let commonPath = this.compilers[0].outputPath;
for(const compiler of this.compilers) {
while(compiler.outputPath.indexOf(commonPath) !== 0 && /[\/\\]/.test(commonPath)) {
commonPath = commonPath.replace(/[\/\\][^\/\\]*$/, "");
while(compiler.outputPath.indexOf(commonPath) !== 0 && /[/\\]/.test(commonPath)) {
commonPath = commonPath.replace(/[/\\][^/\\]*$/, "");
}
}

Expand Down
278 changes: 133 additions & 145 deletions lib/NormalModuleFactory.js
View file
Expand Up @@ -50,173 +50,161 @@ class NormalModuleFactory extends Tapable {
this.cachePredicate = typeof options.unsafeCache === "function" ? options.unsafeCache : Boolean.bind(null, options.unsafeCache);
this.context = context || "";
this.parserCache = {};
this.plugin("factory", function() {
/* beautify preserve:start */
// js-beautify consider to concat "return" and "("
// but it сontradicts eslint rule (keyword-spacing)
return (result, callback) => {
/* beautify preserve:end */
let resolver = this.applyPluginsWaterfall0("resolver", null);
this.plugin("factory", () => (result, callback) => {
let resolver = this.applyPluginsWaterfall0("resolver", null);

// Ignored
if(!resolver) return callback();

resolver(result, (err, data) => {
if(err) return callback(err);
// Ignored
if(!resolver) return callback();

// Ignored
if(!data) return callback();
resolver(result, (err, data) => {
if(err) return callback(err);

// direct module
if(typeof data.source === "function")
return callback(null, data);
// Ignored
if(!data) return callback();

this.applyPluginsAsyncWaterfall("after-resolve", data, (err, result) => {
if(err) return callback(err);
// direct module
if(typeof data.source === "function")
return callback(null, data);

// Ignored
if(!result) return callback();
this.applyPluginsAsyncWaterfall("after-resolve", data, (err, result) => {
if(err) return callback(err);

let createdModule = this.applyPluginsBailResult("create-module", result);
if(!createdModule) {
// Ignored
if(!result) return callback();

if(!result.request) {
return callback(new Error("Empty dependency (no request)"));
}
let createdModule = this.applyPluginsBailResult("create-module", result);
if(!createdModule) {

createdModule = new NormalModule(
result.request,
result.userRequest,
result.rawRequest,
result.loaders,
result.resource,
result.parser
);
if(!result.request) {
return callback(new Error("Empty dependency (no request)"));
}

createdModule = this.applyPluginsWaterfall0("module", createdModule);
createdModule = new NormalModule(
result.request,
result.userRequest,
result.rawRequest,
result.loaders,
result.resource,
result.parser
);
}

return callback(null, createdModule);
});
createdModule = this.applyPluginsWaterfall0("module", createdModule);

return callback(null, createdModule);
});
};
});
});
this.plugin("resolver", function() {
/* beautify preserve:start */
// js-beautify consider to concat "return" and "("
// but it сontradicts eslint rule (keyword-spacing)
return (data, callback) => {
/* beautify preserve:end */
const contextInfo = data.contextInfo;
const context = data.context;
const request = data.request;

const noAutoLoaders = /^-?!/.test(request);
const noPrePostAutoLoaders = /^!!/.test(request);
const noPostAutoLoaders = /^-!/.test(request);
let elements = request.replace(/^-?!+/, "").replace(/!!+/g, "!").split("!");
let resource = elements.pop();
elements = elements.map(identToLoaderRequest);

asyncLib.parallel([
callback => this.resolveRequestArray(contextInfo, context, elements, this.resolvers.loader, callback),
callback => {
if(resource === "" || resource[0] === "?")
return callback(null, {
resource
});

this.resolvers.normal.resolve(contextInfo, context, resource, (err, resource, resourceResolveData) => {
if(err) return callback(err);
callback(null, {
resourceResolveData,
resource
});
this.plugin("resolver", () => (data, callback) => {
const contextInfo = data.contextInfo;
const context = data.context;
const request = data.request;

const noAutoLoaders = /^-?!/.test(request);
const noPrePostAutoLoaders = /^!!/.test(request);
const noPostAutoLoaders = /^-!/.test(request);
let elements = request.replace(/^-?!+/, "").replace(/!!+/g, "!").split("!");
let resource = elements.pop();
elements = elements.map(identToLoaderRequest);

asyncLib.parallel([
callback => this.resolveRequestArray(contextInfo, context, elements, this.resolvers.loader, callback),
callback => {
if(resource === "" || resource[0] === "?")
return callback(null, {
resource
});
}
], (err, results) => {
if(err) return callback(err);
let loaders = results[0];
const resourceResolveData = results[1].resourceResolveData;
resource = results[1].resource;

// translate option idents
try {
loaders.forEach(item => {
if(typeof item.options === "string" && /^\?/.test(item.options)) {
item.options = this.ruleSet.findOptionsByIdent(item.options.substr(1));
}

this.resolvers.normal.resolve(contextInfo, context, resource, (err, resource, resourceResolveData) => {
if(err) return callback(err);
callback(null, {
resourceResolveData,
resource
});
} catch(e) {
return callback(e);
}
});
}
], (err, results) => {
if(err) return callback(err);
let loaders = results[0];
const resourceResolveData = results[1].resourceResolveData;
resource = results[1].resource;

// translate option idents
try {
loaders.forEach(item => {
if(typeof item.options === "string" && /^\?/.test(item.options)) {
item.options = this.ruleSet.findOptionsByIdent(item.options.substr(1));
}
});
} catch(e) {
return callback(e);
}

if(resource === false) {
// ignored
return callback(null,
new RawModule(
"/* (ignored) */",
`ignored ${context} ${request}`,
`${request} (ignored)`
)
);
}
if(resource === false) {
// ignored
return callback(null,
new RawModule(
"/* (ignored) */",
`ignored ${context} ${request}`,
`${request} (ignored)`
)
);
}

const userRequest = loaders.map(loaderToIdent).concat([resource]).join("!");
const userRequest = loaders.map(loaderToIdent).concat([resource]).join("!");

let resourcePath = resource;
let resourceQuery = "";
const queryIndex = resourcePath.indexOf("?");
if(queryIndex >= 0) {
resourceQuery = resourcePath.substr(queryIndex);
resourcePath = resourcePath.substr(0, queryIndex);
}
let resourcePath = resource;
let resourceQuery = "";
const queryIndex = resourcePath.indexOf("?");
if(queryIndex >= 0) {
resourceQuery = resourcePath.substr(queryIndex);
resourcePath = resourcePath.substr(0, queryIndex);
}

const result = this.ruleSet.exec({
resource: resourcePath,
resourceQuery,
issuer: contextInfo.issuer,
compiler: contextInfo.compiler
});
const settings = {};
const useLoadersPost = [];
const useLoaders = [];
const useLoadersPre = [];
result.forEach(r => {
if(r.type === "use") {
if(r.enforce === "post" && !noPostAutoLoaders && !noPrePostAutoLoaders)
useLoadersPost.push(r.value);
else if(r.enforce === "pre" && !noPrePostAutoLoaders)
useLoadersPre.push(r.value);
else if(!r.enforce && !noAutoLoaders && !noPrePostAutoLoaders)
useLoaders.push(r.value);
} else {
settings[r.type] = r.value;
}
});
asyncLib.parallel([
this.resolveRequestArray.bind(this, contextInfo, this.context, useLoadersPost, this.resolvers.loader),
this.resolveRequestArray.bind(this, contextInfo, this.context, useLoaders, this.resolvers.loader),
this.resolveRequestArray.bind(this, contextInfo, this.context, useLoadersPre, this.resolvers.loader)
], (err, results) => {
if(err) return callback(err);
loaders = results[0].concat(loaders, results[1], results[2]);
process.nextTick(() => {
callback(null, {
context: context,
request: loaders.map(loaderToIdent).concat([resource]).join("!"),
dependencies: data.dependencies,
userRequest,
rawRequest: request,
loaders,
resource,
resourceResolveData,
parser: this.getParser(settings.parser)
});
const result = this.ruleSet.exec({
resource: resourcePath,
resourceQuery,
issuer: contextInfo.issuer,
compiler: contextInfo.compiler
});
const settings = {};
const useLoadersPost = [];
const useLoaders = [];
const useLoadersPre = [];
result.forEach(r => {
if(r.type === "use") {
if(r.enforce === "post" && !noPostAutoLoaders && !noPrePostAutoLoaders)
useLoadersPost.push(r.value);
else if(r.enforce === "pre" && !noPrePostAutoLoaders)
useLoadersPre.push(r.value);
else if(!r.enforce && !noAutoLoaders && !noPrePostAutoLoaders)
useLoaders.push(r.value);
} else {
settings[r.type] = r.value;
}
});
asyncLib.parallel([
this.resolveRequestArray.bind(this, contextInfo, this.context, useLoadersPost, this.resolvers.loader),
this.resolveRequestArray.bind(this, contextInfo, this.context, useLoaders, this.resolvers.loader),
this.resolveRequestArray.bind(this, contextInfo, this.context, useLoadersPre, this.resolvers.loader)
], (err, results) => {
if(err) return callback(err);
loaders = results[0].concat(loaders, results[1], results[2]);
process.nextTick(() => {
callback(null, {
context: context,
request: loaders.map(loaderToIdent).concat([resource]).join("!"),
dependencies: data.dependencies,
userRequest,
rawRequest: request,
loaders,
resource,
resourceResolveData,
parser: this.getParser(settings.parser)
});
});
});
};
});
});
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Parser.js
View file
Expand Up @@ -1102,7 +1102,7 @@ class Parser extends Tapable {
result = this.applyPluginsBailResult1("call " + callee.identifier, expression);
if(result === true)
return;
let identifier = callee.identifier.replace(/\.[^\.]+$/, ".*");
let identifier = callee.identifier.replace(/\.[^.]+$/, ".*");
if(identifier !== callee.identifier) {
result = this.applyPluginsBailResult1("call " + identifier, expression);
if(result === true)
Expand Down
2 changes: 1 addition & 1 deletion lib/Stats.js
View file
Expand Up @@ -110,7 +110,7 @@ class Stats {
const showPublicPath = optionOrLocalFallback(options.publicPath, !forToString);
const excludeModules = [].concat(optionOrFallback(options.exclude, [])).map(item => {
if(typeof item === "string") {
const regExp = new RegExp(`[\\\\/]${item.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&")}([\\\\/]|$|!|\\?)`);
const regExp = new RegExp(`[\\\\/]${item.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&")}([\\\\/]|$|!|\\?)`); // eslint-disable-line no-useless-escape
return ident => regExp.test(ident);
}
if(item && typeof item === "object" && typeof item.test === "function")
Expand Down
2 changes: 1 addition & 1 deletion lib/Template.js
View file
Expand Up @@ -28,7 +28,7 @@ module.exports = class Template extends Tapable {

static toPath(str) {
if(typeof str !== "string") return "";
return str.replace(/[^a-zA-Z0-9_!§$()=\-\^°]+/g, "-").replace(/^-|-$/, "");
return str.replace(/[^a-zA-Z0-9_!§$()=\-^°]+/g, "-").replace(/^-|-$/, "");
}

// map number to a single character a-z, A-Z or <_ + number> if number is too big
Expand Down
2 changes: 1 addition & 1 deletion lib/dependencies/HarmonyCompatibilityDependency.js
View file
Expand Up @@ -21,7 +21,7 @@ HarmonyCompatibilityDependency.Template = class HarmonyExportDependencyTemplate
const usedExports = dep.originModule.usedExports;
if(usedExports && !Array.isArray(usedExports)) {
const exportName = dep.originModule.exportsArgument || "exports";
const content = `Object.defineProperty(${exportName}, \"__esModule\", { value: true });\n`;
const content = `Object.defineProperty(${exportName}, "__esModule", { value: true });\n`;
source.insert(-10, content);
}
}
Expand Down

0 comments on commit 838d416

Please sign in to comment.