|
@@ -39,12 +39,14 @@ module.exports = function (varName, config) {
|
|
if (functionVariables) functionVariables += ',';
|
|
if (functionVariables) functionVariables += ',';
|
|
functionVariables += dep.name;
|
|
functionVariables += dep.name;
|
|
dependenciesDefinition += `
|
|
dependenciesDefinition += `
|
|
- var ${dep.name} = root.${dep.name};
|
|
|
|
|
|
+ var ${dep.name};
|
|
if(!${dep.name}) {
|
|
if(!${dep.name}) {
|
|
if(typeof exports === 'object') {
|
|
if(typeof exports === 'object') {
|
|
${dep.optional ? ' try { ' : ''} ${dep.name} = require("${dep.module}"); ${dep.optional ? ' } catch(e) {} ' : ''}
|
|
${dep.optional ? ' try { ' : ''} ${dep.name} = require("${dep.module}"); ${dep.optional ? ' } catch(e) {} ' : ''}
|
|
} else if(typeof define === 'function' && define.amd) {
|
|
} else if(typeof define === 'function' && define.amd) {
|
|
${dep.optional ? ' if(require.defined && require.defined("' + dep.module + '"))' : ''} amdDependencies.push("${dep.module}");
|
|
${dep.optional ? ' if(require.defined && require.defined("' + dep.module + '"))' : ''} amdDependencies.push("${dep.module}");
|
|
|
|
+ } else {
|
|
|
|
+ ${dep.name} = root.${dep.name}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
`
|
|
`
|