moves stuff from webpack-core to webpack-sources

sokra · sokra · commit ded70aef28af · 2015-12-29T17:44:55.000+01:00
diff --git a/lib/AmdMainTemplatePlugin.js b/lib/AmdMainTemplatePlugin.js
@@ -2,7 +2,7 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var ConcatSource = require("webpack-core/lib/ConcatSource");
+var ConcatSource = require("webpack-sources").ConcatSource;
 
 function AmdMainTemplatePlugin(name) {
 	this.name = name;
diff --git a/lib/BannerPlugin.js b/lib/BannerPlugin.js
@@ -2,7 +2,7 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var ConcatSource = require("webpack-core/lib/ConcatSource");
+var ConcatSource = require("webpack-sources").ConcatSource;
 var ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
 
 function wrapComment(str) {
diff --git a/lib/ChunkTemplate.js b/lib/ChunkTemplate.js
@@ -2,7 +2,7 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var ConcatSource = require("webpack-core/lib/ConcatSource");
+var ConcatSource = require("webpack-sources").ConcatSource;
 var Template = require("./Template");
 
 function ChunkTemplate(outputOptions) {
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -18,7 +18,7 @@ var HotUpdateChunkTemplate = require("./HotUpdateChunkTemplate");
 var ModuleTemplate = require("./ModuleTemplate");
 var Dependency = require("./Dependency");
 var ChunkRenderError = require("./ChunkRenderError");
-var CachedSource = require("webpack-core/lib/CachedSource");
+var CachedSource = require("webpack-sources").CachedSource;
 
 function Compilation(compiler) {
 	Tapable.call(this);
diff --git a/lib/ConcatSource.js b/lib/ConcatSource.js
diff --git a/lib/ContextModule.js b/lib/ContextModule.js
@@ -3,8 +3,8 @@
 	Author Tobias Koppers @sokra
 */
 var Module = require("./Module");
-var OriginalSource = require("webpack-core/lib/OriginalSource");
-var RawSource = require("webpack-core/lib/RawSource");
+var OriginalSource = require("webpack-sources").OriginalSource;
+var RawSource = require("webpack-sources").RawSource;
 var DependenciesBlock = require("./DependenciesBlock");
 
 function ContextModule(resolveDependencies, context, recursive, regExp, addon, async) {
diff --git a/lib/ContextModuleFactory.js b/lib/ContextModuleFactory.js
@@ -54,8 +54,8 @@ ContextModuleFactory.prototype.create = function(context, dependency, callback)
 		}
 
 		async.parallel([
-			this.resolvers.context.resolve.bind(this.resolvers.context, context, resource),
-			async.map.bind(async, loaders, this.resolvers.loader.resolve.bind(this.resolvers.loader, context))
+			this.resolvers.context.resolve.bind(this.resolvers.context, {}, context, resource),
+			async.map.bind(async, loaders, this.resolvers.loader.resolve.bind(this.resolvers.loader, {}, context))
 		], function(err, result) {
 			if(err) return callback(err);
 
diff --git a/lib/DelegatedModule.js b/lib/DelegatedModule.js
@@ -3,8 +3,8 @@
 	Author Tobias Koppers @sokra
 */
 var Module = require("./Module");
-var OriginalSource = require("webpack-core/lib/OriginalSource");
-var RawSource = require("webpack-core/lib/RawSource");
+var OriginalSource = require("webpack-sources").OriginalSource;
+var RawSource = require("webpack-sources").RawSource;
 var WebpackMissingModule = require("./dependencies/WebpackMissingModule");
 var DelegatedSourceDependency = require("./dependencies/DelegatedSourceDependency");
 
diff --git a/lib/DependenciesBlockVariable.js b/lib/DependenciesBlockVariable.js
@@ -2,8 +2,8 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var ReplaceSource = require("webpack-core/lib/ReplaceSource");
-var RawSource = require("webpack-core/lib/RawSource");
+var ReplaceSource = require("webpack-sources").ReplaceSource;
+var RawSource = require("webpack-sources").RawSource;
 
 function DependenciesBlockVariable(name, expression, dependencies) {
 	this.name = name;
diff --git a/lib/DllModule.js b/lib/DllModule.js
@@ -3,7 +3,7 @@
 	Author Tobias Koppers @sokra
 */
 var Module = require("./Module");
-var RawSource = require("webpack-core/lib/RawSource");
+var RawSource = require("webpack-sources").RawSource;
 
 function DllModule(context, dependencies, name, type) {
 	Module.call(this);
diff --git a/lib/EvalDevToolModuleTemplatePlugin.js b/lib/EvalDevToolModuleTemplatePlugin.js
@@ -2,7 +2,7 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var RawSource = require("webpack-core/lib/RawSource");
+var RawSource = require("webpack-sources").RawSource;
 var ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
 
 function EvalDevToolModuleTemplatePlugin(sourceUrlComment, moduleFilenameTemplate) {
diff --git a/lib/EvalSourceMapDevToolModuleTemplatePlugin.js b/lib/EvalSourceMapDevToolModuleTemplatePlugin.js
@@ -2,7 +2,7 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var RawSource = require("webpack-core/lib/RawSource");
+var RawSource = require("webpack-sources").RawSource;
 var ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
 
 function EvalSourceMapDevToolModuleTemplatePlugin(compilation, options, sourceMapComment, moduleFilenameTemplate) {
diff --git a/lib/ExternalModule.js b/lib/ExternalModule.js
@@ -3,8 +3,8 @@
 	Author Tobias Koppers @sokra
 */
 var Module = require("./Module");
-var OriginalSource = require("webpack-core/lib/OriginalSource");
-var RawSource = require("webpack-core/lib/RawSource");
+var OriginalSource = require("webpack-sources").OriginalSource;
+var RawSource = require("webpack-sources").RawSource;
 var WebpackMissingModule = require("./dependencies/WebpackMissingModule");
 
 function ExternalModule(request, type) {
diff --git a/lib/FunctionModuleTemplatePlugin.js b/lib/FunctionModuleTemplatePlugin.js
@@ -2,8 +2,8 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var ConcatSource = require("webpack-core/lib/ConcatSource");
-var PrefixSource = require("webpack-core/lib/PrefixSource");
+var ConcatSource = require("webpack-sources").ConcatSource;
+var PrefixSource = require("webpack-sources").PrefixSource;
 
 function FunctionModuleTemplatePlugin() {}
 module.exports = FunctionModuleTemplatePlugin;
diff --git a/lib/HotModuleReplacementPlugin.js b/lib/HotModuleReplacementPlugin.js
@@ -6,7 +6,7 @@ var Template = require("./Template");
 var BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
 var ModuleHotAcceptDependency = require("./dependencies/ModuleHotAcceptDependency");
 var ModuleHotDeclineDependency = require("./dependencies/ModuleHotDeclineDependency");
-var RawSource = require("webpack-core/lib/RawSource");
+var RawSource = require("webpack-sources").RawSource;
 var ConstDependency = require("./dependencies/ConstDependency");
 var NullFactory = require("./NullFactory");
 
diff --git a/lib/JsonpChunkTemplatePlugin.js b/lib/JsonpChunkTemplatePlugin.js
@@ -2,7 +2,7 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var ConcatSource = require("webpack-core/lib/ConcatSource");
+var ConcatSource = require("webpack-sources").ConcatSource;
 var Template = require("./Template");
 
 function JsonpChunkTemplatePlugin() {}
diff --git a/lib/JsonpExportMainTemplatePlugin.js b/lib/JsonpExportMainTemplatePlugin.js
@@ -2,7 +2,7 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var ConcatSource = require("webpack-core/lib/ConcatSource");
+var ConcatSource = require("webpack-sources").ConcatSource;
 
 function JsonpExportMainTemplatePlugin(name) {
 	this.name = name;
diff --git a/lib/JsonpHotUpdateChunkTemplatePlugin.js b/lib/JsonpHotUpdateChunkTemplatePlugin.js
@@ -2,7 +2,7 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var ConcatSource = require("webpack-core/lib/ConcatSource");
+var ConcatSource = require("webpack-sources").ConcatSource;
 var Template = require("./Template");
 
 function JsonpHotUpdateChunkTemplatePlugin() {}
diff --git a/lib/MainTemplate.js b/lib/MainTemplate.js
@@ -2,9 +2,9 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var ConcatSource = require("webpack-core/lib/ConcatSource");
-var OriginalSource = require("webpack-core/lib/OriginalSource");
-var PrefixSource = require("webpack-core/lib/PrefixSource");
+var ConcatSource = require("webpack-sources").ConcatSource;
+var OriginalSource = require("webpack-sources").OriginalSource;
+var PrefixSource = require("webpack-sources").PrefixSource;
 var Template = require("./Template");
 
 /* require function shortcuts:
diff --git a/lib/MultiModule.js b/lib/MultiModule.js
@@ -3,7 +3,7 @@
 	Author Tobias Koppers @sokra
 */
 var Module = require("./Module");
-var RawSource = require("webpack-core/lib/RawSource");
+var RawSource = require("webpack-sources").RawSource;
 
 function MultiModule(context, dependencies, name) {
 	Module.call(this);
diff --git a/lib/NormalModule.js b/lib/NormalModule.js
@@ -5,11 +5,11 @@
 var path = require("path");
 var Module = require("./Module");
 var NormalModuleMixin = require("webpack-core/lib/NormalModuleMixin");
-var SourceMapSource = require("webpack-core/lib/SourceMapSource");
-var OriginalSource = require("webpack-core/lib/OriginalSource");
-var RawSource = require("webpack-core/lib/RawSource");
-var ReplaceSource = require("webpack-core/lib/ReplaceSource");
-var CachedSource = require("webpack-core/lib/CachedSource");
+var SourceMapSource = require("webpack-sources").SourceMapSource;
+var OriginalSource = require("webpack-sources").OriginalSource;
+var RawSource = require("webpack-sources").RawSource;
+var ReplaceSource = require("webpack-sources").ReplaceSource;
+var CachedSource = require("webpack-sources").CachedSource;
 var ModuleParseError = require("./ModuleParseError");
 var TemplateArgumentDependency = require("./dependencies/TemplateArgumentDependency");
 var AsyncDependenciesBlock = require("./AsyncDependenciesBlock");
diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js
@@ -79,7 +79,7 @@ function NormalModuleFactory(context, resolvers, parser, options) {
 				function(callback) {
 					if(resource === "" || resource[0] === "?")
 						return callback(null, resource);
-					_this.resolvers.normal.resolve(context, resource, callback);
+					_this.resolvers.normal.resolve({}, context, resource, callback);
 				}
 			], function(err, results) {
 				if(err) return callback(err);
@@ -171,6 +171,6 @@ NormalModuleFactory.prototype.resolveRequestArray = function resolveRequestArray
 	async.map(array, function(item, callback) {
 		if(item === "" || item[0] === "?")
 			return callback(null, item);
-		resolver.resolve(context, item, callback);
+		resolver.resolve({}, context, item, callback);
 	}, callback);
 };
diff --git a/lib/OptionsDefaulter.js b/lib/OptionsDefaulter.js
@@ -0,0 +1,70 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+function OptionsDefaulter() {
+	this.defaults = {};
+	this.config = {};
+}
+module.exports = OptionsDefaulter;
+
+function getProperty(obj, name) {
+	name = name.split(".");
+	for(var i = 0; i < name.length - 1; i++) {
+		obj = obj[name[i]];
+		if(typeof obj != "object" || !obj) return;
+	}
+	return obj[name.pop()];
+}
+
+function setProperty(obj, name, value) {
+	name = name.split(".");
+	for(var i = 0; i < name.length - 1; i++) {
+		if(typeof (obj[name[i]]) !== "object" || !obj[name[i]]) obj[name[i]] = {};
+		obj = obj[name[i]];
+	}
+	obj[name.pop()] = value;
+}
+
+function hasProperty(obj, name, value) {
+	name = name.split(".");
+	for(var i = 0; i < name.length - 1; i++) {
+		obj = obj[name[i]];
+		if(typeof obj != "object" || !obj) return false;
+	}
+	return Object.prototype.hasOwnProperty.call(obj, name.pop());
+}
+
+OptionsDefaulter.prototype.process = function(options) {
+	for(var name in this.defaults) {
+		switch(this.config[name]) {
+		case undefined:
+			if(getProperty(options, name) === undefined)
+				setProperty(options, name, this.defaults[name]);
+			break;
+		case "call":
+			setProperty(options, name, this.defaults[name].call(this, getProperty(options, name)), options);
+			break;
+		case "append":
+			var oldValue = getProperty(options, name);
+			if(!Array.isArray(oldValue)) oldValue = [];
+			this.defaults[name].forEach(function(item) {
+				oldValue.push(item);
+			});
+			setProperty(options, name, oldValue);
+			break;
+		default:
+			throw new Error("OptionsDefaulter cannot process " + this.config[name]);
+		}
+	}
+};
+
+OptionsDefaulter.prototype.set = function(name, config, def) {
+	if(arguments.length === 3) {
+		this.defaults[name] = def;
+		this.config[name] = config;
+	} else {
+		this.defaults[name] = config;
+		delete this.config[name];
+	}
+}
diff --git a/lib/OriginalSource.js b/lib/OriginalSource.js
diff --git a/lib/RawModule.js b/lib/RawModule.js
@@ -3,8 +3,8 @@
 	Author Tobias Koppers @sokra
 */
 var Module = require("./Module");
-var OriginalSource = require("webpack-core/lib/OriginalSource");
-var RawSource = require("webpack-core/lib/RawSource");
+var OriginalSource = require("webpack-sources").OriginalSource;
+var RawSource = require("webpack-sources").RawSource;
 
 function RawModule(source, identifier, readableIdentifier) {
 	Module.call(this);
diff --git a/lib/SetVarMainTemplatePlugin.js b/lib/SetVarMainTemplatePlugin.js
@@ -2,7 +2,7 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var ConcatSource = require("webpack-core/lib/ConcatSource");
+var ConcatSource = require("webpack-sources").ConcatSource;
 
 function SetVarMainTemplatePlugin(varExpression, copyObject) {
 	this.varExpression = varExpression;
diff --git a/lib/Source.js b/lib/Source.js
diff --git a/lib/SourceMapDevToolPlugin.js b/lib/SourceMapDevToolPlugin.js
@@ -4,8 +4,8 @@
 */
 var path = require("path");
 var RequestShortener = require("./RequestShortener");
-var ConcatSource = require("webpack-core/lib/ConcatSource");
-var RawSource = require("webpack-core/lib/RawSource");
+var ConcatSource = require("webpack-sources").ConcatSource;
+var RawSource = require("webpack-sources").RawSource;
 var ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
 var SourceMapDevToolModuleOptionsPlugin = require("./SourceMapDevToolModuleOptionsPlugin");
 
diff --git a/lib/SourceMapSource.js b/lib/SourceMapSource.js
diff --git a/lib/Template.js b/lib/Template.js
@@ -3,7 +3,7 @@
 	Author Tobias Koppers @sokra
 */
 var Tapable = require("tapable");
-var ConcatSource = require("webpack-core/lib/ConcatSource");
+var ConcatSource = require("webpack-sources").ConcatSource;
 
 function Template(outputOptions) {
 	Tapable.call(this);
diff --git a/lib/UmdMainTemplatePlugin.js b/lib/UmdMainTemplatePlugin.js
@@ -2,8 +2,8 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var ConcatSource = require("webpack-core/lib/ConcatSource");
-var OriginalSource = require("webpack-core/lib/OriginalSource");
+var ConcatSource = require("webpack-sources").ConcatSource;
+var OriginalSource = require("webpack-sources").OriginalSource;
 
 function accessorToObjectAccess(accessor) {
 	return accessor.map(function(a) {
diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
@@ -2,7 +2,7 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var OptionsDefaulter = require("webpack-core/lib/OptionsDefaulter");
+var OptionsDefaulter = require("./OptionsDefaulter");
 
 function WebpackOptionsDefaulter() {
 	OptionsDefaulter.call(this);
diff --git a/lib/node/NodeChunkTemplatePlugin.js b/lib/node/NodeChunkTemplatePlugin.js
@@ -2,7 +2,7 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var ConcatSource = require("webpack-core/lib/ConcatSource");
+var ConcatSource = require("webpack-sources").ConcatSource;
 
 function NodeChunkTemplatePlugin() {}
 module.exports = NodeChunkTemplatePlugin;
diff --git a/lib/node/NodeHotUpdateChunkTemplatePlugin.js b/lib/node/NodeHotUpdateChunkTemplatePlugin.js
@@ -2,7 +2,7 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var ConcatSource = require("webpack-core/lib/ConcatSource");
+var ConcatSource = require("webpack-sources").ConcatSource;
 
 function NodeHotUpdateChunkTemplatePlugin() {}
 module.exports = NodeHotUpdateChunkTemplatePlugin;
diff --git a/lib/optimize/DedupePlugin.js b/lib/optimize/DedupePlugin.js
diff --git a/lib/optimize/UglifyJsPlugin.js b/lib/optimize/UglifyJsPlugin.js
diff --git a/lib/webworker/WebWorkerChunkTemplatePlugin.js b/lib/webworker/WebWorkerChunkTemplatePlugin.js
diff --git a/lib/webworker/WebWorkerHotUpdateChunkTemplatePlugin.js b/lib/webworker/WebWorkerHotUpdateChunkTemplatePlugin.js
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ ContextModuleFactory.prototype.create = function(context, dependency, callback)`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`async.parallel([`
`57`		`- this.resolvers.context.resolve.bind(this.resolvers.context, context, resource),`
`58`		`- async.map.bind(async, loaders, this.resolvers.loader.resolve.bind(this.resolvers.loader, context))`
	`57`	`+ this.resolvers.context.resolve.bind(this.resolvers.context, {}, context, resource),`
	`58`	`+ async.map.bind(async, loaders, this.resolvers.loader.resolve.bind(this.resolvers.loader, {}, context))`
`59`	`59`	`], function(err, result) {`
`60`	`60`	`if(err) return callback(err);`
`61`	`61`