diff options
author | Andrew Dolgov <[email protected]> | 2017-01-21 21:59:17 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2017-01-21 21:59:17 +0300 |
commit | e2e2479984b3aaadb4c0947e5ec15276e5c9a337 (patch) | |
tree | 1662c1772cbcb6e44d017cea28e35d45de44921f /lib/dojo/dojo.profile.js | |
parent | ab235fc5f13385a690a1ed31ae77d0006c85197d (diff) | |
parent | 1c4f5e83900fdd71a84f2e142c694c75106bef53 (diff) |
Merge branch 'dojo-1.12.1'
Conflicts:
js/prefs.js
Diffstat (limited to 'lib/dojo/dojo.profile.js')
-rw-r--r-- | lib/dojo/dojo.profile.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/dojo/dojo.profile.js b/lib/dojo/dojo.profile.js index 4b24edb5e..7a2f24dbf 100644 --- a/lib/dojo/dojo.profile.js +++ b/lib/dojo/dojo.profile.js @@ -1,5 +1,6 @@ var profile = (function(){ - var testResourceRe = /^dojo\/tests\//, + var testResourceRe = /^dojo\/tests(?:DOH)?\//, + nodeModulesRe = /\/node_modules\//, copyOnly = function(filename, mid){ var list = { @@ -19,13 +20,14 @@ var profile = (function(){ /^dojo\/_base\/config\w+$/.test(mid) || (/^dojo\/resources\//.test(mid) && !/\.css$/.test(filename)) || /(png|jpg|jpeg|gif|tiff)$/.test(filename) || + nodeModulesRe.test(mid) || /built\-i18n\-test\/152\-build/.test(mid); }; return { resourceTags:{ test: function(filename, mid){ - return testResourceRe.test(mid) || mid=="dojo/tests" || mid=="dojo/robot" || mid=="dojo/robotx"; + return testResourceRe.test(mid) || mid=="dojo/robot" || mid=="dojo/robotx"; }, copyOnly: function(filename, mid){ @@ -34,6 +36,10 @@ var profile = (function(){ amd: function(filename, mid){ return !testResourceRe.test(mid) && !copyOnly(filename, mid) && /\.js$/.test(filename); + }, + + miniExclude: function(filename, mid){ + return nodeModulesRe.test(mid); } } }; |