diff options
| author | XhmikosR <[email protected]> | 2021-01-27 18:37:18 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-01-27 18:37:18 +0200 |
| commit | 17d8fba548909db2ce358ddfeaaab292cacc0874 (patch) | |
| tree | 65983905058ba6f91952fbe0e5947cfbf3fdff4e /js | |
| parent | 6ffb0b48e455430f8a5359ed689ad64c1143fac2 (diff) | |
| download | bootstrap-17d8fba548909db2ce358ddfeaaab292cacc0874.tar.xz bootstrap-17d8fba548909db2ce358ddfeaaab292cacc0874.zip | |
Update devDependencies (#32852)
Pin karma and linkinator due to failures
Diffstat (limited to 'js')
| -rw-r--r-- | js/src/tools/sanitizer.js | 5 | ||||
| -rw-r--r-- | js/tests/karma.conf.js | 15 | ||||
| -rw-r--r-- | js/tests/unit/.eslintrc.json | 3 |
3 files changed, 11 insertions, 12 deletions
diff --git a/js/src/tools/sanitizer.js b/js/src/tools/sanitizer.js index 45fd6106c..3878a4365 100644 --- a/js/src/tools/sanitizer.js +++ b/js/src/tools/sanitizer.js @@ -71,7 +71,7 @@ function allowedAttribute(attr, allowedAttributeList) { if (allowedAttributeList.indexOf(attrName) !== -1) { if (uriAttrs.indexOf(attrName) !== -1) { - return Boolean(attr.nodeValue.match(SAFE_URL_PATTERN) || attr.nodeValue.match(DATA_URL_PATTERN)) + return Boolean(SAFE_URL_PATTERN.test(attr.nodeValue) || DATA_URL_PATTERN.test(attr.nodeValue)) } return true @@ -81,7 +81,7 @@ function allowedAttribute(attr, allowedAttributeList) { // Check if a regular expression validates the attribute. for (let i = 0, len = regExp.length; i < len; i++) { - if (attrName.match(regExp[i])) { + if (regExp[i].test(attrName)) { return true } } @@ -114,6 +114,7 @@ export function sanitizeHtml(unsafeHtml, whiteList, sanitizeFn) { } const attributeList = [].slice.call(el.attributes) + // eslint-disable-next-line unicorn/prefer-spread const whitelistedAttributes = [].concat(whiteList['*'] || [], whiteList[elName] || []) attributeList.forEach(attr => { diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js index c87911736..255d64154 100644 --- a/js/tests/karma.conf.js +++ b/js/tests/karma.conf.js @@ -77,10 +77,9 @@ if (BUNDLE) { ) conf.customLaunchers = customLaunchers conf.detectBrowsers = detectBrowsers - files = files.concat([ + files = [...files, JQUERY_FILE, - 'dist/js/bootstrap.js' - ]) + 'dist/js/bootstrap.js'] } else if (BROWSERSTACK) { conf.hostname = ip.address() conf.browserStack = { @@ -94,13 +93,12 @@ if (BUNDLE) { conf.customLaunchers = browsers conf.browsers = browsersKeys reporters.push('BrowserStack') - files = files.concat([ + files = [...files, 'node_modules/jquery/dist/jquery.slim.min.js', 'js/dist/util.js', 'js/dist/tooltip.js', // include all of our js/dist files except util.js, index.js and tooltip.js - 'js/dist/!(util|index|tooltip).js' - ]) + 'js/dist/!(util|index|tooltip).js'] } else { frameworks.push('detectBrowsers') plugins.push( @@ -108,13 +106,12 @@ if (BUNDLE) { 'karma-firefox-launcher', 'karma-detect-browsers' ) - files = files.concat([ + files = [...files, JQUERY_FILE, 'js/coverage/dist/util.js', 'js/coverage/dist/tooltip.js', // include all of our js/dist files except util.js, index.js and tooltip.js - 'js/coverage/dist/!(util|index|tooltip).js' - ]) + 'js/coverage/dist/!(util|index|tooltip).js'] conf.customLaunchers = customLaunchers conf.detectBrowsers = detectBrowsers if (!USE_OLD_JQUERY) { diff --git a/js/tests/unit/.eslintrc.json b/js/tests/unit/.eslintrc.json index 8782d64c7..2461403d9 100644 --- a/js/tests/unit/.eslintrc.json +++ b/js/tests/unit/.eslintrc.json @@ -25,7 +25,8 @@ "no-var": "off", "object-shorthand": "off", "prefer-arrow-callback": "off", + "prefer-rest-params": "off", "prefer-template": "off", - "prefer-rest-params": "off" + "unicorn/prefer-spread": "off" } } |
