webpack 2.3.3 → 2.5.1

package/lib/NodeStuffPlugin.js

@@ -2,95 +2,96 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var path = require("path");
-var ParserHelpers = require("./ParserHelpers");
-var ConstDependency = require("./dependencies/ConstDependency");
+"use strict";
 
-var NullFactory = require("./NullFactory");
+const path = require("path");
+const ParserHelpers = require("./ParserHelpers");
+const ConstDependency = require("./dependencies/ConstDependency");
 
-function NodeStuffPlugin(options) {
-	this.options = options;
-}
-module.exports = NodeStuffPlugin;
-NodeStuffPlugin.prototype.apply = function(compiler) {
-	var options = this.options;
-	compiler.plugin("compilation", function(compilation, params) {
-		compilation.dependencyFactories.set(ConstDependency, new NullFactory());
-		compilation.dependencyTemplates.set(ConstDependency, new ConstDependency.Template());
+const NullFactory = require("./NullFactory");
 
-		params.normalModuleFactory.plugin("parser", function(parser, parserOptions) {
+class NodeStuffPlugin {
+	constructor(options) {
+		this.options = options;
+	}
 
-			if(parserOptions.node === false)
-				return;
+	apply(compiler) {
+		const options = this.options;
+		compiler.plugin("compilation", (compilation, params) => {
+			compilation.dependencyFactories.set(ConstDependency, new NullFactory());
+			compilation.dependencyTemplates.set(ConstDependency, new ConstDependency.Template());
 
-			var localOptions = options;
-			if(parserOptions.node)
-				localOptions = Object.assign({}, localOptions, parserOptions.node);
+			params.normalModuleFactory.plugin("parser", (parser, parserOptions) => {
 
-			function setConstant(expressionName, value) {
-				parser.plugin("expression " + expressionName, function() {
-					this.state.current.addVariable(expressionName, JSON.stringify(value));
-					return true;
-				});
-			}
+				if(parserOptions.node === false)
+					return;
+
+				let localOptions = options;
+				if(parserOptions.node)
+					localOptions = Object.assign({}, localOptions, parserOptions.node);
 
-			function setModuleConstant(expressionName, fn) {
-				parser.plugin("expression " + expressionName, function() {
-					this.state.current.addVariable(expressionName, JSON.stringify(fn(this.state.module)));
-					return true;
+				function setConstant(expressionName, value) {
+					parser.plugin(`expression ${expressionName}`, function() {
+						this.state.current.addVariable(expressionName, JSON.stringify(value));
+						return true;
+					});
+				}
+
+				function setModuleConstant(expressionName, fn) {
+					parser.plugin(`expression ${expressionName}`, function() {
+						this.state.current.addVariable(expressionName, JSON.stringify(fn(this.state.module)));
+						return true;
+					});
+				}
+				const context = compiler.context;
+				if(localOptions.__filename === "mock") {
+					setConstant("__filename", "/index.js");
+				} else if(localOptions.__filename) {
+					setModuleConstant("__filename", module => path.relative(context, module.resource));
+				}
+				parser.plugin("evaluate Identifier __filename", function(expr) {
+					if(!this.state.module) return;
+					const resource = this.state.module.resource;
+					const i = resource.indexOf("?");
+					return ParserHelpers.evaluateToString(i < 0 ? resource : resource.substr(0, i))(expr);
 				});
-			}
-			var context = compiler.context;
-			if(localOptions.__filename === "mock") {
-				setConstant("__filename", "/index.js");
-			} else if(localOptions.__filename) {
-				setModuleConstant("__filename", function(module) {
-					return path.relative(context, module.resource);
+				if(localOptions.__dirname === "mock") {
+					setConstant("__dirname", "/");
+				} else if(localOptions.__dirname) {
+					setModuleConstant("__dirname", module => path.relative(context, module.context));
+				}
+				parser.plugin("evaluate Identifier __dirname", function(expr) {
+					if(!this.state.module) return;
+					return ParserHelpers.evaluateToString(this.state.module.context)(expr);
 				});
-			}
-			parser.plugin("evaluate Identifier __filename", function(expr) {
-				if(!this.state.module) return;
-				var resource = this.state.module.resource;
-				var i = resource.indexOf("?");
-				return ParserHelpers.evaluateToString(i < 0 ? resource : resource.substr(0, i))(expr);
-			});
-			if(localOptions.__dirname === "mock") {
-				setConstant("__dirname", "/");
-			} else if(localOptions.__dirname) {
-				setModuleConstant("__dirname", function(module) {
-					return path.relative(context, module.context);
+				parser.plugin("expression require.main", ParserHelpers.toConstantDependency("__webpack_require__.c[__webpack_require__.s]"));
+				parser.plugin(
+					"expression require.extensions",
+					ParserHelpers.expressionIsUnsupported("require.extensions is not supported by webpack. Use a loader instead.")
+				);
+				parser.plugin("expression module.loaded", ParserHelpers.toConstantDependency("module.l"));
+				parser.plugin("expression module.id", ParserHelpers.toConstantDependency("module.i"));
+				parser.plugin("expression module.exports", function() {
+					const module = this.state.module;
+					const isHarmony = module.meta && module.meta.harmonyModule;
+					if(!isHarmony)
+						return true;
 				});
-			}
-			parser.plugin("evaluate Identifier __dirname", function(expr) {
-				if(!this.state.module) return;
-				return ParserHelpers.evaluateToString(this.state.module.context)(expr);
-			});
-			parser.plugin("expression require.main", ParserHelpers.toConstantDependency("__webpack_require__.c[__webpack_require__.s]"));
-			parser.plugin(
-				"expression require.extensions",
-				ParserHelpers.expressionIsUnsupported("require.extensions is not supported by webpack. Use a loader instead.")
-			);
-			parser.plugin("expression module.loaded", ParserHelpers.toConstantDependency("module.l"));
-			parser.plugin("expression module.id", ParserHelpers.toConstantDependency("module.i"));
-			parser.plugin("expression module.exports", function() {
-				var module = this.state.module;
-				var isHarmony = module.meta && module.meta.harmonyModule;
-				if(!isHarmony)
-					return true;
-			});
-			parser.plugin("evaluate Identifier module.hot", ParserHelpers.evaluateToBoolean(false));
-			parser.plugin("expression module", function() {
-				var module = this.state.module;
-				var isHarmony = module.meta && module.meta.harmonyModule;
-				var moduleJsPath = path.join(__dirname, "..", "buildin", isHarmony ? "harmony-module.js" : "module.js");
-				if(module.context) {
-					moduleJsPath = path.relative(this.state.module.context, moduleJsPath);
-					if(!/^[A-Z]:/i.test(moduleJsPath)) {
-						moduleJsPath = "./" + moduleJsPath.replace(/\\/g, "/");
+				parser.plugin("evaluate Identifier module.hot", ParserHelpers.evaluateToBoolean(false));
+				parser.plugin("expression module", function() {
+					const module = this.state.module;
+					const isHarmony = module.meta && module.meta.harmonyModule;
+					let moduleJsPath = path.join(__dirname, "..", "buildin", isHarmony ? "harmony-module.js" : "module.js");
+					if(module.context) {
+						moduleJsPath = path.relative(this.state.module.context, moduleJsPath);
+						if(!/^[A-Z]:/i.test(moduleJsPath)) {
+							moduleJsPath = `./${moduleJsPath.replace(/\\/g, "/")}`;
+						}
 					}
-				}
-				return ParserHelpers.addParsedVariableToModule(this, "module", "require(" + JSON.stringify(moduleJsPath) + ")(module)");
+					return ParserHelpers.addParsedVariableToModule(this, "module", `require(${JSON.stringify(moduleJsPath)})(module)`);
+				});
 			});
 		});
-	});
-};
+	}
+}
+module.exports = NodeStuffPlugin;

package/lib/NormalModule.js

@@ -15,6 +15,7 @@ const ReplaceSource = require("webpack-sources").ReplaceSource;
 const CachedSource = require("webpack-sources").CachedSource;
 const LineToLineMappedSource = require("webpack-sources").LineToLineMappedSource;
 
+const WebpackError = require("./WebpackError");
 const Module = require("./Module");
 const ModuleParseError = require("./ModuleParseError");
 const ModuleBuildError = require("./ModuleBuildError");
@@ -42,8 +43,7 @@ function contextify(context, request) {
 	}).join("!");
 }
 
-class NonErrorEmittedError extends Error {
-
+class NonErrorEmittedError extends WebpackError {
 	constructor(error) {
 		super();
 
@@ -257,7 +257,7 @@ class NormalModule extends Module {
 	}
 
 	build(options, compilation, resolver, fs, callback) {
-		this.buildTimestamp = new Date().getTime();
+		this.buildTimestamp = Date.now();
 		this.built = true;
 		this._source = null;
 		this.error = null;
@@ -456,6 +456,10 @@ class NormalModule extends Module {
 		return new CachedSource(source);
 	}
 
+	originalSource() {
+		return this._source;
+	}
+
 	getHighestTimestamp(keys, timestampsByKey) {
 		let highestTimestamp = 0;
 		for(let i = 0; i < keys.length; i++) {