diff --git a/build/change-version.js b/build/change-version.js index d7627dde31281df0192ac9e5431135871f9a7418..d0e3c12f2ea14a1857fb50aa16c93e2b95c311a5 100755 --- a/build/change-version.js +++ b/build/change-version.js @@ -17,11 +17,11 @@ sh.config.fatal = true // Blame TC39... https://github.com/benjamingr/RegExp.escape/issues/37 function regExpQuote(string) { - return string.replace(/[-\\^$*+?.()|[\]{}]/g, '\\$&') + return string.replace(/[$()*+-.?[\\\]^{|}]/g, '\\$&') } function regExpQuoteReplacement(string) { - return string.replace(/[$]/g, '$$') + return string.replace(/\$/g, '$$') } const DRY_RUN = false diff --git a/js/src/util/sanitizer.js b/js/src/util/sanitizer.js index a85bc5f91d0edc244956b888342bbbfdfed32bae..4ced77606736aa1118cc5d1ede1c63c0e2541b9d 100644 --- a/js/src/util/sanitizer.js +++ b/js/src/util/sanitizer.js @@ -25,14 +25,14 @@ const ARIA_ATTRIBUTE_PATTERN = /^aria-[\w-]*$/i * * Shoutout to Angular 7 https://github.com/angular/angular/blob/7.2.4/packages/core/src/sanitization/url_sanitizer.ts */ -const SAFE_URL_PATTERN = /^(?:(?:https?|mailto|ftp|tel|file):|[^&:/?#]*(?:[/?#]|$))/gi +const SAFE_URL_PATTERN = /^(?:(?:https?|mailto|ftp|tel|file):|[^#&/:?]*(?:[#/?]|$))/gi /** * A pattern that matches safe data URLs. Only matches image, video and audio types. * * Shoutout to Angular 7 https://github.com/angular/angular/blob/7.2.4/packages/core/src/sanitization/url_sanitizer.ts */ -const DATA_URL_PATTERN = /^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[a-z0-9+/]+=*$/i +const DATA_URL_PATTERN = /^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[\d+/a-z]+=*$/i const allowedAttribute = (attr, allowedAttributeList) => { const attrName = attr.nodeName.toLowerCase() diff --git a/package-lock.json b/package-lock.json index 10baa873dc1226de7b50e390530f89f2cf1e442d..88a2950d1e50a6bfaeeff03878fe03798e36944f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3955,9 +3955,9 @@ } }, "eslint-plugin-unicorn": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-13.0.0.tgz", - "integrity": "sha512-9CQk0v74vQpETMt6iqNgjf3IbWEFhrT0sjaLnjkl9SF3rJH6ZL9f7H42BXJ6LPENQR97QzhrIvB8VG0nD05wxQ==", + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-14.0.1.tgz", + "integrity": "sha512-mTyH4s5ogCE8gaVSNPF14hpSuMfW+bGW+Hg8wNzFPpOJeRHWtdeCFmjz+9nZW4VJQ7gtWfa5KMFF7gKj9KcfAg==", "dev": true, "requires": { "ci-info": "^2.0.0", @@ -3972,6 +3972,7 @@ "lodash.topairs": "^4.3.0", "lodash.upperfirst": "^4.3.1", "read-pkg-up": "^7.0.0", + "regexp-tree": "^0.1.16", "regexpp": "^3.0.0", "reserved-words": "^0.1.2", "safe-regex": "^2.1.1", diff --git a/package.json b/package.json index 222377e0705cc80a86a8e39cfaddd59936b8e690..c4120e52ef02f159fabaafd1cf887a464f060303 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "eslint": "^6.7.2", "eslint-config-xo": "^0.27.2", "eslint-plugin-import": "^2.18.2", - "eslint-plugin-unicorn": "^13.0.0", + "eslint-plugin-unicorn": "^14.0.1", "find-unused-sass-variables": "^1.0.3", "glob": "^7.1.6", "hammer-simulator": "0.0.1", diff --git a/site/assets/js/application.js b/site/assets/js/application.js index ce3a3d96b376955bedc3deb04e1aae9f3d75be6e..b698dce74fa36f1f1f45901356ac6358e8cae2b5 100644 --- a/site/assets/js/application.js +++ b/site/assets/js/application.js @@ -152,7 +152,7 @@ }) clipboard.on('error', function (e) { - var modifierKey = /Mac/i.test(navigator.userAgent) ? '\u2318' : 'Ctrl-' + var modifierKey = /mac/i.test(navigator.userAgent) ? '\u2318' : 'Ctrl-' var fallbackMsg = 'Press ' + modifierKey + 'C to copy' var tooltipBtn = bootstrap.Tooltip.getInstance(e.trigger)