From 59627f513d18233c00dc629d6fee7755e0a8f4f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Tue, 16 Jan 2024 12:56:30 +0100 Subject: [PATCH 1/2] [code-infra] Remove custom TS installation script --- .circleci/config.yml | 4 +- package.json | 4 +- pnpm-lock.yaml | 106 ++++++++++++++++++++++++------- scripts/useTypescriptDistTag.mjs | 56 ---------------- 4 files changed, 85 insertions(+), 85 deletions(-) delete mode 100644 scripts/useTypescriptDistTag.mjs diff --git a/.circleci/config.yml b/.circleci/config.yml index daae93dcb38ab7..13df89d55bad06 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -304,10 +304,8 @@ jobs: - checkout - run: name: Resolve typescript version - environment: - TYPESCRIPT_DIST_TAG: next command: | - node scripts/useTypescriptDistTag.mjs + pnpm add typescript@next -d -w # log a patch for maintainers who want to check out this change git --no-pager diff HEAD - install_js diff --git a/package.json b/package.json index ff0d9259daa633..06820f3c8f3904 100644 --- a/package.json +++ b/package.json @@ -178,9 +178,9 @@ "stylelint-config-standard": "^34.0.0", "stylelint-processor-styled-components": "^1.10.0", "terser-webpack-plugin": "^5.3.10", - "tsx": "^4.7.0", "tsup": "^8.0.1", - "typescript": "^5.3.3", + "tsx": "^4.7.0", + "typescript": "5.4.0-dev.20240116", "typescript-to-proptypes": "workspace:^", "webpack": "^5.89.0", "webpack-bundle-analyzer": "^4.10.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 36b530e1c2f737..23e8bc0db4452a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -148,10 +148,10 @@ importers: version: 17.0.32 '@typescript-eslint/eslint-plugin': specifier: ^6.17.0 - version: 6.17.0(@typescript-eslint/parser@6.17.0)(eslint@8.56.0)(typescript@5.3.3) + version: 6.17.0(@typescript-eslint/parser@6.17.0)(eslint@8.56.0)(typescript@5.4.0-dev.20240116) '@typescript-eslint/parser': specifier: ^6.17.0 - version: 6.17.0(eslint@8.56.0)(typescript@5.3.3) + version: 6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116) babel-loader: specifier: ^9.1.3 version: 9.1.3(@babel/core@7.23.7)(webpack@5.89.0) @@ -325,13 +325,13 @@ importers: version: 5.3.10(esbuild@0.19.11)(webpack@5.89.0) tsup: specifier: ^8.0.1 - version: 8.0.1(postcss@8.4.33)(typescript@5.3.3) + version: 8.0.1(postcss@8.4.33)(typescript@5.4.0-dev.20240116) tsx: specifier: ^4.7.0 version: 4.7.0 typescript: - specifier: ^5.3.3 - version: 5.3.3 + specifier: 5.4.0-dev.20240116 + version: 5.4.0-dev.20240116 typescript-to-proptypes: specifier: workspace:^ version: link:packages/typescript-to-proptypes @@ -8018,7 +8018,7 @@ packages: dependencies: '@types/yargs-parser': 21.0.0 - /@typescript-eslint/eslint-plugin@6.17.0(@typescript-eslint/parser@6.17.0)(eslint@8.56.0)(typescript@5.3.3): + /@typescript-eslint/eslint-plugin@6.17.0(@typescript-eslint/parser@6.17.0)(eslint@8.56.0)(typescript@5.4.0-dev.20240116): resolution: {integrity: sha512-Vih/4xLXmY7V490dGwBQJTpIZxH4ZFH6eCVmQ4RFkB+wmaCTDAx4dtgoWwMNGKLkqRY1L6rPqzEbjorRnDo4rQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -8030,10 +8030,10 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.6.2 - '@typescript-eslint/parser': 6.17.0(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/parser': 6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116) '@typescript-eslint/scope-manager': 6.17.0 - '@typescript-eslint/type-utils': 6.17.0(eslint@8.56.0)(typescript@5.3.3) - '@typescript-eslint/utils': 6.17.0(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/type-utils': 6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116) + '@typescript-eslint/utils': 6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116) '@typescript-eslint/visitor-keys': 6.17.0 debug: 4.3.4(supports-color@8.1.1) eslint: 8.56.0 @@ -8041,8 +8041,8 @@ packages: ignore: 5.2.4 natural-compare: 1.4.0 semver: 7.5.4 - ts-api-utils: 1.0.1(typescript@5.3.3) - typescript: 5.3.3 + ts-api-utils: 1.0.1(typescript@5.4.0-dev.20240116) + typescript: 5.4.0-dev.20240116 transitivePeerDependencies: - supports-color dev: true @@ -8068,6 +8068,27 @@ packages: - supports-color dev: true + /@typescript-eslint/parser@6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116): + resolution: {integrity: sha512-C4bBaX2orvhK+LlwrY8oWGmSl4WolCfYm513gEccdWZj0CwGadbIADb0FtVEcI+WzUyjyoBj2JRP8g25E6IB8A==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/scope-manager': 6.17.0 + '@typescript-eslint/types': 6.17.0 + '@typescript-eslint/typescript-estree': 6.17.0(typescript@5.4.0-dev.20240116) + '@typescript-eslint/visitor-keys': 6.17.0 + debug: 4.3.4(supports-color@8.1.1) + eslint: 8.56.0 + typescript: 5.4.0-dev.20240116 + transitivePeerDependencies: + - supports-color + dev: true + /@typescript-eslint/scope-manager@6.17.0: resolution: {integrity: sha512-RX7a8lwgOi7am0k17NUO0+ZmMOX4PpjLtLRgLmT1d3lBYdWH4ssBUbwdmc5pdRX8rXon8v9x8vaoOSpkHfcXGA==} engines: {node: ^16.0.0 || >=18.0.0} @@ -8076,7 +8097,7 @@ packages: '@typescript-eslint/visitor-keys': 6.17.0 dev: true - /@typescript-eslint/type-utils@6.17.0(eslint@8.56.0)(typescript@5.3.3): + /@typescript-eslint/type-utils@6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116): resolution: {integrity: sha512-hDXcWmnbtn4P2B37ka3nil3yi3VCQO2QEB9gBiHJmQp5wmyQWqnjA85+ZcE8c4FqnaB6lBwMrPkgd4aBYz3iNg==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -8086,12 +8107,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 6.17.0(typescript@5.3.3) - '@typescript-eslint/utils': 6.17.0(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/typescript-estree': 6.17.0(typescript@5.4.0-dev.20240116) + '@typescript-eslint/utils': 6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116) debug: 4.3.4(supports-color@8.1.1) eslint: 8.56.0 - ts-api-utils: 1.0.1(typescript@5.3.3) - typescript: 5.3.3 + ts-api-utils: 1.0.1(typescript@5.4.0-dev.20240116) + typescript: 5.4.0-dev.20240116 transitivePeerDependencies: - supports-color dev: true @@ -8123,7 +8144,29 @@ packages: - supports-color dev: true - /@typescript-eslint/utils@6.17.0(eslint@8.56.0)(typescript@5.3.3): + /@typescript-eslint/typescript-estree@6.17.0(typescript@5.4.0-dev.20240116): + resolution: {integrity: sha512-gVQe+SLdNPfjlJn5VNGhlOhrXz4cajwFd5kAgWtZ9dCZf4XJf8xmgCTLIqec7aha3JwgLI2CK6GY1043FRxZwg==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/types': 6.17.0 + '@typescript-eslint/visitor-keys': 6.17.0 + debug: 4.3.4(supports-color@8.1.1) + globby: 11.1.0 + is-glob: 4.0.3 + minimatch: 9.0.3 + semver: 7.5.4 + ts-api-utils: 1.0.1(typescript@5.4.0-dev.20240116) + typescript: 5.4.0-dev.20240116 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/utils@6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116): resolution: {integrity: sha512-LofsSPjN/ITNkzV47hxas2JCsNCEnGhVvocfyOcLzT9c/tSZE7SfhS/iWtzP1lKNOEfLhRTZz6xqI8N2RzweSQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -8134,7 +8177,7 @@ packages: '@types/semver': 7.5.0 '@typescript-eslint/scope-manager': 6.17.0 '@typescript-eslint/types': 6.17.0 - '@typescript-eslint/typescript-estree': 6.17.0(typescript@5.3.3) + '@typescript-eslint/typescript-estree': 6.17.0(typescript@5.4.0-dev.20240116) eslint: 8.56.0 semver: 7.5.4 transitivePeerDependencies: @@ -11587,8 +11630,8 @@ packages: eslint: ^7.32.0 || ^8.2.0 eslint-plugin-import: ^2.25.3 dependencies: - '@typescript-eslint/eslint-plugin': 6.17.0(@typescript-eslint/parser@6.17.0)(eslint@8.56.0)(typescript@5.3.3) - '@typescript-eslint/parser': 6.17.0(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/eslint-plugin': 6.17.0(@typescript-eslint/parser@6.17.0)(eslint@8.56.0)(typescript@5.4.0-dev.20240116) + '@typescript-eslint/parser': 6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116) eslint: 8.56.0 eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.1)(eslint@8.56.0) eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.17.0)(eslint-import-resolver-webpack@0.13.8)(eslint@8.56.0) @@ -11678,7 +11721,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 6.17.0(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/parser': 6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116) debug: 3.2.7 eslint: 8.56.0 eslint-import-resolver-node: 0.3.9 @@ -11719,7 +11762,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 6.17.0(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/parser': 6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116) array-includes: 3.1.7 array.prototype.findlastindex: 1.2.3 array.prototype.flat: 1.3.2 @@ -20646,6 +20689,15 @@ packages: typescript: 5.3.3 dev: true + /ts-api-utils@1.0.1(typescript@5.4.0-dev.20240116): + resolution: {integrity: sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==} + engines: {node: '>=16.13.0'} + peerDependencies: + typescript: '>=4.2.0' + dependencies: + typescript: 5.4.0-dev.20240116 + dev: true + /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} @@ -20689,7 +20741,7 @@ packages: engines: {node: '>=0.6.x'} dev: false - /tsup@8.0.1(postcss@8.4.33)(typescript@5.3.3): + /tsup@8.0.1(postcss@8.4.33)(typescript@5.4.0-dev.20240116): resolution: {integrity: sha512-hvW7gUSG96j53ZTSlT4j/KL0q1Q2l6TqGBFc6/mu/L46IoNWqLLUzLRLP1R8Q7xrJTmkDxxDoojV5uCVs1sVOg==} engines: {node: '>=18'} hasBin: true @@ -20723,7 +20775,7 @@ packages: source-map: 0.8.0-beta.0 sucrase: 3.34.0 tree-kill: 1.2.2 - typescript: 5.3.3 + typescript: 5.4.0-dev.20240116 transitivePeerDependencies: - supports-color - ts-node @@ -20880,6 +20932,12 @@ packages: engines: {node: '>=14.17'} hasBin: true + /typescript@5.4.0-dev.20240116: + resolution: {integrity: sha512-AmpljLROK1uKDoHklWmj9tnKCWrvMrkBLAPsBxlW1TKBuyuxGpixeF0+kSwHN92/tafwpMQCIDjORPENrwifzw==} + engines: {node: '>=14.17'} + hasBin: true + dev: true + /ua-parser-js@0.7.33: resolution: {integrity: sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==} dev: true diff --git a/scripts/useTypescriptDistTag.mjs b/scripts/useTypescriptDistTag.mjs deleted file mode 100644 index 04dd874907285f..00000000000000 --- a/scripts/useTypescriptDistTag.mjs +++ /dev/null @@ -1,56 +0,0 @@ -/** - * Workaround for failing `yarn add -D -W typescript@next` - * See https://github.com/yarnpkg/yarn/issues/7935 - * - * Given an environment variable called `TYPESCRIPT_DIST_TAG` fetch the corresponding - * version and make sure this version used in the worktree as well as in dtslint. - * - * If you work on this file: - * WARNING: This script can only use built-in modules since it has to run before - * `yarn install` - */ -import childProcess from 'child_process'; -import fs from 'fs'; -import os from 'os'; -import path from 'path'; -import { promisify } from 'util'; -import { getWorkspaceRoot } from './utils.mjs'; - -const exec = promisify(childProcess.exec); - -async function main(distTag) { - if (typeof distTag !== 'string') { - throw new TypeError(`expected distTag: string but got '${distTag}'`); - } - - if (distTag === 'stable') { - // eslint-disable-next-line no-console - console.log('nothing to do with stable'); - return; - } - - const { stdout: versions } = await exec(`npm dist-tag ls typescript ${distTag}`); - const tagMapping = versions.split('\n').find((mapping) => { - return mapping.startsWith(`${distTag}: `); - }); - if (tagMapping === undefined) { - throw new Error(`Could not find '${distTag}' in "${versions}"`); - } - - const version = tagMapping.replace(`${distTag}: `, ''); - - const packageJsonPath = path.resolve(getWorkspaceRoot(), 'package.json'); - const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf8' })); - - packageJson.devDependencies.typescript = version; - packageJson.resolutions['**/dtslint/typescript'] = version; - - // add newline for clean diff - fs.writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}${os.EOL}`); -} - -const [distTag = process.env.TYPESCRIPT_DIST_TAG] = process.argv.slice(2); -main(distTag).catch((error) => { - console.error(error); - process.exit(1); -}); From 0a5d1cf2f256219c20428b7713a0c37261b29bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Dudak?= Date: Tue, 16 Jan 2024 13:48:15 +0100 Subject: [PATCH 2/2] Revert TS update --- package.json | 4 +- pnpm-lock.yaml | 106 +++++++++++-------------------------------------- 2 files changed, 26 insertions(+), 84 deletions(-) diff --git a/package.json b/package.json index 06820f3c8f3904..ff0d9259daa633 100644 --- a/package.json +++ b/package.json @@ -178,9 +178,9 @@ "stylelint-config-standard": "^34.0.0", "stylelint-processor-styled-components": "^1.10.0", "terser-webpack-plugin": "^5.3.10", - "tsup": "^8.0.1", "tsx": "^4.7.0", - "typescript": "5.4.0-dev.20240116", + "tsup": "^8.0.1", + "typescript": "^5.3.3", "typescript-to-proptypes": "workspace:^", "webpack": "^5.89.0", "webpack-bundle-analyzer": "^4.10.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 23e8bc0db4452a..36b530e1c2f737 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -148,10 +148,10 @@ importers: version: 17.0.32 '@typescript-eslint/eslint-plugin': specifier: ^6.17.0 - version: 6.17.0(@typescript-eslint/parser@6.17.0)(eslint@8.56.0)(typescript@5.4.0-dev.20240116) + version: 6.17.0(@typescript-eslint/parser@6.17.0)(eslint@8.56.0)(typescript@5.3.3) '@typescript-eslint/parser': specifier: ^6.17.0 - version: 6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116) + version: 6.17.0(eslint@8.56.0)(typescript@5.3.3) babel-loader: specifier: ^9.1.3 version: 9.1.3(@babel/core@7.23.7)(webpack@5.89.0) @@ -325,13 +325,13 @@ importers: version: 5.3.10(esbuild@0.19.11)(webpack@5.89.0) tsup: specifier: ^8.0.1 - version: 8.0.1(postcss@8.4.33)(typescript@5.4.0-dev.20240116) + version: 8.0.1(postcss@8.4.33)(typescript@5.3.3) tsx: specifier: ^4.7.0 version: 4.7.0 typescript: - specifier: 5.4.0-dev.20240116 - version: 5.4.0-dev.20240116 + specifier: ^5.3.3 + version: 5.3.3 typescript-to-proptypes: specifier: workspace:^ version: link:packages/typescript-to-proptypes @@ -8018,7 +8018,7 @@ packages: dependencies: '@types/yargs-parser': 21.0.0 - /@typescript-eslint/eslint-plugin@6.17.0(@typescript-eslint/parser@6.17.0)(eslint@8.56.0)(typescript@5.4.0-dev.20240116): + /@typescript-eslint/eslint-plugin@6.17.0(@typescript-eslint/parser@6.17.0)(eslint@8.56.0)(typescript@5.3.3): resolution: {integrity: sha512-Vih/4xLXmY7V490dGwBQJTpIZxH4ZFH6eCVmQ4RFkB+wmaCTDAx4dtgoWwMNGKLkqRY1L6rPqzEbjorRnDo4rQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -8030,10 +8030,10 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.6.2 - '@typescript-eslint/parser': 6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116) + '@typescript-eslint/parser': 6.17.0(eslint@8.56.0)(typescript@5.3.3) '@typescript-eslint/scope-manager': 6.17.0 - '@typescript-eslint/type-utils': 6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116) - '@typescript-eslint/utils': 6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116) + '@typescript-eslint/type-utils': 6.17.0(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/utils': 6.17.0(eslint@8.56.0)(typescript@5.3.3) '@typescript-eslint/visitor-keys': 6.17.0 debug: 4.3.4(supports-color@8.1.1) eslint: 8.56.0 @@ -8041,8 +8041,8 @@ packages: ignore: 5.2.4 natural-compare: 1.4.0 semver: 7.5.4 - ts-api-utils: 1.0.1(typescript@5.4.0-dev.20240116) - typescript: 5.4.0-dev.20240116 + ts-api-utils: 1.0.1(typescript@5.3.3) + typescript: 5.3.3 transitivePeerDependencies: - supports-color dev: true @@ -8068,27 +8068,6 @@ packages: - supports-color dev: true - /@typescript-eslint/parser@6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116): - resolution: {integrity: sha512-C4bBaX2orvhK+LlwrY8oWGmSl4WolCfYm513gEccdWZj0CwGadbIADb0FtVEcI+WzUyjyoBj2JRP8g25E6IB8A==} - engines: {node: ^16.0.0 || >=18.0.0} - peerDependencies: - eslint: ^7.0.0 || ^8.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@typescript-eslint/scope-manager': 6.17.0 - '@typescript-eslint/types': 6.17.0 - '@typescript-eslint/typescript-estree': 6.17.0(typescript@5.4.0-dev.20240116) - '@typescript-eslint/visitor-keys': 6.17.0 - debug: 4.3.4(supports-color@8.1.1) - eslint: 8.56.0 - typescript: 5.4.0-dev.20240116 - transitivePeerDependencies: - - supports-color - dev: true - /@typescript-eslint/scope-manager@6.17.0: resolution: {integrity: sha512-RX7a8lwgOi7am0k17NUO0+ZmMOX4PpjLtLRgLmT1d3lBYdWH4ssBUbwdmc5pdRX8rXon8v9x8vaoOSpkHfcXGA==} engines: {node: ^16.0.0 || >=18.0.0} @@ -8097,7 +8076,7 @@ packages: '@typescript-eslint/visitor-keys': 6.17.0 dev: true - /@typescript-eslint/type-utils@6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116): + /@typescript-eslint/type-utils@6.17.0(eslint@8.56.0)(typescript@5.3.3): resolution: {integrity: sha512-hDXcWmnbtn4P2B37ka3nil3yi3VCQO2QEB9gBiHJmQp5wmyQWqnjA85+ZcE8c4FqnaB6lBwMrPkgd4aBYz3iNg==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -8107,12 +8086,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 6.17.0(typescript@5.4.0-dev.20240116) - '@typescript-eslint/utils': 6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116) + '@typescript-eslint/typescript-estree': 6.17.0(typescript@5.3.3) + '@typescript-eslint/utils': 6.17.0(eslint@8.56.0)(typescript@5.3.3) debug: 4.3.4(supports-color@8.1.1) eslint: 8.56.0 - ts-api-utils: 1.0.1(typescript@5.4.0-dev.20240116) - typescript: 5.4.0-dev.20240116 + ts-api-utils: 1.0.1(typescript@5.3.3) + typescript: 5.3.3 transitivePeerDependencies: - supports-color dev: true @@ -8144,29 +8123,7 @@ packages: - supports-color dev: true - /@typescript-eslint/typescript-estree@6.17.0(typescript@5.4.0-dev.20240116): - resolution: {integrity: sha512-gVQe+SLdNPfjlJn5VNGhlOhrXz4cajwFd5kAgWtZ9dCZf4XJf8xmgCTLIqec7aha3JwgLI2CK6GY1043FRxZwg==} - engines: {node: ^16.0.0 || >=18.0.0} - peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@typescript-eslint/types': 6.17.0 - '@typescript-eslint/visitor-keys': 6.17.0 - debug: 4.3.4(supports-color@8.1.1) - globby: 11.1.0 - is-glob: 4.0.3 - minimatch: 9.0.3 - semver: 7.5.4 - ts-api-utils: 1.0.1(typescript@5.4.0-dev.20240116) - typescript: 5.4.0-dev.20240116 - transitivePeerDependencies: - - supports-color - dev: true - - /@typescript-eslint/utils@6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116): + /@typescript-eslint/utils@6.17.0(eslint@8.56.0)(typescript@5.3.3): resolution: {integrity: sha512-LofsSPjN/ITNkzV47hxas2JCsNCEnGhVvocfyOcLzT9c/tSZE7SfhS/iWtzP1lKNOEfLhRTZz6xqI8N2RzweSQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -8177,7 +8134,7 @@ packages: '@types/semver': 7.5.0 '@typescript-eslint/scope-manager': 6.17.0 '@typescript-eslint/types': 6.17.0 - '@typescript-eslint/typescript-estree': 6.17.0(typescript@5.4.0-dev.20240116) + '@typescript-eslint/typescript-estree': 6.17.0(typescript@5.3.3) eslint: 8.56.0 semver: 7.5.4 transitivePeerDependencies: @@ -11630,8 +11587,8 @@ packages: eslint: ^7.32.0 || ^8.2.0 eslint-plugin-import: ^2.25.3 dependencies: - '@typescript-eslint/eslint-plugin': 6.17.0(@typescript-eslint/parser@6.17.0)(eslint@8.56.0)(typescript@5.4.0-dev.20240116) - '@typescript-eslint/parser': 6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116) + '@typescript-eslint/eslint-plugin': 6.17.0(@typescript-eslint/parser@6.17.0)(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/parser': 6.17.0(eslint@8.56.0)(typescript@5.3.3) eslint: 8.56.0 eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.1)(eslint@8.56.0) eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.17.0)(eslint-import-resolver-webpack@0.13.8)(eslint@8.56.0) @@ -11721,7 +11678,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116) + '@typescript-eslint/parser': 6.17.0(eslint@8.56.0)(typescript@5.3.3) debug: 3.2.7 eslint: 8.56.0 eslint-import-resolver-node: 0.3.9 @@ -11762,7 +11719,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 6.17.0(eslint@8.56.0)(typescript@5.4.0-dev.20240116) + '@typescript-eslint/parser': 6.17.0(eslint@8.56.0)(typescript@5.3.3) array-includes: 3.1.7 array.prototype.findlastindex: 1.2.3 array.prototype.flat: 1.3.2 @@ -20689,15 +20646,6 @@ packages: typescript: 5.3.3 dev: true - /ts-api-utils@1.0.1(typescript@5.4.0-dev.20240116): - resolution: {integrity: sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==} - engines: {node: '>=16.13.0'} - peerDependencies: - typescript: '>=4.2.0' - dependencies: - typescript: 5.4.0-dev.20240116 - dev: true - /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} @@ -20741,7 +20689,7 @@ packages: engines: {node: '>=0.6.x'} dev: false - /tsup@8.0.1(postcss@8.4.33)(typescript@5.4.0-dev.20240116): + /tsup@8.0.1(postcss@8.4.33)(typescript@5.3.3): resolution: {integrity: sha512-hvW7gUSG96j53ZTSlT4j/KL0q1Q2l6TqGBFc6/mu/L46IoNWqLLUzLRLP1R8Q7xrJTmkDxxDoojV5uCVs1sVOg==} engines: {node: '>=18'} hasBin: true @@ -20775,7 +20723,7 @@ packages: source-map: 0.8.0-beta.0 sucrase: 3.34.0 tree-kill: 1.2.2 - typescript: 5.4.0-dev.20240116 + typescript: 5.3.3 transitivePeerDependencies: - supports-color - ts-node @@ -20932,12 +20880,6 @@ packages: engines: {node: '>=14.17'} hasBin: true - /typescript@5.4.0-dev.20240116: - resolution: {integrity: sha512-AmpljLROK1uKDoHklWmj9tnKCWrvMrkBLAPsBxlW1TKBuyuxGpixeF0+kSwHN92/tafwpMQCIDjORPENrwifzw==} - engines: {node: '>=14.17'} - hasBin: true - dev: true - /ua-parser-js@0.7.33: resolution: {integrity: sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw==} dev: true