Skip to content
This repository was archived by the owner on Jan 13, 2024. It is now read-only.

Commit 0f91f7d

Browse files
jakebaileyjakebailey
authored
Run dprint on json (microsoft#55602)
1 parent 512d632 commit 0f91f7d

16 files changed

+89
-79
lines changed

‎.c8rc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
"include": ["src/**", "built/local/**"],
55
"exclude": ["**/node_modules/**"],
66
"mergeAsync": true
7-
}
7+
}

‎.dprint.jsonc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
],
5252
"plugins": [
5353
"https://plugins.dprint.dev/typescript-0.86.1.wasm",
54-
"https://plugins.dprint.dev/prettier-0.27.0.json@3557a62b4507c55a47d8cde0683195b14d13c41dda66d0f0b0e111aed107e2fe"
54+
"https://plugins.dprint.dev/prettier-0.27.0.json@3557a62b4507c55a47d8cde0683195b14d13c41dda66d0f0b0e111aed107e2fe",
55+
"https://plugins.dprint.dev/json-0.17.4.wasm"
5556
]
5657
}

‎.eslintrc.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
"plugin:@typescript-eslint/stylistic"
1717
],
1818
"plugins": [
19-
"@typescript-eslint", "no-null", "eslint-plugin-local", "simple-import-sort"
19+
"@typescript-eslint",
20+
"no-null",
21+
"eslint-plugin-local",
22+
"simple-import-sort"
2023
],
2124
"ignorePatterns": [
2225
"**/node_modules/**",
@@ -113,7 +116,7 @@
113116
"local/only-arrow-functions": [
114117
"error",
115118
{
116-
"allowNamedFunctions": true ,
119+
"allowNamedFunctions": true,
117120
"allowDeclarations": true
118121
}
119122
],
@@ -133,7 +136,7 @@
133136
"overrides": [
134137
// By default, the ESLint CLI only looks at .js files. But, it will also look at
135138
// any files which are referenced in an override config. Most users of typescript-eslint
136-
// get this behavior by default by extending a recommended typescript-eslint config, which
139+
// get this behavior by default by extending a recommended typescript-eslint config, which
137140
// just so happens to override some core ESLint rules. We don't extend from any config, so
138141
// explicitly reference TS files here so the CLI picks them up.
139142
//
@@ -146,7 +149,8 @@
146149
"files": ["*.mjs", "*.mts"],
147150
"rules": {
148151
// These globals don't exist outside of CJS files.
149-
"no-restricted-globals": ["error",
152+
"no-restricted-globals": [
153+
"error",
150154
{ "name": "__filename" },
151155
{ "name": "__dirname" },
152156
{ "name": "require" },

‎.github/workflow-resources/.lsifrc.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"project": "../../src/tsconfig.json",
3-
"source": "../../package.json",
4-
"package": "../../package.json",
5-
"out": "../../typescript.lsif"
6-
}
2+
"project": "../../src/tsconfig.json",
3+
"source": "../../package.json",
4+
"package": "../../package.json",
5+
"out": "../../typescript.lsif"
6+
}

‎.vscode/extensions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
"unwantedRecommendations": [
99
"ms-vscode.vscode-typescript-tslint-plugin"
1010
]
11-
}
11+
}

‎.vscode/launch.template.json

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22

33
Copy this file into '.vscode/launch.json' or merge its
44
contents into your existing configurations.
@@ -13,52 +13,52 @@
1313
*/
1414

1515
{
16-
// Use IntelliSense to learn about possible attributes.
17-
// Hover to view descriptions of existing attributes.
18-
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
19-
"version": "0.2.0",
20-
"configurations": [
21-
{
22-
"type": "node",
23-
"request": "launch",
24-
"name": "Mocha Tests (currently opened test)",
25-
"runtimeArgs": ["--nolazy"],
26-
"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
27-
"args": [
28-
"-u",
29-
"bdd",
30-
"--no-timeouts",
31-
"--colors",
32-
"built/local/run.js",
33-
"-f",
34-
// You can change this to be the name of a specific test file (without the file extension)
35-
// to consistently launch the same test
36-
"${fileBasenameNoExtension}",
37-
"--skip-percent",
38-
"0"
39-
],
40-
"env": {
41-
"NODE_ENV": "testing"
42-
},
43-
"outFiles": [
44-
"${workspaceFolder}/built/**/*.js",
45-
"${workspaceFolder}/built/**/*.mjs",
46-
"${workspaceFolder}/built/**/*.cjs",
47-
"!**/node_modules/**"
48-
],
49-
"sourceMaps": true,
50-
"smartStep": true,
51-
"preLaunchTask": "npm: build:tests",
52-
"console": "integratedTerminal",
53-
"customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue"
54-
},
55-
{
56-
// See: https://github.com/microsoft/TypeScript/wiki/Debugging-Language-Service-in-VS-Code
57-
"type": "node",
58-
"request": "attach",
59-
"name": "Attach to VS Code TS Server via Port",
60-
"processId": "${command:PickProcess}",
61-
"customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue"
62-
}
63-
]
16+
// Use IntelliSense to learn about possible attributes.
17+
// Hover to view descriptions of existing attributes.
18+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
19+
"version": "0.2.0",
20+
"configurations": [
21+
{
22+
"type": "node",
23+
"request": "launch",
24+
"name": "Mocha Tests (currently opened test)",
25+
"runtimeArgs": ["--nolazy"],
26+
"program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
27+
"args": [
28+
"-u",
29+
"bdd",
30+
"--no-timeouts",
31+
"--colors",
32+
"built/local/run.js",
33+
"-f",
34+
// You can change this to be the name of a specific test file (without the file extension)
35+
// to consistently launch the same test
36+
"${fileBasenameNoExtension}",
37+
"--skip-percent",
38+
"0"
39+
],
40+
"env": {
41+
"NODE_ENV": "testing"
42+
},
43+
"outFiles": [
44+
"${workspaceFolder}/built/**/*.js",
45+
"${workspaceFolder}/built/**/*.mjs",
46+
"${workspaceFolder}/built/**/*.cjs",
47+
"!**/node_modules/**"
48+
],
49+
"sourceMaps": true,
50+
"smartStep": true,
51+
"preLaunchTask": "npm: build:tests",
52+
"console": "integratedTerminal",
53+
"customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue"
54+
},
55+
{
56+
// See: https://github.com/microsoft/TypeScript/wiki/Debugging-Language-Service-in-VS-Code
57+
"type": "node",
58+
"request": "attach",
59+
"name": "Attach to VS Code TS Server via Port",
60+
"processId": "${command:PickProcess}",
61+
"customDescriptionGenerator": "'__tsDebuggerDisplay' in this ? this.__tsDebuggerDisplay(defaultValue) : defaultValue"
62+
}
63+
]
6464
}

‎.vscode/tasks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@
4949
"problemMatcher": [
5050
"$tsc"
5151
]
52-
},
52+
}
5353
]
5454
}

‎scripts/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
},
2424

2525
"include": [
26-
"**/*.mjs", "**/*.cjs"
26+
"**/*.mjs",
27+
"**/*.cjs"
2728
]
2829
}

‎src/.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
},
77
"rules": {
88
"@typescript-eslint/no-unnecessary-type-assertion": "error",
9-
"no-restricted-globals": ["error",
9+
"no-restricted-globals": [
10+
"error",
1011
{ "name": "setTimeout" },
1112
{ "name": "clearTimeout" },
1213
{ "name": "setInterval" },

‎src/compiler/diagnosticMessages.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5294,7 +5294,7 @@
52945294
"category": "Error",
52955295
"code": 6258
52965296
},
5297-
"Found 1 error in {0}": {
5297+
"Found 1 error in {0}": {
52985298
"category": "Message",
52995299
"code": 6259
53005300
},
@@ -6276,9 +6276,9 @@
62766276
"category": "Message",
62776277
"code": 6930
62786278
},
6279-
"List of file name suffixes to search when resolving a module." : {
6280-
"category": "Error",
6281-
"code": 6931
6279+
"List of file name suffixes to search when resolving a module.": {
6280+
"category": "Error",
6281+
"code": 6931
62826282
},
62836283

62846284
"Variable '{0}' implicitly has an '{1}' type.": {

‎src/compiler/tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
"types": ["node"]
55
},
66

7-
"references": [
8-
],
7+
"references": [],
98

109
"include": ["**/*"]
1110
}

‎src/harness/tsconfig.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
44
"types": [
5-
"node", "mocha", "chai"
5+
"node",
6+
"mocha",
7+
"chai"
68
]
79
},
810
"references": [
@@ -11,7 +13,7 @@
1113
{ "path": "../jsTyping" },
1214
{ "path": "../server" },
1315
{ "path": "../typingsInstallerCore" },
14-
{ "path": "../deprecatedCompat" },
16+
{ "path": "../deprecatedCompat" }
1517
],
1618

1719
"include": ["**/*"]

‎src/server/typesMap.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@
361361
"passport": "passport",
362362
"passport-local": "passport-local",
363363
"path": "pathjs",
364-
"pdfkit":"pdfkit",
364+
"pdfkit": "pdfkit",
365365
"peer": "peerjs",
366366
"peg": "pegjs",
367367
"photoswipe": "photoswipe",
@@ -494,4 +494,4 @@
494494
"ZeroClipboard": "zeroclipboard",
495495
"ZSchema-browser": "z-schema"
496496
}
497-
}
497+
}

‎src/testRunner/tsconfig.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
44
"types": [
5-
"node", "mocha", "chai"
5+
"node",
6+
"mocha",
7+
"chai"
68
]
79
},
810
"references": [
@@ -13,7 +15,7 @@
1315
{ "path": "../server" },
1416
{ "path": "../typingsInstallerCore" },
1517
{ "path": "../deprecatedCompat" },
16-
{ "path": "../harness" },
18+
{ "path": "../harness" }
1719
],
1820
"include": ["**/*"]
1921
}

‎src/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
{ "path": "./typescript" },
1717
{ "path": "./typingsInstaller" },
1818
{ "path": "./typingsInstallerCore" },
19-
{ "path": "./watchGuard" },
19+
{ "path": "./watchGuard" }
2020
]
2121
}

‎src/tsserver/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"extends": "../tsconfig-base",
3-
3+
44
"compilerOptions": {
55
"types": [
66
"node"
@@ -10,7 +10,7 @@
1010
{ "path": "../compiler" },
1111
{ "path": "../services" },
1212
{ "path": "../jsTyping" },
13-
{ "path": "../server" },
13+
{ "path": "../server" }
1414
],
1515
"include": ["**/*"]
1616
}

0 commit comments

Comments
 (0)