Skip to content

Commit 3bd2ba8

Browse files
committed
Merge branch 'main' into pure-js-scripts-1
2 parents 0b0a7b6 + 4953316 commit 3bd2ba8

File tree

167 files changed

+10385
-1347
lines changed

Some content is hidden

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

167 files changed

+10385
-1347
lines changed

.github/workflows/accept-baselines-fix-lints.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v3
1212
- uses: actions/setup-node@v3
1313

1414
- name: Configure Git, Run Tests, Update Baselines, Apply Fixes

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ jobs:
1515

1616
steps:
1717
- name: Checkout repository
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v3
1919
with:
2020
# We must fetch at least the immediate parents so that if this is
2121
# a pull request then we can checkout the head.
2222
fetch-depth: 2
2323

2424
# Initializes the CodeQL tools for scanning.
2525
- name: Initialize CodeQL
26-
uses: github/codeql-action/init@v1
26+
uses: github/codeql-action/init@v2
2727
with:
2828
config-file: ./.github/codeql/codeql-configuration.yml
2929
# Override language selection by uncommenting this and choosing your languages
@@ -33,7 +33,7 @@ jobs:
3333
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
3434
# If this step fails, then you should remove it and run the build manually (see below)
3535
- name: Autobuild
36-
uses: github/codeql-action/autobuild@v1
36+
uses: github/codeql-action/autobuild@v2
3737

3838
# ℹ️ Command-line programs to run using the OS shell.
3939
# 📚 https://git.io/JvXDl
@@ -47,4 +47,4 @@ jobs:
4747
# make release
4848

4949
- name: Perform CodeQL Analysis
50-
uses: github/codeql-action/analyze@v1
50+
uses: github/codeql-action/analyze@v2

.github/workflows/ensure-related-repos-run-crons.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
git config --global user.email "[email protected]"
2323
git config --global user.name "TypeScript Bot"
2424
25-
- uses: actions/checkout@v2
25+
- uses: actions/checkout@v3
2626
with:
2727
repository: 'microsoft/TypeScript-Website'
2828
path: 'ts-site'
@@ -34,7 +34,7 @@ jobs:
3434
git config --unset-all http.https://github.com/.extraheader
3535
git push https://${{ secrets.TS_BOT_GITHUB_TOKEN }}@github.com/microsoft/TypeScript-Website.git
3636
37-
- uses: actions/checkout@v2
37+
- uses: actions/checkout@v3
3838
with:
3939
repository: 'microsoft/TypeScript-Make-Monaco-Builds'
4040
path: 'monaco-builds'

.github/workflows/new-release-branch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- uses: actions/setup-node@v3
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414
with:
1515
fetch-depth: 5
1616
- run: |

.github/workflows/nightly.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
if: github.repository == 'microsoft/TypeScript'
1515

1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818
- uses: actions/setup-node@v3
1919
with:
2020
# Use NODE_AUTH_TOKEN environment variable to authenticate to this registry.

.github/workflows/release-branch-artifact.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414
- uses: actions/setup-node@v3
1515
- name: npm install and test
1616
run: |
@@ -27,7 +27,7 @@ jobs:
2727
npm pack ./
2828
mv typescript-*.tgz typescript.tgz
2929
- name: Upload built tarfile
30-
uses: actions/upload-artifact@v1
30+
uses: actions/upload-artifact@v3
3131
with:
3232
name: tgz
3333
path: typescript.tgz

.github/workflows/rich-navigation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: windows-latest
1616

1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
1919
with:
2020
fetch-depth: 5
2121

.github/workflows/set-version.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- uses: actions/setup-node@v3
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414
with:
1515
ref: ${{ github.event.client_payload.branch_name }}
1616
# notably, this is essentially the same script as `new-release-branch.yaml` (with fewer inputs), but it assumes the branch already exists

.github/workflows/sync-branch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- uses: actions/setup-node@v3
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
1919
with:
2020
ref: ${{ github.event.inputs.branch_name || github.event.client_payload.branch_name }}
2121
fetch-depth: 0

.github/workflows/sync-wiki.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- name: Get repo name
1010
run: R=${GITHUB_REPOSITORY%?wiki}; echo "BASENAME=${R##*/}" >> $GITHUB_ENV
1111
- name: Checkout ${{ env.BASENAME }}-wiki
12-
uses: actions/checkout@v2
12+
uses: actions/checkout@v3
1313
with:
1414
repository: "${{ GITHUB.repository_owner }}/${{ env.BASENAME }}-wiki"
1515
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}

.github/workflows/update-lkg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v3
1212
- uses: actions/setup-node@v3
1313

1414
- name: Configure Git and Update LKG

.github/workflows/update-package-lock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
if: github.repository == 'microsoft/TypeScript'
1414

1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1717
with:
1818
token: ${{ secrets.TS_BOT_GITHUB_TOKEN }}
1919
- uses: actions/setup-node@v3

Gulpfile.mjs

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -476,21 +476,6 @@ task("baseline-accept").description = "Makes the most recent test results the ne
476476
task("baseline-accept-rwc", () => baselineAccept(localRwcBaseline, refRwcBaseline));
477477
task("baseline-accept-rwc").description = "Makes the most recent rwc test results the new baseline, overwriting the old baseline";
478478

479-
const buildLoggedIO = () => buildProject("src/loggedIO/tsconfig-tsc-instrumented.json");
480-
const cleanLoggedIO = () => del("built/local/loggedIO.js");
481-
cleanTasks.push(cleanLoggedIO);
482-
483-
const buildInstrumenter = () => buildProject("src/instrumenter");
484-
const cleanInstrumenter = () => cleanProject("src/instrumenter");
485-
cleanTasks.push(cleanInstrumenter);
486-
487-
const tscInstrumented = () => exec(process.execPath, ["built/local/instrumenter.js", "record", cmdLineOptions.tests || "iocapture", "built/local/tsc.js"]);
488-
task("tsc-instrumented", series(lkgPreBuild, parallel(localize, buildTsc, buildServer, buildServices, buildLssl, buildLoggedIO, buildInstrumenter), tscInstrumented));
489-
task("tsc-instrumented").description = "Builds an instrumented tsc.js";
490-
task("tsc-instrumented").flags = {
491-
"-t --tests=<testname>": "The test to run."
492-
};
493-
494479
// TODO(rbuckton): Determine if we still need this task. Depending on a relative
495480
// path here seems like a bad idea.
496481
const updateSublime = () => src(["built/local/tsserver.js", "built/local/tsserver.js.map"])
@@ -551,9 +536,9 @@ task("generate-spec").description = "Generates a Markdown version of the Languag
551536
task("clean", series(parallel(cleanTasks), cleanBuilt));
552537
task("clean").description = "Cleans build outputs";
553538

554-
const configureNightly = () => exec(process.execPath, ["scripts/configurePrerelease.mjs", "dev", "package.json", "src/compiler/corePublic.ts"]);
555-
task("configure-nightly", configureNightly);
556-
task("configure-nightly").description = "Runs scripts/configurePrerelease.mjs to prepare a build for nightly publishing";
539+
const configureNightly = () => exec(process.execPath, ["scripts/configurePrerelease.js", "dev", "package.json", "src/compiler/corePublic.ts"]);
540+
task("configure-nightly", series(buildScripts, configureNightly));
541+
task("configure-nightly").description = "Runs scripts/configurePrerelease.ts to prepare a build for nightly publishing";
557542

558543
const configureInsiders = () => exec(process.execPath, ["scripts/configurePrerelease.mjs", "insiders", "package.json", "src/compiler/corePublic.ts"]);
559544
task("configure-insiders", configureInsiders);
@@ -563,10 +548,6 @@ const configureExperimental = () => exec(process.execPath, ["scripts/configurePr
563548
task("configure-experimental", configureExperimental);
564549
task("configure-experimental").description = "Runs scripts/configurePrerelease.mjs to prepare a build for experimental publishing";
565550

566-
const createLanguageServicesBuild = () => exec(process.execPath, ["scripts/createLanguageServicesBuild.mjs"]);
567-
task("create-language-services-build", createLanguageServicesBuild);
568-
task("create-language-services-build").description = "Runs scripts/createLanguageServicesBuild.mjs to prepare a build which only has the require('typescript') JS.";
569-
570551
const publishNightly = () => exec("npm", ["publish", "--tag", "next"]);
571552
task("publish-nightly", series(task("clean"), task("LKG"), task("clean"), task("runtests-parallel"), publishNightly));
572553
task("publish-nightly").description = "Runs `npm publish --tag next` to create a new nightly build on npm";

0 commit comments

Comments
 (0)