From bfe148d0aa482e73f2eeac4920c11afaab989655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sta=C5=9B=20Ma=C5=82olepszy?= <stas@mozilla.com>
Date: Mon, 23 Sep 2013 16:20:49 +0200
Subject: [PATCH] Support function(require) in filter.moduleDefines

---
 lib/dryice/index.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/dryice/index.js b/lib/dryice/index.js
index d60cbb9..131d22e 100644
--- a/lib/dryice/index.js
+++ b/lib/dryice/index.js
@@ -1133,8 +1133,19 @@ copy.filter.moduleDefines = function(input, source) {
   var module = source.isLocation ? source.path : source;
   module = module.replace(/\.js$/, '');
 
-  return input.replace(/\bdefine\s*\(\s*function\s*\(require,\s*exports,\s*module\)\s*\{/,
-      "define('" + module + "', ['require', 'exports', 'module' " + deps + "], function(require, exports, module) {");
+  function replacer(match, moduleArgs) {
+    var moduleDeps;
+    if (moduleArgs === 'require') {
+      moduleDeps = ['require', 'exports', 'module'].concat(deps);
+    } else {
+      moduleDeps = ['require'].concat(deps);
+    }
+    return "define('" + module + "', [" + moduleDeps.join("', '") + "], " +
+           "function(" + moduleArgs + ") {";
+  }
+
+  return input.replace(
+    /\bdefine\s*\(\s*function\s*\((require[,\s\w]*)?\)\s*\{/, replacer);
 };
 copy.filter.moduleDefines.onRead = true;