RANGER-4877 : Upgrade requireJS to 2.3.6 to 2.3.7.
diff --git a/security-admin/src/main/webapp/libs/bower/requirejs/js/require.js b/security-admin/src/main/webapp/libs/bower/requirejs/js/require.js index 6625738..646f8ac 100644 --- a/security-admin/src/main/webapp/libs/bower/requirejs/js/require.js +++ b/security-admin/src/main/webapp/libs/bower/requirejs/js/require.js
@@ -1,6 +1,5 @@ - /** vim: et:ts=4:sw=4:sts=4 - * @license RequireJS 2.3.6 Copyright jQuery Foundation and other contributors. + * @license RequireJS 2.3.7 Copyright jQuery Foundation and other contributors. * Released under MIT license, https://github.com/requirejs/requirejs/blob/master/LICENSE */ //Not using strict: uneven strict support in browsers, #392, and causes @@ -12,7 +11,7 @@ (function (global, setTimeout) { var req, s, head, baseElement, dataMain, src, interactiveScript, currentlyAddingScript, mainScript, subPath, - version = '2.3.6', + version = '2.3.7', commentRegExp = /\/\*[\s\S]*?\*\/|([^:"'=]|^)\/\/.*$/mg, cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g, jsSuffixRegExp = /\.js$/, @@ -34,7 +33,8 @@ contexts = {}, cfg = {}, globalDefQueue = [], - useInteractive = false; + useInteractive = false, + disallowedProps = ['__proto__', 'constructor']; //Could match something like ')//comment', do not lose the prefix to comment. function commentReplace(match, singlePrefix) { @@ -95,7 +95,7 @@ function eachProp(obj, func) { var prop; for (prop in obj) { - if (hasProp(obj, prop)) { + if (hasProp(obj, prop) && disallowedProps.indexOf(prop) == -1) { if (func(obj[prop], prop)) { break; }
diff --git a/security-admin/src/main/webapp/package-lock.json b/security-admin/src/main/webapp/package-lock.json index f7a7283..8c5fb3a 100644 --- a/security-admin/src/main/webapp/package-lock.json +++ b/security-admin/src/main/webapp/package-lock.json
@@ -1,13 +1,35 @@ { "name": "security-admin", "version": "2.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "security-admin", + "version": "2.0.0", + "devDependencies": { + "requirejs": "^2.3.7" + } + }, + "node_modules/requirejs": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.7.tgz", + "integrity": "sha512-DouTG8T1WanGok6Qjg2SXuCMzszOo0eHeH9hDZ5Y4x8Je+9JB38HdTLT4/VA8OaUhBa0JPVHJ0pyBkM1z+pDsw==", + "dev": true, + "bin": { + "r_js": "bin/r.js", + "r.js": "bin/r.js" + }, + "engines": { + "node": ">=0.4.0" + } + } + }, "dependencies": { "requirejs": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz", - "integrity": "sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.7.tgz", + "integrity": "sha512-DouTG8T1WanGok6Qjg2SXuCMzszOo0eHeH9hDZ5Y4x8Je+9JB38HdTLT4/VA8OaUhBa0JPVHJ0pyBkM1z+pDsw==", "dev": true } }
diff --git a/security-admin/src/main/webapp/package.json b/security-admin/src/main/webapp/package.json index 9f22744..d3db304 100644 --- a/security-admin/src/main/webapp/package.json +++ b/security-admin/src/main/webapp/package.json
@@ -5,6 +5,6 @@ "r.js": "r.js" }, "devDependencies": { - "requirejs": "^2.3.6" + "requirejs": "^2.3.7" } }