diff --git a/apps/api-extractor/package.json b/apps/api-extractor/package.json index ea69d1182a..6e47c256fd 100644 --- a/apps/api-extractor/package.json +++ b/apps/api-extractor/package.json @@ -48,7 +48,7 @@ "resolve": "~1.22.1", "semver": "~7.5.4", "source-map": "~0.6.1", - "typescript": "~5.0.4" + "typescript": "5.3.3" }, "devDependencies": { "local-eslint-config": "workspace:*", diff --git a/apps/api-extractor/src/analyzer/ExportAnalyzer.ts b/apps/api-extractor/src/analyzer/ExportAnalyzer.ts index 4ca72ed77c..b4a345e69f 100644 --- a/apps/api-extractor/src/analyzer/ExportAnalyzer.ts +++ b/apps/api-extractor/src/analyzer/ExportAnalyzer.ts @@ -268,6 +268,7 @@ export class ExportAnalyzer { : undefined; const resolvedModule: ts.ResolvedModuleFull | undefined = TypeScriptInternals.getResolvedModule( + this._program, importOrExportDeclaration.getSourceFile(), moduleSpecifier, mode @@ -882,6 +883,7 @@ export class ExportAnalyzer { ) : undefined; const resolvedModule: ts.ResolvedModuleFull | undefined = TypeScriptInternals.getResolvedModule( + this._program, importOrExportDeclaration.getSourceFile(), moduleSpecifier, mode diff --git a/apps/api-extractor/src/analyzer/TypeScriptInternals.ts b/apps/api-extractor/src/analyzer/TypeScriptInternals.ts index e8b74f8844..eeb8e1b4df 100644 --- a/apps/api-extractor/src/analyzer/TypeScriptInternals.ts +++ b/apps/api-extractor/src/analyzer/TypeScriptInternals.ts @@ -82,14 +82,19 @@ export class TypeScriptInternals { * The compiler populates this cache as part of analyzing the source file. */ public static getResolvedModule( + program: ts.Program, sourceFile: ts.SourceFile, moduleNameText: string, mode: ts.ModuleKind.CommonJS | ts.ModuleKind.ESNext | undefined ): ts.ResolvedModuleFull | undefined { // Compiler internal: - // https://github.com/microsoft/TypeScript/blob/v4.7.2/src/compiler/utilities.ts#L161 - - return (ts as any).getResolvedModule(sourceFile, moduleNameText, mode); + // https://github.com/microsoft/TypeScript/blob/v5.3.3/src/compiler/types.ts#L4698 + const result: ts.ResolvedModuleWithFailedLookupLocations | undefined = (program as any).getResolvedModule( + sourceFile, + moduleNameText, + mode + ); + return result?.resolvedModule; } /** diff --git a/build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml b/build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml index 89f0a7ecf1..849aa15b99 100644 --- a/build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml +++ b/build-tests/install-test-workspace/workspace/common/pnpm-lock.yaml @@ -11,8 +11,8 @@ importers: rush-lib-test: dependencies: '@microsoft/rush-lib': - specifier: file:microsoft-rush-lib-5.112.1.tgz - version: file:../temp/tarballs/microsoft-rush-lib-5.112.1.tgz(@types/node@18.17.15) + specifier: file:microsoft-rush-lib-5.112.2.tgz + version: file:../temp/tarballs/microsoft-rush-lib-5.112.2.tgz(@types/node@18.17.15) colors: specifier: ^1.4.0 version: 1.4.0 @@ -30,15 +30,15 @@ importers: rush-sdk-test: dependencies: '@rushstack/rush-sdk': - specifier: file:rushstack-rush-sdk-5.112.1.tgz - version: file:../temp/tarballs/rushstack-rush-sdk-5.112.1.tgz(@types/node@18.17.15) + specifier: file:rushstack-rush-sdk-5.112.2.tgz + version: file:../temp/tarballs/rushstack-rush-sdk-5.112.2.tgz(@types/node@18.17.15) colors: specifier: ^1.4.0 version: 1.4.0 devDependencies: '@microsoft/rush-lib': - specifier: file:microsoft-rush-lib-5.112.1.tgz - version: file:../temp/tarballs/microsoft-rush-lib-5.112.1.tgz(@types/node@18.17.15) + specifier: file:microsoft-rush-lib-5.112.2.tgz + version: file:../temp/tarballs/microsoft-rush-lib-5.112.2.tgz(@types/node@18.17.15) '@types/node': specifier: 18.17.15 version: 18.17.15 @@ -52,17 +52,17 @@ importers: typescript-newest-test: devDependencies: '@rushstack/eslint-config': - specifier: file:rushstack-eslint-config-3.5.0.tgz - version: file:../temp/tarballs/rushstack-eslint-config-3.5.0.tgz(eslint@8.7.0)(typescript@5.0.4) + specifier: file:rushstack-eslint-config-3.5.1.tgz + version: file:../temp/tarballs/rushstack-eslint-config-3.5.1.tgz(eslint@8.7.0)(typescript@5.0.4) '@rushstack/heft': - specifier: file:rushstack-heft-0.63.2.tgz - version: file:../temp/tarballs/rushstack-heft-0.63.2.tgz + specifier: file:rushstack-heft-0.63.4.tgz + version: file:../temp/tarballs/rushstack-heft-0.63.4.tgz '@rushstack/heft-lint-plugin': - specifier: file:rushstack-heft-lint-plugin-0.2.12.tgz - version: file:../temp/tarballs/rushstack-heft-lint-plugin-0.2.12.tgz(@rushstack/heft@0.63.2) + specifier: file:rushstack-heft-lint-plugin-0.2.14.tgz + version: file:../temp/tarballs/rushstack-heft-lint-plugin-0.2.14.tgz(@rushstack/heft@0.63.4) '@rushstack/heft-typescript-plugin': - specifier: file:rushstack-heft-typescript-plugin-0.2.12.tgz - version: file:../temp/tarballs/rushstack-heft-typescript-plugin-0.2.12.tgz(@rushstack/heft@0.63.2) + specifier: file:rushstack-heft-typescript-plugin-0.2.14.tgz + version: file:../temp/tarballs/rushstack-heft-typescript-plugin-0.2.14.tgz(@rushstack/heft@0.63.4) eslint: specifier: ~8.7.0 version: 8.7.0 @@ -76,17 +76,17 @@ importers: typescript-v4-test: devDependencies: '@rushstack/eslint-config': - specifier: file:rushstack-eslint-config-3.5.0.tgz - version: file:../temp/tarballs/rushstack-eslint-config-3.5.0.tgz(eslint@8.7.0)(typescript@4.7.4) + specifier: file:rushstack-eslint-config-3.5.1.tgz + version: file:../temp/tarballs/rushstack-eslint-config-3.5.1.tgz(eslint@8.7.0)(typescript@4.7.4) '@rushstack/heft': - specifier: file:rushstack-heft-0.63.2.tgz - version: file:../temp/tarballs/rushstack-heft-0.63.2.tgz + specifier: file:rushstack-heft-0.63.4.tgz + version: file:../temp/tarballs/rushstack-heft-0.63.4.tgz '@rushstack/heft-lint-plugin': - specifier: file:rushstack-heft-lint-plugin-0.2.12.tgz - version: file:../temp/tarballs/rushstack-heft-lint-plugin-0.2.12.tgz(@rushstack/heft@0.63.2) + specifier: file:rushstack-heft-lint-plugin-0.2.14.tgz + version: file:../temp/tarballs/rushstack-heft-lint-plugin-0.2.14.tgz(@rushstack/heft@0.63.4) '@rushstack/heft-typescript-plugin': - specifier: file:rushstack-heft-typescript-plugin-0.2.12.tgz - version: file:../temp/tarballs/rushstack-heft-typescript-plugin-0.2.12.tgz(@rushstack/heft@0.63.2) + specifier: file:rushstack-heft-typescript-plugin-0.2.14.tgz + version: file:../temp/tarballs/rushstack-heft-typescript-plugin-0.2.14.tgz(@rushstack/heft@0.63.4) eslint: specifier: ~8.7.0 version: 8.7.0 @@ -3923,22 +3923,22 @@ packages: optionalDependencies: commander: 2.20.3 - file:../temp/tarballs/microsoft-rush-lib-5.112.1.tgz(@types/node@18.17.15): - resolution: {tarball: file:../temp/tarballs/microsoft-rush-lib-5.112.1.tgz} - id: file:../temp/tarballs/microsoft-rush-lib-5.112.1.tgz + file:../temp/tarballs/microsoft-rush-lib-5.112.2.tgz(@types/node@18.17.15): + resolution: {tarball: file:../temp/tarballs/microsoft-rush-lib-5.112.2.tgz} + id: file:../temp/tarballs/microsoft-rush-lib-5.112.2.tgz name: '@microsoft/rush-lib' - version: 5.112.1 + version: 5.112.2 engines: {node: '>=5.6.0'} dependencies: '@pnpm/dependency-path': 2.1.2 '@pnpm/link-bins': 5.3.25 - '@rushstack/heft-config-file': file:../temp/tarballs/rushstack-heft-config-file-0.14.2.tgz(@types/node@18.17.15) - '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.61.0.tgz(@types/node@18.17.15) - '@rushstack/package-deps-hash': file:../temp/tarballs/rushstack-package-deps-hash-4.1.12.tgz(@types/node@18.17.15) - '@rushstack/package-extractor': file:../temp/tarballs/rushstack-package-extractor-0.6.14.tgz(@types/node@18.17.15) + '@rushstack/heft-config-file': file:../temp/tarballs/rushstack-heft-config-file-0.14.3.tgz(@types/node@18.17.15) + '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.62.0.tgz(@types/node@18.17.15) + '@rushstack/package-deps-hash': file:../temp/tarballs/rushstack-package-deps-hash-4.1.14.tgz(@types/node@18.17.15) + '@rushstack/package-extractor': file:../temp/tarballs/rushstack-package-extractor-0.6.17.tgz(@types/node@18.17.15) '@rushstack/rig-package': file:../temp/tarballs/rushstack-rig-package-0.5.1.tgz - '@rushstack/stream-collator': file:../temp/tarballs/rushstack-stream-collator-4.1.13.tgz(@types/node@18.17.15) - '@rushstack/terminal': file:../temp/tarballs/rushstack-terminal-0.7.12.tgz(@types/node@18.17.15) + '@rushstack/stream-collator': file:../temp/tarballs/rushstack-stream-collator-4.1.15.tgz(@types/node@18.17.15) + '@rushstack/terminal': file:../temp/tarballs/rushstack-terminal-0.7.14.tgz(@types/node@18.17.15) '@rushstack/ts-command-line': file:../temp/tarballs/rushstack-ts-command-line-4.17.1.tgz '@types/node-fetch': 2.6.2 '@yarnpkg/lockfile': 1.0.2 @@ -3971,16 +3971,16 @@ packages: - encoding - supports-color - file:../temp/tarballs/rushstack-eslint-config-3.5.0.tgz(eslint@8.7.0)(typescript@4.7.4): - resolution: {tarball: file:../temp/tarballs/rushstack-eslint-config-3.5.0.tgz} - id: file:../temp/tarballs/rushstack-eslint-config-3.5.0.tgz + file:../temp/tarballs/rushstack-eslint-config-3.5.1.tgz(eslint@8.7.0)(typescript@4.7.4): + resolution: {tarball: file:../temp/tarballs/rushstack-eslint-config-3.5.1.tgz} + id: file:../temp/tarballs/rushstack-eslint-config-3.5.1.tgz name: '@rushstack/eslint-config' - version: 3.5.0 + version: 3.5.1 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 typescript: '>=4.7.0' dependencies: - '@rushstack/eslint-patch': file:../temp/tarballs/rushstack-eslint-patch-1.6.0.tgz + '@rushstack/eslint-patch': file:../temp/tarballs/rushstack-eslint-patch-1.6.1.tgz '@rushstack/eslint-plugin': file:../temp/tarballs/rushstack-eslint-plugin-0.13.1.tgz(eslint@8.7.0)(typescript@4.7.4) '@rushstack/eslint-plugin-packlets': file:../temp/tarballs/rushstack-eslint-plugin-packlets-0.8.1.tgz(eslint@8.7.0)(typescript@4.7.4) '@rushstack/eslint-plugin-security': file:../temp/tarballs/rushstack-eslint-plugin-security-0.7.1.tgz(eslint@8.7.0)(typescript@4.7.4) @@ -3997,16 +3997,16 @@ packages: - supports-color dev: true - file:../temp/tarballs/rushstack-eslint-config-3.5.0.tgz(eslint@8.7.0)(typescript@5.0.4): - resolution: {tarball: file:../temp/tarballs/rushstack-eslint-config-3.5.0.tgz} - id: file:../temp/tarballs/rushstack-eslint-config-3.5.0.tgz + file:../temp/tarballs/rushstack-eslint-config-3.5.1.tgz(eslint@8.7.0)(typescript@5.0.4): + resolution: {tarball: file:../temp/tarballs/rushstack-eslint-config-3.5.1.tgz} + id: file:../temp/tarballs/rushstack-eslint-config-3.5.1.tgz name: '@rushstack/eslint-config' - version: 3.5.0 + version: 3.5.1 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 typescript: '>=4.7.0' dependencies: - '@rushstack/eslint-patch': file:../temp/tarballs/rushstack-eslint-patch-1.6.0.tgz + '@rushstack/eslint-patch': file:../temp/tarballs/rushstack-eslint-patch-1.6.1.tgz '@rushstack/eslint-plugin': file:../temp/tarballs/rushstack-eslint-plugin-0.13.1.tgz(eslint@8.7.0)(typescript@5.0.4) '@rushstack/eslint-plugin-packlets': file:../temp/tarballs/rushstack-eslint-plugin-packlets-0.8.1.tgz(eslint@8.7.0)(typescript@5.0.4) '@rushstack/eslint-plugin-security': file:../temp/tarballs/rushstack-eslint-plugin-security-0.7.1.tgz(eslint@8.7.0)(typescript@5.0.4) @@ -4023,10 +4023,10 @@ packages: - supports-color dev: true - file:../temp/tarballs/rushstack-eslint-patch-1.6.0.tgz: - resolution: {tarball: file:../temp/tarballs/rushstack-eslint-patch-1.6.0.tgz} + file:../temp/tarballs/rushstack-eslint-patch-1.6.1.tgz: + resolution: {tarball: file:../temp/tarballs/rushstack-eslint-patch-1.6.1.tgz} name: '@rushstack/eslint-patch' - version: 1.6.0 + version: 1.6.1 dev: true file:../temp/tarballs/rushstack-eslint-plugin-0.13.1.tgz(eslint@8.7.0)(typescript@4.7.4): @@ -4125,16 +4125,16 @@ packages: - typescript dev: true - file:../temp/tarballs/rushstack-heft-0.63.2.tgz: - resolution: {tarball: file:../temp/tarballs/rushstack-heft-0.63.2.tgz} + file:../temp/tarballs/rushstack-heft-0.63.4.tgz: + resolution: {tarball: file:../temp/tarballs/rushstack-heft-0.63.4.tgz} name: '@rushstack/heft' - version: 0.63.2 + version: 0.63.4 engines: {node: '>=10.13.0'} hasBin: true dependencies: - '@rushstack/heft-config-file': file:../temp/tarballs/rushstack-heft-config-file-0.14.2.tgz(@types/node@18.17.15) - '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.61.0.tgz(@types/node@18.17.15) - '@rushstack/operation-graph': file:../temp/tarballs/rushstack-operation-graph-0.2.0.tgz + '@rushstack/heft-config-file': file:../temp/tarballs/rushstack-heft-config-file-0.14.3.tgz(@types/node@18.17.15) + '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.62.0.tgz(@types/node@18.17.15) + '@rushstack/operation-graph': file:../temp/tarballs/rushstack-operation-graph-0.2.1.tgz '@rushstack/rig-package': file:../temp/tarballs/rushstack-rig-package-0.5.1.tgz '@rushstack/ts-command-line': file:../temp/tarballs/rushstack-ts-command-line-4.17.1.tgz '@types/tapable': 1.0.6 @@ -4149,45 +4149,45 @@ packages: - '@types/node' dev: true - file:../temp/tarballs/rushstack-heft-config-file-0.14.2.tgz(@types/node@18.17.15): - resolution: {tarball: file:../temp/tarballs/rushstack-heft-config-file-0.14.2.tgz} - id: file:../temp/tarballs/rushstack-heft-config-file-0.14.2.tgz + file:../temp/tarballs/rushstack-heft-config-file-0.14.3.tgz(@types/node@18.17.15): + resolution: {tarball: file:../temp/tarballs/rushstack-heft-config-file-0.14.3.tgz} + id: file:../temp/tarballs/rushstack-heft-config-file-0.14.3.tgz name: '@rushstack/heft-config-file' - version: 0.14.2 + version: 0.14.3 engines: {node: '>=10.13.0'} dependencies: - '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.61.0.tgz(@types/node@18.17.15) + '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.62.0.tgz(@types/node@18.17.15) '@rushstack/rig-package': file:../temp/tarballs/rushstack-rig-package-0.5.1.tgz jsonpath-plus: 4.0.0 transitivePeerDependencies: - '@types/node' - file:../temp/tarballs/rushstack-heft-lint-plugin-0.2.12.tgz(@rushstack/heft@0.63.2): - resolution: {tarball: file:../temp/tarballs/rushstack-heft-lint-plugin-0.2.12.tgz} - id: file:../temp/tarballs/rushstack-heft-lint-plugin-0.2.12.tgz + file:../temp/tarballs/rushstack-heft-lint-plugin-0.2.14.tgz(@rushstack/heft@0.63.4): + resolution: {tarball: file:../temp/tarballs/rushstack-heft-lint-plugin-0.2.14.tgz} + id: file:../temp/tarballs/rushstack-heft-lint-plugin-0.2.14.tgz name: '@rushstack/heft-lint-plugin' - version: 0.2.12 + version: 0.2.14 peerDependencies: '@rushstack/heft': '*' dependencies: - '@rushstack/heft': file:../temp/tarballs/rushstack-heft-0.63.2.tgz - '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.61.0.tgz(@types/node@18.17.15) + '@rushstack/heft': file:../temp/tarballs/rushstack-heft-0.63.4.tgz + '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.62.0.tgz(@types/node@18.17.15) semver: 7.5.4 transitivePeerDependencies: - '@types/node' dev: true - file:../temp/tarballs/rushstack-heft-typescript-plugin-0.2.12.tgz(@rushstack/heft@0.63.2): - resolution: {tarball: file:../temp/tarballs/rushstack-heft-typescript-plugin-0.2.12.tgz} - id: file:../temp/tarballs/rushstack-heft-typescript-plugin-0.2.12.tgz + file:../temp/tarballs/rushstack-heft-typescript-plugin-0.2.14.tgz(@rushstack/heft@0.63.4): + resolution: {tarball: file:../temp/tarballs/rushstack-heft-typescript-plugin-0.2.14.tgz} + id: file:../temp/tarballs/rushstack-heft-typescript-plugin-0.2.14.tgz name: '@rushstack/heft-typescript-plugin' - version: 0.2.12 + version: 0.2.14 peerDependencies: '@rushstack/heft': '*' dependencies: - '@rushstack/heft': file:../temp/tarballs/rushstack-heft-0.63.2.tgz - '@rushstack/heft-config-file': file:../temp/tarballs/rushstack-heft-config-file-0.14.2.tgz(@types/node@18.17.15) - '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.61.0.tgz(@types/node@18.17.15) + '@rushstack/heft': file:../temp/tarballs/rushstack-heft-0.63.4.tgz + '@rushstack/heft-config-file': file:../temp/tarballs/rushstack-heft-config-file-0.14.3.tgz(@types/node@18.17.15) + '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.62.0.tgz(@types/node@18.17.15) '@types/tapable': 1.0.6 semver: 7.5.4 tapable: 1.1.3 @@ -4195,11 +4195,11 @@ packages: - '@types/node' dev: true - file:../temp/tarballs/rushstack-node-core-library-3.61.0.tgz(@types/node@18.17.15): - resolution: {tarball: file:../temp/tarballs/rushstack-node-core-library-3.61.0.tgz} - id: file:../temp/tarballs/rushstack-node-core-library-3.61.0.tgz + file:../temp/tarballs/rushstack-node-core-library-3.62.0.tgz(@types/node@18.17.15): + resolution: {tarball: file:../temp/tarballs/rushstack-node-core-library-3.62.0.tgz} + id: file:../temp/tarballs/rushstack-node-core-library-3.62.0.tgz name: '@rushstack/node-core-library' - version: 3.61.0 + version: 3.62.0 peerDependencies: '@types/node': '*' peerDependenciesMeta: @@ -4215,38 +4215,38 @@ packages: semver: 7.5.4 z-schema: 5.0.3 - file:../temp/tarballs/rushstack-operation-graph-0.2.0.tgz: - resolution: {tarball: file:../temp/tarballs/rushstack-operation-graph-0.2.0.tgz} + file:../temp/tarballs/rushstack-operation-graph-0.2.1.tgz: + resolution: {tarball: file:../temp/tarballs/rushstack-operation-graph-0.2.1.tgz} name: '@rushstack/operation-graph' - version: 0.2.0 + version: 0.2.1 peerDependencies: '@types/node': '*' peerDependenciesMeta: '@types/node': optional: true dependencies: - '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.61.0.tgz(@types/node@18.17.15) + '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.62.0.tgz(@types/node@18.17.15) dev: true - file:../temp/tarballs/rushstack-package-deps-hash-4.1.12.tgz(@types/node@18.17.15): - resolution: {tarball: file:../temp/tarballs/rushstack-package-deps-hash-4.1.12.tgz} - id: file:../temp/tarballs/rushstack-package-deps-hash-4.1.12.tgz + file:../temp/tarballs/rushstack-package-deps-hash-4.1.14.tgz(@types/node@18.17.15): + resolution: {tarball: file:../temp/tarballs/rushstack-package-deps-hash-4.1.14.tgz} + id: file:../temp/tarballs/rushstack-package-deps-hash-4.1.14.tgz name: '@rushstack/package-deps-hash' - version: 4.1.12 + version: 4.1.14 dependencies: - '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.61.0.tgz(@types/node@18.17.15) + '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.62.0.tgz(@types/node@18.17.15) transitivePeerDependencies: - '@types/node' - file:../temp/tarballs/rushstack-package-extractor-0.6.14.tgz(@types/node@18.17.15): - resolution: {tarball: file:../temp/tarballs/rushstack-package-extractor-0.6.14.tgz} - id: file:../temp/tarballs/rushstack-package-extractor-0.6.14.tgz + file:../temp/tarballs/rushstack-package-extractor-0.6.17.tgz(@types/node@18.17.15): + resolution: {tarball: file:../temp/tarballs/rushstack-package-extractor-0.6.17.tgz} + id: file:../temp/tarballs/rushstack-package-extractor-0.6.17.tgz name: '@rushstack/package-extractor' - version: 0.6.14 + version: 0.6.17 dependencies: '@pnpm/link-bins': 5.3.25 - '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.61.0.tgz(@types/node@18.17.15) - '@rushstack/terminal': file:../temp/tarballs/rushstack-terminal-0.7.12.tgz(@types/node@18.17.15) + '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.62.0.tgz(@types/node@18.17.15) + '@rushstack/terminal': file:../temp/tarballs/rushstack-terminal-0.7.14.tgz(@types/node@18.17.15) ignore: 5.1.9 jszip: 3.8.0 minimatch: 3.0.8 @@ -4263,42 +4263,42 @@ packages: resolve: 1.22.1 strip-json-comments: 3.1.1 - file:../temp/tarballs/rushstack-rush-sdk-5.112.1.tgz(@types/node@18.17.15): - resolution: {tarball: file:../temp/tarballs/rushstack-rush-sdk-5.112.1.tgz} - id: file:../temp/tarballs/rushstack-rush-sdk-5.112.1.tgz + file:../temp/tarballs/rushstack-rush-sdk-5.112.2.tgz(@types/node@18.17.15): + resolution: {tarball: file:../temp/tarballs/rushstack-rush-sdk-5.112.2.tgz} + id: file:../temp/tarballs/rushstack-rush-sdk-5.112.2.tgz name: '@rushstack/rush-sdk' - version: 5.112.1 + version: 5.112.2 dependencies: - '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.61.0.tgz(@types/node@18.17.15) + '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.62.0.tgz(@types/node@18.17.15) '@types/node-fetch': 2.6.2 tapable: 2.2.1 transitivePeerDependencies: - '@types/node' dev: false - file:../temp/tarballs/rushstack-stream-collator-4.1.13.tgz(@types/node@18.17.15): - resolution: {tarball: file:../temp/tarballs/rushstack-stream-collator-4.1.13.tgz} - id: file:../temp/tarballs/rushstack-stream-collator-4.1.13.tgz + file:../temp/tarballs/rushstack-stream-collator-4.1.15.tgz(@types/node@18.17.15): + resolution: {tarball: file:../temp/tarballs/rushstack-stream-collator-4.1.15.tgz} + id: file:../temp/tarballs/rushstack-stream-collator-4.1.15.tgz name: '@rushstack/stream-collator' - version: 4.1.13 + version: 4.1.15 dependencies: - '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.61.0.tgz(@types/node@18.17.15) - '@rushstack/terminal': file:../temp/tarballs/rushstack-terminal-0.7.12.tgz(@types/node@18.17.15) + '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.62.0.tgz(@types/node@18.17.15) + '@rushstack/terminal': file:../temp/tarballs/rushstack-terminal-0.7.14.tgz(@types/node@18.17.15) transitivePeerDependencies: - '@types/node' - file:../temp/tarballs/rushstack-terminal-0.7.12.tgz(@types/node@18.17.15): - resolution: {tarball: file:../temp/tarballs/rushstack-terminal-0.7.12.tgz} - id: file:../temp/tarballs/rushstack-terminal-0.7.12.tgz + file:../temp/tarballs/rushstack-terminal-0.7.14.tgz(@types/node@18.17.15): + resolution: {tarball: file:../temp/tarballs/rushstack-terminal-0.7.14.tgz} + id: file:../temp/tarballs/rushstack-terminal-0.7.14.tgz name: '@rushstack/terminal' - version: 0.7.12 + version: 0.7.14 peerDependencies: '@types/node': '*' peerDependenciesMeta: '@types/node': optional: true dependencies: - '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.61.0.tgz(@types/node@18.17.15) + '@rushstack/node-core-library': file:../temp/tarballs/rushstack-node-core-library-3.62.0.tgz(@types/node@18.17.15) '@types/node': 18.17.15 file:../temp/tarballs/rushstack-tree-pattern-0.3.1.tgz: diff --git a/common/changes/@microsoft/api-extractor/octogonz-ae-ts-5.3.0-beta_2023-10-24-21-05.json b/common/changes/@microsoft/api-extractor/octogonz-ae-ts-5.3.0-beta_2023-10-24-21-05.json new file mode 100644 index 0000000000..e9eb36ded5 --- /dev/null +++ b/common/changes/@microsoft/api-extractor/octogonz-ae-ts-5.3.0-beta_2023-10-24-21-05.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@microsoft/api-extractor", + "comment": "Update API Extractor to support TypeScript 5.3.3", + "type": "minor" + } + ], + "packageName": "@microsoft/api-extractor" +} \ No newline at end of file diff --git a/common/changes/@rushstack/eslint-patch/octogonz-ae-ts-5.3.0-beta_2023-12-19-23-03.json b/common/changes/@rushstack/eslint-patch/octogonz-ae-ts-5.3.0-beta_2023-12-19-23-03.json new file mode 100644 index 0000000000..ceefa44d69 --- /dev/null +++ b/common/changes/@rushstack/eslint-patch/octogonz-ae-ts-5.3.0-beta_2023-12-19-23-03.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@rushstack/eslint-patch", + "comment": "", + "type": "none" + } + ], + "packageName": "@rushstack/eslint-patch" +} \ No newline at end of file diff --git a/common/config/rush/common-versions.json b/common/config/rush/common-versions.json index 0c4361631d..30e8b43744 100644 --- a/common/config/rush/common-versions.json +++ b/common/config/rush/common-versions.json @@ -76,7 +76,9 @@ // For testing Heft with TS V3 "~3.9.10", // For testing Heft with TS V4 - "~4.9.5" + "~4.9.5", + + "5.3.3" ], "source-map": [ "~0.6.1" // API Extractor is using an older version of source-map because newer versions are async diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 95123467cd..e842bb0c9a 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -86,8 +86,8 @@ importers: specifier: ~0.6.1 version: 0.6.1 typescript: - specifier: ~5.0.4 - version: 5.0.4 + specifier: 5.3.3 + version: 5.3.3 devDependencies: '@rushstack/heft': specifier: 0.62.0 @@ -1755,7 +1755,7 @@ importers: version: 29.5.11 '@types/node': specifier: ts4.9 - version: 20.10.4 + version: 20.10.5 eslint: specifier: ~8.7.0 version: 8.7.0 @@ -11399,8 +11399,8 @@ packages: /@types/node@18.17.15: resolution: {integrity: sha512-2yrWpBk32tvV/JAd3HNHWuZn/VDN1P+72hWirHnvsvTGSqbANi+kSeuQR9yAHnbvaBvHDsoTdXV0Fe+iRtHLKA==} - /@types/node@20.10.4: - resolution: {integrity: sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==} + /@types/node@20.10.5: + resolution: {integrity: sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==} dependencies: undici-types: 5.26.5 dev: true @@ -24745,6 +24745,12 @@ packages: engines: {node: '>=12.20'} hasBin: true + /typescript@5.3.3: + resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==} + engines: {node: '>=14.17'} + hasBin: true + dev: false + /uc.micro@1.0.6: resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==} dev: true diff --git a/common/config/rush/repo-state.json b/common/config/rush/repo-state.json index 1e5904eef9..2f34722f15 100644 --- a/common/config/rush/repo-state.json +++ b/common/config/rush/repo-state.json @@ -1,5 +1,5 @@ // DO NOT MODIFY THIS FILE MANUALLY BUT DO COMMIT IT. It is generated and used by Rush. { - "pnpmShrinkwrapHash": "148b38e4e98c98edfcfa2d368a33cff4b835df8f", + "pnpmShrinkwrapHash": "e42e10f7ac97560c9546f9077901b92b19a54310", "preferredVersionsHash": "1926a5b12ac8f4ab41e76503a0d1d0dccc9c0e06" } diff --git a/eslint/eslint-patch/src/eslint-bulk-suppressions/bulk-suppressions-patch.ts b/eslint/eslint-patch/src/eslint-bulk-suppressions/bulk-suppressions-patch.ts index 11e4cd4d7d..93e1c8d9f1 100644 --- a/eslint/eslint-patch/src/eslint-bulk-suppressions/bulk-suppressions-patch.ts +++ b/eslint/eslint-patch/src/eslint-bulk-suppressions/bulk-suppressions-patch.ts @@ -74,7 +74,11 @@ export function getGitRootPath(): string { export const GitRootPath = getGitRootPath(); function findEslintrcDirectory(fileAbsolutePath: string): string { - for (let currentDir = fileAbsolutePath; currentDir.startsWith(GitRootPath); currentDir = path.dirname(currentDir)) + for ( + let currentDir = fileAbsolutePath; + currentDir.startsWith(GitRootPath); + currentDir = path.dirname(currentDir) + ) if (['.eslintrc.js', '.eslintrc.cjs'].some((eslintrc) => fs.existsSync(path.join(currentDir, eslintrc)))) return currentDir; throw new Error('Cannot locate eslintrc');