Unverified Commit 17d8fba5 authored by XhmikosR's avatar XhmikosR Committed by GitHub
Browse files

Update devDependencies (#32852)

Pin karma and linkinator due to failures
4 merge requests!36532My v4 dev,!34086v4: Fix prevented show event disables modals with fade class from being displayed again,!33729V4 dev,!33086V4 dev
Showing with 197 additions and 174 deletions
+197 -174
...@@ -34,25 +34,24 @@ ...@@ -34,25 +34,24 @@
"error", "error",
"always" "always"
], ],
"prefer-named-capture-group": "off",
"semi": [ "semi": [
"error", "error",
"never" "never"
], ],
"unicorn/consistent-function-scoping": "off", "unicorn/consistent-function-scoping": "off",
"unicorn/explicit-length-check": "off", "unicorn/explicit-length-check": "off",
"unicorn/import-index": "off",
"unicorn/no-array-callback-reference": "off", "unicorn/no-array-callback-reference": "off",
"unicorn/no-array-for-each": "off",
"unicorn/no-for-loop": "off", "unicorn/no-for-loop": "off",
"unicorn/no-null": "off", "unicorn/no-null": "off",
"unicorn/no-unused-properties": "error", "unicorn/no-unused-properties": "error",
"unicorn/no-useless-undefined": "off", "unicorn/no-useless-undefined": "off",
"unicorn/prefer-array-find": "off", "unicorn/prefer-array-find": "off",
"unicorn/prefer-dom-node-append": "off",
"unicorn/prefer-dom-node-dataset": "off", "unicorn/prefer-dom-node-dataset": "off",
"unicorn/prefer-dom-node-remove": "off",
"unicorn/prefer-includes": "off", "unicorn/prefer-includes": "off",
"unicorn/prefer-math-trunc": "off", "unicorn/prefer-math-trunc": "off",
"unicorn/prefer-dom-node-append": "off",
"unicorn/prefer-dom-node-remove": "off",
"unicorn/prefer-number-properties": "off", "unicorn/prefer-number-properties": "off",
"unicorn/prefer-optional-catch-binding": "off", "unicorn/prefer-optional-catch-binding": "off",
"unicorn/prefer-query-selector": "off", "unicorn/prefer-query-selector": "off",
......
...@@ -71,7 +71,7 @@ function allowedAttribute(attr, allowedAttributeList) { ...@@ -71,7 +71,7 @@ function allowedAttribute(attr, allowedAttributeList) {
if (allowedAttributeList.indexOf(attrName) !== -1) { if (allowedAttributeList.indexOf(attrName) !== -1) {
if (uriAttrs.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 return true
...@@ -81,7 +81,7 @@ function allowedAttribute(attr, allowedAttributeList) { ...@@ -81,7 +81,7 @@ function allowedAttribute(attr, allowedAttributeList) {
// Check if a regular expression validates the attribute. // Check if a regular expression validates the attribute.
for (let i = 0, len = regExp.length; i < len; i++) { for (let i = 0, len = regExp.length; i < len; i++) {
if (attrName.match(regExp[i])) { if (regExp[i].test(attrName)) {
return true return true
} }
} }
...@@ -114,6 +114,7 @@ export function sanitizeHtml(unsafeHtml, whiteList, sanitizeFn) { ...@@ -114,6 +114,7 @@ export function sanitizeHtml(unsafeHtml, whiteList, sanitizeFn) {
} }
const attributeList = [].slice.call(el.attributes) const attributeList = [].slice.call(el.attributes)
// eslint-disable-next-line unicorn/prefer-spread
const whitelistedAttributes = [].concat(whiteList['*'] || [], whiteList[elName] || []) const whitelistedAttributes = [].concat(whiteList['*'] || [], whiteList[elName] || [])
attributeList.forEach(attr => { attributeList.forEach(attr => {
......
...@@ -77,10 +77,9 @@ if (BUNDLE) { ...@@ -77,10 +77,9 @@ if (BUNDLE) {
) )
conf.customLaunchers = customLaunchers conf.customLaunchers = customLaunchers
conf.detectBrowsers = detectBrowsers conf.detectBrowsers = detectBrowsers
files = files.concat([ files = [...files,
JQUERY_FILE, JQUERY_FILE,
'dist/js/bootstrap.js' 'dist/js/bootstrap.js']
])
} else if (BROWSERSTACK) { } else if (BROWSERSTACK) {
conf.hostname = ip.address() conf.hostname = ip.address()
conf.browserStack = { conf.browserStack = {
...@@ -94,13 +93,12 @@ if (BUNDLE) { ...@@ -94,13 +93,12 @@ if (BUNDLE) {
conf.customLaunchers = browsers conf.customLaunchers = browsers
conf.browsers = browsersKeys conf.browsers = browsersKeys
reporters.push('BrowserStack') reporters.push('BrowserStack')
files = files.concat([ files = [...files,
'node_modules/jquery/dist/jquery.slim.min.js', 'node_modules/jquery/dist/jquery.slim.min.js',
'js/dist/util.js', 'js/dist/util.js',
'js/dist/tooltip.js', 'js/dist/tooltip.js',
// include all of our js/dist files except util.js, index.js and 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 { } else {
frameworks.push('detectBrowsers') frameworks.push('detectBrowsers')
plugins.push( plugins.push(
...@@ -108,13 +106,12 @@ if (BUNDLE) { ...@@ -108,13 +106,12 @@ if (BUNDLE) {
'karma-firefox-launcher', 'karma-firefox-launcher',
'karma-detect-browsers' 'karma-detect-browsers'
) )
files = files.concat([ files = [...files,
JQUERY_FILE, JQUERY_FILE,
'js/coverage/dist/util.js', 'js/coverage/dist/util.js',
'js/coverage/dist/tooltip.js', 'js/coverage/dist/tooltip.js',
// include all of our js/dist files except util.js, index.js and 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.customLaunchers = customLaunchers
conf.detectBrowsers = detectBrowsers conf.detectBrowsers = detectBrowsers
if (!USE_OLD_JQUERY) { if (!USE_OLD_JQUERY) {
......
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
"no-var": "off", "no-var": "off",
"object-shorthand": "off", "object-shorthand": "off",
"prefer-arrow-callback": "off", "prefer-arrow-callback": "off",
"prefer-rest-params": "off",
"prefer-template": "off", "prefer-template": "off",
"prefer-rest-params": "off" "unicorn/prefer-spread": "off"
} }
} }
This diff is collapsed.
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
"docs-serve": "hugo server --port 9001 --disableFastRender", "docs-serve": "hugo server --port 9001 --disableFastRender",
"docs-serve-only": "npx sirv-cli _gh_pages --port 9001", "docs-serve-only": "npx sirv-cli _gh_pages --port 9001",
"lockfile-lint": "lockfile-lint --allowed-hosts npm --allowed-schemes https: --empty-hostname false --type npm --path package-lock.json", "lockfile-lint": "lockfile-lint --allowed-hosts npm --allowed-schemes https: --empty-hostname false --type npm --path package-lock.json",
"update-deps": "ncu -u -x \"jquery,karma-browserstack-launcher,sinon,terser\" && npm update && echo Manually update site/assets/js/vendor", "update-deps": "ncu -u -x \"jquery,karma,karma-browserstack-launcher,linkinator,sinon,terser\" && npm update && echo Manually update site/assets/js/vendor",
"release": "npm-run-all dist release-sri docs-build release-zip*", "release": "npm-run-all dist release-sri docs-build release-zip*",
"release-sri": "node build/generate-sri.js", "release-sri": "node build/generate-sri.js",
"release-version": "node build/change-version.js", "release-version": "node build/change-version.js",
...@@ -99,16 +99,16 @@ ...@@ -99,16 +99,16 @@
"@babel/preset-env": "^7.12.11", "@babel/preset-env": "^7.12.11",
"@rollup/plugin-babel": "^5.2.2", "@rollup/plugin-babel": "^5.2.2",
"@rollup/plugin-commonjs": "^17.0.0", "@rollup/plugin-commonjs": "^17.0.0",
"@rollup/plugin-node-resolve": "^11.0.1", "@rollup/plugin-node-resolve": "^11.1.0",
"autoprefixer": "^10.2.1", "autoprefixer": "^10.2.3",
"babel-plugin-istanbul": "^6.0.0", "babel-plugin-istanbul": "^6.0.0",
"bundlewatch": "^0.3.1", "bundlewatch": "^0.3.2",
"clean-css-cli": "^4.3.0", "clean-css-cli": "^4.3.0",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"eslint": "^7.17.0", "eslint": "^7.18.0",
"eslint-config-xo": "^0.34.0", "eslint-config-xo": "^0.34.0",
"eslint-plugin-import": "^2.22.1", "eslint-plugin-import": "^2.22.1",
"eslint-plugin-unicorn": "^25.0.1", "eslint-plugin-unicorn": "^27.0.0",
"find-unused-sass-variables": "^3.1.0", "find-unused-sass-variables": "^3.1.0",
"glob": "^7.1.6", "glob": "^7.1.6",
"hammer-simulator": "0.0.1", "hammer-simulator": "0.0.1",
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
"karma-firefox-launcher": "^2.1.0", "karma-firefox-launcher": "^2.1.0",
"karma-qunit": "^4.1.1", "karma-qunit": "^4.1.1",
"karma-sinon": "^1.0.5", "karma-sinon": "^1.0.5",
"linkinator": "^2.11.2", "linkinator": "2.11.2",
"lockfile-lint": "^4.3.7", "lockfile-lint": "^4.3.7",
"node-sass": "^5.0.0", "node-sass": "^5.0.0",
"nodemon": "^2.0.7", "nodemon": "^2.0.7",
...@@ -132,10 +132,10 @@ ...@@ -132,10 +132,10 @@
"postcss": "^8.2.4", "postcss": "^8.2.4",
"postcss-cli": "^8.3.1", "postcss-cli": "^8.3.1",
"qunit": "^2.14.0", "qunit": "^2.14.0",
"rollup": "^2.36.1", "rollup": "^2.38.0",
"shelljs": "^0.8.4", "shelljs": "^0.8.4",
"sinon": "^7.5.0", "sinon": "^7.5.0",
"stylelint": "^13.8.0", "stylelint": "^13.9.0",
"stylelint-config-twbs-bootstrap": "^2.1.0", "stylelint-config-twbs-bootstrap": "^2.1.0",
"terser": "5.1.0", "terser": "5.1.0",
"vnu-jar": "20.6.30" "vnu-jar": "20.6.30"
......
...@@ -35,10 +35,10 @@ ...@@ -35,10 +35,10 @@
"unicorn/no-for-loop": "off", "unicorn/no-for-loop": "off",
"unicorn/no-null": "off", "unicorn/no-null": "off",
"unicorn/prefer-array-find": "off", "unicorn/prefer-array-find": "off",
"unicorn/prefer-dom-node-append": "off",
"unicorn/prefer-dom-node-dataset": "off", "unicorn/prefer-dom-node-dataset": "off",
"unicorn/prefer-includes": "off", "unicorn/prefer-includes": "off",
"unicorn/prefer-number-properties": "off", "unicorn/prefer-number-properties": "off",
"unicorn/prefer-dom-node-append": "off",
"unicorn/prefer-query-selector": "off", "unicorn/prefer-query-selector": "off",
"unicorn/prevent-abbreviations": "off" "unicorn/prevent-abbreviations": "off"
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment