require.amd gets it value from webpackOptions.amd

sokra · sokra · commit e3cb0faac8ac · 2012-10-26T10:55:00.000+02:00
diff --git a/README.md b/README.md
@@ -555,6 +555,10 @@ You can also save this options object in a JSON file and use it with the shell c
  // default: 0
  // only process file in seperate process if more or equal loaders applied to the file.
 
+ amd: { jQuery: true },
+ // default: {}
+ // specify the value of require.amd and define.amd
+
  profile: true,
  // default: false
  // capture timings for the build.
diff --git a/buildin/__webpack_amd_require.js b/buildin/__webpack_amd_require.js
@@ -12,6 +12,6 @@ function amdRequire(chunk, requiresFn, fn) {
 }
 for(var name in req)
 	amdRequire[name] = req[name];
-amdRequire.amd = {};
+amdRequire.amd = require("./__webpack_options_amd.loader.js!./__webpack_options_amd.loader.js");
 amdRequire.config = function() {/* config is ignored, use webpack options */};
 module.exports = amdRequire;
diff --git a/buildin/__webpack_options_amd.loader.js b/buildin/__webpack_options_amd.loader.js
@@ -0,0 +1,5 @@
+module.exports = function() {
+	this.cacheable();
+	if(!this.options.amd) return "/* empty to return {} */";
+	return "module.exports = " + JSON.stringify(this.options.amd);
+}
diff --git a/test/browsertest/lib/index.web.js b/test/browsertest/lib/index.web.js
@@ -215,8 +215,8 @@ setTimeout(function() {
 // cross module system support
 window.test(typeof require === "function", "require should be a function");
 window.test(typeof define === "function", "define should be a function");
-window.test(require.amd, "require.amd should be true");
-window.test(define.amd, "define.amd should be true");
+window.test(typeof require.amd === "object", "require.amd should be an object");
+window.test(typeof define.amd === "object", "define.amd should be an object");
 window.test(typeof module === "object", "module should be a object");
 
 
diff --git a/test/browsertest/libary2config.js b/test/browsertest/libary2config.js
@@ -11,5 +11,8 @@ module.exports = {
 			]
 		}
 	},
-	maxChunks: 2
+	maxChunks: 2,
+	amd: {
+		fromOptions: true
+	}
 }
diff --git a/test/browsertest/node_modules/libary2/lib/main.js b/test/browsertest/node_modules/libary2/lib/main.js

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ function amdRequire(chunk, requiresFn, fn) {`
`12`	`12`	`}`
`13`	`13`	`for(var name in req)`
`14`	`14`	`amdRequire[name] = req[name];`
`15`		`-amdRequire.amd = {};`
	`15`	`+amdRequire.amd = require("./__webpack_options_amd.loader.js!./__webpack_options_amd.loader.js");`
`16`	`16`	`amdRequire.config = function() {/* config is ignored, use webpack options */};`
`17`	`17`	`module.exports = amdRequire;`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,8 @@ module.exports = {`
`11`	`11`	`]`
`12`	`12`	`}`
`13`	`13`	`},`
`14`		`- maxChunks: 2`
	`14`	`+ maxChunks: 2,`
	`15`	`+ amd: {`
	`16`	`+ fromOptions: true`
	`17`	`+ }`
`15`	`18`	`}`