diff --git a/eslint-config.yaml b/eslint-config.yaml index da28a00ad4..6021c3b721 100644 --- a/eslint-config.yaml +++ b/eslint-config.yaml @@ -1,5 +1,6 @@ --- env: + es2020: true jest: true node: true @@ -10,9 +11,9 @@ plugins: parser: '@typescript-eslint/parser' parserOptions: - ecmaVersion: 2018 + ecmaVersion: 2020 impliedStrict: true - sourceType: module + sourceType: script project: ./**/tsconfig.json extends: diff --git a/gh-pages/content/user-guides/lib-author/configuration/index.md b/gh-pages/content/user-guides/lib-author/configuration/index.md index ee16302496..32c77a84fc 100644 --- a/gh-pages/content/user-guides/lib-author/configuration/index.md +++ b/gh-pages/content/user-guides/lib-author/configuration/index.md @@ -193,6 +193,10 @@ are set in the `jsii.tsc` section of the `package.json` file, but use the same n `declarationMap`), or to optimize the emitted code size (by disabling source maps entirely). + if any of these options is specified, the source map configuration will exactly match what is being provided here + If none are specified, the default settings will be used: `#!ts { inlineSourceMap: true, inlineSources: true }` +- `types` allows limiting which visible type libraries get loaded in the global scope by the typescript compiler. By + default, all visible `@types/*` packages will be loaded, which can be undesirable (in particular in monorepos, where + some type libraries are not compatible with the TypeScript compiler version that `jsii` uses). The value specified + here will be forwarded as-is to the TypeScript compiler. Refer to the [TypeScript compiler options reference][ts-options] for more information about those options. diff --git a/jest.config.ts b/jest.config.mjs similarity index 83% rename from jest.config.ts rename to jest.config.mjs index e2c3fd3694..baa0673ec4 100644 --- a/jest.config.ts +++ b/jest.config.mjs @@ -1,4 +1,4 @@ -import type { Config } from '@jest/types'; +import jest from '@jest/types'; import { defaults } from 'jest-config'; import { cpus } from 'os'; import { env } from 'process'; @@ -10,8 +10,10 @@ import { env } from 'process'; * be overridden (for example, the coverage threshold), then a new * `jest.config.ts` file should be created that imports from this one and * modifies just what needs to be modified, typically using `overriddenConfig`. + * + * @type {jest.Config.InitialOptions} */ -const config: Config.InitialOptions = { +const config = { ...defaults, collectCoverage: true, @@ -41,19 +43,21 @@ const config: Config.InitialOptions = { * operation works deeply on objects, but overrides that are not objects (e.g: * arrays, strings, ...) simply replace the original value. * - * @param overrides values to be used for overriding the orignal configuration. + * @param {jest.Config.InitialOptions} overrides values to be used for overriding the orignal configuration. + * + * @return {jest.Config.InitialOptions} */ -export function overriddenConfig(overrides: Config.InitialOptions) { +export function overriddenConfig(overrides) { return merge(config, overrides); - function merge(original: T, override: T): T { + function merge(original, override) { if (typeof original === 'object') { // Arrays are objects, too! if (Array.isArray(override)) { return override; } - const result: any = {}; + const result = {}; const allKeys = new Set([ ...Object.keys(original), ...Object.keys(override), @@ -61,12 +65,9 @@ export function overriddenConfig(overrides: Config.InitialOptions) { // TypeScript appears to choke if we do the "as any" in the same // expression as the key access, so we delcare surrogate varibales... - const originalAsAny = original as any; - const overrideAsAny = override as any; - for (const key of Array.from(allKeys).sort()) { - const originalValue: unknown = originalAsAny[key]; - const overrideValue: unknown = overrideAsAny[key]; + const originalValue = original[key]; + const overrideValue = override[key]; if (originalValue == null) { result[key] = overrideValue; } else if (overrideValue == null) { diff --git a/package.json b/package.json index 04f6ae1dcd..28c8101847 100644 --- a/package.json +++ b/package.json @@ -50,10 +50,14 @@ ], "nohoist": [ "**/@fixtures/jsii-calc-bundled", - "**/@fixtures/jsii-calc-bundled/**" + "**/@fixtures/jsii-calc-bundled/**", + "**/typescript" ] }, "resolutions": { - "@types/prettier": "2.6.0" + "minipass": "3.2.1" + }, + "resolutions_info": { + "minipass": "https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/60901" } } diff --git a/packages/@jsii/benchmarks/lib/suite/aws-cdk-lib/build-with-jsii.ts b/packages/@jsii/benchmarks/lib/suite/aws-cdk-lib/build-with-jsii.ts index c14cbf071e..c2827420c2 100644 --- a/packages/@jsii/benchmarks/lib/suite/aws-cdk-lib/build-with-jsii.ts +++ b/packages/@jsii/benchmarks/lib/suite/aws-cdk-lib/build-with-jsii.ts @@ -2,7 +2,7 @@ import { Compiler } from 'jsii/lib/compiler'; import { loadProjectInfo } from 'jsii/lib/project-info'; import * as path from 'node:path'; import * as process from 'node:process'; -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import type { Context } from '.'; diff --git a/packages/@jsii/benchmarks/lib/suite/aws-cdk-lib/build-with-tsc.ts b/packages/@jsii/benchmarks/lib/suite/aws-cdk-lib/build-with-tsc.ts index d14b2d81a4..2afb79ff1c 100644 --- a/packages/@jsii/benchmarks/lib/suite/aws-cdk-lib/build-with-tsc.ts +++ b/packages/@jsii/benchmarks/lib/suite/aws-cdk-lib/build-with-tsc.ts @@ -1,7 +1,7 @@ import * as fs from 'fs-extra'; import * as path from 'node:path'; import * as process from 'node:process'; -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import type { Context } from '.'; diff --git a/packages/@jsii/benchmarks/package.json b/packages/@jsii/benchmarks/package.json index 9e0ddc7cd0..6226d3978d 100644 --- a/packages/@jsii/benchmarks/package.json +++ b/packages/@jsii/benchmarks/package.json @@ -9,7 +9,7 @@ "jsii": "^0.0.0", "npm": "^8.12.1", "tar": "^6.1.11", - "typescript-3.9": "npm:typescript@~3.9.10", + "typescript": "~3.9.10", "yargs": "^16.2.0" }, "devDependencies": { diff --git a/packages/@jsii/benchmarks/scripts/snapshot-package.ts b/packages/@jsii/benchmarks/scripts/snapshot-package.ts index b991cd6174..08dd881bee 100644 --- a/packages/@jsii/benchmarks/scripts/snapshot-package.ts +++ b/packages/@jsii/benchmarks/scripts/snapshot-package.ts @@ -4,7 +4,7 @@ import * as glob from 'glob'; import * as os from 'os'; import * as path from 'path'; import * as tar from 'tar'; -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { cdkTagv2_21_1, cdkv2_21_1 } from '../lib/constants'; diff --git a/packages/@jsii/runtime/jest.config.ts b/packages/@jsii/check-node/jest.config.mjs similarity index 80% rename from packages/@jsii/runtime/jest.config.ts rename to packages/@jsii/check-node/jest.config.mjs index 84550ec62b..71d86a8a63 100644 --- a/packages/@jsii/runtime/jest.config.ts +++ b/packages/@jsii/check-node/jest.config.mjs @@ -1,4 +1,4 @@ -import { overriddenConfig } from '../../../jest.config'; +import { overriddenConfig } from '../../../jest.config.mjs'; export default overriddenConfig({ coveragePathIgnorePatterns: [ diff --git a/packages/@jsii/integ-test/jest.config.ts b/packages/@jsii/integ-test/jest.config.mjs similarity index 66% rename from packages/@jsii/integ-test/jest.config.ts rename to packages/@jsii/integ-test/jest.config.mjs index 8b3086802b..a3f7e990a9 100644 --- a/packages/@jsii/integ-test/jest.config.ts +++ b/packages/@jsii/integ-test/jest.config.mjs @@ -1,4 +1,4 @@ -import { overriddenConfig } from '../../../jest.config'; +import { overriddenConfig } from '../../../jest.config.mjs'; export default overriddenConfig({ // We don't need coverage for the integration tests diff --git a/packages/@jsii/kernel/jest.config.mjs b/packages/@jsii/kernel/jest.config.mjs new file mode 100644 index 0000000000..2e86e6e3ff --- /dev/null +++ b/packages/@jsii/kernel/jest.config.mjs @@ -0,0 +1,3 @@ +import config from '../../../jest.config.mjs'; + +export default config; diff --git a/packages/@jsii/kernel/jest.config.ts b/packages/@jsii/kernel/jest.config.ts deleted file mode 100644 index 6da6af03e8..0000000000 --- a/packages/@jsii/kernel/jest.config.ts +++ /dev/null @@ -1,3 +0,0 @@ -import config from '../../../jest.config'; - -export default config; diff --git a/packages/@jsii/check-node/jest.config.ts b/packages/@jsii/runtime/jest.config.mjs similarity index 80% rename from packages/@jsii/check-node/jest.config.ts rename to packages/@jsii/runtime/jest.config.mjs index 84550ec62b..71d86a8a63 100644 --- a/packages/@jsii/check-node/jest.config.ts +++ b/packages/@jsii/runtime/jest.config.mjs @@ -1,4 +1,4 @@ -import { overriddenConfig } from '../../../jest.config'; +import { overriddenConfig } from '../../../jest.config.mjs'; export default overriddenConfig({ coveragePathIgnorePatterns: [ diff --git a/packages/@jsii/spec/jest.config.ts b/packages/@jsii/spec/jest.config.mjs similarity index 63% rename from packages/@jsii/spec/jest.config.ts rename to packages/@jsii/spec/jest.config.mjs index 2ca2a39215..f9dfa4ffe9 100644 --- a/packages/@jsii/spec/jest.config.ts +++ b/packages/@jsii/spec/jest.config.mjs @@ -1,4 +1,4 @@ -import { overriddenConfig } from '../../../jest.config'; +import { overriddenConfig } from '../../../jest.config.mjs'; export default overriddenConfig({ coverageThreshold: { diff --git a/packages/@scope/jsii-calc-base-of-base/package.json b/packages/@scope/jsii-calc-base-of-base/package.json index 003f1b0e57..185e187c3b 100644 --- a/packages/@scope/jsii-calc-base-of-base/package.json +++ b/packages/@scope/jsii-calc-base-of-base/package.json @@ -58,7 +58,8 @@ }, "tsc": { "outDir": "./build", - "rootDir": "." + "rootDir": ".", + "types": [] }, "versionFormat": "short", "metadata": { diff --git a/packages/@scope/jsii-calc-base/package.json b/packages/@scope/jsii-calc-base/package.json index 184e26ce09..602e7446b3 100644 --- a/packages/@scope/jsii-calc-base/package.json +++ b/packages/@scope/jsii-calc-base/package.json @@ -72,6 +72,9 @@ "module": "scope.jsii_calc_base" } }, + "tsc": { + "types": [] + }, "versionFormat": "short" } } diff --git a/packages/@scope/jsii-calc-lib/package.json b/packages/@scope/jsii-calc-lib/package.json index 81217b3e7d..5f44f71d9c 100644 --- a/packages/@scope/jsii-calc-lib/package.json +++ b/packages/@scope/jsii-calc-lib/package.json @@ -70,7 +70,8 @@ }, "tsc": { "outDir": "build", - "sourceMap": false + "sourceMap": false, + "types": [] }, "versionFormat": "short", "metadata": { diff --git a/packages/codemaker/jest.config.mjs b/packages/codemaker/jest.config.mjs new file mode 100644 index 0000000000..7bc6eadd1b --- /dev/null +++ b/packages/codemaker/jest.config.mjs @@ -0,0 +1,3 @@ +import config from '../../jest.config.mjs'; + +export default config; diff --git a/packages/codemaker/jest.config.ts b/packages/codemaker/jest.config.ts deleted file mode 100644 index e37577d92f..0000000000 --- a/packages/codemaker/jest.config.ts +++ /dev/null @@ -1,3 +0,0 @@ -import config from '../../jest.config'; - -export default config; diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json index 84627a8257..c89e77a126 100644 --- a/packages/jsii-calc/package.json +++ b/packages/jsii-calc/package.json @@ -81,6 +81,11 @@ ] } }, + "tsc": { + "types": [ + "node" + ] + }, "metadata": { "jsii:boolean": true, "jsii:number": 1337, diff --git a/packages/jsii-config/jest.config.mjs b/packages/jsii-config/jest.config.mjs new file mode 100644 index 0000000000..7bc6eadd1b --- /dev/null +++ b/packages/jsii-config/jest.config.mjs @@ -0,0 +1,3 @@ +import config from '../../jest.config.mjs'; + +export default config; diff --git a/packages/jsii-config/jest.config.ts b/packages/jsii-config/jest.config.ts deleted file mode 100644 index e37577d92f..0000000000 --- a/packages/jsii-config/jest.config.ts +++ /dev/null @@ -1,3 +0,0 @@ -import config from '../../jest.config'; - -export default config; diff --git a/packages/jsii-diff/jest.config.mjs b/packages/jsii-diff/jest.config.mjs new file mode 100644 index 0000000000..7bc6eadd1b --- /dev/null +++ b/packages/jsii-diff/jest.config.mjs @@ -0,0 +1,3 @@ +import config from '../../jest.config.mjs'; + +export default config; diff --git a/packages/jsii-diff/jest.config.ts b/packages/jsii-diff/jest.config.ts deleted file mode 100644 index e37577d92f..0000000000 --- a/packages/jsii-diff/jest.config.ts +++ /dev/null @@ -1,3 +0,0 @@ -import config from '../../jest.config'; - -export default config; diff --git a/packages/jsii-pacmak/jest.config.ts b/packages/jsii-pacmak/jest.config.mjs similarity index 64% rename from packages/jsii-pacmak/jest.config.ts rename to packages/jsii-pacmak/jest.config.mjs index 88e4ce53d5..c8a833168e 100644 --- a/packages/jsii-pacmak/jest.config.ts +++ b/packages/jsii-pacmak/jest.config.mjs @@ -1,4 +1,4 @@ -import { overriddenConfig } from '../../jest.config'; +import { overriddenConfig } from '../../jest.config.mjs'; export default overriddenConfig({ coveragePathIgnorePatterns: ['/node_modules/', '/test'], diff --git a/packages/jsii-reflect/jest.config.ts b/packages/jsii-reflect/jest.config.mjs similarity index 69% rename from packages/jsii-reflect/jest.config.ts rename to packages/jsii-reflect/jest.config.mjs index 623c3a4854..eb0980fac2 100644 --- a/packages/jsii-reflect/jest.config.ts +++ b/packages/jsii-reflect/jest.config.mjs @@ -1,4 +1,4 @@ -import { overriddenConfig } from '../../jest.config'; +import { overriddenConfig } from '../../jest.config.mjs'; export default overriddenConfig({ coverageThreshold: { diff --git a/packages/jsii-rosetta/jest.config.mjs b/packages/jsii-rosetta/jest.config.mjs new file mode 100644 index 0000000000..11cd59aafc --- /dev/null +++ b/packages/jsii-rosetta/jest.config.mjs @@ -0,0 +1,6 @@ +import { createRequire } from 'node:module'; +import { overriddenConfig } from '../../jest.config.mjs'; + +export default overriddenConfig({ + setupFiles: [createRequire(import.meta.url).resolve('./jestsetup.js')], +}); diff --git a/packages/jsii-rosetta/jest.config.ts b/packages/jsii-rosetta/jest.config.ts deleted file mode 100644 index e13e1670b0..0000000000 --- a/packages/jsii-rosetta/jest.config.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { join } from 'path'; - -import { overriddenConfig } from '../../jest.config'; - -export default overriddenConfig({ - setupFiles: [join(__dirname, 'jestsetup.js')], -}); diff --git a/packages/jsii-rosetta/lib/fixtures.ts b/packages/jsii-rosetta/lib/fixtures.ts index 2bf2fea32d..affa4283b7 100644 --- a/packages/jsii-rosetta/lib/fixtures.ts +++ b/packages/jsii-rosetta/lib/fixtures.ts @@ -1,6 +1,6 @@ import * as fs from 'fs-extra'; import * as path from 'path'; -import { createSourceFile, ScriptKind, ScriptTarget, SyntaxKind } from 'typescript-3.9'; +import { createSourceFile, ScriptKind, ScriptTarget, SyntaxKind } from 'typescript'; import { TypeScriptSnippet, SnippetParameters, ApiLocation } from './snippet'; diff --git a/packages/jsii-rosetta/lib/jsii/jsii-types.ts b/packages/jsii-rosetta/lib/jsii/jsii-types.ts index d831563f01..320c843dfa 100644 --- a/packages/jsii-rosetta/lib/jsii/jsii-types.ts +++ b/packages/jsii-rosetta/lib/jsii/jsii-types.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { inferredTypeOfExpression, BuiltInType, builtInTypeName, mapElementType } from '../typescript/types'; import { hasAnyFlag, analyzeStructType, JsiiSymbol } from './jsii-utils'; diff --git a/packages/jsii-rosetta/lib/jsii/jsii-utils.ts b/packages/jsii-rosetta/lib/jsii/jsii-utils.ts index de2aabe018..45e94100a2 100644 --- a/packages/jsii-rosetta/lib/jsii/jsii-utils.ts +++ b/packages/jsii-rosetta/lib/jsii/jsii-utils.ts @@ -1,6 +1,6 @@ import * as spec from '@jsii/spec'; import { symbolIdentifier } from 'jsii'; -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { AstRenderer } from '../renderer'; import { typeContainsUndefined } from '../typescript/types'; diff --git a/packages/jsii-rosetta/lib/languages/csharp.ts b/packages/jsii-rosetta/lib/languages/csharp.ts index dc4fb147cb..acca98b23b 100644 --- a/packages/jsii-rosetta/lib/languages/csharp.ts +++ b/packages/jsii-rosetta/lib/languages/csharp.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { determineJsiiType, JsiiType, ObjectLiteralStruct } from '../jsii/jsii-types'; import { JsiiSymbol, simpleName, namespaceName } from '../jsii/jsii-utils'; diff --git a/packages/jsii-rosetta/lib/languages/default.ts b/packages/jsii-rosetta/lib/languages/default.ts index 103a3015f9..bef56096fe 100644 --- a/packages/jsii-rosetta/lib/languages/default.ts +++ b/packages/jsii-rosetta/lib/languages/default.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { analyzeObjectLiteral, ObjectLiteralStruct } from '../jsii/jsii-types'; import { isNamedLikeStruct, isJsiiProtocolType } from '../jsii/jsii-utils'; diff --git a/packages/jsii-rosetta/lib/languages/go.ts b/packages/jsii-rosetta/lib/languages/go.ts index dabcd58caa..9fcb50632d 100644 --- a/packages/jsii-rosetta/lib/languages/go.ts +++ b/packages/jsii-rosetta/lib/languages/go.ts @@ -1,7 +1,7 @@ // import { JsiiSymbol, simpleName, namespaceName } from '../jsii/jsii-utils'; // import { jsiiTargetParameter } from '../jsii/packages'; import { AssertionError } from 'assert'; -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { analyzeObjectLiteral, determineJsiiType, JsiiType, ObjectLiteralStruct } from '../jsii/jsii-types'; import { OTree } from '../o-tree'; diff --git a/packages/jsii-rosetta/lib/languages/java.ts b/packages/jsii-rosetta/lib/languages/java.ts index 7d1f708c0f..778735731c 100644 --- a/packages/jsii-rosetta/lib/languages/java.ts +++ b/packages/jsii-rosetta/lib/languages/java.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { determineJsiiType, JsiiType, analyzeObjectLiteral, ObjectLiteralStruct } from '../jsii/jsii-types'; import { JsiiSymbol, simpleName, namespaceName } from '../jsii/jsii-utils'; diff --git a/packages/jsii-rosetta/lib/languages/python.ts b/packages/jsii-rosetta/lib/languages/python.ts index f5eed1e6be..c4e1c02579 100644 --- a/packages/jsii-rosetta/lib/languages/python.ts +++ b/packages/jsii-rosetta/lib/languages/python.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { determineJsiiType, JsiiType, ObjectLiteralStruct } from '../jsii/jsii-types'; import { diff --git a/packages/jsii-rosetta/lib/languages/record-references.ts b/packages/jsii-rosetta/lib/languages/record-references.ts index 35f2647477..d53750845c 100644 --- a/packages/jsii-rosetta/lib/languages/record-references.ts +++ b/packages/jsii-rosetta/lib/languages/record-references.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { lookupJsiiSymbol } from '../jsii/jsii-utils'; import { TargetLanguage } from '../languages/target-language'; diff --git a/packages/jsii-rosetta/lib/languages/visualize.ts b/packages/jsii-rosetta/lib/languages/visualize.ts index fbf252a211..6bf4c2ac4c 100644 --- a/packages/jsii-rosetta/lib/languages/visualize.ts +++ b/packages/jsii-rosetta/lib/languages/visualize.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { OTree } from '../o-tree'; import { AstRenderer, AstHandler, nimpl, CommentSyntax } from '../renderer'; diff --git a/packages/jsii-rosetta/lib/markdown/replace-typescript-transform.ts b/packages/jsii-rosetta/lib/markdown/replace-typescript-transform.ts index dcc0b45470..51a0b614e0 100644 --- a/packages/jsii-rosetta/lib/markdown/replace-typescript-transform.ts +++ b/packages/jsii-rosetta/lib/markdown/replace-typescript-transform.ts @@ -11,7 +11,7 @@ export class ReplaceTypeScriptTransform extends ReplaceCodeTransform { public constructor(api: ApiLocation, strict: boolean, replacer: TypeScriptReplacer) { super((block, line) => { const languageParts = block.language ? block.language.split(' ') : []; - if (languageParts[0] !== 'typescript-3.9' && languageParts[0] !== 'ts') { + if (languageParts[0] !== 'typescript' && languageParts[0] !== 'ts') { return block; } diff --git a/packages/jsii-rosetta/lib/renderer.ts b/packages/jsii-rosetta/lib/renderer.ts index d6b7aecc41..84fdb08759 100644 --- a/packages/jsii-rosetta/lib/renderer.ts +++ b/packages/jsii-rosetta/lib/renderer.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { TargetLanguage } from './languages'; import { NO_SYNTAX, OTree, UnknownSyntax, Span } from './o-tree'; diff --git a/packages/jsii-rosetta/lib/rosetta-reader.ts b/packages/jsii-rosetta/lib/rosetta-reader.ts index 3deb3dfbef..b2e4457462 100644 --- a/packages/jsii-rosetta/lib/rosetta-reader.ts +++ b/packages/jsii-rosetta/lib/rosetta-reader.ts @@ -259,7 +259,7 @@ export class RosettaTabletReader { const translated = this.translateSnippet(snippet, targetLang); - return translated ?? { language: 'typescript-3.9', source: example }; + return translated ?? { language: 'typescript', source: example }; } /** diff --git a/packages/jsii-rosetta/lib/tablets/tablets.ts b/packages/jsii-rosetta/lib/tablets/tablets.ts index 8121df4e0a..ac01a2a7b0 100644 --- a/packages/jsii-rosetta/lib/tablets/tablets.ts +++ b/packages/jsii-rosetta/lib/tablets/tablets.ts @@ -206,7 +206,7 @@ export class TranslatedSnippet { public get originalSource(): Translation { return { source: this.snippet.translations[ORIGINAL_SNIPPET_KEY].source, - language: 'typescript-3.9', + language: 'typescript', didCompile: this.snippet.didCompile, }; } diff --git a/packages/jsii-rosetta/lib/translate.ts b/packages/jsii-rosetta/lib/translate.ts index 58fb60d186..74dfe27b16 100644 --- a/packages/jsii-rosetta/lib/translate.ts +++ b/packages/jsii-rosetta/lib/translate.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { inspect } from 'util'; import { TARGET_LANGUAGES, TargetLanguage } from './languages'; diff --git a/packages/jsii-rosetta/lib/typescript/ast-utils.ts b/packages/jsii-rosetta/lib/typescript/ast-utils.ts index 7d0d769a7a..27091d41b5 100644 --- a/packages/jsii-rosetta/lib/typescript/ast-utils.ts +++ b/packages/jsii-rosetta/lib/typescript/ast-utils.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { AstRenderer } from '../renderer'; diff --git a/packages/jsii-rosetta/lib/typescript/imports.ts b/packages/jsii-rosetta/lib/typescript/imports.ts index cc21bd4bbb..830bf29388 100644 --- a/packages/jsii-rosetta/lib/typescript/imports.ts +++ b/packages/jsii-rosetta/lib/typescript/imports.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { JsiiSymbol, parentSymbol, lookupJsiiSymbolFromNode } from '../jsii/jsii-utils'; import { AstRenderer } from '../renderer'; diff --git a/packages/jsii-rosetta/lib/typescript/syntax-kind-counter.ts b/packages/jsii-rosetta/lib/typescript/syntax-kind-counter.ts index 1d55238859..ea594d08e6 100644 --- a/packages/jsii-rosetta/lib/typescript/syntax-kind-counter.ts +++ b/packages/jsii-rosetta/lib/typescript/syntax-kind-counter.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { Spans } from './visible-spans'; diff --git a/packages/jsii-rosetta/lib/typescript/ts-compiler.ts b/packages/jsii-rosetta/lib/typescript/ts-compiler.ts index 32f6b3060d..f053acebbe 100644 --- a/packages/jsii-rosetta/lib/typescript/ts-compiler.ts +++ b/packages/jsii-rosetta/lib/typescript/ts-compiler.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; export class TypeScriptCompiler { private readonly realHost = ts.createCompilerHost(STANDARD_COMPILER_OPTIONS, true); diff --git a/packages/jsii-rosetta/lib/typescript/types.ts b/packages/jsii-rosetta/lib/typescript/types.ts index 9d8805ec56..b5af10102a 100644 --- a/packages/jsii-rosetta/lib/typescript/types.ts +++ b/packages/jsii-rosetta/lib/typescript/types.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { hasAllFlags, hasAnyFlag, resolveEnumLiteral, resolvedSymbolAtLocation } from '../jsii/jsii-utils'; import { isDefined } from '../util'; diff --git a/packages/jsii-rosetta/lib/typescript/visible-spans.ts b/packages/jsii-rosetta/lib/typescript/visible-spans.ts index f51609b81f..3a69280ef5 100644 --- a/packages/jsii-rosetta/lib/typescript/visible-spans.ts +++ b/packages/jsii-rosetta/lib/typescript/visible-spans.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { Span } from '../o-tree'; diff --git a/packages/jsii-rosetta/lib/util.ts b/packages/jsii-rosetta/lib/util.ts index c63d1c9ded..d35dd1d375 100644 --- a/packages/jsii-rosetta/lib/util.ts +++ b/packages/jsii-rosetta/lib/util.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { RosettaDiagnostic } from './translate'; diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json index a1f9146108..7924551bb5 100644 --- a/packages/jsii-rosetta/package.json +++ b/packages/jsii-rosetta/package.json @@ -30,7 +30,7 @@ "@jsii/spec": "0.0.0", "commonmark": "^0.30.0", "fs-extra": "^10.1.0", - "typescript-3.9": "npm:typescript@~3.9.10", + "typescript": "~3.9.10", "sort-json": "^2.0.1", "@xmldom/xmldom": "^0.8.2", "workerpool": "^6.2.1", diff --git a/packages/jsii-rosetta/test/util.test.ts b/packages/jsii-rosetta/test/util.test.ts index e71b604c52..1636cbf69e 100644 --- a/packages/jsii-rosetta/test/util.test.ts +++ b/packages/jsii-rosetta/test/util.test.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { annotateStrictDiagnostic, hasStrictBranding } from '../lib/util'; diff --git a/packages/jsii/bin/jsii.ts b/packages/jsii/bin/jsii.ts index 11a8d5d7d5..838f523fb4 100644 --- a/packages/jsii/bin/jsii.ts +++ b/packages/jsii/bin/jsii.ts @@ -2,7 +2,7 @@ import '@jsii/check-node/run'; import * as log4js from 'log4js'; import * as path from 'path'; -import { version as tsVersion } from 'typescript-3.9/package.json'; +import { version as tsVersion } from 'typescript/package.json'; import * as util from 'util'; import * as yargs from 'yargs'; diff --git a/packages/jsii/jest.config.mjs b/packages/jsii/jest.config.mjs new file mode 100644 index 0000000000..7bc6eadd1b --- /dev/null +++ b/packages/jsii/jest.config.mjs @@ -0,0 +1,3 @@ +import config from '../../jest.config.mjs'; + +export default config; diff --git a/packages/jsii/jest.config.ts b/packages/jsii/jest.config.ts deleted file mode 100644 index e37577d92f..0000000000 --- a/packages/jsii/jest.config.ts +++ /dev/null @@ -1,3 +0,0 @@ -import config from '../../jest.config'; - -export default config; diff --git a/packages/jsii/lib/assembler.ts b/packages/jsii/lib/assembler.ts index 1c08b77907..b442526984 100644 --- a/packages/jsii/lib/assembler.ts +++ b/packages/jsii/lib/assembler.ts @@ -6,7 +6,7 @@ import * as deepEqual from 'fast-deep-equal/es6'; import * as fs from 'fs-extra'; import * as log4js from 'log4js'; import * as path from 'path'; -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import * as Case from './case'; import { diff --git a/packages/jsii/lib/compiler.ts b/packages/jsii/lib/compiler.ts index 9d0a22a1f5..3a150248e5 100644 --- a/packages/jsii/lib/compiler.ts +++ b/packages/jsii/lib/compiler.ts @@ -2,7 +2,7 @@ import * as chalk from 'chalk'; import * as fs from 'fs-extra'; import * as log4js from 'log4js'; import * as path from 'path'; -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { Assembler } from './assembler'; import * as Case from './case'; @@ -516,7 +516,7 @@ export class Compiler implements Emitter { * * Respects includes/excludes/etc. * - * This makes it so that running 'typescript-3.9' and running 'jsii' has the same behavior. + * This makes it so that running 'typescript' and running 'jsii' has the same behavior. */ private determineSources(files: string[]): string[] { const ret = new Array(); diff --git a/packages/jsii/lib/docs.ts b/packages/jsii/lib/docs.ts index 96f6620555..9af1421c00 100644 --- a/packages/jsii/lib/docs.ts +++ b/packages/jsii/lib/docs.ts @@ -31,7 +31,7 @@ * https://github.com/Microsoft/tsdoc/blob/master/api-demo/src/advancedDemo.ts */ import * as spec from '@jsii/spec'; -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; /** * Tags that we recognize diff --git a/packages/jsii/lib/emitter.ts b/packages/jsii/lib/emitter.ts index 50b5775103..cb030d5d60 100644 --- a/packages/jsii/lib/emitter.ts +++ b/packages/jsii/lib/emitter.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; /** * An object that is capable of emitting stuff. diff --git a/packages/jsii/lib/helpers.ts b/packages/jsii/lib/helpers.ts index d600ba9ad6..35c7fcf515 100644 --- a/packages/jsii/lib/helpers.ts +++ b/packages/jsii/lib/helpers.ts @@ -11,7 +11,7 @@ import { PackageJson, loadAssemblyFromPath, writeAssembly } from '@jsii/spec'; import * as fs from 'fs-extra'; import * as os from 'os'; import * as path from 'path'; -import { DiagnosticCategory } from 'typescript-3.9'; +import { DiagnosticCategory } from 'typescript'; import { Compiler, CompilerOptions } from './compiler'; import { loadProjectInfo, ProjectInfo } from './project-info'; diff --git a/packages/jsii/lib/jsii-diagnostic.ts b/packages/jsii/lib/jsii-diagnostic.ts index 633ca76154..47cfc958e4 100644 --- a/packages/jsii/lib/jsii-diagnostic.ts +++ b/packages/jsii/lib/jsii-diagnostic.ts @@ -1,6 +1,6 @@ import * as spec from '@jsii/spec'; import { camel, constant, pascal } from 'case'; -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { TypeSystemHints } from './docs'; import { WARNINGSCODE_FILE_NAME } from './transforms/deprecation-warnings'; diff --git a/packages/jsii/lib/node-bindings.ts b/packages/jsii/lib/node-bindings.ts index 7e072314dc..625e062716 100644 --- a/packages/jsii/lib/node-bindings.ts +++ b/packages/jsii/lib/node-bindings.ts @@ -1,5 +1,5 @@ import * as spec from '@jsii/spec'; -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; /** * This module provides typed method that can be used to access TypeScript Nodes diff --git a/packages/jsii/lib/project-info.ts b/packages/jsii/lib/project-info.ts index 154260328e..d7ce655843 100644 --- a/packages/jsii/lib/project-info.ts +++ b/packages/jsii/lib/project-info.ts @@ -4,7 +4,7 @@ import * as fs from 'fs-extra'; import * as log4js from 'log4js'; import * as path from 'path'; import * as semver from 'semver'; -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { JsiiDiagnostic } from './jsii-diagnostic'; import { parsePerson, parseRepository, findDependencyDirectory } from './utils'; @@ -27,6 +27,8 @@ export type TSCompilerOptions = Partial< | 'inlineSourceMap' | 'inlineSources' | 'sourceMap' + // Types limitations + | 'types' > >; @@ -221,6 +223,7 @@ export function loadProjectInfo(projectRoot: string): ProjectInfoResult { forceConsistentCasingInFileNames: pkg.jsii?.tsc?.forceConsistentCasingInFileNames, ..._sourceMapPreferences(pkg.jsii?.tsc), + types: pkg.jsii?.tsc?.types, }, bin: pkg.bin, exports: pkg.exports, diff --git a/packages/jsii/lib/symbol-id.ts b/packages/jsii/lib/symbol-id.ts index a9d8c8dd28..cc7f796a76 100644 --- a/packages/jsii/lib/symbol-id.ts +++ b/packages/jsii/lib/symbol-id.ts @@ -1,7 +1,7 @@ import { Assembly } from '@jsii/spec'; import * as fs from 'fs-extra'; import * as path from 'path'; -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { findUp } from './utils'; diff --git a/packages/jsii/lib/transforms/deprecated-remover.ts b/packages/jsii/lib/transforms/deprecated-remover.ts index 0ee77c1c44..9422bad4a2 100644 --- a/packages/jsii/lib/transforms/deprecated-remover.ts +++ b/packages/jsii/lib/transforms/deprecated-remover.ts @@ -18,7 +18,7 @@ import { TypeReference, } from '@jsii/spec'; import { basename, dirname, relative } from 'path'; -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { JsiiDiagnostic } from '../jsii-diagnostic'; import * as bindings from '../node-bindings'; diff --git a/packages/jsii/lib/transforms/deprecation-warnings.ts b/packages/jsii/lib/transforms/deprecation-warnings.ts index 52e553e375..a0a7b2f36a 100644 --- a/packages/jsii/lib/transforms/deprecation-warnings.ts +++ b/packages/jsii/lib/transforms/deprecation-warnings.ts @@ -2,7 +2,7 @@ import * as spec from '@jsii/spec'; import { Assembly } from '@jsii/spec'; import * as fs from 'fs'; import * as path from 'path'; -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { ProjectInfo } from '../project-info'; import { symbolIdentifier } from '../symbol-id'; diff --git a/packages/jsii/lib/transforms/runtime-info.ts b/packages/jsii/lib/transforms/runtime-info.ts index 8f4018c52b..d980b14e0f 100644 --- a/packages/jsii/lib/transforms/runtime-info.ts +++ b/packages/jsii/lib/transforms/runtime-info.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; /** * Provides a TransformerFactory to annotate classes with runtime information diff --git a/packages/jsii/lib/transforms/utils.ts b/packages/jsii/lib/transforms/utils.ts index e3f109dddd..43f1302651 100644 --- a/packages/jsii/lib/transforms/utils.ts +++ b/packages/jsii/lib/transforms/utils.ts @@ -1,4 +1,4 @@ -import { CustomTransformers } from 'typescript-3.9'; +import { CustomTransformers } from 'typescript'; /** * Combines a collection of `CustomTransformers` configurations into a single diff --git a/packages/jsii/lib/utils.ts b/packages/jsii/lib/utils.ts index f19f832724..0b35d099ce 100644 --- a/packages/jsii/lib/utils.ts +++ b/packages/jsii/lib/utils.ts @@ -1,7 +1,7 @@ import * as fs from 'fs-extra'; import * as log4js from 'log4js'; import * as path from 'path'; -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { JsiiDiagnostic } from './jsii-diagnostic'; diff --git a/packages/jsii/lib/validator.ts b/packages/jsii/lib/validator.ts index 9430b62abc..86039f4360 100644 --- a/packages/jsii/lib/validator.ts +++ b/packages/jsii/lib/validator.ts @@ -1,7 +1,7 @@ import * as spec from '@jsii/spec'; import * as assert from 'assert'; import * as deepEqual from 'fast-deep-equal'; -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import * as Case from './case'; import { Emitter } from './emitter'; diff --git a/packages/jsii/package.json b/packages/jsii/package.json index 005cb48fe1..839ae80aae 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -46,7 +46,7 @@ "semver-intersect": "^1.4.0", "sort-json": "^2.0.1", "spdx-license-list": "^6.6.0", - "typescript-3.9": "npm:typescript@~3.9.10", + "typescript": "~3.9.10", "yargs": "^16.2.0" }, "devDependencies": { diff --git a/packages/jsii/test/__snapshots__/negatives.test.js.snap b/packages/jsii/test/__snapshots__/negatives.test.js.snap index 3a761e3de4..21d490237e 100644 --- a/packages/jsii/test/__snapshots__/negatives.test.js.snap +++ b/packages/jsii/test/__snapshots__/negatives.test.js.snap @@ -573,7 +573,7 @@ neg.omit.1.ts:7:33 - error JSII3004: Illegal extends clause for an exported API: 7 export interface BarBaz extends Omit { ~~~~~~~~~~~~~~~~~~~ - ../../../../node_modules/typescript-3.9/lib/lib.es5.d.ts:1462:35 + ../../node_modules/typescript/lib/lib.es5.d.ts:1462:35 1462 type Pick = { ~ 1463 [P in K]: T[P]; @@ -590,7 +590,7 @@ neg.omit.2.ts:7:32 - error JSII3004: Illegal implements clause for an exported A 7 export class BarBaz implements Omit { ~~~~~~~~~~~~~~~~~~~ - ../../../../node_modules/typescript-3.9/lib/lib.es5.d.ts:1462:35 + ../../node_modules/typescript/lib/lib.es5.d.ts:1462:35 1462 type Pick = { ~ 1463 [P in K]: T[P]; diff --git a/packages/jsii/test/jsii-diagnostic.test.ts b/packages/jsii/test/jsii-diagnostic.test.ts index 30ba0b9b89..a83e3c1211 100644 --- a/packages/jsii/test/jsii-diagnostic.test.ts +++ b/packages/jsii/test/jsii-diagnostic.test.ts @@ -1,4 +1,4 @@ -import { DiagnosticCategory } from 'typescript-3.9'; +import { DiagnosticCategory } from 'typescript'; import { Code, configureCategories } from '../lib/jsii-diagnostic'; diff --git a/packages/jsii/test/negatives.test.ts b/packages/jsii/test/negatives.test.ts index 86e01a07af..8979555f93 100644 --- a/packages/jsii/test/negatives.test.ts +++ b/packages/jsii/test/negatives.test.ts @@ -1,6 +1,6 @@ import * as fs from 'fs-extra'; import * as path from 'path'; -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { Compiler } from '../lib/compiler'; import { ProjectInfo } from '../lib/project-info'; @@ -107,6 +107,9 @@ function _makeProjectInfo(types: string): ProjectInfo { bundleDependencies: {}, targets: {}, excludeTypescript: [], - tsc: { outDir }, + tsc: { + outDir, + types: ['node'], + }, }; } diff --git a/packages/jsii/test/project-info.test.ts b/packages/jsii/test/project-info.test.ts index 0f3920dbdf..a3b7e16d00 100644 --- a/packages/jsii/test/project-info.test.ts +++ b/packages/jsii/test/project-info.test.ts @@ -4,7 +4,7 @@ import * as clone from 'clone'; import * as fs from 'fs-extra'; import * as os from 'os'; import * as path from 'path'; -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { loadProjectInfo } from '../lib/project-info'; import { VERSION } from '../lib/version'; diff --git a/packages/jsii/test/transforms/runtime-info.test.ts b/packages/jsii/test/transforms/runtime-info.test.ts index 29cf52c9a7..130b41f0b2 100644 --- a/packages/jsii/test/transforms/runtime-info.test.ts +++ b/packages/jsii/test/transforms/runtime-info.test.ts @@ -1,4 +1,4 @@ -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; import { RuntimeTypeInfoInjector } from '../../lib/transforms/runtime-info'; @@ -102,7 +102,7 @@ function mockedTypeInfoForClasses( */ const EXAMPLE_NO_CLASS = ` -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; interface Foo { readonly foobar: string; @@ -110,7 +110,7 @@ interface Foo { `; const EXAMPLE_SINGLE_CLASS = ` -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; class Foo { constructor(public readonly bar: string) {} @@ -144,7 +144,7 @@ export default class { `; const EXAMPLE_CONFLICTING_NAME = ` -import * as ts from 'typescript-3.9'; +import * as ts from 'typescript'; const JSII_RTTI_SYMBOL_1 = 42; diff --git a/packages/jsii/tsconfig.json b/packages/jsii/tsconfig.json index c73fd9435b..9a7b1287bf 100644 --- a/packages/jsii/tsconfig.json +++ b/packages/jsii/tsconfig.json @@ -1,9 +1,20 @@ { "extends": "../../tsconfig-base", - "include": ["**/*.ts"], - "exclude": ["test/negatives/*", "jest.config.ts"], + "include": [ + "**/*.ts" + ], + "exclude": [ + "test/negatives/*", + "jest.config.ts" + ], "references": [ - { "path": "../@jsii/check-node" }, - { "path": "../@jsii/spec" }, + { + "name": "@jsii/check-node", + "path": "../@jsii/check-node" + }, + { + "name": "@jsii/spec", + "path": "../@jsii/spec" + }, ] } diff --git a/packages/oo-ascii-tree/jest.config.mjs b/packages/oo-ascii-tree/jest.config.mjs new file mode 100644 index 0000000000..7bc6eadd1b --- /dev/null +++ b/packages/oo-ascii-tree/jest.config.mjs @@ -0,0 +1,3 @@ +import config from '../../jest.config.mjs'; + +export default config; diff --git a/packages/oo-ascii-tree/jest.config.ts b/packages/oo-ascii-tree/jest.config.ts deleted file mode 100644 index e37577d92f..0000000000 --- a/packages/oo-ascii-tree/jest.config.ts +++ /dev/null @@ -1,3 +0,0 @@ -import config from '../../jest.config'; - -export default config; diff --git a/scripts/list-reserved-words.ts b/scripts/list-reserved-words.ts index dcac5de26d..048ab8028e 100755 --- a/scripts/list-reserved-words.ts +++ b/scripts/list-reserved-words.ts @@ -1,4 +1,4 @@ -#!npx ts-node +#!/usr/bin/env npx ts-node import { CSHARP_RESERVED, JAVA_RESERVED, PYTHON_RESERVED } from '../packages/jsii/lib/reserved-words'; const TS = new Set([ diff --git a/yarn.lock b/yarn.lock index 16c2d2729e..75ae2f26cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1896,7 +1896,7 @@ resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== -"@types/prettier@2.6.0", "@types/prettier@^2.1.5": +"@types/prettier@^2.1.5": version "2.6.0" resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.6.0.tgz#efcbd41937f9ae7434c714ab698604822d890759" integrity sha512-G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw== @@ -5653,10 +5653,10 @@ minipass-sized@^1.0.3: dependencies: minipass "^3.0.0" -minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6: - version "3.1.6" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee" - integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ== +minipass@3.2.1, minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6: + version "3.2.1" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.2.1.tgz#12ac0ab289be638db0ad8887b28413b773355c13" + integrity sha512-v5cqJP4WxUVXYXhOOdPiOZEDoF7omSpLivw2GMCL1v/j+xh886bPXKh6SzyA6sa45e4NRQ46IRBEkAazvb6I6A== dependencies: yallist "^4.0.0" @@ -7552,11 +7552,6 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -"typescript-3.9@npm:typescript@~3.9.10": - version "3.9.10" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8" - integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q== - typescript-json-schema@^0.53.1: version "0.53.1" resolved "https://registry.yarnpkg.com/typescript-json-schema/-/typescript-json-schema-0.53.1.tgz#9204547f3e145169b40928998366ff6d28b81d32" @@ -7571,6 +7566,11 @@ typescript-json-schema@^0.53.1: typescript "~4.6.0" yargs "^17.1.1" +typescript@~3.9.10: + version "3.9.10" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8" + integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q== + typescript@~4.6.0: version "4.6.4" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"