diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/use-parent-settings/toggle-disabled-mixin.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/use-parent-settings/toggle-disabled-mixin.test.js index f3e53673a4e59..c01891194ceec 100644 --- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/use-parent-settings/toggle-disabled-mixin.test.js +++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/adminhtml/js/use-parent-settings/toggle-disabled-mixin.test.js @@ -21,7 +21,7 @@ define([ obj; describe('toggle-disabled-mixin structure tests', function () { - var defaultContext = require.s.contexts._; + var defaultContext = 's' in require ? require.s.contexts._ : require.contexts._; obj = new CustomInput(defaultProperties); diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js index 2d8f145bce1da..2838af4e57564 100644 --- a/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js +++ b/dev/tests/js/jasmine/tests/app/code/Magento/Catalog/frontend/js/product/breadcrumbs.test.js @@ -17,7 +17,7 @@ define([ mocks = { 'Magento_Theme/js/model/breadcrumb-list': jasmine.createSpyObj(['push']) }, - defaultContext = require.s.contexts._, + defaultContext = 's' in require ? require.s.contexts._ : require.contexts._, menuItem = $( '
  • ' + 'Cat1' + diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/place-order-mixin.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/place-order-mixin.test.js index 1e3cf3e0280b6..32f25d2770e7e 100644 --- a/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/place-order-mixin.test.js +++ b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/place-order-mixin.test.js @@ -13,7 +13,7 @@ define([ 'Magento_Checkout/js/action/place-order': jasmine.createSpy('placeOrderAction'), 'Magento_CheckoutAgreements/js/model/agreements-assigner': jasmine.createSpy('agreementsAssigner') }, - defaultContext = require.s.contexts._, + defaultContext = 's' in require ? require.s.contexts._ : require.contexts._, mixin, placeOrderAction; diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/set-payment-information-mixin.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/set-payment-information-mixin.test.js index 8ea07b78b02c9..a7faa3ed54875 100644 --- a/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/set-payment-information-mixin.test.js +++ b/dev/tests/js/jasmine/tests/app/code/Magento/CheckoutAgreements/frontend/js/model/set-payment-information-mixin.test.js @@ -13,7 +13,7 @@ define([ 'Magento_Checkout/js/action/set-payment-information': jasmine.createSpy('placeOrderAction'), 'Magento_CheckoutAgreements/js/model/agreements-assigner': jasmine.createSpy('agreementsAssigner') }, - defaultContext = require.s.contexts._, + defaultContext = 's' in require ? require.s.contexts._ : require.contexts._, mixin, placeOrderAction; diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Theme/view/frontend/web/js/view/add-home-breadcrumb.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Theme/view/frontend/web/js/view/add-home-breadcrumb.test.js index 9c7bbc161ac4a..251523a4dc33e 100644 --- a/dev/tests/js/jasmine/tests/app/code/Magento/Theme/view/frontend/web/js/view/add-home-breadcrumb.test.js +++ b/dev/tests/js/jasmine/tests/app/code/Magento/Theme/view/frontend/web/js/view/add-home-breadcrumb.test.js @@ -17,7 +17,7 @@ define([ describe('Magento_Theme/js/view/breadcrumbs', function () { var breadcrumbs, mixin, - defaultContext = require.s.contexts._; + defaultContext = 's' in require ? require.s.contexts._ : require.contexts._; beforeEach(function (done) { window.BASE_URL = window.location.hostname; diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/i18n.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/i18n.test.js index 201959a2598fd..1aa655cc86433 100644 --- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/i18n.test.js +++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/i18n.test.js @@ -19,7 +19,7 @@ define([ variable = ko.observable(variableText), dataTranslateAttr = '[{"shown":"&","translated":"&","original":"$","location":"Span element"}]', dataTranslateAttrName = 'data-translate', - context = require.s.contexts._, + context = 's' in require ? require.s.contexts._ : require.contexts._, /** Stub */ manageInlineTranslation = function (state) { diff --git a/dev/travis/before_script.sh b/dev/travis/before_script.sh index 5d091efbb30a3..e89f23acbf8ce 100755 --- a/dev/travis/before_script.sh +++ b/dev/travis/before_script.sh @@ -80,6 +80,8 @@ case $TEST_SUITE in cp package.json.sample package.json cp Gruntfile.js.sample Gruntfile.js yarn + sed -i'.bak' 's/requirejs.s.contexts/requirejs.contexts/g' node_modules/squirejs/src/Squire.js + sed -i'.bak' 's/return context.require.undef(module)/delete context.defined[module];/g' node_modules/squirejs/src/Squire.js if [[ $GRUNT_COMMAND != "static" ]]; then echo "Installing Magento" diff --git a/lib/internal/Magento/Framework/RequireJs/Config.php b/lib/internal/Magento/Framework/RequireJs/Config.php index ae45e29f38911..b1fc5a1c5752f 100644 --- a/lib/internal/Magento/Framework/RequireJs/Config.php +++ b/lib/internal/Magento/Framework/RequireJs/Config.php @@ -297,7 +297,7 @@ public function getMinResolverCode() $excludesCode = empty($excludes) ? 'true' : implode('&&', $excludes); $result = <<willReturnArgument(0); $expected = << -1; i -= 1) { - if (ary[i] && func(ary[i], i, ary)) { - break; + function errback(p, fail, no) { + if (p.hasOwnProperty('e')) { + prim.nextTick(function () { + no(p.e); + }); + } else { + fail.push(no); } } - } + + prim = function prim(fn) { + var promise, f, + p = {}, + ok = [], + fail = []; + + function makeFulfill() { + var f, f2, + called = false; + + function fulfill(v, prop, listeners) { + if (called) { + return; + } + called = true; + + if (promise === v) { + called = false; + f.reject(new TypeError('value is same promise')); + return; + } + + try { + var then = v && v.then; + if (isFunObj(v) && typeof then === 'function' && + // if error, keep on error pathway if a promise, + // 2.2.7.2 tests. + prop !== 'e') { + f2 = makeFulfill(); + then.call(v, f2.resolve, f2.reject); + } else { + p[prop] = v; + notify(listeners, v); + } + } catch (e) { + called = false; + f.reject(e); + } + } + + f = { + resolve: function (v) { + fulfill(v, 'v', ok); + }, + reject: function(e) { + fulfill(e, 'e', fail); + } + }; + return f; + } + + f = makeFulfill(); + + promise = { + then: function (yes, no) { + var next = prim(function (nextResolve, nextReject) { + + function finish(fn, nextFn, v) { + try { + if (fn && typeof fn === 'function') { + v = fn(v); + nextResolve(v); + } else { + nextFn(v); + } + } catch (e) { + nextReject(e); + } + } + + callback(p, ok, finish.bind(undefined, yes, nextResolve)); + errback(p, fail, finish.bind(undefined, no, nextReject)); + + }); + return next; + }, + + catch: function (no) { + return promise.then(null, no); + } + }; + + try { + fn(f.resolve, f.reject); + } catch (e) { + f.reject(e); + } + + return promise; + }; + + prim.resolve = function (value) { + return prim(function (yes) { + yes(value); + }); + }; + + prim.reject = function (err) { + return prim(function (yes, no) { + no(err); + }); + }; + + prim.cast = function (x) { + // A bit of a weak check, want "then" to be a function, + // but also do not want to trigger a getter if accessing + // it. Good enough for now. + if (isFunObj(x) && 'then' in x) { + return x; + } else { + return prim(function (yes, no) { + if (x instanceof Error) { + no(x); + } else { + yes(x); + } + }); + } + }; + + prim.all = function (ary) { + return prim(function (yes, no) { + var count = 0, + length = ary.length, + result = []; + + function resolved(i, v) { + result[i] = v; + count += 1; + if (count === length) { + yes(result); + } + } + + if (!ary.length) { + yes([]); + } else { + ary.forEach(function (item, i) { + prim.cast(item).then(function (v) { + resolved(i, v); + }, function (err) { + no(err); + }); + }); + } + }); + }; + + prim.nextTick = nextTick; + Promise = prim; + }()); + //END prim + + } + + + var topReq, dataMain, src, subPath, + bootstrapConfig = requirejs || require, + hasOwn = Object.prototype.hasOwnProperty, + contexts = {}, + queue = [], + currDirRegExp = /^\.\//, + urlRegExp = /^\/|\:|\?|\.js$/, + commentRegExp = /\/\*[\s\S]*?\*\/|([^:"'=]|^)\/\/.*$/mg, + cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g, + jsSuffixRegExp = /\.js$/, + slice = Array.prototype.slice; + + if (typeof requirejs === 'function') { + return; + } + + var asap = Promise.resolve(undefined); + + // Could match something like ')//comment', do not lose the prefix to comment. + function commentReplace(match, singlePrefix) { + return singlePrefix || ''; } function hasProp(obj, prop) { @@ -81,7 +266,11 @@ var requirejs, require, define; } function getOwn(obj, prop) { - return hasProp(obj, prop) && obj[prop]; + return obj && hasProp(obj, prop) && obj[prop]; + } + + function obj() { + return Object.create(null); } /** @@ -109,7 +298,7 @@ var requirejs, require, define; eachProp(source, function (value, prop) { if (force || !hasProp(target, prop)) { if (deepStringMixin && typeof value === 'object' && value && - !isArray(value) && !isFunction(value) && + !Array.isArray(value) && typeof value !== 'function' && !(value instanceof RegExp)) { if (!target[prop]) { @@ -125,82 +314,27 @@ var requirejs, require, define; return target; } - //Similar to Function.prototype.bind, but the 'this' object is specified - //first, since it is easier to read/figure out what 'this' will be. - function bind(obj, fn) { - return function () { - return fn.apply(obj, arguments); - }; - } - - function scripts() { - return document.getElementsByTagName('script'); - } - - function defaultOnError(err) { - throw err; - } - - //Allow getting a global that is expressed in - //dot notation, like 'a.b.c'. + // Allow getting a global that expressed in + // dot notation, like 'a.b.c'. function getGlobal(value) { if (!value) { return value; } var g = global; - each(value.split('.'), function (part) { + value.split('.').forEach(function (part) { g = g[part]; }); return g; } - /** - * Constructs an error with a pointer to an URL with more information. - * @param {String} id the error ID that maps to an ID on a web page. - * @param {String} message human readable error. - * @param {Error} [err] the original error, if there is one. - * - * @returns {Error} - */ - function makeError(id, msg, err, requireModules) { - var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id); - e.requireType = id; - e.requireModules = requireModules; - if (err) { - e.originalError = err; - } - return e; - } - - if (typeof define !== 'undefined') { - //If a define is already in play via another AMD loader, - //do not overwrite. - return; - } - - if (typeof requirejs !== 'undefined') { - if (isFunction(requirejs)) { - //Do not overwrite and existing requirejs instance. - return; - } - cfg = requirejs; - requirejs = undefined; - } - - //Allow for a require config object - if (typeof require !== 'undefined' && !isFunction(require)) { - //assume it is a config object. - cfg = require; - require = undefined; - } - function newContext(contextName) { - var inCheckLoaded, Module, context, handlers, - checkLoadedTimeoutId, + var req, main, makeMap, callDep, handlers, checkingLater, load, context, + defined = obj(), + waiting = obj(), config = { - //Defaults. Do not set a default for map - //config to speed up normalize(), which - //will run faster if there is no default. + // Defaults. Do not set a default for map + // config to speed up normalize(), which + // will run faster if there is no default. waitSeconds: 7, baseUrl: './', paths: {}, @@ -209,18 +343,18 @@ var requirejs, require, define; shim: {}, config: {} }, - registry = {}, - //registry of just enabled modules, to speed - //cycle breaking code when lots of modules - //are registered, but not activated. - enabledRegistry = {}, - undefEvents = {}, - defQueue = [], - defined = {}, - urlFetched = {}, - bundlesMap = {}, - requireCounter = 1, - unnormalizedCounter = 1; + mapCache = obj(), + requireDeferreds = [], + deferreds = obj(), + calledDefine = obj(), + calledPlugin = obj(), + loadCount = 0, + startTime = (new Date()).getTime(), + errCount = 0, + trackedErrors = obj(), + urlFetched = obj(), + bundlesMap = obj(), + asyncResolve = Promise.resolve(); /** * Trims the . and .. from an array of path segments. @@ -239,14 +373,13 @@ var requirejs, require, define; ary.splice(i, 1); i -= 1; } else if (part === '..') { - if (i === 1 && (ary[2] === '..' || ary[0] === '..')) { - //End of the line. Keep at least one non-dot - //path segment at the front so it can be mapped - //correctly to disk. Otherwise, there is likely - //no path mapping for a path starting with '..'. - //This can still fail, but catches the most reasonable - //uses of .. - break; + // If at the start, or previous value is still .., + // keep them so that when converted to a path it may + // still work when converted to a path, even though + // as an ID it is less than ideal. In larger point + // releases, may be better to just kick out an error. + if (i === 0 || (i === 1 && ary[2] === '..') || ary[i - 1] === '..') { + continue; } else if (i > 0) { ary.splice(i - 1, 2); i -= 2; @@ -273,40 +406,36 @@ var requirejs, require, define; map = config.map, starMap = map && map['*']; + //Adjust any relative paths. - if (name && name.charAt(0) === '.') { - //If have a base name, try to normalize against it, - //otherwise, assume it is a top-level require that will - //be relative to baseUrl in the end. - if (baseName) { + if (name) { + name = name.split('/'); + lastIndex = name.length - 1; + + // If wanting node ID compatibility, strip .js from end + // of IDs. Have to do this here, and not in nameToUrl + // because node allows either .js or non .js to map + // to same file. + if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) { + name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, ''); + } + + // Starts with a '.' so need the baseName + if (name[0].charAt(0) === '.' && baseParts) { //Convert baseName to array, and lop off the last part, //so that . matches that 'directory' and not name of the baseName's //module. For instance, baseName of 'one/two/three', maps to //'one/two/three.js', but we want the directory, 'one/two' for //this normalization. normalizedBaseParts = baseParts.slice(0, baseParts.length - 1); - name = name.split('/'); - lastIndex = name.length - 1; - - // If wanting node ID compatibility, strip .js from end - // of IDs. Have to do this here, and not in nameToUrl - // because node allows either .js or non .js to map - // to same file. - if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) { - name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, ''); - } - name = normalizedBaseParts.concat(name); - trimDots(name); - name = name.join('/'); - } else if (name.indexOf('./') === 0) { - // No baseName, so this is ID is resolved relative - // to baseUrl, pull off the leading dot. - name = name.substring(2); } + + trimDots(name); + name = name.join('/'); } - //Apply map config if available. + // Apply map config if available. if (applyMap && map && (baseParts || starMap)) { nameParts = name.split('/'); @@ -314,17 +443,17 @@ var requirejs, require, define; nameSegment = nameParts.slice(0, i).join('/'); if (baseParts) { - //Find the longest baseName segment match in the config. - //So, do joins on the biggest to smallest lengths of baseParts. + // Find the longest baseName segment match in the config. + // So, do joins on the biggest to smallest lengths of baseParts. for (j = baseParts.length; j > 0; j -= 1) { mapValue = getOwn(map, baseParts.slice(0, j).join('/')); - //baseName segment has config, find if it has one for - //this name. + // baseName segment has config, find if it has one for + // this name. if (mapValue) { mapValue = getOwn(mapValue, nameSegment); if (mapValue) { - //Match, update name to the new value. + // Match, update name to the new value. foundMap = mapValue; foundI = i; break outerLoop; @@ -333,9 +462,9 @@ var requirejs, require, define; } } - //Check for a star map match, but just hold on to it, - //if there is a shorter segment match later in a matching - //config, then favor over this star map. + // Check for a star map match, but just hold on to it, + // if there is a shorter segment match later in a matching + // config, then favor over this star map. if (!foundStarMap && starMap && getOwn(starMap, nameSegment)) { foundStarMap = getOwn(starMap, nameSegment); starI = i; @@ -360,1709 +489,1039 @@ var requirejs, require, define; return pkgMain ? pkgMain : name; } - function removeScript(name) { - if (isBrowser) { - each(scripts(), function (scriptNode) { - if (scriptNode.getAttribute('data-requiremodule') === name && - scriptNode.getAttribute('data-requirecontext') === context.contextName) { - scriptNode.parentNode.removeChild(scriptNode); - return true; - } - }); + function makeShimExports(value) { + function fn() { + var ret; + if (value.init) { + ret = value.init.apply(global, arguments); + } + return ret || (value.exports && getGlobal(value.exports)); } + return fn; } - function hasPathFallback(id) { - var pathConfig = getOwn(config.paths, id); - if (pathConfig && isArray(pathConfig) && pathConfig.length > 1) { - //Pop off the first array value, since it failed, and - //retry - pathConfig.shift(); - context.require.undef(id); - context.require([id]); - return true; + function takeQueue(anonId) { + var i, id, args, shim; + for (i = 0; i < queue.length; i += 1) { + // Peek to see if anon + if (typeof queue[i][0] !== 'string') { + if (anonId) { + queue[i].unshift(anonId); + anonId = undef; + } else { + // Not our anon module, stop. + break; + } + } + args = queue.shift(); + id = args[0]; + i -= 1; + + if (!(id in defined) && !(id in waiting)) { + if (id in deferreds) { + main.apply(undef, args); + } else { + waiting[id] = args; + } + } } - } - //Turns a plugin!resource to [plugin, resource] - //with the plugin being undefined if the name - //did not have a plugin prefix. - function splitPrefix(name) { - var prefix, - index = name ? name.indexOf('!') : -1; - if (index > -1) { - prefix = name.substring(0, index); - name = name.substring(index + 1, name.length); + // if get to the end and still have anonId, then could be + // a shimmed dependency. + if (anonId) { + shim = getOwn(config.shim, anonId) || {}; + main(anonId, shim.deps || [], shim.exportsFn); } - return [prefix, name]; } - /** - * Creates a module mapping that includes plugin prefix, module - * name, and path. If parentModuleMap is provided it will - * also normalize the name via require.normalize() - * - * @param {String} name the module name - * @param {String} [parentModuleMap] parent module map - * for the module name, used to resolve relative names. - * @param {Boolean} isNormalized: is the ID already normalized. - * This is true if this call is done for a define() module ID. - * @param {Boolean} applyMap: apply the map config to the ID. - * Should only be true if this map is for a dependency. - * - * @returns {Object} - */ - function makeModuleMap(name, parentModuleMap, isNormalized, applyMap) { - var url, pluginModule, suffix, nameParts, - prefix = null, - parentName = parentModuleMap ? parentModuleMap.name : null, - originalName = name, - isDefine = true, - normalizedName = ''; - - //If no name, then it means it is a require call, generate an - //internal name. - if (!name) { - isDefine = false; - name = '_@r' + (requireCounter += 1); - } + function makeRequire(relName, topLevel) { + var req = function (deps, callback, errback, alt) { + var name, cfg; - nameParts = splitPrefix(name); - prefix = nameParts[0]; - name = nameParts[1]; + if (topLevel) { + takeQueue(); + } - if (prefix) { - prefix = normalize(prefix, parentName, applyMap); - pluginModule = getOwn(defined, prefix); - } + if (typeof deps === "string") { + if (handlers[deps]) { + return handlers[deps](relName); + } + // Just return the module wanted. In this scenario, the + // deps arg is the module name, and second arg (if passed) + // is just the relName. + // Normalize module name, if it contains . or .. + name = makeMap(deps, relName, true).id; + if (!(name in defined)) { + throw new Error('Not loaded: ' + name); + } + return defined[name]; + } else if (deps && !Array.isArray(deps)) { + // deps is a config object, not an array. + cfg = deps; + deps = undef; + + if (Array.isArray(callback)) { + // callback is an array, which means it is a dependency list. + // Adjust args if there are dependencies + deps = callback; + callback = errback; + errback = alt; + } - //Account for relative paths if there is a base name. - if (name) { - if (prefix) { - if (pluginModule && pluginModule.normalize) { - //Plugin is loaded, use its normalize method. - normalizedName = pluginModule.normalize(name, function (name) { - return normalize(name, parentName, applyMap); - }); - } else { - normalizedName = normalize(name, parentName, applyMap); + if (topLevel) { + // Could be a new context, so call returned require + return req.config(cfg)(deps, callback, errback); } - } else { - //A regular module. - normalizedName = normalize(name, parentName, applyMap); - - //Normalized name may be a plugin ID due to map config - //application in normalize. The map config values must - //already be normalized, so do not need to redo that part. - nameParts = splitPrefix(normalizedName); - prefix = nameParts[0]; - normalizedName = nameParts[1]; - isNormalized = true; - - url = context.nameToUrl(normalizedName); } - } - //If the id is a plugin id that cannot be determined if it needs - //normalization, stamp it with a unique ID so two matching relative - //ids that may conflict can be separate. - suffix = prefix && !pluginModule && !isNormalized ? - '_unnormalized' + (unnormalizedCounter += 1) : - ''; - - return { - prefix: prefix, - name: normalizedName, - parentMap: parentModuleMap, - unnormalized: !!suffix, - url: url, - originalName: originalName, - isDefine: isDefine, - id: (prefix ? - prefix + '!' + normalizedName : - normalizedName) + suffix + // Support require(['a']) + callback = callback || function () { + // In case used later as a promise then value, return the + // arguments as an array. + return slice.call(arguments, 0); + }; + + // Complete async to maintain expected execution semantics. + return asyncResolve.then(function () { + // Grab any modules that were defined after a require call. + takeQueue(); + + return main(undef, deps || [], callback, errback, relName); + }); }; - } - function getModule(depMap) { - var id = depMap.id, - mod = getOwn(registry, id); + req.isBrowser = typeof document !== 'undefined' && + typeof navigator !== 'undefined'; - if (!mod) { - mod = registry[id] = new context.Module(depMap); - } + req.nameToUrl = function (moduleName, ext, skipExt) { + var paths, syms, i, parentModule, url, + parentPath, bundleId, + pkgMain = getOwn(config.pkgs, moduleName); - return mod; - } + if (pkgMain) { + moduleName = pkgMain; + } - function on(depMap, name, fn) { - var id = depMap.id, - mod = getOwn(registry, id); + bundleId = getOwn(bundlesMap, moduleName); - if (hasProp(defined, id) && - (!mod || mod.defineEmitComplete)) { - if (name === 'defined') { - fn(defined[id]); + if (bundleId) { + return req.nameToUrl(bundleId, ext, skipExt); } - } else { - mod = getModule(depMap); - if (mod.error && name === 'error') { - fn(mod.error); + + // If a colon is in the URL, it indicates a protocol is used and it is + // just an URL to a file, or if it starts with a slash, contains a query + // arg (i.e. ?) or ends with .js, then assume the user meant to use an + // url and not a module id. The slash is important for protocol-less + // URLs as well as full paths. + if (urlRegExp.test(moduleName)) { + // Just a plain path, not module name lookup, so just return it. + // Add extension if it is included. This is a bit wonky, only non-.js + // things pass an extension, this method probably needs to be + // reworked. + url = moduleName + (ext || ''); } else { - mod.on(name, fn); - } - } - } + // A module that needs to be converted to a path. + paths = config.paths; - function onError(err, errback) { - var ids = err.requireModules, - notified = false; + syms = moduleName.split('/'); + // For each module name segment, see if there is a path + // registered for it. Start with most specific name + // and work up from it. + for (i = syms.length; i > 0; i -= 1) { + parentModule = syms.slice(0, i).join('/'); - if (errback) { - errback(err); - } else { - each(ids, function (id) { - var mod = getOwn(registry, id); - if (mod) { - //Set error on module, so it skips timeout checks. - mod.error = err; - if (mod.events.error) { - notified = true; - mod.emit('error', err); + parentPath = getOwn(paths, parentModule); + if (parentPath) { + // If an array, it means there are a few choices, + // Choose the one that is desired + if (Array.isArray(parentPath)) { + parentPath = parentPath[0]; + } + syms.splice(0, i, parentPath); + break; } } - }); - if (!notified) { - req.onError(err); + // Join the path parts together, then figure out if baseUrl is needed. + url = syms.join('/'); + url += (ext || (/^data\:|^blob\:|\?/.test(url) || skipExt ? '' : '.js')); + url = (url.charAt(0) === '/' || + url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url; } - } - } - /** - * Internal method to transfer globalQueue items to this context's - * defQueue. - */ - function takeGlobalQueue() { - //Push all the globalDefQueue items into the context's defQueue - if (globalDefQueue.length) { - //Array splice in the values since the context code has a - //local var ref to defQueue, so cannot just reassign the one - //on context. - apsp.apply(defQueue, - [defQueue.length, 0].concat(globalDefQueue)); - globalDefQueue = []; - } - } + return config.urlArgs && !/^blob\:/.test(url) ? + url + config.urlArgs(moduleName, url) : url; + }; - handlers = { - 'require': function (mod) { - if (mod.require) { - return mod.require; - } else { - return (mod.require = context.makeRequire(mod.map)); - } - }, - 'exports': function (mod) { - mod.usingExports = true; - if (mod.map.isDefine) { - if (mod.exports) { - return (defined[mod.map.id] = mod.exports); - } else { - return (mod.exports = defined[mod.map.id] = {}); - } - } - }, - 'module': function (mod) { - if (mod.module) { - return mod.module; - } else { - return (mod.module = { - id: mod.map.id, - uri: mod.map.url, - config: function () { - return getOwn(config.config, mod.map.id) || {}; - }, - exports: mod.exports || (mod.exports = {}) - }); + /** + * Converts a module name + .extension into an URL path. + * *Requires* the use of a module name. It does not support using + * plain URLs like nameToUrl. + */ + req.toUrl = function (moduleNamePlusExt) { + var ext, + index = moduleNamePlusExt.lastIndexOf('.'), + segment = moduleNamePlusExt.split('/')[0], + isRelative = segment === '.' || segment === '..'; + + // Have a file extension alias, and it is not the + // dots from a relative path. + if (index !== -1 && (!isRelative || index > 1)) { + ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length); + moduleNamePlusExt = moduleNamePlusExt.substring(0, index); } - } - }; - function cleanRegistry(id) { - //Clean up machinery used for waiting modules. - delete registry[id]; - delete enabledRegistry[id]; - } + return req.nameToUrl(normalize(moduleNamePlusExt, relName), ext, true); + }; - function breakCycle(mod, traced, processed) { - var id = mod.map.id; + req.defined = function (id) { + return makeMap(id, relName, true).id in defined; + }; - if (mod.error) { - mod.emit('error', mod.error); - } else { - traced[id] = true; - each(mod.depMaps, function (depMap, i) { - var depId = depMap.id, - dep = getOwn(registry, depId); - - //Only force things that have not completed - //being defined, so still in the registry, - //and only if it has not been matched up - //in the module already. - if (dep && !mod.depMatched[i] && !processed[depId]) { - if (getOwn(traced, depId)) { - mod.defineDep(i, defined[depId]); - mod.check(); //pass false? - } else { - breakCycle(dep, traced, processed); - } - } - }); - processed[id] = true; - } + req.specified = function (id) { + id = makeMap(id, relName, true).id; + return id in defined || id in deferreds; + }; + + return req; } - function checkLoaded() { - var err, usingPathFallback, - waitInterval = config.waitSeconds * 1000, - //It is possible to disable the wait interval by using waitSeconds of 0. - expired = waitInterval && (context.startTime + waitInterval) < new Date().getTime(), - noLoads = [], - reqCalls = [], - stillLoading = false, - needCycleCheck = true; - - //Do not bother if this call was a result of a cycle break. - if (inCheckLoaded) { - return; + function resolve(name, d, value) { + if (name) { + defined[name] = value; + if (requirejs.onResourceLoad) { + requirejs.onResourceLoad(context, d.map, d.deps); + } } + d.finished = true; + d.resolve(value); + } - inCheckLoaded = true; + function reject(d, err) { + d.finished = true; + d.rejected = true; + d.reject(err); + } - //Figure out the state of all the modules. - eachProp(enabledRegistry, function (mod) { - var map = mod.map, - modId = map.id; + function makeNormalize(relName) { + return function (name) { + return normalize(name, relName, true); + }; + } - //Skip things that are not enabled or in error state. - if (!mod.enabled) { - return; - } + function defineModule(d) { + d.factoryCalled = true; - if (!map.isDefine) { - reqCalls.push(mod); - } + var ret, + name = d.map.id; - if (!mod.error) { - //If the module should be executed, and it has not - //been inited and time is up, remember it. - if (!mod.inited && expired) { - if (hasPathFallback(modId)) { - usingPathFallback = true; - stillLoading = true; - } else { - noLoads.push(modId); - removeScript(modId); - } - } else if (!mod.inited && mod.fetched && map.isDefine) { - stillLoading = true; - if (!map.prefix) { - //No reason to keep looking for unfinished - //loading. If the only stillLoading is a - //plugin resource though, keep going, - //because it may be that a plugin resource - //is waiting on a non-plugin cycle. - return (needCycleCheck = false); - } + try { + ret = context.execCb(name, d.factory, d.values, defined[name]); + } catch(err) { + return reject(d, err); + } + + if (name) { + // Favor return value over exports. If node/cjs in play, + // then will not have a return value anyway. Favor + // module.exports assignment over exports object. + if (ret === undef) { + if (d.cjsModule) { + ret = d.cjsModule.exports; + } else if (d.usingExports) { + ret = defined[name]; } } - }); + } else { + // Remove the require deferred from the list to + // make cycle searching faster. Do not need to track + // it anymore either. + requireDeferreds.splice(requireDeferreds.indexOf(d), 1); + } + resolve(name, d, ret); + } - if (expired && noLoads.length) { - //If wait time expired, throw error of unloaded modules. - err = makeError('timeout', 'Load timeout for modules: ' + noLoads, null, noLoads); - err.contextName = context.contextName; - return onError(err); + // This method is attached to every module deferred, + // so the "this" in here is the module deferred object. + function depFinished(val, i) { + if (!this.rejected && !this.depDefined[i]) { + this.depDefined[i] = true; + this.depCount += 1; + this.values[i] = val; + if (!this.depending && this.depCount === this.depMax) { + defineModule(this); + } } + } - //Not expired, check for a cycle. - if (needCycleCheck) { - each(reqCalls, function (mod) { - breakCycle(mod, {}, {}); - }); + function makeDefer(name, calculatedMap) { + var d = {}; + d.promise = new Promise(function (resolve, reject) { + d.resolve = resolve; + d.reject = function(err) { + if (!name) { + requireDeferreds.splice(requireDeferreds.indexOf(d), 1); + } + reject(err); + }; + }); + d.map = name ? (calculatedMap || makeMap(name)) : {}; + d.depCount = 0; + d.depMax = 0; + d.values = []; + d.depDefined = []; + d.depFinished = depFinished; + if (d.map.pr) { + // Plugin resource ID, implicitly + // depends on plugin. Track it in deps + // so cycle breaking can work + d.deps = [makeMap(d.map.pr)]; } + return d; + } - //If still waiting on loads, and the waiting load is something - //other than a plugin resource, or there are still outstanding - //scripts, then just try back later. - if ((!expired || usingPathFallback) && stillLoading) { - //Something is still waiting to load. Wait for it, but only - //if a timeout is not already in effect. - if ((isBrowser || isWebWorker) && !checkLoadedTimeoutId) { - checkLoadedTimeoutId = setTimeout(function () { - checkLoadedTimeoutId = 0; - checkLoaded(); - }, 50); + function getDefer(name, calculatedMap) { + var d; + if (name) { + d = (name in deferreds) && deferreds[name]; + if (!d) { + d = deferreds[name] = makeDefer(name, calculatedMap); } + } else { + d = makeDefer(); + requireDeferreds.push(d); } + return d; + } - inCheckLoaded = false; + function makeErrback(d, name) { + return function (err) { + if (!d.rejected) { + if (!err.dynaId) { + err.dynaId = 'id' + (errCount += 1); + err.requireModules = [name]; + } + reject(d, err); + } + }; } - Module = function (map) { - this.events = getOwn(undefEvents, map.id) || {}; - this.map = map; - this.shim = getOwn(config.shim, map.id); - this.depExports = []; - this.depMaps = []; - this.depMatched = []; - this.pluginMaps = {}; - this.depCount = 0; - - /* this.exports this.factory - this.depMaps = [], - this.enabled, this.fetched - */ - }; + function waitForDep(depMap, relName, d, i) { + d.depMax += 1; - Module.prototype = { - init: function (depMaps, factory, errback, options) { - options = options || {}; + // Do the fail at the end to catch errors + // in the then callback execution. + callDep(depMap, relName).then(function (val) { + d.depFinished(val, i); + }, makeErrback(d, depMap.id)).catch(makeErrback(d, d.map.id)); + } - //Do not do more inits if already done. Can happen if there - //are multiple define calls for the same module. That is not - //a normal, common case, but it is also not unexpected. - if (this.inited) { - return; + function makeLoad(id) { + var fromTextCalled; + function load(value) { + // Protect against older plugins that call load after + // calling load.fromText + if (!fromTextCalled) { + resolve(id, getDefer(id), value); } + } - this.factory = factory; + load.error = function (err) { + reject(getDefer(id), err); + }; - if (errback) { - //Register for errors on this module. - this.on('error', errback); - } else if (this.events.error) { - //If no errback already, but there are error listeners - //on this module, set up an errback to pass to the deps. - errback = bind(this, function (err) { - this.emit('error', err); - }); + load.fromText = function (text, textAlt) { + /*jslint evil: true */ + var d = getDefer(id), + map = makeMap(makeMap(id).n), + plainId = map.id, + execError; + + fromTextCalled = true; + + // Set up the factory just to be a return of the value from + // plainId. + d.factory = function (p, val) { + return val; + }; + + // As of requirejs 2.1.0, support just passing the text, to reinforce + // fromText only being called once per resource. Still + // support old style of passing moduleName but discard + // that moduleName in favor of the internal ref. + if (textAlt) { + text = textAlt; } - //Do a copy of the dependency array, so that - //source inputs are not modified. For example - //"shim" deps are passed in here directly, and - //doing a direct modification of the depMaps array - //would affect that config. - this.depMaps = depMaps && depMaps.slice(0); - - this.errback = errback; - - //Indicate this module has be initialized - this.inited = true; - - this.ignore = options.ignore; - - //Could have option to init this module in enabled mode, - //or could have been previously marked as enabled. However, - //the dependencies are not known until init is called. So - //if enabled previously, now trigger dependencies as enabled. - if (options.enabled || this.enabled) { - //Enable this module and dependencies. - //Will call this.check() - this.enable(); - } else { - this.check(); + // Transfer any config to this other module. + if (hasProp(config.config, id)) { + config.config[plainId] = config.config[id]; } - }, - defineDep: function (i, depExports) { - //Because of cycles, defined callback for a given - //export can be called more than once. - if (!this.depMatched[i]) { - this.depMatched[i] = true; - this.depCount -= 1; - this.depExports[i] = depExports; + try { + req.exec(text); + } catch (e) { + execError = new Error('fromText eval for ' + plainId + + ' failed: ' + e); + execError.requireType = 'fromtexteval'; + reject(d, execError); } - }, - fetch: function () { - if (this.fetched) { - return; - } - this.fetched = true; + // Execute any waiting define created by the plainId + takeQueue(plainId); - context.startTime = (new Date()).getTime(); + // Mark this as a dependency for the plugin + // resource + d.deps = [map]; + waitForDep(map, null, d, d.deps.length); + }; - var map = this.map; + return load; + } - //If the manager is for a plugin managed resource, - //ask the plugin to load it now. - if (this.shim) { - context.makeRequire(this.map, { - enableBuildCallback: true - })(this.shim.deps || [], bind(this, function () { - return map.prefix ? this.callPlugin() : this.load(); - })); - } else { - //Regular dependency. - return map.prefix ? this.callPlugin() : this.load(); + load = typeof importScripts === 'function' ? + function (map) { + var url = map.url; + if (urlFetched[url]) { + return; } - }, + urlFetched[url] = true; - load: function () { - var url = this.map.url; - - //Regular dependency. - if (!urlFetched[url]) { - urlFetched[url] = true; - context.load(this.map.id, url); - } - }, + // Ask for the deferred so loading is triggered. + // Do this before loading, since loading is sync. + getDefer(map.id); + importScripts(url); + takeQueue(map.id); + } : + function (map) { + var script, + id = map.id, + url = map.url; - /** - * Checks if the module is ready to define itself, and if so, - * define it. - */ - check: function () { - if (!this.enabled || this.enabling) { + if (urlFetched[url]) { return; } - - var err, cjsModule, - id = this.map.id, - depExports = this.depExports, - exports = this.exports, - factory = this.factory; - - if (!this.inited) { - this.fetch(); - } else if (this.error) { - this.emit('error', this.error); - } else if (!this.defining) { - //The factory could trigger another require call - //that would result in checking this module to - //define itself again. If already in the process - //of doing that, skip this work. - this.defining = true; - - if (this.depCount < 1 && !this.defined) { - if (isFunction(factory)) { - //If there is an error listener, favor passing - //to that instead of throwing an error. However, - //only do it for define()'d modules. require - //errbacks should not be called for failures in - //their callbacks (#699). However if a global - //onError is set, use that. - if ((this.events.error && this.map.isDefine) || - req.onError !== defaultOnError) { - try { - exports = context.execCb(id, factory, depExports, exports); - } catch (e) { - err = e; - } - } else { - exports = context.execCb(id, factory, depExports, exports); - } - - // Favor return value over exports. If node/cjs in play, - // then will not have a return value anyway. Favor - // module.exports assignment over exports object. - if (this.map.isDefine && exports === undefined) { - cjsModule = this.module; - if (cjsModule) { - exports = cjsModule.exports; - } else if (this.usingExports) { - //exports already set the defined value. - exports = this.exports; - } - } - - if (err) { - err.requireMap = this.map; - err.requireModules = this.map.isDefine ? [this.map.id] : null; - err.requireType = this.map.isDefine ? 'define' : 'require'; - return onError((this.error = err)); - } - - } else { - //Just a literal value - exports = factory; - } - - this.exports = exports; - - if (this.map.isDefine && !this.ignore) { - defined[id] = exports; - - if (req.onResourceLoad) { - req.onResourceLoad(context, this.map, this.depMaps); - } - } - - //Clean up - cleanRegistry(id); - - this.defined = true; + urlFetched[url] = true; + + script = document.createElement('script'); + script.setAttribute('data-requiremodule', id); + script.type = config.scriptType || 'text/javascript'; + script.charset = 'utf-8'; + script.async = true; + + loadCount += 1; + + script.addEventListener('load', function () { + loadCount -= 1; + takeQueue(id); + }, false); + script.addEventListener('error', function () { + loadCount -= 1; + var err, + pathConfig = getOwn(config.paths, id); + if (pathConfig && Array.isArray(pathConfig) && + pathConfig.length > 1) { + script.parentNode.removeChild(script); + // Pop off the first array value, since it failed, and + // retry + pathConfig.shift(); + var d = getDefer(id); + d.map = makeMap(id); + // mapCache will have returned previous map value, update the + // url, which will also update mapCache value. + d.map.url = req.nameToUrl(id); + load(d.map); + } else { + err = new Error('Load failed: ' + id + ': ' + script.src); + err.requireModules = [id]; + err.requireType = 'scripterror'; + reject(getDefer(id), err); } + }, false); - //Finished the define stage. Allow calling check again - //to allow define notifications below in the case of a - //cycle. - this.defining = false; - - if (this.defined && !this.defineEmitted) { - this.defineEmitted = true; - this.emit('defined', this.exports); - this.defineEmitComplete = true; - } + script.src = url; + if (config.onNodeCreated) { + config.onNodeCreated(script, config, id, url); } - }, - - callPlugin: function () { - var map = this.map, - id = map.id, - //Map already normalized the prefix. - pluginMap = makeModuleMap(map.prefix); - - //Mark this as a dependency for this plugin, so it - //can be traced for cycles. - this.depMaps.push(pluginMap); - - on(pluginMap, 'defined', bind(this, function (plugin) { - var load, normalizedMap, normalizedMod, - bundleId = getOwn(bundlesMap, this.map.id), - name = this.map.name, - parentName = this.map.parentMap ? this.map.parentMap.name : null, - localRequire = context.makeRequire(map.parentMap, { - enableBuildCallback: true - }); - - //If current map is not normalized, wait for that - //normalized name to load instead of continuing. - if (this.map.unnormalized) { - //Normalize the ID if the plugin allows it. - if (plugin.normalize) { - name = plugin.normalize(name, function (name) { - return normalize(name, parentName, true); - }) || ''; - } - - //prefix and name should already be normalized, no need - //for applying map config again either. - normalizedMap = makeModuleMap(map.prefix + '!' + name, - this.map.parentMap); - on(normalizedMap, - 'defined', bind(this, function (value) { - this.init([], function () { return value; }, null, { - enabled: true, - ignore: true - }); - })); - - normalizedMod = getOwn(registry, normalizedMap.id); - if (normalizedMod) { - //Mark this as a dependency for this plugin, so it - //can be traced for cycles. - this.depMaps.push(normalizedMap); - - if (this.events.error) { - normalizedMod.on('error', bind(this, function (err) { - this.emit('error', err); - })); - } - normalizedMod.enable(); - } - - return; - } - - //If a paths config, then just load that file instead to - //resolve the plugin, as it is built into that paths layer. - if (bundleId) { - this.map.url = context.nameToUrl(bundleId); - this.load(); - return; - } - load = bind(this, function (value) { - this.init([], function () { return value; }, null, { - enabled: true - }); + // If the script is cached, IE10 executes the script body and the + // onload handler synchronously here. That's a spec violation, + // so be sure to do this asynchronously. + if (document.documentMode === 10) { + asap.then(function() { + document.head.appendChild(script); }); + } else { + document.head.appendChild(script); + } + }; - load.error = bind(this, function (err) { - this.inited = true; - this.error = err; - err.requireModules = [id]; + function callPlugin(plugin, map, relName) { + plugin.load(map.n, makeRequire(relName), makeLoad(map.id), config); + } - //Remove temp unnormalized modules for this module, - //since they will never be resolved otherwise now. - eachProp(registry, function (mod) { - if (mod.map.id.indexOf(id + '_unnormalized') === 0) { - cleanRegistry(mod.map.id); + callDep = function (map, relName) { + var args, bundleId, + name = map.id, + shim = config.shim[name]; + + if (name in waiting) { + args = waiting[name]; + delete waiting[name]; + main.apply(undef, args); + } else if (!(name in deferreds)) { + if (map.pr) { + // If a bundles config, then just load that file instead to + // resolve the plugin, as it is built into that bundle. + if ((bundleId = getOwn(bundlesMap, name))) { + map.url = req.nameToUrl(bundleId); + load(map); + } else { + return callDep(makeMap(map.pr)).then(function (plugin) { + // Redo map now that plugin is known to be loaded + var newMap = map.prn ? map : makeMap(name, relName, true), + newId = newMap.id, + shim = getOwn(config.shim, newId); + + // Make sure to only call load once per resource. Many + // calls could have been queued waiting for plugin to load. + if (!(newId in calledPlugin)) { + calledPlugin[newId] = true; + if (shim && shim.deps) { + req(shim.deps, function () { + callPlugin(plugin, newMap, relName); + }); + } else { + callPlugin(plugin, newMap, relName); + } } + return getDefer(newId).promise; }); - - onError(err); - }); - - //Allow plugins to load other code without having to know the - //context or how to 'complete' the load. - load.fromText = bind(this, function (text, textAlt) { - /*jslint evil: true */ - var moduleName = map.name, - moduleMap = makeModuleMap(moduleName), - hasInteractive = useInteractive; - - //As of 2.1.0, support just passing the text, to reinforce - //fromText only being called once per resource. Still - //support old style of passing moduleName but discard - //that moduleName in favor of the internal ref. - if (textAlt) { - text = textAlt; - } - - //Turn off interactive script matching for IE for any define - //calls in the text, then turn it back on at the end. - if (hasInteractive) { - useInteractive = false; - } - - //Prime the system by creating a module instance for - //it. - getModule(moduleMap); - - //Transfer any config to this other module. - if (hasProp(config.config, id)) { - config.config[moduleName] = config.config[id]; - } - - try { - req.exec(text); - } catch (e) { - return onError(makeError('fromtexteval', - 'fromText eval for ' + id + - ' failed: ' + e, - e, - [id])); - } - - if (hasInteractive) { - useInteractive = true; - } - - //Mark this as a dependency for the plugin - //resource - this.depMaps.push(moduleMap); - - //Support anonymous modules. - context.completeLoad(moduleName); - - //Bind the value of that module to the value for this - //resource ID. - localRequire([moduleName], load); - }); - - //Use parentName here since the plugin's name is not reliable, - //could be some weird string with no path that actually wants to - //reference the parentName's path. - plugin.load(map.name, localRequire, load, config); - })); - - context.enable(pluginMap, this); - this.pluginMaps[pluginMap.id] = pluginMap; - }, - - enable: function () { - enabledRegistry[this.map.id] = this; - this.enabled = true; - - //Set flag mentioning that the module is enabling, - //so that immediate calls to the defined callbacks - //for dependencies do not trigger inadvertent load - //with the depCount still being zero. - this.enabling = true; - - //Enable each dependency - each(this.depMaps, bind(this, function (depMap, i) { - var id, mod, handler; - - if (typeof depMap === 'string') { - //Dependency needs to be converted to a depMap - //and wired up to this module. - depMap = makeModuleMap(depMap, - (this.map.isDefine ? this.map : this.map.parentMap), - false, - !this.skipMap); - this.depMaps[i] = depMap; - - handler = getOwn(handlers, depMap.id); - - if (handler) { - this.depExports[i] = handler(this); - return; - } - - this.depCount += 1; - - on(depMap, 'defined', bind(this, function (depExports) { - this.defineDep(i, depExports); - this.check(); - })); - - if (this.errback) { - on(depMap, 'error', bind(this, this.errback)); - } } + } else if (shim && shim.deps) { + req(shim.deps, function () { + load(map); + }); + } else { + load(map); + } + } - id = depMap.id; - mod = registry[id]; + return getDefer(name).promise; + }; - //Skip special modules like 'require', 'exports', 'module' - //Also, don't call enable if it is already enabled, - //important in circular dependency cases. - if (!hasProp(handlers, id) && mod && !mod.enabled) { - context.enable(depMap, this); - } - })); - - //Enable each plugin that is used in - //a dependency - eachProp(this.pluginMaps, bind(this, function (pluginMap) { - var mod = getOwn(registry, pluginMap.id); - if (mod && !mod.enabled) { - context.enable(pluginMap, this); - } - })); + // Turns a plugin!resource to [plugin, resource] + // with the plugin being undefined if the name + // did not have a plugin prefix. + function splitPrefix(name) { + var prefix, + index = name ? name.indexOf('!') : -1; + if (index > -1) { + prefix = name.substring(0, index); + name = name.substring(index + 1, name.length); + } + return [prefix, name]; + } - this.enabling = false; + /** + * Makes a name map, normalizing the name, and using a plugin + * for normalization if necessary. Grabs a ref to plugin + * too, as an optimization. + */ + makeMap = function (name, relName, applyMap) { + if (typeof name !== 'string') { + return name; + } - this.check(); - }, + var plugin, url, parts, prefix, result, prefixNormalized, + cacheKey = name + ' & ' + (relName || '') + ' & ' + !!applyMap; - on: function (name, cb) { - var cbs = this.events[name]; - if (!cbs) { - cbs = this.events[name] = []; - } - cbs.push(cb); - }, + parts = splitPrefix(name); + prefix = parts[0]; + name = parts[1]; - emit: function (name, evt) { - each(this.events[name], function (cb) { - cb(evt); - }); - if (name === 'error') { - //Now that the error handler was triggered, remove - //the listeners, since this broken Module instance - //can stay around for a while in the registry. - delete this.events[name]; - } + if (!prefix && (cacheKey in mapCache)) { + return mapCache[cacheKey]; } - }; - function callGetModule(args) { - //Skip modules already defined. - if (!hasProp(defined, args[0])) { - getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]); + if (prefix) { + prefix = normalize(prefix, relName, applyMap); + plugin = (prefix in defined) && defined[prefix]; } - } - function removeListener(node, func, name, ieName) { - //Favor detachEvent because of IE9 - //issue, see attachEvent/addEventListener comment elsewhere - //in this file. - if (node.detachEvent && !isOpera) { - //Probably IE. If not it will throw an error, which will be - //useful to know. - if (ieName) { - node.detachEvent(ieName, func); + // Normalize according + if (prefix) { + if (plugin && plugin.normalize) { + name = plugin.normalize(name, makeNormalize(relName)); + prefixNormalized = true; + } else { + // If nested plugin references, then do not try to + // normalize, as it will not normalize correctly. This + // places a restriction on resourceIds, and the longer + // term solution is not to normalize until plugins are + // loaded and all normalizations to allow for async + // loading of a loader plugin. But for now, fixes the + // common uses. Details in requirejs#1131 + name = name.indexOf('!') === -1 ? + normalize(name, relName, applyMap) : + name; } } else { - node.removeEventListener(name, func, false); + name = normalize(name, relName, applyMap); + parts = splitPrefix(name); + prefix = parts[0]; + name = parts[1]; + + url = req.nameToUrl(name); } - } - /** - * Given an event from a script node, get the requirejs info from it, - * and then removes the event listeners on the node. - * @param {Event} evt - * @returns {Object} - */ - function getScriptData(evt) { - //Using currentTarget instead of target for Firefox 2.0's sake. Not - //all old browsers will be supported, but this one was easy enough - //to support and still makes sense. - var node = evt.currentTarget || evt.srcElement; - - //Remove the listeners once here. - removeListener(node, context.onScriptLoad, 'load', 'onreadystatechange'); - removeListener(node, context.onScriptError, 'error'); - - return { - node: node, - id: node && node.getAttribute('data-requiremodule') + // Using ridiculous property names for space reasons + result = { + id: prefix ? prefix + '!' + name : name, // fullName + n: name, + pr: prefix, + url: url, + prn: prefix && prefixNormalized }; - } - function intakeDefines() { - var args; + if (!prefix) { + mapCache[cacheKey] = result; + } - //Any defined modules in the global queue, intake them now. - takeGlobalQueue(); + return result; + }; - //Make sure any remaining defQueue items get properly processed. - while (defQueue.length) { - args = defQueue.shift(); - if (args[0] === null) { - return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1])); + handlers = { + require: function (name) { + return makeRequire(name); + }, + exports: function (name) { + var e = defined[name]; + if (typeof e !== 'undefined') { + return e; } else { - //args are id, deps, factory. Should be normalized by the - //define() function. - callGetModule(args); + return (defined[name] = {}); } - } - } - - context = { - config: config, - contextName: contextName, - registry: registry, - defined: defined, - urlFetched: urlFetched, - defQueue: defQueue, - Module: Module, - makeModuleMap: makeModuleMap, - nextTick: req.nextTick, - onError: onError, - - /** - * Set a configuration for the context. - * @param {Object} cfg config object to integrate. - */ - configure: function (cfg) { - //Make sure the baseUrl ends in a slash. - if (cfg.baseUrl) { - if (cfg.baseUrl.charAt(cfg.baseUrl.length - 1) !== '/') { - cfg.baseUrl += '/'; + }, + module: function (name) { + return { + id: name, + uri: '', + exports: handlers.exports(name), + config: function () { + return getOwn(config.config, name) || {}; } - } + }; + } + }; - //Save off the paths since they require special processing, - //they are additive. - var shim = config.shim, - objs = { - paths: true, - bundles: true, - config: true, - map: true - }; + function breakCycle(d, traced, processed) { + var id = d.map.id; - eachProp(cfg, function (value, prop) { - if (objs[prop]) { - if (!config[prop]) { - config[prop] = {}; + traced[id] = true; + if (!d.finished && d.deps) { + d.deps.forEach(function (depMap) { + var depId = depMap.id, + dep = !hasProp(handlers, depId) && getDefer(depId, depMap); + + // Only force things that have not completed + // being defined, so still in the registry, + // and only if it has not been matched up + // in the module already. + if (dep && !dep.finished && !processed[depId]) { + if (hasProp(traced, depId)) { + d.deps.forEach(function (depMap, i) { + if (depMap.id === depId) { + d.depFinished(defined[depId], i); + } + }); + } else { + breakCycle(dep, traced, processed); } - mixin(config[prop], value, true, true); - } else { - config[prop] = value; } }); + } + processed[id] = true; + } - //Reverse map the bundles - if (cfg.bundles) { - eachProp(cfg.bundles, function (value, prop) { - each(value, function (v) { - if (v !== prop) { - bundlesMap[v] = prop; - } - }); - }); - } - - //Merge shim - if (cfg.shim) { - eachProp(cfg.shim, function (value, id) { - //Normalize the structure - if (isArray(value)) { - value = { - deps: value - }; - } - if ((value.exports || value.init) && !value.exportsFn) { - value.exportsFn = context.makeShimExports(value); - } - shim[id] = value; - }); - config.shim = shim; - } - - //Adjust packages if necessary. - if (cfg.packages) { - each(cfg.packages, function (pkgObj) { - var location, name; - - pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj; - - name = pkgObj.name; - location = pkgObj.location; - if (location) { - config.paths[name] = pkgObj.location; - } - - //Save pointer to main module ID for pkg name. - //Remove leading dot in main, so main paths are normalized, - //and remove any trailing .js, since different package - //envs have different conventions: some use a module name, - //some use a file name. - config.pkgs[name] = pkgObj.name + '/' + (pkgObj.main || 'main') - .replace(currDirRegExp, '') - .replace(jsSuffixRegExp, ''); + function check(d) { + var err, mid, dfd, + notFinished = [], + waitInterval = config.waitSeconds * 1000, + // It is possible to disable the wait interval by using waitSeconds 0. + expired = waitInterval && + (startTime + waitInterval) < (new Date()).getTime(); + + if (loadCount === 0) { + // If passed in a deferred, it is for a specific require call. + // Could be a sync case that needs resolution right away. + // Otherwise, if no deferred, means it was the last ditch + // timeout-based check, so check all waiting require deferreds. + if (d) { + if (!d.finished) { + breakCycle(d, {}, {}); + } + } else if (requireDeferreds.length) { + requireDeferreds.forEach(function (d) { + breakCycle(d, {}, {}); }); } + } - //If there are any "waiting to execute" modules in the registry, - //update the maps for them, since their info, like URLs to load, - //may have changed. - eachProp(registry, function (mod, id) { - //If module already has init called, since it is too - //late to modify them, and ignore unnormalized ones - //since they are transient. - if (!mod.inited && !mod.map.unnormalized) { - mod.map = makeModuleMap(id); + // If still waiting on loads, and the waiting load is something + // other than a plugin resource, or there are still outstanding + // scripts, then just try back later. + if (expired) { + // If wait time expired, throw error of unloaded modules. + for (mid in deferreds) { + dfd = deferreds[mid]; + if (!dfd.finished) { + notFinished.push(dfd.map.id); } + } + err = new Error('Timeout for modules: ' + notFinished); + err.requireModules = notFinished; + err.requireType = 'timeout'; + notFinished.forEach(function (id) { + reject(getDefer(id), err); }); - - //If a deps array or a config callback is specified, then call - //require with those args. This is useful when require is defined as a - //config object before require.js is loaded. - if (cfg.deps || cfg.callback) { - context.require(cfg.deps || [], cfg.callback); + } else if (loadCount || requireDeferreds.length) { + // Something is still waiting to load. Wait for it, but only + // if a later check is not already scheduled. Using setTimeout + // because want other things in the event loop to happen, + // to help in dependency resolution, and this is really a + // last ditch check, mostly for detecting timeouts (cycles + // should come through the main() use of check()), so it can + // wait a bit before doing the final check. + if (!checkingLater) { + checkingLater = true; + setTimeout(function () { + checkingLater = false; + check(); + }, 70); } - }, + } + } - makeShimExports: function (value) { - function fn() { - var ret; - if (value.init) { - ret = value.init.apply(global, arguments); - } - return ret || (value.exports && getGlobal(value.exports)); + // Used to break out of the promise try/catch chains. + function delayedError(e) { + setTimeout(function () { + if (!e.dynaId || !trackedErrors[e.dynaId]) { + trackedErrors[e.dynaId] = true; + req.onError(e); } - return fn; - }, - - makeRequire: function (relMap, options) { - options = options || {}; - - function localRequire(deps, callback, errback) { - var id, map, requireMod; - - if (options.enableBuildCallback && callback && isFunction(callback)) { - callback.__requireJsBuild = true; - } - - if (typeof deps === 'string') { - if (isFunction(callback)) { - //Invalid call - return onError(makeError('requireargs', 'Invalid require call'), errback); - } - - //If require|exports|module are requested, get the - //value for them from the special handlers. Caveat: - //this only works while module is being defined. - if (relMap && hasProp(handlers, deps)) { - return handlers[deps](registry[relMap.id]); - } - - //Synchronous access to one module. If require.get is - //available (as in the Node adapter), prefer that. - if (req.get) { - return req.get(context, deps, relMap, localRequire); - } - - //Normalize module name, if it contains . or .. - map = makeModuleMap(deps, relMap, false, true); - id = map.id; - - if (!hasProp(defined, id)) { - return onError(makeError('notloaded', 'Module name "' + - id + - '" has not been loaded yet for context: ' + - contextName + - (relMap ? '' : '. Use require([])'))); - } - return defined[id]; - } - - //Grab defines waiting in the global queue. - intakeDefines(); - - //Mark all the dependencies as needing to be loaded. - context.nextTick(function () { - //Some defines could have been added since the - //require call, collect them. - intakeDefines(); - - requireMod = getModule(makeModuleMap(null, relMap)); - - //Store if map config should be applied to this require - //call for dependencies. - requireMod.skipMap = options.skipMap; - - requireMod.init(deps, callback, errback, { - enabled: true - }); - - checkLoaded(); - }); + }); + return e; + } - return localRequire; + main = function (name, deps, factory, errback, relName) { + if (name) { + // Only allow main calling once per module. + if (name in calledDefine) { + return; } + calledDefine[name] = true; + } - mixin(localRequire, { - isBrowser: isBrowser, - - /** - * Converts a module name + .extension into an URL path. - * *Requires* the use of a module name. It does not support using - * plain URLs like nameToUrl. - */ - toUrl: function (moduleNamePlusExt) { - var ext, - index = moduleNamePlusExt.lastIndexOf('.'), - segment = moduleNamePlusExt.split('/')[0], - isRelative = segment === '.' || segment === '..'; - - //Have a file extension alias, and it is not the - //dots from a relative path. - if (index !== -1 && (!isRelative || index > 1)) { - ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length); - moduleNamePlusExt = moduleNamePlusExt.substring(0, index); - } + var d = getDefer(name); - return context.nameToUrl(normalize(moduleNamePlusExt, - relMap && relMap.id, true), ext, true); - }, + // This module may not have dependencies + if (deps && !Array.isArray(deps)) { + // deps is not an array, so probably means + // an object literal or factory function for + // the value. Adjust args. + factory = deps; + deps = []; + } - defined: function (id) { - return hasProp(defined, makeModuleMap(id, relMap, false, true).id); - }, + // Create fresh array instead of modifying passed in value. + deps = deps ? slice.call(deps, 0) : null; - specified: function (id) { - id = makeModuleMap(id, relMap, false, true).id; - return hasProp(defined, id) || hasProp(registry, id); + if (!errback) { + if (hasProp(config, 'defaultErrback')) { + if (config.defaultErrback) { + errback = config.defaultErrback; } - }); - - //Only allow undef on top level require calls - if (!relMap) { - localRequire.undef = function (id) { - //Bind any waiting define() calls to this context, - //fix for #408 - takeGlobalQueue(); - - var map = makeModuleMap(id, relMap, true), - mod = getOwn(registry, id); - - removeScript(id); + } else { + errback = delayedError; + } + } - delete defined[id]; - delete urlFetched[map.url]; - delete undefEvents[id]; + if (errback) { + d.promise.catch(errback); + } - //Clean queued defines too. Go backwards - //in array so that the splices do not - //mess up the iteration. - eachReverse(defQueue, function(args, i) { - if(args[0] === id) { - defQueue.splice(i, 1); - } + // Use name if no relName + relName = relName || name; + + // Call the factory to define the module, if necessary. + if (typeof factory === 'function') { + + if (!deps.length && factory.length) { + // Remove comments from the callback string, + // look for require calls, and pull them into the dependencies, + // but only if there are function args. + factory + .toString() + .replace(commentRegExp, commentReplace) + .replace(cjsRequireRegExp, function (match, dep) { + deps.push(dep); }); - if (mod) { - //Hold on to listeners in case the - //module will be attempted to be reloaded - //using a different config. - if (mod.events.defined) { - undefEvents[id] = mod.events; - } - - cleanRegistry(id); - } - }; - } - - return localRequire; - }, - - /** - * Called to enable a module if it is still in the registry - * awaiting enablement. A second arg, parent, the parent module, - * is passed in for context, when this method is overridden by - * the optimizer. Not shown here to keep code compact. - */ - enable: function (depMap) { - var mod = getOwn(registry, depMap.id); - if (mod) { - getModule(depMap).enable(); + // May be a CommonJS thing even without require calls, but still + // could use exports, and module. Avoid doing exports and module + // work though if it just needs require. + // REQUIRES the function to expect the CommonJS variables in the + // order listed below. + deps = (factory.length === 1 ? + ['require'] : + ['require', 'exports', 'module']).concat(deps); } - }, - /** - * Internal method used by environment adapters to complete a load event. - * A load event could be a script load or just a load pass from a synchronous - * load call. - * @param {String} moduleName the name of the module to potentially complete. - */ - completeLoad: function (moduleName) { - var found, args, mod, - shim = getOwn(config.shim, moduleName) || {}, - shExports = shim.exports; - - takeGlobalQueue(); - - while (defQueue.length) { - args = defQueue.shift(); - if (args[0] === null) { - args[0] = moduleName; - //If already found an anonymous module and bound it - //to this name, then this is some other anon module - //waiting for its completeLoad to fire. - if (found) { - break; - } - found = true; - } else if (args[0] === moduleName) { - //Found matching define call for this script! - found = true; + // Save info for use later. + d.factory = factory; + d.deps = deps; + + d.depending = true; + deps.forEach(function (depName, i) { + var depMap; + deps[i] = depMap = makeMap(depName, relName, true); + depName = depMap.id; + + // Fast path CommonJS standard dependencies. + if (depName === "require") { + d.values[i] = handlers.require(name); + } else if (depName === "exports") { + // CommonJS module spec 1.1 + d.values[i] = handlers.exports(name); + d.usingExports = true; + } else if (depName === "module") { + // CommonJS module spec 1.1 + d.values[i] = d.cjsModule = handlers.module(name); + } else if (depName === undefined) { + d.values[i] = undefined; + } else { + waitForDep(depMap, relName, d, i); } + }); + d.depending = false; - callGetModule(args); + // Some modules just depend on the require, exports, modules, so + // trigger their definition here if so. + if (d.depCount === d.depMax) { + defineModule(d); } + } else if (name) { + // May just be an object definition for the module. Only + // worry about defining if have a module name. + resolve(name, d, factory); + } - //Do this after the cycle of callGetModule in case the result - //of those calls/init calls changes the registry. - mod = getOwn(registry, moduleName); + startTime = (new Date()).getTime(); - if (!found && !hasProp(defined, moduleName) && mod && !mod.inited) { - if (config.enforceDefine && (!shExports || !getGlobal(shExports))) { - if (hasPathFallback(moduleName)) { - return; - } else { - return onError(makeError('nodefine', - 'No define call for ' + moduleName, - null, - [moduleName])); - } - } else { - //A script that does not call define(), so just simulate - //the call for it. - callGetModule([moduleName, (shim.deps || []), shim.exportsFn]); - } - } + if (!name) { + check(d); + } - checkLoaded(); - }, + return d.promise; + }; - /** - * Converts a module name to a file path. Supports cases where - * moduleName may actually be just an URL. - * Note that it **does not** call normalize on the moduleName, - * it is assumed to have already been normalized. This is an - * internal API, not a public one. Use toUrl for the public API. - */ - nameToUrl: function (moduleName, ext, skipExt) { - var paths, syms, i, parentModule, url, - parentPath, bundleId, - pkgMain = getOwn(config.pkgs, moduleName); + req = makeRequire(null, true); - if (pkgMain) { - moduleName = pkgMain; + /* + * Just drops the config on the floor, but returns req in case + * the config return value is used. + */ + req.config = function (cfg) { + if (cfg.context && cfg.context !== contextName) { + var existingContext = getOwn(contexts, cfg.context); + if (existingContext) { + return existingContext.req.config(cfg); + } else { + return newContext(cfg.context).config(cfg); } + } - bundleId = getOwn(bundlesMap, moduleName); + // Since config changed, mapCache may not be valid any more. + mapCache = obj(); - if (bundleId) { - return context.nameToUrl(bundleId, ext, skipExt); + // Make sure the baseUrl ends in a slash. + if (cfg.baseUrl) { + if (cfg.baseUrl.charAt(cfg.baseUrl.length - 1) !== '/') { + cfg.baseUrl += '/'; } + } - //If a colon is in the URL, it indicates a protocol is used and it is just - //an URL to a file, or if it starts with a slash, contains a query arg (i.e. ?) - //or ends with .js, then assume the user meant to use an url and not a module id. - //The slash is important for protocol-less URLs as well as full paths. - if (req.jsExtRegExp.test(moduleName)) { - //Just a plain path, not module name lookup, so just return it. - //Add extension if it is included. This is a bit wonky, only non-.js things pass - //an extension, this method probably needs to be reworked. - url = moduleName + (ext || ''); - } else { - //A module that needs to be converted to a path. - paths = config.paths; - - syms = moduleName.split('/'); - //For each module name segment, see if there is a path - //registered for it. Start with most specific name - //and work up from it. - for (i = syms.length; i > 0; i -= 1) { - parentModule = syms.slice(0, i).join('/'); + // Convert old style urlArgs string to a function. + if (typeof cfg.urlArgs === 'string') { + var urlArgs = cfg.urlArgs; + cfg.urlArgs = function(id, url) { + return (url.indexOf('?') === -1 ? '?' : '&') + urlArgs; + }; + } - parentPath = getOwn(paths, parentModule); - if (parentPath) { - //If an array, it means there are a few choices, - //Choose the one that is desired - if (isArray(parentPath)) { - parentPath = parentPath[0]; - } - syms.splice(0, i, parentPath); - break; - } + // Save off the paths and packages since they require special processing, + // they are additive. + var shim = config.shim, + objs = { + paths: true, + bundles: true, + config: true, + map: true + }; + + eachProp(cfg, function (value, prop) { + if (objs[prop]) { + if (!config[prop]) { + config[prop] = {}; } - - //Join the path parts together, then figure out if baseUrl is needed. - url = syms.join('/'); - url += (ext || (/^data\:|\?/.test(url) || skipExt ? '' : '.js')); - url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url; - } - - return config.urlArgs ? url + - ((url.indexOf('?') === -1 ? '?' : '&') + - config.urlArgs) : url; - }, - - //Delegates to req.load. Broken out as a separate function to - //allow overriding in the optimizer. - load: function (id, url) { - req.load(context, id, url); - }, - - /** - * Executes a module callback function. Broken out as a separate function - * solely to allow the build system to sequence the files in the built - * layer in the right sequence. - * - * @private - */ - execCb: function (name, callback, args, exports) { - return callback.apply(exports, args); - }, - - /** - * callback for script loads, used to check status of loading. - * - * @param {Event} evt the event from the browser for the script - * that was loaded. - */ - onScriptLoad: function (evt) { - //Using currentTarget instead of target for Firefox 2.0's sake. Not - //all old browsers will be supported, but this one was easy enough - //to support and still makes sense. - if (evt.type === 'load' || - (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) { - //Reset interactive script so a script node is not held onto for - //to long. - interactiveScript = null; - - //Pull out the name of the module and the context. - var data = getScriptData(evt); - context.completeLoad(data.id); + mixin(config[prop], value, true, true); + } else { + config[prop] = value; } - }, + }); - /** - * Callback for script errors. - */ - onScriptError: function (evt) { - var data = getScriptData(evt); - if (!hasPathFallback(data.id)) { - return onError(makeError('scripterror', 'Script error for: ' + data.id, evt, [data.id])); - } + // Reverse map the bundles + if (cfg.bundles) { + eachProp(cfg.bundles, function (value, prop) { + value.forEach(function (v) { + if (v !== prop) { + bundlesMap[v] = prop; + } + }); + }); } - }; - - context.require = context.makeRequire(); - return context; - } - /** - * Main entry point. - * - * If the only argument to require is a string, then the module that - * is represented by that string is fetched for the appropriate context. - * - * If the first argument is an array, then it will be treated as an array - * of dependency string names to fetch. An optional function callback can - * be specified to execute when all of those dependencies are available. - * - * Make a local req variable to help Caja compliance (it assumes things - * on a require that are not standardized), and to give a short - * name for minification/local scope use. - */ - req = requirejs = function (deps, callback, errback, optional) { - - //Find the right context, use default - var context, config, - contextName = defContextName; - - // Determine if have config object in the call. - if (!isArray(deps) && typeof deps !== 'string') { - // deps is a config object - config = deps; - if (isArray(callback)) { - // Adjust args if there are dependencies - deps = callback; - callback = errback; - errback = optional; - } else { - deps = []; + // Merge shim + if (cfg.shim) { + eachProp(cfg.shim, function (value, id) { + // Normalize the structure + if (Array.isArray(value)) { + value = { + deps: value + }; + } + if ((value.exports || value.init) && !value.exportsFn) { + value.exportsFn = makeShimExports(value); + } + shim[id] = value; + }); + config.shim = shim; } - } - if (config && config.context) { - contextName = config.context; - } + // Adjust packages if necessary. + if (cfg.packages) { + cfg.packages.forEach(function (pkgObj) { + var location, name; - context = getOwn(contexts, contextName); - if (!context) { - context = contexts[contextName] = req.s.newContext(contextName); - } + pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj; - if (config) { - context.configure(config); - } - - return context.require(deps, callback, errback); - }; - - /** - * Support require.config() to make it easier to cooperate with other - * AMD loaders on globally agreed names. - */ - req.config = function (config) { - return req(config); - }; - - /** - * Execute something after the current tick - * of the event loop. Override for other envs - * that have a better solution than setTimeout. - * @param {Function} fn function to execute later. - */ - req.nextTick = typeof setTimeout !== 'undefined' ? function (fn) { - setTimeout(fn, 4); - } : function (fn) { fn(); }; - - /** - * Export require as a global, but only if it does not already exist. - */ - if (!require) { - require = req; - } - - req.version = version; - - //Used to filter out dependencies that are already paths. - req.jsExtRegExp = /^\/|:|\?|\.js$/; - req.isBrowser = isBrowser; - s = req.s = { - contexts: contexts, - newContext: newContext - }; - - //Create default context. - req({}); - - //Exports some context-sensitive methods on global require. - each([ - 'toUrl', - 'undef', - 'defined', - 'specified' - ], function (prop) { - //Reference from contexts instead of early binding to default context, - //so that during builds, the latest instance of the default context - //with its config gets used. - req[prop] = function () { - var ctx = contexts[defContextName]; - return ctx.require[prop].apply(ctx, arguments); - }; - }); - - if (isBrowser) { - head = s.head = document.getElementsByTagName('head')[0]; - //If BASE tag is in play, using appendChild is a problem for IE6. - //When that browser dies, this can be removed. Details in this jQuery bug: - //http://dev.jquery.com/ticket/2709 - baseElement = document.getElementsByTagName('base')[0]; - if (baseElement) { - head = s.head = baseElement.parentNode; - } - } - - /** - * Any errors that require explicitly generates will be passed to this - * function. Intercept/override it if you want custom error handling. - * @param {Error} err the error object. - */ - req.onError = defaultOnError; - - /** - * Creates the node for the load command. Only used in browser envs. - */ - req.createNode = function (config, moduleName, url) { - var node = config.xhtml ? - document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') : - document.createElement('script'); - node.type = config.scriptType || 'text/javascript'; - node.charset = 'utf-8'; - node.async = true; - return node; - }; + name = pkgObj.name; + location = pkgObj.location; + if (location) { + config.paths[name] = pkgObj.location; + } - /** - * Does the request to load a module for the browser case. - * Make this a separate function to allow other environments - * to override it. - * - * @param {Object} context the require context to find state. - * @param {String} moduleName the name of the module. - * @param {Object} url the URL to the module. - */ - req.load = function (context, moduleName, url) { - var config = (context && context.config) || {}, - node; - if (isBrowser) { - //In the browser so use a script tag - node = req.createNode(config, moduleName, url); - - node.setAttribute('data-requirecontext', context.contextName); - node.setAttribute('data-requiremodule', moduleName); - - //Set up load listener. Test attachEvent first because IE9 has - //a subtle issue in its addEventListener and script onload firings - //that do not match the behavior of all other browsers with - //addEventListener support, which fire the onload event for a - //script right after the script execution. See: - //https://connect.microsoft.com/IE/feedback/details/648057/script-onload-event-is-not-fired-immediately-after-script-execution - //UNFORTUNATELY Opera implements attachEvent but does not follow the script - //script execution mode. - if (node.attachEvent && - //Check if node.attachEvent is artificially added by custom script or - //natively supported by browser - //read https://github.com/jrburke/requirejs/issues/187 - //if we can NOT find [native code] then it must NOT natively supported. - //in IE8, node.attachEvent does not have toString() - //Note the test for "[native code" with no closing brace, see: - //https://github.com/jrburke/requirejs/issues/273 - !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) && - !isOpera) { - //Probably IE. IE (at least 6-8) do not fire - //script onload right after executing the script, so - //we cannot tie the anonymous define call to a name. - //However, IE reports the script as being in 'interactive' - //readyState at the time of the define call. - useInteractive = true; - - node.attachEvent('onreadystatechange', context.onScriptLoad); - //It would be great to add an error handler here to catch - //404s in IE9+. However, onreadystatechange will fire before - //the error handler, so that does not help. If addEventListener - //is used, then IE will fire error before load, but we cannot - //use that pathway given the connect.microsoft.com issue - //mentioned above about not doing the 'script execute, - //then fire the script load event listener before execute - //next script' that other browsers do. - //Best hope: IE10 fixes the issues, - //and then destroys all installs of IE 6-9. - //node.attachEvent('onerror', context.onScriptError); - } else { - node.addEventListener('load', context.onScriptLoad, false); - node.addEventListener('error', context.onScriptError, false); - } - node.src = url; - - //For some cache cases in IE 6-8, the script executes before the end - //of the appendChild execution, so to tie an anonymous define - //call to the module name (which is stored on the node), hold on - //to a reference to this node, but clear after the DOM insertion. - currentlyAddingScript = node; - if (baseElement) { - head.insertBefore(node, baseElement); - } else { - head.appendChild(node); + // Save pointer to main module ID for pkg name. + // Remove leading dot in main, so main paths are normalized, + // and remove any trailing .js, since different package + // envs have different conventions: some use a module name, + // some use a file name. + config.pkgs[name] = pkgObj.name + '/' + (pkgObj.main || 'main') + .replace(currDirRegExp, '') + .replace(jsSuffixRegExp, ''); + }); } - currentlyAddingScript = null; - return node; - } else if (isWebWorker) { - try { - //In a web worker, use importScripts. This is not a very - //efficient use of importScripts, importScripts will block until - //its script is downloaded and evaluated. However, if web workers - //are in play, the expectation that a build has been done so that - //only one script needs to be loaded anyway. This may need to be - //reevaluated if other use cases become common. - importScripts(url); - - //Account for anonymous modules - context.completeLoad(moduleName); - } catch (e) { - context.onError(makeError('importscripts', - 'importScripts failed for ' + - moduleName + ' at ' + url, - e, - [moduleName])); + // If a deps array or a config callback is specified, then call + // require with those args. This is useful when require is defined as a + // config object before require.js is loaded. + if (cfg.deps || cfg.callback) { + req(cfg.deps, cfg.callback); } - } - }; - function getInteractiveScript() { - if (interactiveScript && interactiveScript.readyState === 'interactive') { - return interactiveScript; - } + return req; + }; - eachReverse(scripts(), function (script) { - if (script.readyState === 'interactive') { - return (interactiveScript = script); - } - }); - return interactiveScript; - } + req.onError = function (err) { + throw err; + }; - //Look for a data-main script attribute, which could also adjust the baseUrl. - if (isBrowser && !cfg.skipDataMain) { - //Figure out baseUrl. Get it from the script tag with require.js in it. - eachReverse(scripts(), function (script) { - //Set the 'head' where we can append children by - //using the script's parent. - if (!head) { - head = script.parentNode; + context = { + id: contextName, + defined: defined, + waiting: waiting, + config: config, + deferreds: deferreds, + req: req, + execCb: function execCb(name, callback, args, exports) { + return callback.apply(exports, args); } + }; - //Look for a data-main attribute to set main script for the page - //to load. If it is there, the path to data main becomes the - //baseUrl, if it is not already set. - dataMain = script.getAttribute('data-main'); - if (dataMain) { - //Preserve dataMain in case it is a path (i.e. contains '?') - mainScript = dataMain; - - //Set final baseUrl if there is not already an explicit one. - if (!cfg.baseUrl) { - //Pull off the directory of data-main for use as the - //baseUrl. - src = mainScript.split('/'); - mainScript = src.pop(); - subPath = src.length ? src.join('/') + '/' : './'; - - cfg.baseUrl = subPath; - } - - //Strip off any trailing .js since mainScript is now - //like a module name. - mainScript = mainScript.replace(jsSuffixRegExp, ''); + contexts[contextName] = context; - //If mainScript is still a path, fall back to dataMain - if (req.jsExtRegExp.test(mainScript)) { - mainScript = dataMain; - } + return req; + } - //Put the data-main script in the files to load. - cfg.deps = cfg.deps ? cfg.deps.concat(mainScript) : [mainScript]; + requirejs = topReq = newContext('_'); - return true; - } - }); + if (typeof require !== 'function') { + require = topReq; + require.queue = queue; + require.newContext = newContext; } /** - * The function that handles definitions of modules. Differs from - * require() in that a string for the module should be the first argument, - * and the function to execute after dependencies are loaded should - * return a value to define the module corresponding to the first argument's - * name. + * Executes the text. Normally just uses eval, but can be modified + * to use a better, environment-specific call. Only used for transpiling + * loader plugins, not for plain JS modules. + * @param {String} text the text to execute/evaluate. */ - define = function (name, deps, callback) { - var node, context; - - //Allow for anonymous modules - if (typeof name !== 'string') { - //Adjust args appropriately - callback = deps; - deps = name; - name = null; - } - - //This module may not have dependencies - if (!isArray(deps)) { - callback = deps; - deps = null; - } - - //If no name, and callback is a function, then figure out if it a - //CommonJS thing with dependencies. - if (!deps && isFunction(callback)) { - deps = []; - //Remove comments from the callback string, - //look for require calls, and pull them into the dependencies, - //but only if there are function args. - if (callback.length) { - callback - .toString() - .replace(commentRegExp, '') - .replace(cjsRequireRegExp, function (match, dep) { - deps.push(dep); - }); - - //May be a CommonJS thing even without require calls, but still - //could use exports, and module. Avoid doing exports and module - //work though if it just needs require. - //REQUIRES the function to expect the CommonJS variables in the - //order listed below. - deps = (callback.length === 1 ? ['require'] : ['require', 'exports', 'module']).concat(deps); - } - } + topReq.exec = function (text) { + /*jslint evil: true */ + return eval(text); + }; - //If in IE 6-8 and hit an anonymous define() call, do the interactive - //work. - if (useInteractive) { - node = currentlyAddingScript || getInteractiveScript(); - if (node) { - if (!name) { - name = node.getAttribute('data-requiremodule'); - } - context = contexts[node.getAttribute('data-requirecontext')]; - } - } + topReq.contexts = contexts; - //Always save off evaluating the def call until the script onload handler. - //This allows multiple modules to be in a file without prematurely - //tracing dependencies, and allows for anonymous module support, - //where the module name is not known until the script onload event - //occurs. If no context, use the global queue, and get it processed - //in the onscript load callback. - (context ? context.defQueue : globalDefQueue).push([name, deps, callback]); + define = function () { + queue.push(slice.call(arguments, 0)); }; define.amd = { jQuery: true }; + if (bootstrapConfig) { + topReq.config(bootstrapConfig); + } - /** - * Executes the text. Normally just uses eval, but can be modified - * to use a better, environment-specific call. Only used for transpiling - * loader plugins, not for plain JS modules. - * @param {String} text the text to execute/evaluate. - */ - req.exec = function (text) { - /*jslint evil: true */ - return eval(text); - }; + // data-main support. + if (topReq.isBrowser && !contexts._.config.skipDataMain) { + dataMain = document.querySelectorAll('script[data-main]')[0]; + dataMain = dataMain && dataMain.getAttribute('data-main'); + if (dataMain) { + // Strip off any trailing .js since dataMain is now + // like a module name. + dataMain = dataMain.replace(jsSuffixRegExp, ''); + + // Set final baseUrl if there is not already an explicit one, + // but only do so if the data-main value is not a loader plugin + // module ID. + if ((!bootstrapConfig || !bootstrapConfig.baseUrl) && + dataMain.indexOf('!') === -1) { + // Pull off the directory of data-main for use as the + // baseUrl. + src = dataMain.split('/'); + dataMain = src.pop(); + subPath = src.length ? src.join('/') + '/' : './'; + + topReq.config({baseUrl: subPath}); + } - //Set up with config info. - req(cfg); -}(this)); \ No newline at end of file + topReq([dataMain]); + } + } +}(this, (typeof Promise !== 'undefined' ? Promise : undefined)));