added require.include

sokra · sokra · commit a0680280f389 · 2013-02-15T17:08:14.000+01:00
diff --git a/lib/WebpackOptionsApply.js b/lib/WebpackOptionsApply.js
@@ -31,6 +31,7 @@ var CommonJsPlugin = require("./dependencies/CommonJsPlugin");
 var AMDPlugin = require("./dependencies/AMDPlugin");
 var RequireContextPlugin = require("./dependencies/RequireContextPlugin");
 var RequireEnsurePlugin = require("./dependencies/RequireEnsurePlugin");
+var RequireIncludePlugin = require("./dependencies/RequireIncludePlugin");
 
 var LimitChunkCountPlugin = require("./optimize/LimitChunkCountPlugin");
 var MinChunkSizePlugin = require("./optimize/MinChunkSizePlugin");
@@ -107,6 +108,7 @@ WebpackOptionsApply.prototype.process = function(options, compiler) {
 		new RequireJsStuffPlugin(),
 		new APIPlugin(),
 		new ConstPlugin(),
+		new RequireIncludePlugin(),
 		new RequireEnsurePlugin(),
 		new RequireContextPlugin(options.resolve.modulesDirectories, options.resolve.extensions),
 		new AMDPlugin(options.amd || {}),
diff --git a/lib/dependencies/RequireIncludeDependency.js b/lib/dependencies/RequireIncludeDependency.js
@@ -0,0 +1,25 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var ModuleDependency = require("./ModuleDependency");
+
+function RequireIncludeDependency(request, range) {
+	ModuleDependency.call(this, request);
+	this.Class = RequireIncludeDependency;
+	this.range = range;
+}
+module.exports = RequireIncludeDependency;
+
+RequireIncludeDependency.prototype = Object.create(ModuleDependency.prototype);
+RequireIncludeDependency.prototype.type = "require.include";
+
+RequireIncludeDependency.Template = function RequireIncludeDependencyTemplate() {};
+
+RequireIncludeDependency.Template.prototype.apply = function(dep, source, outputOptions, requestShortener) {
+	var comment = "";
+	if(outputOptions.pathinfo && dep.module)
+		comment = "/*! require.include " + requestShortener.shorten(dep.request) + " */";
+	source.replace(dep.range[0], dep.range[1]-1, 
+			"undefined" + comment);
+};
diff --git a/lib/dependencies/RequireIncludeDependencyParserPlugin.js b/lib/dependencies/RequireIncludeDependencyParserPlugin.js
@@ -0,0 +1,19 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var AbstractPlugin = require("../AbstractPlugin");
+var RequireIncludeDependency = require("./RequireIncludeDependency");
+
+module.exports = AbstractPlugin.create({
+	"call require.include": function(expr) {
+		if(expr.arguments.length != 1) return;
+		var param = this.evaluateExpression(expr.arguments[0]);
+		if(!param.isString()) return;
+		var dep = new RequireIncludeDependency(param.string, expr.range);
+		dep.loc = expr.loc;
+		this.state.current.addDependency(dep);
+		return true;
+	}
+});
+
diff --git a/lib/dependencies/RequireIncludePlugin.js b/lib/dependencies/RequireIncludePlugin.js
@@ -0,0 +1,20 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var RequireIncludeDependency = require("./RequireIncludeDependency");
+var RequireIncludeDependencyParserPlugin = require("./RequireIncludeDependencyParserPlugin");
+
+function RequireIncludePlugin() {
+}
+module.exports = RequireIncludePlugin;
+
+RequireIncludePlugin.prototype.apply = function(compiler) {
+	compiler.plugin("compilation", function(compilation, params) {
+		var normalModuleFactory = params.normalModuleFactory;
+
+		compilation.dependencyFactories.set(RequireIncludeDependency, normalModuleFactory);
+		compilation.dependencyTemplates.set(RequireIncludeDependency, new RequireIncludeDependency.Template());
+	});
+	new RequireIncludeDependencyParserPlugin().apply(compiler.parser);
+};
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "webpack",
-	"version": "0.9.0-beta21",
+	"version": "0.9.0-beta22",
 	"author": "Tobias Koppers @sokra",
 	"description": "Packs CommonJs/AMD Modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff.",
 	"dependencies": {
diff --git a/test/browsertest/lib/index.web.js b/test/browsertest/lib/index.web.js
@@ -293,6 +293,16 @@ describe("main", function() {
 				}, "named-chunk");
 			}
 		});
+
+		it("should accept a require.include call", function() {
+			require.include("./require.include");
+			var value = null;
+			require.ensure([], function(require) {
+				value = require("./require.include");
+			});
+			should.exist(value);
+			value.should.be.eql("require.include");
+		});
 	});
 
 	describe("loaders", function() {
diff --git a/test/browsertest/lib/require.include.js b/test/browsertest/lib/require.include.js
@@ -0,0 +1 @@
+module.exports = "require.include";

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webpack",`
`3`		`- "version": "0.9.0-beta21",`
	`3`	`+ "version": "0.9.0-beta22",`
`4`	`4`	`"author": "Tobias Koppers @sokra",`
`5`	`5`	`"description": "Packs CommonJs/AMD Modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff.",`
`6`	`6`	`"dependencies": {`