From c12cc533b2c06938d166e11965477aee105ccb5e Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Sun, 15 Nov 2020 00:39:08 -0500 Subject: [PATCH] Remove bundledPackageName from release 4.1 (#41536) * Merge release 4-1 * Remove unused tests --- src/compiler/checker.ts | 4 +- src/compiler/commandLineParser.ts | 7 --- src/compiler/diagnosticMessages.json | 8 --- src/compiler/moduleSpecifiers.ts | 7 ++- src/compiler/program.ts | 5 -- src/compiler/types.ts | 2 - src/compiler/utilities.ts | 12 +---- src/services/utilities.ts | 3 +- .../tsbuild/javascriptProjectEmit.ts | 6 +-- src/testRunner/unittests/tsbuild/outFile.ts | 4 +- src/testRunner/unittests/tsbuild/watchMode.ts | 4 +- .../tsserver/projectReferenceErrors.ts | 4 +- .../reference/api/tsserverlibrary.d.ts | 1 - tests/baselines/reference/api/typescript.d.ts | 1 - .../bundledDtsLateExportRenaming.errors.txt | 30 ----------- .../reference/bundledDtsLateExportRenaming.js | 51 ------------------- .../bundledNodeDTSFailsWithOutFlag.errors.txt | 29 ----------- .../bundledNodeDTSFailsWithOutFlag.js | 50 ------------------ .../reference/bundledNodeDTSPassesWithFlag.js | 50 ------------------ .../reference/bundledNodeDTSWithExports.js | 44 ---------------- .../bundledNodeDTSWithScopedPackage.js | 50 ------------------ .../declarationEmitOutFileBundlePaths.js | 9 ++-- .../declarationEmitOutFileBundlePaths.symbols | 1 + .../declarationEmitOutFileBundlePaths.types | 1 + .../reference/declarationMapsOutFile.js | 10 ++-- .../reference/declarationMapsOutFile.js.map | 4 +- .../declarationMapsOutFile.sourcemap.txt | 10 ++-- .../outModuleConcatCommonjsDeclarationOnly.js | 6 +-- .../bundledPackageName/tsconfig.json | 2 +- ...rojects-and-concatenates-them-correctly.js | 6 +-- ...rojects-and-concatenates-them-correctly.js | 6 +-- .../outFile/initial-build/clean-projects.js | 3 -- .../non-module-projects-without-prepend.js | 6 --- ...erated-when-incremental-is-set-to-false.js | 3 -- ...-buildInfo-absence-results-in-new-build.js | 3 -- .../baseline-sectioned-sourcemaps.js | 3 -- .../declarationMap-and-sourceMap-disabled.js | 3 -- .../emitHelpers-in-all-projects.js | 3 -- ...tHelpers-in-only-one-dependency-project.js | 3 -- .../multiple-emitHelpers-in-all-projects.js | 3 -- ...tiple-emitHelpers-in-different-projects.js | 3 -- .../multiple-prologues-in-all-projects.js | 3 -- ...ultiple-prologues-in-different-projects.js | 3 -- .../initial-build/shebang-in-all-projects.js | 3 -- .../shebang-in-only-one-dependency-project.js | 3 -- .../initial-build/strict-in-all-projects.js | 3 -- .../initial-build/strict-in-one-dependency.js | 3 -- ...hen-internal-is-inside-another-internal.js | 3 -- ...en-one-two-three-are-prepended-in-order.js | 3 -- .../stripInternal-jsdoc-style-comment.js | 3 -- ...en-one-two-three-are-prepended-in-order.js | 3 -- ...-jsdoc-style-with-comments-emit-enabled.js | 3 -- ...l-when-few-members-of-enum-are-internal.js | 3 -- ...en-one-two-three-are-prepended-in-order.js | 3 -- ...nal-when-prepend-is-completely-internal.js | 4 +- ...en-one-two-three-are-prepended-in-order.js | 3 -- ...tripInternal-with-comments-emit-enabled.js | 3 -- .../initial-build/stripInternal.js | 3 -- .../triple-slash-refs-in-all-projects.js | 3 -- .../triple-slash-refs-in-one-project.js | 3 -- ...roject-is-not-composite-but-incremental.js | 3 -- ...t-composite-but-uses-project-references.js | 3 -- ...final-project-specifies-tsBuildInfoFile.js | 3 -- ...-source-files-are-empty-in-the-own-file.js | 3 -- ...ncing-project-even-for-non-local-change.js | 14 ++--- .../typeReferenceDirectives12.errors.txt | 2 - .../compiler/bundledDtsLateExportRenaming.ts | 31 ----------- ...WithErrorsInInputDeclarationFileWithOut.ts | 1 - ...BundlePreservesHasNoDefaultLibDirective.ts | 1 - .../declarationEmitOutFileBundlePaths.ts | 3 +- .../declarationFileOverwriteErrorWithOut.ts | 2 +- ...eclarationFilesGeneratingTypeReferences.ts | 1 - .../cases/compiler/declarationMapsOutFile.ts | 1 - .../cases/compiler/declarationMapsOutFile2.ts | 1 - .../compiler/declarationMapsWithSourceMap.ts | 1 - ...pilationDuplicateFunctionImplementation.ts | 1 - ...FunctionImplementationFileOrderReversed.ts | 1 - .../jsFileCompilationDuplicateVariable.ts | 1 - ...mpilationDuplicateVariableErrorReported.ts | 1 - .../jsFileCompilationEmitDeclarations.ts | 1 - ...ileCompilationEmitTrippleSlashReference.ts | 1 - ...nDeclarationsWithJsFileReferenceWithOut.ts | 1 - .../jsFileCompilationLetDeclarationOrder.ts | 1 - .../jsFileCompilationLetDeclarationOrder2.ts | 1 - ...leCompilationWithEnabledCompositeOption.ts | 1 - ...OutDeclarationFileNameSameAsInputJsFile.ts | 1 - tests/cases/compiler/out-flag2.ts | 1 - tests/cases/compiler/out-flag3.ts | 1 - .../cases/compiler/outModuleConcatCommonjs.ts | 1 - .../outModuleConcatCommonjsDeclarationOnly.ts | 1 - ...catUnspecifiedModuleKindDeclarationOnly.ts | 1 - ...sourceMapWithMultipleFilesWithCopyright.ts | 1 - .../compiler/typeReferenceDirectives11.ts | 1 - .../bundledNodeDTSFailsWithOutFlag.ts | 29 ----------- .../bundledNodeDTSPassesWithFlag.ts | 30 ----------- .../bundledNodeDTSWithExports.ts | 27 ---------- .../bundledNodeDTSWithScopedPackage.ts | 30 ----------- .../container/compositeExec/tsconfig.json | 1 - tests/projects/container/exec/tsconfig.json | 1 - tests/projects/container/lib/tsconfig.json | 1 - .../outfile-concat/first/tsconfig.json | 1 - .../outfile-concat/second/tsconfig.json | 1 - .../outfile-concat/third/tsconfig.json | 1 - 103 files changed, 54 insertions(+), 674 deletions(-) delete mode 100644 tests/baselines/reference/bundledDtsLateExportRenaming.errors.txt delete mode 100644 tests/baselines/reference/bundledDtsLateExportRenaming.js delete mode 100644 tests/baselines/reference/bundledNodeDTSFailsWithOutFlag.errors.txt delete mode 100644 tests/baselines/reference/bundledNodeDTSFailsWithOutFlag.js delete mode 100644 tests/baselines/reference/bundledNodeDTSPassesWithFlag.js delete mode 100644 tests/baselines/reference/bundledNodeDTSWithExports.js delete mode 100644 tests/baselines/reference/bundledNodeDTSWithScopedPackage.js delete mode 100644 tests/cases/compiler/bundledDtsLateExportRenaming.ts delete mode 100644 tests/cases/conformance/declarationEmit/bundledNodeDTSFailsWithOutFlag.ts delete mode 100644 tests/cases/conformance/declarationEmit/bundledNodeDTSPassesWithFlag.ts delete mode 100644 tests/cases/conformance/declarationEmit/bundledNodeDTSWithExports.ts delete mode 100644 tests/cases/conformance/declarationEmit/bundledNodeDTSWithScopedPackage.ts diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 9e61193a1f962..2d4ef35754cac 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -4360,7 +4360,6 @@ namespace ts { getProjectReferenceRedirect: fileName => host.getProjectReferenceRedirect(fileName), isSourceOfProjectReferenceRedirect: fileName => host.isSourceOfProjectReferenceRedirect(fileName), fileExists: fileName => host.fileExists(fileName), - getCompilerOptions: () => host.getCompilerOptions() } : undefined }, encounteredError: false, visitedTypes: undefined, @@ -6015,8 +6014,7 @@ namespace ts { const resolverHost = { getCanonicalFileName, getCurrentDirectory: () => context.tracker.moduleResolverHost!.getCurrentDirectory(), - getCommonSourceDirectory: () => context.tracker.moduleResolverHost!.getCommonSourceDirectory(), - getCompilerOptions: () => context.tracker.moduleResolverHost!.getCompilerOptions() + getCommonSourceDirectory: () => context.tracker.moduleResolverHost!.getCommonSourceDirectory() }; const newName = getResolvedExternalModuleName(resolverHost, targetFile); return factory.createStringLiteral(newName); diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 2c41ba05ffde6..1d8c17300969a 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -1031,13 +1031,6 @@ namespace ts { category: Diagnostics.Advanced_Options, description: Diagnostics.Emit_class_fields_with_Define_instead_of_Set, }, - { - name: "bundledPackageName", - type: "string", - affectsEmit: true, - category: Diagnostics.Advanced_Options, - description: Diagnostics.Provides_a_root_package_name_when_using_outFile_with_declarations, - }, { name: "keyofStringsOnly", diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 95d40754f37ab..1aafb063bd302 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -1188,14 +1188,6 @@ "category": "Error", "code": 1389 }, - "Provides a root package name when using outFile with declarations.": { - "category": "Message", - "code": 1390 - }, - "The `bundledPackageName` option must be provided when using outFile and node module resolution with declaration emit.": { - "category": "Error", - "code": 1391 - }, "The types of '{0}' are incompatible between these types.": { "category": "Error", "code": 2200 diff --git a/src/compiler/moduleSpecifiers.ts b/src/compiler/moduleSpecifiers.ts index 8b87c5cd10225..1128ee38d7205 100644 --- a/src/compiler/moduleSpecifiers.ts +++ b/src/compiler/moduleSpecifiers.ts @@ -157,7 +157,7 @@ namespace ts.moduleSpecifiers { } function getLocalModuleSpecifier(moduleFileName: string, { getCanonicalFileName, sourceDirectory }: Info, compilerOptions: CompilerOptions, host: ModuleSpecifierResolutionHost, { ending, relativePreference }: Preferences): string { - const { baseUrl, paths, rootDirs, bundledPackageName } = compilerOptions; + const { baseUrl, paths, rootDirs } = compilerOptions; const relativePath = rootDirs && tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName, ending, compilerOptions) || removeExtensionAndIndexPostFix(ensurePathIsNonModuleName(getRelativePathFromDirectory(sourceDirectory, moduleFileName, getCanonicalFileName)), ending, compilerOptions); @@ -171,9 +171,8 @@ namespace ts.moduleSpecifiers { return relativePath; } - const bundledPkgReference = bundledPackageName ? combinePaths(bundledPackageName, relativeToBaseUrl) : relativeToBaseUrl; - const importRelativeToBaseUrl = removeExtensionAndIndexPostFix(bundledPkgReference, ending, compilerOptions); - const fromPaths = paths && tryGetModuleNameFromPaths(removeFileExtension(bundledPkgReference), importRelativeToBaseUrl, paths); + const importRelativeToBaseUrl = removeExtensionAndIndexPostFix(relativeToBaseUrl, ending, compilerOptions); + const fromPaths = paths && tryGetModuleNameFromPaths(removeFileExtension(relativeToBaseUrl), importRelativeToBaseUrl, paths); const nonRelative = fromPaths === undefined && baseUrl !== undefined ? importRelativeToBaseUrl : fromPaths; if (!nonRelative) { return relativePath; diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 16d6a6bd36715..35951a4afa27e 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -3224,11 +3224,6 @@ namespace ts { } } - // Without a package name, for multiple files being bundled into a .d.ts file you basically get a file which doesn't wrk - if (outputFile && getEmitDeclarations(options) && getEmitModuleResolutionKind(options) === ModuleResolutionKind.NodeJs && !options.bundledPackageName) { - createDiagnosticForOptionName(Diagnostics.The_bundledPackageName_option_must_be_provided_when_using_outFile_and_node_module_resolution_with_declaration_emit, options.out ? "out" : "outFile"); - } - if (options.resolveJsonModule) { if (getEmitModuleResolutionKind(options) !== ModuleResolutionKind.NodeJs) { createDiagnosticForOptionName(Diagnostics.Option_resolveJsonModule_cannot_be_specified_without_node_module_resolution_strategy, "resolveJsonModule"); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index a234916d5c13a..72fc2ab72aae7 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -5729,7 +5729,6 @@ namespace ts { /** An error if set - this should only go through the -b pipeline and not actually be observed */ /*@internal*/ build?: boolean; - bundledPackageName?: string; charset?: string; checkJs?: boolean; /* @internal */ configFilePath?: string; @@ -7857,7 +7856,6 @@ namespace ts { readonly redirectTargetsMap: RedirectTargetsMap; getProjectReferenceRedirect(fileName: string): string | undefined; isSourceOfProjectReferenceRedirect(fileName: string): boolean; - getCompilerOptions(): CompilerOptions; } // Note: this used to be deprecated in our public API, but is still used internally diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 295671b70449b..b4abedc1923b8 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -4069,7 +4069,6 @@ namespace ts { getCanonicalFileName(p: string): string; getCommonSourceDirectory(): string; getCurrentDirectory(): string; - getCompilerOptions(): CompilerOptions; } export function getResolvedExternalModuleName(host: ResolveModuleNameResolutionHost, file: SourceFile, referenceFile?: SourceFile): string { @@ -4093,16 +4092,7 @@ namespace ts { const filePath = getNormalizedAbsolutePath(fileName, host.getCurrentDirectory()); const relativePath = getRelativePathToDirectoryOrUrl(dir, filePath, dir, getCanonicalFileName, /*isAbsolutePathAnUrl*/ false); const extensionless = removeFileExtension(relativePath); - if (referencePath) { - return ensurePathIsNonModuleName(extensionless); - } - const options = host.getCompilerOptions(); - const rootPkgName = options.bundledPackageName || ""; - const newPath = combinePaths(rootPkgName, extensionless); - if (rootPkgName && getEmitModuleResolutionKind(options) === ModuleResolutionKind.NodeJs && endsWith(newPath, "/index")) { - return newPath.slice(0, newPath.length - "/index".length); - } - return newPath; + return referencePath ? ensurePathIsNonModuleName(extensionless) : extensionless; } export function getOwnEmitOutputFilePath(fileName: string, host: EmitHost, extension: string) { diff --git a/src/services/utilities.ts b/src/services/utilities.ts index d63e21d476f79..f2c88b8f4791b 100644 --- a/src/services/utilities.ts +++ b/src/services/utilities.ts @@ -1786,8 +1786,7 @@ namespace ts { getSourceFiles: () => program.getSourceFiles(), redirectTargetsMap: program.redirectTargetsMap, getProjectReferenceRedirect: fileName => program.getProjectReferenceRedirect(fileName), - isSourceOfProjectReferenceRedirect: fileName => program.isSourceOfProjectReferenceRedirect(fileName), - getCompilerOptions: () => program.getCompilerOptions() + isSourceOfProjectReferenceRedirect: fileName => program.isSourceOfProjectReferenceRedirect(fileName) }; } diff --git a/src/testRunner/unittests/tsbuild/javascriptProjectEmit.ts b/src/testRunner/unittests/tsbuild/javascriptProjectEmit.ts index 058e5c0efb4fc..6658e5a198da5 100644 --- a/src/testRunner/unittests/tsbuild/javascriptProjectEmit.ts +++ b/src/testRunner/unittests/tsbuild/javascriptProjectEmit.ts @@ -105,7 +105,7 @@ namespace ts { "compilerOptions": { "composite": true, "outFile": "common.js", - "bundledPackageName": "common" + }, "include": ["nominal.js"] }`, @@ -121,7 +121,7 @@ namespace ts { "compilerOptions": { "composite": true, "outFile": "sub-project.js", - "bundledPackageName": "sub" + }, "references": [ { "path": "../common", "prepend": true } @@ -146,7 +146,7 @@ namespace ts { "compilerOptions": { "composite": true, "outFile": "sub-project-2.js", - "bundledPackageName": "sub-2" + }, "references": [ { "path": "../sub-project", "prepend": true } diff --git a/src/testRunner/unittests/tsbuild/outFile.ts b/src/testRunner/unittests/tsbuild/outFile.ts index 1f6685c873e2b..c062478605aab 100644 --- a/src/testRunner/unittests/tsbuild/outFile.ts +++ b/src/testRunner/unittests/tsbuild/outFile.ts @@ -658,8 +658,7 @@ ${internal} enum internalEnum { a, b, c }`); declarationMap: true, skipDefaultLibCheck: true, sourceMap: true, - outFile: "./bin/first-output.js", - bundledPackageName: "first" + outFile: "./bin/first-output.js" }, files: [sources[Project.first][Source.ts][Part.one]] })); @@ -671,7 +670,6 @@ ${internal} enum internalEnum { a, b, c }`); stripInternal: true, sourceMap: true, outFile: "./thirdjs/output/third-output.js", - bundledPackageName: "third" }, references: [{ path: "../first", prepend: true }], files: [sources[Project.third][Source.ts][Part.one]] diff --git a/src/testRunner/unittests/tsbuild/watchMode.ts b/src/testRunner/unittests/tsbuild/watchMode.ts index a0442229ba817..e04950cc42dea 100644 --- a/src/testRunner/unittests/tsbuild/watchMode.ts +++ b/src/testRunner/unittests/tsbuild/watchMode.ts @@ -326,13 +326,13 @@ export class someClass2 { }`), const coreTsConfig: File = { path: core[0].path, content: JSON.stringify({ - compilerOptions: { composite: true, declaration: true, outFile: "index.js", bundledPackageName: "core" } + compilerOptions: { composite: true, declaration: true, outFile: "index.js" } }) }; const logicTsConfig: File = { path: logic[0].path, content: JSON.stringify({ - compilerOptions: { composite: true, declaration: true, outFile: "index.js", bundledPackageName: "logic" }, + compilerOptions: { composite: true, declaration: true, outFile: "index.js" }, references: [{ path: "../core", prepend: true }] }) }; diff --git a/src/testRunner/unittests/tsserver/projectReferenceErrors.ts b/src/testRunner/unittests/tsserver/projectReferenceErrors.ts index 371e0720eb767..432cd81098128 100644 --- a/src/testRunner/unittests/tsserver/projectReferenceErrors.ts +++ b/src/testRunner/unittests/tsserver/projectReferenceErrors.ts @@ -193,7 +193,7 @@ let x: string = 10;` }; const dependencyConfig: File = { path: `${dependecyLocation}/tsconfig.json`, - content: JSON.stringify({ compilerOptions: { composite: true, outFile: "../dependency.js", bundledPackageName: "dep" } }) + content: JSON.stringify({ compilerOptions: { composite: true, outFile: "../dependency.js" } }) }; const usageTs: File = { path: `${usageLocation}/usage.ts`, @@ -205,7 +205,7 @@ fnErr(); const usageConfig: File = { path: `${usageLocation}/tsconfig.json`, content: JSON.stringify({ - compilerOptions: { composite: true, outFile: "../usage.js", bundledPackageName: "usage" }, + compilerOptions: { composite: true, outFile: "../usage.js" }, references: [{ path: "../dependency" }] }) }; diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 95963d1ef5d46..f721c4ce0a8da 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -2790,7 +2790,6 @@ declare namespace ts { allowUnusedLabels?: boolean; alwaysStrict?: boolean; baseUrl?: string; - bundledPackageName?: string; charset?: string; checkJs?: boolean; declaration?: boolean; diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts index 2b6547e3c851c..7c6c6301d218b 100644 --- a/tests/baselines/reference/api/typescript.d.ts +++ b/tests/baselines/reference/api/typescript.d.ts @@ -2790,7 +2790,6 @@ declare namespace ts { allowUnusedLabels?: boolean; alwaysStrict?: boolean; baseUrl?: string; - bundledPackageName?: string; charset?: string; checkJs?: boolean; declaration?: boolean; diff --git a/tests/baselines/reference/bundledDtsLateExportRenaming.errors.txt b/tests/baselines/reference/bundledDtsLateExportRenaming.errors.txt deleted file mode 100644 index 4f96a9965ae4b..0000000000000 --- a/tests/baselines/reference/bundledDtsLateExportRenaming.errors.txt +++ /dev/null @@ -1,30 +0,0 @@ -error TS1391: The `bundledPackageName` option must be provided when using outFile and node module resolution with declaration emit. - - -!!! error TS1391: The `bundledPackageName` option must be provided when using outFile and node module resolution with declaration emit. -==== tests/cases/compiler/index.ts (0 errors) ==== - export * from "./nested"; - -==== tests/cases/compiler/nested/base.ts (0 errors) ==== - import { B } from "./shared"; - - export function f() { - return new B(); - } - -==== tests/cases/compiler/nested/derived.ts (0 errors) ==== - import { f } from "./base"; - - export function g() { - return f(); - } - -==== tests/cases/compiler/nested/index.ts (0 errors) ==== - export * from "./base"; - - export * from "./derived"; - export * from "./shared"; - -==== tests/cases/compiler/nested/shared.ts (0 errors) ==== - export class B {} - \ No newline at end of file diff --git a/tests/baselines/reference/bundledDtsLateExportRenaming.js b/tests/baselines/reference/bundledDtsLateExportRenaming.js deleted file mode 100644 index 52b642b655e1f..0000000000000 --- a/tests/baselines/reference/bundledDtsLateExportRenaming.js +++ /dev/null @@ -1,51 +0,0 @@ -//// [tests/cases/compiler/bundledDtsLateExportRenaming.ts] //// - -//// [index.ts] -export * from "./nested"; - -//// [base.ts] -import { B } from "./shared"; - -export function f() { - return new B(); -} - -//// [derived.ts] -import { f } from "./base"; - -export function g() { - return f(); -} - -//// [index.ts] -export * from "./base"; - -export * from "./derived"; -export * from "./shared"; - -//// [shared.ts] -export class B {} - - - - -//// [out.d.ts] -declare module "nested/shared" { - export class B { - } -} -declare module "nested/base" { - import { B } from "nested/shared"; - export function f(): B; -} -declare module "nested/derived" { - export function g(): import("nested").B; -} -declare module "nested/index" { - export * from "nested/base"; - export * from "nested/derived"; - export * from "nested/shared"; -} -declare module "index" { - export * from "nested/index"; -} diff --git a/tests/baselines/reference/bundledNodeDTSFailsWithOutFlag.errors.txt b/tests/baselines/reference/bundledNodeDTSFailsWithOutFlag.errors.txt deleted file mode 100644 index 33c7b6a659d42..0000000000000 --- a/tests/baselines/reference/bundledNodeDTSFailsWithOutFlag.errors.txt +++ /dev/null @@ -1,29 +0,0 @@ -error TS1391: The `bundledPackageName` option must be provided when using outFile and node module resolution with declaration emit. - - -!!! error TS1391: The `bundledPackageName` option must be provided when using outFile and node module resolution with declaration emit. -==== tests/cases/conformance/declarationEmit/index.ts (0 errors) ==== - export * from "./nested"; - -==== tests/cases/conformance/declarationEmit/nested/base.ts (0 errors) ==== - import { B } from "./shared"; - - export function f() { - return new B(); - } - -==== tests/cases/conformance/declarationEmit/nested/derived.ts (0 errors) ==== - import { f } from "./base"; - - export function g() { - return f(); - } - -==== tests/cases/conformance/declarationEmit/nested/index.ts (0 errors) ==== - export * from "./base"; - export * from "./derived"; - export * from "./shared"; - -==== tests/cases/conformance/declarationEmit/nested/shared.ts (0 errors) ==== - export class B {} - \ No newline at end of file diff --git a/tests/baselines/reference/bundledNodeDTSFailsWithOutFlag.js b/tests/baselines/reference/bundledNodeDTSFailsWithOutFlag.js deleted file mode 100644 index 8a778916492b8..0000000000000 --- a/tests/baselines/reference/bundledNodeDTSFailsWithOutFlag.js +++ /dev/null @@ -1,50 +0,0 @@ -//// [tests/cases/conformance/declarationEmit/bundledNodeDTSFailsWithOutFlag.ts] //// - -//// [index.ts] -export * from "./nested"; - -//// [base.ts] -import { B } from "./shared"; - -export function f() { - return new B(); -} - -//// [derived.ts] -import { f } from "./base"; - -export function g() { - return f(); -} - -//// [index.ts] -export * from "./base"; -export * from "./derived"; -export * from "./shared"; - -//// [shared.ts] -export class B {} - - - - -//// [out.d.ts] -declare module "nested/shared" { - export class B { - } -} -declare module "nested/base" { - import { B } from "nested/shared"; - export function f(): B; -} -declare module "nested/derived" { - export function g(): import("nested").B; -} -declare module "nested/index" { - export * from "nested/base"; - export * from "nested/derived"; - export * from "nested/shared"; -} -declare module "index" { - export * from "nested/index"; -} diff --git a/tests/baselines/reference/bundledNodeDTSPassesWithFlag.js b/tests/baselines/reference/bundledNodeDTSPassesWithFlag.js deleted file mode 100644 index d671430a28072..0000000000000 --- a/tests/baselines/reference/bundledNodeDTSPassesWithFlag.js +++ /dev/null @@ -1,50 +0,0 @@ -//// [tests/cases/conformance/declarationEmit/bundledNodeDTSPassesWithFlag.ts] //// - -//// [index.ts] -export * from "./nested"; - -//// [base.ts] -import { B } from "./shared"; - -export function f() { - return new B(); -} - -//// [derived.ts] -import { f } from "./base"; - -export function g() { - return f(); -} - -//// [index.ts] -export * from "./base"; -export * from "./derived"; -export * from "./shared"; - -//// [shared.ts] -export class B {} - - - - -//// [out.d.ts] -declare module "my-pkg/nested/shared" { - export class B { - } -} -declare module "my-pkg/nested/base" { - import { B } from "my-pkg/nested/shared"; - export function f(): B; -} -declare module "my-pkg/nested/derived" { - export function g(): import("my-pkg").B; -} -declare module "my-pkg/nested" { - export * from "my-pkg/nested/base"; - export * from "my-pkg/nested/derived"; - export * from "my-pkg/nested/shared"; -} -declare module "my-pkg" { - export * from "my-pkg/nested"; -} diff --git a/tests/baselines/reference/bundledNodeDTSWithExports.js b/tests/baselines/reference/bundledNodeDTSWithExports.js deleted file mode 100644 index 69dc79e917da5..0000000000000 --- a/tests/baselines/reference/bundledNodeDTSWithExports.js +++ /dev/null @@ -1,44 +0,0 @@ -//// [tests/cases/conformance/declarationEmit/bundledNodeDTSWithExports.ts] //// - -//// [index.ts] -export {} - -//// [base.ts] -import { C } from "./"; - -export function f() { - return new C(); -} - -//// [derived.ts] -import { f } from "./base"; - -export function g() { - return f(); -} - -//// [index.ts] -export * from "./base"; -export * from "./derived"; -export class C {} - - - - -//// [out.d.ts] -declare module "my-pkg" { - export {}; -} -declare module "my-pkg/nested/derived" { - export function g(): import("my-pkg/nested").C; -} -declare module "my-pkg/nested" { - export * from "my-pkg/nested/base"; - export * from "my-pkg/nested/derived"; - export class C { - } -} -declare module "my-pkg/nested/base" { - import { C } from "my-pkg/nested"; - export function f(): C; -} diff --git a/tests/baselines/reference/bundledNodeDTSWithScopedPackage.js b/tests/baselines/reference/bundledNodeDTSWithScopedPackage.js deleted file mode 100644 index 7feb7b4f8051c..0000000000000 --- a/tests/baselines/reference/bundledNodeDTSWithScopedPackage.js +++ /dev/null @@ -1,50 +0,0 @@ -//// [tests/cases/conformance/declarationEmit/bundledNodeDTSWithScopedPackage.ts] //// - -//// [index.ts] -export * from "./nested"; - -//// [base.ts] -import { B } from "./shared"; - -export function f() { - return new B(); -} - -//// [derived.ts] -import { f } from "./base"; - -export function g() { - return f(); -} - -//// [index.ts] -export * from "./base"; -export * from "./derived"; -export * from "./shared"; - -//// [shared.ts] -export class B {} - - - - -//// [out.d.ts] -declare module "@test/my-pkg/nested/shared" { - export class B { - } -} -declare module "@test/my-pkg/nested/base" { - import { B } from "@test/my-pkg/nested/shared"; - export function f(): B; -} -declare module "@test/my-pkg/nested/derived" { - export function g(): import("@test/my-pkg").B; -} -declare module "@test/my-pkg/nested" { - export * from "@test/my-pkg/nested/base"; - export * from "@test/my-pkg/nested/derived"; - export * from "@test/my-pkg/nested/shared"; -} -declare module "@test/my-pkg" { - export * from "@test/my-pkg/nested"; -} diff --git a/tests/baselines/reference/declarationEmitOutFileBundlePaths.js b/tests/baselines/reference/declarationEmitOutFileBundlePaths.js index e3612405d6e67..6d0af3cab62ea 100644 --- a/tests/baselines/reference/declarationEmitOutFileBundlePaths.js +++ b/tests/baselines/reference/declarationEmitOutFileBundlePaths.js @@ -10,19 +10,20 @@ import versions from './versions.static.js'; export { versions -}; +}; + //// [index.d.ts] -declare module "mylib/versions.static" { +declare module "versions.static" { var _default: { "@a/b": string; "@a/c": string; }; export default _default; } -declare module "mylib" { +declare module "index" { export { versions }; - import versions from "mylib/versions.static"; + import versions from "versions.static"; } diff --git a/tests/baselines/reference/declarationEmitOutFileBundlePaths.symbols b/tests/baselines/reference/declarationEmitOutFileBundlePaths.symbols index 6bc9c7ac6b07c..d5a1fb4d472db 100644 --- a/tests/baselines/reference/declarationEmitOutFileBundlePaths.symbols +++ b/tests/baselines/reference/declarationEmitOutFileBundlePaths.symbols @@ -16,3 +16,4 @@ export { >versions : Symbol(versions, Decl(index.js, 2, 8)) }; + diff --git a/tests/baselines/reference/declarationEmitOutFileBundlePaths.types b/tests/baselines/reference/declarationEmitOutFileBundlePaths.types index 91817afedc1e6..e68e17ed692b9 100644 --- a/tests/baselines/reference/declarationEmitOutFileBundlePaths.types +++ b/tests/baselines/reference/declarationEmitOutFileBundlePaths.types @@ -20,3 +20,4 @@ export { >versions : { "@a/b": string; "@a/c": string; } }; + diff --git a/tests/baselines/reference/declarationMapsOutFile.js b/tests/baselines/reference/declarationMapsOutFile.js index fae211af71588..47fb58fb98f93 100644 --- a/tests/baselines/reference/declarationMapsOutFile.js +++ b/tests/baselines/reference/declarationMapsOutFile.js @@ -20,7 +20,7 @@ export { c, Foo }; //// [bundle.js] -define("example/a", ["require", "exports"], function (require, exports) { +define("a", ["require", "exports"], function (require, exports) { "use strict"; exports.__esModule = true; exports.Foo = void 0; @@ -37,7 +37,7 @@ define("example/a", ["require", "exports"], function (require, exports) { }()); exports.Foo = Foo; }); -define("example/index", ["require", "exports", "example/a"], function (require, exports, a_1) { +define("index", ["require", "exports", "a"], function (require, exports, a_1) { "use strict"; exports.__esModule = true; exports.Foo = exports.c = exports.x = void 0; @@ -50,7 +50,7 @@ define("example/index", ["require", "exports", "example/a"], function (require, //// [bundle.d.ts] -declare module "example/a" { +declare module "a" { export class Foo { doThing(x: { a: number; @@ -60,8 +60,8 @@ declare module "example/a" { static make(): Foo; } } -declare module "example/index" { - import { Foo } from "example/a"; +declare module "index" { + import { Foo } from "a"; const c: Foo; export let x: { b: number; diff --git a/tests/baselines/reference/declarationMapsOutFile.js.map b/tests/baselines/reference/declarationMapsOutFile.js.map index 1bea630c38a7c..31ad85d665052 100644 --- a/tests/baselines/reference/declarationMapsOutFile.js.map +++ b/tests/baselines/reference/declarationMapsOutFile.js.map @@ -1,3 +1,3 @@ //// [bundle.d.ts.map] -{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/index.ts"],"names":[],"mappings":";IAAA,MAAM,OAAO,GAAG;QACZ,OAAO,CAAC,GAAG;YAAC,CAAC,EAAE,MAAM,CAAA;SAAC;;;QAGtB,MAAM,CAAC,IAAI;KAGd;;;ICPD,OAAO,EAAC,GAAG,EAAC,kBAAY;IAExB,MAAM,CAAC,KAAY,CAAC;IAGpB,MAAM,CAAC,IAAI,CAAC;;KAAqB,CAAC;IAClC,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC"} -//// https://sokra.github.io/source-map-visualization#base64,ZGVjbGFyZSBtb2R1bGUgImV4YW1wbGUvYSIgew0KICAgIGV4cG9ydCBjbGFzcyBGb28gew0KICAgICAgICBkb1RoaW5nKHg6IHsNCiAgICAgICAgICAgIGE6IG51bWJlcjsNCiAgICAgICAgfSk6IHsNCiAgICAgICAgICAgIGI6IG51bWJlcjsNCiAgICAgICAgfTsNCiAgICAgICAgc3RhdGljIG1ha2UoKTogRm9vOw0KICAgIH0NCn0NCmRlY2xhcmUgbW9kdWxlICJleGFtcGxlL2luZGV4IiB7DQogICAgaW1wb3J0IHsgRm9vIH0gZnJvbSAiZXhhbXBsZS9hIjsNCiAgICBjb25zdCBjOiBGb287DQogICAgZXhwb3J0IGxldCB4OiB7DQogICAgICAgIGI6IG51bWJlcjsNCiAgICB9Ow0KICAgIGV4cG9ydCB7IGMsIEZvbyB9Ow0KfQ0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9YnVuZGxlLmQudHMubWFw,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVuZGxlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ0ZXN0cy9jYXNlcy9jb21waWxlci9hLnRzIiwidGVzdHMvY2FzZXMvY29tcGlsZXIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtJQUFBLE1BQU0sT0FBTyxHQUFHO1FBQ1osT0FBTyxDQUFDLEdBQUc7WUFBQyxDQUFDLEVBQUUsTUFBTSxDQUFBO1NBQUM7OztRQUd0QixNQUFNLENBQUMsSUFBSTtLQUdkOzs7SUNQRCxPQUFPLEVBQUMsR0FBRyxFQUFDLGtCQUFZO0lBRXhCLE1BQU0sQ0FBQyxLQUFZLENBQUM7SUFHcEIsTUFBTSxDQUFDLElBQUksQ0FBQzs7S0FBcUIsQ0FBQztJQUNsQyxPQUFPLEVBQUUsQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDIn0=,ZXhwb3J0IGNsYXNzIEZvbyB7CiAgICBkb1RoaW5nKHg6IHthOiBudW1iZXJ9KSB7CiAgICAgICAgcmV0dXJuIHtiOiB4LmF9OwogICAgfQogICAgc3RhdGljIG1ha2UoKSB7CiAgICAgICAgcmV0dXJuIG5ldyBGb28oKTsKICAgIH0KfQ==,aW1wb3J0IHtGb299IGZyb20gIi4vYSI7Cgpjb25zdCBjID0gbmV3IEZvbygpOwpjLmRvVGhpbmcoe2E6IDQyfSk7CgpleHBvcnQgbGV0IHggPSBjLmRvVGhpbmcoe2E6IDEyfSk7CmV4cG9ydCB7IGMsIEZvbyB9Owo= +{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/index.ts"],"names":[],"mappings":";IAAA,MAAM,OAAO,GAAG;QACZ,OAAO,CAAC,GAAG;YAAC,CAAC,EAAE,MAAM,CAAA;SAAC;;;QAGtB,MAAM,CAAC,IAAI;KAGd;;;ICPD,OAAO,EAAC,GAAG,EAAC,UAAY;IAExB,MAAM,CAAC,KAAY,CAAC;IAGpB,MAAM,CAAC,IAAI,CAAC;;KAAqB,CAAC;IAClC,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC"} +//// https://sokra.github.io/source-map-visualization#base64,ZGVjbGFyZSBtb2R1bGUgImEiIHsNCiAgICBleHBvcnQgY2xhc3MgRm9vIHsNCiAgICAgICAgZG9UaGluZyh4OiB7DQogICAgICAgICAgICBhOiBudW1iZXI7DQogICAgICAgIH0pOiB7DQogICAgICAgICAgICBiOiBudW1iZXI7DQogICAgICAgIH07DQogICAgICAgIHN0YXRpYyBtYWtlKCk6IEZvbzsNCiAgICB9DQp9DQpkZWNsYXJlIG1vZHVsZSAiaW5kZXgiIHsNCiAgICBpbXBvcnQgeyBGb28gfSBmcm9tICJhIjsNCiAgICBjb25zdCBjOiBGb287DQogICAgZXhwb3J0IGxldCB4OiB7DQogICAgICAgIGI6IG51bWJlcjsNCiAgICB9Ow0KICAgIGV4cG9ydCB7IGMsIEZvbyB9Ow0KfQ0KLy8jIHNvdXJjZU1hcHBpbmdVUkw9YnVuZGxlLmQudHMubWFw,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVuZGxlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJ0ZXN0cy9jYXNlcy9jb21waWxlci9hLnRzIiwidGVzdHMvY2FzZXMvY29tcGlsZXIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtJQUFBLE1BQU0sT0FBTyxHQUFHO1FBQ1osT0FBTyxDQUFDLEdBQUc7WUFBQyxDQUFDLEVBQUUsTUFBTSxDQUFBO1NBQUM7OztRQUd0QixNQUFNLENBQUMsSUFBSTtLQUdkOzs7SUNQRCxPQUFPLEVBQUMsR0FBRyxFQUFDLFVBQVk7SUFFeEIsTUFBTSxDQUFDLEtBQVksQ0FBQztJQUdwQixNQUFNLENBQUMsSUFBSSxDQUFDOztLQUFxQixDQUFDO0lBQ2xDLE9BQU8sRUFBRSxDQUFDLEVBQUUsR0FBRyxFQUFFLENBQUMifQ==,ZXhwb3J0IGNsYXNzIEZvbyB7CiAgICBkb1RoaW5nKHg6IHthOiBudW1iZXJ9KSB7CiAgICAgICAgcmV0dXJuIHtiOiB4LmF9OwogICAgfQogICAgc3RhdGljIG1ha2UoKSB7CiAgICAgICAgcmV0dXJuIG5ldyBGb28oKTsKICAgIH0KfQ==,aW1wb3J0IHtGb299IGZyb20gIi4vYSI7Cgpjb25zdCBjID0gbmV3IEZvbygpOwpjLmRvVGhpbmcoe2E6IDQyfSk7CgpleHBvcnQgbGV0IHggPSBjLmRvVGhpbmcoe2E6IDEyfSk7CmV4cG9ydCB7IGMsIEZvbyB9Owo= diff --git a/tests/baselines/reference/declarationMapsOutFile.sourcemap.txt b/tests/baselines/reference/declarationMapsOutFile.sourcemap.txt index 277b08dda551c..26c730e30c4d3 100644 --- a/tests/baselines/reference/declarationMapsOutFile.sourcemap.txt +++ b/tests/baselines/reference/declarationMapsOutFile.sourcemap.txt @@ -8,7 +8,7 @@ sources: tests/cases/compiler/a.ts,tests/cases/compiler/index.ts emittedFile:bundle.d.ts sourceFile:tests/cases/compiler/a.ts ------------------------------------------------------------------- ->>>declare module "example/a" { +>>>declare module "a" { >>> export class Foo { 1 >^^^^ 2 > ^^^^^^ @@ -95,14 +95,14 @@ emittedFile:bundle.d.ts sourceFile:tests/cases/compiler/index.ts ------------------------------------------------------------------- >>>} ->>>declare module "example/index" { ->>> import { Foo } from "example/a"; +>>>declare module "index" { +>>> import { Foo } from "a"; 1 >^^^^ 2 > ^^^^^^^ 3 > ^^ 4 > ^^^ 5 > ^^ -6 > ^^^^^^^^^^^^^^^^^^ +6 > ^^^^^^^^^^ 1 > 2 > import 3 > { @@ -114,7 +114,7 @@ sourceFile:tests/cases/compiler/index.ts 3 >Emitted(12, 14) Source(1, 9) + SourceIndex(1) 4 >Emitted(12, 17) Source(1, 12) + SourceIndex(1) 5 >Emitted(12, 19) Source(1, 13) + SourceIndex(1) -6 >Emitted(12, 37) Source(1, 25) + SourceIndex(1) +6 >Emitted(12, 29) Source(1, 25) + SourceIndex(1) --- >>> const c: Foo; 1 >^^^^ diff --git a/tests/baselines/reference/outModuleConcatCommonjsDeclarationOnly.js b/tests/baselines/reference/outModuleConcatCommonjsDeclarationOnly.js index e9aafab7d37cc..dccf40461dcac 100644 --- a/tests/baselines/reference/outModuleConcatCommonjsDeclarationOnly.js +++ b/tests/baselines/reference/outModuleConcatCommonjsDeclarationOnly.js @@ -11,12 +11,12 @@ export class B extends A { } //// [all.d.ts] -declare module "out/ref/a" { +declare module "ref/a" { export class A { } } -declare module "out/b" { - import { A } from "out/ref/a"; +declare module "b" { + import { A } from "ref/a"; export class B extends A { } } diff --git a/tests/baselines/reference/showConfig/Shows tsconfig for single option/bundledPackageName/tsconfig.json b/tests/baselines/reference/showConfig/Shows tsconfig for single option/bundledPackageName/tsconfig.json index 50946eae74b91..1743ea8bb43b2 100644 --- a/tests/baselines/reference/showConfig/Shows tsconfig for single option/bundledPackageName/tsconfig.json +++ b/tests/baselines/reference/showConfig/Shows tsconfig for single option/bundledPackageName/tsconfig.json @@ -1,5 +1,5 @@ { "compilerOptions": { - "bundledPackageName": "someString" + } } diff --git a/tests/baselines/reference/tsbuild/javascriptProjectEmit/initial-build/loads-outfile-js-projects-and-concatenates-them-correctly.js b/tests/baselines/reference/tsbuild/javascriptProjectEmit/initial-build/loads-outfile-js-projects-and-concatenates-them-correctly.js index e95a85b307165..9f6976d5cc3c4 100644 --- a/tests/baselines/reference/tsbuild/javascriptProjectEmit/initial-build/loads-outfile-js-projects-and-concatenates-them-correctly.js +++ b/tests/baselines/reference/tsbuild/javascriptProjectEmit/initial-build/loads-outfile-js-projects-and-concatenates-them-correctly.js @@ -36,7 +36,7 @@ interface Symbol { "compilerOptions": { "composite": true, "outFile": "common.js", - "bundledPackageName": "common" + }, "include": ["nominal.js"] } @@ -54,7 +54,7 @@ const c = /** @type {*} */(null); "compilerOptions": { "composite": true, "outFile": "sub-project.js", - "bundledPackageName": "sub" + }, "references": [ { "path": "../common", "prepend": true } @@ -81,7 +81,7 @@ function getVar() { "compilerOptions": { "composite": true, "outFile": "sub-project-2.js", - "bundledPackageName": "sub-2" + }, "references": [ { "path": "../sub-project", "prepend": true } diff --git a/tests/baselines/reference/tsbuild/javascriptProjectEmit/initial-build/modifies-outfile-js-projects-and-concatenates-them-correctly.js b/tests/baselines/reference/tsbuild/javascriptProjectEmit/initial-build/modifies-outfile-js-projects-and-concatenates-them-correctly.js index d386ee34b0792..6f061ef1b8e29 100644 --- a/tests/baselines/reference/tsbuild/javascriptProjectEmit/initial-build/modifies-outfile-js-projects-and-concatenates-them-correctly.js +++ b/tests/baselines/reference/tsbuild/javascriptProjectEmit/initial-build/modifies-outfile-js-projects-and-concatenates-them-correctly.js @@ -36,7 +36,7 @@ interface Symbol { "compilerOptions": { "composite": true, "outFile": "common.js", - "bundledPackageName": "common" + }, "include": ["nominal.js"] } @@ -54,7 +54,7 @@ const c = /** @type {*} */(null); "compilerOptions": { "composite": true, "outFile": "sub-project.js", - "bundledPackageName": "sub" + }, "references": [ { "path": "../common", "prepend": true } @@ -81,7 +81,7 @@ function getVar() { "compilerOptions": { "composite": true, "outFile": "sub-project-2.js", - "bundledPackageName": "sub-2" + }, "references": [ { "path": "../sub-project", "prepend": true } diff --git a/tests/baselines/reference/tsbuild/outFile/initial-build/clean-projects.js b/tests/baselines/reference/tsbuild/outFile/initial-build/clean-projects.js index 4169905f9a7c8..8b3a08c3f9db1 100644 --- a/tests/baselines/reference/tsbuild/outFile/initial-build/clean-projects.js +++ b/tests/baselines/reference/tsbuild/outFile/initial-build/clean-projects.js @@ -52,7 +52,6 @@ Input:: "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -80,7 +79,6 @@ Input:: "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -119,7 +117,6 @@ Input:: "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outFile/initial-build/non-module-projects-without-prepend.js b/tests/baselines/reference/tsbuild/outFile/initial-build/non-module-projects-without-prepend.js index a19a9148467c3..db838335a72b9 100644 --- a/tests/baselines/reference/tsbuild/outFile/initial-build/non-module-projects-without-prepend.js +++ b/tests/baselines/reference/tsbuild/outFile/initial-build/non-module-projects-without-prepend.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -92,7 +91,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "skipDefaultLibCheck": true }, @@ -118,7 +116,6 @@ c.doSomething(); "declaration": true, "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" @@ -238,7 +235,6 @@ function f() { "sourceMap": true, "declarationMap": true, "skipDefaultLibCheck": true, - "bundledPackageName": "first", "configFilePath": "./tsconfig.json" }, "semanticDiagnosticsPerFile": [ @@ -326,7 +322,6 @@ var C = (function () { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "skipDefaultLibCheck": true, "configFilePath": "./tsconfig.json" }, @@ -404,7 +399,6 @@ c.doSomething(); "declarationMap": true, "declaration": true, "skipDefaultLibCheck": true, - "bundledPackageName": "third", "configFilePath": "./tsconfig.json" }, "semanticDiagnosticsPerFile": [ diff --git a/tests/baselines/reference/tsbuild/outFile/initial-build/tsbuildinfo-is-not-generated-when-incremental-is-set-to-false.js b/tests/baselines/reference/tsbuild/outFile/initial-build/tsbuildinfo-is-not-generated-when-incremental-is-set-to-false.js index fa2dbb5a8d179..19083118e2408 100644 --- a/tests/baselines/reference/tsbuild/outFile/initial-build/tsbuildinfo-is-not-generated-when-incremental-is-set-to-false.js +++ b/tests/baselines/reference/tsbuild/outFile/initial-build/tsbuildinfo-is-not-generated-when-incremental-is-set-to-false.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -92,7 +91,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -118,7 +116,6 @@ c.doSomething(); "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outFile/initial-build/verify-buildInfo-absence-results-in-new-build.js b/tests/baselines/reference/tsbuild/outFile/initial-build/verify-buildInfo-absence-results-in-new-build.js index c5570a7e8ef09..75af12e17eef1 100644 --- a/tests/baselines/reference/tsbuild/outFile/initial-build/verify-buildInfo-absence-results-in-new-build.js +++ b/tests/baselines/reference/tsbuild/outFile/initial-build/verify-buildInfo-absence-results-in-new-build.js @@ -132,7 +132,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -160,7 +159,6 @@ function f() { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -316,7 +314,6 @@ c.doSomething(); "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/baseline-sectioned-sourcemaps.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/baseline-sectioned-sourcemaps.js index cb033e5b0df9c..7be93aa69490a 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/baseline-sectioned-sourcemaps.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/baseline-sectioned-sourcemaps.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -92,7 +91,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -118,7 +116,6 @@ c.doSomething(); "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/declarationMap-and-sourceMap-disabled.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/declarationMap-and-sourceMap-disabled.js index 8bb1f2c6882aa..7e029a26f2b0d 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/declarationMap-and-sourceMap-disabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/declarationMap-and-sourceMap-disabled.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -92,7 +91,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -116,7 +114,6 @@ class C { "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/emitHelpers-in-all-projects.js index 30f000d9a98ea..0d65171b57402 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/emitHelpers-in-all-projects.js @@ -50,7 +50,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -96,7 +95,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -124,7 +122,6 @@ const { b, ...rest } = { a: 10, b: 30, yy: 30 }; "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/emitHelpers-in-only-one-dependency-project.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/emitHelpers-in-only-one-dependency-project.js index 9c947a4793488..45eb9db79dd2b 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/emitHelpers-in-only-one-dependency-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/emitHelpers-in-only-one-dependency-project.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -94,7 +93,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -120,7 +118,6 @@ c.doSomething(); "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-emitHelpers-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-emitHelpers-in-all-projects.js index 3021e55807eb9..f65bc8c5c6bb1 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-emitHelpers-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-emitHelpers-in-all-projects.js @@ -53,7 +53,6 @@ firstfirst_part3Spread(...[10, 20, 30]); "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -102,7 +101,6 @@ secondsecond_part2Spread(...[10, 20, 30]); "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -133,7 +131,6 @@ thirdthird_part1Spread(...[10, 20, 30]); "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-emitHelpers-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-emitHelpers-in-different-projects.js index 699c467ceb203..ee2dc10f0bf92 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-emitHelpers-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-emitHelpers-in-different-projects.js @@ -50,7 +50,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -97,7 +96,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -125,7 +123,6 @@ const { b, ...rest } = { a: 10, b: 30, yy: 30 }; "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-prologues-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-prologues-in-all-projects.js index c107118b3f36b..6983f20b3d25a 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-prologues-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-prologues-in-all-projects.js @@ -49,7 +49,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -95,7 +94,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -123,7 +121,6 @@ c.doSomething(); "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-prologues-in-different-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-prologues-in-different-projects.js index 028288aaac6f3..1cf4f9f24bb63 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-prologues-in-different-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/multiple-prologues-in-different-projects.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -94,7 +93,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -120,7 +118,6 @@ c.doSomething(); "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/shebang-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/shebang-in-all-projects.js index fbeb489cee30f..497603a8078d1 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/shebang-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/shebang-in-all-projects.js @@ -50,7 +50,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -95,7 +94,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -122,7 +120,6 @@ c.doSomething(); "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/shebang-in-only-one-dependency-project.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/shebang-in-only-one-dependency-project.js index 5deb019aee2d3..ff43fd4be8d3e 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/shebang-in-only-one-dependency-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/shebang-in-only-one-dependency-project.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -93,7 +92,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -119,7 +117,6 @@ c.doSomething(); "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/strict-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/strict-in-all-projects.js index 1be8254490c26..9b5c49b89ca8d 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/strict-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/strict-in-all-projects.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -92,7 +91,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -118,7 +116,6 @@ c.doSomething(); "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/strict-in-one-dependency.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/strict-in-one-dependency.js index a800f1d9cbe98..ea0ac0db8251e 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/strict-in-one-dependency.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/strict-in-one-dependency.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -92,7 +91,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -118,7 +116,6 @@ c.doSomething(); "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-baseline-when-internal-is-inside-another-internal.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-baseline-when-internal-is-inside-another-internal.js index 83dc640065574..83c44bc9697be 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-baseline-when-internal-is-inside-another-internal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-baseline-when-internal-is-inside-another-internal.js @@ -75,7 +75,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -119,7 +118,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -146,7 +144,6 @@ c.doSomething(); "stripInternal": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js index b33056d5772cb..dab920b88efaa 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-jsdoc-style-comment-when-one-two-three-are-prepended-in-order.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -117,7 +116,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -145,7 +143,6 @@ c.doSomething(); "stripInternal": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-jsdoc-style-comment.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-jsdoc-style-comment.js index dfc58c8d63287..ff4fa4222242f 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-jsdoc-style-comment.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-jsdoc-style-comment.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -117,7 +116,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -144,7 +142,6 @@ c.doSomething(); "stripInternal": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index 23dc29eeac7b7..44fe27d4f4b71 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-jsdoc-style-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -117,7 +116,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -145,7 +143,6 @@ c.doSomething(); "stripInternal": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-jsdoc-style-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-jsdoc-style-with-comments-emit-enabled.js index 5acedb0dbeb78..32e88b5279689 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-jsdoc-style-with-comments-emit-enabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-jsdoc-style-with-comments-emit-enabled.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -117,7 +116,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -144,7 +142,6 @@ c.doSomething(); "stripInternal": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-when-few-members-of-enum-are-internal.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-when-few-members-of-enum-are-internal.js index ffe6921b33444..0e7e742db6fba 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-when-few-members-of-enum-are-internal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-when-few-members-of-enum-are-internal.js @@ -70,7 +70,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -114,7 +113,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -141,7 +139,6 @@ c.doSomething(); "stripInternal": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-when-one-two-three-are-prepended-in-order.js index 812a307add2b9..f9d8f0f5aa962 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-when-one-two-three-are-prepended-in-order.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -117,7 +116,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -145,7 +143,6 @@ c.doSomething(); "stripInternal": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-when-prepend-is-completely-internal.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-when-prepend-is-completely-internal.js index a2f6f80cbb770..04c58f90e11e2 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-when-prepend-is-completely-internal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-when-prepend-is-completely-internal.js @@ -24,7 +24,7 @@ declare const console: { log(msg: any): void; }; //// [/src/first/tsconfig.json] -{"compilerOptions":{"composite":true,"declaration":true,"declarationMap":true,"skipDefaultLibCheck":true,"sourceMap":true,"outFile":"./bin/first-output.js","bundledPackageName":"first"},"files":["/src/first/first_PART1.ts"]} +{"compilerOptions":{"composite":true,"declaration":true,"declarationMap":true,"skipDefaultLibCheck":true,"sourceMap":true,"outFile":"./bin/first-output.js"},"files":["/src/first/first_PART1.ts"]} //// [/src/second/second_part1.ts] @@ -39,7 +39,7 @@ declare const console: { log(msg: any): void; }; const B = 2; //// [/src/third/tsconfig.json] -{"compilerOptions":{"composite":true,"declaration":true,"declarationMap":false,"stripInternal":true,"sourceMap":true,"outFile":"./thirdjs/output/third-output.js","bundledPackageName":"third"},"references":[{"path":"../first","prepend":true}],"files":["/src/third/third_part1.ts"]} +{"compilerOptions":{"composite":true,"declaration":true,"declarationMap":false,"stripInternal":true,"sourceMap":true,"outFile":"./thirdjs/output/third-output.js"},"references":[{"path":"../first","prepend":true}],"files":["/src/third/third_part1.ts"]} diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js index c36b89c2c6e64..6eb49d5227c11 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-with-comments-emit-enabled-when-one-two-three-are-prepended-in-order.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -117,7 +116,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -145,7 +143,6 @@ c.doSomething(); "stripInternal": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-with-comments-emit-enabled.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-with-comments-emit-enabled.js index 1675d3b90c58c..d761c2a618192 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-with-comments-emit-enabled.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal-with-comments-emit-enabled.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -117,7 +116,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -144,7 +142,6 @@ c.doSomething(); "stripInternal": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal.js index 908424fc5fee1..f8e7002e37eb5 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/stripInternal.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -117,7 +116,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -144,7 +142,6 @@ c.doSomething(); "stripInternal": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/triple-slash-refs-in-all-projects.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/triple-slash-refs-in-all-projects.js index 5e64ec560bd26..d381389a0a879 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/triple-slash-refs-in-all-projects.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/triple-slash-refs-in-all-projects.js @@ -53,7 +53,6 @@ declare class firstfirst_part2 { } "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -102,7 +101,6 @@ declare class secondsecond_part1 { } "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -133,7 +131,6 @@ declare class thirdthird_part1 { } "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/triple-slash-refs-in-one-project.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/triple-slash-refs-in-one-project.js index a73f4c1077776..1df368b1d2312 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/triple-slash-refs-in-one-project.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/triple-slash-refs-in-one-project.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -97,7 +96,6 @@ declare class secondsecond_part1 { } "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -123,7 +121,6 @@ c.doSomething(); "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/when-final-project-is-not-composite-but-incremental.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/when-final-project-is-not-composite-but-incremental.js index b8b8f46a6fb7e..690d9b8e27e59 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/when-final-project-is-not-composite-but-incremental.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/when-final-project-is-not-composite-but-incremental.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -92,7 +91,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -118,7 +116,6 @@ c.doSomething(); "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/when-final-project-is-not-composite-but-uses-project-references.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/when-final-project-is-not-composite-but-uses-project-references.js index 5be8ceda59b4a..08951b5e3f91c 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/when-final-project-is-not-composite-but-uses-project-references.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/when-final-project-is-not-composite-but-uses-project-references.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -92,7 +91,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -118,7 +116,6 @@ c.doSomething(); "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/when-final-project-specifies-tsBuildInfoFile.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/when-final-project-specifies-tsBuildInfoFile.js index ba6a309bb3884..40db9ae63d0e0 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/when-final-project-specifies-tsBuildInfoFile.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/when-final-project-specifies-tsBuildInfoFile.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -92,7 +91,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -119,7 +117,6 @@ c.doSomething(); "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/when-source-files-are-empty-in-the-own-file.js b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/when-source-files-are-empty-in-the-own-file.js index 52315c549d7ad..77226feadeea2 100644 --- a/tests/baselines/reference/tsbuild/outfile-concat/initial-build/when-source-files-are-empty-in-the-own-file.js +++ b/tests/baselines/reference/tsbuild/outfile-concat/initial-build/when-source-files-are-empty-in-the-own-file.js @@ -48,7 +48,6 @@ function f() { "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", @@ -92,7 +91,6 @@ class C { "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, @@ -116,7 +114,6 @@ class C { "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts" diff --git a/tests/baselines/reference/tsbuild/watchMode/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js b/tests/baselines/reference/tsbuild/watchMode/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js index 5785af2d1f7db..98abb53cd0aa2 100644 --- a/tests/baselines/reference/tsbuild/watchMode/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js +++ b/tests/baselines/reference/tsbuild/watchMode/programUpdates/when-referenced-using-prepend-builds-referencing-project-even-for-non-local-change.js @@ -13,13 +13,13 @@ interface String { charAt: any; } interface Array { length: number; [n: number]: T; } //// [/user/username/projects/sample1/core/tsconfig.json] -{"compilerOptions":{"composite":true,"declaration":true,"outFile":"index.js","bundledPackageName":"core"}} +{"compilerOptions":{"composite":true,"declaration":true,"outFile":"index.js"}} //// [/user/username/projects/sample1/core/index.ts] function foo() { return 10; } //// [/user/username/projects/sample1/logic/tsconfig.json] -{"compilerOptions":{"composite":true,"declaration":true,"outFile":"index.js","bundledPackageName":"logic"},"references":[{"path":"../core","prepend":true}]} +{"compilerOptions":{"composite":true,"declaration":true,"outFile":"index.js"},"references":[{"path":"../core","prepend":true}]} //// [/user/username/projects/sample1/logic/index.ts] function bar() { return foo() + 1 }; @@ -35,7 +35,7 @@ Output:: Program root files: ["/user/username/projects/sample1/core/index.ts"] -Program options: {"composite":true,"declaration":true,"outFile":"/user/username/projects/sample1/core/index.js","bundledPackageName":"core","watch":true,"configFilePath":"/user/username/projects/sample1/core/tsconfig.json"} +Program options: {"composite":true,"declaration":true,"outFile":"/user/username/projects/sample1/core/index.js","watch":true,"configFilePath":"/user/username/projects/sample1/core/tsconfig.json"} Program structureReused: Not Program files:: /a/lib/lib.d.ts @@ -44,7 +44,7 @@ Program files:: No cached semantic diagnostics in the builder:: Program root files: ["/user/username/projects/sample1/logic/index.ts"] -Program options: {"composite":true,"declaration":true,"outFile":"/user/username/projects/sample1/logic/index.js","bundledPackageName":"logic","watch":true,"configFilePath":"/user/username/projects/sample1/logic/tsconfig.json"} +Program options: {"composite":true,"declaration":true,"outFile":"/user/username/projects/sample1/logic/index.js","watch":true,"configFilePath":"/user/username/projects/sample1/logic/tsconfig.json"} Program structureReused: Not Program files:: /a/lib/lib.d.ts @@ -237,7 +237,7 @@ Output:: Program root files: ["/user/username/projects/sample1/core/index.ts"] -Program options: {"composite":true,"declaration":true,"outFile":"/user/username/projects/sample1/core/index.js","bundledPackageName":"core","watch":true,"configFilePath":"/user/username/projects/sample1/core/tsconfig.json"} +Program options: {"composite":true,"declaration":true,"outFile":"/user/username/projects/sample1/core/index.js","watch":true,"configFilePath":"/user/username/projects/sample1/core/tsconfig.json"} Program structureReused: Not Program files:: /a/lib/lib.d.ts @@ -333,7 +333,7 @@ Output:: Program root files: ["/user/username/projects/sample1/logic/index.ts"] -Program options: {"composite":true,"declaration":true,"outFile":"/user/username/projects/sample1/logic/index.js","bundledPackageName":"logic","watch":true,"configFilePath":"/user/username/projects/sample1/logic/tsconfig.json"} +Program options: {"composite":true,"declaration":true,"outFile":"/user/username/projects/sample1/logic/index.js","watch":true,"configFilePath":"/user/username/projects/sample1/logic/tsconfig.json"} Program structureReused: Not Program files:: /a/lib/lib.d.ts @@ -477,7 +477,7 @@ Output:: Program root files: ["/user/username/projects/sample1/core/index.ts"] -Program options: {"composite":true,"declaration":true,"outFile":"/user/username/projects/sample1/core/index.js","bundledPackageName":"core","watch":true,"configFilePath":"/user/username/projects/sample1/core/tsconfig.json"} +Program options: {"composite":true,"declaration":true,"outFile":"/user/username/projects/sample1/core/index.js","watch":true,"configFilePath":"/user/username/projects/sample1/core/tsconfig.json"} Program structureReused: Not Program files:: /a/lib/lib.d.ts diff --git a/tests/baselines/reference/typeReferenceDirectives12.errors.txt b/tests/baselines/reference/typeReferenceDirectives12.errors.txt index 6fefacdf96f21..20431e19d9a88 100644 --- a/tests/baselines/reference/typeReferenceDirectives12.errors.txt +++ b/tests/baselines/reference/typeReferenceDirectives12.errors.txt @@ -1,8 +1,6 @@ -error TS1391: The `bundledPackageName` option must be provided when using outFile and node module resolution with declaration emit. /main.ts(1,14): error TS6131: Cannot compile modules using option 'out' unless the '--module' flag is 'amd' or 'system'. -!!! error TS1391: The `bundledPackageName` option must be provided when using outFile and node module resolution with declaration emit. ==== /mod2.ts (0 errors) ==== import { Cls } from "./main"; import "./mod1"; diff --git a/tests/cases/compiler/bundledDtsLateExportRenaming.ts b/tests/cases/compiler/bundledDtsLateExportRenaming.ts deleted file mode 100644 index cc9f16f1f805e..0000000000000 --- a/tests/cases/compiler/bundledDtsLateExportRenaming.ts +++ /dev/null @@ -1,31 +0,0 @@ -// @module: commonjs -// @declaration: true -// @moduleResolution: node -// @emitDeclarationOnly: true -// @outFile: ./dist/out.d.ts - -// @Filename: index.ts -export * from "./nested"; - -// @Filename: nested/base.ts -import { B } from "./shared"; - -export function f() { - return new B(); -} - -// @Filename: nested/derived.ts -import { f } from "./base"; - -export function g() { - return f(); -} - -// @Filename: nested/index.ts -export * from "./base"; - -export * from "./derived"; -export * from "./shared"; - -// @Filename: nested/shared.ts -export class B {} diff --git a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts index 0243f2168c65a..005b52d5bc9f6 100644 --- a/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts +++ b/tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts @@ -1,6 +1,5 @@ // @declaration: true // @out: out.js -// @bundledPackageName: "lib" // @Filename: declFile.d.ts declare module M { diff --git a/tests/cases/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.ts b/tests/cases/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.ts index 3b2bbb5316703..79ebb3c938733 100644 --- a/tests/cases/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.ts +++ b/tests/cases/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.ts @@ -1,6 +1,5 @@ // @declaration: true // @outFile: mylib.js -// @bundledPackageName: mylib // @filename: extensions.ts /// class Foo { diff --git a/tests/cases/compiler/declarationEmitOutFileBundlePaths.ts b/tests/cases/compiler/declarationEmitOutFileBundlePaths.ts index 5bd187796d164..568d336e2ad74 100644 --- a/tests/cases/compiler/declarationEmitOutFileBundlePaths.ts +++ b/tests/cases/compiler/declarationEmitOutFileBundlePaths.ts @@ -6,7 +6,6 @@ // @strict: true // @esModuleInterop: true // @outFile: ./js/index.js -// @bundledPackageName: mylib // @filename: js/versions.static.js export default { "@a/b": "1.0.0", @@ -17,4 +16,4 @@ import versions from './versions.static.js'; export { versions -}; \ No newline at end of file +}; diff --git a/tests/cases/compiler/declarationFileOverwriteErrorWithOut.ts b/tests/cases/compiler/declarationFileOverwriteErrorWithOut.ts index 9fe02ae124685..a44f3014db35e 100644 --- a/tests/cases/compiler/declarationFileOverwriteErrorWithOut.ts +++ b/tests/cases/compiler/declarationFileOverwriteErrorWithOut.ts @@ -1,5 +1,5 @@ // @declaration: true -// @bundledPackageName: decl + // @out: tests/cases/compiler/out.js // @Filename: out.d.ts diff --git a/tests/cases/compiler/declarationFilesGeneratingTypeReferences.ts b/tests/cases/compiler/declarationFilesGeneratingTypeReferences.ts index d9a2a47aeff13..62107b3caed6b 100644 --- a/tests/cases/compiler/declarationFilesGeneratingTypeReferences.ts +++ b/tests/cases/compiler/declarationFilesGeneratingTypeReferences.ts @@ -1,6 +1,5 @@ // @declaration: true // @outFile: out.js -// @bundledPackageName: decl // @filename: /a/node_modules/@types/jquery/index.d.ts interface JQuery { diff --git a/tests/cases/compiler/declarationMapsOutFile.ts b/tests/cases/compiler/declarationMapsOutFile.ts index a7e60ee3bbe8d..b388d567ef335 100644 --- a/tests/cases/compiler/declarationMapsOutFile.ts +++ b/tests/cases/compiler/declarationMapsOutFile.ts @@ -1,6 +1,5 @@ // @declaration: true // @declarationMap: true -// @bundledPackageName: example // @module: amd // @outFile: bundle.js // @filename: a.ts diff --git a/tests/cases/compiler/declarationMapsOutFile2.ts b/tests/cases/compiler/declarationMapsOutFile2.ts index e29debe6d5b9e..713f6f5391044 100644 --- a/tests/cases/compiler/declarationMapsOutFile2.ts +++ b/tests/cases/compiler/declarationMapsOutFile2.ts @@ -1,6 +1,5 @@ // @declaration: true // @declarationMap: true -// @bundledPackageName: "lib" // @outFile: bundle.js // @filename: a.ts class Foo { diff --git a/tests/cases/compiler/declarationMapsWithSourceMap.ts b/tests/cases/compiler/declarationMapsWithSourceMap.ts index 7a1777dacc4fa..332ccb04fce36 100644 --- a/tests/cases/compiler/declarationMapsWithSourceMap.ts +++ b/tests/cases/compiler/declarationMapsWithSourceMap.ts @@ -1,7 +1,6 @@ // @declaration: true // @declarationMap: true // @outFile: bundle.js -// @bundledPackageName: bundle // @sourceMap: true // @filename: a.ts class Foo { diff --git a/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementation.ts b/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementation.ts index 4d1a607b86535..8517c9dbf8e6d 100644 --- a/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementation.ts +++ b/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementation.ts @@ -1,7 +1,6 @@ // @allowJs: true // @out: out.js // @declaration: true -// @bundledPackageName: out // @filename: b.js function foo() { return 10; diff --git a/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.ts b/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.ts index 0e28d85bc8865..a02b7d9d88a95 100644 --- a/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.ts +++ b/tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.ts @@ -1,7 +1,6 @@ // @allowJs: true // @out: out.js // @declaration: true -// @bundledPackageName: jsfile // @filename: a.ts function foo() { return 30; diff --git a/tests/cases/compiler/jsFileCompilationDuplicateVariable.ts b/tests/cases/compiler/jsFileCompilationDuplicateVariable.ts index b8e6ea125ab2b..4bcd69563f1af 100644 --- a/tests/cases/compiler/jsFileCompilationDuplicateVariable.ts +++ b/tests/cases/compiler/jsFileCompilationDuplicateVariable.ts @@ -1,7 +1,6 @@ // @allowJs: true // @out: out.js // @declaration: true -// @bundledPackageName: decl // @filename: a.ts var x = 10; diff --git a/tests/cases/compiler/jsFileCompilationDuplicateVariableErrorReported.ts b/tests/cases/compiler/jsFileCompilationDuplicateVariableErrorReported.ts index 35e6611bc2985..93a05c3ba1149 100644 --- a/tests/cases/compiler/jsFileCompilationDuplicateVariableErrorReported.ts +++ b/tests/cases/compiler/jsFileCompilationDuplicateVariableErrorReported.ts @@ -1,7 +1,6 @@ // @allowJs: true // @out: out.js // @declaration: true -// @bundledPackageName: out // @filename: b.js var x = "hello"; diff --git a/tests/cases/compiler/jsFileCompilationEmitDeclarations.ts b/tests/cases/compiler/jsFileCompilationEmitDeclarations.ts index 92e7e058f6214..9d6daeac6fa6c 100644 --- a/tests/cases/compiler/jsFileCompilationEmitDeclarations.ts +++ b/tests/cases/compiler/jsFileCompilationEmitDeclarations.ts @@ -1,7 +1,6 @@ // @allowJs: true // @out: out.js // @declaration: true -// @bundledPackageName: decl // @filename: a.ts class c { } diff --git a/tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts b/tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts index b08524fa1581e..5dd123a4670ad 100644 --- a/tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts +++ b/tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts @@ -1,7 +1,6 @@ // @allowJs: true // @out: out.js // @declaration: true -// @bundledPackageName: out // @filename: a.ts class c { } diff --git a/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts index 26d846844e994..5bb44333d36b4 100644 --- a/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts +++ b/tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts @@ -1,7 +1,6 @@ // @allowJs: true // @out: out.js // @declaration: true -// @bundledPackageName: out // @filename: a.ts class c { } diff --git a/tests/cases/compiler/jsFileCompilationLetDeclarationOrder.ts b/tests/cases/compiler/jsFileCompilationLetDeclarationOrder.ts index f61ada82699b4..962267c5cabb3 100644 --- a/tests/cases/compiler/jsFileCompilationLetDeclarationOrder.ts +++ b/tests/cases/compiler/jsFileCompilationLetDeclarationOrder.ts @@ -1,7 +1,6 @@ // @allowJs: true // @out: out.js // @declaration: true -// @bundledPackageName: out // @filename: b.js let a = 10; b = 30; diff --git a/tests/cases/compiler/jsFileCompilationLetDeclarationOrder2.ts b/tests/cases/compiler/jsFileCompilationLetDeclarationOrder2.ts index 2f72abb21fde4..8f89c57ade21e 100644 --- a/tests/cases/compiler/jsFileCompilationLetDeclarationOrder2.ts +++ b/tests/cases/compiler/jsFileCompilationLetDeclarationOrder2.ts @@ -1,7 +1,6 @@ // @allowJs: true // @out: out.js // @declaration: true -// @bundledPackageName: out // @filename: a.ts let b = 30; a = 10; diff --git a/tests/cases/compiler/jsFileCompilationWithEnabledCompositeOption.ts b/tests/cases/compiler/jsFileCompilationWithEnabledCompositeOption.ts index 4e5dfaa5da374..90340ef5d3af2 100644 --- a/tests/cases/compiler/jsFileCompilationWithEnabledCompositeOption.ts +++ b/tests/cases/compiler/jsFileCompilationWithEnabledCompositeOption.ts @@ -1,6 +1,5 @@ // @allowJs: true // @out: out.js -// @bundledPackageName: out // @composite: true // @filename: a.ts class c { diff --git a/tests/cases/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.ts b/tests/cases/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.ts index ce6041cf5ccd7..f1d772398d39d 100644 --- a/tests/cases/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.ts +++ b/tests/cases/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.ts @@ -1,6 +1,5 @@ // @declaration: true // @out: tests/cases/compiler/b.js -// @bundledPackageName: "lib" // @filename: a.ts class c { } diff --git a/tests/cases/compiler/out-flag2.ts b/tests/cases/compiler/out-flag2.ts index 8687a834194f8..c25ede07b7f34 100644 --- a/tests/cases/compiler/out-flag2.ts +++ b/tests/cases/compiler/out-flag2.ts @@ -3,7 +3,6 @@ // @declaration: true // @module: commonjs // @outFile: c.js -// @bundledPackageName: out // @Filename: a.ts class A { } diff --git a/tests/cases/compiler/out-flag3.ts b/tests/cases/compiler/out-flag3.ts index 71dcc68394388..82ef99c42de74 100644 --- a/tests/cases/compiler/out-flag3.ts +++ b/tests/cases/compiler/out-flag3.ts @@ -1,7 +1,6 @@ // @target: ES5 // @sourcemap: true // @declaration: true -// @bundledPackageName: out // @module: commonjs // @outFile: c.js // @out: d.js diff --git a/tests/cases/compiler/outModuleConcatCommonjs.ts b/tests/cases/compiler/outModuleConcatCommonjs.ts index 9e87cd8ea49c9..ed94db087d1d9 100644 --- a/tests/cases/compiler/outModuleConcatCommonjs.ts +++ b/tests/cases/compiler/outModuleConcatCommonjs.ts @@ -3,7 +3,6 @@ // @declaration: true // @module: commonjs // @outFile: all.js -// @bundledPackageName: "lib" // This should be an error diff --git a/tests/cases/compiler/outModuleConcatCommonjsDeclarationOnly.ts b/tests/cases/compiler/outModuleConcatCommonjsDeclarationOnly.ts index 8778764b88145..b21794c4980ca 100644 --- a/tests/cases/compiler/outModuleConcatCommonjsDeclarationOnly.ts +++ b/tests/cases/compiler/outModuleConcatCommonjsDeclarationOnly.ts @@ -3,7 +3,6 @@ // @declaration: true // @emitDeclarationOnly: true // @module: commonjs -// @bundledPackageName: out // @outFile: all.js // @Filename: ref/a.ts diff --git a/tests/cases/compiler/outModuleConcatUnspecifiedModuleKindDeclarationOnly.ts b/tests/cases/compiler/outModuleConcatUnspecifiedModuleKindDeclarationOnly.ts index 5af8173fa7cc9..f928d05c9169a 100644 --- a/tests/cases/compiler/outModuleConcatUnspecifiedModuleKindDeclarationOnly.ts +++ b/tests/cases/compiler/outModuleConcatUnspecifiedModuleKindDeclarationOnly.ts @@ -1,7 +1,6 @@ // @target: ES5 // @outFile: out.js // @declaration: true, -// @bundledPackageName: lib // @emitDeclarationOnly: true // @Filename: a.ts diff --git a/tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts b/tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts index 9d87916490fa0..54a767d3df243 100644 --- a/tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts +++ b/tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts @@ -1,7 +1,6 @@ // @out: a.js // @sourcemap: true // @declaration: true -// @bundledPackageName: out // @Filename: a.ts /*-------------------------------------------------------------------------- Copyright diff --git a/tests/cases/compiler/typeReferenceDirectives11.ts b/tests/cases/compiler/typeReferenceDirectives11.ts index c4e9cd8d84d82..696fdd56987d0 100644 --- a/tests/cases/compiler/typeReferenceDirectives11.ts +++ b/tests/cases/compiler/typeReferenceDirectives11.ts @@ -1,6 +1,5 @@ // @noImplicitReferences: true // @declaration: true -// @bundledPackageName: out // @typeRoots: /types // @traceResolution: true // @types: lib diff --git a/tests/cases/conformance/declarationEmit/bundledNodeDTSFailsWithOutFlag.ts b/tests/cases/conformance/declarationEmit/bundledNodeDTSFailsWithOutFlag.ts deleted file mode 100644 index 19445ea4103b7..0000000000000 --- a/tests/cases/conformance/declarationEmit/bundledNodeDTSFailsWithOutFlag.ts +++ /dev/null @@ -1,29 +0,0 @@ -// @module: commonjs -// @declaration: true -// @emitDeclarationOnly: true -// @outFile: ./dist/out.d.ts - -// @Filename: index.ts -export * from "./nested"; - -// @Filename: nested/base.ts -import { B } from "./shared"; - -export function f() { - return new B(); -} - -// @Filename: nested/derived.ts -import { f } from "./base"; - -export function g() { - return f(); -} - -// @Filename: nested/index.ts -export * from "./base"; -export * from "./derived"; -export * from "./shared"; - -// @Filename: nested/shared.ts -export class B {} diff --git a/tests/cases/conformance/declarationEmit/bundledNodeDTSPassesWithFlag.ts b/tests/cases/conformance/declarationEmit/bundledNodeDTSPassesWithFlag.ts deleted file mode 100644 index 7b40b45745de4..0000000000000 --- a/tests/cases/conformance/declarationEmit/bundledNodeDTSPassesWithFlag.ts +++ /dev/null @@ -1,30 +0,0 @@ -// @module: commonjs -// @declaration: true -// @emitDeclarationOnly: true -// @outFile: ./dist/out.d.ts -// @bundledPackageName: my-pkg - -// @Filename: index.ts -export * from "./nested"; - -// @Filename: nested/base.ts -import { B } from "./shared"; - -export function f() { - return new B(); -} - -// @Filename: nested/derived.ts -import { f } from "./base"; - -export function g() { - return f(); -} - -// @Filename: nested/index.ts -export * from "./base"; -export * from "./derived"; -export * from "./shared"; - -// @Filename: nested/shared.ts -export class B {} diff --git a/tests/cases/conformance/declarationEmit/bundledNodeDTSWithExports.ts b/tests/cases/conformance/declarationEmit/bundledNodeDTSWithExports.ts deleted file mode 100644 index 04bc127464182..0000000000000 --- a/tests/cases/conformance/declarationEmit/bundledNodeDTSWithExports.ts +++ /dev/null @@ -1,27 +0,0 @@ -// @module: commonjs -// @declaration: true -// @emitDeclarationOnly: true -// @outFile: ./dist/out.d.ts -// @bundledPackageName: my-pkg - -// @Filename: index.ts -export {} - -// @Filename: nested/base.ts -import { C } from "./"; - -export function f() { - return new C(); -} - -// @Filename: nested/derived.ts -import { f } from "./base"; - -export function g() { - return f(); -} - -// @Filename: nested/index.ts -export * from "./base"; -export * from "./derived"; -export class C {} diff --git a/tests/cases/conformance/declarationEmit/bundledNodeDTSWithScopedPackage.ts b/tests/cases/conformance/declarationEmit/bundledNodeDTSWithScopedPackage.ts deleted file mode 100644 index 1c29efba0bd67..0000000000000 --- a/tests/cases/conformance/declarationEmit/bundledNodeDTSWithScopedPackage.ts +++ /dev/null @@ -1,30 +0,0 @@ -// @module: commonjs -// @declaration: true -// @emitDeclarationOnly: true -// @outFile: ./dist/out.d.ts -// @bundledPackageName: @test/my-pkg - -// @Filename: index.ts -export * from "./nested"; - -// @Filename: nested/base.ts -import { B } from "./shared"; - -export function f() { - return new B(); -} - -// @Filename: nested/derived.ts -import { f } from "./base"; - -export function g() { - return f(); -} - -// @Filename: nested/index.ts -export * from "./base"; -export * from "./derived"; -export * from "./shared"; - -// @Filename: nested/shared.ts -export class B {} diff --git a/tests/projects/container/compositeExec/tsconfig.json b/tests/projects/container/compositeExec/tsconfig.json index 7bc3010d9376a..a42e20414fdc8 100644 --- a/tests/projects/container/compositeExec/tsconfig.json +++ b/tests/projects/container/compositeExec/tsconfig.json @@ -3,7 +3,6 @@ "outFile": "../built/local/compositeExec.js", "composite": true, "declarationMap": true, - "bundledPackageName": "compositeExec" }, "files": [ "index.ts" diff --git a/tests/projects/container/exec/tsconfig.json b/tests/projects/container/exec/tsconfig.json index 77df9b2c0b9ad..abc00c9065896 100644 --- a/tests/projects/container/exec/tsconfig.json +++ b/tests/projects/container/exec/tsconfig.json @@ -1,7 +1,6 @@ { "compilerOptions": { "outFile": "../built/local/exec.js", - "bundledPackageName": "exec" }, "files": [ "index.ts" diff --git a/tests/projects/container/lib/tsconfig.json b/tests/projects/container/lib/tsconfig.json index 44d3ac56fefe7..55481caa9e8d7 100644 --- a/tests/projects/container/lib/tsconfig.json +++ b/tests/projects/container/lib/tsconfig.json @@ -3,7 +3,6 @@ "outFile": "../built/local/lib.js", "composite": true, "declarationMap": true, - "bundledPackageName": "lib" }, "references": [], "files": [ diff --git a/tests/projects/outfile-concat/first/tsconfig.json b/tests/projects/outfile-concat/first/tsconfig.json index 29ad28d3352af..28389ee995d0f 100644 --- a/tests/projects/outfile-concat/first/tsconfig.json +++ b/tests/projects/outfile-concat/first/tsconfig.json @@ -8,7 +8,6 @@ "declarationMap": true, "outFile": "./bin/first-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "first", }, "files": [ "first_PART1.ts", diff --git a/tests/projects/outfile-concat/second/tsconfig.json b/tests/projects/outfile-concat/second/tsconfig.json index 5f0118593e7b6..7ea38db348624 100644 --- a/tests/projects/outfile-concat/second/tsconfig.json +++ b/tests/projects/outfile-concat/second/tsconfig.json @@ -7,7 +7,6 @@ "sourceMap": true, "declarationMap": true, "declaration": true, - "bundledPackageName": "second", "outFile": "../2/second-output.js", "skipDefaultLibCheck": true }, diff --git a/tests/projects/outfile-concat/third/tsconfig.json b/tests/projects/outfile-concat/third/tsconfig.json index 0ed8e23dec67b..abbf603a8e871 100644 --- a/tests/projects/outfile-concat/third/tsconfig.json +++ b/tests/projects/outfile-concat/third/tsconfig.json @@ -9,7 +9,6 @@ "declaration": true, "outFile": "./thirdjs/output/third-output.js", "skipDefaultLibCheck": true, - "bundledPackageName": "third", }, "files": [ "third_part1.ts"