Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/ripe-spiders-crash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/netlify': patch
---

Updates internal dependencies
6 changes: 6 additions & 0 deletions .changeset/warm-lines-deny.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@astrojs/ts-plugin': patch
'astro-vscode': patch
---

Drops support for versions of VS Code below 1.101.0 [May 2025]
12 changes: 4 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,13 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
# VS Code 1.92 (minimum supported version) ships with Node 20.14.0
node_version: [20.14.0, 22]
# VS Code 1.101 (minimum supported version) ships with Node 22.15.1
node_version: [22.22.2, 24.15.0]
include:
- os: windows-latest
node_version: 20.14.0
node_version: 22.22.2
- os: macos-latest
node_version: 20.14.0
node_version: 22.22.2
fail-fast: false

name: 'Test (language-tools): node-${{ matrix.node_version }}, ${{ matrix.os }}'
Expand Down Expand Up @@ -355,10 +355,6 @@ jobs:
- name: Install dependencies
run: pnpm install --no-frozen-lockfile

# Reset lockfile changes so that Turbo can reuse the old build cache
- name: Reset lockfile changes
run: git reset --hard

Comment on lines -358 to -361
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This hack no longer works: it appears pnpm 11 will run an install if it detects that packages are not installed correctly. This means that this reset caused the subsequent pnpm run build to rerun an install, which fails due to frozen lockfile requirements in CI. There’s no way to pass --no-frozen-lockfile in this scenario though.

I tested this in a small dummy project where I manually added a dep to package.json and tried running a script. pnpm 11 immediately went to install the dep before running the script.

- name: Build Packages
run: pnpm run build

Expand Down
8 changes: 1 addition & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,10 @@
"engines": {
"node": ">=22.12.0"
},
"packageManager": "pnpm@10.30.3",
"packageManager": "pnpm@11.0.9",
"dependencies": {
"astro-benchmark": "workspace:*"
},
"pnpm": {
"overrides": {
"picomatch@<4": "^2.3.2",
"vite@^7": "^7.3.2"
}
},
"devDependencies": {
"@astrojs/check": "^0.9.5",
"@biomejs/biome": "2.4.10",
Expand Down
2 changes: 0 additions & 2 deletions packages/astro/e2e/fixtures/multiple-frameworks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
"astro": "workspace:*"
},
"dependencies": {
"@webcomponents/template-shadowroot": "^0.2.1",
"lit": "^3.3.2",
Comment on lines -14 to -15
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These packages used to be used in this fixture but are no longer needed now we don’t have the Lit integration. Removing them allowed me to clean up some pnpm config.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

haha, i can't believe we still had this.

"preact": "^10.29.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"@astrojs/cloudflare": "workspace:*",
"@astrojs/solid-js": "^5.1.3",
"@astrojs/solid-js": "workspace:*",
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixture and a few others were not using workspace:* copies of monorepo packages. This caused them to lag behind and use outdated versions which the newly enable trustPolicy caught.

"astro": "workspace:*",
"solid-js": "^1.9.11"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"@astrojs/cloudflare": "workspace:*",
"@astrojs/solid-js": "^5.1.3",
"@astrojs/solid-js": "workspace:*",
"astro": "workspace:*",
"solid-js": "^1.9.11"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"dependencies": {
"@astrojs/cloudflare": "workspace:*",
"@astrojs/vue": "^5.1.4",
"@astrojs/vue": "workspace:*",
"astro": "workspace:*",
"vue": "^3.5.29"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/integrations/netlify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
"dependencies": {
"@astrojs/internal-helpers": "workspace:*",
"@astrojs/underscore-redirects": "workspace:*",
"@netlify/blobs": "^10.7.0",
"@netlify/functions": "^5.1.2",
"@netlify/vite-plugin": "^2.10.3",
"@netlify/blobs": "^10.7.4",
"@netlify/functions": "^5.2.0",
"@netlify/vite-plugin": "^2.12.3",
"@vercel/nft": "^1.3.2",
"esbuild": "^0.27.3",
"tinyglobby": "^0.2.15",
Expand Down
2 changes: 1 addition & 1 deletion packages/language-tools/ts-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@types/mocha": "^10.0.10",
"@types/node": "^20.9.0",
"@types/semver": "^7.7.1",
"@types/vscode": "^1.92.0",
"@types/vscode": "^1.101.0",
"@vscode/test-cli": "^0.0.12",
"@vscode/test-electron": "^2.5.2",
"mocha": "^11.7.5",
Expand Down
4 changes: 2 additions & 2 deletions packages/language-tools/vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"license": "MIT",
"publisher": "astro-build",
"engines": {
"vscode": "^1.92.0"
"vscode": "^1.101.0"
},
"activationEvents": [
"workspaceContains:astro.config.*"
Expand Down Expand Up @@ -250,7 +250,7 @@
"@types/js-yaml": "^4.0.9",
"@types/mocha": "^10.0.10",
"@types/node": "^20.9.0",
"@types/vscode": "^1.92.0",
"@types/vscode": "^1.101.0",
"@volar/language-server": "~2.4.28",
"@volar/vscode": "~2.4.28",
"@vscode/test-cli": "^0.0.12",
Expand Down
Loading
Loading