moves stuff from webpack-core to webpack-sources

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;

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) {

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) {

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);

lib/ConcatSource.js

@@ -1,5 +0,0 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-module.exports = require("webpack-core/lib/ConcatSource");

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) {

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);
 

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");
 

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;

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);

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) {

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) {

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) {

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;

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");
 

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() {}

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;

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() {}

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:

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);

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");

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);
 };

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];
+	}
+}

lib/OriginalSource.js

@@ -1,5 +0,0 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-module.exports = require("webpack-core/lib/OriginalSource");

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);

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;

lib/Source.js

@@ -1,5 +0,0 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-module.exports = require("webpack-core/lib/Source");

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");
 

lib/SourceMapSource.js

@@ -1,5 +0,0 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-module.exports = require("webpack-core/lib/SourceMapSource");

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);

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) {

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);

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;

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;

lib/optimize/DedupePlugin.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 TemplateArgumentDependency = require("../dependencies/TemplateArgumentDependency");
 
 function DedupePlugin() {}

lib/optimize/UglifyJsPlugin.js

@@ -2,9 +2,9 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var SourceMapConsumer = require("webpack-core/lib/source-map").SourceMapConsumer;
-var SourceMapSource = require("webpack-core/lib/SourceMapSource");
-var RawSource = require("webpack-core/lib/RawSource");
+var SourceMapConsumer = require("source-map").SourceMapConsumer;
+var SourceMapSource = require("webpack-sources").SourceMapSource;
+var RawSource = require("webpack-sources").RawSource;
 var RequestShortener = require("../RequestShortener");
 var ModuleFilenameHelpers = require("../ModuleFilenameHelpers");
 var uglify = require("uglify-js");

lib/webworker/WebWorkerChunkTemplatePlugin.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 WebWorkerChunkTemplatePlugin() {}

lib/webworker/WebWorkerHotUpdateChunkTemplatePlugin.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 WebWorkerHotUpdateChunkTemplatePlugin() {}

package.json

@@ -16,6 +16,7 @@
     "optimist": "~0.6.0",
     "supports-color": "^3.1.0",
     "tapable": "~0.1.8",
+    "webpack-sources": "~0.1.0",
     "uglify-js": "~2.6.0",
     "watchpack": "^0.2.1",
     "webpack-core": "~0.6.0"