From e3c5cc68ec18314b8ea2f2fbcb00007b9537fd4e Mon Sep 17 00:00:00 2001 From: Billy Janitsch Date: Tue, 3 Dec 2024 17:19:58 -0500 Subject: [PATCH 1/2] Fix library inclusions for ES2024 target (#60622) --- src/compiler/commandLineParser.ts | 4 +- src/compiler/transformers/esnext.ts | 4 +- src/compiler/types.ts | 8 +- src/compiler/utilities.ts | 4 +- src/compiler/utilitiesPublic.ts | 6 + ...-style-sibling-packages-symlinked-Linux.js | 118 ++++++++++- ...packages-symlinked-package1-built-Linux.js | 97 ++++++++- .../packages-outside-project-folder-Linux.js | 178 +++++++++++++++++ .../packages-outside-project-folder-MacOs.js | 158 +++++++++++++++ ...ages-outside-project-folder-built-Linux.js | 170 ++++++++++++++++ ...ages-outside-project-folder-built-MacOs.js | 154 +++++++++++++++ ...stamp-true-useFsEventsOnParentDirectory.js | 8 + .../fsWatch/fsWatchWithTimestamp-true.js | 8 + ...inode-when-rename-event-ends-with-tilde.js | 32 +++ ...e-occurs-when-file-is-still-on-the-disk.js | 30 +++ ...when-using-file-watching-thats-on-inode.js | 32 +++ ...polling-when-renaming-file-in-subfolder.js | 16 ++ ...rectory-when-renaming-file-in-subfolder.js | 16 ++ ...tchFile-when-renaming-file-in-subfolder.js | 16 ++ ...-folders-with-synchronousWatchDirectory.js | 8 + ...ymlinks-to-folders-in-recursive-folders.js | 8 + ...hronous-watch-directory-renaming-a-file.js | 40 ++++ ...ory-with-outDir-and-declaration-enabled.js | 32 +++ .../with-non-synchronous-watch-directory.js | 34 ++++ ...-directory-watching-extendedDiagnostics.js | 8 + ...ption-with-recursive-directory-watching.js | 8 + .../with-fallbackPolling-option.js | 8 + .../with-watchDirectory-option.js | 8 + .../projectErrors/file-rename-on-wsl2.js | 8 + ...-location-with-currentDirectory-at-root.js | 11 +- ...lution-fails-in-global-typings-location.js | 13 +- ...e-failing-with-currentDirectory-at-root.js | 15 +- ...with-import-from-the-cache-file-failing.js | 21 +- ...ache-file-with-currentDirectory-at-root.js | 15 +- ...ocation-with-import-from-the-cache-file.js | 21 +- ...ache-file-with-currentDirectory-at-root.js | 15 +- ...ith-relative-import-from-the-cache-file.js | 21 +- ...kages-symlinked-Linux-canUseWatchEvents.js | 27 ++- ...-style-sibling-packages-symlinked-Linux.js | 75 ++++++- ...-package1-built-Linux-canUseWatchEvents.js | 27 ++- ...packages-symlinked-package1-built-Linux.js | 67 ++++++- ...-project-folder-Linux-canUseWatchEvents.js | 108 ++++++++++ .../packages-outside-project-folder-Linux.js | 184 ++++++++++++++++++ ...-project-folder-MacOs-canUseWatchEvents.js | 108 ++++++++++ .../packages-outside-project-folder-MacOs.js | 154 +++++++++++++++ ...ct-folder-built-Linux-canUseWatchEvents.js | 108 ++++++++++ ...ages-outside-project-folder-built-Linux.js | 180 +++++++++++++++++ ...ct-folder-built-MacOs-canUseWatchEvents.js | 108 ++++++++++ ...ages-outside-project-folder-built-MacOs.js | 154 +++++++++++++++ ...files-starting-with-dot-in-node_modules.js | 20 ++ ...polling-when-file-is-added-to-subfolder.js | 8 + ...rectory-when-file-is-added-to-subfolder.js | 8 + ...tchFile-when-file-is-added-to-subfolder.js | 8 + ...ere-workspaces-folder-is-hosted-at-root.js | 24 +++ 54 files changed, 2659 insertions(+), 62 deletions(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index b3c10e3c84951..e4fb6e7a834e7 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -147,8 +147,8 @@ export const inverseJsxOptionMap: Map = new Map(mapIterator(jsxO // augmented in another lib. // NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in // June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`, -// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts and the contents of each -// lib/esnext.*.d.ts file. +// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts, +// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file. const libEntries: [string, string][] = [ // JavaScript only ["es5", "lib.es5.d.ts"], diff --git a/src/compiler/transformers/esnext.ts b/src/compiler/transformers/esnext.ts index 1871e67c6f788..eace2e2c28057 100644 --- a/src/compiler/transformers/esnext.ts +++ b/src/compiler/transformers/esnext.ts @@ -74,8 +74,8 @@ const enum UsingKind { export function transformESNext(context: TransformationContext): (x: SourceFile | Bundle) => SourceFile | Bundle { // NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in // June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`, - // `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts and the contents of each - // lib/esnext.*.d.ts file. + // `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts, + // compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file. const { factory, diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 9b5908d71d9bc..1ace37c6856bc 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -7580,8 +7580,8 @@ export const enum ScriptKind { // NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in // June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`, -// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts and the contents of each -// lib/esnext.*.d.ts file. +// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts, +// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file. export const enum ScriptTarget { /** @deprecated */ ES3 = 0, @@ -8389,8 +8389,8 @@ export type LanugageFeatures = // Upcoming Features // NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in // June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`, - // `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts and the contents of each - // lib/esnext.*.d.ts file. + // `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts, + // compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file. | "UsingAndAwaitUsing" // `using x = y`, `await using x = y` | "ClassAndClassElementDecorators" // `@dec class C {}`, `class C { @dec m() {} }` ; diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index d12ae297b81ad..debbf655c9947 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -1374,8 +1374,8 @@ export type ScriptTargetFeatures = ReadonlyMap ScriptTargetFeatures = /* @__PURE__ */ memoize((): ScriptTargetFeatures => new Map(Object.entries({ diff --git a/src/compiler/utilitiesPublic.ts b/src/compiler/utilitiesPublic.ts index 02e22b94c895e..02623678a0cf0 100644 --- a/src/compiler/utilitiesPublic.ts +++ b/src/compiler/utilitiesPublic.ts @@ -305,8 +305,13 @@ export function sortAndDeduplicateDiagnostics(diagnostics: } /** @internal */ +// NOTE: We must reevaluate the target for upcoming features when each successive TC39 edition is ratified in +// June of each year. This includes changes to `LanguageFeatureMinimumTarget`, `ScriptTarget`, +// `ScriptTargetFeatures` transformers/esnext.ts, compiler/commandLineParser.ts, +// compiler/utilitiesPublic.ts, and the contents of each lib/esnext.*.d.ts file. export const targetToLibMap: Map = new Map([ [ScriptTarget.ESNext, "lib.esnext.full.d.ts"], + [ScriptTarget.ES2024, "lib.es2024.full.d.ts"], [ScriptTarget.ES2023, "lib.es2023.full.d.ts"], [ScriptTarget.ES2022, "lib.es2022.full.d.ts"], [ScriptTarget.ES2021, "lib.es2021.full.d.ts"], @@ -322,6 +327,7 @@ export function getDefaultLibFileName(options: CompilerOptions): string { const target = getEmitScriptTarget(options); switch (target) { case ScriptTarget.ESNext: + case ScriptTarget.ES2024: case ScriptTarget.ES2023: case ScriptTarget.ES2022: case ScriptTarget.ES2021: diff --git a/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-Linux.js b/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-Linux.js index 291315e9d3295..c32ea5e5931ae 100644 --- a/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-Linux.js +++ b/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-Linux.js @@ -200,14 +200,22 @@ DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/packages/packag Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/packages/package2 1 undefined Wild card directory -//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 30 +//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 31 +<<<<<<< HEAD //// [/home/src/projects/project/packages/package2/dist/index.js] Inode:: 117 +======= +//// [/home/src/projects/project/packages/package2/dist/index.js] Inode:: 119 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +<<<<<<< HEAD //// [/home/src/projects/project/packages/package2/dist/index.d.ts] Inode:: 118 +======= +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] Inode:: 120 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export {}; @@ -242,7 +250,11 @@ FsWatches:: /home/src/projects/project/packages/package2: *new* {"inode":11} /home/src/projects/project/packages/package2/dist: *new* +<<<<<<< HEAD {"inode":116} +======= + {"inode":118} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package2/src: *new* {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: *new* @@ -250,7 +262,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: *new* {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: *new* - {"inode":30} + {"inode":31} Program root files: [ "/home/src/projects/project/packages/package2/src/index.ts" @@ -290,20 +302,35 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 120 +======= +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 122 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 121 +======= +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 123 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export type FooType = "foo"; export type BarType = "bar"; +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 122 {"root":["./src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 123 +======= +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 124 +{"root":["./src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 125 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "./src/index.ts" @@ -355,7 +382,11 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: *new* +<<<<<<< HEAD {"inode":119} +======= + {"inode":121} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -363,7 +394,11 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: +<<<<<<< HEAD {"inode":116} +======= + {"inode":118} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -371,7 +406,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} Timeout callback:: count: 1 8: timerToInvalidateFailedLookupResolutions *new* @@ -436,8 +471,13 @@ packages/package2/src/index.ts +<<<<<<< HEAD //// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 117 //// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 118 +======= +//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 119 +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 120 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /home/src/projects/node_modules/@types: @@ -465,9 +505,15 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: +<<<<<<< HEAD {"inode":119} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* {"inode":121} +======= + {"inode":121} +/home/src/projects/project/packages/package1/dist/index.d.ts: *new* + {"inode":123} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -475,7 +521,11 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: +<<<<<<< HEAD {"inode":116} +======= + {"inode":118} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -483,7 +533,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} Program root files: [ @@ -568,7 +618,11 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: +<<<<<<< HEAD {"inode":116} +======= + {"inode":118} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -576,13 +630,19 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} FsWatches *deleted*:: /home/src/projects/project/packages/package1/dist: +<<<<<<< HEAD {"inode":119} /home/src/projects/project/packages/package1/dist/index.d.ts: {"inode":121} +======= + {"inode":121} +/home/src/projects/project/packages/package1/dist/index.d.ts: + {"inode":123} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) Timeout callback:: count: 2 10: timerToUpdateProgram *new* @@ -690,8 +750,13 @@ Scheduling invalidateFailedLookup, Cancelled earlier one Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/project/node_modules/package1 :: WatchInfo: /home/src/projects/project/node_modules/package1 1 undefined Failed Lookup Locations +<<<<<<< HEAD //// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 117 //// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 118 +======= +//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 119 +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 120 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /home/src/projects/node_modules: *new* @@ -729,7 +794,11 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: +<<<<<<< HEAD {"inode":116} +======= + {"inode":118} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -737,7 +806,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} Timeout callback:: count: 1 16: timerToInvalidateFailedLookupResolutions *new* @@ -927,14 +996,24 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 122 //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 123 //// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 125 +======= +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 124 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 125 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 127 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 126 +======= +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 128 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export type FooType = "foo"; export type BarType = "bar"; @@ -981,7 +1060,11 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: *new* +<<<<<<< HEAD {"inode":124} +======= + {"inode":126} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -989,7 +1072,11 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: +<<<<<<< HEAD {"inode":116} +======= + {"inode":118} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -997,7 +1084,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} Timeout callback:: count: 1 21: timerToInvalidateFailedLookupResolutions *new* @@ -1062,8 +1149,13 @@ packages/package2/src/index.ts +<<<<<<< HEAD //// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 117 //// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 118 +======= +//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 119 +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 120 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /home/src/projects/node_modules/@types: @@ -1091,9 +1183,15 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: +<<<<<<< HEAD {"inode":124} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* {"inode":126} +======= + {"inode":126} +/home/src/projects/project/packages/package1/dist/index.d.ts: *new* + {"inode":128} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1101,7 +1199,11 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: +<<<<<<< HEAD {"inode":116} +======= + {"inode":118} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -1109,7 +1211,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js b/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js index 652834a606f30..587c6ed44fbf5 100644 --- a/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js +++ b/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js @@ -82,22 +82,37 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 30 +//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 31 +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 117 +======= +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 119 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 118 +======= +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 120 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export type FooType = "foo"; export type BarType = "bar"; +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 119 {"root":["./src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 120 +======= +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 121 +{"root":["./src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 122 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "./src/index.ts" @@ -173,12 +188,20 @@ DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/packages/packag Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/packages/package2 1 undefined Wild card directory +<<<<<<< HEAD //// [/home/src/projects/project/packages/package2/dist/index.js] Inode:: 122 +======= +//// [/home/src/projects/project/packages/package2/dist/index.js] Inode:: 124 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +<<<<<<< HEAD //// [/home/src/projects/project/packages/package2/dist/index.d.ts] Inode:: 123 +======= +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] Inode:: 125 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export {}; @@ -205,9 +228,15 @@ FsWatches:: /home/src/projects/project/packages/package1: *new* {"inode":6} /home/src/projects/project/packages/package1/dist: *new* +<<<<<<< HEAD {"inode":116} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* {"inode":118} +======= + {"inode":118} +/home/src/projects/project/packages/package1/dist/index.d.ts: *new* + {"inode":120} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package1/package.json: *new* {"inode":7} /home/src/projects/project/packages/package1/src: *new* @@ -215,7 +244,11 @@ FsWatches:: /home/src/projects/project/packages/package2: *new* {"inode":11} /home/src/projects/project/packages/package2/dist: *new* +<<<<<<< HEAD {"inode":121} +======= + {"inode":123} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package2/src: *new* {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: *new* @@ -223,7 +256,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: *new* {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: *new* - {"inode":30} + {"inode":31} Program root files: [ "/home/src/projects/project/packages/package2/src/index.ts" @@ -309,7 +342,11 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: +<<<<<<< HEAD {"inode":121} +======= + {"inode":123} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -317,13 +354,19 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} FsWatches *deleted*:: /home/src/projects/project/packages/package1/dist: +<<<<<<< HEAD {"inode":116} /home/src/projects/project/packages/package1/dist/index.d.ts: {"inode":118} +======= + {"inode":118} +/home/src/projects/project/packages/package1/dist/index.d.ts: + {"inode":120} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) Timeout callback:: count: 2 1: timerToUpdateProgram *new* @@ -434,8 +477,13 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/project/node_ sysLog:: Elapsed:: *ms:: onTimerToUpdateChildWatches:: 0 undefined +<<<<<<< HEAD //// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 122 //// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 123 +======= +//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 124 +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 125 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /home/src/projects/node_modules: *new* @@ -473,7 +521,11 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: +<<<<<<< HEAD {"inode":121} +======= + {"inode":123} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -481,7 +533,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} Timeout callback:: count: 1 7: timerToInvalidateFailedLookupResolutions *new* @@ -671,14 +723,24 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 119 //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 120 //// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 125 +======= +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 121 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 122 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 127 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 126 +======= +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 128 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export type FooType = "foo"; export type BarType = "bar"; @@ -725,7 +787,11 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: *new* +<<<<<<< HEAD {"inode":124} +======= + {"inode":126} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -733,7 +799,11 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: +<<<<<<< HEAD {"inode":121} +======= + {"inode":123} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -741,7 +811,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} Timeout callback:: count: 1 12: timerToInvalidateFailedLookupResolutions *new* @@ -806,8 +876,13 @@ packages/package2/src/index.ts +<<<<<<< HEAD //// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 122 //// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 123 +======= +//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 124 +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 125 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /home/src/projects/node_modules/@types: @@ -835,9 +910,15 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: +<<<<<<< HEAD {"inode":124} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* {"inode":126} +======= + {"inode":126} +/home/src/projects/project/packages/package1/dist/index.d.ts: *new* + {"inode":128} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -845,7 +926,11 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: +<<<<<<< HEAD {"inode":121} +======= + {"inode":123} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -853,7 +938,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":30} + {"inode":31} Program root files: [ diff --git a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Linux.js b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Linux.js index 3472f0b5d6634..57101cb165b24 100644 --- a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Linux.js +++ b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Linux.js @@ -206,7 +206,11 @@ DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 unde Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 undefined Wild card directory +<<<<<<< HEAD //// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 138 +======= +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 140 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -284,7 +288,11 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 139 +======= +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 141 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -302,7 +310,11 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 140 +======= +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 142 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -320,18 +332,30 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 142 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 144 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 143 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 144 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 145 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 146 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -351,6 +375,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 145 export * from './c'; @@ -359,6 +384,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 147 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 147 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 148 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 149 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -368,18 +403,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 149 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 151 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 150 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 151 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 152 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 153 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -400,15 +447,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 152 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 154 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 153 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 155 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 156 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -460,7 +518,11 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib: *new* +<<<<<<< HEAD {"inode":148} +======= + {"inode":150} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -593,7 +655,11 @@ src/index.ts +<<<<<<< HEAD //// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 138 +======= +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 140 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /home/src/projects/a/1/a-impl/a/lib/node_modules: *new* @@ -621,11 +687,19 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: +<<<<<<< HEAD {"inode":148} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* {"inode":150} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* {"inode":152} +======= + {"inode":150} +/home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* + {"inode":152} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* + {"inode":154} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -639,11 +713,19 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* +<<<<<<< HEAD {"inode":141} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* {"inode":143} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* {"inode":145} +======= + {"inode":143} +/home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* + {"inode":145} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* + {"inode":147} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: @@ -698,7 +780,11 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 155 +======= +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -716,7 +802,11 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 156 +======= +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -856,6 +946,7 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib: +<<<<<<< HEAD {"inode":148} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: {"inode":150} @@ -867,6 +958,19 @@ FsWatches *deleted*:: {"inode":143} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: {"inode":145} +======= + {"inode":150} +/home/src/projects/a/1/a-impl/a/lib/a.d.ts: + {"inode":152} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: + {"inode":154} +/home/src/projects/c/3/c-impl/c/lib: + {"inode":143} +/home/src/projects/c/3/c-impl/c/lib/c.d.ts: + {"inode":145} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: + {"inode":147} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) Timeout callback:: count: 2 18: timerToUpdateProgram *new* @@ -984,7 +1088,11 @@ src/index.ts +<<<<<<< HEAD //// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 138 +======= +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 140 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /home/src/projects/b/2/b-impl/b/node_modules/@types: @@ -1099,18 +1207,30 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 158 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 159 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 160 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1130,6 +1250,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 161 export * from './c'; @@ -1138,6 +1259,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 163 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -1147,18 +1278,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 165 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 166 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 167 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1179,15 +1322,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 168 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 169 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -1239,7 +1393,11 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib: *new* +<<<<<<< HEAD {"inode":164} +======= + {"inode":166} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1370,7 +1528,11 @@ src/index.ts +<<<<<<< HEAD //// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 138 +======= +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 140 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /home/src/projects/a/1/a-impl/a/lib/node_modules: *new* @@ -1398,11 +1560,19 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: +<<<<<<< HEAD {"inode":164} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* {"inode":166} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* {"inode":168} +======= + {"inode":166} +/home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* + {"inode":168} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* + {"inode":170} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1416,11 +1586,19 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* +<<<<<<< HEAD {"inode":157} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* {"inode":159} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* {"inode":161} +======= + {"inode":159} +/home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* + {"inode":161} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* + {"inode":163} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-MacOs.js b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-MacOs.js index 479198be1400e..624bbe62020e8 100644 --- a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-MacOs.js +++ b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-MacOs.js @@ -206,7 +206,11 @@ DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 unde Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 undefined Wild card directory +<<<<<<< HEAD //// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 138 +======= +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 140 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -280,7 +284,11 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 139 +======= +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 141 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -298,7 +306,11 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 140 +======= +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 142 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -316,18 +328,30 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 142 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 144 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 143 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 144 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 145 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 146 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -347,6 +371,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 145 export * from './c'; @@ -355,6 +380,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 147 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 147 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 148 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 149 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -364,18 +399,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 149 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 151 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 150 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 151 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 152 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 153 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -396,15 +443,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 152 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 154 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 153 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 155 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 156 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -552,7 +610,11 @@ src/index.ts +<<<<<<< HEAD //// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 138 +======= +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 140 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /home/src/projects/a/1/a-impl/a/lib/node_modules: *new* @@ -580,9 +642,15 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* +<<<<<<< HEAD {"inode":150} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* {"inode":152} +======= + {"inode":152} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* + {"inode":154} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/src/index.ts: @@ -590,9 +658,15 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* +<<<<<<< HEAD {"inode":143} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* {"inode":145} +======= + {"inode":145} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* + {"inode":147} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: @@ -659,7 +733,11 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 155 +======= +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -688,7 +766,11 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 156 +======= +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -827,6 +909,7 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: +<<<<<<< HEAD {"inode":150} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: {"inode":152} @@ -834,6 +917,15 @@ FsWatches *deleted*:: {"inode":143} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: {"inode":145} +======= + {"inode":152} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: + {"inode":154} +/home/src/projects/c/3/c-impl/c/lib/c.d.ts: + {"inode":145} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: + {"inode":147} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) FsWatchesRecursive:: /home/src/projects/a: @@ -963,7 +1055,11 @@ src/index.ts +<<<<<<< HEAD //// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 138 +======= +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 140 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /home/src/projects/b/2/b-impl/b/node_modules/@types: @@ -1059,18 +1155,30 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 158 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 159 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 160 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1090,6 +1198,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 161 export * from './c'; @@ -1098,6 +1207,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 163 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -1107,18 +1226,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 165 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 166 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 167 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1139,15 +1270,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 168 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 169 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -1293,7 +1435,11 @@ src/index.ts +<<<<<<< HEAD //// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 138 +======= +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 140 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /home/src/projects/a/1/a-impl/a/lib/node_modules: *new* @@ -1321,9 +1467,15 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* +<<<<<<< HEAD {"inode":166} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* {"inode":168} +======= + {"inode":168} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* + {"inode":170} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/src/index.ts: @@ -1331,9 +1483,15 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* +<<<<<<< HEAD {"inode":159} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* {"inode":161} +======= + {"inode":161} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* + {"inode":163} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Linux.js b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Linux.js index f175af64aa0a8..459d12f952f60 100644 --- a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Linux.js +++ b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Linux.js @@ -88,18 +88,30 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 138 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 140 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 139 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 140 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 141 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 142 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -119,6 +131,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 141 export * from './c'; @@ -127,6 +140,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 143 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 143 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 144 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 145 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -136,18 +159,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 145 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 147 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 146 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 147 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 148 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 149 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -168,15 +203,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 148 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 150 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 149 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 150 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 151 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 152 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -291,7 +337,11 @@ DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 unde Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 undefined Wild card directory +<<<<<<< HEAD //// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 152 +======= +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 154 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -313,11 +363,19 @@ PolledWatches:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: *new* +<<<<<<< HEAD {"inode":144} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* {"inode":146} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* {"inode":148} +======= + {"inode":146} +/home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* + {"inode":148} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* + {"inode":150} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/node_modules: *new* {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: *new* @@ -331,11 +389,19 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: *new* {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* +<<<<<<< HEAD {"inode":137} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* {"inode":139} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* {"inode":141} +======= + {"inode":139} +/home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* + {"inode":141} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* + {"inode":143} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: *new* @@ -383,7 +449,11 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 153 +======= +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 155 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -401,7 +471,11 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 154 +======= +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 156 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -419,7 +493,11 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 155 +======= +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -437,7 +515,11 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 156 +======= +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -577,6 +659,7 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib: +<<<<<<< HEAD {"inode":144} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: {"inode":146} @@ -588,6 +671,19 @@ FsWatches *deleted*:: {"inode":139} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: {"inode":141} +======= + {"inode":146} +/home/src/projects/a/1/a-impl/a/lib/a.d.ts: + {"inode":148} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: + {"inode":150} +/home/src/projects/c/3/c-impl/c/lib: + {"inode":139} +/home/src/projects/c/3/c-impl/c/lib/c.d.ts: + {"inode":141} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: + {"inode":143} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) Timeout callback:: count: 2 13: timerToUpdateProgram *new* @@ -705,7 +801,11 @@ src/index.ts +<<<<<<< HEAD //// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 152 +======= +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 154 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /home/src/projects/b/2/b-impl/b/node_modules/@types: @@ -820,18 +920,30 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 158 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 159 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 160 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -851,6 +963,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 161 export * from './c'; @@ -859,6 +972,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 163 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -868,18 +991,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 165 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 166 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 167 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -900,15 +1035,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 168 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 169 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -960,7 +1106,11 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib: *new* +<<<<<<< HEAD {"inode":164} +======= + {"inode":166} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1091,7 +1241,11 @@ src/index.ts +<<<<<<< HEAD //// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 152 +======= +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 154 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /home/src/projects/a/1/a-impl/a/lib/node_modules: *new* @@ -1119,11 +1273,19 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: +<<<<<<< HEAD {"inode":164} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* {"inode":166} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* {"inode":168} +======= + {"inode":166} +/home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* + {"inode":168} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* + {"inode":170} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1137,11 +1299,19 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* +<<<<<<< HEAD {"inode":157} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* {"inode":159} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* {"inode":161} +======= + {"inode":159} +/home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* + {"inode":161} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* + {"inode":163} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-MacOs.js b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-MacOs.js index 8107787ffc5a5..eb7c8f35f2173 100644 --- a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-MacOs.js +++ b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-MacOs.js @@ -88,18 +88,30 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 138 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 140 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 139 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 140 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 141 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 142 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -119,6 +131,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 141 export * from './c'; @@ -127,6 +140,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 143 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 143 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 144 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 145 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -136,18 +159,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 145 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 147 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 146 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 147 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 148 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 149 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -168,15 +203,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 148 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 150 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 149 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 150 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 151 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 152 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -291,7 +337,11 @@ DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 unde Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 undefined Wild card directory +<<<<<<< HEAD //// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 152 +======= +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 154 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -313,9 +363,15 @@ PolledWatches:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* +<<<<<<< HEAD {"inode":146} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* {"inode":148} +======= + {"inode":148} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* + {"inode":150} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/package.json: *new* {"inode":24} /home/src/projects/b/2/b-impl/b/src/index.ts: *new* @@ -323,9 +379,15 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: *new* {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* +<<<<<<< HEAD {"inode":139} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* {"inode":141} +======= + {"inode":141} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* + {"inode":143} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: *new* @@ -385,7 +447,11 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 153 +======= +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 155 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -414,7 +480,11 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 154 +======= +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 156 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -443,7 +513,11 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 155 +======= +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -472,7 +546,11 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 156 +======= +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -611,6 +689,7 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: +<<<<<<< HEAD {"inode":146} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: {"inode":148} @@ -618,6 +697,15 @@ FsWatches *deleted*:: {"inode":139} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: {"inode":141} +======= + {"inode":148} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: + {"inode":150} +/home/src/projects/c/3/c-impl/c/lib/c.d.ts: + {"inode":141} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: + {"inode":143} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) FsWatchesRecursive:: /home/src/projects/a: @@ -747,7 +835,11 @@ src/index.ts +<<<<<<< HEAD //// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 152 +======= +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 154 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /home/src/projects/b/2/b-impl/b/node_modules/@types: @@ -843,18 +935,30 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 158 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 159 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 160 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -874,6 +978,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 161 export * from './c'; @@ -882,6 +987,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 163 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -891,18 +1006,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 165 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 166 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 167 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -923,15 +1050,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 168 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 169 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -1077,7 +1215,11 @@ src/index.ts +<<<<<<< HEAD //// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 152 +======= +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 154 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /home/src/projects/a/1/a-impl/a/lib/node_modules: *new* @@ -1105,9 +1247,15 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* +<<<<<<< HEAD {"inode":166} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* {"inode":168} +======= + {"inode":168} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* + {"inode":170} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/src/index.ts: @@ -1115,9 +1263,15 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* +<<<<<<< HEAD {"inode":159} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* {"inode":161} +======= + {"inode":161} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* + {"inode":163} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true-useFsEventsOnParentDirectory.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true-useFsEventsOnParentDirectory.js index 2cc3b82b7228d..b29e46325d7b1 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true-useFsEventsOnParentDirectory.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true-useFsEventsOnParentDirectory.js @@ -46,7 +46,11 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node +<<<<<<< HEAD //// [/user/username/projects/myproject/main.js] Inode:: 107 +======= +//// [/user/username/projects/myproject/main.js] Inode:: 109 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; @@ -132,7 +136,11 @@ CreatingProgramWith:: +<<<<<<< HEAD //// [/user/username/projects/myproject/main.js] Inode:: 107 +======= +//// [/user/username/projects/myproject/main.js] Inode:: 109 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.y = exports.x = void 0; diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true.js index d3b49c2edd440..6a0327ef13a8b 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true.js @@ -46,7 +46,11 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node +<<<<<<< HEAD //// [/user/username/projects/myproject/main.js] Inode:: 107 +======= +//// [/user/username/projects/myproject/main.js] Inode:: 109 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; @@ -134,7 +138,11 @@ CreatingProgramWith:: +<<<<<<< HEAD //// [/user/username/projects/myproject/main.js] Inode:: 107 +======= +//// [/user/username/projects/myproject/main.js] Inode:: 109 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.y = exports.x = void 0; diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js index f23c8d534772c..9cf2534a4fec7 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js @@ -58,7 +58,11 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myprojec +<<<<<<< HEAD //// [/user/username/projects/myproject/main.js] Inode:: 108 +======= +//// [/user/username/projects/myproject/main.js] Inode:: 110 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var foo_1 = require("./foo"); @@ -114,7 +118,11 @@ exitCode:: ExitStatus.undefined Change:: Replace file with rename event that introduces error Input:: +<<<<<<< HEAD //// [/user/username/projects/myproject/foo.d.ts] Inode:: 109 +======= +//// [/user/username/projects/myproject/foo.d.ts] Inode:: 111 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export function foo2(): string; @@ -163,7 +171,11 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/foo.d.ts: +<<<<<<< HEAD {"inode":109} *new* +======= + {"inode":111} *new* +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /user/username/projects/myproject/main.ts: {"inode":5} /user/username/projects/myproject/tsconfig.json: @@ -204,7 +216,11 @@ CreatingProgramWith:: +<<<<<<< HEAD //// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 108 +======= +//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 110 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) Timeout callback:: count: 0 9: timerToInvalidateFailedLookupResolutions *deleted* @@ -238,7 +254,11 @@ exitCode:: ExitStatus.undefined Change:: Replace file with rename event that fixes error Input:: +<<<<<<< HEAD //// [/user/username/projects/myproject/foo.d.ts] Inode:: 110 +======= +//// [/user/username/projects/myproject/foo.d.ts] Inode:: 112 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export function foo(): string; @@ -287,7 +307,11 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/foo.d.ts: +<<<<<<< HEAD {"inode":110} *new* +======= + {"inode":112} *new* +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /user/username/projects/myproject/main.ts: {"inode":5} /user/username/projects/myproject/tsconfig.json: @@ -295,7 +319,11 @@ FsWatches:: FsWatches *deleted*:: /user/username/projects/myproject/foo.d.ts: +<<<<<<< HEAD {"inode":109} +======= + {"inode":111} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) Timeout callback:: count: 2 16: timerToUpdateProgram *new* @@ -318,7 +346,11 @@ CreatingProgramWith:: +<<<<<<< HEAD //// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 108 +======= +//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 110 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) Timeout callback:: count: 0 18: timerToInvalidateFailedLookupResolutions *deleted* diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js index 87af2b062e27b..597882b8d73f1 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js @@ -54,12 +54,20 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node +<<<<<<< HEAD //// [/user/username/projects/myproject/foo.js] Inode:: 108 +======= +//// [/user/username/projects/myproject/foo.js] Inode:: 110 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +<<<<<<< HEAD //// [/user/username/projects/myproject/main.js] Inode:: 109 +======= +//// [/user/username/projects/myproject/main.js] Inode:: 111 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var foo_1 = require("./foo"); @@ -113,7 +121,11 @@ exitCode:: ExitStatus.undefined Change:: Introduce error such that when callback happens file is already appeared Input:: +<<<<<<< HEAD //// [/user/username/projects/myproject/foo.ts] Inode:: 110 +======= +//// [/user/username/projects/myproject/foo.ts] Inode:: 112 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export declare function foo2(): string; @@ -173,8 +185,13 @@ CreatingProgramWith:: +<<<<<<< HEAD //// [/user/username/projects/myproject/foo.js] file written with same contents Inode:: 108 //// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 109 +======= +//// [/user/username/projects/myproject/foo.js] file written with same contents Inode:: 110 +//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 111 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) Program root files: [ @@ -205,7 +222,11 @@ exitCode:: ExitStatus.undefined Change:: Replace file with rename event that fixes error Input:: +<<<<<<< HEAD //// [/user/username/projects/myproject/foo.ts] Inode:: 111 +======= +//// [/user/username/projects/myproject/foo.ts] Inode:: 113 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export declare function foo(): string; @@ -234,7 +255,11 @@ FsWatches:: /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":13} /user/username/projects/myproject/foo.ts: +<<<<<<< HEAD {"inode":111} *new* +======= + {"inode":113} *new* +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /user/username/projects/myproject/main.ts: {"inode":5} /user/username/projects/myproject/tsconfig.json: @@ -263,8 +288,13 @@ CreatingProgramWith:: +<<<<<<< HEAD //// [/user/username/projects/myproject/foo.js] file written with same contents Inode:: 108 //// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 109 +======= +//// [/user/username/projects/myproject/foo.js] file written with same contents Inode:: 110 +//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 111 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) Program root files: [ diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js index 115d2b37cfebe..b1036afd4b310 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js @@ -58,7 +58,11 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myprojec +<<<<<<< HEAD //// [/user/username/projects/myproject/main.js] Inode:: 108 +======= +//// [/user/username/projects/myproject/main.js] Inode:: 110 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var foo_1 = require("./foo"); @@ -114,7 +118,11 @@ exitCode:: ExitStatus.undefined Change:: Replace file with rename event that introduces error Input:: +<<<<<<< HEAD //// [/user/username/projects/myproject/foo.d.ts] Inode:: 109 +======= +//// [/user/username/projects/myproject/foo.d.ts] Inode:: 111 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export function foo2(): string; @@ -151,7 +159,11 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/foo.d.ts: +<<<<<<< HEAD {"inode":109} *new* +======= + {"inode":111} *new* +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /user/username/projects/myproject/main.ts: {"inode":5} /user/username/projects/myproject/tsconfig.json: @@ -192,7 +204,11 @@ CreatingProgramWith:: +<<<<<<< HEAD //// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 108 +======= +//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 110 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) Timeout callback:: count: 0 5: timerToInvalidateFailedLookupResolutions *deleted* @@ -226,7 +242,11 @@ exitCode:: ExitStatus.undefined Change:: Replace file with rename event that fixes error Input:: +<<<<<<< HEAD //// [/user/username/projects/myproject/foo.d.ts] Inode:: 110 +======= +//// [/user/username/projects/myproject/foo.d.ts] Inode:: 112 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export function foo(): string; @@ -263,7 +283,11 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/foo.d.ts: +<<<<<<< HEAD {"inode":110} *new* +======= + {"inode":112} *new* +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /user/username/projects/myproject/main.ts: {"inode":5} /user/username/projects/myproject/tsconfig.json: @@ -271,7 +295,11 @@ FsWatches:: FsWatches *deleted*:: /user/username/projects/myproject/foo.d.ts: +<<<<<<< HEAD {"inode":109} +======= + {"inode":111} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) Timeout callback:: count: 2 9: timerToUpdateProgram *new* @@ -294,7 +322,11 @@ CreatingProgramWith:: +<<<<<<< HEAD //// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 108 +======= +//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 110 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) Timeout callback:: count: 0 10: timerToInvalidateFailedLookupResolutions *deleted* diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-dynamic-polling-when-renaming-file-in-subfolder.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-dynamic-polling-when-renaming-file-in-subfolder.js index 81e7880d0e808..341d5f2edff71 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-dynamic-polling-when-renaming-file-in-subfolder.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-dynamic-polling-when-renaming-file-in-subfolder.js @@ -35,7 +35,11 @@ Output:: +<<<<<<< HEAD //// [/a/username/projects/project/src/file1.js] Inode:: 108 +======= +//// [/a/username/projects/project/src/file1.js] Inode:: 110 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) @@ -75,7 +79,11 @@ exitCode:: ExitStatus.undefined Change:: Rename file1 to file2 Input:: +<<<<<<< HEAD //// [/a/username/projects/project/src/file2.ts] Inode:: 109 +======= +//// [/a/username/projects/project/src/file2.ts] Inode:: 111 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) //// [/a/username/projects/project/src/file1.ts] deleted @@ -129,7 +137,11 @@ Output:: +<<<<<<< HEAD //// [/a/username/projects/project/src/file2.js] Inode:: 110 +======= +//// [/a/username/projects/project/src/file2.js] Inode:: 112 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) @@ -139,7 +151,11 @@ PolledWatches *deleted*:: FsWatches:: /a/username/projects/project/src/file2.ts: *new* +<<<<<<< HEAD {"inode":109} +======= + {"inode":111} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /a/username/projects/project/tsconfig.json: {"inode":7} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js index 32207a707ecf6..7a50e54dfefc4 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js @@ -35,7 +35,11 @@ Output:: +<<<<<<< HEAD //// [/a/username/projects/project/src/file1.js] Inode:: 108 +======= +//// [/a/username/projects/project/src/file1.js] Inode:: 110 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) @@ -82,7 +86,11 @@ exitCode:: ExitStatus.undefined Change:: Rename file1 to file2 Input:: +<<<<<<< HEAD //// [/a/username/projects/project/src/file2.ts] Inode:: 109 +======= +//// [/a/username/projects/project/src/file2.ts] Inode:: 111 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) //// [/a/username/projects/project/src/file1.ts] deleted @@ -129,7 +137,11 @@ Output:: +<<<<<<< HEAD //// [/a/username/projects/project/src/file2.js] Inode:: 110 +======= +//// [/a/username/projects/project/src/file2.js] Inode:: 112 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) @@ -149,7 +161,11 @@ FsWatches:: /a/username/projects/project/src: {"inode":5} /a/username/projects/project/src/file2.ts: *new* +<<<<<<< HEAD {"inode":109} +======= + {"inode":111} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /a/username/projects/project/tsconfig.json: {"inode":7} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-watchFile-when-renaming-file-in-subfolder.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-watchFile-when-renaming-file-in-subfolder.js index 8258a63830faf..d5693f4169b3c 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-watchFile-when-renaming-file-in-subfolder.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-watchFile-when-renaming-file-in-subfolder.js @@ -35,7 +35,11 @@ Output:: +<<<<<<< HEAD //// [/a/username/projects/project/src/file1.js] Inode:: 108 +======= +//// [/a/username/projects/project/src/file1.js] Inode:: 110 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) @@ -82,7 +86,11 @@ exitCode:: ExitStatus.undefined Change:: Rename file1 to file2 Input:: +<<<<<<< HEAD //// [/a/username/projects/project/src/file2.ts] Inode:: 109 +======= +//// [/a/username/projects/project/src/file2.ts] Inode:: 111 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) //// [/a/username/projects/project/src/file1.ts] deleted @@ -129,7 +137,11 @@ Output:: +<<<<<<< HEAD //// [/a/username/projects/project/src/file2.js] Inode:: 110 +======= +//// [/a/username/projects/project/src/file2.js] Inode:: 112 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) @@ -149,7 +161,11 @@ PolledWatches *deleted*:: FsWatches:: /a/username/projects/project/src/file2.ts: *new* +<<<<<<< HEAD {"inode":109} +======= + {"inode":111} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /a/username/projects/project/tsconfig.json: {"inode":7} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders-with-synchronousWatchDirectory.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders-with-synchronousWatchDirectory.js index 3eccc5cff938f..e92239092e2d3 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders-with-synchronousWatchDirectory.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders-with-synchronousWatchDirectory.js @@ -100,7 +100,11 @@ DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject 1 {"synchron Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject 1 {"synchronousWatchDirectory":true} Wild card directory +<<<<<<< HEAD //// [/home/user/projects/myproject/src/file.js] Inode:: 118 +======= +//// [/home/user/projects/myproject/src/file.js] Inode:: 120 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -315,7 +319,11 @@ FileWatcher:: Close:: WatchInfo: /home/user/projects/package.json 2000 {"synchro +<<<<<<< HEAD //// [/home/user/projects/myproject/src/file.js] file written with same contents Inode:: 118 +======= +//// [/home/user/projects/myproject/src/file.js] file written with same contents Inode:: 120 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /home/user/projects/myproject/node_modules/@types: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js index 4ce59ebe5e320..59422733a3486 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js @@ -95,7 +95,11 @@ DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject 1 undefined Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject 1 undefined Wild card directory +<<<<<<< HEAD //// [/home/user/projects/myproject/src/file.js] Inode:: 118 +======= +//// [/home/user/projects/myproject/src/file.js] Inode:: 120 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -321,7 +325,11 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/user/projects/myproject/no sysLog:: Elapsed:: *ms:: onTimerToUpdateChildWatches:: 0 undefined +<<<<<<< HEAD //// [/home/user/projects/myproject/src/file.js] file written with same contents Inode:: 118 +======= +//// [/home/user/projects/myproject/src/file.js] file written with same contents Inode:: 120 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /home/user/projects/myproject/node_modules/@types: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js index b303ed835d6c2..ce464a4fb5419 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js @@ -38,14 +38,22 @@ Output:: +<<<<<<< HEAD //// [/user/username/projects/myproject/dist/file2.js] Inode:: 110 +======= +//// [/user/username/projects/myproject/dist/file2.js] Inode:: 112 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; exports.x = 10; +<<<<<<< HEAD //// [/user/username/projects/myproject/dist/file1.js] Inode:: 111 +======= +//// [/user/username/projects/myproject/dist/file1.js] Inode:: 113 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -63,7 +71,11 @@ FsWatches:: /user/username/projects/myproject: *new* {"inode":4} /user/username/projects/myproject/dist: *new* +<<<<<<< HEAD {"inode":109} +======= + {"inode":111} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /user/username/projects/myproject/src: *new* {"inode":5} /user/username/projects/myproject/src/file1.ts: *new* @@ -110,7 +122,11 @@ exitCode:: ExitStatus.undefined Change:: rename the file Input:: +<<<<<<< HEAD //// [/user/username/projects/myproject/src/renamed.ts] Inode:: 112 +======= +//// [/user/username/projects/myproject/src/renamed.ts] Inode:: 114 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const x = 10; //// [/user/username/projects/myproject/src/file2.ts] deleted @@ -133,7 +149,11 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/dist: +<<<<<<< HEAD {"inode":109} +======= + {"inode":111} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /user/username/projects/myproject/src: {"inode":5} /user/username/projects/myproject/src/file1.ts: @@ -167,7 +187,11 @@ Output:: +<<<<<<< HEAD //// [/user/username/projects/myproject/dist/file1.js] file written with same contents Inode:: 111 +======= +//// [/user/username/projects/myproject/dist/file1.js] file written with same contents Inode:: 113 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /user/username/projects/myproject/node_modules/@types: @@ -187,7 +211,11 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/dist: +<<<<<<< HEAD {"inode":109} +======= + {"inode":111} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /user/username/projects/myproject/src: {"inode":5} /user/username/projects/myproject/src/file1.ts: @@ -250,7 +278,11 @@ Output:: +<<<<<<< HEAD //// [/user/username/projects/myproject/dist/renamed.js] Inode:: 113 +======= +//// [/user/username/projects/myproject/dist/renamed.js] Inode:: 115 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; @@ -274,13 +306,21 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/dist: +<<<<<<< HEAD {"inode":109} +======= + {"inode":111} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /user/username/projects/myproject/src: {"inode":5} /user/username/projects/myproject/src/file1.ts: {"inode":6} /user/username/projects/myproject/src/renamed.ts: *new* +<<<<<<< HEAD {"inode":112} +======= + {"inode":114} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /user/username/projects/myproject/tsconfig.json: {"inode":8} diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js index d751628e34076..f483714a9bade 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js @@ -39,12 +39,20 @@ Output:: +<<<<<<< HEAD //// [/user/username/projects/myproject/dist/file1.js] Inode:: 112 +======= +//// [/user/username/projects/myproject/dist/file1.js] Inode:: 114 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +<<<<<<< HEAD //// [/user/username/projects/myproject/dist/file1.d.ts] Inode:: 113 +======= +//// [/user/username/projects/myproject/dist/file1.d.ts] Inode:: 115 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export {}; @@ -69,7 +77,11 @@ FsWatches:: /user/username/projects/myproject: *new* {"inode":4} /user/username/projects/myproject/dist: *new* +<<<<<<< HEAD {"inode":111} +======= + {"inode":113} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /user/username/projects/myproject/node_modules: *new* {"inode":7} /user/username/projects/myproject/node_modules/file2: *new* @@ -120,7 +132,11 @@ exitCode:: ExitStatus.undefined Change:: Add new file, should schedule and run timeout to update directory watcher Input:: +<<<<<<< HEAD //// [/user/username/projects/myproject/src/file3.ts] Inode:: 114 +======= +//// [/user/username/projects/myproject/src/file3.ts] Inode:: 116 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const y = 10; @@ -158,14 +174,22 @@ Output:: +<<<<<<< HEAD //// [/user/username/projects/myproject/dist/file3.js] Inode:: 115 +======= +//// [/user/username/projects/myproject/dist/file3.js] Inode:: 117 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.y = void 0; exports.y = 10; +<<<<<<< HEAD //// [/user/username/projects/myproject/dist/file3.d.ts] Inode:: 116 +======= +//// [/user/username/projects/myproject/dist/file3.d.ts] Inode:: 118 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export declare const y = 10; @@ -190,7 +214,11 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/dist: +<<<<<<< HEAD {"inode":111} +======= + {"inode":113} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /user/username/projects/myproject/node_modules: {"inode":7} /user/username/projects/myproject/node_modules/file2: @@ -202,7 +230,11 @@ FsWatches:: /user/username/projects/myproject/src/file1.ts: {"inode":6} /user/username/projects/myproject/src/file3.ts: *new* +<<<<<<< HEAD {"inode":114} +======= + {"inode":116} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /user/username/projects/myproject/tsconfig.json: {"inode":10} diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js index c87d331a9b696..45cbcb10129d2 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js @@ -34,7 +34,11 @@ Output:: +<<<<<<< HEAD //// [/user/username/projects/myproject/src/file1.js] Inode:: 111 +======= +//// [/user/username/projects/myproject/src/file1.js] Inode:: 113 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -187,7 +191,11 @@ Output:: +<<<<<<< HEAD //// [/user/username/projects/myproject/src/file1.js] file written with same contents Inode:: 111 +======= +//// [/user/username/projects/myproject/src/file1.js] file written with same contents Inode:: 113 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /user/username/projects/myproject/node_modules: @@ -337,7 +345,11 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/node_modules: *new* +<<<<<<< HEAD {"inode":112} +======= + {"inode":114} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /user/username/projects/myproject/src: {"inode":5} /user/username/projects/myproject/src/file1.ts: @@ -365,7 +377,11 @@ exitCode:: ExitStatus.undefined Change:: npm install index file in file2 Input:: +<<<<<<< HEAD //// [/user/username/projects/myproject/node_modules/file2/index.d.ts] Inode:: 114 +======= +//// [/user/username/projects/myproject/node_modules/file2/index.d.ts] Inode:: 116 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const x = 10; @@ -395,9 +411,15 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/node_modules: +<<<<<<< HEAD {"inode":112} /user/username/projects/myproject/node_modules/file2: *new* {"inode":113} +======= + {"inode":114} +/user/username/projects/myproject/node_modules/file2: *new* + {"inode":115} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /user/username/projects/myproject/src: {"inode":5} /user/username/projects/myproject/src/file1.ts: @@ -447,7 +469,11 @@ Output:: +<<<<<<< HEAD //// [/user/username/projects/myproject/src/file1.js] file written with same contents Inode:: 111 +======= +//// [/user/username/projects/myproject/src/file1.js] file written with same contents Inode:: 113 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) PolledWatches:: /user/username/projects/myproject/node_modules/@types: @@ -473,11 +499,19 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/node_modules: +<<<<<<< HEAD {"inode":112} /user/username/projects/myproject/node_modules/file2: {"inode":113} /user/username/projects/myproject/node_modules/file2/index.d.ts: *new* {"inode":114} +======= + {"inode":114} +/user/username/projects/myproject/node_modules/file2: + {"inode":115} +/user/username/projects/myproject/node_modules/file2/index.d.ts: *new* + {"inode":116} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /user/username/projects/myproject/src: {"inode":5} /user/username/projects/myproject/src/file1.ts: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js index 93f6972ad89d2..758b7488ffc55 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js @@ -75,7 +75,11 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 {"excl Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 {"excludeDirectories":["/user/username/projects/myproject/**/temp"]} Wild card directory +<<<<<<< HEAD //// [/user/username/projects/myproject/src/main.js] Inode:: 115 +======= +//// [/user/username/projects/myproject/src/main.js] Inode:: 117 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var bar_1 = require("bar"); @@ -175,7 +179,11 @@ exitCode:: ExitStatus.undefined Change:: add new folder to temp Input:: +<<<<<<< HEAD //// [/user/username/projects/myproject/node_modules/bar/temp/fooBar/index.d.ts] Inode:: 117 +======= +//// [/user/username/projects/myproject/node_modules/bar/temp/fooBar/index.d.ts] Inode:: 119 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export function temp(): string; diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js index 18a874270511a..28ae9dc391422 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js @@ -52,7 +52,11 @@ Output:: +<<<<<<< HEAD //// [/user/username/projects/myproject/src/main.js] Inode:: 115 +======= +//// [/user/username/projects/myproject/src/main.js] Inode:: 117 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var bar_1 = require("bar"); @@ -140,7 +144,11 @@ exitCode:: ExitStatus.undefined Change:: add new folder to temp Input:: +<<<<<<< HEAD //// [/user/username/projects/myproject/node_modules/bar/temp/fooBar/index.d.ts] Inode:: 117 +======= +//// [/user/username/projects/myproject/node_modules/bar/temp/fooBar/index.d.ts] Inode:: 119 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export function temp(): string; diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js index c762692af8bef..568e262f8f210 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js @@ -43,11 +43,19 @@ sysLog:: /home/src/tslibs/TS/Lib/lib.d.ts:: Changing to watchFile sysLog:: /user/username/projects/project:: Changing to watchFile +<<<<<<< HEAD //// [/user/username/projects/project/commonFile1.js] Inode:: 108 var x = 1; //// [/user/username/projects/project/commonFile2.js] Inode:: 109 +======= +//// [/user/username/projects/project/commonFile1.js] Inode:: 110 +var x = 1; + + +//// [/user/username/projects/project/commonFile2.js] Inode:: 111 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) var y = 1; diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js index 742ed8e259f5e..c07e3a0a6d1fc 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js @@ -38,11 +38,19 @@ Output:: +<<<<<<< HEAD //// [/user/username/projects/project/commonFile1.js] Inode:: 108 var x = 1; //// [/user/username/projects/project/commonFile2.js] Inode:: 109 +======= +//// [/user/username/projects/project/commonFile1.js] Inode:: 110 +var x = 1; + + +//// [/user/username/projects/project/commonFile2.js] Inode:: 111 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) var y = 1; diff --git a/tests/baselines/reference/tsserver/projectErrors/file-rename-on-wsl2.js b/tests/baselines/reference/tsserver/projectErrors/file-rename-on-wsl2.js index 56db835489810..0e3388cc29774 100644 --- a/tests/baselines/reference/tsserver/projectErrors/file-rename-on-wsl2.js +++ b/tests/baselines/reference/tsserver/projectErrors/file-rename-on-wsl2.js @@ -217,7 +217,11 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/username/workspaces/project/tsconfig.j Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles* Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/username/workspaces/project/src/b.ts 2:: WatchInfo: /home/username/workspaces/project/src/b.ts 500 undefined WatchType: Closed Script info Before request +<<<<<<< HEAD //// [/home/username/workspaces/project/src/c.ts] Inode:: 111 +======= +//// [/home/username/workspaces/project/src/c.ts] Inode:: 113 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const b = 10; //// [/home/username/workspaces/project/src/b.ts] deleted @@ -495,7 +499,11 @@ FsWatches:: /home/username/workspaces/project/src: {"inode":5} /home/username/workspaces/project/src/c.ts: *new* +<<<<<<< HEAD {"inode":111} +======= + {"inode":113} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/username/workspaces/project/tsconfig.json: {"inode":8} diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location-with-currentDirectory-at-root.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location-with-currentDirectory-at-root.js index 0c4f2df2a14f1..2311efec8c8cf 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location-with-currentDirectory-at-root.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location-with-currentDirectory-at-root.js @@ -87,12 +87,12 @@ Info seq [hh:mm:ss:mss] Files (2) Info seq [hh:mm:ss:mss] ----------------------------------------------- TI:: Creating typing installer -//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 11 +//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 12 FsWatches:: /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new* - {"inode":11} + {"inode":12} Projects:: /dev/null/inferredProject1* (Inferred) *new* @@ -119,10 +119,17 @@ TI:: [hh:mm:ss:mss] Updating types-registry npm package... TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest TI:: [hh:mm:ss:mss] Updated types-registry npm package TI:: typing installer creation complete +<<<<<<< HEAD //// [/home/src/Library/Caches/typescript/package.json] Inode:: 104 { "private": true } //// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 107 +======= +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 106 +{ "private": true } + +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 109 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "entries": {} } diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location.js index e2cfb906f89da..52cdf0a9237ec 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location.js @@ -122,7 +122,7 @@ Info seq [hh:mm:ss:mss] Files (2) Info seq [hh:mm:ss:mss] ----------------------------------------------- TI:: Creating typing installer -//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 14 +//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 15 PolledWatches:: @@ -149,7 +149,7 @@ FsWatches:: /home/src/Vscode/Projects/bin: *new* {"inode":5} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new* - {"inode":14} + {"inode":15} Projects:: /dev/null/inferredProject1* (Inferred) *new* @@ -176,10 +176,17 @@ TI:: [hh:mm:ss:mss] Updating types-registry npm package... TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest TI:: [hh:mm:ss:mss] Updated types-registry npm package TI:: typing installer creation complete +<<<<<<< HEAD //// [/home/src/Library/Caches/typescript/package.json] Inode:: 107 { "private": true } //// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 110 +======= +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 109 +{ "private": true } + +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 112 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "entries": {} } @@ -342,7 +349,7 @@ FsWatches:: /home/src/Vscode/Projects/bin: {"inode":5} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: - {"inode":14} + {"inode":15} Projects:: /dev/null/inferredProject1* (Inferred) *changed* diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing-with-currentDirectory-at-root.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing-with-currentDirectory-at-root.js index a5f9cc8d0c37f..8cabbd2ae0dd4 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing-with-currentDirectory-at-root.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing-with-currentDirectory-at-root.js @@ -23,10 +23,17 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; +<<<<<<< HEAD //// [/home/src/Library/Caches/typescript/package.json] Inode:: 108 { "private": true } //// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 110 +======= +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 110 +{ "private": true } + +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 112 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "entries": {} } @@ -140,7 +147,7 @@ Info seq [hh:mm:ss:mss] Files (3) Info seq [hh:mm:ss:mss] ----------------------------------------------- TI:: Creating typing installer -//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 18 +//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 19 PolledWatches:: @@ -153,9 +160,13 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: *new* +<<<<<<< HEAD {"inode":108} +======= + {"inode":110} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new* - {"inode":18} + {"inode":19} FsWatchesRecursive:: /home/src/Library/Caches/typescript/node_modules: *new* diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing.js index cb0c065e02db4..d7bb30c6f3247 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing.js @@ -23,10 +23,17 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; +<<<<<<< HEAD //// [/home/src/Library/Caches/typescript/package.json] Inode:: 111 { "private": true } //// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 113 +======= +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 113 +{ "private": true } + +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 115 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "entries": {} } @@ -175,7 +182,7 @@ Info seq [hh:mm:ss:mss] Files (3) Info seq [hh:mm:ss:mss] ----------------------------------------------- TI:: Creating typing installer -//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 21 +//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 22 PolledWatches:: @@ -202,7 +209,11 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: *new* +<<<<<<< HEAD {"inode":111} +======= + {"inode":113} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/Vscode: *new* {"inode":10} /home/src/Vscode/Projects: *new* @@ -210,7 +221,7 @@ FsWatches:: /home/src/Vscode/Projects/bin: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new* - {"inode":21} + {"inode":22} FsWatchesRecursive:: /home/src/Library/Caches/typescript/node_modules: *new* @@ -402,7 +413,11 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: +<<<<<<< HEAD {"inode":111} +======= + {"inode":113} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/Vscode: {"inode":10} /home/src/Vscode/Projects: @@ -410,7 +425,7 @@ FsWatches:: /home/src/Vscode/Projects/bin: {"inode":12} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: - {"inode":21} + {"inode":22} FsWatchesRecursive:: /home/src/Library/Caches/typescript/node_modules: diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-with-currentDirectory-at-root.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-with-currentDirectory-at-root.js index d5e37d65b9a5c..b7a9771a909c2 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-with-currentDirectory-at-root.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-with-currentDirectory-at-root.js @@ -27,10 +27,17 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; +<<<<<<< HEAD //// [/home/src/Library/Caches/typescript/package.json] Inode:: 110 { "private": true } //// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 112 +======= +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 112 +{ "private": true } + +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 114 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "entries": {} } @@ -147,7 +154,7 @@ Info seq [hh:mm:ss:mss] Files (4) Info seq [hh:mm:ss:mss] ----------------------------------------------- TI:: Creating typing installer -//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 20 +//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 21 PolledWatches:: @@ -162,9 +169,13 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: *new* +<<<<<<< HEAD {"inode":110} +======= + {"inode":112} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new* - {"inode":20} + {"inode":21} FsWatchesRecursive:: /home/src/Library/Caches/typescript/node_modules: *new* diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file.js index eac5007ecd783..4a7d864b7f138 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file.js @@ -27,10 +27,17 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; +<<<<<<< HEAD //// [/home/src/Library/Caches/typescript/package.json] Inode:: 113 { "private": true } //// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 115 +======= +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 115 +{ "private": true } + +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 117 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "entries": {} } @@ -182,7 +189,7 @@ Info seq [hh:mm:ss:mss] Files (4) Info seq [hh:mm:ss:mss] ----------------------------------------------- TI:: Creating typing installer -//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 23 +//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 24 PolledWatches:: @@ -211,7 +218,11 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: *new* +<<<<<<< HEAD {"inode":113} +======= + {"inode":115} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/Vscode: *new* {"inode":12} /home/src/Vscode/Projects: *new* @@ -219,7 +230,7 @@ FsWatches:: /home/src/Vscode/Projects/bin: *new* {"inode":14} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new* - {"inode":23} + {"inode":24} FsWatchesRecursive:: /home/src/Library/Caches/typescript/node_modules: *new* @@ -407,7 +418,11 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: +<<<<<<< HEAD {"inode":113} +======= + {"inode":115} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/Vscode: {"inode":12} /home/src/Vscode/Projects: @@ -415,7 +430,7 @@ FsWatches:: /home/src/Vscode/Projects/bin: {"inode":14} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: - {"inode":23} + {"inode":24} FsWatchesRecursive:: /home/src/Library/Caches/typescript/node_modules: diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file-with-currentDirectory-at-root.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file-with-currentDirectory-at-root.js index 62e13123ffb57..16de658c0bb5e 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file-with-currentDirectory-at-root.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file-with-currentDirectory-at-root.js @@ -27,10 +27,17 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; +<<<<<<< HEAD //// [/home/src/Library/Caches/typescript/package.json] Inode:: 109 { "private": true } //// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 111 +======= +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 111 +{ "private": true } + +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 113 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "entries": {} } @@ -136,7 +143,7 @@ Info seq [hh:mm:ss:mss] Files (4) Info seq [hh:mm:ss:mss] ----------------------------------------------- TI:: Creating typing installer -//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 19 +//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 20 PolledWatches:: @@ -149,9 +156,13 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: *new* +<<<<<<< HEAD {"inode":109} +======= + {"inode":111} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new* - {"inode":19} + {"inode":20} FsWatchesRecursive:: /home/src/Library/Caches/typescript/node_modules: *new* diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file.js index b72c021fd75d4..974d53405b1d7 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file.js @@ -27,10 +27,17 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; +<<<<<<< HEAD //// [/home/src/Library/Caches/typescript/package.json] Inode:: 112 { "private": true } //// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 114 +======= +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 114 +{ "private": true } + +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 116 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "entries": {} } @@ -171,7 +178,7 @@ Info seq [hh:mm:ss:mss] Files (4) Info seq [hh:mm:ss:mss] ----------------------------------------------- TI:: Creating typing installer -//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 22 +//// [/home/src/tslibs/TS/Lib/lib.es2020.full.d.ts] *Lib* Inode:: 23 PolledWatches:: @@ -198,7 +205,11 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: *new* +<<<<<<< HEAD {"inode":112} +======= + {"inode":114} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/Vscode: *new* {"inode":11} /home/src/Vscode/Projects: *new* @@ -206,7 +217,7 @@ FsWatches:: /home/src/Vscode/Projects/bin: *new* {"inode":13} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new* - {"inode":22} + {"inode":23} FsWatchesRecursive:: /home/src/Library/Caches/typescript/node_modules: *new* @@ -392,7 +403,11 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: +<<<<<<< HEAD {"inode":112} +======= + {"inode":114} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/Vscode: {"inode":11} /home/src/Vscode/Projects: @@ -400,7 +415,7 @@ FsWatches:: /home/src/Vscode/Projects/bin: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: - {"inode":22} + {"inode":23} FsWatchesRecursive:: /home/src/Library/Caches/typescript/node_modules: diff --git a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux-canUseWatchEvents.js index 1cd3213fdf675..76d377dada865 100644 --- a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux-canUseWatchEvents.js +++ b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux-canUseWatchEvents.js @@ -508,7 +508,7 @@ Info seq [hh:mm:ss:mss] response: } } After request -//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 33 +//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 34 PolledWatches:: @@ -707,20 +707,35 @@ Custom watchDirectory:: Triggered Ignored:: {"id":8,"path":"/home/src/projects/p Custom watchDirectory:: Triggered Ignored:: {"id":8,"path":"/home/src/projects/project/node_modules/package1","recursive":true,"ignoreUpdate":true}:: /home/src/projects/project/node_modules/package1/tsconfig.tsbuildinfo.readable.baseline.txt created Custom watchDirectory:: Triggered Ignored:: {"id":8,"path":"/home/src/projects/project/node_modules/package1","recursive":true,"ignoreUpdate":true}:: /home/src/projects/project/node_modules/package1/tsconfig.tsbuildinfo.readable.baseline.txt updated Before request +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 120 +======= +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 122 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 121 +======= +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 123 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export type FooType = "foo"; export type BarType = "bar"; +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 122 {"root":["./src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 123 +======= +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 124 +{"root":["./src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 125 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "./src/index.ts" @@ -1470,14 +1485,24 @@ Custom watchDirectory:: Triggered Ignored:: {"id":8,"path":"/home/src/projects/p Custom watchDirectory:: Triggered Ignored:: {"id":8,"path":"/home/src/projects/project/node_modules/package1","recursive":true,"ignoreUpdate":true}:: /home/src/projects/project/node_modules/package1/tsconfig.tsbuildinfo updated Custom watchDirectory:: Triggered Ignored:: {"id":8,"path":"/home/src/projects/project/node_modules/package1","recursive":true,"ignoreUpdate":true}:: /home/src/projects/project/node_modules/package1/tsconfig.tsbuildinfo.readable.baseline.txt updated Before request +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 122 //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 123 //// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 125 +======= +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 124 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 125 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 127 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 126 +======= +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 128 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export type FooType = "foo"; export type BarType = "bar"; diff --git a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux.js b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux.js index dc7b78dfd921c..311605508bc4f 100644 --- a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux.js +++ b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux.js @@ -325,7 +325,7 @@ Info seq [hh:mm:ss:mss] response: } } After request -//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 33 +//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 34 PolledWatches:: @@ -364,7 +364,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: *new* {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: *new* - {"inode":33} + {"inode":34} Projects:: /home/src/projects/project/packages/package2/tsconfig.json (Configured) *new* @@ -517,20 +517,35 @@ After running Immedidate callback:: count: 0 Build dependencies Before running Timeout callback:: count: 1 7: timerToUpdateChildWatches +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 120 +======= +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 122 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 121 +======= +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 123 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export type FooType = "foo"; export type BarType = "bar"; +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 122 {"root":["./src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 123 +======= +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 124 +{"root":["./src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 125 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "./src/index.ts" @@ -576,7 +591,11 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: *new* +<<<<<<< HEAD {"inode":119} +======= + {"inode":121} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -590,7 +609,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Timeout callback:: count: 1 9: /home/src/projects/project/packages/package2/tsconfig.jsonFailedLookupInvalidation *new* @@ -718,9 +737,15 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: +<<<<<<< HEAD {"inode":119} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* {"inode":121} +======= + {"inode":121} +/home/src/projects/project/packages/package1/dist/index.d.ts: *new* + {"inode":123} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -734,7 +759,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Projects:: /home/src/projects/project/packages/package2/tsconfig.json (Configured) *changed* @@ -925,13 +950,19 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} FsWatches *deleted*:: /home/src/projects/project/packages/package1/dist: +<<<<<<< HEAD {"inode":119} /home/src/projects/project/packages/package1/dist/index.d.ts: {"inode":121} +======= + {"inode":121} +/home/src/projects/project/packages/package1/dist/index.d.ts: + {"inode":123} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) Timeout callback:: count: 3 13: /home/src/projects/project/packages/package2/tsconfig.json *new* @@ -1124,7 +1155,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Timeout callback:: count: 1 20: /home/src/projects/project/packages/package2/tsconfig.jsonFailedLookupInvalidation *new* @@ -1411,14 +1442,24 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/project Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/project/packages/package1/dist/index.d.ts 0:: WatchInfo: /home/src/projects/project/packages/package1/dist/index.d.ts 500 undefined WatchType: Closed Script info Before running Timeout callback:: count: 1 25: timerToUpdateChildWatches +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 122 //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 123 //// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 125 +======= +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 124 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 125 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 127 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 126 +======= +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 128 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export type FooType = "foo"; export type BarType = "bar"; @@ -1452,7 +1493,11 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* +<<<<<<< HEAD {"inode":126} +======= + {"inode":128} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1466,7 +1511,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Timeout callback:: count: 1 25: timerToUpdateChildWatches *new* @@ -1518,9 +1563,15 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: *new* +<<<<<<< HEAD {"inode":124} /home/src/projects/project/packages/package1/dist/index.d.ts: {"inode":126} +======= + {"inode":126} +/home/src/projects/project/packages/package1/dist/index.d.ts: + {"inode":128} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1534,7 +1585,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Timeout callback:: count: 1 27: /home/src/projects/project/packages/package2/tsconfig.jsonFailedLookupInvalidation *new* @@ -1660,9 +1711,15 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: +<<<<<<< HEAD {"inode":124} /home/src/projects/project/packages/package1/dist/index.d.ts: {"inode":126} +======= + {"inode":126} +/home/src/projects/project/packages/package1/dist/index.d.ts: + {"inode":128} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1676,7 +1733,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Projects:: /home/src/projects/project/packages/package2/tsconfig.json (Configured) *changed* diff --git a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux-canUseWatchEvents.js index dc2aec616bba6..686159570866c 100644 --- a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux-canUseWatchEvents.js +++ b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux-canUseWatchEvents.js @@ -85,22 +85,37 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 33 +//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 34 +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 120 +======= +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 122 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 121 +======= +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 123 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export type FooType = "foo"; export type BarType = "bar"; +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 122 {"root":["./src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 123 +======= +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 124 +{"root":["./src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 125 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "./src/index.ts" @@ -1066,14 +1081,24 @@ Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/p Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/project/node_modules/package1","recursive":true,"ignoreUpdate":true}:: /home/src/projects/project/node_modules/package1/tsconfig.tsbuildinfo updated Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/project/node_modules/package1","recursive":true,"ignoreUpdate":true}:: /home/src/projects/project/node_modules/package1/tsconfig.tsbuildinfo.readable.baseline.txt updated Before request +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 122 //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 123 //// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 125 +======= +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 124 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 125 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 127 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 126 +======= +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 128 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export type FooType = "foo"; export type BarType = "bar"; diff --git a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js index deb512494aa9c..8d99c4af2d86c 100644 --- a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js +++ b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js @@ -85,22 +85,37 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 33 +//// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 34 +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 120 +======= +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 122 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 121 +======= +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 123 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export type FooType = "foo"; export type BarType = "bar"; +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 122 {"root":["./src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 123 +======= +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 124 +{"root":["./src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 125 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "./src/index.ts" @@ -327,9 +342,15 @@ FsWatches:: /home/src/projects/project/packages/package1: *new* {"inode":6} /home/src/projects/project/packages/package1/dist: *new* +<<<<<<< HEAD {"inode":119} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* {"inode":121} +======= + {"inode":121} +/home/src/projects/project/packages/package1/dist/index.d.ts: *new* + {"inode":123} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package1/package.json: *new* {"inode":7} /home/src/projects/project/packages/package1/src: *new* @@ -343,7 +364,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: *new* {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: *new* - {"inode":33} + {"inode":34} Projects:: /home/src/projects/project/packages/package2/tsconfig.json (Configured) *new* @@ -533,13 +554,19 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} FsWatches *deleted*:: /home/src/projects/project/packages/package1/dist: +<<<<<<< HEAD {"inode":119} /home/src/projects/project/packages/package1/dist/index.d.ts: {"inode":121} +======= + {"inode":121} +/home/src/projects/project/packages/package1/dist/index.d.ts: + {"inode":123} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) Timeout callback:: count: 3 2: /home/src/projects/project/packages/package2/tsconfig.json *new* @@ -736,7 +763,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Timeout callback:: count: 1 9: /home/src/projects/project/packages/package2/tsconfig.jsonFailedLookupInvalidation *new* @@ -1024,14 +1051,24 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/project Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/project/packages/package1/dist/index.d.ts 0:: WatchInfo: /home/src/projects/project/packages/package1/dist/index.d.ts 500 undefined WatchType: Closed Script info Before running Timeout callback:: count: 1 14: timerToUpdateChildWatches +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 122 //// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 123 //// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 125 +======= +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 124 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 125 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 127 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +<<<<<<< HEAD //// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 126 +======= +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 128 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export type FooType = "foo"; export type BarType = "bar"; @@ -1065,7 +1102,11 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* +<<<<<<< HEAD {"inode":126} +======= + {"inode":128} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1079,7 +1120,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Timeout callback:: count: 1 14: timerToUpdateChildWatches *new* @@ -1131,9 +1172,15 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: *new* +<<<<<<< HEAD {"inode":124} /home/src/projects/project/packages/package1/dist/index.d.ts: {"inode":126} +======= + {"inode":126} +/home/src/projects/project/packages/package1/dist/index.d.ts: + {"inode":128} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1147,7 +1194,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Timeout callback:: count: 1 16: /home/src/projects/project/packages/package2/tsconfig.jsonFailedLookupInvalidation *new* @@ -1273,9 +1320,15 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: +<<<<<<< HEAD {"inode":124} /home/src/projects/project/packages/package1/dist/index.d.ts: {"inode":126} +======= + {"inode":126} +/home/src/projects/project/packages/package1/dist/index.d.ts: + {"inode":128} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1289,7 +1342,7 @@ FsWatches:: /home/src/projects/project/packages/package2/tsconfig.json: {"inode":13} /home/src/tslibs/TS/Lib/lib.es2016.full.d.ts: - {"inode":33} + {"inode":34} Projects:: /home/src/projects/project/packages/package2/tsconfig.json (Configured) *changed* diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux-canUseWatchEvents.js index 53b893d025e61..22e5e91897d54 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux-canUseWatchEvents.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux-canUseWatchEvents.js @@ -602,7 +602,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 140 +======= +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 142 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -732,7 +736,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 141 +======= +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 143 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -882,18 +890,30 @@ Custom watchDirectory:: Triggered Ignored:: {"id":5,"path":"/home/src/projects/b Custom watchDirectory:: Triggered Ignored:: {"id":5,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt updated Custom watchDirectory:: Triggered Ignored:: {"id":5,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated Before request +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 145 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 146 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 147 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -913,6 +933,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 export * from './c'; @@ -921,6 +942,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 148 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 149 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 150 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -930,18 +961,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 152 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 153 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 154 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -962,15 +1005,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 155 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 156 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 157 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -1483,7 +1537,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 +======= +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 158 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -1599,7 +1657,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 +======= +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 159 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -2295,18 +2357,30 @@ Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/ Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt updated Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated Before request +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 161 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 162 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 163 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -2326,6 +2400,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 export * from './c'; @@ -2334,6 +2409,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 164 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 165 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 166 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -2343,18 +2428,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 168 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 169 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 170 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -2375,15 +2472,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 171 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 172 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 173 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux.js index 1d8bfa858d3fa..293866033d928 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux.js @@ -424,7 +424,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 140 +======= +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 142 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -554,7 +558,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 141 +======= +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 143 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -685,18 +693,30 @@ After running Immedidate callback:: count: 0 Build dependencies Before running Timeout callback:: count: 1 5: timerToUpdateChildWatches +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 145 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 146 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 147 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -716,6 +736,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 export * from './c'; @@ -724,6 +745,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 148 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 149 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 150 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -733,18 +764,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 152 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 153 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 154 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -765,15 +808,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 155 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 156 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 157 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -819,7 +873,11 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib: *new* +<<<<<<< HEAD {"inode":149} +======= + {"inode":151} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -970,11 +1028,19 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: +<<<<<<< HEAD {"inode":149} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* {"inode":151} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* {"inode":153} +======= + {"inode":151} +/home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* + {"inode":153} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* + {"inode":155} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -986,11 +1052,19 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* +<<<<<<< HEAD {"inode":142} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* {"inode":144} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* {"inode":146} +======= + {"inode":144} +/home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* + {"inode":146} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* + {"inode":148} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: @@ -1143,7 +1217,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 +======= +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 158 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -1259,7 +1337,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 +======= +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 159 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -1493,6 +1575,7 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib: +<<<<<<< HEAD {"inode":149} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: {"inode":151} @@ -1504,6 +1587,19 @@ FsWatches *deleted*:: {"inode":144} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: {"inode":146} +======= + {"inode":151} +/home/src/projects/a/1/a-impl/a/lib/a.d.ts: + {"inode":153} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: + {"inode":155} +/home/src/projects/c/3/c-impl/c/lib: + {"inode":144} +/home/src/projects/c/3/c-impl/c/lib/c.d.ts: + {"inode":146} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: + {"inode":148} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) Timeout callback:: count: 3 28: /home/src/projects/b/2/b-impl/b/tsconfig.json *new* @@ -1829,18 +1925,30 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-i Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info Before running Timeout callback:: count: 1 37: timerToUpdateChildWatches +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 161 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 162 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 163 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1860,6 +1968,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 export * from './c'; @@ -1868,6 +1977,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 164 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 165 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 166 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -1877,18 +1996,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 168 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 169 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 170 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1909,15 +2040,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 171 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 172 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 173 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -1962,9 +2104,15 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* +<<<<<<< HEAD {"inode":167} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* {"inode":169} +======= + {"inode":169} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* + {"inode":171} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1980,9 +2128,15 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* +<<<<<<< HEAD {"inode":160} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* {"inode":162} +======= + {"inode":162} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* + {"inode":164} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":45} @@ -2051,11 +2205,19 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib: *new* +<<<<<<< HEAD {"inode":165} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: {"inode":167} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: {"inode":169} +======= + {"inode":167} +/home/src/projects/a/1/a-impl/a/lib/a.d.ts: + {"inode":169} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: + {"inode":171} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -2071,9 +2233,15 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: +<<<<<<< HEAD {"inode":160} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: {"inode":162} +======= + {"inode":162} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: + {"inode":164} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":45} @@ -2205,11 +2373,19 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: +<<<<<<< HEAD {"inode":165} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: {"inode":167} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: {"inode":169} +======= + {"inode":167} +/home/src/projects/a/1/a-impl/a/lib/a.d.ts: + {"inode":169} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: + {"inode":171} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -2221,11 +2397,19 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* +<<<<<<< HEAD {"inode":158} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: {"inode":160} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: {"inode":162} +======= + {"inode":160} +/home/src/projects/c/3/c-impl/c/lib/c.d.ts: + {"inode":162} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: + {"inode":164} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs-canUseWatchEvents.js index 735aedbaf9be1..7709ca7930239 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs-canUseWatchEvents.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs-canUseWatchEvents.js @@ -602,7 +602,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 140 +======= +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 142 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -732,7 +736,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 141 +======= +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 143 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -869,18 +877,30 @@ Custom watchDirectory:: Triggered Ignored:: {"id":5,"path":"/home/src/projects/b Custom watchDirectory:: Triggered Ignored:: {"id":5,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo created Custom watchDirectory:: Triggered Ignored:: {"id":5,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt created Before request +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 145 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 146 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 147 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -900,6 +920,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 export * from './c'; @@ -908,6 +929,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 148 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 149 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 150 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -917,18 +948,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 152 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 153 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 154 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -949,15 +992,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 155 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 156 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 157 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -1470,7 +1524,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 +======= +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 158 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -1586,7 +1644,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 +======= +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 159 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -2269,18 +2331,30 @@ Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/ Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo created Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt created Before request +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 161 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 162 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 163 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -2300,6 +2374,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 export * from './c'; @@ -2308,6 +2383,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 164 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 165 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 166 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -2317,18 +2402,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 168 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 169 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 170 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -2349,15 +2446,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 171 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 172 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 173 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs.js index e100b95bb0be2..c83ca7ed62481 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs.js @@ -420,7 +420,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 140 +======= +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 142 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -550,7 +554,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 141 +======= +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 143 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -702,18 +710,30 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 10: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 145 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 146 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 147 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -733,6 +753,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 export * from './c'; @@ -741,6 +762,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 148 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 149 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 150 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -750,18 +781,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 152 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 153 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 154 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -782,15 +825,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 155 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 156 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 157 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -931,17 +985,29 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* +<<<<<<< HEAD {"inode":151} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* {"inode":153} +======= + {"inode":153} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* + {"inode":155} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* +<<<<<<< HEAD {"inode":144} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* {"inode":146} +======= + {"inode":146} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* + {"inode":148} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: @@ -1110,7 +1176,11 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/2/unrelated/anotherFile.ts :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 14: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 +======= +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 158 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -1234,7 +1304,11 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/4/unrelated/anotherFile.ts :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 16: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 +======= +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 159 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -1462,6 +1536,7 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: +<<<<<<< HEAD {"inode":151} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: {"inode":153} @@ -1469,6 +1544,15 @@ FsWatches *deleted*:: {"inode":144} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: {"inode":146} +======= + {"inode":153} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: + {"inode":155} +/home/src/projects/c/3/c-impl/c/lib/c.d.ts: + {"inode":146} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: + {"inode":148} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) FsWatchesRecursive:: /home/src/projects/a: @@ -1827,18 +1911,30 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 47: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 161 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 162 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 163 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1858,6 +1954,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 export * from './c'; @@ -1866,6 +1963,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 164 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 165 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 166 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -1875,18 +1982,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 168 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 169 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 170 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1907,15 +2026,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 171 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 172 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 173 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -1958,17 +2088,29 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* +<<<<<<< HEAD {"inode":167} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* {"inode":169} +======= + {"inode":169} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* + {"inode":171} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* +<<<<<<< HEAD {"inode":160} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* {"inode":162} +======= + {"inode":162} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* + {"inode":164} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":45} @@ -2135,17 +2277,29 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: +<<<<<<< HEAD {"inode":167} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: {"inode":169} +======= + {"inode":169} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: + {"inode":171} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: +<<<<<<< HEAD {"inode":160} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: {"inode":162} +======= + {"inode":162} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: + {"inode":164} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux-canUseWatchEvents.js index d05ebaf4a847a..242ba3404a1d1 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux-canUseWatchEvents.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux-canUseWatchEvents.js @@ -91,18 +91,30 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 141 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 142 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 143 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -122,6 +134,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 144 export * from './c'; @@ -130,6 +143,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 146 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -139,18 +162,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 148 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 149 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 150 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -171,15 +206,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 151 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 152 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 153 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -771,7 +817,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 154 +======= +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 156 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -887,7 +937,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 155 +======= +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 157 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -1003,7 +1057,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 +======= +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 158 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -1119,7 +1177,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 +======= +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 159 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -1817,18 +1879,30 @@ Custom watchDirectory:: Triggered Ignored:: {"id":20,"path":"/home/src/projects/ Custom watchDirectory:: Triggered Ignored:: {"id":20,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt updated Custom watchDirectory:: Triggered Ignored:: {"id":20,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated Before request +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 161 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 162 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 163 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1848,6 +1922,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 export * from './c'; @@ -1856,6 +1931,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 164 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 165 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 166 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -1865,18 +1950,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 168 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 169 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 170 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1897,15 +1994,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 171 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 172 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 173 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux.js index c8db0a8ccdd91..09f812c229ac9 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux.js @@ -91,18 +91,30 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 141 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 142 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 143 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -122,6 +134,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 144 export * from './c'; @@ -130,6 +143,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 146 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -139,18 +162,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 148 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 149 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 150 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -171,15 +206,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 151 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 152 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 153 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -377,11 +423,19 @@ PolledWatches:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: *new* +<<<<<<< HEAD {"inode":147} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* {"inode":149} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* {"inode":151} +======= + {"inode":149} +/home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* + {"inode":151} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* + {"inode":153} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/node_modules: *new* {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: *new* @@ -393,11 +447,19 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: *new* {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* +<<<<<<< HEAD {"inode":140} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* {"inode":142} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* {"inode":144} +======= + {"inode":142} +/home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* + {"inode":144} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* + {"inode":146} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: *new* @@ -541,7 +603,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 154 +======= +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 156 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -657,7 +723,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 155 +======= +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 157 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -773,7 +843,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 +======= +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 158 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -889,7 +963,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 +======= +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 159 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -1123,6 +1201,7 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib: +<<<<<<< HEAD {"inode":147} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: {"inode":149} @@ -1134,6 +1213,19 @@ FsWatches *deleted*:: {"inode":142} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: {"inode":144} +======= + {"inode":149} +/home/src/projects/a/1/a-impl/a/lib/a.d.ts: + {"inode":151} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: + {"inode":153} +/home/src/projects/c/3/c-impl/c/lib: + {"inode":142} +/home/src/projects/c/3/c-impl/c/lib/c.d.ts: + {"inode":144} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: + {"inode":146} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) Timeout callback:: count: 3 21: /home/src/projects/b/2/b-impl/b/tsconfig.json *new* @@ -1461,18 +1553,30 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-i Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info Before running Timeout callback:: count: 1 30: timerToUpdateChildWatches +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 161 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 162 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 163 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1492,6 +1596,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 export * from './c'; @@ -1500,6 +1605,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 164 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 165 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 166 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -1509,18 +1624,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 168 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 169 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 170 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1541,15 +1668,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 171 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 172 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 173 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -1594,9 +1732,15 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* +<<<<<<< HEAD {"inode":167} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* {"inode":169} +======= + {"inode":169} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* + {"inode":171} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1612,9 +1756,15 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* +<<<<<<< HEAD {"inode":160} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* {"inode":162} +======= + {"inode":162} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* + {"inode":164} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":45} @@ -1683,11 +1833,19 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib: *new* +<<<<<<< HEAD {"inode":165} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: {"inode":167} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: {"inode":169} +======= + {"inode":167} +/home/src/projects/a/1/a-impl/a/lib/a.d.ts: + {"inode":169} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: + {"inode":171} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1703,9 +1861,15 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: +<<<<<<< HEAD {"inode":160} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: {"inode":162} +======= + {"inode":162} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: + {"inode":164} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":45} @@ -1837,11 +2001,19 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: +<<<<<<< HEAD {"inode":165} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: {"inode":167} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: {"inode":169} +======= + {"inode":167} +/home/src/projects/a/1/a-impl/a/lib/a.d.ts: + {"inode":169} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: + {"inode":171} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1853,11 +2025,19 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* +<<<<<<< HEAD {"inode":158} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: {"inode":160} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: {"inode":162} +======= + {"inode":160} +/home/src/projects/c/3/c-impl/c/lib/c.d.ts: + {"inode":162} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: + {"inode":164} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs-canUseWatchEvents.js index d87341e7c4bd9..2bc376307423b 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs-canUseWatchEvents.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs-canUseWatchEvents.js @@ -91,18 +91,30 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 141 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 142 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 143 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -122,6 +134,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 144 export * from './c'; @@ -130,6 +143,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 146 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -139,18 +162,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 148 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 149 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 150 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -171,15 +206,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 151 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 152 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 153 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -771,7 +817,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 154 +======= +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 156 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -887,7 +937,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 155 +======= +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 157 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -1003,7 +1057,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 +======= +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 158 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -1119,7 +1177,11 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 +======= +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 159 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -1804,18 +1866,30 @@ Custom watchDirectory:: Triggered Ignored:: {"id":20,"path":"/home/src/projects/ Custom watchDirectory:: Triggered Ignored:: {"id":20,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo created Custom watchDirectory:: Triggered Ignored:: {"id":20,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt created Before request +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 161 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 162 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 163 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1835,6 +1909,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 export * from './c'; @@ -1843,6 +1918,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 164 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 165 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 166 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -1852,18 +1937,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 168 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 169 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 170 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1884,15 +1981,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 171 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 172 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 173 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs.js index a65c6507369fa..deb08133274de 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs.js @@ -91,18 +91,30 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 141 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 142 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 143 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -122,6 +134,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 144 export * from './c'; @@ -130,6 +143,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 146 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -139,18 +162,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 148 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 149 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 150 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -171,15 +206,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 151 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 152 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 153 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -377,17 +423,29 @@ PolledWatches:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* +<<<<<<< HEAD {"inode":149} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* {"inode":151} +======= + {"inode":151} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* + {"inode":153} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/package.json: *new* {"inode":24} /home/src/projects/b/2/b-impl/b/tsconfig.json: *new* {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* +<<<<<<< HEAD {"inode":142} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* {"inode":144} +======= + {"inode":144} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* + {"inode":146} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: *new* @@ -547,7 +605,11 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/2/unrelated/somethingUnrelated.ts :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 2: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 154 +======= +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 156 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -671,7 +733,11 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/4/unrelated/somethingUnrelated.ts :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 4: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 155 +======= +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 157 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -795,7 +861,11 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/2/unrelated/anotherFile.ts :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 6: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation +<<<<<<< HEAD //// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 +======= +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 158 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -919,7 +989,11 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/4/unrelated/anotherFile.ts :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 8: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation +<<<<<<< HEAD //// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 +======= +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 159 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export const a = 10; @@ -1147,6 +1221,7 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: +<<<<<<< HEAD {"inode":149} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: {"inode":151} @@ -1154,6 +1229,15 @@ FsWatches *deleted*:: {"inode":142} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: {"inode":144} +======= + {"inode":151} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: + {"inode":153} +/home/src/projects/c/3/c-impl/c/lib/c.d.ts: + {"inode":144} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: + {"inode":146} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) FsWatchesRecursive:: /home/src/projects/a: @@ -1514,18 +1598,30 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 39: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 161 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 export declare const c: string; //// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 162 +export declare const c: string; + + +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 163 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1545,6 +1641,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); +<<<<<<< HEAD //// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 export * from './c'; @@ -1553,6 +1650,16 @@ export * from './c'; {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 +======= +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 164 +export * from './c'; + + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 165 +{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 166 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/c.ts", @@ -1562,18 +1669,30 @@ export * from './c'; "size": 68 } +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 168 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 export declare const a: string; //// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 169 +export declare const a: string; + + +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 170 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1594,15 +1713,26 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 171 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export * from './a'; export * from 'c'; +<<<<<<< HEAD //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} //// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 +======= +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 172 +{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} + +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 173 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) { "root": [ "../src/a.ts", @@ -1645,17 +1775,29 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* +<<<<<<< HEAD {"inode":167} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* {"inode":169} +======= + {"inode":169} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* + {"inode":171} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* +<<<<<<< HEAD {"inode":160} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* {"inode":162} +======= + {"inode":162} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* + {"inode":164} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":45} @@ -1822,17 +1964,29 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: +<<<<<<< HEAD {"inode":167} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: {"inode":169} +======= + {"inode":169} +/home/src/projects/a/1/a-impl/a/lib/index.d.ts: + {"inode":171} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: +<<<<<<< HEAD {"inode":160} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: {"inode":162} +======= + {"inode":162} +/home/src/projects/c/3/c-impl/c/lib/index.d.ts: + {"inode":164} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js b/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js index b06255e2053a7..4da0135ad234e 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js @@ -217,26 +217,46 @@ ScriptInfos:: /a/username/workspace/project/tsconfig.json After writing ignored file or folder +<<<<<<< HEAD //// [/a/username/workspace/project/node_modules/.cache/someFile.d.ts] Inode:: 115 +======= +//// [/a/username/workspace/project/node_modules/.cache/someFile.d.ts] Inode:: 117 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) After writing ignored file or folder +<<<<<<< HEAD //// [/a/username/workspace/project/node_modules/.cacheFile.ts] Inode:: 116 +======= +//// [/a/username/workspace/project/node_modules/.cacheFile.ts] Inode:: 118 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) After writing ignored file or folder +<<<<<<< HEAD //// [/a/username/workspace/project/.git/someFile.d.ts] Inode:: 118 +======= +//// [/a/username/workspace/project/.git/someFile.d.ts] Inode:: 120 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) After writing ignored file or folder +<<<<<<< HEAD //// [/a/username/workspace/project/.gitCache.d.ts] Inode:: 119 +======= +//// [/a/username/workspace/project/.gitCache.d.ts] Inode:: 121 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) After writing ignored file or folder +<<<<<<< HEAD //// [/a/username/workspace/project/src/.#field.ts] Inode:: 120 +======= +//// [/a/username/workspace/project/src/.#field.ts] Inode:: 122 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) diff --git a/tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js b/tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js index 90971e4fa5dfc..40892e16d8567 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js @@ -243,7 +243,11 @@ After request Before running Timeout callback:: count: 1 1: pollPollingIntervalQueue +<<<<<<< HEAD //// [/a/username/workspace/project/src/file2.ts] Inode:: 112 +======= +//// [/a/username/workspace/project/src/file2.ts] Inode:: 114 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) @@ -357,7 +361,11 @@ FsWatches:: /a/username/workspace/project/src/file1.ts: {"inode":7} /a/username/workspace/project/src/file2.ts: *new* +<<<<<<< HEAD {"inode":112} +======= + {"inode":114} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /a/username/workspace/project/tsconfig.json: {"inode":8} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js b/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js index ede1f356109f6..5af10c896154a 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js @@ -259,7 +259,11 @@ Before running Timeout callback:: count: 3 1: /a/username/workspace/project/tsconfig.json 2: *ensureProjectForOpenFiles* 3: /a/username/workspace/project/tsconfig.jsonFailedLookupInvalidation +<<<<<<< HEAD //// [/a/username/workspace/project/src/file2.ts] Inode:: 112 +======= +//// [/a/username/workspace/project/src/file2.ts] Inode:: 114 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) @@ -343,7 +347,11 @@ FsWatches:: /a/username/workspace/project/src/file1.ts: {"inode":7} /a/username/workspace/project/src/file2.ts: *new* +<<<<<<< HEAD {"inode":112} +======= + {"inode":114} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /a/username/workspace/project/tsconfig.json: {"inode":8} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js b/tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js index b90188ad9bd88..a35119e61098e 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js @@ -262,7 +262,11 @@ Before running Timeout callback:: count: 3 3: /a/username/workspace/project/tsconfig.json 4: *ensureProjectForOpenFiles* 5: /a/username/workspace/project/tsconfig.jsonFailedLookupInvalidation +<<<<<<< HEAD //// [/a/username/workspace/project/src/file2.ts] Inode:: 112 +======= +//// [/a/username/workspace/project/src/file2.ts] Inode:: 114 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) @@ -333,7 +337,11 @@ FsWatches:: /a/username/workspace/project/src/file1.ts: {"inode":7} /a/username/workspace/project/src/file2.ts: *new* +<<<<<<< HEAD {"inode":112} +======= + {"inode":114} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /a/username/workspace/project/tsconfig.json: {"inode":8} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/watchEnvironment/watching-npm-install-in-codespaces-where-workspaces-folder-is-hosted-at-root.js b/tests/baselines/reference/tsserver/watchEnvironment/watching-npm-install-in-codespaces-where-workspaces-folder-is-hosted-at-root.js index 3c9742decf01a..937d44e1faeb6 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/watching-npm-install-in-codespaces-where-workspaces-folder-is-hosted-at-root.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/watching-npm-install-in-codespaces-where-workspaces-folder-is-hosted-at-root.js @@ -654,7 +654,11 @@ Projects:: dirty: true *changed* Before request +<<<<<<< HEAD //// [/workspaces/somerepo/node_modules/@types/random-seed/index.d.ts] Inode:: 116 +======= +//// [/workspaces/somerepo/node_modules/@types/random-seed/index.d.ts] Inode:: 118 +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) export function randomSeed(): string; @@ -674,9 +678,15 @@ FsWatches:: /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":18} /workspaces/somerepo/node_modules: *new* +<<<<<<< HEAD {"inode":113} /workspaces/somerepo/node_modules/@types: *new* {"inode":114} +======= + {"inode":115} +/workspaces/somerepo/node_modules/@types: *new* + {"inode":116} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /workspaces/somerepo/src: {"inode":3} /workspaces/somerepo/src/tsconfig.json: @@ -770,9 +780,15 @@ FsWatches:: /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":18} /workspaces/somerepo/node_modules: +<<<<<<< HEAD {"inode":113} /workspaces/somerepo/node_modules/@types: {"inode":114} +======= + {"inode":115} +/workspaces/somerepo/node_modules/@types: + {"inode":116} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /workspaces/somerepo/src: {"inode":3} /workspaces/somerepo/src/tsconfig.json: @@ -902,11 +918,19 @@ FsWatches:: /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":18} /workspaces/somerepo/node_modules: +<<<<<<< HEAD {"inode":113} /workspaces/somerepo/node_modules/@types: {"inode":114} /workspaces/somerepo/node_modules/@types/random-seed: *new* {"inode":115} +======= + {"inode":115} +/workspaces/somerepo/node_modules/@types: + {"inode":116} +/workspaces/somerepo/node_modules/@types/random-seed: *new* + {"inode":117} +>>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) /workspaces/somerepo/src: {"inode":3} /workspaces/somerepo/src/tsconfig.json: From 4c17bbb9f97c1178609ae2619ca5944754f34428 Mon Sep 17 00:00:00 2001 From: TypeScript Bot Date: Wed, 4 Dec 2024 20:16:42 +0000 Subject: [PATCH 2/2] Update baselines --- ...-style-sibling-packages-symlinked-Linux.js | 164 ++-------- ...packages-symlinked-package1-built-Linux.js | 137 ++------ .../packages-outside-project-folder-Linux.js | 282 +++-------------- .../packages-outside-project-folder-MacOs.js | 246 +++------------ ...ages-outside-project-folder-built-Linux.js | 270 +++------------- ...ages-outside-project-folder-built-MacOs.js | 240 +++----------- ...stamp-true-useFsEventsOnParentDirectory.js | 12 +- .../fsWatch/fsWatchWithTimestamp-true.js | 12 +- ...inode-when-rename-event-ends-with-tilde.js | 48 +-- ...e-occurs-when-file-is-still-on-the-disk.js | 48 +-- ...when-using-file-watching-thats-on-inode.js | 48 +-- ...polling-when-renaming-file-in-subfolder.js | 24 +- ...rectory-when-renaming-file-in-subfolder.js | 24 +- ...tchFile-when-renaming-file-in-subfolder.js | 24 +- ...-folders-with-synchronousWatchDirectory.js | 12 +- ...ymlinks-to-folders-in-recursive-folders.js | 12 +- ...hronous-watch-directory-renaming-a-file.js | 60 +--- ...ory-with-outDir-and-declaration-enabled.js | 48 +-- .../with-non-synchronous-watch-directory.js | 50 +-- ...-directory-watching-extendedDiagnostics.js | 12 +- ...ption-with-recursive-directory-watching.js | 12 +- .../with-fallbackPolling-option.js | 12 +- .../with-watchDirectory-option.js | 12 +- .../projectErrors/file-rename-on-wsl2.js | 12 +- ...-location-with-currentDirectory-at-root.js | 11 +- ...lution-fails-in-global-typings-location.js | 11 +- ...e-failing-with-currentDirectory-at-root.js | 17 +- ...with-import-from-the-cache-file-failing.js | 23 +- ...ache-file-with-currentDirectory-at-root.js | 17 +- ...ocation-with-import-from-the-cache-file.js | 23 +- ...ache-file-with-currentDirectory-at-root.js | 17 +- ...ith-relative-import-from-the-cache-file.js | 23 +- ...kages-symlinked-Linux-canUseWatchEvents.js | 41 +-- ...-style-sibling-packages-symlinked-Linux.js | 93 ++---- ...-package1-built-Linux-canUseWatchEvents.js | 41 +-- ...packages-symlinked-package1-built-Linux.js | 87 +---- ...-project-folder-Linux-canUseWatchEvents.js | 164 ++-------- .../packages-outside-project-folder-Linux.js | 296 ++++-------------- ...-project-folder-MacOs-canUseWatchEvents.js | 164 ++-------- .../packages-outside-project-folder-MacOs.js | 242 +++----------- ...ct-folder-built-Linux-canUseWatchEvents.js | 164 ++-------- ...ages-outside-project-folder-built-Linux.js | 290 ++++------------- ...ct-folder-built-MacOs-canUseWatchEvents.js | 164 ++-------- ...ages-outside-project-folder-built-MacOs.js | 242 +++----------- ...files-starting-with-dot-in-node_modules.js | 30 +- ...polling-when-file-is-added-to-subfolder.js | 12 +- ...rectory-when-file-is-added-to-subfolder.js | 12 +- ...tchFile-when-file-is-added-to-subfolder.js | 12 +- ...ere-workspaces-folder-is-hosted-at-root.js | 34 +- 49 files changed, 730 insertions(+), 3321 deletions(-) diff --git a/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-Linux.js b/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-Linux.js index c32ea5e5931ae..ea1e4a342b7b8 100644 --- a/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-Linux.js +++ b/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-Linux.js @@ -202,20 +202,12 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/p //// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 31 -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package2/dist/index.js] Inode:: 117 -======= -//// [/home/src/projects/project/packages/package2/dist/index.js] Inode:: 119 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package2/dist/index.js] Inode:: 118 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] Inode:: 118 -======= -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] Inode:: 120 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] Inode:: 119 export {}; @@ -250,11 +242,7 @@ FsWatches:: /home/src/projects/project/packages/package2: *new* {"inode":11} /home/src/projects/project/packages/package2/dist: *new* -<<<<<<< HEAD - {"inode":116} -======= - {"inode":118} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":117} /home/src/projects/project/packages/package2/src: *new* {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: *new* @@ -302,35 +290,20 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 120 -======= -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 122 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 121 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 121 -======= -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 123 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 122 export type FooType = "foo"; export type BarType = "bar"; -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 122 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 123 {"root":["./src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 123 -======= -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 124 -{"root":["./src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 125 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 124 { "root": [ "./src/index.ts" @@ -382,11 +355,7 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: *new* -<<<<<<< HEAD - {"inode":119} -======= - {"inode":121} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":120} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -394,11 +363,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: -<<<<<<< HEAD - {"inode":116} -======= - {"inode":118} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":117} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -471,13 +436,8 @@ packages/package2/src/index.ts -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 117 -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 118 -======= -//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 119 -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 120 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 118 +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 119 PolledWatches:: /home/src/projects/node_modules/@types: @@ -505,15 +465,9 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: -<<<<<<< HEAD - {"inode":119} -/home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":121} -======= - {"inode":121} + {"inode":120} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":123} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":122} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -521,11 +475,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: -<<<<<<< HEAD - {"inode":116} -======= - {"inode":118} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":117} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -618,11 +568,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: -<<<<<<< HEAD - {"inode":116} -======= - {"inode":118} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":117} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -634,15 +580,9 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/project/packages/package1/dist: -<<<<<<< HEAD - {"inode":119} + {"inode":120} /home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":121} -======= - {"inode":121} -/home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":123} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":122} Timeout callback:: count: 2 10: timerToUpdateProgram *new* @@ -750,13 +690,8 @@ Scheduling invalidateFailedLookup, Cancelled earlier one Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/project/node_modules/package1 :: WatchInfo: /home/src/projects/project/node_modules/package1 1 undefined Failed Lookup Locations -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 117 -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 118 -======= -//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 119 -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 120 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 118 +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 119 PolledWatches:: /home/src/projects/node_modules: *new* @@ -794,11 +729,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: -<<<<<<< HEAD - {"inode":116} -======= - {"inode":118} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":117} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -996,24 +927,14 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 122 -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 123 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 125 -======= -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 124 -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 125 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 127 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 123 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 124 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 126 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 126 -======= -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 128 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 127 export type FooType = "foo"; export type BarType = "bar"; @@ -1060,11 +981,7 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: *new* -<<<<<<< HEAD - {"inode":124} -======= - {"inode":126} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":125} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1072,11 +989,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: -<<<<<<< HEAD - {"inode":116} -======= - {"inode":118} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":117} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -1149,13 +1062,8 @@ packages/package2/src/index.ts -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 117 -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 118 -======= -//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 119 -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 120 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 118 +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 119 PolledWatches:: /home/src/projects/node_modules/@types: @@ -1183,15 +1091,9 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: -<<<<<<< HEAD - {"inode":124} -/home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":126} -======= - {"inode":126} + {"inode":125} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":128} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":127} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1199,11 +1101,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: -<<<<<<< HEAD - {"inode":116} -======= - {"inode":118} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":117} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: diff --git a/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js b/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js index 587c6ed44fbf5..7062b1a8bf54d 100644 --- a/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js +++ b/tests/baselines/reference/tscWatch/symlinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js @@ -84,35 +84,20 @@ declare const console: { log(msg: any): void; }; //// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 31 -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 117 -======= -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 119 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 118 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 118 -======= -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 120 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 119 export type FooType = "foo"; export type BarType = "bar"; -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 119 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 120 {"root":["./src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 120 -======= -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 121 -{"root":["./src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 122 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 121 { "root": [ "./src/index.ts" @@ -188,20 +173,12 @@ DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/packages/packag Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/project/packages/package2 1 undefined Wild card directory -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package2/dist/index.js] Inode:: 122 -======= -//// [/home/src/projects/project/packages/package2/dist/index.js] Inode:: 124 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package2/dist/index.js] Inode:: 123 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] Inode:: 123 -======= -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] Inode:: 125 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] Inode:: 124 export {}; @@ -228,15 +205,9 @@ FsWatches:: /home/src/projects/project/packages/package1: *new* {"inode":6} /home/src/projects/project/packages/package1/dist: *new* -<<<<<<< HEAD - {"inode":116} -/home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":118} -======= - {"inode":118} + {"inode":117} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":120} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":119} /home/src/projects/project/packages/package1/package.json: *new* {"inode":7} /home/src/projects/project/packages/package1/src: *new* @@ -244,11 +215,7 @@ FsWatches:: /home/src/projects/project/packages/package2: *new* {"inode":11} /home/src/projects/project/packages/package2/dist: *new* -<<<<<<< HEAD - {"inode":121} -======= - {"inode":123} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":122} /home/src/projects/project/packages/package2/src: *new* {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: *new* @@ -342,11 +309,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: -<<<<<<< HEAD - {"inode":121} -======= - {"inode":123} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":122} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -358,15 +321,9 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/project/packages/package1/dist: -<<<<<<< HEAD - {"inode":116} + {"inode":117} /home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":118} -======= - {"inode":118} -/home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":120} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":119} Timeout callback:: count: 2 1: timerToUpdateProgram *new* @@ -477,13 +434,8 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/project/node_ sysLog:: Elapsed:: *ms:: onTimerToUpdateChildWatches:: 0 undefined -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 122 -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 123 -======= -//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 124 -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 125 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 123 +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 124 PolledWatches:: /home/src/projects/node_modules: *new* @@ -521,11 +473,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: -<<<<<<< HEAD - {"inode":121} -======= - {"inode":123} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":122} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -723,24 +671,14 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 119 -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 120 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 125 -======= -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 121 -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 122 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 127 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 120 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 121 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 126 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 126 -======= -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 128 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 127 export type FooType = "foo"; export type BarType = "bar"; @@ -787,11 +725,7 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: *new* -<<<<<<< HEAD - {"inode":124} -======= - {"inode":126} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":125} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -799,11 +733,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: -<<<<<<< HEAD - {"inode":121} -======= - {"inode":123} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":122} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: @@ -876,13 +806,8 @@ packages/package2/src/index.ts -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 122 -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 123 -======= -//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 124 -//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 125 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package2/dist/index.js] file written with same contents Inode:: 123 +//// [/home/src/projects/project/packages/package2/dist/index.d.ts] file written with same contents Inode:: 124 PolledWatches:: /home/src/projects/node_modules/@types: @@ -910,15 +835,9 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: -<<<<<<< HEAD - {"inode":124} -/home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":126} -======= - {"inode":126} + {"inode":125} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":128} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":127} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -926,11 +845,7 @@ FsWatches:: /home/src/projects/project/packages/package2: {"inode":11} /home/src/projects/project/packages/package2/dist: -<<<<<<< HEAD - {"inode":121} -======= - {"inode":123} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":122} /home/src/projects/project/packages/package2/src: {"inode":14} /home/src/projects/project/packages/package2/src/index.ts: diff --git a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Linux.js b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Linux.js index 57101cb165b24..a42a35a3e1c84 100644 --- a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Linux.js +++ b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-Linux.js @@ -206,11 +206,7 @@ DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 unde Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 undefined Wild card directory -<<<<<<< HEAD -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 138 -======= -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 140 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 139 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -288,11 +284,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 139 -======= -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 141 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 140 export const a = 10; @@ -310,11 +302,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 140 -======= -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 142 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 141 export const a = 10; @@ -332,30 +320,18 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 142 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 144 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 143 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 144 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 145 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 146 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -375,25 +351,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 145 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 146 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 147 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 147 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 148 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 149 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 { "root": [ "../src/c.ts", @@ -403,30 +368,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 149 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 151 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 150 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 151 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 152 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 153 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -447,26 +400,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 152 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 154 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 153 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 155 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 156 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 { "root": [ "../src/a.ts", @@ -518,11 +460,7 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib: *new* -<<<<<<< HEAD - {"inode":148} -======= - {"inode":150} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":149} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -655,11 +593,7 @@ src/index.ts -<<<<<<< HEAD -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 138 -======= -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 140 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 139 PolledWatches:: /home/src/projects/a/1/a-impl/a/lib/node_modules: *new* @@ -687,19 +621,11 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: -<<<<<<< HEAD - {"inode":148} -/home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":150} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":152} -======= - {"inode":150} + {"inode":149} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":152} + {"inode":151} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":154} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":153} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -713,19 +639,11 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* -<<<<<<< HEAD - {"inode":141} + {"inode":142} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":143} + {"inode":144} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":145} -======= - {"inode":143} -/home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":145} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":147} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":146} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: @@ -780,11 +698,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 155 -======= -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 export const a = 10; @@ -802,11 +716,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 156 -======= -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -946,31 +856,17 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib: -<<<<<<< HEAD - {"inode":148} + {"inode":149} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":150} + {"inode":151} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":152} + {"inode":153} /home/src/projects/c/3/c-impl/c/lib: - {"inode":141} + {"inode":142} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":143} + {"inode":144} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":145} -======= - {"inode":150} -/home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":152} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":154} -/home/src/projects/c/3/c-impl/c/lib: - {"inode":143} -/home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":145} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":147} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":146} Timeout callback:: count: 2 18: timerToUpdateProgram *new* @@ -1088,11 +984,7 @@ src/index.ts -<<<<<<< HEAD -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 138 -======= -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 140 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 139 PolledWatches:: /home/src/projects/b/2/b-impl/b/node_modules/@types: @@ -1207,30 +1099,18 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 158 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 159 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 160 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1250,25 +1130,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 161 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 162 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 163 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 { "root": [ "../src/c.ts", @@ -1278,30 +1147,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 165 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 166 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 167 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1322,26 +1179,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 168 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 169 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 { "root": [ "../src/a.ts", @@ -1393,11 +1239,7 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib: *new* -<<<<<<< HEAD - {"inode":164} -======= - {"inode":166} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":165} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1528,11 +1370,7 @@ src/index.ts -<<<<<<< HEAD -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 138 -======= -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 140 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 139 PolledWatches:: /home/src/projects/a/1/a-impl/a/lib/node_modules: *new* @@ -1560,19 +1398,11 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: -<<<<<<< HEAD - {"inode":164} + {"inode":165} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":166} + {"inode":167} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":168} -======= - {"inode":166} -/home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":168} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":170} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":169} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1586,19 +1416,11 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* -<<<<<<< HEAD - {"inode":157} -/home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":159} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":161} -======= - {"inode":159} + {"inode":158} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":161} + {"inode":160} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":163} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":162} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-MacOs.js b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-MacOs.js index 624bbe62020e8..cd178e641f3ea 100644 --- a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-MacOs.js +++ b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-MacOs.js @@ -206,11 +206,7 @@ DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 unde Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 undefined Wild card directory -<<<<<<< HEAD -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 138 -======= -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 140 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 139 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -284,11 +280,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 139 -======= -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 141 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 140 export const a = 10; @@ -306,11 +298,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 140 -======= -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 142 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 141 export const a = 10; @@ -328,30 +316,18 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 142 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 144 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 143 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 144 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 145 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 146 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -371,25 +347,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 145 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 146 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 147 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 147 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 148 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 149 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 { "root": [ "../src/c.ts", @@ -399,30 +364,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 149 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 151 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 150 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 151 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 152 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 153 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -443,26 +396,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 152 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 154 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 153 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 155 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 156 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 { "root": [ "../src/a.ts", @@ -610,11 +552,7 @@ src/index.ts -<<<<<<< HEAD -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 138 -======= -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 140 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 139 PolledWatches:: /home/src/projects/a/1/a-impl/a/lib/node_modules: *new* @@ -642,15 +580,9 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* -<<<<<<< HEAD - {"inode":150} + {"inode":151} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":152} -======= - {"inode":152} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":154} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":153} /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/src/index.ts: @@ -658,15 +590,9 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* -<<<<<<< HEAD - {"inode":143} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":145} -======= - {"inode":145} + {"inode":144} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":147} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":146} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: @@ -733,11 +659,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 155 -======= -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 export const a = 10; @@ -766,11 +688,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 156 -======= -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -909,23 +827,13 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: -<<<<<<< HEAD - {"inode":150} + {"inode":151} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":152} + {"inode":153} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":143} + {"inode":144} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":145} -======= - {"inode":152} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":154} -/home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":145} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":147} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":146} FsWatchesRecursive:: /home/src/projects/a: @@ -1055,11 +963,7 @@ src/index.ts -<<<<<<< HEAD -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 138 -======= -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 140 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 139 PolledWatches:: /home/src/projects/b/2/b-impl/b/node_modules/@types: @@ -1155,30 +1059,18 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 158 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 159 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 160 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1198,25 +1090,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 161 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 162 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 163 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 { "root": [ "../src/c.ts", @@ -1226,30 +1107,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 165 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 166 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 167 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1270,26 +1139,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 168 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 { "root": [ "../src/a.ts", @@ -1435,11 +1293,7 @@ src/index.ts -<<<<<<< HEAD -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 138 -======= -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 140 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 139 PolledWatches:: /home/src/projects/a/1/a-impl/a/lib/node_modules: *new* @@ -1467,15 +1321,9 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* -<<<<<<< HEAD - {"inode":166} + {"inode":167} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":168} -======= - {"inode":168} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":170} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":169} /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/src/index.ts: @@ -1483,15 +1331,9 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* -<<<<<<< HEAD - {"inode":159} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":161} -======= - {"inode":161} + {"inode":160} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":163} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":162} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Linux.js b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Linux.js index 459d12f952f60..c1eb87e9d0906 100644 --- a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Linux.js +++ b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-Linux.js @@ -88,30 +88,18 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 138 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 140 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 139 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 139 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 140 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 140 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 141 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 142 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 141 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -131,25 +119,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 141 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 142 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 143 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 143 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 142 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 144 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 143 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 145 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 144 { "root": [ "../src/c.ts", @@ -159,30 +136,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 145 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 147 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 146 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 146 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 147 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 148 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 147 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 149 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 148 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -203,26 +168,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 148 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 150 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 149 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 149 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 150 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 151 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 150 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 152 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 151 { "root": [ "../src/a.ts", @@ -337,11 +291,7 @@ DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 unde Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 undefined Wild card directory -<<<<<<< HEAD -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 152 -======= -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 154 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 153 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -363,19 +313,11 @@ PolledWatches:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: *new* -<<<<<<< HEAD - {"inode":144} -/home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":146} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":148} -======= - {"inode":146} + {"inode":145} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":148} + {"inode":147} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":150} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":149} /home/src/projects/a/1/a-impl/a/node_modules: *new* {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: *new* @@ -389,19 +331,11 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: *new* {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* -<<<<<<< HEAD - {"inode":137} + {"inode":138} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":139} + {"inode":140} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":141} -======= - {"inode":139} -/home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":141} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":143} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":142} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: *new* @@ -449,11 +383,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 153 -======= -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 155 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 154 export const a = 10; @@ -471,11 +401,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 154 -======= -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 156 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 155 export const a = 10; @@ -493,11 +419,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 155 -======= -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 export const a = 10; @@ -515,11 +437,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 156 -======= -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -659,31 +577,17 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib: -<<<<<<< HEAD - {"inode":144} + {"inode":145} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":146} + {"inode":147} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":148} + {"inode":149} /home/src/projects/c/3/c-impl/c/lib: - {"inode":137} + {"inode":138} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":139} + {"inode":140} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":141} -======= - {"inode":146} -/home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":148} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":150} -/home/src/projects/c/3/c-impl/c/lib: - {"inode":139} -/home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":141} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":143} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":142} Timeout callback:: count: 2 13: timerToUpdateProgram *new* @@ -801,11 +705,7 @@ src/index.ts -<<<<<<< HEAD -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 152 -======= -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 154 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 153 PolledWatches:: /home/src/projects/b/2/b-impl/b/node_modules/@types: @@ -920,30 +820,18 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 158 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 159 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 160 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -963,25 +851,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 161 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 162 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 163 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 { "root": [ "../src/c.ts", @@ -991,30 +868,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 165 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 166 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 167 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1035,26 +900,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 168 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 169 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 { "root": [ "../src/a.ts", @@ -1106,11 +960,7 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib: *new* -<<<<<<< HEAD - {"inode":164} -======= - {"inode":166} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":165} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1241,11 +1091,7 @@ src/index.ts -<<<<<<< HEAD -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 152 -======= -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 154 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 153 PolledWatches:: /home/src/projects/a/1/a-impl/a/lib/node_modules: *new* @@ -1273,19 +1119,11 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: -<<<<<<< HEAD - {"inode":164} + {"inode":165} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":166} + {"inode":167} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":168} -======= - {"inode":166} -/home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":168} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":170} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":169} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1299,19 +1137,11 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* -<<<<<<< HEAD - {"inode":157} -/home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":159} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":161} -======= - {"inode":159} + {"inode":158} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":161} + {"inode":160} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":163} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":162} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-MacOs.js b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-MacOs.js index eb7c8f35f2173..e4e2bd9cd6ef9 100644 --- a/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-MacOs.js +++ b/tests/baselines/reference/tscWatch/symlinks/packages-outside-project-folder-built-MacOs.js @@ -88,30 +88,18 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 138 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 140 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 139 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 139 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 140 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 140 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 141 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 142 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 141 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -131,25 +119,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 141 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 142 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 142 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 143 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 143 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 143 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 144 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 145 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 144 { "root": [ "../src/c.ts", @@ -159,30 +136,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 145 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 147 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 146 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 146 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 147 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 147 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 148 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 149 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 148 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -203,26 +168,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 148 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 150 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 149 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 149 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 150 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 151 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 150 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 152 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 151 { "root": [ "../src/a.ts", @@ -337,11 +291,7 @@ DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 unde Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/src/projects/b/2/b-impl/b/src 1 undefined Wild card directory -<<<<<<< HEAD -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 152 -======= -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 154 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] Inode:: 153 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -363,15 +313,9 @@ PolledWatches:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* -<<<<<<< HEAD - {"inode":146} + {"inode":147} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":148} -======= - {"inode":148} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":150} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":149} /home/src/projects/a/1/a-impl/a/package.json: *new* {"inode":24} /home/src/projects/b/2/b-impl/b/src/index.ts: *new* @@ -379,15 +323,9 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: *new* {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* -<<<<<<< HEAD - {"inode":139} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":141} -======= - {"inode":141} + {"inode":140} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":143} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":142} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: *new* @@ -447,11 +385,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 153 -======= -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 155 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 154 export const a = 10; @@ -480,11 +414,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 154 -======= -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 156 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 155 export const a = 10; @@ -513,11 +443,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in a Input:: -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 155 -======= -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 export const a = 10; @@ -546,11 +472,7 @@ exitCode:: ExitStatus.undefined Change:: change in unrelated folder in c Input:: -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 156 -======= -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -689,23 +611,13 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: -<<<<<<< HEAD - {"inode":146} + {"inode":147} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":148} + {"inode":149} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":139} + {"inode":140} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":141} -======= - {"inode":148} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":150} -/home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":141} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":143} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":142} FsWatchesRecursive:: /home/src/projects/a: @@ -835,11 +747,7 @@ src/index.ts -<<<<<<< HEAD -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 152 -======= -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 154 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 153 PolledWatches:: /home/src/projects/b/2/b-impl/b/node_modules/@types: @@ -935,30 +843,18 @@ exitCode:: ExitStatus.undefined Change:: Build dependencies Input:: -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 158 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 159 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 160 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -978,25 +874,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 161 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 162 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 163 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 { "root": [ "../src/c.ts", @@ -1006,30 +891,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 165 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 166 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 167 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1050,26 +923,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 168 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 170 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 { "root": [ "../src/a.ts", @@ -1215,11 +1077,7 @@ src/index.ts -<<<<<<< HEAD -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 152 -======= -//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 154 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/b/2/b-impl/b/lib/index.js] file written with same contents Inode:: 153 PolledWatches:: /home/src/projects/a/1/a-impl/a/lib/node_modules: *new* @@ -1247,15 +1105,9 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* -<<<<<<< HEAD - {"inode":166} + {"inode":167} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":168} -======= - {"inode":168} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":170} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":169} /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/src/index.ts: @@ -1263,15 +1115,9 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* -<<<<<<< HEAD - {"inode":159} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":161} -======= - {"inode":161} + {"inode":160} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":163} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":162} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true-useFsEventsOnParentDirectory.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true-useFsEventsOnParentDirectory.js index b29e46325d7b1..529f77d063d79 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true-useFsEventsOnParentDirectory.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true-useFsEventsOnParentDirectory.js @@ -46,11 +46,7 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node -<<<<<<< HEAD -//// [/user/username/projects/myproject/main.js] Inode:: 107 -======= -//// [/user/username/projects/myproject/main.js] Inode:: 109 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/main.js] Inode:: 108 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; @@ -136,11 +132,7 @@ CreatingProgramWith:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/main.js] Inode:: 107 -======= -//// [/user/username/projects/myproject/main.js] Inode:: 109 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/main.js] Inode:: 108 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.y = exports.x = void 0; diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true.js index 6a0327ef13a8b..03e0b738bdc7a 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/fsWatchWithTimestamp-true.js @@ -46,11 +46,7 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node -<<<<<<< HEAD -//// [/user/username/projects/myproject/main.js] Inode:: 107 -======= -//// [/user/username/projects/myproject/main.js] Inode:: 109 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/main.js] Inode:: 108 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; @@ -138,11 +134,7 @@ CreatingProgramWith:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/main.js] Inode:: 107 -======= -//// [/user/username/projects/myproject/main.js] Inode:: 109 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/main.js] Inode:: 108 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.y = exports.x = void 0; diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js index 9cf2534a4fec7..e2f5092527000 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-event-ends-with-tilde.js @@ -58,11 +58,7 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myprojec -<<<<<<< HEAD -//// [/user/username/projects/myproject/main.js] Inode:: 108 -======= -//// [/user/username/projects/myproject/main.js] Inode:: 110 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/main.js] Inode:: 109 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var foo_1 = require("./foo"); @@ -118,11 +114,7 @@ exitCode:: ExitStatus.undefined Change:: Replace file with rename event that introduces error Input:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/foo.d.ts] Inode:: 109 -======= -//// [/user/username/projects/myproject/foo.d.ts] Inode:: 111 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/foo.d.ts] Inode:: 110 export function foo2(): string; @@ -171,11 +163,7 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/foo.d.ts: -<<<<<<< HEAD - {"inode":109} *new* -======= - {"inode":111} *new* ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":110} *new* /user/username/projects/myproject/main.ts: {"inode":5} /user/username/projects/myproject/tsconfig.json: @@ -216,11 +204,7 @@ CreatingProgramWith:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 108 -======= -//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 110 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 109 Timeout callback:: count: 0 9: timerToInvalidateFailedLookupResolutions *deleted* @@ -254,11 +238,7 @@ exitCode:: ExitStatus.undefined Change:: Replace file with rename event that fixes error Input:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/foo.d.ts] Inode:: 110 -======= -//// [/user/username/projects/myproject/foo.d.ts] Inode:: 112 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/foo.d.ts] Inode:: 111 export function foo(): string; @@ -307,11 +287,7 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/foo.d.ts: -<<<<<<< HEAD - {"inode":110} *new* -======= - {"inode":112} *new* ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":111} *new* /user/username/projects/myproject/main.ts: {"inode":5} /user/username/projects/myproject/tsconfig.json: @@ -319,11 +295,7 @@ FsWatches:: FsWatches *deleted*:: /user/username/projects/myproject/foo.d.ts: -<<<<<<< HEAD - {"inode":109} -======= - {"inode":111} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":110} Timeout callback:: count: 2 16: timerToUpdateProgram *new* @@ -346,11 +318,7 @@ CreatingProgramWith:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 108 -======= -//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 110 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 109 Timeout callback:: count: 0 18: timerToInvalidateFailedLookupResolutions *deleted* diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js index 597882b8d73f1..a7e75b38541e6 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode-when-rename-occurs-when-file-is-still-on-the-disk.js @@ -54,20 +54,12 @@ Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/node -<<<<<<< HEAD -//// [/user/username/projects/myproject/foo.js] Inode:: 108 -======= -//// [/user/username/projects/myproject/foo.js] Inode:: 110 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/foo.js] Inode:: 109 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -<<<<<<< HEAD -//// [/user/username/projects/myproject/main.js] Inode:: 109 -======= -//// [/user/username/projects/myproject/main.js] Inode:: 111 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/main.js] Inode:: 110 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var foo_1 = require("./foo"); @@ -121,11 +113,7 @@ exitCode:: ExitStatus.undefined Change:: Introduce error such that when callback happens file is already appeared Input:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/foo.ts] Inode:: 110 -======= -//// [/user/username/projects/myproject/foo.ts] Inode:: 112 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/foo.ts] Inode:: 111 export declare function foo2(): string; @@ -185,13 +173,8 @@ CreatingProgramWith:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/foo.js] file written with same contents Inode:: 108 -//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 109 -======= -//// [/user/username/projects/myproject/foo.js] file written with same contents Inode:: 110 -//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 111 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/foo.js] file written with same contents Inode:: 109 +//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 110 Program root files: [ @@ -222,11 +205,7 @@ exitCode:: ExitStatus.undefined Change:: Replace file with rename event that fixes error Input:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/foo.ts] Inode:: 111 -======= -//// [/user/username/projects/myproject/foo.ts] Inode:: 113 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/foo.ts] Inode:: 112 export declare function foo(): string; @@ -255,11 +234,7 @@ FsWatches:: /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":13} /user/username/projects/myproject/foo.ts: -<<<<<<< HEAD - {"inode":111} *new* -======= - {"inode":113} *new* ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":112} *new* /user/username/projects/myproject/main.ts: {"inode":5} /user/username/projects/myproject/tsconfig.json: @@ -288,13 +263,8 @@ CreatingProgramWith:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/foo.js] file written with same contents Inode:: 108 -//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 109 -======= -//// [/user/username/projects/myproject/foo.js] file written with same contents Inode:: 110 -//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 111 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/foo.js] file written with same contents Inode:: 109 +//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 110 Program root files: [ diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js index b1036afd4b310..7bf3603ccdffa 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/fsWatch/when-using-file-watching-thats-on-inode.js @@ -58,11 +58,7 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /user/username/projects/myprojec -<<<<<<< HEAD -//// [/user/username/projects/myproject/main.js] Inode:: 108 -======= -//// [/user/username/projects/myproject/main.js] Inode:: 110 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/main.js] Inode:: 109 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var foo_1 = require("./foo"); @@ -118,11 +114,7 @@ exitCode:: ExitStatus.undefined Change:: Replace file with rename event that introduces error Input:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/foo.d.ts] Inode:: 109 -======= -//// [/user/username/projects/myproject/foo.d.ts] Inode:: 111 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/foo.d.ts] Inode:: 110 export function foo2(): string; @@ -159,11 +151,7 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/foo.d.ts: -<<<<<<< HEAD - {"inode":109} *new* -======= - {"inode":111} *new* ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":110} *new* /user/username/projects/myproject/main.ts: {"inode":5} /user/username/projects/myproject/tsconfig.json: @@ -204,11 +192,7 @@ CreatingProgramWith:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 108 -======= -//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 110 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 109 Timeout callback:: count: 0 5: timerToInvalidateFailedLookupResolutions *deleted* @@ -242,11 +226,7 @@ exitCode:: ExitStatus.undefined Change:: Replace file with rename event that fixes error Input:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/foo.d.ts] Inode:: 110 -======= -//// [/user/username/projects/myproject/foo.d.ts] Inode:: 112 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/foo.d.ts] Inode:: 111 export function foo(): string; @@ -283,11 +263,7 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/foo.d.ts: -<<<<<<< HEAD - {"inode":110} *new* -======= - {"inode":112} *new* ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":111} *new* /user/username/projects/myproject/main.ts: {"inode":5} /user/username/projects/myproject/tsconfig.json: @@ -295,11 +271,7 @@ FsWatches:: FsWatches *deleted*:: /user/username/projects/myproject/foo.d.ts: -<<<<<<< HEAD - {"inode":109} -======= - {"inode":111} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":110} Timeout callback:: count: 2 9: timerToUpdateProgram *new* @@ -322,11 +294,7 @@ CreatingProgramWith:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 108 -======= -//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 110 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/main.js] file written with same contents Inode:: 109 Timeout callback:: count: 0 10: timerToInvalidateFailedLookupResolutions *deleted* diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-dynamic-polling-when-renaming-file-in-subfolder.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-dynamic-polling-when-renaming-file-in-subfolder.js index 341d5f2edff71..73df3b79f64c4 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-dynamic-polling-when-renaming-file-in-subfolder.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-dynamic-polling-when-renaming-file-in-subfolder.js @@ -35,11 +35,7 @@ Output:: -<<<<<<< HEAD -//// [/a/username/projects/project/src/file1.js] Inode:: 108 -======= -//// [/a/username/projects/project/src/file1.js] Inode:: 110 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/a/username/projects/project/src/file1.js] Inode:: 109 @@ -79,11 +75,7 @@ exitCode:: ExitStatus.undefined Change:: Rename file1 to file2 Input:: -<<<<<<< HEAD -//// [/a/username/projects/project/src/file2.ts] Inode:: 109 -======= -//// [/a/username/projects/project/src/file2.ts] Inode:: 111 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/a/username/projects/project/src/file2.ts] Inode:: 110 //// [/a/username/projects/project/src/file1.ts] deleted @@ -137,11 +129,7 @@ Output:: -<<<<<<< HEAD -//// [/a/username/projects/project/src/file2.js] Inode:: 110 -======= -//// [/a/username/projects/project/src/file2.js] Inode:: 112 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/a/username/projects/project/src/file2.js] Inode:: 111 @@ -151,11 +139,7 @@ PolledWatches *deleted*:: FsWatches:: /a/username/projects/project/src/file2.ts: *new* -<<<<<<< HEAD - {"inode":109} -======= - {"inode":111} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":110} /a/username/projects/project/tsconfig.json: {"inode":7} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js index 7a50e54dfefc4..a42416c7d1cb8 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-non-recursive-watchDirectory-when-renaming-file-in-subfolder.js @@ -35,11 +35,7 @@ Output:: -<<<<<<< HEAD -//// [/a/username/projects/project/src/file1.js] Inode:: 108 -======= -//// [/a/username/projects/project/src/file1.js] Inode:: 110 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/a/username/projects/project/src/file1.js] Inode:: 109 @@ -86,11 +82,7 @@ exitCode:: ExitStatus.undefined Change:: Rename file1 to file2 Input:: -<<<<<<< HEAD -//// [/a/username/projects/project/src/file2.ts] Inode:: 109 -======= -//// [/a/username/projects/project/src/file2.ts] Inode:: 111 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/a/username/projects/project/src/file2.ts] Inode:: 110 //// [/a/username/projects/project/src/file1.ts] deleted @@ -137,11 +129,7 @@ Output:: -<<<<<<< HEAD -//// [/a/username/projects/project/src/file2.js] Inode:: 110 -======= -//// [/a/username/projects/project/src/file2.js] Inode:: 112 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/a/username/projects/project/src/file2.js] Inode:: 111 @@ -161,11 +149,7 @@ FsWatches:: /a/username/projects/project/src: {"inode":5} /a/username/projects/project/src/file2.ts: *new* -<<<<<<< HEAD - {"inode":109} -======= - {"inode":111} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":110} /a/username/projects/project/tsconfig.json: {"inode":7} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-watchFile-when-renaming-file-in-subfolder.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-watchFile-when-renaming-file-in-subfolder.js index d5693f4169b3c..6f37e99c0ea28 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-watchFile-when-renaming-file-in-subfolder.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/uses-watchFile-when-renaming-file-in-subfolder.js @@ -35,11 +35,7 @@ Output:: -<<<<<<< HEAD -//// [/a/username/projects/project/src/file1.js] Inode:: 108 -======= -//// [/a/username/projects/project/src/file1.js] Inode:: 110 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/a/username/projects/project/src/file1.js] Inode:: 109 @@ -86,11 +82,7 @@ exitCode:: ExitStatus.undefined Change:: Rename file1 to file2 Input:: -<<<<<<< HEAD -//// [/a/username/projects/project/src/file2.ts] Inode:: 109 -======= -//// [/a/username/projects/project/src/file2.ts] Inode:: 111 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/a/username/projects/project/src/file2.ts] Inode:: 110 //// [/a/username/projects/project/src/file1.ts] deleted @@ -137,11 +129,7 @@ Output:: -<<<<<<< HEAD -//// [/a/username/projects/project/src/file2.js] Inode:: 110 -======= -//// [/a/username/projects/project/src/file2.js] Inode:: 112 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/a/username/projects/project/src/file2.js] Inode:: 111 @@ -161,11 +149,7 @@ PolledWatches *deleted*:: FsWatches:: /a/username/projects/project/src/file2.ts: *new* -<<<<<<< HEAD - {"inode":109} -======= - {"inode":111} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":110} /a/username/projects/project/tsconfig.json: {"inode":7} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders-with-synchronousWatchDirectory.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders-with-synchronousWatchDirectory.js index e92239092e2d3..ce9d0b341d227 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders-with-synchronousWatchDirectory.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders-with-synchronousWatchDirectory.js @@ -100,11 +100,7 @@ DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject 1 {"synchron Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject 1 {"synchronousWatchDirectory":true} Wild card directory -<<<<<<< HEAD -//// [/home/user/projects/myproject/src/file.js] Inode:: 118 -======= -//// [/home/user/projects/myproject/src/file.js] Inode:: 120 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/user/projects/myproject/src/file.js] Inode:: 119 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -319,11 +315,7 @@ FileWatcher:: Close:: WatchInfo: /home/user/projects/package.json 2000 {"synchro -<<<<<<< HEAD -//// [/home/user/projects/myproject/src/file.js] file written with same contents Inode:: 118 -======= -//// [/home/user/projects/myproject/src/file.js] file written with same contents Inode:: 120 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/user/projects/myproject/src/file.js] file written with same contents Inode:: 119 PolledWatches:: /home/user/projects/myproject/node_modules/@types: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js index 59422733a3486..afc7cc6d67471 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/when-there-are-symlinks-to-folders-in-recursive-folders.js @@ -95,11 +95,7 @@ DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject 1 undefined Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /home/user/projects/myproject 1 undefined Wild card directory -<<<<<<< HEAD -//// [/home/user/projects/myproject/src/file.js] Inode:: 118 -======= -//// [/home/user/projects/myproject/src/file.js] Inode:: 120 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/user/projects/myproject/src/file.js] Inode:: 119 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -325,11 +321,7 @@ Elapsed:: *ms DirectoryWatcher:: Triggered with /home/user/projects/myproject/no sysLog:: Elapsed:: *ms:: onTimerToUpdateChildWatches:: 0 undefined -<<<<<<< HEAD -//// [/home/user/projects/myproject/src/file.js] file written with same contents Inode:: 118 -======= -//// [/home/user/projects/myproject/src/file.js] file written with same contents Inode:: 120 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/user/projects/myproject/src/file.js] file written with same contents Inode:: 119 PolledWatches:: /home/user/projects/myproject/node_modules/@types: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js index ce464a4fb5419..26d544a743fea 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-renaming-a-file.js @@ -38,22 +38,14 @@ Output:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/dist/file2.js] Inode:: 110 -======= -//// [/user/username/projects/myproject/dist/file2.js] Inode:: 112 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/dist/file2.js] Inode:: 111 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; exports.x = 10; -<<<<<<< HEAD -//// [/user/username/projects/myproject/dist/file1.js] Inode:: 111 -======= -//// [/user/username/projects/myproject/dist/file1.js] Inode:: 113 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/dist/file1.js] Inode:: 112 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -71,11 +63,7 @@ FsWatches:: /user/username/projects/myproject: *new* {"inode":4} /user/username/projects/myproject/dist: *new* -<<<<<<< HEAD - {"inode":109} -======= - {"inode":111} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":110} /user/username/projects/myproject/src: *new* {"inode":5} /user/username/projects/myproject/src/file1.ts: *new* @@ -122,11 +110,7 @@ exitCode:: ExitStatus.undefined Change:: rename the file Input:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/src/renamed.ts] Inode:: 112 -======= -//// [/user/username/projects/myproject/src/renamed.ts] Inode:: 114 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/src/renamed.ts] Inode:: 113 export const x = 10; //// [/user/username/projects/myproject/src/file2.ts] deleted @@ -149,11 +133,7 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/dist: -<<<<<<< HEAD - {"inode":109} -======= - {"inode":111} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":110} /user/username/projects/myproject/src: {"inode":5} /user/username/projects/myproject/src/file1.ts: @@ -187,11 +167,7 @@ Output:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/dist/file1.js] file written with same contents Inode:: 111 -======= -//// [/user/username/projects/myproject/dist/file1.js] file written with same contents Inode:: 113 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/dist/file1.js] file written with same contents Inode:: 112 PolledWatches:: /user/username/projects/myproject/node_modules/@types: @@ -211,11 +187,7 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/dist: -<<<<<<< HEAD - {"inode":109} -======= - {"inode":111} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":110} /user/username/projects/myproject/src: {"inode":5} /user/username/projects/myproject/src/file1.ts: @@ -278,11 +250,7 @@ Output:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/dist/renamed.js] Inode:: 113 -======= -//// [/user/username/projects/myproject/dist/renamed.js] Inode:: 115 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/dist/renamed.js] Inode:: 114 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; @@ -306,21 +274,13 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/dist: -<<<<<<< HEAD - {"inode":109} -======= - {"inode":111} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":110} /user/username/projects/myproject/src: {"inode":5} /user/username/projects/myproject/src/file1.ts: {"inode":6} /user/username/projects/myproject/src/renamed.ts: *new* -<<<<<<< HEAD - {"inode":112} -======= - {"inode":114} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":113} /user/username/projects/myproject/tsconfig.json: {"inode":8} diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js index f483714a9bade..578cc12c41415 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory-with-outDir-and-declaration-enabled.js @@ -39,20 +39,12 @@ Output:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/dist/file1.js] Inode:: 112 -======= -//// [/user/username/projects/myproject/dist/file1.js] Inode:: 114 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/dist/file1.js] Inode:: 113 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -<<<<<<< HEAD -//// [/user/username/projects/myproject/dist/file1.d.ts] Inode:: 113 -======= -//// [/user/username/projects/myproject/dist/file1.d.ts] Inode:: 115 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/dist/file1.d.ts] Inode:: 114 export {}; @@ -77,11 +69,7 @@ FsWatches:: /user/username/projects/myproject: *new* {"inode":4} /user/username/projects/myproject/dist: *new* -<<<<<<< HEAD - {"inode":111} -======= - {"inode":113} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":112} /user/username/projects/myproject/node_modules: *new* {"inode":7} /user/username/projects/myproject/node_modules/file2: *new* @@ -132,11 +120,7 @@ exitCode:: ExitStatus.undefined Change:: Add new file, should schedule and run timeout to update directory watcher Input:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/src/file3.ts] Inode:: 114 -======= -//// [/user/username/projects/myproject/src/file3.ts] Inode:: 116 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/src/file3.ts] Inode:: 115 export const y = 10; @@ -174,22 +158,14 @@ Output:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/dist/file3.js] Inode:: 115 -======= -//// [/user/username/projects/myproject/dist/file3.js] Inode:: 117 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/dist/file3.js] Inode:: 116 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.y = void 0; exports.y = 10; -<<<<<<< HEAD -//// [/user/username/projects/myproject/dist/file3.d.ts] Inode:: 116 -======= -//// [/user/username/projects/myproject/dist/file3.d.ts] Inode:: 118 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/dist/file3.d.ts] Inode:: 117 export declare const y = 10; @@ -214,11 +190,7 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/dist: -<<<<<<< HEAD - {"inode":111} -======= - {"inode":113} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":112} /user/username/projects/myproject/node_modules: {"inode":7} /user/username/projects/myproject/node_modules/file2: @@ -230,11 +202,7 @@ FsWatches:: /user/username/projects/myproject/src/file1.ts: {"inode":6} /user/username/projects/myproject/src/file3.ts: *new* -<<<<<<< HEAD - {"inode":114} -======= - {"inode":116} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":115} /user/username/projects/myproject/tsconfig.json: {"inode":10} diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js index 45cbcb10129d2..95bcc66b5cf11 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchDirectories/with-non-synchronous-watch-directory.js @@ -34,11 +34,7 @@ Output:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/src/file1.js] Inode:: 111 -======= -//// [/user/username/projects/myproject/src/file1.js] Inode:: 113 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/src/file1.js] Inode:: 112 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); @@ -191,11 +187,7 @@ Output:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/src/file1.js] file written with same contents Inode:: 111 -======= -//// [/user/username/projects/myproject/src/file1.js] file written with same contents Inode:: 113 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/src/file1.js] file written with same contents Inode:: 112 PolledWatches:: /user/username/projects/myproject/node_modules: @@ -345,11 +337,7 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/node_modules: *new* -<<<<<<< HEAD - {"inode":112} -======= - {"inode":114} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":113} /user/username/projects/myproject/src: {"inode":5} /user/username/projects/myproject/src/file1.ts: @@ -377,11 +365,7 @@ exitCode:: ExitStatus.undefined Change:: npm install index file in file2 Input:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/node_modules/file2/index.d.ts] Inode:: 114 -======= -//// [/user/username/projects/myproject/node_modules/file2/index.d.ts] Inode:: 116 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/node_modules/file2/index.d.ts] Inode:: 115 export const x = 10; @@ -411,15 +395,9 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/node_modules: -<<<<<<< HEAD - {"inode":112} -/user/username/projects/myproject/node_modules/file2: *new* {"inode":113} -======= - {"inode":114} /user/username/projects/myproject/node_modules/file2: *new* - {"inode":115} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":114} /user/username/projects/myproject/src: {"inode":5} /user/username/projects/myproject/src/file1.ts: @@ -469,11 +447,7 @@ Output:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/src/file1.js] file written with same contents Inode:: 111 -======= -//// [/user/username/projects/myproject/src/file1.js] file written with same contents Inode:: 113 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/src/file1.js] file written with same contents Inode:: 112 PolledWatches:: /user/username/projects/myproject/node_modules/@types: @@ -499,19 +473,11 @@ FsWatches:: /user/username/projects/myproject: {"inode":4} /user/username/projects/myproject/node_modules: -<<<<<<< HEAD - {"inode":112} -/user/username/projects/myproject/node_modules/file2: {"inode":113} -/user/username/projects/myproject/node_modules/file2/index.d.ts: *new* - {"inode":114} -======= - {"inode":114} /user/username/projects/myproject/node_modules/file2: - {"inode":115} + {"inode":114} /user/username/projects/myproject/node_modules/file2/index.d.ts: *new* - {"inode":116} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":115} /user/username/projects/myproject/src: {"inode":5} /user/username/projects/myproject/src/file1.ts: diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js index 758b7488ffc55..8a49616b9b82c 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching-extendedDiagnostics.js @@ -75,11 +75,7 @@ DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 {"excl Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: /user/username/projects/myproject 1 {"excludeDirectories":["/user/username/projects/myproject/**/temp"]} Wild card directory -<<<<<<< HEAD -//// [/user/username/projects/myproject/src/main.js] Inode:: 115 -======= -//// [/user/username/projects/myproject/src/main.js] Inode:: 117 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/src/main.js] Inode:: 116 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var bar_1 = require("bar"); @@ -179,11 +175,7 @@ exitCode:: ExitStatus.undefined Change:: add new folder to temp Input:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/node_modules/bar/temp/fooBar/index.d.ts] Inode:: 117 -======= -//// [/user/username/projects/myproject/node_modules/bar/temp/fooBar/index.d.ts] Inode:: 119 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/node_modules/bar/temp/fooBar/index.d.ts] Inode:: 118 export function temp(): string; diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js index 28ae9dc391422..9aea9607c9c2a 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-excludeDirectories-option-with-recursive-directory-watching.js @@ -52,11 +52,7 @@ Output:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/src/main.js] Inode:: 115 -======= -//// [/user/username/projects/myproject/src/main.js] Inode:: 117 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/src/main.js] Inode:: 116 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); var bar_1 = require("bar"); @@ -144,11 +140,7 @@ exitCode:: ExitStatus.undefined Change:: add new folder to temp Input:: -<<<<<<< HEAD -//// [/user/username/projects/myproject/node_modules/bar/temp/fooBar/index.d.ts] Inode:: 117 -======= -//// [/user/username/projects/myproject/node_modules/bar/temp/fooBar/index.d.ts] Inode:: 119 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/myproject/node_modules/bar/temp/fooBar/index.d.ts] Inode:: 118 export function temp(): string; diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js index 568e262f8f210..40d9e621d30ff 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-fallbackPolling-option.js @@ -43,19 +43,11 @@ sysLog:: /home/src/tslibs/TS/Lib/lib.d.ts:: Changing to watchFile sysLog:: /user/username/projects/project:: Changing to watchFile -<<<<<<< HEAD -//// [/user/username/projects/project/commonFile1.js] Inode:: 108 +//// [/user/username/projects/project/commonFile1.js] Inode:: 109 var x = 1; -//// [/user/username/projects/project/commonFile2.js] Inode:: 109 -======= -//// [/user/username/projects/project/commonFile1.js] Inode:: 110 -var x = 1; - - -//// [/user/username/projects/project/commonFile2.js] Inode:: 111 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/project/commonFile2.js] Inode:: 110 var y = 1; diff --git a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js index c07e3a0a6d1fc..a76bc0caf6f85 100644 --- a/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js +++ b/tests/baselines/reference/tscWatch/watchEnvironment/watchOptions/with-watchDirectory-option.js @@ -38,19 +38,11 @@ Output:: -<<<<<<< HEAD -//// [/user/username/projects/project/commonFile1.js] Inode:: 108 +//// [/user/username/projects/project/commonFile1.js] Inode:: 109 var x = 1; -//// [/user/username/projects/project/commonFile2.js] Inode:: 109 -======= -//// [/user/username/projects/project/commonFile1.js] Inode:: 110 -var x = 1; - - -//// [/user/username/projects/project/commonFile2.js] Inode:: 111 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/user/username/projects/project/commonFile2.js] Inode:: 110 var y = 1; diff --git a/tests/baselines/reference/tsserver/projectErrors/file-rename-on-wsl2.js b/tests/baselines/reference/tsserver/projectErrors/file-rename-on-wsl2.js index 0e3388cc29774..2e5a5bbc6b625 100644 --- a/tests/baselines/reference/tsserver/projectErrors/file-rename-on-wsl2.js +++ b/tests/baselines/reference/tsserver/projectErrors/file-rename-on-wsl2.js @@ -217,11 +217,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/username/workspaces/project/tsconfig.j Info seq [hh:mm:ss:mss] Scheduled: *ensureProjectForOpenFiles* Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/username/workspaces/project/src/b.ts 2:: WatchInfo: /home/username/workspaces/project/src/b.ts 500 undefined WatchType: Closed Script info Before request -<<<<<<< HEAD -//// [/home/username/workspaces/project/src/c.ts] Inode:: 111 -======= -//// [/home/username/workspaces/project/src/c.ts] Inode:: 113 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/username/workspaces/project/src/c.ts] Inode:: 112 export const b = 10; //// [/home/username/workspaces/project/src/b.ts] deleted @@ -499,11 +495,7 @@ FsWatches:: /home/username/workspaces/project/src: {"inode":5} /home/username/workspaces/project/src/c.ts: *new* -<<<<<<< HEAD - {"inode":111} -======= - {"inode":113} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":112} /home/username/workspaces/project/tsconfig.json: {"inode":8} diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location-with-currentDirectory-at-root.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location-with-currentDirectory-at-root.js index 2311efec8c8cf..255a3a9c06359 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location-with-currentDirectory-at-root.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location-with-currentDirectory-at-root.js @@ -119,17 +119,10 @@ TI:: [hh:mm:ss:mss] Updating types-registry npm package... TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest TI:: [hh:mm:ss:mss] Updated types-registry npm package TI:: typing installer creation complete -<<<<<<< HEAD -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 104 +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 105 { "private": true } -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 107 -======= -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 106 -{ "private": true } - -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 109 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 108 { "entries": {} } diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location.js index 52cdf0a9237ec..8ef7f18090647 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-fails-in-global-typings-location.js @@ -176,17 +176,10 @@ TI:: [hh:mm:ss:mss] Updating types-registry npm package... TI:: [hh:mm:ss:mss] npm install --ignore-scripts types-registry@latest TI:: [hh:mm:ss:mss] Updated types-registry npm package TI:: typing installer creation complete -<<<<<<< HEAD -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 107 +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 108 { "private": true } -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 110 -======= -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 109 -{ "private": true } - -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 112 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 111 { "entries": {} } diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing-with-currentDirectory-at-root.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing-with-currentDirectory-at-root.js index 8cabbd2ae0dd4..38b0383db1ae4 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing-with-currentDirectory-at-root.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing-with-currentDirectory-at-root.js @@ -23,17 +23,10 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -<<<<<<< HEAD -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 108 +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 109 { "private": true } -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 110 -======= -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 110 -{ "private": true } - -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 112 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 111 { "entries": {} } @@ -160,11 +153,7 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: *new* -<<<<<<< HEAD - {"inode":108} -======= - {"inode":110} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":109} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new* {"inode":19} diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing.js index d7bb30c6f3247..2d060082c19ac 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-failing.js @@ -23,17 +23,10 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -<<<<<<< HEAD -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 111 +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 112 { "private": true } -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 113 -======= -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 113 -{ "private": true } - -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 115 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 114 { "entries": {} } @@ -209,11 +202,7 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: *new* -<<<<<<< HEAD - {"inode":111} -======= - {"inode":113} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":112} /home/src/Vscode: *new* {"inode":10} /home/src/Vscode/Projects: *new* @@ -413,11 +402,7 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: -<<<<<<< HEAD - {"inode":111} -======= - {"inode":113} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":112} /home/src/Vscode: {"inode":10} /home/src/Vscode/Projects: diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-with-currentDirectory-at-root.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-with-currentDirectory-at-root.js index b7a9771a909c2..5a8497fc4244e 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-with-currentDirectory-at-root.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file-with-currentDirectory-at-root.js @@ -27,17 +27,10 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -<<<<<<< HEAD -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 110 +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 111 { "private": true } -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 112 -======= -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 112 -{ "private": true } - -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 114 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 113 { "entries": {} } @@ -169,11 +162,7 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: *new* -<<<<<<< HEAD - {"inode":110} -======= - {"inode":112} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":111} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new* {"inode":21} diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file.js index 4a7d864b7f138..9ea8cbf5a575d 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-import-from-the-cache-file.js @@ -27,17 +27,10 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -<<<<<<< HEAD -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 113 +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 114 { "private": true } -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 115 -======= -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 115 -{ "private": true } - -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 117 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 116 { "entries": {} } @@ -218,11 +211,7 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: *new* -<<<<<<< HEAD - {"inode":113} -======= - {"inode":115} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":114} /home/src/Vscode: *new* {"inode":12} /home/src/Vscode/Projects: *new* @@ -418,11 +407,7 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: -<<<<<<< HEAD - {"inode":113} -======= - {"inode":115} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":114} /home/src/Vscode: {"inode":12} /home/src/Vscode/Projects: diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file-with-currentDirectory-at-root.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file-with-currentDirectory-at-root.js index 16de658c0bb5e..c5b71def1c0e7 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file-with-currentDirectory-at-root.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file-with-currentDirectory-at-root.js @@ -27,17 +27,10 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -<<<<<<< HEAD -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 109 +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 110 { "private": true } -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 111 -======= -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 111 -{ "private": true } - -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 113 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 112 { "entries": {} } @@ -156,11 +149,7 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: *new* -<<<<<<< HEAD - {"inode":109} -======= - {"inode":111} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":110} /home/src/tslibs/TS/Lib/lib.es2020.full.d.ts: *new* {"inode":20} diff --git a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file.js b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file.js index 974d53405b1d7..7a2f77169e31b 100644 --- a/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file.js +++ b/tests/baselines/reference/tsserver/resolutionCache/when-resolution-is-succeeds-in-global-typings-location-with-relative-import-from-the-cache-file.js @@ -27,17 +27,10 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -<<<<<<< HEAD -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 112 +//// [/home/src/Library/Caches/typescript/package.json] Inode:: 113 { "private": true } -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 114 -======= -//// [/home/src/Library/Caches/typescript/package.json] Inode:: 114 -{ "private": true } - -//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 116 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/Library/Caches/typescript/node_modules/types-registry/index.json] Inode:: 115 { "entries": {} } @@ -205,11 +198,7 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: *new* -<<<<<<< HEAD - {"inode":112} -======= - {"inode":114} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":113} /home/src/Vscode: *new* {"inode":11} /home/src/Vscode/Projects: *new* @@ -403,11 +392,7 @@ PolledWatches:: FsWatches:: /home/src/Library/Caches/typescript/package.json: -<<<<<<< HEAD - {"inode":112} -======= - {"inode":114} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":113} /home/src/Vscode: {"inode":11} /home/src/Vscode/Projects: diff --git a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux-canUseWatchEvents.js index 76d377dada865..8010df12f0062 100644 --- a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux-canUseWatchEvents.js +++ b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux-canUseWatchEvents.js @@ -707,35 +707,20 @@ Custom watchDirectory:: Triggered Ignored:: {"id":8,"path":"/home/src/projects/p Custom watchDirectory:: Triggered Ignored:: {"id":8,"path":"/home/src/projects/project/node_modules/package1","recursive":true,"ignoreUpdate":true}:: /home/src/projects/project/node_modules/package1/tsconfig.tsbuildinfo.readable.baseline.txt created Custom watchDirectory:: Triggered Ignored:: {"id":8,"path":"/home/src/projects/project/node_modules/package1","recursive":true,"ignoreUpdate":true}:: /home/src/projects/project/node_modules/package1/tsconfig.tsbuildinfo.readable.baseline.txt updated Before request -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 120 -======= -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 122 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 121 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 121 -======= -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 123 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 122 export type FooType = "foo"; export type BarType = "bar"; -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 122 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 123 {"root":["./src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 123 -======= -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 124 -{"root":["./src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 125 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 124 { "root": [ "./src/index.ts" @@ -1485,24 +1470,14 @@ Custom watchDirectory:: Triggered Ignored:: {"id":8,"path":"/home/src/projects/p Custom watchDirectory:: Triggered Ignored:: {"id":8,"path":"/home/src/projects/project/node_modules/package1","recursive":true,"ignoreUpdate":true}:: /home/src/projects/project/node_modules/package1/tsconfig.tsbuildinfo updated Custom watchDirectory:: Triggered Ignored:: {"id":8,"path":"/home/src/projects/project/node_modules/package1","recursive":true,"ignoreUpdate":true}:: /home/src/projects/project/node_modules/package1/tsconfig.tsbuildinfo.readable.baseline.txt updated Before request -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 122 -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 123 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 125 -======= -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 124 -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 125 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 127 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 123 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 124 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 126 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 126 -======= -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 128 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 127 export type FooType = "foo"; export type BarType = "bar"; diff --git a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux.js b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux.js index 311605508bc4f..187e4387e1f9f 100644 --- a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux.js +++ b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-Linux.js @@ -517,35 +517,20 @@ After running Immedidate callback:: count: 0 Build dependencies Before running Timeout callback:: count: 1 7: timerToUpdateChildWatches -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 120 -======= -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 122 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 121 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 121 -======= -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 123 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 122 export type FooType = "foo"; export type BarType = "bar"; -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 122 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 123 {"root":["./src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 123 -======= -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 124 -{"root":["./src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 125 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 124 { "root": [ "./src/index.ts" @@ -591,11 +576,7 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: *new* -<<<<<<< HEAD - {"inode":119} -======= - {"inode":121} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":120} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -737,15 +718,9 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: -<<<<<<< HEAD - {"inode":119} -/home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":121} -======= - {"inode":121} + {"inode":120} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":123} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":122} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -954,15 +929,9 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/project/packages/package1/dist: -<<<<<<< HEAD - {"inode":119} + {"inode":120} /home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":121} -======= - {"inode":121} -/home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":123} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":122} Timeout callback:: count: 3 13: /home/src/projects/project/packages/package2/tsconfig.json *new* @@ -1442,24 +1411,14 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/project Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/project/packages/package1/dist/index.d.ts 0:: WatchInfo: /home/src/projects/project/packages/package1/dist/index.d.ts 500 undefined WatchType: Closed Script info Before running Timeout callback:: count: 1 25: timerToUpdateChildWatches -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 122 -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 123 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 125 -======= -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 124 -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 125 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 127 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 123 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 124 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 126 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 126 -======= -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 128 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 127 export type FooType = "foo"; export type BarType = "bar"; @@ -1493,11 +1452,7 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* -<<<<<<< HEAD - {"inode":126} -======= - {"inode":128} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":127} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1563,15 +1518,9 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: *new* -<<<<<<< HEAD - {"inode":124} -/home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":126} -======= - {"inode":126} + {"inode":125} /home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":128} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":127} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1711,15 +1660,9 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: -<<<<<<< HEAD - {"inode":124} -/home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":126} -======= - {"inode":126} + {"inode":125} /home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":128} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":127} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: diff --git a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux-canUseWatchEvents.js index 686159570866c..4609806402805 100644 --- a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux-canUseWatchEvents.js +++ b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux-canUseWatchEvents.js @@ -87,35 +87,20 @@ declare const console: { log(msg: any): void; }; //// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 34 -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 120 -======= -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 122 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 121 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 121 -======= -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 123 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 122 export type FooType = "foo"; export type BarType = "bar"; -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 122 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 123 {"root":["./src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 123 -======= -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 124 -{"root":["./src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 125 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 124 { "root": [ "./src/index.ts" @@ -1081,24 +1066,14 @@ Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/p Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/project/node_modules/package1","recursive":true,"ignoreUpdate":true}:: /home/src/projects/project/node_modules/package1/tsconfig.tsbuildinfo updated Custom watchDirectory:: Triggered Ignored:: {"id":9,"path":"/home/src/projects/project/node_modules/package1","recursive":true,"ignoreUpdate":true}:: /home/src/projects/project/node_modules/package1/tsconfig.tsbuildinfo.readable.baseline.txt updated Before request -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 122 -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 123 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 125 -======= -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 124 -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 125 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 127 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 123 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 124 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 126 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 126 -======= -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 128 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 127 export type FooType = "foo"; export type BarType = "bar"; diff --git a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js index 8d99c4af2d86c..115b711ed40d9 100644 --- a/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js +++ b/tests/baselines/reference/tsserver/symLinks/monorepo-style-sibling-packages-symlinked-package1-built-Linux.js @@ -87,35 +87,20 @@ declare const console: { log(msg: any): void; }; //// [/home/src/tslibs/TS/Lib/lib.es2016.full.d.ts] *Lib* Inode:: 34 -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 120 -======= -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 122 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 121 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 121 -======= -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 123 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 122 export type FooType = "foo"; export type BarType = "bar"; -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 122 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 123 {"root":["./src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 123 -======= -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] Inode:: 124 -{"root":["./src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 125 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 124 { "root": [ "./src/index.ts" @@ -342,15 +327,9 @@ FsWatches:: /home/src/projects/project/packages/package1: *new* {"inode":6} /home/src/projects/project/packages/package1/dist: *new* -<<<<<<< HEAD - {"inode":119} -/home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":121} -======= - {"inode":121} + {"inode":120} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* - {"inode":123} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":122} /home/src/projects/project/packages/package1/package.json: *new* {"inode":7} /home/src/projects/project/packages/package1/src: *new* @@ -558,15 +537,9 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/project/packages/package1/dist: -<<<<<<< HEAD - {"inode":119} + {"inode":120} /home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":121} -======= - {"inode":121} -/home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":123} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":122} Timeout callback:: count: 3 2: /home/src/projects/project/packages/package2/tsconfig.json *new* @@ -1051,24 +1024,14 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/project Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/project/packages/package1/dist/index.d.ts 0:: WatchInfo: /home/src/projects/project/packages/package1/dist/index.d.ts 500 undefined WatchType: Closed Script info Before running Timeout callback:: count: 1 14: timerToUpdateChildWatches -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 122 -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 123 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 125 -======= -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 124 -//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 125 -//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 127 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo] file written with same contents Inode:: 123 +//// [/home/src/projects/project/packages/package1/tsconfig.tsbuildinfo.readable.baseline.txt] file written with same contents Inode:: 124 +//// [/home/src/projects/project/packages/package1/dist/index.js] Inode:: 126 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -<<<<<<< HEAD -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 126 -======= -//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 128 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/project/packages/package1/dist/index.d.ts] Inode:: 127 export type FooType = "foo"; export type BarType = "bar"; @@ -1102,11 +1065,7 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist/index.d.ts: *new* -<<<<<<< HEAD - {"inode":126} -======= - {"inode":128} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":127} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1172,15 +1131,9 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: *new* -<<<<<<< HEAD - {"inode":124} -/home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":126} -======= - {"inode":126} + {"inode":125} /home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":128} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":127} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: @@ -1320,15 +1273,9 @@ FsWatches:: /home/src/projects/project/packages/package1: {"inode":6} /home/src/projects/project/packages/package1/dist: -<<<<<<< HEAD - {"inode":124} -/home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":126} -======= - {"inode":126} + {"inode":125} /home/src/projects/project/packages/package1/dist/index.d.ts: - {"inode":128} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":127} /home/src/projects/project/packages/package1/package.json: {"inode":7} /home/src/projects/project/packages/package1/src: diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux-canUseWatchEvents.js index 22e5e91897d54..0c627935951ff 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux-canUseWatchEvents.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux-canUseWatchEvents.js @@ -602,11 +602,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 140 -======= -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 142 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 141 export const a = 10; @@ -736,11 +732,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 141 -======= -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 143 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 142 export const a = 10; @@ -890,30 +882,18 @@ Custom watchDirectory:: Triggered Ignored:: {"id":5,"path":"/home/src/projects/b Custom watchDirectory:: Triggered Ignored:: {"id":5,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt updated Custom watchDirectory:: Triggered Ignored:: {"id":5,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated Before request -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 145 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 144 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 145 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 146 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 147 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 146 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -933,25 +913,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 147 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 148 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 148 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 149 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 150 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 149 { "root": [ "../src/c.ts", @@ -961,30 +930,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 152 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 151 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 153 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 152 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 154 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 153 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1005,26 +962,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 155 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 154 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 156 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 155 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 157 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 156 { "root": [ "../src/a.ts", @@ -1537,11 +1483,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 -======= -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 158 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -1657,11 +1599,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 -======= -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 159 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 export const a = 10; @@ -2357,30 +2295,18 @@ Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/ Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt updated Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated Before request -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 161 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 162 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 163 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -2400,25 +2326,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 164 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 165 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 166 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 { "root": [ "../src/c.ts", @@ -2428,30 +2343,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 168 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 170 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -2472,26 +2375,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 171 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 172 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 173 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 { "root": [ "../src/a.ts", diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux.js index 293866033d928..a19f0fd0cd93d 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-Linux.js @@ -424,11 +424,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 140 -======= -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 142 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 141 export const a = 10; @@ -558,11 +554,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 141 -======= -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 143 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 142 export const a = 10; @@ -693,30 +685,18 @@ After running Immedidate callback:: count: 0 Build dependencies Before running Timeout callback:: count: 1 5: timerToUpdateChildWatches -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 145 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 144 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 145 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 146 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 147 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 146 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -736,25 +716,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 147 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 148 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 148 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 149 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 150 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 149 { "root": [ "../src/c.ts", @@ -764,30 +733,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 152 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 151 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 153 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 152 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 154 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 153 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -808,26 +765,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 155 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 154 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 155 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 156 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 157 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 156 { "root": [ "../src/a.ts", @@ -873,11 +819,7 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib: *new* -<<<<<<< HEAD - {"inode":149} -======= - {"inode":151} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":150} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1028,19 +970,11 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: -<<<<<<< HEAD - {"inode":149} -/home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":151} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":153} -======= - {"inode":151} + {"inode":150} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":153} + {"inode":152} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":155} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":154} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1052,19 +986,11 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* -<<<<<<< HEAD - {"inode":142} -/home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":144} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":146} -======= - {"inode":144} + {"inode":143} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":146} + {"inode":145} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":148} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":147} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: @@ -1217,11 +1143,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 -======= -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 158 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -1337,11 +1259,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 -======= -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 159 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 export const a = 10; @@ -1575,31 +1493,17 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib: -<<<<<<< HEAD - {"inode":149} -/home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":151} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":153} -/home/src/projects/c/3/c-impl/c/lib: - {"inode":142} -/home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":144} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":146} -======= - {"inode":151} + {"inode":150} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":153} + {"inode":152} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":155} + {"inode":154} /home/src/projects/c/3/c-impl/c/lib: - {"inode":144} + {"inode":143} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":146} + {"inode":145} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":148} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":147} Timeout callback:: count: 3 28: /home/src/projects/b/2/b-impl/b/tsconfig.json *new* @@ -1925,30 +1829,18 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-i Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info Before running Timeout callback:: count: 1 37: timerToUpdateChildWatches -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 161 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 162 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 163 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1968,25 +1860,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 164 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 165 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 166 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 { "root": [ "../src/c.ts", @@ -1996,30 +1877,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 168 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 170 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -2040,26 +1909,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 171 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 172 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 173 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 { "root": [ "../src/a.ts", @@ -2104,15 +1962,9 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* -<<<<<<< HEAD - {"inode":167} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":169} -======= - {"inode":169} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":171} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":170} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -2128,15 +1980,9 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* -<<<<<<< HEAD - {"inode":160} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":162} -======= - {"inode":162} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":164} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":163} /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":45} @@ -2205,19 +2051,11 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib: *new* -<<<<<<< HEAD - {"inode":165} -/home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":167} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":169} -======= - {"inode":167} + {"inode":166} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":169} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":171} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":170} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -2233,15 +2071,9 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: -<<<<<<< HEAD - {"inode":160} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":162} -======= - {"inode":162} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":164} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":163} /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":45} @@ -2373,19 +2205,11 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: -<<<<<<< HEAD - {"inode":165} -/home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":167} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":169} -======= - {"inode":167} + {"inode":166} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":169} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":171} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":170} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -2397,19 +2221,11 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* -<<<<<<< HEAD - {"inode":158} -/home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":160} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":162} -======= - {"inode":160} + {"inode":159} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":162} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":164} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":163} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs-canUseWatchEvents.js index 7709ca7930239..6daf2abc71149 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs-canUseWatchEvents.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs-canUseWatchEvents.js @@ -602,11 +602,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 140 -======= -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 142 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 141 export const a = 10; @@ -736,11 +732,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 141 -======= -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 143 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 142 export const a = 10; @@ -877,30 +869,18 @@ Custom watchDirectory:: Triggered Ignored:: {"id":5,"path":"/home/src/projects/b Custom watchDirectory:: Triggered Ignored:: {"id":5,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo created Custom watchDirectory:: Triggered Ignored:: {"id":5,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt created Before request -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 145 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 144 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 145 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 146 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 147 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 146 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -920,25 +900,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 147 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 148 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 148 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 149 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 150 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 149 { "root": [ "../src/c.ts", @@ -948,30 +917,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 152 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 151 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 153 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 152 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 154 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 153 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -992,26 +949,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 155 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 154 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 156 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 155 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 157 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 156 { "root": [ "../src/a.ts", @@ -1524,11 +1470,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 -======= -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 158 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -1644,11 +1586,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 -======= -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 159 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 export const a = 10; @@ -2331,30 +2269,18 @@ Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/ Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo created Custom watchDirectory:: Triggered Ignored:: {"id":25,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt created Before request -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 161 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 162 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 163 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -2374,25 +2300,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 164 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 165 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 166 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 { "root": [ "../src/c.ts", @@ -2402,30 +2317,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 168 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 170 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -2446,26 +2349,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 171 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 172 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 173 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 { "root": [ "../src/a.ts", diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs.js index c83ca7ed62481..8838800aa1c80 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-MacOs.js @@ -420,11 +420,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 140 -======= -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 142 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 141 export const a = 10; @@ -554,11 +550,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 141 -======= -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 143 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 142 export const a = 10; @@ -710,30 +702,18 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 10: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 145 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 144 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 145 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 146 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 147 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 146 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -753,25 +733,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 147 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 148 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 148 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 149 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 150 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 149 { "root": [ "../src/c.ts", @@ -781,30 +750,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 152 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 151 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 153 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 152 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 154 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 153 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -825,26 +782,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 155 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 154 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 155 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 156 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 157 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 156 { "root": [ "../src/a.ts", @@ -985,29 +931,17 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* -<<<<<<< HEAD - {"inode":151} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":153} -======= - {"inode":153} + {"inode":152} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":155} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":154} /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* -<<<<<<< HEAD - {"inode":144} + {"inode":145} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":146} -======= - {"inode":146} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":148} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":147} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: @@ -1176,11 +1110,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/2/unrelated/anotherFile.ts :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 14: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 -======= -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 158 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -1304,11 +1234,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/4/unrelated/anotherFile.ts :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 16: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 -======= -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 159 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 export const a = 10; @@ -1536,23 +1462,13 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: -<<<<<<< HEAD - {"inode":151} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":153} -/home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":144} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":146} -======= - {"inode":153} + {"inode":152} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":155} + {"inode":154} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":146} + {"inode":145} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":148} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":147} FsWatchesRecursive:: /home/src/projects/a: @@ -1911,30 +1827,18 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 47: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 161 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 162 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 163 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1954,25 +1858,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 164 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 165 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 166 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 { "root": [ "../src/c.ts", @@ -1982,30 +1875,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 168 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 169 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 170 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -2026,26 +1907,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 171 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 172 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 173 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 { "root": [ "../src/a.ts", @@ -2088,29 +1958,17 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* -<<<<<<< HEAD - {"inode":167} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":169} -======= - {"inode":169} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":171} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":170} /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* -<<<<<<< HEAD - {"inode":160} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":162} -======= - {"inode":162} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":164} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":163} /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":45} @@ -2277,29 +2135,17 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: -<<<<<<< HEAD - {"inode":167} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":169} -======= - {"inode":169} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":171} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":170} /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: -<<<<<<< HEAD - {"inode":160} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":162} -======= - {"inode":162} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":164} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":163} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux-canUseWatchEvents.js index 242ba3404a1d1..ce8a90c7da91d 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux-canUseWatchEvents.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux-canUseWatchEvents.js @@ -91,30 +91,18 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 141 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 142 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 142 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 143 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 143 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 144 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -134,25 +122,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 144 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 145 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 145 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 146 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 146 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 147 { "root": [ "../src/c.ts", @@ -162,30 +139,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 148 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 149 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 149 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 150 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 150 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 151 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -206,26 +171,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 151 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 152 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 152 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 153 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 153 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154 { "root": [ "../src/a.ts", @@ -817,11 +771,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 154 -======= -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 156 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 155 export const a = 10; @@ -937,11 +887,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 155 -======= -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 157 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 156 export const a = 10; @@ -1057,11 +1003,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 -======= -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 158 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -1177,11 +1119,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 -======= -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 159 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 export const a = 10; @@ -1879,30 +1817,18 @@ Custom watchDirectory:: Triggered Ignored:: {"id":20,"path":"/home/src/projects/ Custom watchDirectory:: Triggered Ignored:: {"id":20,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt updated Custom watchDirectory:: Triggered Ignored:: {"id":20,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib updated Before request -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 161 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 162 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 163 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1922,25 +1848,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 164 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 165 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 166 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 { "root": [ "../src/c.ts", @@ -1950,30 +1865,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 168 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 170 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1994,26 +1897,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 171 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 172 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 173 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 { "root": [ "../src/a.ts", diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux.js index 09f812c229ac9..e47b094ef5f3a 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-Linux.js @@ -91,30 +91,18 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 141 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 142 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 142 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 143 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 143 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 144 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -134,25 +122,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 144 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 145 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 145 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 146 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 146 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 147 { "root": [ "../src/c.ts", @@ -162,30 +139,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 148 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 149 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 149 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 150 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 150 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 151 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -206,26 +171,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 151 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 152 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 152 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 153 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 153 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154 { "root": [ "../src/a.ts", @@ -423,19 +377,11 @@ PolledWatches:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: *new* -<<<<<<< HEAD - {"inode":147} -/home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":149} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":151} -======= - {"inode":149} + {"inode":148} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* - {"inode":151} + {"inode":150} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":153} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":152} /home/src/projects/a/1/a-impl/a/node_modules: *new* {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: *new* @@ -447,19 +393,11 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: *new* {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* -<<<<<<< HEAD - {"inode":140} -/home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":142} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":144} -======= - {"inode":142} + {"inode":141} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* - {"inode":144} + {"inode":143} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":146} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":145} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: *new* @@ -603,11 +541,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 154 -======= -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 156 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 155 export const a = 10; @@ -723,11 +657,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 155 -======= -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 157 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 156 export const a = 10; @@ -843,11 +773,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 -======= -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 158 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -963,11 +889,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 -======= -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 159 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 export const a = 10; @@ -1201,31 +1123,17 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib: -<<<<<<< HEAD - {"inode":147} -/home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":149} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":151} -/home/src/projects/c/3/c-impl/c/lib: - {"inode":140} -/home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":142} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":144} -======= - {"inode":149} + {"inode":148} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":151} + {"inode":150} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":153} + {"inode":152} /home/src/projects/c/3/c-impl/c/lib: - {"inode":142} + {"inode":141} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":144} + {"inode":143} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":146} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":145} Timeout callback:: count: 3 21: /home/src/projects/b/2/b-impl/b/tsconfig.json *new* @@ -1553,30 +1461,18 @@ Info seq [hh:mm:ss:mss] FileWatcher:: Triggered with /home/src/projects/a/1/a-i Info seq [hh:mm:ss:mss] Elapsed:: *ms FileWatcher:: Triggered with /home/src/projects/a/1/a-impl/a/lib/index.d.ts 0:: WatchInfo: /home/src/projects/a/1/a-impl/a/lib/index.d.ts 500 undefined WatchType: Closed Script info Before running Timeout callback:: count: 1 30: timerToUpdateChildWatches -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 161 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 162 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 163 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1596,25 +1492,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 164 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 165 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 166 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 { "root": [ "../src/c.ts", @@ -1624,30 +1509,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 168 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 170 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1668,26 +1541,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 171 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 172 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 173 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 { "root": [ "../src/a.ts", @@ -1732,15 +1594,9 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* -<<<<<<< HEAD - {"inode":167} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":169} -======= - {"inode":169} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":171} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":170} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1756,15 +1612,9 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* -<<<<<<< HEAD - {"inode":160} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":162} -======= - {"inode":162} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":164} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":163} /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":45} @@ -1833,19 +1683,11 @@ FsWatches:: /home/src/projects/a/1/a-impl/a: {"inode":19} /home/src/projects/a/1/a-impl/a/lib: *new* -<<<<<<< HEAD - {"inode":165} -/home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":167} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":169} -======= - {"inode":167} + {"inode":166} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":169} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":171} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":170} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -1861,15 +1703,9 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: -<<<<<<< HEAD - {"inode":160} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":162} -======= - {"inode":162} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":164} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":163} /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":45} @@ -2001,19 +1837,11 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib: -<<<<<<< HEAD - {"inode":165} -/home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":167} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":169} -======= - {"inode":167} + {"inode":166} /home/src/projects/a/1/a-impl/a/lib/a.d.ts: - {"inode":169} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":171} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":170} /home/src/projects/a/1/a-impl/a/node_modules: {"inode":25} /home/src/projects/a/1/a-impl/a/package.json: @@ -2025,19 +1853,11 @@ FsWatches:: /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib: *new* -<<<<<<< HEAD - {"inode":158} -/home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":160} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":162} -======= - {"inode":160} + {"inode":159} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":162} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":164} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":163} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs-canUseWatchEvents.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs-canUseWatchEvents.js index 2bc376307423b..1fe1ab61d7ff1 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs-canUseWatchEvents.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs-canUseWatchEvents.js @@ -91,30 +91,18 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 141 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 142 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 142 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 143 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 143 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 144 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -134,25 +122,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 144 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 145 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 145 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 146 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 146 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 147 { "root": [ "../src/c.ts", @@ -162,30 +139,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 148 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 149 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 149 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 150 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 150 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 151 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -206,26 +171,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 151 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 152 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 152 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 153 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 153 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154 { "root": [ "../src/a.ts", @@ -817,11 +771,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 154 -======= -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 156 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 155 export const a = 10; @@ -937,11 +887,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 155 -======= -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 157 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 156 export const a = 10; @@ -1057,11 +1003,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in a Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 -======= -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 158 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -1177,11 +1119,7 @@ After running Immedidate callback:: count: 0 change in unrelated folder in c Before running Timeout callback:: count: 0 -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 -======= -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 159 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 export const a = 10; @@ -1866,30 +1804,18 @@ Custom watchDirectory:: Triggered Ignored:: {"id":20,"path":"/home/src/projects/ Custom watchDirectory:: Triggered Ignored:: {"id":20,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo created Custom watchDirectory:: Triggered Ignored:: {"id":20,"path":"/home/src/projects/b/2/b-impl/b/node_modules/a","recursive":true,"ignoreUpdate":true}:: /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt created Before request -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 161 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 162 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 163 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1909,25 +1835,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 164 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 165 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 166 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 { "root": [ "../src/c.ts", @@ -1937,30 +1852,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 168 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 169 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 170 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1981,26 +1884,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 171 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 172 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 173 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 { "root": [ "../src/a.ts", diff --git a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs.js b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs.js index deb08133274de..e2c84313250ba 100644 --- a/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs.js +++ b/tests/baselines/reference/tsserver/symLinks/packages-outside-project-folder-built-MacOs.js @@ -91,30 +91,18 @@ interface Array { length: number; [n: number]: T; } interface ReadonlyArray {} declare const console: { log(msg: any): void; }; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 141 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 143 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 142 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 142 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 143 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 143 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 144 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 145 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 144 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -134,25 +122,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 144 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 145 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 145 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 146 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 146 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 146 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 147 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 148 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 147 { "root": [ "../src/c.ts", @@ -162,30 +139,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 148 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 150 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 149 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 149 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 150 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 151 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 150 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 152 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 151 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -206,26 +171,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 151 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 153 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 152 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 152 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 153 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 153 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 154 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 155 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 154 { "root": [ "../src/a.ts", @@ -423,29 +377,17 @@ PolledWatches:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* -<<<<<<< HEAD - {"inode":149} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":151} -======= - {"inode":151} + {"inode":150} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":153} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":152} /home/src/projects/a/1/a-impl/a/package.json: *new* {"inode":24} /home/src/projects/b/2/b-impl/b/tsconfig.json: *new* {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* -<<<<<<< HEAD - {"inode":142} + {"inode":143} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":144} -======= - {"inode":144} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":146} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":145} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: *new* @@ -605,11 +547,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/2/unrelated/somethingUnrelated.ts :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 2: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 154 -======= -//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 156 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/somethingUnrelated.ts] Inode:: 155 export const a = 10; @@ -733,11 +671,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/4/unrelated/somethingUnrelated.ts :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 4: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 155 -======= -//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 157 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/somethingUnrelated.ts] Inode:: 156 export const a = 10; @@ -861,11 +795,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/a/2/unrelated/anotherFile.ts :: WatchInfo: /home/src/projects/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 6: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation -<<<<<<< HEAD -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 156 -======= -//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 158 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/2/unrelated/anotherFile.ts] Inode:: 157 export const a = 10; @@ -989,11 +919,7 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/c/4/unrelated/anotherFile.ts :: WatchInfo: /home/src/projects/c 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 8: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation -<<<<<<< HEAD -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 157 -======= -//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 159 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/4/unrelated/anotherFile.ts] Inode:: 158 export const a = 10; @@ -1221,23 +1147,13 @@ FsWatches:: FsWatches *deleted*:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: -<<<<<<< HEAD - {"inode":149} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":151} -/home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":142} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":144} -======= - {"inode":151} + {"inode":150} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":153} + {"inode":152} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: - {"inode":144} + {"inode":143} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":146} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":145} FsWatchesRecursive:: /home/src/projects/a: @@ -1598,30 +1514,18 @@ Info seq [hh:mm:ss:mss] Scheduled: /home/src/projects/b/2/b-impl/b/tsconfig.jso Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Triggered with /home/src/projects/b/2/b-impl/b/node_modules/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt :: WatchInfo: /home/src/projects/b/2/b-impl/b/node_modules/a 1 undefined Project: /home/src/projects/b/2/b-impl/b/tsconfig.json WatchType: Failed Lookup Locations Before running Timeout callback:: count: 1 39: /home/src/projects/b/2/b-impl/b/tsconfig.jsonFailedLookupInvalidation -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 159 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 161 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/c.js] Inode:: 160 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.c = void 0; exports.c = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 160 +//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 161 export declare const c: string; -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 161 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/c.d.ts] Inode:: 162 -export declare const c: string; - - -//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 163 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/index.js] Inode:: 162 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1641,25 +1545,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 162 +//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 163 export * from './c'; -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 163 +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 164 {"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 164 -======= -//// [/home/src/projects/c/3/c-impl/c/lib/index.d.ts] Inode:: 164 -export * from './c'; - - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo] Inode:: 165 -{"root":["../src/c.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 166 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/c/3/c-impl/c/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 165 { "root": [ "../src/c.ts", @@ -1669,30 +1562,18 @@ export * from './c'; "size": 68 } -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 166 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 168 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/a.js] Inode:: 167 "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; exports.a = 'test'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 167 +//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 168 export declare const a: string; -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 168 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/a.d.ts] Inode:: 169 -export declare const a: string; - - -//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 170 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.js] Inode:: 169 "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; @@ -1713,26 +1594,15 @@ __exportStar(require("./a"), exports); __exportStar(require("c"), exports); -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 169 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 171 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/index.d.ts] Inode:: 170 export * from './a'; export * from 'c'; -<<<<<<< HEAD -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 170 -{"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} - -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 171 -======= -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 172 +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo] Inode:: 171 {"root":["../src/a.ts","../src/index.ts"],"version":"FakeTSVersion"} -//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 173 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/home/src/projects/a/1/a-impl/a/lib/tsconfig.tsbuildinfo.readable.baseline.txt] Inode:: 172 { "root": [ "../src/a.ts", @@ -1775,29 +1645,17 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: *new* -<<<<<<< HEAD - {"inode":167} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":169} -======= - {"inode":169} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: *new* - {"inode":171} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":170} /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: *new* -<<<<<<< HEAD - {"inode":160} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":162} -======= - {"inode":162} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: *new* - {"inode":164} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":163} /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":45} @@ -1964,29 +1822,17 @@ PolledWatches *deleted*:: FsWatches:: /home/src/projects/a/1/a-impl/a/lib/a.d.ts: -<<<<<<< HEAD - {"inode":167} + {"inode":168} /home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":169} -======= - {"inode":169} -/home/src/projects/a/1/a-impl/a/lib/index.d.ts: - {"inode":171} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":170} /home/src/projects/a/1/a-impl/a/package.json: {"inode":24} /home/src/projects/b/2/b-impl/b/tsconfig.json: {"inode":36} /home/src/projects/c/3/c-impl/c/lib/c.d.ts: -<<<<<<< HEAD - {"inode":160} -/home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":162} -======= - {"inode":162} + {"inode":161} /home/src/projects/c/3/c-impl/c/lib/index.d.ts: - {"inode":164} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":163} /home/src/projects/c/3/c-impl/c/package.json: *new* {"inode":12} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js b/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js index 4da0135ad234e..2ceae269d429c 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/recursive-directory-does-not-watch-files-starting-with-dot-in-node_modules.js @@ -217,46 +217,26 @@ ScriptInfos:: /a/username/workspace/project/tsconfig.json After writing ignored file or folder -<<<<<<< HEAD -//// [/a/username/workspace/project/node_modules/.cache/someFile.d.ts] Inode:: 115 -======= -//// [/a/username/workspace/project/node_modules/.cache/someFile.d.ts] Inode:: 117 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/a/username/workspace/project/node_modules/.cache/someFile.d.ts] Inode:: 116 After writing ignored file or folder -<<<<<<< HEAD -//// [/a/username/workspace/project/node_modules/.cacheFile.ts] Inode:: 116 -======= -//// [/a/username/workspace/project/node_modules/.cacheFile.ts] Inode:: 118 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/a/username/workspace/project/node_modules/.cacheFile.ts] Inode:: 117 After writing ignored file or folder -<<<<<<< HEAD -//// [/a/username/workspace/project/.git/someFile.d.ts] Inode:: 118 -======= -//// [/a/username/workspace/project/.git/someFile.d.ts] Inode:: 120 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/a/username/workspace/project/.git/someFile.d.ts] Inode:: 119 After writing ignored file or folder -<<<<<<< HEAD -//// [/a/username/workspace/project/.gitCache.d.ts] Inode:: 119 -======= -//// [/a/username/workspace/project/.gitCache.d.ts] Inode:: 121 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/a/username/workspace/project/.gitCache.d.ts] Inode:: 120 After writing ignored file or folder -<<<<<<< HEAD -//// [/a/username/workspace/project/src/.#field.ts] Inode:: 120 -======= -//// [/a/username/workspace/project/src/.#field.ts] Inode:: 122 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/a/username/workspace/project/src/.#field.ts] Inode:: 121 diff --git a/tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js b/tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js index 40892e16d8567..7f686b274959c 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/uses-dynamic-polling-when-file-is-added-to-subfolder.js @@ -243,11 +243,7 @@ After request Before running Timeout callback:: count: 1 1: pollPollingIntervalQueue -<<<<<<< HEAD -//// [/a/username/workspace/project/src/file2.ts] Inode:: 112 -======= -//// [/a/username/workspace/project/src/file2.ts] Inode:: 114 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/a/username/workspace/project/src/file2.ts] Inode:: 113 @@ -361,11 +357,7 @@ FsWatches:: /a/username/workspace/project/src/file1.ts: {"inode":7} /a/username/workspace/project/src/file2.ts: *new* -<<<<<<< HEAD - {"inode":112} -======= - {"inode":114} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":113} /a/username/workspace/project/tsconfig.json: {"inode":8} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js b/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js index 5af10c896154a..46defc73cad3d 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/uses-non-recursive-watchDirectory-when-file-is-added-to-subfolder.js @@ -259,11 +259,7 @@ Before running Timeout callback:: count: 3 1: /a/username/workspace/project/tsconfig.json 2: *ensureProjectForOpenFiles* 3: /a/username/workspace/project/tsconfig.jsonFailedLookupInvalidation -<<<<<<< HEAD -//// [/a/username/workspace/project/src/file2.ts] Inode:: 112 -======= -//// [/a/username/workspace/project/src/file2.ts] Inode:: 114 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/a/username/workspace/project/src/file2.ts] Inode:: 113 @@ -347,11 +343,7 @@ FsWatches:: /a/username/workspace/project/src/file1.ts: {"inode":7} /a/username/workspace/project/src/file2.ts: *new* -<<<<<<< HEAD - {"inode":112} -======= - {"inode":114} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":113} /a/username/workspace/project/tsconfig.json: {"inode":8} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js b/tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js index a35119e61098e..da104ef3024c8 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/uses-watchFile-when-file-is-added-to-subfolder.js @@ -262,11 +262,7 @@ Before running Timeout callback:: count: 3 3: /a/username/workspace/project/tsconfig.json 4: *ensureProjectForOpenFiles* 5: /a/username/workspace/project/tsconfig.jsonFailedLookupInvalidation -<<<<<<< HEAD -//// [/a/username/workspace/project/src/file2.ts] Inode:: 112 -======= -//// [/a/username/workspace/project/src/file2.ts] Inode:: 114 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/a/username/workspace/project/src/file2.ts] Inode:: 113 @@ -337,11 +333,7 @@ FsWatches:: /a/username/workspace/project/src/file1.ts: {"inode":7} /a/username/workspace/project/src/file2.ts: *new* -<<<<<<< HEAD - {"inode":112} -======= - {"inode":114} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":113} /a/username/workspace/project/tsconfig.json: {"inode":8} /home/src/tslibs/TS/Lib/lib.d.ts: diff --git a/tests/baselines/reference/tsserver/watchEnvironment/watching-npm-install-in-codespaces-where-workspaces-folder-is-hosted-at-root.js b/tests/baselines/reference/tsserver/watchEnvironment/watching-npm-install-in-codespaces-where-workspaces-folder-is-hosted-at-root.js index 937d44e1faeb6..3af7065f46640 100644 --- a/tests/baselines/reference/tsserver/watchEnvironment/watching-npm-install-in-codespaces-where-workspaces-folder-is-hosted-at-root.js +++ b/tests/baselines/reference/tsserver/watchEnvironment/watching-npm-install-in-codespaces-where-workspaces-folder-is-hosted-at-root.js @@ -654,11 +654,7 @@ Projects:: dirty: true *changed* Before request -<<<<<<< HEAD -//// [/workspaces/somerepo/node_modules/@types/random-seed/index.d.ts] Inode:: 116 -======= -//// [/workspaces/somerepo/node_modules/@types/random-seed/index.d.ts] Inode:: 118 ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) +//// [/workspaces/somerepo/node_modules/@types/random-seed/index.d.ts] Inode:: 117 export function randomSeed(): string; @@ -678,15 +674,9 @@ FsWatches:: /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":18} /workspaces/somerepo/node_modules: *new* -<<<<<<< HEAD - {"inode":113} -/workspaces/somerepo/node_modules/@types: *new* {"inode":114} -======= - {"inode":115} /workspaces/somerepo/node_modules/@types: *new* - {"inode":116} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":115} /workspaces/somerepo/src: {"inode":3} /workspaces/somerepo/src/tsconfig.json: @@ -780,15 +770,9 @@ FsWatches:: /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":18} /workspaces/somerepo/node_modules: -<<<<<<< HEAD - {"inode":113} -/workspaces/somerepo/node_modules/@types: {"inode":114} -======= - {"inode":115} /workspaces/somerepo/node_modules/@types: - {"inode":116} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":115} /workspaces/somerepo/src: {"inode":3} /workspaces/somerepo/src/tsconfig.json: @@ -918,19 +902,11 @@ FsWatches:: /home/src/tslibs/TS/Lib/lib.d.ts: {"inode":18} /workspaces/somerepo/node_modules: -<<<<<<< HEAD - {"inode":113} -/workspaces/somerepo/node_modules/@types: {"inode":114} -/workspaces/somerepo/node_modules/@types/random-seed: *new* - {"inode":115} -======= - {"inode":115} /workspaces/somerepo/node_modules/@types: - {"inode":116} + {"inode":115} /workspaces/somerepo/node_modules/@types/random-seed: *new* - {"inode":117} ->>>>>>> 6f75783184 (Fix library inclusions for ES2024 target (#60622)) + {"inode":116} /workspaces/somerepo/src: {"inode":3} /workspaces/somerepo/src/tsconfig.json: