This is an automated email from the ASF dual-hosted git repository. gcruz pushed a commit to branch gc/8476 in repository https://gitbox.apache.org/repos/asf/allura.git
commit c0734a04ee9741285690300c759ac39d9c9ebff6 Author: Guillermo Cruz <[email protected]> AuthorDate: Wed Nov 9 15:58:53 2022 -0700 [#8476] upgraded underscore 1.8.3 -> 1.13.6 --- Allura/LICENSE | 2 +- Allura/allura/public/nf/js/underscore-1.13.6.min.js | 6 ++++++ Allura/allura/public/nf/js/underscore-min.js | 5 ----- Allura/allura/templates/jinja_master/top_nav.html | 2 +- Allura/allura/templates_responsive/jinja_master/top_nav.html | 2 +- Brocfile.js | 2 +- LICENSE | 2 +- rat-excludes.txt | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Allura/LICENSE b/Allura/LICENSE index eee2efdc9..2dfdb4d3c 100644 --- a/Allura/LICENSE +++ b/Allura/LICENSE @@ -255,7 +255,7 @@ For details, see: allura/public/nf/js/react-reorderable.min.js Underscore, which is available under the MIT license. -For details, see allura/public/nf/js/underscore-min.js +For details, see allura/public/nf/js/underscore-1.13.6.min.js Babel's Polyfill, which is available under the MIT license. See https://babeljs.io/docs/usage/polyfill/ diff --git a/Allura/allura/public/nf/js/underscore-1.13.6.min.js b/Allura/allura/public/nf/js/underscore-1.13.6.min.js new file mode 100644 index 000000000..5310cb277 --- /dev/null +++ b/Allura/allura/public/nf/js/underscore-1.13.6.min.js @@ -0,0 +1,6 @@ +!function(n,r){"object"==typeof exports&&"undefined"!=typeof module?module.exports=r():"function"==typeof define&&define.amd?define("underscore",r):(n="undefined"!=typeof globalThis?globalThis:n||self,function(){var t=n._,e=n._=r();e.noConflict=function(){return n._=t,e}}())}(this,(function(){ +// Underscore.js 1.13.6 +// https://underscorejs.org +// (c) 2009-2022 Jeremy Ashkenas, Julian Gonggrijp, and DocumentCloud and Investigative Reporters & Editors +// Underscore may be freely distributed under the MIT license. +var n="1.13.6",r="object"==typeof self&&self.self===self&&self||"object"==typeof global&&global.global===global&&global||Function("return this")()||{},t=Array.prototype,e=Object.prototype,u="undefined"!=typeof Symbol?Symbol.prototype:null,o=t.push,i=t.slice,a=e.toString,f=e.hasOwnProperty,c="undefined"!=typeof ArrayBuffer,l="undefined"!=typeof DataView,s=Array.isArray,p=Object.keys,v=Object.create,h=c&&ArrayBuffer.isView,y=isNaN,d=isFinite,g=!{toString:null}.propertyIsEnumerable("toStrin [...] diff --git a/Allura/allura/public/nf/js/underscore-min.js b/Allura/allura/public/nf/js/underscore-min.js deleted file mode 100644 index 0ff175a0c..000000000 --- a/Allura/allura/public/nf/js/underscore-min.js +++ /dev/null @@ -1,5 +0,0 @@ -// Underscore.js 1.8.3 -// http://underscorejs.org -// (c) 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors -// Underscore may be freely distributed under the MIT license. -(function(){function n(n){function t(t,r,e,u,i,o){for(;i>=0&&o>i;i+=n){var a=u?u[i]:i;e=r(e,t[a],a,t)}return e}return function(r,e,u,i){e=b(e,i,4);var o=!k(r)&&m.keys(r),a=(o||r).length,c=n>0?0:a-1;return arguments.length<3&&(u=r[o?o[c]:c],c+=n),t(r,e,u,o,c,a)}}function t(n){return function(t,r,e){r=x(r,e);for(var u=O(t),i=n>0?0:u-1;i>=0&&u>i;i+=n)if(r(t[i],i,t))return i;return-1}}function r(n,t,r){return function(e,u,i){var o=0,a=O(e);if("number"==typeof i)n>0?o=i>=0?i:Math.max(i+a,o):a [...] \ No newline at end of file diff --git a/Allura/allura/templates/jinja_master/top_nav.html b/Allura/allura/templates/jinja_master/top_nav.html index 53923c1d5..e4cf131f1 100644 --- a/Allura/allura/templates/jinja_master/top_nav.html +++ b/Allura/allura/templates/jinja_master/top_nav.html @@ -44,7 +44,7 @@ </ul> </div> {% if h.has_access(c.project, 'admin')() %} - {% do g.register_forge_js('js/underscore-min.js') %} + {% do g.register_forge_js('js/underscore-1.13.6.min.js') %} {% do g.register_forge_js('js/browser-polyfill.min.js') %} {% do lib.register_react_js_files() %} {% do g.register_forge_js('js/react-drag.min.js') %} diff --git a/Allura/allura/templates_responsive/jinja_master/top_nav.html b/Allura/allura/templates_responsive/jinja_master/top_nav.html index 36e2f21ae..9a1a66042 100644 --- a/Allura/allura/templates_responsive/jinja_master/top_nav.html +++ b/Allura/allura/templates_responsive/jinja_master/top_nav.html @@ -44,7 +44,7 @@ </ul> </div> {% if h.has_access(c.project, 'admin')() %} - {% do g.register_forge_js('js/underscore-min.js') %} + {% do g.register_forge_js('js/underscore-1.13.6.min.js') %} {% do g.register_forge_js('js/browser-polyfill.min.js') %} {% do lib.register_react_js_files() %} {% do g.register_forge_js('js/react-drag.min.js') %} diff --git a/Brocfile.js b/Brocfile.js index 71c60f5a1..0eb9c3a49 100644 --- a/Brocfile.js +++ b/Brocfile.js @@ -42,7 +42,7 @@ tree = sourceMapConcat(tree, { var react_file = 'public/nf/js/react.' + (production ? 'production.min' : 'development') + '.js'; var react_dom_file = 'public/nf/js/react-dom.' + (production ? 'production.min' : 'development') + '.js'; var navbar = funnel('Allura/allura', { - include: ['public/nf/js/underscore-min.js', + include: ['public/nf/js/underscore-1.13.6.min.js', react_file, react_dom_file, 'public/nf/js/create-react-class.min.js', diff --git a/LICENSE b/LICENSE index 5cfacad1d..14bcf2fe4 100644 --- a/LICENSE +++ b/LICENSE @@ -260,7 +260,7 @@ For details, see: Allura/allura/public/nf/js/react-reorderable.min.js Underscore, which is available under the MIT license. -For details, see Allura/allura/public/nf/js/underscore-min.js +For details, see Allura/allura/public/nf/js/underscore-1.13.6.min.js Babel's Polyfill, which is available under the MIT license. See https://babeljs.io/docs/usage/polyfill/ diff --git a/rat-excludes.txt b/rat-excludes.txt index 7c702e624..f40a74386 100644 --- a/rat-excludes.txt +++ b/rat-excludes.txt @@ -61,7 +61,7 @@ Allura/allura/public/nf/js/react-reorderable.min.js Allura/allura/public/nf/js/sylvester.js Allura/allura/public/nf/js/Sortable.min.js Allura/allura/public/nf/js/twemoji.min.js -Allura/allura/public/nf/js/underscore-min.js +Allura/allura/public/nf/js/underscore-1.13.6.min.js Allura/allura/tests/data/test_mime/text_file.txt Allura/docs/make.bat Allura/docs/Makefile
