Skip to content

Commit dea45fd

Browse files
authored
Update submodule, fix JSON syntax problems (#1285)
1 parent 8975084 commit dea45fd

File tree

111 files changed

+1325
-3871
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+1325
-3871
lines changed

_submodules/TypeScript

Submodule TypeScript updated 63 files

internal/fourslash/tests/gen/pathCompletionsPackageJsonExportsBundlerNoNodeCondition_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func TestPathCompletionsPackageJsonExportsBundlerNoNodeCondition(t *testing.T) {
2020
"./only-for-node": {
2121
"node": "./something.js"
2222
},
23-
"./for-everywhere": "./other.js",
23+
"./for-everywhere": "./other.js"
2424
}
2525
}
2626
// @Filename: /node_modules/foo/something.d.ts

internal/fourslash/tests/gen/pathCompletionsPackageJsonExportsCustomConditions_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func TestPathCompletionsPackageJsonExportsCustomConditions(t *testing.T) {
2020
"exports": {
2121
"./only-with-custom-conditions": {
2222
"custom-condition": "./something.js"
23-
},
23+
}
2424
}
2525
}
2626
// @Filename: /node_modules/foo/something.d.ts

internal/fourslash/tests/gen/pathCompletionsPackageJsonImportsBundlerNoNodeCondition_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func TestPathCompletionsPackageJsonImportsBundlerNoNodeCondition(t *testing.T) {
2020
"#only-for-node": {
2121
"node": "./something.js"
2222
},
23-
"#for-everywhere": "./other.js",
23+
"#for-everywhere": "./other.js"
2424
}
2525
}
2626
// @Filename: /something.d.ts

internal/fourslash/tests/gen/pathCompletionsPackageJsonImportsCustomConditions_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func TestPathCompletionsPackageJsonImportsCustomConditions(t *testing.T) {
2020
"imports": {
2121
"#only-with-custom-conditions": {
2222
"custom-condition": "./something.js"
23-
},
23+
}
2424
}
2525
}
2626
// @Filename: /something.d.ts

internal/packagejson/packagejson.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ type Fields struct {
3636
func Parse(data []byte) (Fields, error) {
3737
var f Fields
3838
if err := json2.Unmarshal(data, &f); err != nil {
39-
return f, err
39+
return Fields{}, err
4040
}
4141
return f, nil
4242
}

internal/project/projectreferencesprogram_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ func filesForSymlinkReferences(preserveSymlinks bool, scope string) (files map[s
283283
files = map[string]any{
284284
"/user/username/projects/myproject/packages/B/package.json": `{
285285
"main": "lib/index.js",
286-
"types": "lib/index.d.ts",
286+
"types": "lib/index.d.ts"
287287
}`,
288288
aTest: fmt.Sprintf(`
289289
import { foo } from '%sb';

testdata/baselines/reference/submodule/compiler/awaitedTypeNoLib.errors.txt.diff

Lines changed: 0 additions & 20 deletions
This file was deleted.

testdata/baselines/reference/submodule/compiler/narrowingUnionToUnion.types.diff

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,6 @@
11
--- old.narrowingUnionToUnion.types
22
+++ new.narrowingUnionToUnion.types
3-
@@= skipped -32, +32 lines =@@
4-
>x : T | undefined
5-
6-
x; // T & Falsy | undefined
7-
->x : (T & null) | (T & "") | (T & 0) | (T & false) | (T & 0n) | undefined
8-
+>x : (T & null) | (T & "") | (T & 0) | (T & 0n) | (T & false) | undefined
9-
}
10-
}
11-
12-
@@= skipped -212, +212 lines =@@
3+
@@= skipped -244, +244 lines =@@
134
}
145
},
156
(value?: string) => {

testdata/baselines/reference/submodule/compiler/reactJsxReactResolvedNodeNext.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const a = <div></div>;
77
"name": "@types/react",
88
"version": "0.0.1",
99
"main": "",
10-
"types": "index.d.ts",
10+
"types": "index.d.ts"
1111
}
1212
//// [index.d.ts]
1313
declare namespace JSX {

0 commit comments

Comments
 (0)