Skip to content

Update submodule, fix JSON syntax problems #1285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _submodules/TypeScript
Submodule TypeScript updated 63 files
+7 −5 src/compiler/checker.ts
+15 −8 src/compiler/types.ts
+12 −3 src/compiler/utilities.ts
+12 −12 tests/baselines/reference/api/typescript.d.ts
+2 −2 tests/baselines/reference/awaitedTypeNoLib.errors.txt
+3 −2 tests/baselines/reference/conditionalExportsResolutionFallback(moduleresolution=node16).errors.txt
+3 −2 tests/baselines/reference/conditionalExportsResolutionFallback(moduleresolution=nodenext).errors.txt
+1 −1 tests/baselines/reference/narrowingUnionToUnion.types
+3 −2 tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=node16).errors.txt
+3 −2 tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=node16).js
+3 −2 tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=node18).errors.txt
+3 −2 tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=node18).js
+3 −2 tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=nodenext).errors.txt
+3 −2 tests/baselines/reference/nodeModulesAllowJsConditionalPackageExports(module=nodenext).js
+3 −2 tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=node16).errors.txt
+3 −2 tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=node16).js
+3 −2 tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=node18).errors.txt
+3 −2 tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=node18).js
+3 −2 tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=nodenext).errors.txt
+3 −2 tests/baselines/reference/nodeModulesAllowJsPackagePatternExports(module=nodenext).js
+3 −2 tests/baselines/reference/nodeModulesAllowJsPackagePatternExportsTrailers(module=node16).errors.txt
+3 −2 tests/baselines/reference/nodeModulesAllowJsPackagePatternExportsTrailers(module=node16).js
+3 −2 tests/baselines/reference/nodeModulesAllowJsPackagePatternExportsTrailers(module=node18).errors.txt
+3 −2 tests/baselines/reference/nodeModulesAllowJsPackagePatternExportsTrailers(module=node18).js
+3 −2 tests/baselines/reference/nodeModulesAllowJsPackagePatternExportsTrailers(module=nodenext).errors.txt
+3 −2 tests/baselines/reference/nodeModulesAllowJsPackagePatternExportsTrailers(module=nodenext).js
+3 −2 tests/baselines/reference/nodeModulesConditionalPackageExports(module=node16).errors.txt
+3 −2 tests/baselines/reference/nodeModulesConditionalPackageExports(module=node16).js
+3 −2 tests/baselines/reference/nodeModulesConditionalPackageExports(module=node18).errors.txt
+3 −2 tests/baselines/reference/nodeModulesConditionalPackageExports(module=node18).js
+3 −2 tests/baselines/reference/nodeModulesConditionalPackageExports(module=nodenext).errors.txt
+3 −2 tests/baselines/reference/nodeModulesConditionalPackageExports(module=nodenext).js
+3 −2 tests/baselines/reference/nodeModulesPackagePatternExports(module=node16).errors.txt
+3 −2 tests/baselines/reference/nodeModulesPackagePatternExports(module=node16).js
+3 −2 tests/baselines/reference/nodeModulesPackagePatternExports(module=node18).errors.txt
+3 −2 tests/baselines/reference/nodeModulesPackagePatternExports(module=node18).js
+3 −2 tests/baselines/reference/nodeModulesPackagePatternExports(module=nodenext).errors.txt
+3 −2 tests/baselines/reference/nodeModulesPackagePatternExports(module=nodenext).js
+3 −2 tests/baselines/reference/nodeModulesPackagePatternExportsTrailers(module=node16).errors.txt
+3 −2 tests/baselines/reference/nodeModulesPackagePatternExportsTrailers(module=node16).js
+3 −2 tests/baselines/reference/nodeModulesPackagePatternExportsTrailers(module=node18).errors.txt
+3 −2 tests/baselines/reference/nodeModulesPackagePatternExportsTrailers(module=node18).js
+3 −2 tests/baselines/reference/nodeModulesPackagePatternExportsTrailers(module=nodenext).errors.txt
+3 −2 tests/baselines/reference/nodeModulesPackagePatternExportsTrailers(module=nodenext).js
+4 −3 tests/baselines/reference/nodeModulesTypesVersionPackageExports(module=node16).js
+4 −3 tests/baselines/reference/nodeModulesTypesVersionPackageExports(module=node18).js
+4 −3 tests/baselines/reference/nodeModulesTypesVersionPackageExports(module=nodenext).js
+2 −2 tests/baselines/reference/partiallyNamedTuples2.types
+1 −1 tests/baselines/reference/reactJsxReactResolvedNodeNext.js
+1 −1 tests/cases/compiler/reactJsxReactResolvedNodeNext.tsx
+2 −2 tests/cases/conformance/moduleResolution/conditionalExportsResolutionFallback.ts
+8 −8 tests/cases/conformance/moduleResolution/selfNameModuleAugmentation.ts
+2 −2 tests/cases/conformance/node/allowJs/nodeModulesAllowJsConditionalPackageExports.ts
+2 −2 tests/cases/conformance/node/allowJs/nodeModulesAllowJsPackagePatternExports.ts
+2 −2 tests/cases/conformance/node/allowJs/nodeModulesAllowJsPackagePatternExportsTrailers.ts
+2 −2 tests/cases/conformance/node/nodeModulesConditionalPackageExports.ts
+2 −2 tests/cases/conformance/node/nodeModulesPackagePatternExports.ts
+2 −2 tests/cases/conformance/node/nodeModulesPackagePatternExportsTrailers.ts
+3 −3 tests/cases/conformance/node/nodeModulesTypesVersionPackageExports.ts
+1 −1 tests/cases/fourslash/pathCompletionsPackageJsonExportsBundlerNoNodeCondition.ts
+1 −1 tests/cases/fourslash/pathCompletionsPackageJsonExportsCustomConditions.ts
+1 −1 tests/cases/fourslash/pathCompletionsPackageJsonImportsBundlerNoNodeCondition.ts
+1 −1 tests/cases/fourslash/pathCompletionsPackageJsonImportsCustomConditions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestPathCompletionsPackageJsonExportsBundlerNoNodeCondition(t *testing.T) {
"./only-for-node": {
"node": "./something.js"
},
"./for-everywhere": "./other.js",
"./for-everywhere": "./other.js"
}
}
// @Filename: /node_modules/foo/something.d.ts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestPathCompletionsPackageJsonExportsCustomConditions(t *testing.T) {
"exports": {
"./only-with-custom-conditions": {
"custom-condition": "./something.js"
},
}
}
}
// @Filename: /node_modules/foo/something.d.ts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestPathCompletionsPackageJsonImportsBundlerNoNodeCondition(t *testing.T) {
"#only-for-node": {
"node": "./something.js"
},
"#for-everywhere": "./other.js",
"#for-everywhere": "./other.js"
}
}
// @Filename: /something.d.ts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func TestPathCompletionsPackageJsonImportsCustomConditions(t *testing.T) {
"imports": {
"#only-with-custom-conditions": {
"custom-condition": "./something.js"
},
}
}
}
// @Filename: /something.d.ts
Expand Down
2 changes: 1 addition & 1 deletion internal/packagejson/packagejson.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ type Fields struct {
func Parse(data []byte) (Fields, error) {
var f Fields
if err := json2.Unmarshal(data, &f); err != nil {
return f, err
return Fields{}, err
}
return f, nil
}
2 changes: 1 addition & 1 deletion internal/project/projectreferencesprogram_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ func filesForSymlinkReferences(preserveSymlinks bool, scope string) (files map[s
files = map[string]any{
"/user/username/projects/myproject/packages/B/package.json": `{
"main": "lib/index.js",
"types": "lib/index.d.ts",
"types": "lib/index.d.ts"
}`,
aTest: fmt.Sprintf(`
import { foo } from '%sb';
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
--- old.narrowingUnionToUnion.types
+++ new.narrowingUnionToUnion.types
@@= skipped -32, +32 lines =@@
>x : T | undefined

x; // T & Falsy | undefined
->x : (T & null) | (T & "") | (T & 0) | (T & false) | (T & 0n) | undefined
+>x : (T & null) | (T & "") | (T & 0) | (T & 0n) | (T & false) | undefined
}
}

@@= skipped -212, +212 lines =@@
@@= skipped -244, +244 lines =@@
}
},
(value?: string) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const a = <div></div>;
"name": "@types/react",
"version": "0.0.1",
"main": "",
"types": "index.d.ts",
"types": "index.d.ts"
}
//// [index.d.ts]
declare namespace JSX {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,28 +1,8 @@
index.cjs(3,22): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package/mjs")' call instead.
index.cjs(4,23): error TS1479: The current file is a CommonJS module whose imports will produce 'require' calls; however, the referenced file is an ECMAScript module and cannot be imported with 'require'. Consider writing a dynamic 'import("package")' call instead.
index.cjs(8,23): error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
index.cjs(9,23): error TS2307: Cannot find module 'inner/b' or its corresponding type declarations.
index.cjs(11,21): error TS2307: Cannot find module 'inner/types' or its corresponding type declarations.
index.js(8,23): error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
index.js(9,23): error TS2307: Cannot find module 'inner/b' or its corresponding type declarations.
index.js(11,21): error TS2307: Cannot find module 'inner/types' or its corresponding type declarations.
index.js(14,7): error TS2339: Property 'mjsSource' does not exist on type 'typeof import("node_modules/inner/index")'.
index.mjs(8,23): error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
index.mjs(9,23): error TS2307: Cannot find module 'inner/b' or its corresponding type declarations.
index.mjs(11,21): error TS2307: Cannot find module 'inner/types' or its corresponding type declarations.
index.mjs(14,7): error TS2339: Property 'mjsSource' does not exist on type 'typeof import("node_modules/inner/index")'.
node_modules/inner/index.d.cts(2,22): error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
node_modules/inner/index.d.cts(3,22): error TS2307: Cannot find module 'inner/b' or its corresponding type declarations.
node_modules/inner/index.d.cts(5,21): error TS2307: Cannot find module 'inner/types' or its corresponding type declarations.
node_modules/inner/index.d.mts(2,22): error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
node_modules/inner/index.d.mts(3,22): error TS2307: Cannot find module 'inner/b' or its corresponding type declarations.
node_modules/inner/index.d.mts(5,21): error TS2307: Cannot find module 'inner/types' or its corresponding type declarations.
node_modules/inner/index.d.ts(2,22): error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
node_modules/inner/index.d.ts(3,22): error TS2307: Cannot find module 'inner/b' or its corresponding type declarations.
node_modules/inner/index.d.ts(5,21): error TS2307: Cannot find module 'inner/types' or its corresponding type declarations.


==== index.js (4 errors) ====
==== index.js (0 errors) ====
// esm format file
import * as cjs from "package/cjs";
import * as mjs from "package/mjs";
Expand All @@ -31,22 +11,14 @@ node_modules/inner/index.d.ts(5,21): error TS2307: Cannot find module 'inner/typ
mjs;
type;
import * as cjsi from "inner/a";
~~~~~~~~~
!!! error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
import * as mjsi from "inner/b";
~~~~~~~~~
!!! error TS2307: Cannot find module 'inner/b' or its corresponding type declarations.
import * as typei from "inner";
import * as ts from "inner/types";
~~~~~~~~~~~~~
!!! error TS2307: Cannot find module 'inner/types' or its corresponding type declarations.
cjsi.mjsSource;
mjsi.mjsSource;
typei.mjsSource;
~~~~~~~~~
!!! error TS2339: Property 'mjsSource' does not exist on type 'typeof import("node_modules/inner/index")'.
ts.mjsSource;
==== index.mjs (4 errors) ====
==== index.mjs (0 errors) ====
// esm format file
import * as cjs from "package/cjs";
import * as mjs from "package/mjs";
Expand All @@ -55,22 +27,14 @@ node_modules/inner/index.d.ts(5,21): error TS2307: Cannot find module 'inner/typ
mjs;
type;
import * as cjsi from "inner/a";
~~~~~~~~~
!!! error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
import * as mjsi from "inner/b";
~~~~~~~~~
!!! error TS2307: Cannot find module 'inner/b' or its corresponding type declarations.
import * as typei from "inner";
import * as ts from "inner/types";
~~~~~~~~~~~~~
!!! error TS2307: Cannot find module 'inner/types' or its corresponding type declarations.
cjsi.mjsSource;
mjsi.mjsSource;
typei.mjsSource;
~~~~~~~~~
!!! error TS2339: Property 'mjsSource' does not exist on type 'typeof import("node_modules/inner/index")'.
ts.mjsSource;
==== index.cjs (5 errors) ====
==== index.cjs (2 errors) ====
// cjs format file
import * as cjs from "package/cjs";
import * as mjs from "package/mjs";
Expand All @@ -83,65 +47,41 @@ node_modules/inner/index.d.ts(5,21): error TS2307: Cannot find module 'inner/typ
mjs;
type;
import * as cjsi from "inner/a";
~~~~~~~~~
!!! error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
import * as mjsi from "inner/b";
~~~~~~~~~
!!! error TS2307: Cannot find module 'inner/b' or its corresponding type declarations.
import * as typei from "inner";
import * as ts from "inner/types";
~~~~~~~~~~~~~
!!! error TS2307: Cannot find module 'inner/types' or its corresponding type declarations.
cjsi.cjsSource;
mjsi.cjsSource;
typei.implicitCjsSource;
ts.cjsSource;
==== node_modules/inner/index.d.ts (3 errors) ====
==== node_modules/inner/index.d.ts (0 errors) ====
// cjs format file
import * as cjs from "inner/a";
~~~~~~~~~
!!! error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
import * as mjs from "inner/b";
~~~~~~~~~
!!! error TS2307: Cannot find module 'inner/b' or its corresponding type declarations.
import * as type from "inner";
import * as ts from "inner/types";
~~~~~~~~~~~~~
!!! error TS2307: Cannot find module 'inner/types' or its corresponding type declarations.
export { cjs };
export { mjs };
export { type };
export { ts };
export const implicitCjsSource = true;
==== node_modules/inner/index.d.mts (3 errors) ====
==== node_modules/inner/index.d.mts (0 errors) ====
// esm format file
import * as cjs from "inner/a";
~~~~~~~~~
!!! error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
import * as mjs from "inner/b";
~~~~~~~~~
!!! error TS2307: Cannot find module 'inner/b' or its corresponding type declarations.
import * as type from "inner";
import * as ts from "inner/types";
~~~~~~~~~~~~~
!!! error TS2307: Cannot find module 'inner/types' or its corresponding type declarations.
export { cjs };
export { mjs };
export { type };
export { ts };
export const mjsSource = true;
==== node_modules/inner/index.d.cts (3 errors) ====
==== node_modules/inner/index.d.cts (0 errors) ====
// cjs format file
import * as cjs from "inner/a";
~~~~~~~~~
!!! error TS2307: Cannot find module 'inner/a' or its corresponding type declarations.
import * as mjs from "inner/b";
~~~~~~~~~
!!! error TS2307: Cannot find module 'inner/b' or its corresponding type declarations.
import * as type from "inner";
import * as ts from "inner/types";
~~~~~~~~~~~~~
!!! error TS2307: Cannot find module 'inner/types' or its corresponding type declarations.
export { cjs };
export { mjs };
export { type };
Expand Down Expand Up @@ -178,12 +118,13 @@ node_modules/inner/index.d.ts(5,21): error TS2307: Cannot find module 'inner/typ
"./types": {
"types": {
"import": "./index.d.mts",
"require": "./index.d.cts",
"require": "./index.d.cts"
},
"node": {
"import": "./index.mjs",
"require": "./index.cjs"
}
}
}
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,16 @@ export const cjsSource = true;
"./types": {
"types": {
"import": "./index.d.mts",
"require": "./index.d.cts",
"require": "./index.d.cts"
},
"node": {
"import": "./index.mjs",
"require": "./index.cjs"
}
}
}
}
}


//// [index.mjs]
// esm format file
Expand Down
Loading