Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-08 02:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update vendor/requirejs and fix AMD dependencies to avoid circular dependency issues.

Browse Source 
Former-commit-id: 4af19b824f7018d7e3473ba7fe98584b5d6949c5
This commit is contained in:
John-David Dalton
2013-07-16 22:33:10 -07:00
parent fab0b91a79
commit a17c32bed0
3 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
build.js
View File

@@ -832,10 +832,11 @@
};
var getDepPath = function(dep, fromPath) {
fromPath || (fromPath = '');
if (dep == 'require') {
return dep;
}
var toPath = getPath(dep),
relative = path.relative(fromPath, toPath).replace(RegExp(path.sepEscaped, 'g'), sep);
relative = path.relative(fromPath || '', toPath).replace(RegExp(path.sepEscaped, 'g'), sep);
if (relative.charAt(0) != '.') {
relative = '.' + (relative ? sep + relative : '');
@@ -857,19 +858,26 @@
// create modules for each identifier
identifiers.forEach(function(identifier) {
var circDeps = circularDependencyMap[identifier];
var circDeps = circularDependencyMap[identifier],
modulePath = getPath(identifier),
iife = [];
var deps = _.difference(
getDependencies(identifier, true)
.concat(propDependencyMap[identifier] || [])
.concat(varDependencyMap[identifier] || [])
.concat(propDependencyMap[identifier] || arrayRef)
.concat(varDependencyMap[identifier] || arrayRef)
, circDeps)
.sort();
var modulePath = getPath(identifier),
depArgs = deps.join(', '),
depPaths = '[' + (deps.length ? "'" + getDepPaths(deps, modulePath).join("', '") + "'" : '') + '], ',
iife = [];
if (circDeps) {
deps.unshift('require');
}
var depArgs = deps.join(', ');
if (circDeps) {
push.apply(deps, circDeps);
}
var depPaths = '[' + (deps.length ? "'" + getDepPaths(deps, modulePath).join("', '") + "'" : '') + '], ';
if (isAMD) {
iife.push(