Skip to content

Commit 93e81c4

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix/no-strict-null-checks-crash-optional-undefined
2 parents b2f4fc4 + 12d9687 commit 93e81c4

File tree

356 files changed

+26728
-1865
lines changed

Some content is hidden

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

356 files changed

+26728
-1865
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
name: coverage
9696
path: coverage
9797

98-
- uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
98+
- uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # v5.0.7
9999
with:
100100
use_oidc: ${{ !(github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork) }}
101101
disable_search: true

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
49+
uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
5050
with:
5151
config-file: ./.github/codeql/codeql-configuration.yml
5252
# Override language selection by uncommenting this and choosing your languages
@@ -56,7 +56,7 @@ jobs:
5656
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5757
# If this step fails, then you should remove it and run the build manually (see below).
5858
- name: Autobuild
59-
uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
59+
uses: github/codeql-action/autobuild@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
6060

6161
# ℹ️ Command-line programs to run using the OS shell.
6262
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -70,4 +70,4 @@ jobs:
7070
# make release
7171

7272
- name: Perform CodeQL Analysis
73-
uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
73+
uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ jobs:
5555

5656
# Upload the results to GitHub's code scanning dashboard.
5757
- name: 'Upload to code-scanning'
58-
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
58+
uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
5959
with:
6060
sarif_file: results.sarif

Herebyfile.mjs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -604,14 +604,6 @@ export const knip = task({
604604
run: () => exec(process.execPath, ["node_modules/knip/bin/knip.js", "--tags=+internal,-knipignore", "--exclude=duplicates,enumMembers", ...(cmdLineOptions.fix ? ["--fix"] : [])]),
605605
});
606606

607-
const { main: cancellationToken, watch: watchCancellationToken } = entrypointBuildTask({
608-
name: "cancellation-token",
609-
project: "src/cancellationToken",
610-
srcEntrypoint: "./src/cancellationToken/cancellationToken.ts",
611-
builtEntrypoint: "./built/local/cancellationToken/cancellationToken.js",
612-
output: "./built/local/cancellationToken.js",
613-
});
614-
615607
const { main: typingsInstaller, watch: watchTypingsInstaller } = entrypointBuildTask({
616608
name: "typings-installer",
617609
buildDeps: [generateDiagnostics],
@@ -661,14 +653,14 @@ const copyBuiltLocalDiagnosticMessages = task({
661653
export const otherOutputs = task({
662654
name: "other-outputs",
663655
description: "Builds miscelaneous scripts and documents distributed with the LKG",
664-
dependencies: [cancellationToken, typingsInstaller, watchGuard, generateTypesMap, copyBuiltLocalDiagnosticMessages],
656+
dependencies: [typingsInstaller, watchGuard, generateTypesMap, copyBuiltLocalDiagnosticMessages],
665657
});
666658

667659
export const watchOtherOutputs = task({
668660
name: "watch-other-outputs",
669661
description: "Builds miscelaneous scripts and documents distributed with the LKG",
670662
hiddenFromTaskList: true,
671-
dependencies: [watchCancellationToken, watchTypingsInstaller, watchWatchGuard, generateTypesMap, copyBuiltLocalDiagnosticMessages],
663+
dependencies: [watchTypingsInstaller, watchWatchGuard, generateTypesMap, copyBuiltLocalDiagnosticMessages],
672664
});
673665

674666
export const local = task({
@@ -916,7 +908,6 @@ export const produceLKG = task({
916908
}
917909

918910
const expectedFiles = [
919-
"built/local/cancellationToken.js",
920911
"built/local/tsc.js",
921912
"built/local/_tsc.js",
922913
"built/local/tsserver.js",

knip.jsonc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"includeEntryExports": true,
44
"entry": [
55
"Herebyfile.mjs",
6-
"src/cancellationToken/cancellationToken.ts",
76
"src/testRunner/_namespaces/Harness.ts",
87
"src/tsc/tsc.ts",
98
"src/tsserver/server.ts",

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "typescript",
33
"author": "Microsoft Corp.",
44
"homepage": "https://www.typescriptlang.org/",
5-
"version": "5.7.0",
5+
"version": "5.8.0",
66
"license": "Apache-2.0",
77
"description": "TypeScript is a language for application scale JavaScript development",
88
"keywords": [

scripts/produceLKG.mjs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ async function copyTypesMap() {
4848
}
4949

5050
async function copyScriptOutputs() {
51-
await copyFromBuiltLocal("cancellationToken.js");
5251
await copyFromBuiltLocal("tsc.js");
5352
await copyFromBuiltLocal("_tsc.js");
5453
await copyFromBuiltLocal("tsserver.js");

src/cancellationToken/cancellationToken.ts

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

src/cancellationToken/tsconfig.json

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

0 commit comments

Comments
 (0)