Skip to content

Commit 06559e9

Browse files
committed
Merge remote-tracking branch 'origin/main' into pkg-json-imports-completions
# Conflicts: # src/compiler/utilities.ts # src/services/stringCompletions.ts
2 parents 2adb14c + 2c23bea commit 06559e9

File tree

19,643 files changed

+2001285
-461354
lines changed

Some content is hidden

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

19,643 files changed

+2001285
-461354
lines changed

.c8rc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"reporter": ["lcovonly", "cobertura"],
2+
"reporter": ["lcovonly", "cobertura", "v8", "v8-json", "codecov"],
33
"src": "src",
44
"include": ["src/**", "built/local/**"],
55
"exclude": ["**/node_modules/**"],

.devcontainer/Dockerfile

-7
This file was deleted.

.devcontainer/devcontainer.json

+22-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node
13
{
24
"name": "Node.js",
3-
"build": {
4-
"dockerfile": "Dockerfile",
5-
"args": {
6-
"VARIANT": "18"
7-
}
5+
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6+
"image": "mcr.microsoft.com/devcontainers/javascript-node:1-22-bookworm",
7+
8+
// Features to add to the dev container. More info: https://containers.dev/features.
9+
"features": {
10+
"ghcr.io/devcontainers/features/go:1": {}
11+
},
12+
13+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
14+
// "forwardPorts": [],
15+
16+
// Use 'postCreateCommand' to run commands after the container is created.
17+
"postCreateCommand": {
18+
"Configure Build Tools": "sudo corepack enable npm; sudo npm install -g hereby; npm ci",
19+
"Install pprof": "go install github.com/google/pprof@latest",
20+
"Install Graphviz": "sudo apt install graphviz"
821
},
22+
23+
// Configure tool-specific properties.
924
"customizations": {
1025
"vscode": {
1126
"settings": {
@@ -23,5 +38,7 @@
2338
]
2439
}
2540
},
41+
42+
// More info: https://aka.ms/dev-containers-non-root.
2643
"remoteUser": "node"
2744
}

.dprint.jsonc

+16-19
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
// If updating this, also update the config in dtsBundler.mjs.
23
"indentWidth": 4,
34
"lineWidth": 1000,
45
"newLineKind": "auto",
@@ -19,31 +20,25 @@
1920
"arrowFunction.useParentheses": "preferNone",
2021
"conditionalExpression.linePerExpression": false, // Keep our "match/case"-ish conditionals.
2122
"functionExpression.spaceAfterFunctionKeyword": true,
22-
"importDeclaration.forceMultiLine": true,
23+
"importDeclaration.forceMultiLine": "whenMultiple",
2324
"constructorType.spaceAfterNewKeyword": true,
2425
"constructSignature.spaceAfterNewKeyword": true,
2526

26-
// Let eslint-plugin-simple-import-sort handle this.
27-
"module.sortImportDeclarations": "maintain",
28-
"module.sortExportDeclarations": "maintain",
29-
"exportDeclaration.sortNamedExports": "maintain",
30-
"importDeclaration.sortNamedImports": "maintain"
27+
"module.sortImportDeclarations": "caseInsensitive",
28+
"module.sortExportDeclarations": "caseInsensitive",
29+
"exportDeclaration.sortNamedExports": "caseInsensitive",
30+
"importDeclaration.sortNamedImports": "caseInsensitive"
3131
},
32-
"prettier": {
33-
"newLineKind": "lf",
34-
"associations": [
35-
"**/*.{yaml,yml}"
36-
],
37-
"yml.tabWidth": 2,
38-
"yaml.tabWidth": 2,
39-
"yml.singleQuote": true,
40-
"yaml.singleQuote": true
32+
"yaml": {
33+
"indentWidth": 2,
34+
"quotes": "preferSingle"
4135
},
4236
"json": {
4337
// This would be good to do in known-JSONC files, but VS Code warns on trailing commas.
4438
"trailingCommas": "never"
4539
},
4640
"excludes": [
41+
"**/.git",
4742
"**/node_modules",
4843
"**/*-lock.json",
4944
"coverage/**",
@@ -52,12 +47,14 @@
5247
"tests/**",
5348
"internal/**",
5449
"**/*.generated.*",
55-
"scripts/*.d.*"
50+
"scripts/*.d.*",
51+
"**/_namespaces/**"
5652
],
5753
// Note: if adding new languages, make sure settings.template.json is updated too.
54+
// Also, if updating typescript, update the one in package.json.
5855
"plugins": [
59-
"https://plugins.dprint.dev/typescript-0.88.9.wasm",
60-
"https://plugins.dprint.dev/json-0.19.1.wasm",
61-
"https://plugins.dprint.dev/prettier-0.35.0.json@0df49c4d878bb1051af2fa1d1f69ba6400f4b78633f49baa1f38954a6fd32b40"
56+
"https://plugins.dprint.dev/typescript-0.91.8.wasm",
57+
"https://plugins.dprint.dev/json-0.19.3.wasm",
58+
"https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.0.wasm"
6259
]
6360
}

.eslint-plugin-local.cjs

-12
This file was deleted.

.eslintrc.json

-180
This file was deleted.

.github/ISSUE_TEMPLATE/bug_report.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ description: 'Create a report to help us improve TypeScript'
33
body:
44
- type: markdown
55
attributes:
6-
value: Please fill in each section completely. Thank you!
6+
value: |
7+
🔍 Please [search thoroughly in GitHub](https://github.com/Microsoft/TypeScript/search?type=Issues) or by the query `site:github.com/microsoft/TypeScript <your keywords>` in your favorite search engine before reporting a new bug as most bugs are very likely to find precedents.
8+
9+
Please fill in each section completely. Thank you!
710
- type: textarea
811
id: search_terms
912
attributes:
@@ -35,7 +38,6 @@ body:
3538
3639
Please keep and fill in the line that best applies.
3740
value: |
38-
- This is a crash
3941
- This changed between versions ______ and _______
4042
- This changed in commit or PR _______
4143
- This is the behavior in every version I tried, and I reviewed the FAQ for entries about _________

.github/ISSUE_TEMPLATE/feature_request.yml

+10-5
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,22 @@ description: 'Suggest an idea'
33
body:
44
- type: markdown
55
attributes:
6-
value: 'Please fill in each section completely. Thank you!'
6+
value: |
7+
💡 Did you know? TypeScript has over 2,000 open suggestions!
8+
9+
🔎 Please [search thoroughly in GitHub](https://github.com/Microsoft/TypeScript/search?type=Issues) or by the query `site:github.com/microsoft/TypeScript <your keywords>` in your favorite search engine before logging new feature requests as most common ideas already have a proposal in progress.
10+
11+
The "Common Feature Requests" section of the FAQ lists many popular requests: https://github.com/Microsoft/TypeScript/wiki/FAQ#common-feature-requests
12+
13+
Please fill in each section completely. Thank you!
714
- type: textarea
815
id: search_terms
916
attributes:
1017
label: '🔍 Search Terms'
1118
description: |
12-
💡 Did you know? TypeScript has over 2,000 open suggestions!
19+
What search terms did you use when trying to find an existing suggestion?
1320
14-
🔎 Please search thoroughly before logging new feature requests as most common ideas already have a proposal in progress.
15-
16-
The "Common Feature Requests" section of the FAQ lists many popular requests: https://github.com/Microsoft/TypeScript/wiki/FAQ#common-feature-requests
21+
List them here so people in the future can find this one more easily.
1722
placeholder: |
1823
List of keywords you searched for before creating this issue. Write them down here so that others can find this suggestion more easily and help provide feedback.
1924

.github/codecov.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
comment: false
2+
3+
coverage:
4+
precision: 5
5+
status:
6+
patch:
7+
default:
8+
informational: true
9+
project:
10+
default:
11+
informational: true
12+
13+
github_checks:
14+
annotations: false

.github/dependabot.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# To get started with Dependabot version updates, you'll need to specify which
22
# package ecosystems to update and where the package manifests are located.
3-
# Please see the documentation for all configuration options:
3+
# Please see the documentation for more information:
44
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
# https://containers.dev/guide/dependabot
56

67
version: 2
78
updates:
@@ -13,3 +14,8 @@ updates:
1314
github-actions:
1415
patterns:
1516
- '*'
17+
18+
- package-ecosystem: 'devcontainers'
19+
directory: '/'
20+
schedule:
21+
interval: weekly

0 commit comments

Comments
 (0)