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/dijit/dijit.profile.js | |
| parent | ab235fc5f13385a690a1ed31ae77d0006c85197d (diff) | |
| parent | 1c4f5e83900fdd71a84f2e142c694c75106bef53 (diff) | |
Merge branch 'dojo-1.12.1'
Conflicts:
js/prefs.js
Diffstat (limited to 'lib/dijit/dijit.profile.js')
| -rw-r--r-- | lib/dijit/dijit.profile.js | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/dijit/dijit.profile.js b/lib/dijit/dijit.profile.js index 5a75a6aca..bdebb299c 100644 --- a/lib/dijit/dijit.profile.js +++ b/lib/dijit/dijit.profile.js @@ -1,5 +1,6 @@ var profile = (function(){ var testResourceRe = /^dijit\/tests\//, + nodeModulesRe = /\/node_modules\//, copyOnly = function(filename, mid){ var list = { @@ -7,7 +8,10 @@ var profile = (function(){ "dijit/package.json":1, "dijit/themes/claro/compile":1 }; - return (mid in list) || (/^dijit\/resources\//.test(mid) && !/\.css$/.test(filename)) || /(png|jpg|jpeg|gif|tiff)$/.test(filename); + return (mid in list) || + (/^dijit\/resources\//.test(mid) && !/\.css$/.test(filename)) || + /(png|jpg|jpeg|gif|tiff)$/.test(filename) || + nodeModulesRe.test(mid); }; return { @@ -25,11 +29,10 @@ var profile = (function(){ }, miniExclude: function(filename, mid){ - return /^dijit\/bench\//.test(mid) || /^dijit\/themes\/themeTest/.test(mid); + return /^dijit\/bench\//.test(mid) || + /^dijit\/themes\/themeTest/.test(mid) || + nodeModulesRe.test(mid); } } }; })(); - - - |