Skip to content

Commit 7d0cd83

Browse files
committed
Merge branch 'main' into bye-bye-tsserverlibrary
2 parents b40497c + e78f2a8 commit 7d0cd83

File tree

304 files changed

+3709
-3607
lines changed

Some content is hidden

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

304 files changed

+3709
-3607
lines changed

.devcontainer/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.154.0/containers/javascript-node/.devcontainer/base.Dockerfile
1+
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/blob/v0.245.2/containers/javascript-node/.devcontainer/base.Dockerfile
22

3-
# [Choice] Node.js version: 14, 12, 10
4-
ARG VARIANT="14-buster"
3+
# [Choice] Node.js version: 18, 16, 14
4+
ARG VARIANT="18-buster"
55
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
66

77
RUN sudo -u node npm install -g hereby

.devcontainer/devcontainer.json

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,24 @@
33
"build": {
44
"dockerfile": "Dockerfile",
55
"args": {
6-
"VARIANT": "14"
6+
"VARIANT": "18"
77
}
88
},
9-
"settings": {
10-
"terminal.integrated.defaultProfile.linux": "bash",
11-
"terminal.integrated.profiles.linux": {
12-
"bash": {
13-
"path": "/bin/bash",
14-
"icon": "terminal-bash",
9+
"customizations": {
10+
"vscode": {
11+
"settings": {
12+
"terminal.integrated.defaultProfile.linux": "bash",
13+
"terminal.integrated.profiles.linux": {
14+
"bash": {
15+
"path": "/bin/bash",
16+
"icon": "terminal-bash"
17+
}
18+
}
1519
},
16-
},
20+
"extensions": [
21+
"dbaeumer.vscode-eslint"
22+
]
23+
}
1724
},
18-
"extensions": [
19-
"dbaeumer.vscode-eslint"
20-
],
2125
"remoteUser": "node"
22-
}
26+
}

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ body:
1212
What search terms did you use when trying to find an existing bug report?
1313
1414
List them here so people in the future can find this one more easily.
15+
placeholder: |
16+
List of keywords you searched for before creating this issue.
17+
Write them down here so that others can find this bug more easily and help provide feedback.
18+
19+
e.g. "function inference any", "jsx attribute spread", "move to file duplicate imports", "discriminated union inference", "ts2822"
1520
validations:
1621
required: true
1722
- type: textarea
@@ -72,6 +77,10 @@ body:
7277
- We have to pare too much extraneous code.
7378
- We have to clone a large repo and validate that the problem isn't elsewhere.
7479
- The sample is confusing or doesn't clearly demonstrate what's wrong.
80+
value: |
81+
```ts
82+
// Your code here
83+
```
7584
validations:
7685
required: false
7786
- type: textarea

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ body:
1717
placeholder: |
1818
List of keywords you searched for before creating this issue.
1919
Write them down here so that others can find this suggestion more easily and help provide feedback.
20+
21+
e.g. "isArray readonly", "regex string types", "json const assertion import"
2022
validations:
2123
required: true
2224
- type: checkboxes

Herebyfile.mjs

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import util from "util";
1414
import { localizationDirectories } from "./scripts/build/localization.mjs";
1515
import cmdLineOptions from "./scripts/build/options.mjs";
1616
import { buildProject, cleanProject, watchProject } from "./scripts/build/projects.mjs";
17-
import { localBaseline, localRwcBaseline, refBaseline, refRwcBaseline, runConsoleTests } from "./scripts/build/tests.mjs";
17+
import { localBaseline, refBaseline, runConsoleTests } from "./scripts/build/tests.mjs";
1818
import { Debouncer, Deferred, exec, getDiffTool, memoize, needsUpdate, readJson } from "./scripts/build/utils.mjs";
1919

2020
const glob = util.promisify(_glob);
@@ -766,12 +766,6 @@ export const diff = task({
766766
run: () => exec(getDiffTool(), [refBaseline, localBaseline], { ignoreExitCode: true, waitForExit: false }),
767767
});
768768

769-
export const diffRwc = task({
770-
name: "diff-rwc",
771-
description: "Diffs the RWC baselines using the diff tool specified by the 'DIFF' environment variable",
772-
run: () => exec(getDiffTool(), [refRwcBaseline, localRwcBaseline], { ignoreExitCode: true, waitForExit: false }),
773-
});
774-
775769
/**
776770
* @param {string} localBaseline Path to the local copy of the baselines
777771
* @param {string} refBaseline Path to the reference copy of the baselines
@@ -806,12 +800,6 @@ export const baselineAccept = task({
806800
run: baselineAcceptTask(localBaseline, refBaseline),
807801
});
808802

809-
export const baselineAcceptRwc = task({
810-
name: "baseline-accept-rwc",
811-
description: "Makes the most recent rwc test results the new baseline, overwriting the old baseline",
812-
run: baselineAcceptTask(localRwcBaseline, refRwcBaseline),
813-
});
814-
815803
// TODO(rbuckton): Determine if we still need this task. Depending on a relative
816804
// path here seems like a bad idea.
817805
export const updateSublime = task({
@@ -825,13 +813,6 @@ export const updateSublime = task({
825813
}
826814
});
827815

828-
// TODO(rbuckton): Should the path to DefinitelyTyped be configurable via an environment variable?
829-
export const importDefinitelyTypedTests = task({
830-
name: "importDefinitelyTypedTests",
831-
description: "Runs the importDefinitelyTypedTests script to copy DT's tests to the TS-internal RWC tests",
832-
run: () => exec(process.execPath, ["scripts/importDefinitelyTypedTests.mjs", "./", "../DefinitelyTyped"]),
833-
});
834-
835816

836817
export const produceLKG = task({
837818
name: "LKG",

0 commit comments

Comments
 (0)