From 671a54425f5b4eb0e4031ced4cd51a942057f48b Mon Sep 17 00:00:00 2001 From: Matthew B White Date: Tue, 5 Apr 2022 09:48:49 +0100 Subject: [PATCH] Some updates to the latest tool versions Signed-off-by: Matthew B White --- apis/fabric-contract-api/package.json | 6 +- common/config/rush/pnpm-lock.yaml | 557 +++++++++++++----- common/scripts/install-run-rush.js | 34 +- common/scripts/install-run.js | 41 +- libraries/fabric-ledger/package.json | 6 +- libraries/fabric-shim-crypto/package.json | 4 +- .../lib/cmds/metadata/generateCommand.js | 2 +- .../fabric-shim/lib/cmds/serverCommand.js | 1 - libraries/fabric-shim/package.json | 15 +- rush.json | 4 +- test/e2e/package.json | 2 +- test/fv/package.json | 6 +- tools/toolchain/package.json | 2 +- 13 files changed, 468 insertions(+), 212 deletions(-) diff --git a/apis/fabric-contract-api/package.json b/apis/fabric-contract-api/package.json index 6d742c8d..0bf70e20 100644 --- a/apis/fabric-contract-api/package.json +++ b/apis/fabric-contract-api/package.json @@ -51,7 +51,7 @@ "fast-safe-stringify": "^2.1.1", "get-params": "^0.1.2", "reflect-metadata": "^0.1.13", - "winston": "^3.3.3" + "winston": "^3.7.2" }, "devDependencies": { "ajv": "^6.12.2", @@ -66,8 +66,8 @@ "gulp-eslint": "~6.0.0", "mocha": "9.1.3", "nyc": "15.1.0", - "rewire": "5.0.0", - "sinon": "11.1.2", + "rewire": "6.0.0", + "sinon": "13.0.1", "typescript": "4.4.4" } } diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 8d9630ed..eb743d97 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -24,6 +24,7 @@ specifiers: ajv: ^6.12.2 ajv-cli: ^3.2.1 ajv-formats: 2.1.1 + caniuse-lite: ~1.0.30001325 chai: ^4.3.4 chai-as-promised: ^7.1.1 chai-things: ^0.2.0 @@ -34,7 +35,7 @@ specifiers: elliptic: ^6.5.4 eslint: ^6.6.0 fast-safe-stringify: ^2.1.1 - fs-extra: ^10.0.0 + fs-extra: ^10.0.1 get-params: ^0.1.2 git-rev-sync: 3.0.1 gulp: ^4.0.2 @@ -55,17 +56,17 @@ specifiers: npm-cli-login: ~0.1.1 nyc: 15.1.0 reflect-metadata: ^0.1.13 - rewire: 5.0.0 + rewire: 6.0.0 rimraf: ^3.0.2 - sinon: 11.1.2 + sinon: 13.0.1 sinon-test: ^2.2.0 spec-junit-splitter-mocha-reporter: 1.0.1 ts-mockito: ^2.6.1 ts-node: ^10.2.1 typescript: 4.4.4 - winston: ^3.3.3 - yargs: ^17.2.1 - yargs-parser: ^20.2.9 + winston: ^3.7.2 + yargs: ^17.4.0 + yargs-parser: ^21.0.1 dependencies: '@fidm/x509': 1.2.1 @@ -91,6 +92,7 @@ dependencies: ajv: 6.12.6 ajv-cli: 3.2.1 ajv-formats: 2.1.1 + caniuse-lite: 1.0.30001325 chai: 4.3.4 chai-as-promised: 7.1.1_chai@4.3.4 chai-things: 0.2.0 @@ -101,7 +103,7 @@ dependencies: elliptic: 6.5.4 eslint: 6.8.0 fast-safe-stringify: 2.1.1 - fs-extra: 10.0.0 + fs-extra: 10.0.1 get-params: 0.1.2 git-rev-sync: 3.0.1 gulp: 4.0.2 @@ -122,20 +124,26 @@ dependencies: npm-cli-login: 0.1.1 nyc: 15.1.0 reflect-metadata: 0.1.13 - rewire: 5.0.0 + rewire: 6.0.0 rimraf: 3.0.2 - sinon: 11.1.2 - sinon-test: 2.4.3_sinon@11.1.2 + sinon: 13.0.1 + sinon-test: 2.4.3_sinon@13.0.1 spec-junit-splitter-mocha-reporter: 1.0.1 ts-mockito: 2.6.1 ts-node: 10.2.1_4837b44df871fd426bb731ce8876dc42 typescript: 4.4.4 - winston: 3.3.3 - yargs: 17.2.1 - yargs-parser: 20.2.9 + winston: 3.7.2 + yargs: 17.4.0 + yargs-parser: 21.0.1 packages: + /@babel/code-frame/7.12.11: + resolution: {integrity: sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==} + dependencies: + '@babel/highlight': 7.14.5 + dev: false + /@babel/code-frame/7.15.8: resolution: {integrity: sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==} engines: {node: '>=6.9.0'} @@ -355,6 +363,11 @@ packages: to-fast-properties: 2.0.0 dev: false + /@colors/colors/1.5.0: + resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} + engines: {node: '>=0.1.90'} + dev: false + /@cspotcode/source-map-consumer/0.8.0: resolution: {integrity: sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==} engines: {node: '>= 12'} @@ -375,6 +388,23 @@ packages: kuler: 2.0.0 dev: false + /@eslint/eslintrc/0.4.3: + resolution: {integrity: sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==} + engines: {node: ^10.12.0 || >=12.0.0} + dependencies: + ajv: 6.12.6 + debug: 4.3.2 + espree: 7.3.1 + globals: 13.13.0 + ignore: 4.0.6 + import-fresh: 3.2.1 + js-yaml: 3.14.0 + minimatch: 3.0.4 + strip-json-comments: 3.1.1 + transitivePeerDependencies: + - supports-color + dev: false + /@fidm/asn1/1.0.4: resolution: {integrity: sha512-esd1jyNvRb2HVaQGq2Gg8Z0kbQPXzV9Tq5Z14KNIov6KfFD6PTaRIO8UpcsYiTNzOqJpmyzWgVTrUwFV3UF4TQ==} engines: {node: '>= 8'} @@ -408,6 +438,21 @@ packages: yargs: 16.2.0 dev: false + /@humanwhocodes/config-array/0.5.0: + resolution: {integrity: sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==} + engines: {node: '>=10.10.0'} + dependencies: + '@humanwhocodes/object-schema': 1.2.1 + debug: 4.3.2 + minimatch: 3.0.4 + transitivePeerDependencies: + - supports-color + dev: false + + /@humanwhocodes/object-schema/1.2.1: + resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} + dev: false + /@istanbuljs/load-nyc-config/1.1.0: resolution: {integrity: sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==} engines: {node: '>=8'} @@ -524,8 +569,8 @@ packages: type-detect: 4.0.8 dev: false - /@sinonjs/fake-timers/7.1.2: - resolution: {integrity: sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==} + /@sinonjs/fake-timers/9.1.1: + resolution: {integrity: sha512-Wp5vwlZ0lOqpSYGKqr53INws9HLkt6JDc/pDZcPf7bchQnrXJMXPns8CXx0hFikMSGSWfvtvvpb2gtMVfkWagA==} dependencies: '@sinonjs/commons': 1.8.3 dev: false @@ -549,7 +594,7 @@ packages: /@sinonjs/referee/3.2.0: resolution: {integrity: sha512-t+sDpTvUmqgYWkPwTuO4gEivScbEKbF6eqFB9Cv70PqcyJla3w7Mj0JQyXn18uCDR2bIZglD4NNGeWGg8YfaGw==} dependencies: - '@sinonjs/commons': 1.8.0 + '@sinonjs/commons': 1.8.3 '@sinonjs/formatio': 3.2.2 '@sinonjs/samsam': 3.3.3 array-from: 2.1.1 @@ -567,8 +612,8 @@ packages: lodash: 4.17.15 dev: false - /@sinonjs/samsam/6.0.2: - resolution: {integrity: sha512-jxPRPp9n93ci7b8hMfJOFDPRLFYadN6FSpeROFTR4UNF4i5b+EK6m4QXPO46BDhFgRy1JuS87zAnFOzCUwMJcQ==} + /@sinonjs/samsam/6.1.1: + resolution: {integrity: sha512-cZ7rKJTLiE7u7Wi/v9Hc2fs3Ucc3jrWeMgPHbbTCeVAB2S0wOBbYlkJVeNSL04i7fdhT8wIbDq1zhC/PXTD2SA==} dependencies: '@sinonjs/commons': 1.8.3 lodash.get: 4.4.2 @@ -696,7 +741,7 @@ packages: dependencies: '@snyk/graphlib': 2.1.9-patch ci-info: 2.0.0 - debug: 4.1.1 + debug: 4.3.2 glob: 7.1.6 jszip: 3.5.0 needle: 2.5.0 @@ -705,6 +750,8 @@ packages: source-map-support: 0.5.19 temp-dir: 2.0.0 tslib: 1.11.1 + transitivePeerDependencies: + - supports-color dev: false /@snyk/lodash/4.17.15-patch: @@ -811,10 +858,6 @@ packages: resolution: {integrity: sha512-scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA==} dev: false - /@types/node/14.0.14: - resolution: {integrity: sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ==} - dev: false - /@types/node/16.11.1: resolution: {integrity: sha512-PYGcJHL9mwl1Ek3PLiYgyEKtwTMmkMw4vbiyz/ps3pfdRYLVv+SN7qHVAImrjdAXxgluDEw6Ph4lyv+m9UpRmA==} dev: false @@ -830,7 +873,7 @@ packages: /@types/xml2js/0.4.5: resolution: {integrity: sha512-yohU3zMn0fkhlape1nxXG2bLEGZRc1FeqF80RoHaYXJN7uibaauXfhzhOJr1Xh36sn+/tx21QAOf07b/xYVk1w==} dependencies: - '@types/node': 14.0.14 + '@types/node': 16.11.1 dev: false /@typescript-eslint/eslint-plugin/2.3.3_1a5f73936db5ef7e91497c31ec0dac24: @@ -898,12 +941,12 @@ packages: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} dev: false - /acorn-jsx/5.3.2_acorn@7.3.1: + /acorn-jsx/5.3.2_acorn@7.4.1: resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - acorn: 7.3.1 + acorn: 7.4.1 dev: false /acorn-walk/8.2.0: @@ -911,8 +954,8 @@ packages: engines: {node: '>=0.4.0'} dev: false - /acorn/7.3.1: - resolution: {integrity: sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==} + /acorn/7.4.1: + resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==} engines: {node: '>=0.4.0'} hasBin: true dev: false @@ -984,15 +1027,6 @@ packages: json-schema-traverse: 0.3.1 dev: false - /ajv/6.12.2: - resolution: {integrity: sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==} - dependencies: - fast-deep-equal: 3.1.3 - fast-json-stable-stringify: 2.1.0 - json-schema-traverse: 0.4.1 - uri-js: 4.2.2 - dev: false - /ajv/6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} dependencies: @@ -1068,8 +1102,8 @@ packages: engines: {node: '>=6'} dev: false - /ansi-regex/5.0.0: - resolution: {integrity: sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==} + /ansi-regex/5.0.1: + resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} dev: false @@ -1315,6 +1349,11 @@ packages: engines: {node: '>=4'} dev: false + /astral-regex/2.0.0: + resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==} + engines: {node: '>=8'} + dev: false + /async-done/1.3.2: resolution: {integrity: sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==} engines: {node: '>= 0.10'} @@ -1346,8 +1385,8 @@ packages: lodash: 4.17.15 dev: false - /async/3.2.0: - resolution: {integrity: sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==} + /async/3.2.3: + resolution: {integrity: sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==} dev: false /asynckit/0.4.0: @@ -1528,7 +1567,7 @@ packages: camelcase: 5.3.1 chalk: 3.0.0 cli-boxes: 2.2.0 - string-width: 4.2.0 + string-width: 4.2.3 term-size: 2.2.0 type-fest: 0.8.1 widest-line: 3.1.0 @@ -1592,7 +1631,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001265 + caniuse-lite: 1.0.30001325 electron-to-chromium: 1.3.864 escalade: 3.1.1 node-releases: 1.1.77 @@ -1694,8 +1733,8 @@ packages: engines: {node: '>=10'} dev: false - /caniuse-lite/1.0.30001265: - resolution: {integrity: sha512-YzBnspggWV5hep1m9Z6sZVLOt7vrju8xWooFAgN6BA5qvy98qPAPb7vNUzypFaoh2pb3vlfzbDO8tB57UPGbtw==} + /caniuse-lite/1.0.30001325: + resolution: {integrity: sha512-sB1bZHjseSjDtijV1Hb7PB2Zd58Kyx+n/9EotvZ4Qcz2K3d0lWB8dB4nb8wN/TsOGFq3UuAm0zQZNQ4SoR7TrQ==} dev: false /caseless/0.12.0: @@ -1902,16 +1941,16 @@ packages: /cliui/6.0.0: resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==} dependencies: - string-width: 4.2.0 - strip-ansi: 6.0.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 wrap-ansi: 6.2.0 dev: false /cliui/7.0.4: resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==} dependencies: - string-width: 4.2.0 - strip-ansi: 6.0.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 wrap-ansi: 7.0.0 dev: false @@ -2010,11 +2049,6 @@ packages: color-string: 1.5.3 dev: false - /colors/1.4.0: - resolution: {integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==} - engines: {node: '>=0.1.90'} - dev: false - /colorspace/1.1.2: resolution: {integrity: sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==} dependencies: @@ -2194,12 +2228,6 @@ packages: ms: 2.1.3 dev: false - /debug/4.1.1: - resolution: {integrity: sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==} - dependencies: - ms: 2.1.2 - dev: false - /debug/4.3.2: resolution: {integrity: sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==} engines: {node: '>=6.0'} @@ -2393,10 +2421,12 @@ packages: resolution: {integrity: sha512-cwaRptBmYZwu/FyhGcqBm2MzXA77W2/E6eVkpOZVDk6PkI9Bjj84xPrXiHMA+OWjzNy+DFjgKh8Q+1hMR7/OHg==} engines: {node: '>= 8.0'} dependencies: - debug: 4.1.1 + debug: 4.3.2 readable-stream: 3.6.0 split-ca: 1.0.1 ssh2: 0.8.9 + transitivePeerDependencies: + - supports-color dev: false /dockerfile-ast/0.0.19: @@ -2543,6 +2573,13 @@ packages: once: 1.4.0 dev: false + /enquirer/2.3.6: + resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==} + engines: {node: '>=8.6'} + dependencies: + ansi-colors: 4.1.1 + dev: false + /entities/2.0.3: resolution: {integrity: sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==} dev: false @@ -2723,11 +2760,23 @@ packages: eslint-visitor-keys: 1.3.0 dev: false + /eslint-utils/2.1.0: + resolution: {integrity: sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==} + engines: {node: '>=6'} + dependencies: + eslint-visitor-keys: 1.3.0 + dev: false + /eslint-visitor-keys/1.3.0: resolution: {integrity: sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==} engines: {node: '>=4'} dev: false + /eslint-visitor-keys/2.1.0: + resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==} + engines: {node: '>=10'} + dev: false + /eslint/6.8.0: resolution: {integrity: sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==} engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1} @@ -2774,12 +2823,70 @@ packages: - supports-color dev: false + /eslint/7.32.0: + resolution: {integrity: sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==} + engines: {node: ^10.12.0 || >=12.0.0} + hasBin: true + dependencies: + '@babel/code-frame': 7.12.11 + '@eslint/eslintrc': 0.4.3 + '@humanwhocodes/config-array': 0.5.0 + ajv: 6.12.6 + chalk: 4.1.2 + cross-spawn: 7.0.3 + debug: 4.3.2 + doctrine: 3.0.0 + enquirer: 2.3.6 + escape-string-regexp: 4.0.0 + eslint-scope: 5.1.1 + eslint-utils: 2.1.0 + eslint-visitor-keys: 2.1.0 + espree: 7.3.1 + esquery: 1.4.0 + esutils: 2.0.3 + fast-deep-equal: 3.1.3 + file-entry-cache: 6.0.1 + functional-red-black-tree: 1.0.1 + glob-parent: 5.1.2 + globals: 13.13.0 + ignore: 4.0.6 + import-fresh: 3.2.1 + imurmurhash: 0.1.4 + is-glob: 4.0.3 + js-yaml: 3.14.0 + json-stable-stringify-without-jsonify: 1.0.1 + levn: 0.4.1 + lodash.merge: 4.6.2 + minimatch: 3.0.4 + natural-compare: 1.4.0 + optionator: 0.9.1 + progress: 2.0.3 + regexpp: 3.2.0 + semver: 7.3.2 + strip-ansi: 6.0.1 + strip-json-comments: 3.1.1 + table: 6.8.0 + text-table: 0.2.0 + v8-compile-cache: 2.1.1 + transitivePeerDependencies: + - supports-color + dev: false + /espree/6.2.1: resolution: {integrity: sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==} engines: {node: '>=6.0.0'} dependencies: - acorn: 7.3.1 - acorn-jsx: 5.3.2_acorn@7.3.1 + acorn: 7.4.1 + acorn-jsx: 5.3.2_acorn@7.4.1 + eslint-visitor-keys: 1.3.0 + dev: false + + /espree/7.3.1: + resolution: {integrity: sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==} + engines: {node: ^10.12.0 || >=12.0.0} + dependencies: + acorn: 7.4.1 + acorn-jsx: 5.3.2_acorn@7.4.1 eslint-visitor-keys: 1.3.0 dev: false @@ -3009,6 +3116,13 @@ packages: flat-cache: 2.0.1 dev: false + /file-entry-cache/6.0.1: + resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==} + engines: {node: ^10.12.0 || >=12.0.0} + dependencies: + flat-cache: 3.0.4 + dev: false + /file-uri-to-path/1.0.0: resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==} dev: false @@ -3112,7 +3226,7 @@ packages: engines: {node: '>= 0.10'} dependencies: detect-file: 1.0.0 - is-glob: 4.0.1 + is-glob: 4.0.3 micromatch: 3.1.10 resolve-dir: 1.0.1 dev: false @@ -3142,6 +3256,14 @@ packages: write: 1.0.3 dev: false + /flat-cache/3.0.4: + resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==} + engines: {node: ^10.12.0 || >=12.0.0} + dependencies: + flatted: 3.2.5 + rimraf: 3.0.2 + dev: false + /flat/4.1.0: resolution: {integrity: sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==} deprecated: Fixed a prototype pollution security issue in 4.1.0, please upgrade to ^4.1.1 or ^5.0.1. @@ -3159,6 +3281,10 @@ packages: resolution: {integrity: sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==} dev: false + /flatted/3.2.5: + resolution: {integrity: sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==} + dev: false + /flush-write-stream/1.1.1: resolution: {integrity: sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==} dependencies: @@ -3225,8 +3351,8 @@ packages: resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==} dev: false - /fs-extra/10.0.0: - resolution: {integrity: sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==} + /fs-extra/10.0.1: + resolution: {integrity: sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==} engines: {node: '>=12'} dependencies: graceful-fs: 4.2.4 @@ -3522,6 +3648,13 @@ packages: type-fest: 0.8.1 dev: false + /globals/13.13.0: + resolution: {integrity: sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==} + engines: {node: '>=8'} + dependencies: + type-fest: 0.20.2 + dev: false + /globals/9.18.0: resolution: {integrity: sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==} engines: {node: '>=0.10.0'} @@ -3694,7 +3827,7 @@ packages: resolution: {integrity: sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==} engines: {node: '>=6'} dependencies: - ajv: 6.12.2 + ajv: 6.12.6 har-schema: 2.0.0 dev: false @@ -3962,8 +4095,8 @@ packages: mute-stream: 0.0.8 run-async: 2.4.1 rxjs: 6.5.5 - string-width: 4.2.0 - strip-ansi: 6.0.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 through: 2.3.8 dev: false @@ -4207,13 +4340,6 @@ packages: is-extglob: 2.1.1 dev: false - /is-glob/4.0.1: - resolution: {integrity: sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==} - engines: {node: '>=0.10.0'} - dependencies: - is-extglob: 2.1.1 - dev: false - /is-glob/4.0.3: resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} engines: {node: '>=0.10.0'} @@ -4872,6 +4998,14 @@ packages: type-check: 0.3.2 dev: false + /levn/0.4.1: + resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} + engines: {node: '>= 0.8.0'} + dependencies: + prelude-ls: 1.2.1 + type-check: 0.4.0 + dev: false + /lie/3.3.0: resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==} dependencies: @@ -5004,6 +5138,10 @@ packages: lodash._reinterpolate: 3.0.0 dev: false + /lodash.truncate/4.4.2: + resolution: {integrity: sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=} + dev: false + /lodash.unescape/4.0.1: resolution: {integrity: sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=} dev: false @@ -5031,13 +5169,13 @@ packages: is-unicode-supported: 0.1.0 dev: false - /logform/2.2.0: - resolution: {integrity: sha512-N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg==} + /logform/2.4.0: + resolution: {integrity: sha512-CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw==} dependencies: - colors: 1.4.0 - fast-safe-stringify: 2.1.1 + '@colors/colors': 1.5.0 fecha: 4.2.0 ms: 2.1.3 + safe-stable-stringify: 2.3.1 triple-beam: 1.3.0 dev: false @@ -5482,11 +5620,11 @@ packages: path-to-regexp: 1.8.0 dev: false - /nise/5.1.0: - resolution: {integrity: sha512-W5WlHu+wvo3PaKLsJJkgPup2LrsXCcm7AWwyNZkUnn5rwPkuPBi3Iwk5SQtN0mv+K65k7nKKjwNQ30wg3wLAQQ==} + /nise/5.1.1: + resolution: {integrity: sha512-yr5kW2THW1AkxVmCnKEh4nbYkJdB3I7LUkiUgOvEkOp414mc2UMaHMA7pjq1nYowhdoJZGwEKGaQVbxfpWj10A==} dependencies: '@sinonjs/commons': 1.8.3 - '@sinonjs/fake-timers': 7.1.2 + '@sinonjs/fake-timers': 9.1.1 '@sinonjs/text-encoding': 0.7.1 just-extend: 4.1.0 path-to-regexp: 1.8.0 @@ -5557,6 +5695,8 @@ packages: dependencies: npm-registry-client: 8.6.0 snyk: 1.348.2 + transitivePeerDependencies: + - supports-color dev: false /npm-package-arg/6.1.1: @@ -5828,6 +5968,18 @@ packages: word-wrap: 1.2.3 dev: false + /optionator/0.9.1: + resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==} + engines: {node: '>= 0.8.0'} + dependencies: + deep-is: 0.1.3 + fast-levenshtein: 2.0.6 + levn: 0.4.1 + prelude-ls: 1.2.1 + type-check: 0.4.0 + word-wrap: 1.2.3 + dev: false + /ordered-read-streams/1.0.1: resolution: {integrity: sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=} dependencies: @@ -5937,13 +6089,15 @@ packages: resolution: {integrity: sha512-44DUg21G/liUZ48dJpUSjZnFfZro/0K5JTyFYLBcmh9+T6Ooi4/i4efwUiEy0+4oQusCBqWdhv16XohIj1GqnQ==} dependencies: agent-base: 4.3.0 - debug: 4.1.1 + debug: 4.3.2 get-uri: 2.0.4 http-proxy-agent: 2.1.0 https-proxy-agent: 3.0.1 pac-resolver: 3.0.0 raw-body: 2.4.1 socks-proxy-agent: 4.0.2 + transitivePeerDependencies: + - supports-color dev: false /pac-resolver/3.0.0: @@ -6193,6 +6347,11 @@ packages: engines: {node: '>= 0.8.0'} dev: false + /prelude-ls/1.2.1: + resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} + engines: {node: '>= 0.8.0'} + dev: false + /prepend-http/2.0.0: resolution: {integrity: sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=} engines: {node: '>=4'} @@ -6267,13 +6426,15 @@ packages: engines: {node: '>=6'} dependencies: agent-base: 4.3.0 - debug: 4.1.1 + debug: 4.3.2 http-proxy-agent: 2.1.0 https-proxy-agent: 3.0.1 lru-cache: 5.1.1 pac-proxy-agent: 3.0.1 proxy-from-env: 1.1.0 socks-proxy-agent: 4.0.2 + transitivePeerDependencies: + - supports-color dev: false /proxy-from-env/1.1.0: @@ -6469,6 +6630,11 @@ packages: engines: {node: '>=6.5.0'} dev: false + /regexpp/3.2.0: + resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==} + engines: {node: '>=8'} + dev: false + /registry-auth-token/4.1.1: resolution: {integrity: sha512-9bKS7nTl9+/A1s7tnPeGrUpRcVY+LUh7bfFgzpndALdPfXQBfQV77rQVtqgUV3ti4vc/Ik81Ex8UJDWDQ12zQA==} engines: {node: '>=6.0.0'} @@ -6672,10 +6838,10 @@ packages: resolution: {integrity: sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=} dev: false - /rewire/5.0.0: - resolution: {integrity: sha512-1zfitNyp9RH5UDyGGLe9/1N0bMlPQ0WrX0Tmg11kMHBpqwPJI4gfPpP7YngFyLbFmhXh19SToAG0sKKEFcOIJA==} + /rewire/6.0.0: + resolution: {integrity: sha512-7sZdz5dptqBCapJYocw9EcppLU62KMEqDLIILJnNET2iqzXHaQfaVP5SOJ06XvjX+dNIDJbzjw0ZWzrgDhtjYg==} dependencies: - eslint: 6.8.0 + eslint: 7.32.0 transitivePeerDependencies: - supports-color dev: false @@ -6727,6 +6893,11 @@ packages: ret: 0.1.15 dev: false + /safe-stable-stringify/2.3.1: + resolution: {integrity: sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg==} + engines: {node: '>=10'} + dev: false + /safer-buffer/2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} dev: false @@ -6869,22 +7040,22 @@ packages: is-arrayish: 0.3.2 dev: false - /sinon-test/2.4.3_sinon@11.1.2: + /sinon-test/2.4.3_sinon@13.0.1: resolution: {integrity: sha512-si0GRSeYtEFj67t/nyR5BKTWhFTerFJ7Xw88EIhUT5G99bpJ0HOxZiHuJ1DFqS6S7i0RqU23H9GaVxAVf/hxow==} peerDependencies: sinon: 2.x - 9.x dependencies: - sinon: 11.1.2 + sinon: 13.0.1 dev: false - /sinon/11.1.2: - resolution: {integrity: sha512-59237HChms4kg7/sXhiRcUzdSkKuydDeTiamT/jesUVHshBgL8XAmhgFo0GfK6RruMDM/iRSij1EybmMog9cJw==} + /sinon/13.0.1: + resolution: {integrity: sha512-8yx2wIvkBjIq/MGY1D9h1LMraYW+z1X0mb648KZnKSdvLasvDu7maa0dFaNYdTDczFgbjNw2tOmWdTk9saVfwQ==} dependencies: '@sinonjs/commons': 1.8.3 - '@sinonjs/fake-timers': 7.1.2 - '@sinonjs/samsam': 6.0.2 + '@sinonjs/fake-timers': 9.1.1 + '@sinonjs/samsam': 6.1.1 diff: 5.0.0 - nise: 5.1.0 + nise: 5.1.1 supports-color: 7.2.0 dev: false @@ -6909,6 +7080,15 @@ packages: is-fullwidth-code-point: 2.0.0 dev: false + /slice-ansi/4.0.0: + resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==} + engines: {node: '>=10'} + dependencies: + ansi-styles: 4.2.1 + astral-regex: 2.0.0 + is-fullwidth-code-point: 3.0.0 + dev: false + /slide/1.1.6: resolution: {integrity: sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=} dev: false @@ -6952,23 +7132,27 @@ packages: resolution: {integrity: sha512-3UlyogA67/9WOssJ7s4d7gqWQRWyO/LbgdBBNMhhmFDKa7eTUSW+A782CVHgyDSJZ2kNANcMWwMiOL+h3p6zQg==} dependencies: '@snyk/lodash': 4.17.15-patch - debug: 4.1.1 + debug: 4.3.2 nconf: 0.10.0 + transitivePeerDependencies: + - supports-color dev: false /snyk-config/3.1.1: resolution: {integrity: sha512-wwrMIEDozfLJ8LmakCsCC1FQ0siIX5icCQPCbUKKgRbeVsZ27NjPJs37BpTXX4rcHkaWpe8TbH3yOtp23qmszg==} dependencies: - debug: 4.1.1 + debug: 4.3.2 lodash.merge: 4.6.2 nconf: 0.10.0 + transitivePeerDependencies: + - supports-color dev: false /snyk-docker-plugin/3.12.3: resolution: {integrity: sha512-Ysv7ZDvXFt6K11f1m6wJaqYS3yM7c8YhzOIPoEmrYZW+4tL+Al5DiyKaAQBudbfYEA7xa6S6qGqE3QRitHZ5nQ==} dependencies: '@snyk/rpm-parser': 2.0.0 - debug: 4.1.1 + debug: 4.3.2 docker-modem: 2.1.3 dockerfile-ast: 0.0.19 event-loop-spinner: 1.1.0 @@ -6977,6 +7161,8 @@ packages: snyk-nodejs-lockfile-parser: 1.22.0 tar-stream: 2.1.2 tslib: 1.13.0 + transitivePeerDependencies: + - supports-color dev: false /snyk-go-parser/1.4.1: @@ -6991,10 +7177,12 @@ packages: resolution: {integrity: sha512-r/uaM3gk/RF7m/VGYswxlnA6I+kMgK3eVPsPyf7400BhqF8noh8K7v10CEg67mHA4JM0l7dZASqejr/5kKw9ZQ==} dependencies: '@snyk/graphlib': 2.1.9-patch - debug: 4.1.1 + debug: 4.3.2 snyk-go-parser: 1.4.1 tmp: 0.1.0 tslib: 1.13.0 + transitivePeerDependencies: + - supports-color dev: false /snyk-gradle-plugin/3.5.0: @@ -7004,9 +7192,11 @@ packages: '@snyk/dep-graph': 1.19.0 '@types/debug': 4.1.5 chalk: 3.0.0 - debug: 4.1.1 + debug: 4.3.2 tmp: 0.2.1 tslib: 2.0.0 + transitivePeerDependencies: + - supports-color dev: false /snyk-module/1.9.1: @@ -7028,8 +7218,10 @@ packages: /snyk-module/3.1.0: resolution: {integrity: sha512-HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw==} dependencies: - debug: 4.1.1 + debug: 4.3.2 hosted-git-info: 3.0.4 + transitivePeerDependencies: + - supports-color dev: false /snyk-mvn-plugin/2.17.1: @@ -7037,10 +7229,12 @@ packages: dependencies: '@snyk/cli-interface': 2.5.0 '@snyk/java-call-graph-builder': 1.10.0 - debug: 4.1.1 + debug: 4.3.2 needle: 2.5.0 tmp: 0.1.0 tslib: 1.11.1 + transitivePeerDependencies: + - supports-color dev: false /snyk-nodejs-lockfile-parser/1.22.0: @@ -7057,6 +7251,8 @@ packages: source-map-support: 0.5.19 tslib: 1.13.0 uuid: 3.4.0 + transitivePeerDependencies: + - supports-color dev: false /snyk-nuget-plugin/1.18.1: @@ -7064,12 +7260,14 @@ packages: engines: {node: '>=8'} dependencies: '@snyk/lodash': 4.17.15-patch - debug: 4.1.1 + debug: 4.3.2 dotnet-deps-parser: 4.10.0 jszip: 3.3.0 snyk-paket-parser: 1.6.0 tslib: 1.13.0 xml2js: 0.4.23 + transitivePeerDependencies: + - supports-color dev: false /snyk-paket-parser/1.6.0: @@ -7091,7 +7289,7 @@ packages: /snyk-policy/1.14.1: resolution: {integrity: sha512-C5vSkoBYxPnaqb218sm4m6N5s1BhIXlldpIX5xRNnZ0QkDwVj3dy/PfgwxRgVQh7QFGa1ajbvKmsGmm4RRsN8g==} dependencies: - debug: 4.1.1 + debug: 4.3.2 email-validator: 2.0.4 js-yaml: 3.14.0 lodash.clonedeep: 4.5.0 @@ -7100,6 +7298,8 @@ packages: snyk-resolve: 1.0.1 snyk-try-require: 1.3.1 then-fs: 2.0.0 + transitivePeerDependencies: + - supports-color dev: false /snyk-python-plugin/1.17.1: @@ -7141,11 +7341,13 @@ packages: /snyk-sbt-plugin/2.11.0: resolution: {integrity: sha512-wUqHLAa3MzV6sVO+05MnV+lwc+T6o87FZZaY+43tQPytBI2Wq23O3j4POREM4fa2iFfiQJoEYD6c7xmhiEUsSA==} dependencies: - debug: 4.1.1 + debug: 4.3.2 semver: 6.3.0 tmp: 0.1.0 tree-kill: 1.2.2 tslib: 1.13.0 + transitivePeerDependencies: + - supports-color dev: false /snyk-tree/1.0.0: @@ -7182,7 +7384,7 @@ packages: chalk: 2.4.2 cli-spinner: 0.2.10 configstore: 5.0.1 - debug: 4.1.1 + debug: 4.3.2 diff: 4.0.2 glob: 7.1.6 ipaddr.js: 1.9.1 @@ -7215,6 +7417,8 @@ packages: update-notifier: 4.1.0 uuid: 3.4.0 wrap-ansi: 5.1.0 + transitivePeerDependencies: + - supports-color dev: false /socks-proxy-agent/4.0.2: @@ -7424,13 +7628,13 @@ packages: strip-ansi: 5.2.0 dev: false - /string-width/4.2.0: - resolution: {integrity: sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==} + /string-width/4.2.3: + resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} engines: {node: '>=8'} dependencies: emoji-regex: 8.0.0 is-fullwidth-code-point: 3.0.0 - strip-ansi: 6.0.0 + strip-ansi: 6.0.1 dev: false /string.prototype.trimend/1.0.4: @@ -7493,11 +7697,11 @@ packages: ansi-regex: 4.1.0 dev: false - /strip-ansi/6.0.0: - resolution: {integrity: sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==} + /strip-ansi/6.0.1: + resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} engines: {node: '>=8'} dependencies: - ansi-regex: 5.0.0 + ansi-regex: 5.0.1 dev: false /strip-bom/2.0.0: @@ -7602,6 +7806,17 @@ packages: string-width: 3.1.0 dev: false + /table/6.8.0: + resolution: {integrity: sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==} + engines: {node: '>=10.0.0'} + dependencies: + ajv: 8.6.3 + lodash.truncate: 4.4.2 + slice-ansi: 4.0.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 + dev: false + /taffydb/2.6.2: resolution: {integrity: sha1-fLy2S1oUG2ou/CxdLGe04VCyomg=} dev: false @@ -7901,6 +8116,13 @@ packages: prelude-ls: 1.1.2 dev: false + /type-check/0.4.0: + resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} + engines: {node: '>= 0.8.0'} + dependencies: + prelude-ls: 1.2.1 + dev: false + /type-detect/4.0.8: resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==} engines: {node: '>=4'} @@ -7911,6 +8133,11 @@ packages: engines: {node: '>=8'} dev: false + /type-fest/0.20.2: + resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==} + engines: {node: '>=10'} + dev: false + /type-fest/0.8.1: resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==} engines: {node: '>=8'} @@ -8232,7 +8459,7 @@ packages: resolution: {integrity: sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==} engines: {node: '>=8'} dependencies: - string-width: 4.2.0 + string-width: 4.2.3 dev: false /window-size/0.1.4: @@ -8248,27 +8475,29 @@ packages: execa: 1.0.0 dev: false - /winston-transport/4.4.0: - resolution: {integrity: sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw==} + /winston-transport/4.5.0: + resolution: {integrity: sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==} engines: {node: '>= 6.4.0'} dependencies: - readable-stream: 2.3.7 + logform: 2.4.0 + readable-stream: 3.6.0 triple-beam: 1.3.0 dev: false - /winston/3.3.3: - resolution: {integrity: sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw==} - engines: {node: '>= 6.4.0'} + /winston/3.7.2: + resolution: {integrity: sha512-QziIqtojHBoyzUOdQvQiar1DH0Xp9nF1A1y7NVy2DGEsz82SBDtOalS0ulTRGVT14xPX3WRWkCsdcJKqNflKng==} + engines: {node: '>= 12.0.0'} dependencies: '@dabh/diagnostics': 2.0.2 - async: 3.2.0 + async: 3.2.3 is-stream: 2.0.0 - logform: 2.2.0 + logform: 2.4.0 one-time: 1.0.0 readable-stream: 3.6.0 + safe-stable-stringify: 2.3.1 stack-trace: 0.0.10 triple-beam: 1.3.0 - winston-transport: 4.4.0 + winston-transport: 4.5.0 dev: false /word-wrap/1.2.3: @@ -8306,8 +8535,8 @@ packages: engines: {node: '>=8'} dependencies: ansi-styles: 4.2.1 - string-width: 4.2.0 - strip-ansi: 6.0.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 dev: false /wrap-ansi/7.0.0: @@ -8315,8 +8544,8 @@ packages: engines: {node: '>=10'} dependencies: ansi-styles: 4.2.1 - string-width: 4.2.0 - strip-ansi: 6.0.0 + string-width: 4.2.3 + strip-ansi: 6.0.1 dev: false /wrappy/1.0.2: @@ -8427,6 +8656,11 @@ packages: engines: {node: '>=10'} dev: false + /yargs-parser/21.0.1: + resolution: {integrity: sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==} + engines: {node: '>=12'} + dev: false + /yargs-parser/5.0.0-security.0: resolution: {integrity: sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==} dependencies: @@ -8494,7 +8728,7 @@ packages: require-directory: 2.1.1 require-main-filename: 2.0.0 set-blocking: 2.0.0 - string-width: 4.2.0 + string-width: 4.2.3 which-module: 2.0.0 y18n: 4.0.0 yargs-parser: 18.1.3 @@ -8508,22 +8742,22 @@ packages: escalade: 3.1.1 get-caller-file: 2.0.5 require-directory: 2.1.1 - string-width: 4.2.0 + string-width: 4.2.3 y18n: 5.0.8 yargs-parser: 20.2.9 dev: false - /yargs/17.2.1: - resolution: {integrity: sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q==} + /yargs/17.4.0: + resolution: {integrity: sha512-WJudfrk81yWFSOkZYpAZx4Nt7V4xp7S/uJkX0CnxovMCt1wCE8LNftPpNuF9X/u9gN5nsD7ycYtRcDf2pL3UiA==} engines: {node: '>=12'} dependencies: cliui: 7.0.4 escalade: 3.1.1 get-caller-file: 2.0.5 require-directory: 2.1.1 - string-width: 4.2.0 + string-width: 4.2.3 y18n: 5.0.8 - yargs-parser: 20.2.9 + yargs-parser: 21.0.1 dev: false /yargs/3.32.0: @@ -8567,7 +8801,7 @@ packages: dev: false file:projects/fabric-contract-api.tgz: - resolution: {integrity: sha512-p8zXF+/vGT/zzhbAkmcSCGeGfFSP57bHnTkubgZxPIMHc2FVRx16KmNp126Usb5rueh97sYu518f8IoHH4E04w==, tarball: file:projects/fabric-contract-api.tgz} + resolution: {integrity: sha512-hM6mFMoWv1OH4benio/m6Hg41Q45cNoWGcX4obE3QO2h4k0PWgapjS6DcFPCdJwlVHjLRVOL/1NgxiD7ouph5w==, tarball: file:projects/fabric-contract-api.tgz} name: '@rush-temp/fabric-contract-api' version: 0.0.0 dependencies: @@ -8587,23 +8821,23 @@ packages: mocha: 9.1.3 nyc: 15.1.0 reflect-metadata: 0.1.13 - rewire: 5.0.0 - sinon: 11.1.2 + rewire: 6.0.0 + sinon: 13.0.1 typescript: 4.4.4 - winston: 3.3.3 + winston: 3.7.2 transitivePeerDependencies: - supports-color dev: false file:projects/fabric-e2e-tests.tgz: - resolution: {integrity: sha512-K9EaOCnJX0UUOvovT9JHlaue1GChTLibjhVvegh+xbb3eh7Xw3ghGGvHuu8uJs3wIBqkQUAvDOcMeT02PxiJhA==, tarball: file:projects/fabric-e2e-tests.tgz} + resolution: {integrity: sha512-YOAOzr41EwvgvVvJok9Ct+eUDwXdoCYX6EXNvONW3WG0G3r+6easV+QEpJLFppXTCTX59HetZ+ShQJGnCtN4fw==, tarball: file:projects/fabric-e2e-tests.tgz} name: '@rush-temp/fabric-e2e-tests' version: 0.0.0 dependencies: ajv: 6.12.6 ajv-cli: 3.2.1 delay: 5.0.0 - fs-extra: 10.0.0 + fs-extra: 10.0.1 git-rev-sync: 3.0.1 gulp: 4.0.2 ip: 1.1.5 @@ -8611,7 +8845,7 @@ packages: dev: false file:projects/fabric-ledger.tgz_@types+node@16.11.1: - resolution: {integrity: sha512-GqkRLuM4H0IWni58V5sSS0+l/96Y3FrJrGvxElQXJh7v/ynRFMbxRFsOk+557LisBVkOxbgks00tnvrG5EFwWw==, tarball: file:projects/fabric-ledger.tgz} + resolution: {integrity: sha512-oLHhlqFjkcg0u0fp31bhLJ9jgcPwj1I+/Iz6rgRisFYAKA6B0/5f3jjCxVzh5DuBwPHA8El1MZozZNMu802/Fw==, tarball: file:projects/fabric-ledger.tgz} id: file:projects/fabric-ledger.tgz name: '@rush-temp/fabric-ledger' version: 0.0.0 @@ -8627,14 +8861,14 @@ packages: mocha: 9.1.3 mockery: 2.1.0 nyc: 15.1.0 - rewire: 5.0.0 + rewire: 6.0.0 rimraf: 3.0.2 - sinon: 11.1.2 + sinon: 13.0.1 spec-junit-splitter-mocha-reporter: 1.0.1 ts-mockito: 2.6.1 ts-node: 10.2.1_4837b44df871fd426bb731ce8876dc42 typescript: 4.4.4 - winston: 3.3.3 + winston: 3.7.2 transitivePeerDependencies: - '@swc/core' - '@swc/wasm' @@ -8643,7 +8877,7 @@ packages: dev: false file:projects/fabric-nodeenv.tgz: - resolution: {integrity: sha512-qXnOIAv35GazU9LIB9RD/JPML1/Rd7wvF9t/DyyIMT65iH8g7Tm286mgI1+Oe25qmvWZtS7JnjFuNClZ6Y2Bng==, tarball: file:projects/fabric-nodeenv.tgz} + resolution: {integrity: sha512-Q2dwdQYFFjKYT5ovoW4AcnsnNNntOdCeawTPlFy8nUJyebp3QlENLKXVYTzE1CdAKIClR0PKO3Ywu2wo9C/Y5g==, tarball: file:projects/fabric-nodeenv.tgz} name: '@rush-temp/fabric-nodeenv' version: 0.0.0 dependencies: @@ -8660,7 +8894,7 @@ packages: dev: false file:projects/fabric-shim-crypto.tgz: - resolution: {integrity: sha512-SEoxGyd3jkA66HdyDnJynO7Y6d/aKwV63P3dLtSoRcfty8u8DzWlfuGvIAePa7Ex++nwJ8S7JDYso06OX2IEPg==, tarball: file:projects/fabric-shim-crypto.tgz} + resolution: {integrity: sha512-uzMOMYqU7vX8ag47wVjFMtiFD0qYbIzreJFEX3batuYrkscRvcSoYtz7jatc+DZygp9zd/86a1FHgDPJe1YgWg==, tarball: file:projects/fabric-shim-crypto.tgz} name: '@rush-temp/fabric-shim-crypto' version: 0.0.0 dependencies: @@ -8672,8 +8906,8 @@ packages: jsrsasign: 10.4.1 mocha: 9.1.3 nyc: 15.1.0 - rewire: 5.0.0 - sinon: 11.1.2 + rewire: 6.0.0 + sinon: 13.0.1 spec-junit-splitter-mocha-reporter: 1.0.1 typescript: 4.4.4 transitivePeerDependencies: @@ -8681,7 +8915,7 @@ packages: dev: false file:projects/fabric-shim-docs.tgz: - resolution: {integrity: sha512-JsWHy/2wTvAPp0uXM4Gk1SNozHFz6aOtsPTMrCbqA49OV7PA2SPdpFfYd0vmy8lBmcQ+LM5SQ+ptOpKFcr7d8A==, tarball: file:projects/fabric-shim-docs.tgz} + resolution: {integrity: sha512-saZQlFqsLrY8qTc/lD7KpLNSg3EedJJBJAQFyt7fd3rwkmPxG1h7UZHvi/4lU0tkCM/2kxXQ2wB8o2rMG4Bj1g==, tarball: file:projects/fabric-shim-docs.tgz} name: '@rush-temp/fabric-shim-docs' version: 0.0.0 dependencies: @@ -8691,7 +8925,7 @@ packages: dev: false file:projects/fabric-shim.tgz: - resolution: {integrity: sha512-Tvhg46oe+N0VsfYsStf5iBEaKYhRVM7Nog71W3v0NNnWJHZPoqjTAbo8aTAzF6CtNP9axT2fwM1nmsU4mJGPqQ==, tarball: file:projects/fabric-shim.tgz} + resolution: {integrity: sha512-2GRL/w0Am8UvAG/wAC7SuTulSSWD1CDOSj4CYSJ4tVhQFuFGGi69jy8GJeObgIPN7cgJAGT64QoKHSnW6KYdgA==, tarball: file:projects/fabric-shim.tgz} name: '@rush-temp/fabric-shim' version: 0.0.0 dependencies: @@ -8700,29 +8934,30 @@ packages: '@grpc/proto-loader': 0.6.6 '@types/node': 16.11.1 ajv: 6.12.6 + caniuse-lite: 1.0.30001325 chai: 4.3.4 chai-as-promised: 7.1.1_chai@4.3.4 chai-things: 0.2.0 cpx: 1.5.0 eslint: 6.8.0 - fs-extra: 10.0.0 + fs-extra: 10.0.1 mocha: 9.1.3 mockery: 2.1.0 nyc: 15.1.0 reflect-metadata: 0.1.13 - rewire: 5.0.0 + rewire: 6.0.0 rimraf: 3.0.2 - sinon: 11.1.2 + sinon: 13.0.1 spec-junit-splitter-mocha-reporter: 1.0.1 - winston: 3.3.3 - yargs: 17.2.1 - yargs-parser: 20.2.9 + winston: 3.7.2 + yargs: 17.4.0 + yargs-parser: 21.0.1 transitivePeerDependencies: - supports-color dev: false file:projects/fvtests.tgz: - resolution: {integrity: sha512-fESdPYabx8BYfVD2l16rVhzTOix0x/ZQo/N66Wc1a6jqji6iRN6uArxoW7XdJPwHXqNzwekddwe/Y2BQqWAwrQ==, tarball: file:projects/fvtests.tgz} + resolution: {integrity: sha512-0tf4VSUKzD8UHghmZ+2RVoP+mS8khC9BpZAau8XDbpeKvUTIyYNLAJJuc3YLX+RxaHdYJjamBbsg6yVmepEtVA==, tarball: file:projects/fvtests.tgz} name: '@rush-temp/fvtests' version: 0.0.0 dependencies: @@ -8735,7 +8970,7 @@ packages: del: 3.0.0 delay: 5.0.0 eslint: 6.8.0 - fs-extra: 10.0.0 + fs-extra: 10.0.1 git-rev-sync: 3.0.1 gulp: 4.0.2 ip: 1.1.5 @@ -8743,21 +8978,21 @@ packages: jsverify: 0.8.4 mocha: 9.1.3 mockery: 2.1.0 - rewire: 5.0.0 - sinon: 11.1.2 - sinon-test: 2.4.3_sinon@11.1.2 + rewire: 6.0.0 + sinon: 13.0.1 + sinon-test: 2.4.3_sinon@13.0.1 spec-junit-splitter-mocha-reporter: 1.0.1 transitivePeerDependencies: - supports-color dev: false file:projects/toolchain.tgz: - resolution: {integrity: sha512-8hlipejAhZ0jgHbNDPJNEmj1HhjLrJ5TmnB+RD6HUYV9qH1QP5geof+ZkV/zPWsAPL/qVldIkD1VtpCnwke02w==, tarball: file:projects/toolchain.tgz} + resolution: {integrity: sha512-W/quztgrRXRhdUqJtjX4QYts+Ry1MeaQRo+nJMrMEbkGkJwRlOHcB3JHQstc75F//5ZZ9oWMOF8LiV3EAw2MsQ==, tarball: file:projects/toolchain.tgz} name: '@rush-temp/toolchain' version: 0.0.0 dependencies: delay: 5.0.0 - fs-extra: 10.0.0 + fs-extra: 10.0.1 git-rev-sync: 3.0.1 gulp: 4.0.2 gulp-cli: 2.3.0 diff --git a/common/scripts/install-run-rush.js b/common/scripts/install-run-rush.js index 5afdb9ad..6e7c3b66 100644 --- a/common/scripts/install-run-rush.js +++ b/common/scripts/install-run-rush.js @@ -36,10 +36,10 @@ const fs = __importStar(require("fs")); const install_run_1 = require("./install-run"); const PACKAGE_NAME = '@microsoft/rush'; const RUSH_PREVIEW_VERSION = 'RUSH_PREVIEW_VERSION'; -function _getRushVersion() { +function _getRushVersion(logger) { const rushPreviewVersion = process.env[RUSH_PREVIEW_VERSION]; if (rushPreviewVersion !== undefined) { - console.log(`Using Rush version from environment variable ${RUSH_PREVIEW_VERSION}=${rushPreviewVersion}`); + logger.info(`Using Rush version from environment variable ${RUSH_PREVIEW_VERSION}=${rushPreviewVersion}`); return rushPreviewVersion; } const rushJsonFolder = (0, install_run_1.findRushJsonFolder)(); @@ -66,7 +66,27 @@ function _run() { if (!nodePath || !scriptPath) { throw new Error('Unexpected exception: could not detect node path or script path'); } - if (process.argv.length < 3) { + let commandFound = false; + let logger = { info: console.log, error: console.error }; + for (const arg of packageBinArgs) { + if (arg === '-q' || arg === '--quiet') { + // The -q/--quiet flag is supported by both `rush` and `rushx`, and will suppress + // any normal informational/diagnostic information printed during startup. + // + // To maintain the same user experience, the install-run* scripts pass along this + // flag but also use it to suppress any diagnostic information normally printed + // to stdout. + logger = { + info: () => { }, + error: console.error + }; + } + if (!arg.startsWith('-')) { + commandFound = true; + break; + } + } + if (!commandFound) { console.log(`Usage: ${scriptName} [args...]`); if (scriptName === 'install-run-rush.js') { console.log(`Example: ${scriptName} build --to myproject`); @@ -76,10 +96,10 @@ function _run() { } process.exit(1); } - (0, install_run_1.runWithErrorAndStatusCode)(() => { - const version = _getRushVersion(); - console.log(`The rush.json configuration requests Rush version ${version}`); - return (0, install_run_1.installAndRun)(PACKAGE_NAME, version, bin, packageBinArgs); + (0, install_run_1.runWithErrorAndStatusCode)(logger, () => { + const version = _getRushVersion(logger); + logger.info(`The rush.json configuration requests Rush version ${version}`); + return (0, install_run_1.installAndRun)(logger, PACKAGE_NAME, version, bin, packageBinArgs); }); } _run(); diff --git a/common/scripts/install-run.js b/common/scripts/install-run.js index fa5522e8..178cbe0b 100644 --- a/common/scripts/install-run.js +++ b/common/scripts/install-run.js @@ -79,9 +79,9 @@ function _parsePackageSpecifier(rawPackageSpecifier) { * * IMPORTANT: THIS CODE SHOULD BE KEPT UP TO DATE WITH Utilities.copyAndTrimNpmrcFile() */ -function _copyAndTrimNpmrcFile(sourceNpmrcPath, targetNpmrcPath) { - console.log(`Transforming ${sourceNpmrcPath}`); // Verbose - console.log(` --> "${targetNpmrcPath}"`); +function _copyAndTrimNpmrcFile(logger, sourceNpmrcPath, targetNpmrcPath) { + logger.info(`Transforming ${sourceNpmrcPath}`); // Verbose + logger.info(` --> "${targetNpmrcPath}"`); let npmrcFileLines = fs.readFileSync(sourceNpmrcPath).toString().split('\n'); npmrcFileLines = npmrcFileLines.map((line) => (line || '').trim()); const resultLines = []; @@ -125,16 +125,16 @@ function _copyAndTrimNpmrcFile(sourceNpmrcPath, targetNpmrcPath) { * * IMPORTANT: THIS CODE SHOULD BE KEPT UP TO DATE WITH Utilities._syncNpmrc() */ -function _syncNpmrc(sourceNpmrcFolder, targetNpmrcFolder, useNpmrcPublish) { +function _syncNpmrc(logger, sourceNpmrcFolder, targetNpmrcFolder, useNpmrcPublish) { const sourceNpmrcPath = path.join(sourceNpmrcFolder, !useNpmrcPublish ? '.npmrc' : '.npmrc-publish'); const targetNpmrcPath = path.join(targetNpmrcFolder, '.npmrc'); try { if (fs.existsSync(sourceNpmrcPath)) { - _copyAndTrimNpmrcFile(sourceNpmrcPath, targetNpmrcPath); + _copyAndTrimNpmrcFile(logger, sourceNpmrcPath, targetNpmrcPath); } else if (fs.existsSync(targetNpmrcPath)) { // If the source .npmrc doesn't exist and there is one in the target, delete the one in the target - console.log(`Deleting ${targetNpmrcPath}`); // Verbose + logger.info(`Deleting ${targetNpmrcPath}`); // Verbose fs.unlinkSync(targetNpmrcPath); } } @@ -215,7 +215,7 @@ function _getRushTempFolder(rushCommonFolder) { /** * Resolve a package specifier to a static version */ -function _resolvePackageVersion(rushCommonFolder, { name, version }) { +function _resolvePackageVersion(logger, rushCommonFolder, { name, version }) { if (!version) { version = '*'; // If no version is specified, use the latest version } @@ -229,7 +229,7 @@ function _resolvePackageVersion(rushCommonFolder, { name, version }) { try { const rushTempFolder = _getRushTempFolder(rushCommonFolder); const sourceNpmrcFolder = path.join(rushCommonFolder, 'config', 'rush'); - _syncNpmrc(sourceNpmrcFolder, rushTempFolder); + _syncNpmrc(logger, sourceNpmrcFolder, rushTempFolder); const npmPath = getNpmPath(); // This returns something that looks like: // @microsoft/rush@3.0.0 '3.0.0' @@ -350,9 +350,9 @@ function _createPackageJson(packageInstallFolder, name, version) { /** * Run "npm install" in the package install folder. */ -function _installPackage(packageInstallFolder, name, version) { +function _installPackage(logger, packageInstallFolder, name, version) { try { - console.log(`Installing ${name}...`); + logger.info(`Installing ${name}...`); const npmPath = getNpmPath(); const result = childProcess.spawnSync(npmPath, ['install'], { stdio: 'inherit', @@ -362,7 +362,7 @@ function _installPackage(packageInstallFolder, name, version) { if (result.status !== 0) { throw new Error('"npm install" encountered an error'); } - console.log(`Successfully installed ${name}@${version}`); + logger.info(`Successfully installed ${name}@${version}`); } catch (e) { throw new Error(`Unable to install package: ${e}`); @@ -388,7 +388,7 @@ function _writeFlagFile(packageInstallFolder) { throw new Error(`Unable to create installed.flag file in ${packageInstallFolder}`); } } -function installAndRun(packageName, packageVersion, packageBinName, packageBinArgs) { +function installAndRun(logger, packageName, packageVersion, packageBinName, packageBinArgs) { const rushJsonFolder = findRushJsonFolder(); const rushCommonFolder = path.join(rushJsonFolder, 'common'); const rushTempFolder = _getRushTempFolder(rushCommonFolder); @@ -397,14 +397,14 @@ function installAndRun(packageName, packageVersion, packageBinName, packageBinAr // The package isn't already installed _cleanInstallFolder(rushTempFolder, packageInstallFolder); const sourceNpmrcFolder = path.join(rushCommonFolder, 'config', 'rush'); - _syncNpmrc(sourceNpmrcFolder, packageInstallFolder); + _syncNpmrc(logger, sourceNpmrcFolder, packageInstallFolder); _createPackageJson(packageInstallFolder, packageName, packageVersion); - _installPackage(packageInstallFolder, packageName, packageVersion); + _installPackage(logger, packageInstallFolder, packageName, packageVersion); _writeFlagFile(packageInstallFolder); } const statusMessage = `Invoking "${packageBinName} ${packageBinArgs.join(' ')}"`; const statusMessageLine = new Array(statusMessage.length + 1).join('-'); - console.log(os.EOL + statusMessage + os.EOL + statusMessageLine + os.EOL); + logger.info(os.EOL + statusMessage + os.EOL + statusMessageLine + os.EOL); const binPath = _getBinPath(packageInstallFolder, packageBinName); const binFolderPath = path.resolve(packageInstallFolder, NODE_MODULES_FOLDER_NAME, '.bin'); // Windows environment variables are case-insensitive. Instead of using SpawnSyncOptions.env, we need to @@ -436,14 +436,14 @@ function installAndRun(packageName, packageVersion, packageBinName, packageBinAr } } exports.installAndRun = installAndRun; -function runWithErrorAndStatusCode(fn) { +function runWithErrorAndStatusCode(logger, fn) { process.exitCode = 1; try { const exitCode = fn(); process.exitCode = exitCode; } catch (e) { - console.error(os.EOL + os.EOL + e.toString() + os.EOL + os.EOL); + logger.error(os.EOL + os.EOL + e.toString() + os.EOL + os.EOL); } } exports.runWithErrorAndStatusCode = runWithErrorAndStatusCode; @@ -462,16 +462,17 @@ function _run() { console.log('Example: install-run.js qrcode@1.2.2 qrcode https://rushjs.io'); process.exit(1); } - runWithErrorAndStatusCode(() => { + const logger = { info: console.log, error: console.error }; + runWithErrorAndStatusCode(logger, () => { const rushJsonFolder = findRushJsonFolder(); const rushCommonFolder = _ensureAndJoinPath(rushJsonFolder, 'common'); const packageSpecifier = _parsePackageSpecifier(rawPackageSpecifier); const name = packageSpecifier.name; - const version = _resolvePackageVersion(rushCommonFolder, packageSpecifier); + const version = _resolvePackageVersion(logger, rushCommonFolder, packageSpecifier); if (packageSpecifier.version !== version) { console.log(`Resolved to ${name}@${version}`); } - return installAndRun(name, version, packageBinName, packageBinArgs); + return installAndRun(logger, name, version, packageBinName, packageBinArgs); }); } _run(); diff --git a/libraries/fabric-ledger/package.json b/libraries/fabric-ledger/package.json index b3289654..9cad7f04 100644 --- a/libraries/fabric-ledger/package.json +++ b/libraries/fabric-ledger/package.json @@ -50,7 +50,7 @@ }, "dependencies": { "fabric-contract-api": "2.4.1", - "winston": "^3.3.3" + "winston": "^3.7.2" }, "devDependencies": { "@types/chai": "^4.2.22", @@ -64,9 +64,9 @@ "mocha": "9.1.3", "mockery": "^2.1.0", "nyc": "15.1.0", - "rewire": "5.0.0", + "rewire": "6.0.0", "rimraf": "^3.0.2", - "sinon": "11.1.2", + "sinon": "13.0.1", "ts-node": "^10.2.1", "ts-mockito": "^2.6.1", "typescript": "4.4.4", diff --git a/libraries/fabric-shim-crypto/package.json b/libraries/fabric-shim-crypto/package.json index 06840e59..9ea12634 100644 --- a/libraries/fabric-shim-crypto/package.json +++ b/libraries/fabric-shim-crypto/package.json @@ -35,8 +35,8 @@ "typescript": "4.4.4", "chai": "^4.3.4", "chai-as-promised": "^7.1.1", - "rewire": "5.0.0", - "sinon": "11.1.2", + "rewire": "6.0.0", + "sinon": "13.0.1", "chai-things": "^0.2.0", "spec-junit-splitter-mocha-reporter": "1.0.1" }, diff --git a/libraries/fabric-shim/lib/cmds/metadata/generateCommand.js b/libraries/fabric-shim/lib/cmds/metadata/generateCommand.js index e7ec0fbc..ea6667af 100644 --- a/libraries/fabric-shim/lib/cmds/metadata/generateCommand.js +++ b/libraries/fabric-shim/lib/cmds/metadata/generateCommand.js @@ -20,5 +20,5 @@ module.exports.builder = (yargs) => { }; module.exports.handler = async (argv) => { - await Generate.handler(argv); + await Generate.handler(argv); }; diff --git a/libraries/fabric-shim/lib/cmds/serverCommand.js b/libraries/fabric-shim/lib/cmds/serverCommand.js index 9eaba68c..338db28b 100644 --- a/libraries/fabric-shim/lib/cmds/serverCommand.js +++ b/libraries/fabric-shim/lib/cmds/serverCommand.js @@ -58,7 +58,6 @@ exports.handler = async function (argv) { const Bootstrap = require('../contract-spi/bootstrap'); await Bootstrap.bootstrap(true); - console.log("Returning from hanlder") }; exports.getArgs = function (yargs) { diff --git a/libraries/fabric-shim/package.json b/libraries/fabric-shim/package.json index 3c7b6c5b..d241bfe8 100644 --- a/libraries/fabric-shim/package.json +++ b/libraries/fabric-shim/package.json @@ -61,11 +61,11 @@ "ajv": "^6.12.2", "fabric-contract-api": "2.4.1", "fabric-shim-api": "2.4.1", - "fs-extra": "^10.0.0", + "fs-extra": "^10.0.1", "reflect-metadata": "^0.1.13", - "winston": "^3.3.3", - "yargs": "^17.2.1", - "yargs-parser": "^20.2.9" + "winston": "^3.7.2", + "yargs": "^17.4.0", + "yargs-parser": "^21.0.1" }, "devDependencies": { "chai": "^4.3.4", @@ -76,9 +76,10 @@ "mocha": "9.1.3", "mockery": "^2.1.0", "nyc": "15.1.0", - "rewire": "5.0.0", + "rewire": "6.0.0", "rimraf": "^3.0.2", - "sinon": "11.1.2", - "spec-junit-splitter-mocha-reporter": "1.0.1" + "sinon": "13.0.1", + "spec-junit-splitter-mocha-reporter": "1.0.1", + "caniuse-lite": "~1.0.30001325" } } diff --git a/rush.json b/rush.json index 618d5269..b9541dc0 100644 --- a/rush.json +++ b/rush.json @@ -15,7 +15,7 @@ * path segment in the "$schema" field for all your Rush config files. This will ensure * correct error-underlining and tab-completion for editors such as VS Code. */ - "rushVersion": "5.55.0", + "rushVersion": "5.64.0", /** * The next field selects which package manager should be installed and determines its version. * Rush installs its own local copy of the package manager to ensure that your build process @@ -24,7 +24,7 @@ * Specify one of: "pnpmVersion", "npmVersion", or "yarnVersion". See the Rush documentation * for details about these alternatives. */ - "pnpmVersion": "6.16.1", + "pnpmVersion": "6.32.4", /** * Options that are only used when the PNPM package manager is selected */ diff --git a/test/e2e/package.json b/test/e2e/package.json index 6d4e31d0..b5835bd5 100644 --- a/test/e2e/package.json +++ b/test/e2e/package.json @@ -15,7 +15,7 @@ "gulp": "^4.0.2", "toolchain": "2.4.1", "delay": "5.0.0", - "fs-extra": "^10.0.0", + "fs-extra": "^10.0.1", "ip": "^1.1.5", "ajv": "^6.12.2", "ajv-cli": "^3.2.1", diff --git a/test/fv/package.json b/test/fv/package.json index de9fd3bc..aca4dd64 100644 --- a/test/fv/package.json +++ b/test/fv/package.json @@ -30,7 +30,7 @@ "fabric-shim": "2.4.1", "fabric-shim-api": "2.4.1", "fabric-shim-crypto": "2.4.1", - "fs-extra": "^10.0.0", + "fs-extra": "^10.0.1", "git-rev-sync": "3.0.1", "gulp": "^4.0.2", "ip": "^1.1.5", @@ -38,8 +38,8 @@ "jsverify": "~0.8.4", "mocha": "9.1.3", "mockery": "^2.1.0", - "rewire": "5.0.0", - "sinon": "11.1.2", + "rewire": "6.0.0", + "sinon": "13.0.1", "sinon-test": "^2.2.0", "spec-junit-splitter-mocha-reporter": "1.0.1" } diff --git a/tools/toolchain/package.json b/tools/toolchain/package.json index 8d67743c..bc49b937 100644 --- a/tools/toolchain/package.json +++ b/tools/toolchain/package.json @@ -12,7 +12,7 @@ "license": "Apache-2.0", "dependencies": { "delay": "5.0.0", - "fs-extra": "^10.0.0", + "fs-extra": "^10.0.1", "git-rev-sync": "3.0.1", "gulp-debug": "~4.0.0", "gulp-eslint": "~6.0.0",