Skip to content

Commit b93d62e

Browse files
authored
Merge branch 'microsoft:main' into iife-used-before-def
2 parents b8036a1 + f0c3c3f commit b93d62e

File tree

195 files changed

+1851
-2745
lines changed

Some content is hidden

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

195 files changed

+1851
-2745
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+
}

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);
@@ -740,12 +740,6 @@ export const diff = task({
740740
run: () => exec(getDiffTool(), [refBaseline, localBaseline], { ignoreExitCode: true, waitForExit: false }),
741741
});
742742

743-
export const diffRwc = task({
744-
name: "diff-rwc",
745-
description: "Diffs the RWC baselines using the diff tool specified by the 'DIFF' environment variable",
746-
run: () => exec(getDiffTool(), [refRwcBaseline, localRwcBaseline], { ignoreExitCode: true, waitForExit: false }),
747-
});
748-
749743
/**
750744
* @param {string} localBaseline Path to the local copy of the baselines
751745
* @param {string} refBaseline Path to the reference copy of the baselines
@@ -780,12 +774,6 @@ export const baselineAccept = task({
780774
run: baselineAcceptTask(localBaseline, refBaseline),
781775
});
782776

783-
export const baselineAcceptRwc = task({
784-
name: "baseline-accept-rwc",
785-
description: "Makes the most recent rwc test results the new baseline, overwriting the old baseline",
786-
run: baselineAcceptTask(localRwcBaseline, refRwcBaseline),
787-
});
788-
789777
// TODO(rbuckton): Determine if we still need this task. Depending on a relative
790778
// path here seems like a bad idea.
791779
export const updateSublime = task({
@@ -799,13 +787,6 @@ export const updateSublime = task({
799787
}
800788
});
801789

802-
// TODO(rbuckton): Should the path to DefinitelyTyped be configurable via an environment variable?
803-
export const importDefinitelyTypedTests = task({
804-
name: "importDefinitelyTypedTests",
805-
description: "Runs the importDefinitelyTypedTests script to copy DT's tests to the TS-internal RWC tests",
806-
run: () => exec(process.execPath, ["scripts/importDefinitelyTypedTests.mjs", "./", "../DefinitelyTyped"]),
807-
});
808-
809790

810791
export const produceLKG = task({
811792
name: "LKG",

0 commit comments

Comments
 (0)