Browse Source

[NO JIRA] Bump glob-promise, jsdom, drop @types/sanitize-html

tags/9.5.0.56709
Mathieu Suen 2 years ago
parent
commit
b574e0fd48

+ 1
- 1
server/sonar-docs/package.json View File

@@ -51,7 +51,7 @@
"eslint-plugin-react": "7.29.4",
"eslint-plugin-react-hooks": "4.4.0",
"fs-extra": "7.0.1",
"glob-promise": "3.4.0",
"glob-promise": "4.2.2",
"jest": "27.5.1",
"jest-fetch-mock": "2.1.2",
"prettier": "1.19.1",

+ 17
- 7
server/sonar-docs/yarn.lock View File

@@ -2896,6 +2896,16 @@ __metadata:
languageName: node
linkType: hard

"@types/glob@npm:^7.1.3":
version: 7.2.0
resolution: "@types/glob@npm:7.2.0"
dependencies:
"@types/minimatch": "*"
"@types/node": "*"
checksum: 6ae717fedfdfdad25f3d5a568323926c64f52ef35897bcac8aca8e19bc50c0bd84630bbd063e5d52078b2137d8e7d3c26eabebd1a2f03ff350fff8a91e79fc19
languageName: node
linkType: hard

"@types/graceful-fs@npm:^4.1.2":
version: 4.1.5
resolution: "@types/graceful-fs@npm:4.1.5"
@@ -10131,14 +10141,14 @@ fsevents@~2.1.2:
languageName: node
linkType: hard

"glob-promise@npm:3.4.0":
version: 3.4.0
resolution: "glob-promise@npm:3.4.0"
"glob-promise@npm:4.2.2":
version: 4.2.2
resolution: "glob-promise@npm:4.2.2"
dependencies:
"@types/glob": "*"
"@types/glob": ^7.1.3
peerDependencies:
glob: "*"
checksum: 84a2c076e7581c9f8aa7a8a151ad5f9352c4118ba03c5673ecfcf540f4c53aa75f8d32fe493c2286d471dccd7a75932b9bfe97bf782564c1f4a50b9c7954e3b6
glob: ^7.1.6
checksum: c1a3d95f7c8393e4151d4899ec4e42bb2e8237160f840ad1eccbe9247407da8b6c13e28f463022e011708bc40862db87b9b77236d35afa3feb8aa86d518f2dfe
languageName: node
linkType: hard

@@ -19001,7 +19011,7 @@ fsevents@~2.1.2:
gatsby-remark-custom-blocks: 2.1.27
gatsby-source-filesystem: 2.1.57
gatsby-transformer-remark: 2.6.59
glob-promise: 3.4.0
glob-promise: 4.2.2
hast-util-select: 4.0.0
jest: 27.5.1
jest-fetch-mock: 2.1.2

+ 0
- 57
server/sonar-web/config/documentation-loader/index.js View File

@@ -1,57 +0,0 @@
/*
* SonarQube
* Copyright (C) 2009-2022 SonarSource SA
* mailto:info AT sonarsource DOT com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
const fs = require('fs');
const path = require('path');
const glob = require('glob-promise');

module.exports = function(source) {
this.cacheable();

const failure = this.async();
const success = failure.bind(null, null);

const config = this.exec(source, this.resourcePath);
const root = path.resolve(path.dirname(this.resourcePath), config.root);
this.addContextDependency(root);

glob(root + '/**/*.md')
.then(files => files.map(file => file.substr(root.length + 1)))
.then(files =>
files.map(file => ({
path: file.slice(0, -3),
content: handleIncludes(fs.readFileSync(root + '/' + file, 'utf8'), root)
}))
)
.then(result => `module.exports = ${JSON.stringify(result)};`)
.then(success)
.catch(failure);
};

/**
* @param {string} content
* @param {string} root
* @returns {string}
*/
function handleIncludes(content, root) {
return content.replace(/@include (.+)/, (match, p) => {
const filePath = path.join(root, '..', `${p}.md`);
return fs.readFileSync(filePath, 'utf8');
});
}

+ 2
- 3
server/sonar-web/package.json View File

@@ -80,7 +80,6 @@
"@types/react-select": "4.0.16",
"@types/react-select-legacy": "npm:@types/react-select@1.2.6",
"@types/react-virtualized": "9.21.20",
"@types/sanitize-html": "1.22.0",
"@types/valid-url": "1.0.3",
"@typescript-eslint/eslint-plugin": "4.33.0",
"@typescript-eslint/parser": "4.33.0",
@@ -102,12 +101,12 @@
"eslint-plugin-testing-library": "5.2.1",
"fs-extra": "10.0.1",
"glob": "7.2.0",
"glob-promise": "3.4.0",
"glob-promise": "4.2.2",
"http-proxy": "1.18.1",
"jest": "27.5.1",
"jest-emotion": "10.0.32",
"jest-junit": "13.0.0",
"jsdom": "16.7.0",
"jsdom": "19.0.0",
"path-browserify": "1.0.1",
"postcss-calc": "7.0.2",
"postcss-custom-properties": "9.1.1",

+ 194
- 61
server/sonar-web/yarn.lock View File

@@ -1610,6 +1610,13 @@ __metadata:
languageName: node
linkType: hard

"@tootallnate/once@npm:2":
version: 2.0.0
resolution: "@tootallnate/once@npm:2.0.0"
checksum: ad87447820dd3f24825d2d947ebc03072b20a42bfc96cbafec16bff8bbda6c1a81fcb0be56d5b21968560c5359a0af4038a68ba150c3e1694fe4c109a063bed8
languageName: node
linkType: hard

"@types/aria-query@npm:^4.2.0":
version: 4.2.2
resolution: "@types/aria-query@npm:4.2.2"
@@ -1787,13 +1794,6 @@ __metadata:
languageName: node
linkType: hard

"@types/domhandler@npm:*":
version: 2.4.1
resolution: "@types/domhandler@npm:2.4.1"
checksum: b2d59124dad66cac48c72f7e69f02a8f67e3cf06ae71ceeb1a074f2f33f6dccc72b7e965328a8a38657fedacd8201e9fadb6c463b05ffcbbee888ec06ced1298
languageName: node
linkType: hard

"@types/dompurify@npm:2.3.3":
version: 2.3.3
resolution: "@types/dompurify@npm:2.3.3"
@@ -1803,15 +1803,6 @@ __metadata:
languageName: node
linkType: hard

"@types/domutils@npm:*":
version: 1.7.2
resolution: "@types/domutils@npm:1.7.2"
dependencies:
"@types/domhandler": "*"
checksum: 3b6e1d04ea6480396eb4cd01f12a8abe15a645444dc82460f8906a40467c46c4f91d9856a3a436d51b48c1846f4d1af92852f85647bc31f78488fb8b40a04486
languageName: node
linkType: hard

"@types/enzyme@npm:3.10.5":
version: 3.10.5
resolution: "@types/enzyme@npm:3.10.5"
@@ -1822,21 +1813,13 @@ __metadata:
languageName: node
linkType: hard

"@types/events@npm:*":
version: 3.0.0
resolution: "@types/events@npm:3.0.0"
checksum: 9a424c2da210957d5636e0763e8c9fc3aaeee35bf411284ddec62a56a6abe31de9c7c2e713dabdd8a76ff98b47db2bd52f61310be6609641d6234cc842ecbbe3
languageName: node
linkType: hard

"@types/glob@npm:*":
version: 7.1.1
resolution: "@types/glob@npm:7.1.1"
"@types/glob@npm:^7.1.3":
version: 7.2.0
resolution: "@types/glob@npm:7.2.0"
dependencies:
"@types/events": "*"
"@types/minimatch": "*"
"@types/node": "*"
checksum: 9fb96d004c8e9ed25b305bc0d34c99c70c47c571740ca861cca92be4b28649786971703e9883f8ead0815b50225dbaf103a1df2d076923066f6bc0ab733a7be8
checksum: 6ae717fedfdfdad25f3d5a568323926c64f52ef35897bcac8aca8e19bc50c0bd84630bbd063e5d52078b2137d8e7d3c26eabebd1a2f03ff350fff8a91e79fc19
languageName: node
linkType: hard

@@ -1866,17 +1849,6 @@ __metadata:
languageName: node
linkType: hard

"@types/htmlparser2@npm:*":
version: 3.10.0
resolution: "@types/htmlparser2@npm:3.10.0"
dependencies:
"@types/domhandler": "*"
"@types/domutils": "*"
"@types/node": "*"
checksum: a9b50cf9ddea3819ef5cd36f4043ce3cf14b472655bab3c447ea90fe99d8554f4b18991b0cc69950771c5716c106da25a9c450ac5eb11b8c629992b43a4d1bbd
languageName: node
linkType: hard

"@types/invariant@npm:^2.2.31":
version: 2.2.35
resolution: "@types/invariant@npm:2.2.35"
@@ -2121,15 +2093,6 @@ __metadata:
languageName: node
linkType: hard

"@types/sanitize-html@npm:1.22.0":
version: 1.22.0
resolution: "@types/sanitize-html@npm:1.22.0"
dependencies:
"@types/htmlparser2": "*"
checksum: 8737775a9471e2a37fa46281e92303259c150c1a91874a0f0118d8d8acb9d3c96b143220a83e9a6cc1923d73eb8809949de8825d038f4953bed12e351bc7b5d5
languageName: node
linkType: hard

"@types/stack-utils@npm:^2.0.0":
version: 2.0.1
resolution: "@types/stack-utils@npm:2.0.1"
@@ -2379,7 +2342,6 @@ __metadata:
"@types/react-select": 4.0.16
"@types/react-select-legacy": "npm:@types/react-select@1.2.6"
"@types/react-virtualized": 9.21.20
"@types/sanitize-html": 1.22.0
"@types/valid-url": 1.0.3
"@typescript-eslint/eslint-plugin": 4.33.0
"@typescript-eslint/parser": 4.33.0
@@ -2413,13 +2375,13 @@ __metadata:
formik: 1.2.0
fs-extra: 10.0.1
glob: 7.2.0
glob-promise: 3.4.0
glob-promise: 4.2.2
history: 3.3.0
http-proxy: 1.18.1
jest: 27.5.1
jest-emotion: 10.0.32
jest-junit: 13.0.0
jsdom: 16.7.0
jsdom: 19.0.0
keymaster: 1.6.2
lodash: 4.17.21
lunr: 2.3.9
@@ -2508,7 +2470,7 @@ __metadata:
languageName: node
linkType: hard

"acorn@npm:^8.2.4":
"acorn@npm:^8.2.4, acorn@npm:^8.5.0":
version: 8.7.0
resolution: "acorn@npm:8.7.0"
bin:
@@ -3659,6 +3621,13 @@ __metadata:
languageName: node
linkType: hard

"cssom@npm:^0.5.0":
version: 0.5.0
resolution: "cssom@npm:0.5.0"
checksum: 823471aa30091c59e0a305927c30e7768939b6af70405808f8d2ce1ca778cddcb24722717392438329d1691f9a87cb0183b64b8d779b56a961546d54854fde01
languageName: node
linkType: hard

"cssom@npm:~0.3.6":
version: 0.3.8
resolution: "cssom@npm:0.3.8"
@@ -3871,6 +3840,17 @@ __metadata:
languageName: node
linkType: hard

"data-urls@npm:^3.0.1":
version: 3.0.1
resolution: "data-urls@npm:3.0.1"
dependencies:
abab: ^2.0.3
whatwg-mimetype: ^3.0.0
whatwg-url: ^10.0.0
checksum: 00c71280d5d8146a2f19f3fce3ce59c3b860c66cd584f4e7db8764477a9c97966fa06543c9d9d28b762784f50e21c2e2ccb2d0be24b392ec82eb21daf7804b3e
languageName: node
linkType: hard

"date-fns@npm:1.30.1":
version: 1.30.1
resolution: "date-fns@npm:1.30.1"
@@ -3947,7 +3927,7 @@ __metadata:
languageName: node
linkType: hard

"decimal.js@npm:^10.2.1":
"decimal.js@npm:^10.2.1, decimal.js@npm:^10.3.1":
version: 10.3.1
resolution: "decimal.js@npm:10.3.1"
checksum: 0351ac9f05fe050f23227aa6a4573bee2d58fa7378fcf28d969a8c789525032effb488a90320fd3fe86a66e17b4bc507d811b15eada5b7f0e7ec5d2af4c24a59
@@ -4133,6 +4113,15 @@ __metadata:
languageName: node
linkType: hard

"domexception@npm:^4.0.0":
version: 4.0.0
resolution: "domexception@npm:4.0.0"
dependencies:
webidl-conversions: ^7.0.0
checksum: ddbc1268edf33a8ba02ccc596735ede80375ee0cf124b30d2f05df5b464ba78ef4f49889b6391df4a04954e63d42d5631c7fcf8b1c4f12bc531252977a5f13d5
languageName: node
linkType: hard

"domhandler@npm:^2.3.0":
version: 2.4.2
resolution: "domhandler@npm:2.4.2"
@@ -5312,6 +5301,17 @@ __metadata:
languageName: node
linkType: hard

"form-data@npm:^4.0.0":
version: 4.0.0
resolution: "form-data@npm:4.0.0"
dependencies:
asynckit: ^0.4.0
combined-stream: ^1.0.8
mime-types: ^2.1.12
checksum: 01135bf8675f9d5c61ff18e2e2932f719ca4de964e3be90ef4c36aacfc7b9cb2fceb5eca0b7e0190e3383fe51c5b37f4cb80b62ca06a99aaabfcfd6ac7c9328c
languageName: node
linkType: hard

"formik@npm:1.2.0":
version: 1.2.0
resolution: "formik@npm:1.2.0"
@@ -5557,14 +5557,14 @@ __metadata:
languageName: node
linkType: hard

"glob-promise@npm:3.4.0":
version: 3.4.0
resolution: "glob-promise@npm:3.4.0"
"glob-promise@npm:4.2.2":
version: 4.2.2
resolution: "glob-promise@npm:4.2.2"
dependencies:
"@types/glob": "*"
"@types/glob": ^7.1.3
peerDependencies:
glob: "*"
checksum: 84a2c076e7581c9f8aa7a8a151ad5f9352c4118ba03c5673ecfcf540f4c53aa75f8d32fe493c2286d471dccd7a75932b9bfe97bf782564c1f4a50b9c7954e3b6
glob: ^7.1.6
checksum: c1a3d95f7c8393e4151d4899ec4e42bb2e8237160f840ad1eccbe9247407da8b6c13e28f463022e011708bc40862db87b9b77236d35afa3feb8aa86d518f2dfe
languageName: node
linkType: hard

@@ -5949,6 +5949,15 @@ __metadata:
languageName: node
linkType: hard

"html-encoding-sniffer@npm:^3.0.0":
version: 3.0.0
resolution: "html-encoding-sniffer@npm:3.0.0"
dependencies:
whatwg-encoding: ^2.0.0
checksum: 8d806aa00487e279e5ccb573366a951a9f68f65c90298eac9c3a2b440a7ffe46615aff2995a2f61c6746c639234e6179a97e18ca5ccbbf93d3725ef2099a4502
languageName: node
linkType: hard

"html-escaper@npm:^2.0.0":
version: 2.0.0
resolution: "html-escaper@npm:2.0.0"
@@ -5995,6 +6004,17 @@ __metadata:
languageName: node
linkType: hard

"http-proxy-agent@npm:^5.0.0":
version: 5.0.0
resolution: "http-proxy-agent@npm:5.0.0"
dependencies:
"@tootallnate/once": 2
agent-base: 6
debug: 4
checksum: e2ee1ff1656a131953839b2a19cd1f3a52d97c25ba87bd2559af6ae87114abf60971e498021f9b73f9fd78aea8876d1fb0d4656aac8a03c6caa9fc175f22b786
languageName: node
linkType: hard

"http-proxy@npm:1.18.1":
version: 1.18.1
resolution: "http-proxy@npm:1.18.1"
@@ -6041,7 +6061,7 @@ __metadata:
languageName: node
linkType: hard

"iconv-lite@npm:^0.6.2":
"iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2":
version: 0.6.3
resolution: "iconv-lite@npm:0.6.3"
dependencies:
@@ -7275,7 +7295,47 @@ __metadata:
languageName: node
linkType: hard

"jsdom@npm:16.7.0, jsdom@npm:^16.6.0":
"jsdom@npm:19.0.0":
version: 19.0.0
resolution: "jsdom@npm:19.0.0"
dependencies:
abab: ^2.0.5
acorn: ^8.5.0
acorn-globals: ^6.0.0
cssom: ^0.5.0
cssstyle: ^2.3.0
data-urls: ^3.0.1
decimal.js: ^10.3.1
domexception: ^4.0.0
escodegen: ^2.0.0
form-data: ^4.0.0
html-encoding-sniffer: ^3.0.0
http-proxy-agent: ^5.0.0
https-proxy-agent: ^5.0.0
is-potential-custom-element-name: ^1.0.1
nwsapi: ^2.2.0
parse5: 6.0.1
saxes: ^5.0.1
symbol-tree: ^3.2.4
tough-cookie: ^4.0.0
w3c-hr-time: ^1.0.2
w3c-xmlserializer: ^3.0.0
webidl-conversions: ^7.0.0
whatwg-encoding: ^2.0.0
whatwg-mimetype: ^3.0.0
whatwg-url: ^10.0.0
ws: ^8.2.3
xml-name-validator: ^4.0.0
peerDependencies:
canvas: ^2.5.0
peerDependenciesMeta:
canvas:
optional: true
checksum: 94b693bf4a394097dd96705550bb7b6cd3c8db3c5414e6e9c92a0995ed8b61067597da2f37fca6bed4b5a2f1ef33960ee759522156dccd0b306311988ea87cfb
languageName: node
linkType: hard

"jsdom@npm:^16.6.0":
version: 16.7.0
resolution: "jsdom@npm:16.7.0"
dependencies:
@@ -10650,6 +10710,15 @@ resolve@^1.3.2:
languageName: node
linkType: hard

"tr46@npm:^3.0.0":
version: 3.0.0
resolution: "tr46@npm:3.0.0"
dependencies:
punycode: ^2.1.1
checksum: 44c3cc6767fb800490e6e9fd64fd49041aa4e49e1f6a012b34a75de739cc9ed3a6405296072c1df8b6389ae139c5e7c6496f659cfe13a04a4bff3a1422981270
languageName: node
linkType: hard

"trim-lines@npm:^1.0.0":
version: 1.1.2
resolution: "trim-lines@npm:1.1.2"
@@ -11078,6 +11147,15 @@ resolve@^1.3.2:
languageName: node
linkType: hard

"w3c-xmlserializer@npm:^3.0.0":
version: 3.0.0
resolution: "w3c-xmlserializer@npm:3.0.0"
dependencies:
xml-name-validator: ^4.0.0
checksum: 0af8589942eeb11c9fe29eb31a1a09f3d5dd136aea53a9848dfbabff79ac0dd26fe13eb54d330d5555fe27bb50b28dca0715e09f9cc2bfa7670ccc8b7f919ca2
languageName: node
linkType: hard

"walker@npm:^1.0.7":
version: 1.0.7
resolution: "walker@npm:1.0.7"
@@ -11126,6 +11204,13 @@ resolve@^1.3.2:
languageName: node
linkType: hard

"webidl-conversions@npm:^7.0.0":
version: 7.0.0
resolution: "webidl-conversions@npm:7.0.0"
checksum: f05588567a2a76428515333eff87200fae6c83c3948a7482ebb109562971e77ef6dc49749afa58abb993391227c5697b3ecca52018793e0cb4620a48f10bd21b
languageName: node
linkType: hard

"whatwg-encoding@npm:^1.0.5":
version: 1.0.5
resolution: "whatwg-encoding@npm:1.0.5"
@@ -11135,6 +11220,15 @@ resolve@^1.3.2:
languageName: node
linkType: hard

"whatwg-encoding@npm:^2.0.0":
version: 2.0.0
resolution: "whatwg-encoding@npm:2.0.0"
dependencies:
iconv-lite: 0.6.3
checksum: 7087810c410aa9b689cbd6af8773341a53cdc1f3aae2a882c163bd5522ec8ca4cdfc269aef417a5792f411807d5d77d50df4c24e3abb00bb60192858a40cc675
languageName: node
linkType: hard

"whatwg-fetch@npm:3.6.2":
version: 3.6.2
resolution: "whatwg-fetch@npm:3.6.2"
@@ -11156,6 +11250,23 @@ resolve@^1.3.2:
languageName: node
linkType: hard

"whatwg-mimetype@npm:^3.0.0":
version: 3.0.0
resolution: "whatwg-mimetype@npm:3.0.0"
checksum: ce08bbb36b6aaf64f3a84da89707e3e6a31e5ab1c1a2379fd68df79ba712a4ab090904f0b50e6693b0dafc8e6343a6157e40bf18fdffd26e513cf95ee2a59824
languageName: node
linkType: hard

"whatwg-url@npm:^10.0.0":
version: 10.0.0
resolution: "whatwg-url@npm:10.0.0"
dependencies:
tr46: ^3.0.0
webidl-conversions: ^7.0.0
checksum: a21ec309c5cc743fe9414509408bedf65eaf0fb5c17ac66baa08ef12fce16da4dd30ce90abefbd5a716408301c58a73666dabfd5042cf4242992eb98b954f861
languageName: node
linkType: hard

"whatwg-url@npm:^8.0.0, whatwg-url@npm:^8.5.0":
version: 8.7.0
resolution: "whatwg-url@npm:8.7.0"
@@ -11270,6 +11381,21 @@ resolve@^1.3.2:
languageName: node
linkType: hard

"ws@npm:^8.2.3":
version: 8.5.0
resolution: "ws@npm:8.5.0"
peerDependencies:
bufferutil: ^4.0.1
utf-8-validate: ^5.0.2
peerDependenciesMeta:
bufferutil:
optional: true
utf-8-validate:
optional: true
checksum: 76f2f90e40344bf18fd544194e7067812fb1372b2a37865678d8f12afe4b478ff2ebc0c7c0aff82cd5e6b66fc43d889eec0f1865c2365d8f7a66d92da7744a77
languageName: node
linkType: hard

"xml-name-validator@npm:^3.0.0":
version: 3.0.0
resolution: "xml-name-validator@npm:3.0.0"
@@ -11277,6 +11403,13 @@ resolve@^1.3.2:
languageName: node
linkType: hard

"xml-name-validator@npm:^4.0.0":
version: 4.0.0
resolution: "xml-name-validator@npm:4.0.0"
checksum: af100b79c29804f05fa35aa3683e29a321db9b9685d5e5febda3fa1e40f13f85abc40f45a6b2bf7bee33f68a1dc5e8eaef4cec100a304a9db565e6061d4cb5ad
languageName: node
linkType: hard

"xml@npm:^1.0.1":
version: 1.0.1
resolution: "xml@npm:1.0.1"

Loading…
Cancel
Save