diff --git a/node_modules/architect-build/build_support/mini_require.js b/node_modules/architect-build/build_support/mini_require.js index 4d2f0e24..67eb1972 100644 --- a/node_modules/architect-build/build_support/mini_require.js +++ b/node_modules/architect-build/build_support/mini_require.js @@ -143,38 +143,6 @@ var processLoadQueue = function(err, id) { } }; -// helper for umd define wrappers -define.$umd = function(require, exports, module) { - var umdDefine = function(name, deps, m) { - if (typeof name == "function") { - m = name; - deps = ["require", "exports", "module"]; - name = module.id; - } - if (typeof name !== "string") { - m = deps; - deps = name; - name = module.id; - } - if (!m) { - m = deps; - deps = []; - } - var ret = typeof m == "function" - ? m.apply(module, deps.map(function(n){ return require(n) })) - : m; - if (ret != undefined) { - module.exports = ret; - } - if (name != module.id) { - // dependencies may expect custom name, e.g. jquery-ui and jquery - define(name, [], function() { return module.exports }); - } - }; - umdDefine.amd = true; - return umdDefine; -}; - define.amd = {}; define.queue = []; define.loaded = {}; @@ -203,7 +171,7 @@ var activateModule = function(name) { if (missing.length) return missing; - modules.define = define; + module.define = define; modules.require = req; modules.exports = exports; modules.module = module; diff --git a/node_modules/architect-build/module-deps.js b/node_modules/architect-build/module-deps.js index 45a7583b..77718e8d 100644 --- a/node_modules/architect-build/module-deps.js +++ b/node_modules/architect-build/module-deps.js @@ -372,8 +372,26 @@ function wrapUMD(module) { module.source = 'define(function(require, exports, module) {\n' - + 'var define = require("define").$umd(require, exports, module);\n' + + 'var $build_deps$ = {require: require, exports: exports, module: module};\n' + 'exports = undefined; module = undefined;\n' + + 'function define(name, deps, m) {\n' + + ' if (typeof name == "function") {\n' + + ' m = name; deps = ["require", "exports", "module"]; name = $build_deps$.module.id\n' + + ' }\n' + + ' if (typeof name !== "string") {\n' + + ' m = deps; deps = name; name = $build_deps$.module.id\n' + + ' }\n' + + ' if (!m) {\n' + + ' m = deps; deps = [];\n' + + ' }\n' + + ' var ret = typeof m == "function" ?\n' + + ' m.apply($build_deps$.module, deps.map(function(n){return $build_deps$[n] || require(n)})) : m\n' + + ' if (ret != undefined) $build_deps$.module.exports = ret;\n' + + ' if (name != $build_deps$.module.id && $build_deps$.module.define) {\n' + + ' $build_deps$.module.define(name, [], function() { return $build_deps$.module.exports });\n' + + ' }\n' + + '}\n' + + 'define.amd = true;' + module.source + '});'; }