Skip to content

Commit 2517d66

Browse files
Merge remote-tracking branch 'upstream/next' into next
2 parents 2d36fbf + 40729b4 commit 2517d66

File tree

299 files changed

+2699
-2192
lines changed

Some content is hidden

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

299 files changed

+2699
-2192
lines changed

.autorc.json

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
{
2-
"plugins": [
3-
"npm",
4-
"conventional-commits",
5-
"first-time-contributor",
6-
"released"
7-
],
8-
"baseBranch": "stable",
9-
"prereleaseBranches": [
10-
"next"
11-
],
12-
"author": "GitHub Actions Bot <[email protected]>"
2+
"plugins": ["npm", "conventional-commits", "first-time-contributor", "released"],
3+
"baseBranch": "stable",
4+
"prereleaseBranches": ["next"],
5+
"author": "GitHub Actions Bot <[email protected]>"
136
}

.editorconfig

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

.eslintignore

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

.eslintrc.js

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

.github/workflows/test.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,7 @@ jobs:
1212
test:
1313
name: Test
1414

15-
strategy:
16-
fail-fast: false
17-
matrix:
18-
os: [ubuntu-latest, windows-latest]
19-
20-
runs-on: ${{ matrix.os }}
15+
runs-on: ubuntu-latest
2116

2217
steps:
2318
- uses: actions/checkout@v4

.prettierignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
azure-pipelines.yml
21
package.json
32
test/valid-data/**/*.json
3+
babel.config.cjs
4+
jest.config.cjs

.prettierrc.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
2-
"trailingComma": "es5",
32
"printWidth": 120,
43
"tabWidth": 4,
5-
"endOfLine": "lf",
64
"overrides": [
75
{
86
"files": "*.json",

.vscode/launch.json

Lines changed: 29 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,31 @@
11
{
2-
// Use IntelliSense to learn about possible Node.js debug attributes.
3-
// Hover to view descriptions of existing attributes.
4-
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5-
"version": "0.2.0",
6-
"configurations": [
7-
{
8-
//
9-
// Helps with debugging parsing.
10-
// - Set break points in the code
11-
// - Open the file you want to parse: test/**/main.ts
12-
// - F5 to run the debugger.
13-
"name": "Debug Test Case",
14-
"type": "node",
15-
"request": "launch",
16-
"runtimeExecutable": "node",
17-
"runtimeArgs": [
18-
"--nolazy",
19-
"-r",
20-
"ts-node/register"
21-
],
22-
"args": [
23-
"ts-json-schema-generator.ts",
24-
"-p",
25-
"${file}"
26-
],
27-
"cwd": "${workspaceFolder}",
28-
"internalConsoleOptions": "openOnSessionStart",
29-
"skipFiles": [
30-
"<node_internals>/**",
31-
"node_modules/**"
32-
]
33-
},
34-
{
35-
"type": "node",
36-
"request": "attach",
37-
"name": "Attach",
38-
"port": 9229,
39-
"protocol": "inspector"
40-
}
41-
]
2+
// Use IntelliSense to learn about possible Node.js debug attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
//
9+
// Helps with debugging parsing.
10+
// - Set break points in the code
11+
// - Open the file you want to parse: test/**/main.ts
12+
// - F5 to run the debugger.
13+
"name": "Debug Test Case",
14+
"type": "node",
15+
"request": "launch",
16+
"runtimeExecutable": "node",
17+
"runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
18+
"args": ["ts-json-schema-generator.ts", "-p", "${file}"],
19+
"cwd": "${workspaceFolder}",
20+
"internalConsoleOptions": "openOnSessionStart",
21+
"skipFiles": ["<node_internals>/**", "node_modules/**"]
22+
},
23+
{
24+
"type": "node",
25+
"request": "attach",
26+
"name": "Attach",
27+
"port": 9229,
28+
"protocol": "inspector"
29+
}
30+
]
4231
}

.vscode/settings.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
// Place your settings in this file to overwrite default and user settings.
22
{
33
"search.exclude": {
4-
"dist": true,
5-
"bin": true
4+
"dist": true
65
},
76
"files.trimTrailingWhitespace": true,
87
"typescript.tsdk": "node_modules/typescript/lib",
98
"files.insertFinalNewline": true,
10-
"eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
9+
"eslint.validate": ["javascript", "javascriptreact", "typescript"],
1110
"editor.tabSize": 4,
1211
"editor.formatOnSave": true,
1312
"editor.codeActionsOnSave": {
1413
"source.fixAll.eslint": "explicit"
1514
},
16-
"jest.autoRun": "off"
15+
"eslint.experimental.useFlatConfig": true,
16+
"jest.runMode": "on-demand",
17+
"javascript.preferences.importModuleSpecifierEnding": "js"
1718
}
File renamed without changes.

0 commit comments

Comments
 (0)