Skip to content

Commit 3e070ad

Browse files
committed
Merge remote-tracking branch 'upstream/main' into merge_main
2 parents ee2b58d + d1be94b commit 3e070ad

File tree

8,658 files changed

+746008
-91438
lines changed

Some content is hidden

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

8,658 files changed

+746008
-91438
lines changed

.custom-gcl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# yaml-language-server: $schema=https://golangci-lint.run/jsonschema/custom-gcl.jsonschema.json
22

3-
version: v2.5.0
3+
version: v2.6.2
44

55
destination: ./_tools
66

.devcontainer/devcontainer.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
11
// 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/universal
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/go
33
{
44
"name": "TypeScript Compiler Development",
55
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6-
"image": "mcr.microsoft.com/devcontainers/universal:2-linux",
7-
6+
"image": "mcr.microsoft.com/devcontainers/go:2-1.25-bookworm",
87
// Features to add to the dev container. More info: https://containers.dev/features.
9-
// "features": {},
8+
"features": {
9+
"ghcr.io/devcontainers/features/node:1": {
10+
"version": "lts",
11+
"pnpmVersion": "latest",
12+
"nvmVersion": "latest"
13+
},
14+
"ghcr.io/devcontainers-extra/features/dprint-asdf:2": {
15+
"version": "latest"
16+
},
17+
"ghcr.io/devcontainers/features/rust:1": {}
18+
},
1019

1120
// Use 'forwardPorts' to make a list of ports inside the container available locally.
1221
// "forwardPorts": [],

.dprint.jsonc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
// Note: if adding new languages, make sure settings.template.json is updated too.
5959
// Also, if updating typescript, update the one in package.json.
6060
"plugins": [
61-
"https://plugins.dprint.dev/typescript-0.95.11.wasm",
62-
"https://plugins.dprint.dev/json-0.20.0.wasm",
61+
"https://plugins.dprint.dev/typescript-0.95.12.wasm",
62+
"https://plugins.dprint.dev/json-0.21.0.wasm",
6363
"https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.1.wasm",
6464
"https://plugins.dprint.dev/exec-0.6.0.json@a054130d458f124f9b5c91484833828950723a5af3f8ff2bd1523bd47b83b364"
6565
]

.github/ISSUE_TEMPLATE/02-behavior-difference.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: Behavior Difference
3-
about: tsgo produces different results than TypeScript 5.8
3+
about: tsgo produces different results than TypeScript 5.9
44
title: ''
55
labels: ''
66
assignees: ''
@@ -11,6 +11,6 @@ assignees: ''
1111

1212
<!-- Share a repository link or a code sample -->
1313

14-
## Behavior with `typescript@5.8`
14+
## Behavior with `typescript@5.9`
1515

1616
## Behavior with `tsgo`
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: 'VS Code Editor Issue'
2+
description: 'Issue using tsgo in VS Code'
3+
labels: 'Domain: Editor'
4+
assignees: []
5+
body:
6+
- type: input
7+
id: extension_version
8+
attributes:
9+
label: Extension Version
10+
description: The version of the TypeScript (native preview) extension
11+
placeholder: '0.20251016.x'
12+
validations:
13+
required: true
14+
- type: input
15+
id: vscode_version
16+
attributes:
17+
label: VS Code Version
18+
description: The version of the VS Code you are using
19+
placeholder: '1.105.x'
20+
validations:
21+
required: true
22+
- type: input
23+
id: os_version
24+
attributes:
25+
label: Operating system Version
26+
description: Your operating system and version
27+
validations:
28+
required: true
29+
- type: textarea
30+
id: steps
31+
attributes:
32+
label: 'Steps to reproduce'
33+
description: |
34+
Information about how to reproduce the issue and expected behavior
35+
value: |
36+
1.
37+
2.
38+
3.
39+
validations:
40+
required: true
41+
- type: textarea
42+
id: bug_info
43+
attributes:
44+
label: 'Issue'
45+
description: |
46+
Information about the bug, such as expected vs actual behavior
47+
validations:
48+
required: true
File renamed without changes.
File renamed without changes.

.github/actions/setup-go/action.yml

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ description: Setup Go
33

44
inputs:
55
go-version:
6-
description: Go version range to set up.
7-
default: '>=1.25.0'
6+
description: Go version to set up in go-install.ps1 format
7+
default: 'go1.25'
88
create:
99
description: Create the cache
1010
default: 'false'
@@ -18,19 +18,51 @@ runs:
1818
steps:
1919
- name: Install Go
2020
id: install-go
21-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
22-
with:
23-
go-version: ${{ inputs.go-version }}
24-
cache: false
21+
shell: pwsh
22+
run: |
23+
# https://github.com/microsoft/go-infra/blob/main/goinstallscript/powershell/go-install.ps1
24+
${{ github.action_path }}/go-install.ps1 -Version ${{ inputs.go-version }} -GitHubActionsPath
25+
26+
$goVersionOutput = go version
27+
Write-Host $goVersionOutput
28+
# Extract version like "1.23.4" from "go version go1.23.4 windows/amd64"
29+
if ($goVersionOutput -match 'go version go([\d\.]+)') {
30+
$exactVersion = $matches[1]
31+
"go-version=$exactVersion" >> $env:GITHUB_OUTPUT
32+
Write-Host "Exact Go version: $exactVersion"
33+
} else {
34+
Write-Error "Failed to parse Go version from: $goVersionOutput"
35+
exit 1
36+
}
37+
38+
- name: Verify Microsoft Go
39+
shell: pwsh
40+
run: |
41+
$goPath = (Get-Command go).Source
42+
Write-Host "Go executable path: $goPath"
43+
if ($goPath -notlike "*microsoft-go*") {
44+
Write-Error "Go installation is not from microsoft-go. Path: $goPath"
45+
exit 1
46+
}
47+
Write-Host "✓ Verified: Microsoft Go is active"
48+
49+
- name: Add GOBIN to PATH
50+
shell: bash
51+
run: |
52+
GOBIN=$(go env GOBIN)
53+
if [ -z "$GOBIN" ]; then
54+
GOBIN="$(go env GOPATH)/bin"
55+
fi
56+
echo "$GOBIN" >> $GITHUB_PATH
2557
2658
# Avoid hardcoding the cache keys more than once.
2759
- name: Get cache info
2860
shell: bash
2961
id: cache-info
3062
env:
31-
MODULES_KEY: go-modules-${{ runner.os }}-${{ steps.install-go.outputs.go-version }}-${{ hashFiles('**/go.sum', '**/.custom-gcl.yml') }}
32-
LINT_KEY: golangci-lint-${{ runner.os }}-${{ steps.install-go.outputs.go-version }}-${{ hashFiles('**/go.sum', '**/.custom-gcl.yml') }}
33-
BUILD_KEY: go-build-cache-${{ runner.os }}-${{ steps.install-go.outputs.go-version }}
63+
MODULES_KEY: go-modules-${{ runner.os }}-msft-${{ steps.install-go.outputs.go-version }}-${{ hashFiles('**/go.sum', '**/.custom-gcl.yml') }}
64+
LINT_KEY: golangci-lint-${{ runner.os }}-msft-${{ steps.install-go.outputs.go-version }}-${{ hashFiles('**/go.sum', '**/.custom-gcl.yml') }}
65+
BUILD_KEY: go-build-cache-${{ runner.os }}-msft-${{ steps.install-go.outputs.go-version }}
3466
run: |
3567
echo "modules-key=$MODULES_KEY" >> $GITHUB_OUTPUT
3668
echo "lint-key=$LINT_KEY" >> $GITHUB_OUTPUT

0 commit comments

Comments
 (0)