From 94377de6eee28c58efbc13188d249accec1943ca Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 11 Dec 2021 02:45:52 +0200 Subject: [PATCH] chore: fix peer dependency issues --- .npmrc | 5 +- .pnpmfile.cjs | 6 + package.json | 3 +- pnpm-lock.yaml | 300 ++++++++------------------- privatePackages/prepare/package.json | 4 +- utils/eslint-config/package.json | 1 + 6 files changed, 101 insertions(+), 218 deletions(-) diff --git a/.npmrc b/.npmrc index 7ba762fa4e..01319826ae 100644 --- a/.npmrc +++ b/.npmrc @@ -7,7 +7,4 @@ shared-workspace-lockfile = true use-beta-cli = true publish-branch = main pnpmfile = .pnpmfile.cjs - -; Temporarily commenting out. -; peer dependencies should be resolved from dependencies of the root workspace package -; strict-peer-dependencies = true +strict-peer-dependencies = true diff --git a/.pnpmfile.cjs b/.pnpmfile.cjs index 27696dd5b2..be21cf484b 100644 --- a/.pnpmfile.cjs +++ b/.pnpmfile.cjs @@ -4,6 +4,12 @@ module.exports = { if (typeof pkg.repository === 'string' && pkg.repository.startsWith('https://github.com/pnpm/pnpm/')) { pkg.devDependencies[pkg.name] = 'link:' } + if (pkg.peerDependencies['eslint']) { + pkg.peerDependencies['eslint'] = '*' + } + if (pkg.peerDependencies['@typescript-eslint/eslint-plugin'] === '^4.0.1') { + pkg.peerDependencies['@typescript-eslint/eslint-plugin'] = '^5.6.0' + } return pkg } } diff --git a/package.json b/package.json index 1a4bc39010..8615d836c6 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "@babel/plugin-proposal-dynamic-import": "^7.16.0", "@babel/plugin-transform-modules-commonjs": "^7.16.0", "@babel/preset-typescript": "^7.16.0", + "@babel/types": "^7.16.0", "@changesets/cli": "^2.17.0", "@commitlint/cli": "^15.0.0", "@commitlint/config-conventional": "^15.0.0", @@ -37,7 +38,7 @@ "@pnpm/meta-updater": "0.0.6", "@pnpm/registry-mock": "^2.11.0", "@pnpm/tsconfig": "workspace:*", - "@types/jest": "^26.0.24", + "@types/jest": "^27.0.0", "@types/node": "^14.17.32", "c8": "^7.10.0", "cross-env": "^7.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 52baab267b..4bed01c096 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -34,6 +34,7 @@ importers: '@babel/plugin-proposal-dynamic-import': ^7.16.0 '@babel/plugin-transform-modules-commonjs': ^7.16.0 '@babel/preset-typescript': ^7.16.0 + '@babel/types': ^7.16.0 '@changesets/cli': ^2.17.0 '@commitlint/cli': ^15.0.0 '@commitlint/config-conventional': ^15.0.0 @@ -42,7 +43,7 @@ importers: '@pnpm/meta-updater': 0.0.6 '@pnpm/registry-mock': ^2.11.0 '@pnpm/tsconfig': workspace:* - '@types/jest': ^26.0.24 + '@types/jest': ^27.0.0 '@types/node': ^14.17.32 c8: ^7.10.0 cross-env: ^7.0.3 @@ -65,6 +66,7 @@ importers: '@babel/plugin-proposal-dynamic-import': 7.16.0_@babel+core@7.16.0 '@babel/plugin-transform-modules-commonjs': 7.16.0_@babel+core@7.16.0 '@babel/preset-typescript': 7.16.0_@babel+core@7.16.0 + '@babel/types': 7.16.0 '@changesets/cli': 2.18.1 '@commitlint/cli': 15.0.0 '@commitlint/config-conventional': 15.0.0 @@ -73,20 +75,20 @@ importers: '@pnpm/meta-updater': 0.0.6 '@pnpm/registry-mock': 2.11.0 '@pnpm/tsconfig': link:utils/tsconfig - '@types/jest': 26.0.24 + '@types/jest': 27.0.3 '@types/node': 14.18.0 c8: 7.10.0 cross-env: 7.0.3 eslint: 8.4.1 husky: 7.0.4 - jest: 27.4.4_ts-node@10.4.0 + jest: 27.4.4_e83fc80d152deb3eb830e2185b3d9fcf lcov-result-merger: 3.1.0 npm-run-all: 4.1.5 publish-packed: 4.0.2 rimraf: 3.0.2 shx: 0.3.3 syncpack: 5.8.15 - ts-jest: 27.0.7_0774b55ea5653110e8039f4446cabd20 + ts-jest: 27.0.7_2d8382365f4ad04f5c41d8e6387d1eb9 ts-node: 10.4.0_5fa3e012ffda681857188eee90261f55 typescript: 4.5.2 verdaccio: 5.2.2 @@ -3413,8 +3415,6 @@ importers: '@pnpm/assert-project': workspace:* '@pnpm/types': workspace:7.6.0 '@types/node': ^14.17.32 - tslint-config-standard: 9.0.0 - tslint-eslint-rules: 5.4.0 unique-string: ^2.0.0 write-json5-file: ^3.1.0 write-pkg: 4.0.0 @@ -3428,8 +3428,6 @@ importers: write-yaml-file: 4.2.0 devDependencies: '@types/node': 14.18.0 - tslint-config-standard: 9.0.0_typescript@4.5.2 - tslint-eslint-rules: 5.4.0_typescript@4.5.2 privatePackages/test-fixtures: specifiers: @@ -3457,12 +3455,14 @@ importers: specifiers: '@pnpm/eslint-config': 'link:' '@typescript-eslint/eslint-plugin': ^5.0.0 + '@typescript-eslint/parser': ^5.0.0 eslint-config-standard-with-typescript: ^21.0.1 eslint-plugin-import: ^2.22.1 eslint-plugin-node: ^11.1.0 eslint-plugin-promise: ^5.0.0 dependencies: - '@typescript-eslint/eslint-plugin': 5.6.0_eslint@8.4.1+typescript@4.5.2 + '@typescript-eslint/eslint-plugin': 5.6.0_16d83f5c41c3abb1061a82b07c18e4f3 + '@typescript-eslint/parser': 5.6.0_eslint@8.4.1+typescript@4.5.2 eslint-config-standard-with-typescript: 21.0.1_0df57457d31906dbf937b1ec93a5d21c eslint-plugin-import: 2.25.3_eslint@8.4.1 eslint-plugin-node: 11.1.0_eslint@8.4.1 @@ -3719,14 +3719,6 @@ packages: '@babel/types': 7.13.12 dev: true - /@babel/parser/7.16.4: - resolution: {integrity: sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==} - engines: {node: '>=6.0.0'} - hasBin: true - peerDependencies: - '@babel/types': '*' - dev: true - /@babel/parser/7.16.4_@babel+types@7.16.0: resolution: {integrity: sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==} engines: {node: '>=6.0.0'} @@ -4417,7 +4409,7 @@ packages: slash: 3.0.0 dev: true - /@jest/core/27.4.4_ts-node@10.4.0: + /@jest/core/27.4.4_e83fc80d152deb3eb830e2185b3d9fcf: resolution: {integrity: sha512-xBNPVqYAdAiAMXnb4ugx9Cdmr0S52lBsLbQMR/sGBRO0810VSPKiuSDtuup6qdkK1e9vxbv3KK3IAP1QFAp8mw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} peerDependencies: @@ -4427,9 +4419,9 @@ packages: optional: true dependencies: '@jest/console': 27.4.2 - '@jest/reporters': 27.4.4 + '@jest/reporters': 27.4.4_@babel+types@7.16.0 '@jest/test-result': 27.4.2 - '@jest/transform': 27.4.4 + '@jest/transform': 27.4.4_@babel+types@7.16.0 '@jest/types': 27.4.2 '@types/node': 14.18.0 ansi-escapes: 4.3.2 @@ -4438,14 +4430,14 @@ packages: exit: 0.1.2 graceful-fs: 4.2.8 jest-changed-files: 27.4.2 - jest-config: 27.4.4_ts-node@10.4.0 + jest-config: 27.4.4_e83fc80d152deb3eb830e2185b3d9fcf jest-haste-map: 27.4.4 jest-message-util: 27.4.2 jest-regex-util: 27.4.0 jest-resolve: 27.4.4 jest-resolve-dependencies: 27.4.4 - jest-runner: 27.4.4 - jest-runtime: 27.4.4 + jest-runner: 27.4.4_@babel+types@7.16.0 + jest-runtime: 27.4.4_@babel+types@7.16.0 jest-snapshot: 27.4.4 jest-util: 27.4.2 jest-validate: 27.4.2 @@ -4494,7 +4486,7 @@ packages: expect: 27.4.2 dev: true - /@jest/reporters/27.4.4: + /@jest/reporters/27.4.4_@babel+types@7.16.0: resolution: {integrity: sha512-ssyJSw9B9Awb1QaxDhIPSs4de1b7SE2kv7tqFehQL13xpn5HUkMYZK/ufTOXiCAnXFOZS+XDl1GaQ/LmJAzI1A==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} peerDependencies: @@ -4506,7 +4498,7 @@ packages: '@bcoe/v8-coverage': 0.2.3 '@jest/console': 27.4.2 '@jest/test-result': 27.4.2 - '@jest/transform': 27.4.4 + '@jest/transform': 27.4.4_@babel+types@7.16.0 '@jest/types': 27.4.2 '@types/node': 14.18.0 chalk: 4.1.2 @@ -4552,38 +4544,14 @@ packages: collect-v8-coverage: 1.0.1 dev: true - /@jest/test-sequencer/27.4.4: + /@jest/test-sequencer/27.4.4_@babel+types@7.16.0: resolution: {integrity: sha512-mCh+d4JTGTtX7vr13d7q2GHJy33nAobEwtEJ8X3u7R8+0ImVO2eAsQzsLfX8lyvdYHBxYABhqbYuaUNo42/pQw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/test-result': 27.4.2 graceful-fs: 4.2.8 jest-haste-map: 27.4.4 - jest-runtime: 27.4.4 - transitivePeerDependencies: - - '@babel/types' - - supports-color - dev: true - - /@jest/transform/27.4.4: - resolution: {integrity: sha512-7U/nDSrGsGzL7+X8ScNFV71w8u8knJQWSa9C2xsrrKLMOgb+rWuCG4VAyWke/53BU96GnT+Ka81xCAHA5gk6zA==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - dependencies: - '@babel/core': 7.16.0 - '@jest/types': 27.4.2 - babel-plugin-istanbul: 6.1.1 - chalk: 4.1.2 - convert-source-map: 1.8.0 - fast-json-stable-stringify: 2.1.0 - graceful-fs: 4.2.8 - jest-haste-map: 27.4.4 - jest-regex-util: 27.4.0 - jest-util: 27.4.2 - micromatch: 4.0.4 - pirates: 4.0.4 - slash: 3.0.0 - source-map: 0.6.1 - write-file-atomic: 3.0.3 + jest-runtime: 27.4.4_@babel+types@7.16.0 transitivePeerDependencies: - '@babel/types' - supports-color @@ -4613,17 +4581,6 @@ packages: - supports-color dev: true - /@jest/types/26.6.2: - resolution: {integrity: sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==} - engines: {node: '>= 10.14.2'} - dependencies: - '@types/istanbul-lib-coverage': 2.0.3 - '@types/istanbul-reports': 3.0.1 - '@types/node': 14.18.0 - '@types/yargs': 15.0.14 - chalk: 4.1.2 - dev: true - /@jest/types/27.4.2: resolution: {integrity: sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -5239,11 +5196,11 @@ packages: '@types/istanbul-lib-report': 3.0.0 dev: true - /@types/jest/26.0.24: - resolution: {integrity: sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==} + /@types/jest/27.0.3: + resolution: {integrity: sha512-cmmwv9t7gBYt7hNKH5Spu7Kuu/DotGa+Ff+JGRKZ4db5eh8PnKS4LuebJ3YLUoyOyIHraTGyULn23YtEAm0VSg==} dependencies: - jest-diff: 26.6.2 - pretty-format: 26.6.2 + jest-diff: 27.4.2 + pretty-format: 27.4.2 dev: true /@types/js-yaml/4.0.5: @@ -5459,12 +5416,6 @@ packages: resolution: {integrity: sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==} dev: true - /@types/yargs/15.0.14: - resolution: {integrity: sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==} - dependencies: - '@types/yargs-parser': 20.2.1 - dev: true - /@types/yargs/16.0.4: resolution: {integrity: sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==} dependencies: @@ -5475,18 +5426,19 @@ packages: resolution: {integrity: sha512-8NYnGOctzsI4W0ApsP/BIHD/LnxpJ6XaGf2AZmz4EyDYJMxtprN4279dLNI1CPZcwC9H18qYcaFv4bXi0wmokg==} dev: true - /@typescript-eslint/eslint-plugin/5.6.0_eslint@8.4.1+typescript@4.5.2: + /@typescript-eslint/eslint-plugin/5.6.0_16d83f5c41c3abb1061a82b07c18e4f3: resolution: {integrity: sha512-MIbeMy5qfLqtgs1hWd088k1hOuRsN9JrHUPwVVKCD99EOUqScd7SrwoZl4Gso05EAP9w1kvLWUVGJOVpRPkDPA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: '@typescript-eslint/parser': ^5.0.0 - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + eslint: '*' typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: '@typescript-eslint/experimental-utils': 5.6.0_eslint@8.4.1+typescript@4.5.2 + '@typescript-eslint/parser': 5.6.0_eslint@8.4.1+typescript@4.5.2 '@typescript-eslint/scope-manager': 5.6.0 debug: 4.3.3 eslint: 8.4.1 @@ -5522,7 +5474,7 @@ packages: resolution: {integrity: sha512-ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: - eslint: ^5.0.0 || ^6.0.0 || ^7.0.0 + eslint: '*' typescript: '*' peerDependenciesMeta: typescript: @@ -5538,6 +5490,26 @@ packages: - supports-color dev: false + /@typescript-eslint/parser/5.6.0_eslint@8.4.1+typescript@4.5.2: + resolution: {integrity: sha512-YVK49NgdUPQ8SpCZaOpiq1kLkYRPMv9U5gcMrywzI8brtwZjr/tG3sZpuHyODt76W/A0SufNjYt9ZOgrC4tLIQ==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: '*' + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/scope-manager': 5.6.0 + '@typescript-eslint/types': 5.6.0 + '@typescript-eslint/typescript-estree': 5.6.0_typescript@4.5.2 + debug: 4.3.3 + eslint: 8.4.1 + typescript: 4.5.2 + transitivePeerDependencies: + - supports-color + dev: false + /@typescript-eslint/scope-manager/4.33.0: resolution: {integrity: sha512-5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ==} engines: {node: ^8.10.0 || ^10.13.0 || >=11.10.1} @@ -6591,17 +6563,17 @@ packages: resolution: {integrity: sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==} dev: true - /babel-jest/27.4.4_@babel+core@7.16.0: + /babel-jest/27.4.4_106e11afe8da511401c8519eddabf86d: resolution: {integrity: sha512-+6RVutZxOQgJkt4svgTHPFtOQlVe9dUg3wrimIAM38pY6hL/nsL8glfFSUjD9jNVjaVjzkCzj6loFFecrjr9Qw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} peerDependencies: '@babel/core': ^7.8.0 dependencies: '@babel/core': 7.16.0 - '@jest/transform': 27.4.4 + '@jest/transform': 27.4.4_@babel+types@7.16.0 '@jest/types': 27.4.2 '@types/babel__core': 7.1.17 - babel-plugin-istanbul: 6.1.1 + babel-plugin-istanbul: 6.1.1_@babel+types@7.16.0 babel-preset-jest: 27.4.0_@babel+core@7.16.0 chalk: 4.1.2 graceful-fs: 4.2.8 @@ -6617,20 +6589,6 @@ packages: object.assign: 4.1.2 dev: true - /babel-plugin-istanbul/6.1.1: - resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==} - engines: {node: '>=8'} - dependencies: - '@babel/helper-plugin-utils': 7.14.5 - '@istanbuljs/load-nyc-config': 1.1.0 - '@istanbuljs/schema': 0.1.3 - istanbul-lib-instrument: 5.1.0 - test-exclude: 6.0.0 - transitivePeerDependencies: - - '@babel/types' - - supports-color - dev: true - /babel-plugin-istanbul/6.1.1_@babel+types@7.16.0: resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==} engines: {node: '>=8'} @@ -7295,6 +7253,7 @@ packages: /code-point-at/1.1.0: resolution: {integrity: sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=} engines: {node: '>=0.10.0'} + dev: true /collapse-white-space/1.0.6: resolution: {integrity: sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==} @@ -7972,11 +7931,6 @@ packages: lodash.deburr: 4.1.0 dev: false - /diff-sequences/26.6.2: - resolution: {integrity: sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==} - engines: {node: '>= 10.14.2'} - dev: true - /diff-sequences/27.4.0: resolution: {integrity: sha512-YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -8019,14 +7973,6 @@ packages: dependencies: path-temp: 2.0.0 - /doctrine/0.7.2: - resolution: {integrity: sha1-fLhgNZujvpDgQLJrcpzkv6ZUxSM=} - engines: {node: '>=0.10.0'} - dependencies: - esutils: 1.1.6 - isarray: 0.0.1 - dev: true - /doctrine/2.1.0: resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==} engines: {node: '>=0.10.0'} @@ -8449,14 +8395,14 @@ packages: /eslint-config-standard-with-typescript/21.0.1_0df57457d31906dbf937b1ec93a5d21c: resolution: {integrity: sha512-FeiMHljEJ346Y0I/HpAymNKdrgKEpHpcg/D93FvPHWfCzbT4QyUJba/0FwntZeGLXfUiWDSeKmdJD597d9wwiw==} peerDependencies: - '@typescript-eslint/eslint-plugin': ^4.0.1 - eslint: ^7.12.1 + '@typescript-eslint/eslint-plugin': ^5.6.0 + eslint: '*' eslint-plugin-import: ^2.22.1 eslint-plugin-node: ^11.1.0 eslint-plugin-promise: ^4.2.1 || ^5.0.0 typescript: ^3.9 || ^4.0.0 dependencies: - '@typescript-eslint/eslint-plugin': 5.6.0_eslint@8.4.1+typescript@4.5.2 + '@typescript-eslint/eslint-plugin': 5.6.0_16d83f5c41c3abb1061a82b07c18e4f3 '@typescript-eslint/parser': 4.33.0_eslint@8.4.1+typescript@4.5.2 eslint: 8.4.1 eslint-config-standard: 16.0.3_79a23b4ffc45aed4cdeb891cd82eaee3 @@ -8471,7 +8417,7 @@ packages: /eslint-config-standard/16.0.3_79a23b4ffc45aed4cdeb891cd82eaee3: resolution: {integrity: sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg==} peerDependencies: - eslint: ^7.12.1 + eslint: '*' eslint-plugin-import: ^2.22.1 eslint-plugin-node: ^11.1.0 eslint-plugin-promise: ^4.2.1 || ^5.0.0 @@ -8509,7 +8455,7 @@ packages: resolution: {integrity: sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==} engines: {node: '>=8.10.0'} peerDependencies: - eslint: '>=4.19.1' + eslint: '*' dependencies: eslint: 8.4.1 eslint-utils: 2.1.0 @@ -8520,7 +8466,7 @@ packages: resolution: {integrity: sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg==} engines: {node: '>=4'} peerDependencies: - eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 + eslint: '*' dependencies: array-includes: 3.1.4 array.prototype.flat: 1.2.5 @@ -8542,7 +8488,7 @@ packages: resolution: {integrity: sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==} engines: {node: '>=8.10.0'} peerDependencies: - eslint: '>=5.16.0' + eslint: '*' dependencies: eslint: 8.4.1 eslint-plugin-es: 3.0.1_eslint@8.4.1 @@ -8557,7 +8503,7 @@ packages: resolution: {integrity: sha512-SftLb1pUG01QYq2A/hGAWfDRXqYD82zE7j7TopDOyNdU+7SvvoXREls/+PRTY17vUXzXnZA/zfnyKgRH6x4JJw==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: - eslint: ^7.0.0 + eslint: '*' dependencies: eslint: 8.4.1 dev: false @@ -8589,7 +8535,7 @@ packages: resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==} engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0} peerDependencies: - eslint: '>=5' + eslint: '*' dependencies: eslint: 8.4.1 eslint-visitor-keys: 2.1.0 @@ -8694,11 +8640,6 @@ packages: resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} engines: {node: '>=4.0'} - /esutils/1.1.6: - resolution: {integrity: sha1-wBzKqa5LiXxtDD4hCuUvPHqEQ3U=} - engines: {node: '>=0.10.0'} - dev: true - /esutils/2.0.3: resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} engines: {node: '>=0.10.0'} @@ -10151,6 +10092,7 @@ packages: engines: {node: '>=0.10.0'} dependencies: number-is-nan: 1.0.1 + dev: true /is-fullwidth-code-point/2.0.0: resolution: {integrity: sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=} @@ -10415,20 +10357,6 @@ packages: - supports-color dev: true - /istanbul-lib-instrument/5.1.0: - resolution: {integrity: sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==} - engines: {node: '>=8'} - dependencies: - '@babel/core': 7.16.0 - '@babel/parser': 7.16.4 - '@istanbuljs/schema': 0.1.3 - istanbul-lib-coverage: 3.2.0 - semver: 6.3.0 - transitivePeerDependencies: - - '@babel/types' - - supports-color - dev: true - /istanbul-lib-instrument/5.1.0_@babel+types@7.16.0: resolution: {integrity: sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==} engines: {node: '>=8'} @@ -10472,7 +10400,7 @@ packages: throat: 6.0.1 dev: true - /jest-circus/27.4.4: + /jest-circus/27.4.4_@babel+types@7.16.0: resolution: {integrity: sha512-4DWhvQerDq5X4GaqhEUoZiBhuNdKDGr0geW0iJwarbDljAmGaGOErKQG+z2PBr0vgN05z7tsGSY51mdWr8E4xg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: @@ -10488,7 +10416,7 @@ packages: jest-each: 27.4.2 jest-matcher-utils: 27.4.2 jest-message-util: 27.4.2 - jest-runtime: 27.4.4 + jest-runtime: 27.4.4_@babel+types@7.16.0 jest-snapshot: 27.4.4 jest-util: 27.4.2 pretty-format: 27.4.2 @@ -10500,7 +10428,7 @@ packages: - supports-color dev: true - /jest-cli/27.4.4_ts-node@10.4.0: + /jest-cli/27.4.4_e83fc80d152deb3eb830e2185b3d9fcf: resolution: {integrity: sha512-+MfsHnZPUOBigCBURuQFRpgYoPCgmIFkICkqt4SrramZCUp/UAuWcst4pMZb84O3VU8JyKJmnpGG4qH8ClQloA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} hasBin: true @@ -10510,14 +10438,14 @@ packages: node-notifier: optional: true dependencies: - '@jest/core': 27.4.4_ts-node@10.4.0 + '@jest/core': 27.4.4_e83fc80d152deb3eb830e2185b3d9fcf '@jest/test-result': 27.4.2 '@jest/types': 27.4.2 chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.8 import-local: 3.0.3 - jest-config: 27.4.4_ts-node@10.4.0 + jest-config: 27.4.4_e83fc80d152deb3eb830e2185b3d9fcf jest-util: 27.4.2 jest-validate: 27.4.2 prompts: 2.4.2 @@ -10531,7 +10459,7 @@ packages: - utf-8-validate dev: true - /jest-config/27.4.4_ts-node@10.4.0: + /jest-config/27.4.4_e83fc80d152deb3eb830e2185b3d9fcf: resolution: {integrity: sha512-6lxg0ugO6KS2zKEbpdDwBzu1IT0Xg4/VhxXMuBu+z/5FvBjLCEMTaWQm3bCaGCZUR9j9FK4DzUIxyhIgn6kVEg==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} peerDependencies: @@ -10541,22 +10469,22 @@ packages: optional: true dependencies: '@babel/core': 7.16.0 - '@jest/test-sequencer': 27.4.4 + '@jest/test-sequencer': 27.4.4_@babel+types@7.16.0 '@jest/types': 27.4.2 - babel-jest: 27.4.4_@babel+core@7.16.0 + babel-jest: 27.4.4_106e11afe8da511401c8519eddabf86d chalk: 4.1.2 ci-info: 3.3.0 deepmerge: 4.2.2 glob: 7.2.0 graceful-fs: 4.2.8 - jest-circus: 27.4.4 + jest-circus: 27.4.4_@babel+types@7.16.0 jest-environment-jsdom: 27.4.4 jest-environment-node: 27.4.4 jest-get-type: 27.4.0 - jest-jasmine2: 27.4.4 + jest-jasmine2: 27.4.4_@babel+types@7.16.0 jest-regex-util: 27.4.0 jest-resolve: 27.4.4 - jest-runner: 27.4.4 + jest-runner: 27.4.4_@babel+types@7.16.0 jest-util: 27.4.2 jest-validate: 27.4.2 micromatch: 4.0.4 @@ -10571,16 +10499,6 @@ packages: - utf-8-validate dev: true - /jest-diff/26.6.2: - resolution: {integrity: sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==} - engines: {node: '>= 10.14.2'} - dependencies: - chalk: 4.1.2 - diff-sequences: 26.6.2 - jest-get-type: 26.3.0 - pretty-format: 26.6.2 - dev: true - /jest-diff/27.4.2: resolution: {integrity: sha512-ujc9ToyUZDh9KcqvQDkk/gkbf6zSaeEg9AiBxtttXW59H/AcqEYp1ciXAtJp+jXWva5nAf/ePtSsgWwE5mqp4Q==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -10639,11 +10557,6 @@ packages: jest-util: 27.4.2 dev: true - /jest-get-type/26.3.0: - resolution: {integrity: sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==} - engines: {node: '>= 10.14.2'} - dev: true - /jest-get-type/27.4.0: resolution: {integrity: sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -10669,7 +10582,7 @@ packages: fsevents: 2.3.2 dev: true - /jest-jasmine2/27.4.4: + /jest-jasmine2/27.4.4_@babel+types@7.16.0: resolution: {integrity: sha512-ygk2tUgtLeN3ouj4KEYw9p81GLI1EKrnvourPULN5gdgB482PH5op9gqaRG0IenbJhBbbRwiSvh5NoBoQZSqdA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: @@ -10686,7 +10599,7 @@ packages: jest-each: 27.4.2 jest-matcher-utils: 27.4.2 jest-message-util: 27.4.2 - jest-runtime: 27.4.4 + jest-runtime: 27.4.4_@babel+types@7.16.0 jest-snapshot: 27.4.4 jest-util: 27.4.2 pretty-format: 27.4.2 @@ -10781,14 +10694,14 @@ packages: slash: 3.0.0 dev: true - /jest-runner/27.4.4: + /jest-runner/27.4.4_@babel+types@7.16.0: resolution: {integrity: sha512-AXv/8Q0Xf1puWnDf52m7oLrK7sXcv6re0V/kItwTSVHJbX7Oebm07oGFQqGmq0R0mhO1zpmB3OpqRuaCN2elPA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/console': 27.4.2 '@jest/environment': 27.4.4 '@jest/test-result': 27.4.2 - '@jest/transform': 27.4.4 + '@jest/transform': 27.4.4_@babel+types@7.16.0 '@jest/types': 27.4.2 '@types/node': 14.18.0 chalk: 4.1.2 @@ -10802,7 +10715,7 @@ packages: jest-leak-detector: 27.4.2 jest-message-util: 27.4.2 jest-resolve: 27.4.4 - jest-runtime: 27.4.4 + jest-runtime: 27.4.4_@babel+types@7.16.0 jest-util: 27.4.2 jest-worker: 27.4.4 source-map-support: 0.5.21 @@ -10815,7 +10728,7 @@ packages: - utf-8-validate dev: true - /jest-runtime/27.4.4: + /jest-runtime/27.4.4_@babel+types@7.16.0: resolution: {integrity: sha512-tZGay6P6vXJq8t4jVFAUzYHx+lzIHXjz+rj1XBk6mAR1Lwtf5kz0Uun7qNuU+oqpZu4+hhuxpUfXb6j30bEPqA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: @@ -10824,7 +10737,7 @@ packages: '@jest/globals': 27.4.4 '@jest/source-map': 27.4.0 '@jest/test-result': 27.4.2 - '@jest/transform': 27.4.4 + '@jest/transform': 27.4.4_@babel+types@7.16.0 '@jest/types': 27.4.2 '@types/yargs': 16.0.4 chalk: 4.1.2 @@ -10936,7 +10849,7 @@ packages: supports-color: 8.1.1 dev: true - /jest/27.4.4_ts-node@10.4.0: + /jest/27.4.4_e83fc80d152deb3eb830e2185b3d9fcf: resolution: {integrity: sha512-AXwEIFa58Uf1Jno3/KSo5HZZ0/2Xwqvfrz0/3bmTwImkFlbOvz5vARAW9nTrxRLkojjkitaZ1KNKAtw3JRFAaA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} hasBin: true @@ -10946,9 +10859,9 @@ packages: node-notifier: optional: true dependencies: - '@jest/core': 27.4.4_ts-node@10.4.0 + '@jest/core': 27.4.4_e83fc80d152deb3eb830e2185b3d9fcf import-local: 3.0.3 - jest-cli: 27.4.4_ts-node@10.4.0 + jest-cli: 27.4.4_e83fc80d152deb3eb830e2185b3d9fcf transitivePeerDependencies: - '@babel/types' - bufferutil @@ -12175,7 +12088,6 @@ packages: resolution: {integrity: sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==} engines: {node: '>= 10.12.0'} hasBin: true - requiresBuild: true dependencies: env-paths: 2.2.1 glob: 7.2.0 @@ -12357,6 +12269,7 @@ packages: /number-is-nan/1.0.1: resolution: {integrity: sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=} engines: {node: '>=0.10.0'} + dev: true /nwsapi/2.2.0: resolution: {integrity: sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==} @@ -13054,16 +12967,6 @@ packages: resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==} engines: {node: '>=6'} - /pretty-format/26.6.2: - resolution: {integrity: sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==} - engines: {node: '>= 10'} - dependencies: - '@jest/types': 26.6.2 - ansi-regex: 5.0.1 - ansi-styles: 4.3.0 - react-is: 17.0.2 - dev: true - /pretty-format/27.4.2: resolution: {integrity: sha512-p0wNtJ9oLuvgOQDEIZ9zQjZffK7KtyR6Si0jnXULIDwrlNF8Cuir3AZP0hHv0jmKuNN/edOnbMjnzd4uTcmWiw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -14450,6 +14353,7 @@ packages: code-point-at: 1.1.0 is-fullwidth-code-point: 1.0.0 strip-ansi: 3.0.1 + dev: true /string-width/2.1.1: resolution: {integrity: sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==} @@ -14513,6 +14417,7 @@ packages: engines: {node: '>=0.10.0'} dependencies: ansi-regex: 5.0.1 + dev: true /strip-ansi/4.0.0: resolution: {integrity: sha1-qEeQIusaw2iocTibY1JixQXuNo8=} @@ -14982,7 +14887,7 @@ packages: utf8-byte-length: 1.0.4 dev: false - /ts-jest/27.0.7_0774b55ea5653110e8039f4446cabd20: + /ts-jest/27.0.7_2d8382365f4ad04f5c41d8e6387d1eb9: resolution: {integrity: sha512-O41shibMqzdafpuP+CkrOL7ykbmLh+FqQrXEmV9CydQ5JBk0Sj0uAEF5TNNe94fZWKm3yYvWa/IbyV4Yg1zK2Q==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} hasBin: true @@ -15001,10 +14906,10 @@ packages: optional: true dependencies: '@babel/core': 7.16.0 - '@types/jest': 26.0.24 + '@types/jest': 27.0.3 bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 - jest: 27.4.4_ts-node@10.4.0 + jest: 27.4.4_e83fc80d152deb3eb830e2185b3d9fcf jest-util: 27.4.2 json5: 2.2.0 lodash.memoize: 4.1.2 @@ -15076,10 +14981,6 @@ packages: /tslib/1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} - /tslib/1.9.0: - resolution: {integrity: sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==} - dev: true - /tslib/2.1.0: resolution: {integrity: sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==} @@ -15087,28 +14988,6 @@ packages: resolution: {integrity: sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==} dev: true - /tslint-config-standard/9.0.0_typescript@4.5.2: - resolution: {integrity: sha512-CAw9J743RnPMemQV/XQ4YyNreC+A1NItACfkm+cBedrOkz6CQfwlnbKn8anUXBfoa4Zo4tjAhblRbsMNcSLfSw==} - deprecated: 'TSLint is deprecated, please move to ESLint: https://github.com/blakeembrey/tslint-config-standard/issues/61' - dependencies: - tslint-eslint-rules: 5.4.0_typescript@4.5.2 - transitivePeerDependencies: - - tslint - - typescript - dev: true - - /tslint-eslint-rules/5.4.0_typescript@4.5.2: - resolution: {integrity: sha512-WlSXE+J2vY/VPgIcqQuijMQiel+UtmXS+4nvK4ZzlDiqBfXse8FAvkNnTcYhnQyOTW5KFM+uRRGXxYhFpuBc6w==} - peerDependencies: - tslint: ^5.0.0 - typescript: ^2.2.0 || ^3.0.0 - dependencies: - doctrine: 0.7.2 - tslib: 1.9.0 - tsutils: 3.21.0_typescript@4.5.2 - typescript: 4.5.2 - dev: true - /tsscmp/1.0.6: resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==} engines: {node: '>=0.6.x'} @@ -15122,6 +15001,7 @@ packages: dependencies: tslib: 1.14.1 typescript: 4.5.2 + dev: false /tty-table/2.8.13: resolution: {integrity: sha512-eVV/+kB6fIIdx+iUImhXrO22gl7f6VmmYh0Zbu6C196fe1elcHXd7U6LcLXu0YoVPc2kNesWiukYcdK8ZmJ6aQ==} @@ -15767,7 +15647,7 @@ packages: /wide-align/1.1.5: resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==} dependencies: - string-width: 1.0.2 + string-width: 4.2.3 /widest-line/2.0.1: resolution: {integrity: sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==} diff --git a/privatePackages/prepare/package.json b/privatePackages/prepare/package.json index c88c20ad4e..6b7b9b4545 100644 --- a/privatePackages/prepare/package.json +++ b/privatePackages/prepare/package.json @@ -13,9 +13,7 @@ "write-yaml-file": "^4.2.0" }, "devDependencies": { - "@types/node": "^14.17.32", - "tslint-config-standard": "9.0.0", - "tslint-eslint-rules": "5.4.0" + "@types/node": "^14.17.32" }, "scripts": { "lint": "tslint -c ../../tslint.json --project .", diff --git a/utils/eslint-config/package.json b/utils/eslint-config/package.json index c87bcda22b..c8b5d07295 100644 --- a/utils/eslint-config/package.json +++ b/utils/eslint-config/package.json @@ -25,6 +25,7 @@ "scripts": {}, "dependencies": { "@typescript-eslint/eslint-plugin": "^5.0.0", + "@typescript-eslint/parser": "^5.0.0", "eslint-config-standard-with-typescript": "^21.0.1", "eslint-plugin-import": "^2.22.1", "eslint-plugin-node": "^11.1.0",