Skip to content

Commit

Permalink
Merge branch 'main' into fix/yarn-pnpm
Browse files Browse the repository at this point in the history
  • Loading branch information
nhedger authored Nov 24, 2024
2 parents e52b631 + f652a3c commit eb3fbde
Show file tree
Hide file tree
Showing 17 changed files with 526 additions and 488 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/01_bug-report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ body:
further investigation. We NEED to be able to reproduce the issue in order to undestand it
and fix it.
You can use the `npm create @biomejs/biome-reproduction` command to quickly bootstrap a reproduction
Please use the `npm create @biomejs/biome-reproduction` command whenever you can to bootstrap a reproduction
repository.
- type: textarea
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- name: Setup Biome
uses: biomejs/setup-biome@1cbe33ead22c7a2fded3b52fa2893611c815c9b5 # v2
- name: Run Biome checks
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-prerelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
version: ${{ steps.generate-prerelease-version.outputs.version }}
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- name: Generate prerelease version
id: generate-prerelease-version
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-stable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
version: ${{ steps.next-version.outputs.version }}
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
with:
# Fetch the whole history so we can determine the next version number
# based on the commit history.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/~package-prerelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- name: Setup PNPM
uses: pnpm/action-setup@v4
with:
Expand All @@ -32,7 +32,7 @@ jobs:
- name: Package VSIX
run: pnpm vsce package --pre-release -o biome.vsix
- name: Upload the artifact
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
with:
name: biome.vsix
path: biome.vsix
4 changes: 2 additions & 2 deletions .github/workflows/~package-stable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
with:
# We fetch the latest commit on the main branch to ensure that our
# package.json version contains the patched version number from the
Expand All @@ -26,7 +26,7 @@ jobs:
- name: Package VSIX
run: pnpm vsce package -o biome.vsix
- name: Upload the artifact
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
with:
name: biome.vsix
path: biome.vsix
2 changes: 1 addition & 1 deletion .github/workflows/~publish-to-github-releases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
with:
# Fetch the whole history so we can determine the next version number
# based on the commit history.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/~publish-to-ovsx-registry.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- name: Retrieve packaged VSIX
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/~publish-to-vs-marketplace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
environment: vscode
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- name: Retrieve packaged VSIX
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4
with:
Expand Down
2 changes: 1 addition & 1 deletion lefthook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ pre-commit:
commands:
check:
glob: "*.{js,ts,json}"
run: pnpm biome check --apply {staged_files} && git add {staged_files}
run: pnpm exec biome check --apply {staged_files} && git add {staged_files}
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
"url": "https://github.com/sponsors/biomejs"
},
"devDependencies": {
"@biomejs/biome": "1.9.3",
"@rollup/plugin-commonjs": "28.0.0",
"@biomejs/biome": "1.9.4",
"@rollup/plugin-commonjs": "28.0.1",
"@rollup/plugin-json": "6.1.0",
"@rollup/plugin-node-resolve": "15.3.0",
"@types/vscode": "1.80.0",
"@vscode/vsce": "3.1.1",
"lefthook": "1.7.18",
"ovsx": "0.9.5",
"rollup": "4.24.0",
"@vscode/vsce": "3.2.1",
"lefthook": "1.8.2",
"ovsx": "0.10.0",
"rollup": "4.27.2",
"rollup-plugin-esbuild": "6.1.1",
"ts-node": "10.9.2",
"typescript": "5.6.2"
"typescript": "5.6.3"
},
"activationEvents": ["onStartupFinished"],
"bugs": {
Expand Down Expand Up @@ -217,9 +217,9 @@
"@biomejs/version-utils": "0.4.0",
"@vscode/test-electron": "2.4.1",
"ky": "1.7.2",
"nanoid": "5.0.7",
"nanoid": "5.0.8",
"vscode-languageclient": "8.1.0",
"vscode-uri": "3.0.8"
},
"packageManager": "pnpm@9.12.0"
"packageManager": "pnpm@9.13.2"
}
Loading

0 comments on commit eb3fbde

Please sign in to comment.