From a3812180936c9bda9b25c5f7153bc9ba0647fefe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 16 Dec 2024 19:20:41 +0000 Subject: [PATCH] [ci] release --- .changeset/tame-spoons-shop.md | 5 -- examples/basics/package.json | 2 +- examples/blog/package.json | 2 +- examples/component/package.json | 2 +- examples/container-with-vitest/package.json | 2 +- examples/framework-alpine/package.json | 2 +- examples/framework-multiple/package.json | 2 +- examples/framework-preact/package.json | 2 +- examples/framework-react/package.json | 2 +- examples/framework-solid/package.json | 2 +- examples/framework-svelte/package.json | 2 +- examples/framework-vue/package.json | 2 +- examples/hackernews/package.json | 2 +- examples/integration/package.json | 2 +- examples/minimal/package.json | 2 +- examples/portfolio/package.json | 2 +- examples/ssr/package.json | 2 +- examples/starlog/package.json | 2 +- examples/toolbar-app/package.json | 2 +- examples/with-markdoc/package.json | 2 +- examples/with-mdx/package.json | 2 +- examples/with-nanostores/package.json | 2 +- examples/with-tailwindcss/package.json | 2 +- examples/with-vitest/package.json | 2 +- packages/astro/CHANGELOG.md | 6 +++ packages/astro/package.json | 2 +- packages/astro/src/core/build/index.ts | 3 +- packages/astro/src/core/build/static-build.ts | 10 ++-- packages/astro/test/astro-basic.test.js | 2 +- packages/astro/test/sourcemap.test.js | 4 +- packages/integrations/react/src/index.ts | 2 +- pnpm-lock.yaml | 46 +++++++++---------- 32 files changed, 61 insertions(+), 65 deletions(-) delete mode 100644 .changeset/tame-spoons-shop.md diff --git a/.changeset/tame-spoons-shop.md b/.changeset/tame-spoons-shop.md deleted file mode 100644 index e0d80ecdb92c..000000000000 --- a/.changeset/tame-spoons-shop.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'astro': patch ---- - -Clean server sourcemaps from static output diff --git a/examples/basics/package.json b/examples/basics/package.json index a2d0b432977f..b243e706551a 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^5.0.7" + "astro": "^5.0.8" } } diff --git a/examples/blog/package.json b/examples/blog/package.json index 63af5745d5c2..fcc9e6b35fe3 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -13,6 +13,6 @@ "@astrojs/mdx": "^4.0.2", "@astrojs/rss": "^4.0.10", "@astrojs/sitemap": "^3.2.1", - "astro": "^5.0.7" + "astro": "^5.0.8" } } diff --git a/examples/component/package.json b/examples/component/package.json index adc66d4da0d2..23ef761c54b4 100644 --- a/examples/component/package.json +++ b/examples/component/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^5.0.7" + "astro": "^5.0.8" }, "peerDependencies": { "astro": "^4.0.0 || ^5.0.0" diff --git a/examples/container-with-vitest/package.json b/examples/container-with-vitest/package.json index f7bf8566b036..bb4c0cf71b25 100644 --- a/examples/container-with-vitest/package.json +++ b/examples/container-with-vitest/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@astrojs/react": "^4.1.0", - "astro": "^5.0.7", + "astro": "^5.0.8", "react": "^18.3.1", "react-dom": "^18.3.1", "vitest": "^2.1.6" diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index 357f42343fed..cedc96d17dbd 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -13,6 +13,6 @@ "@astrojs/alpinejs": "^0.4.0", "@types/alpinejs": "^3.13.10", "alpinejs": "^3.14.3", - "astro": "^5.0.7" + "astro": "^5.0.8" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index f69f08e23425..a01906003a48 100644 --- a/examples/framework-multiple/package.json +++ b/examples/framework-multiple/package.json @@ -17,7 +17,7 @@ "@astrojs/vue": "^5.0.2", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", - "astro": "^5.0.7", + "astro": "^5.0.8", "preact": "^10.24.3", "react": "^18.3.1", "react-dom": "^18.3.1", diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 089863925f91..2c1ccecd3450 100644 --- a/examples/framework-preact/package.json +++ b/examples/framework-preact/package.json @@ -12,7 +12,7 @@ "dependencies": { "@astrojs/preact": "^4.0.0", "@preact/signals": "^1.3.0", - "astro": "^5.0.7", + "astro": "^5.0.8", "preact": "^10.24.3" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index ba9133a69425..59bca486bd1d 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -13,7 +13,7 @@ "@astrojs/react": "^4.1.0", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", - "astro": "^5.0.7", + "astro": "^5.0.8", "react": "^18.3.1", "react-dom": "^18.3.1" } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 3ecf46e393eb..8fbaebc3daec 100644 --- a/examples/framework-solid/package.json +++ b/examples/framework-solid/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@astrojs/solid-js": "^5.0.0", - "astro": "^5.0.7", + "astro": "^5.0.8", "solid-js": "^1.9.3" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index 348829ba41cb..3aa869238187 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@astrojs/svelte": "^7.0.1", - "astro": "^5.0.7", + "astro": "^5.0.8", "svelte": "^5.1.16" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 475362a51cf2..0b9e3d5b0eac 100644 --- a/examples/framework-vue/package.json +++ b/examples/framework-vue/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@astrojs/vue": "^5.0.2", - "astro": "^5.0.7", + "astro": "^5.0.8", "vue": "^3.5.12" } } diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json index 72dcd57a35d2..394aa303d48c 100644 --- a/examples/hackernews/package.json +++ b/examples/hackernews/package.json @@ -11,6 +11,6 @@ }, "dependencies": { "@astrojs/node": "^9.0.0", - "astro": "^5.0.7" + "astro": "^5.0.8" } } diff --git a/examples/integration/package.json b/examples/integration/package.json index 2cb34159e795..2a05111f653f 100644 --- a/examples/integration/package.json +++ b/examples/integration/package.json @@ -15,7 +15,7 @@ ], "scripts": {}, "devDependencies": { - "astro": "^5.0.7" + "astro": "^5.0.8" }, "peerDependencies": { "astro": "^4.0.0" diff --git a/examples/minimal/package.json b/examples/minimal/package.json index 055829e5b28c..a614ea6b3b11 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^5.0.7" + "astro": "^5.0.8" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 9fcd04b3ea21..bc4fd55afa88 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -10,6 +10,6 @@ "astro": "astro" }, "dependencies": { - "astro": "^5.0.7" + "astro": "^5.0.8" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index e239490939b0..ae12ac6c3bd4 100644 --- a/examples/ssr/package.json +++ b/examples/ssr/package.json @@ -13,7 +13,7 @@ "dependencies": { "@astrojs/node": "^9.0.0", "@astrojs/svelte": "^7.0.1", - "astro": "^5.0.7", + "astro": "^5.0.8", "svelte": "^5.1.16" } } diff --git a/examples/starlog/package.json b/examples/starlog/package.json index 24e0ae202b94..dbbc6af2fd35 100644 --- a/examples/starlog/package.json +++ b/examples/starlog/package.json @@ -9,7 +9,7 @@ "astro": "astro" }, "dependencies": { - "astro": "^5.0.7", + "astro": "^5.0.8", "sass": "^1.80.6", "sharp": "^0.33.3" } diff --git a/examples/toolbar-app/package.json b/examples/toolbar-app/package.json index 8df62344f553..fc33d2a3eaa2 100644 --- a/examples/toolbar-app/package.json +++ b/examples/toolbar-app/package.json @@ -15,6 +15,6 @@ "./app": "./dist/app.js" }, "devDependencies": { - "astro": "^5.0.7" + "astro": "^5.0.8" } } diff --git a/examples/with-markdoc/package.json b/examples/with-markdoc/package.json index fdaec7edb0c3..ba3392fe3e7d 100644 --- a/examples/with-markdoc/package.json +++ b/examples/with-markdoc/package.json @@ -11,6 +11,6 @@ }, "dependencies": { "@astrojs/markdoc": "^0.12.3", - "astro": "^5.0.7" + "astro": "^5.0.8" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index 329ef978eb90..a75425f8f1b8 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -12,7 +12,7 @@ "dependencies": { "@astrojs/mdx": "^4.0.2", "@astrojs/preact": "^4.0.0", - "astro": "^5.0.7", + "astro": "^5.0.8", "preact": "^10.24.3" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index 5a7569be3afb..7f636e4211ec 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -12,7 +12,7 @@ "dependencies": { "@astrojs/preact": "^4.0.0", "@nanostores/preact": "^0.5.2", - "astro": "^5.0.7", + "astro": "^5.0.8", "nanostores": "^0.11.3", "preact": "^10.24.3" } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index baa6f1c06271..c3d5ce19b034 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -13,7 +13,7 @@ "@astrojs/mdx": "^4.0.2", "@astrojs/tailwind": "^5.1.3", "@types/canvas-confetti": "^1.6.4", - "astro": "^5.0.7", + "astro": "^5.0.8", "autoprefixer": "^10.4.20", "canvas-confetti": "^1.9.3", "postcss": "^8.4.49", diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index 681bfcdee9e1..61df11475109 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -11,7 +11,7 @@ "test": "vitest" }, "dependencies": { - "astro": "^5.0.7", + "astro": "^5.0.8", "vitest": "^2.1.6" } } diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md index e1d4f82d4d36..90c09625ad3a 100644 --- a/packages/astro/CHANGELOG.md +++ b/packages/astro/CHANGELOG.md @@ -1,5 +1,11 @@ # astro +## 5.0.8 + +### Patch Changes + +- [#12749](https://github.com/withastro/astro/pull/12749) [`039d022`](https://github.com/withastro/astro/commit/039d022b1bbaacf9ea83071d27affc5318e0e515) Thanks [@matthewp](https://github.com/matthewp)! - Clean server sourcemaps from static output + ## 5.0.7 ### Patch Changes diff --git a/packages/astro/package.json b/packages/astro/package.json index 109f619ca464..b1b84419707f 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -1,6 +1,6 @@ { "name": "astro", - "version": "5.0.7", + "version": "5.0.8", "description": "Astro is a modern site builder with web best practices, performance, and DX front-of-mind.", "type": "module", "author": "withastro", diff --git a/packages/astro/src/core/build/index.ts b/packages/astro/src/core/build/index.ts index 14bc534ddca2..a31b34ce84a0 100644 --- a/packages/astro/src/core/build/index.ts +++ b/packages/astro/src/core/build/index.ts @@ -205,8 +205,7 @@ class AstroBuilder { key: keyPromise, }; - const { internals, ssrOutputChunkNames } = - await viteBuild(opts); + const { internals, ssrOutputChunkNames } = await viteBuild(opts); const hasServerIslands = this.settings.serverIslandNameMap.size > 0; // Error if there are server islands but no adapter provided. diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts index 8023d9e3b012..ccd0994d6d0f 100644 --- a/packages/astro/src/core/build/static-build.ts +++ b/packages/astro/src/core/build/static-build.ts @@ -356,8 +356,7 @@ async function cleanServerOutput( ) { const out = getOutDirWithinCwd(opts.settings.config.outDir); // The SSR output chunks for Astro are all .mjs files - const files = ssrOutputChunkNames - .filter((f) => f.endsWith('.mjs')); + const files = ssrOutputChunkNames.filter((f) => f.endsWith('.mjs')); if (internals.manifestFileName) { files.push(internals.manifestFileName); } @@ -367,10 +366,7 @@ async function cleanServerOutput( files.map(async (filename) => { const url = new URL(filename, out); const map = new URL(url + '.map'); - await Promise.all([ - fs.promises.rm(url), - fs.promises.rm(new URL(map)).catch((e) => {}) - ]); + await Promise.all([fs.promises.rm(url), fs.promises.rm(new URL(map)).catch((e) => {})]); }), ); @@ -426,7 +422,7 @@ async function ssrMoveAssets(opts: StaticBuildOptions) { cwd: fileURLToPath(serverAssets), }); - console.log("FILES2", files); + console.log('FILES2', files); if (files.length > 0) { await Promise.all( diff --git a/packages/astro/test/astro-basic.test.js b/packages/astro/test/astro-basic.test.js index a780a6cb47ca..0c4908c2d520 100644 --- a/packages/astro/test/astro-basic.test.js +++ b/packages/astro/test/astro-basic.test.js @@ -169,7 +169,7 @@ describe('Astro basic build', () => { it('server sourcemaps not included in output', async () => { const files = await fixture.readdir('/'); - const hasSourcemaps = files.some(fileName => { + const hasSourcemaps = files.some((fileName) => { return fileName.endsWith('.map'); }); assert.equal(hasSourcemaps, false, 'no sourcemap files in output'); diff --git a/packages/astro/test/sourcemap.test.js b/packages/astro/test/sourcemap.test.js index 36cd071a6b98..7040655a35df 100644 --- a/packages/astro/test/sourcemap.test.js +++ b/packages/astro/test/sourcemap.test.js @@ -18,9 +18,9 @@ describe('Sourcemap', async () => { it('Builds non-empty sourcemap', async () => { const assets = await fixture.readdir('/_astro'); - const maps = assets.filter(file => file.endsWith('.map')); + const maps = assets.filter((file) => file.endsWith('.map')); assert.ok(maps.length > 0, 'got source maps'); - for(const mapName of maps) { + for (const mapName of maps) { const filename = `/_astro/${mapName}`; const map = await fixture.readFile(filename); assert.equal(map.includes('"sources":[]'), false); diff --git a/packages/integrations/react/src/index.ts b/packages/integrations/react/src/index.ts index 6df52fb14ba4..b1effa27a044 100644 --- a/packages/integrations/react/src/index.ts +++ b/packages/integrations/react/src/index.ts @@ -60,7 +60,7 @@ function getViteConfiguration( 'react/jsx-runtime', 'react/jsx-dev-runtime', 'react-dom', - 'react-compiler-runtime' + 'react-compiler-runtime', ], exclude: [reactConfig.server], }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f90797f0fe06..a5316d6f331c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -142,7 +142,7 @@ importers: examples/basics: dependencies: astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro examples/blog: @@ -157,13 +157,13 @@ importers: specifier: ^3.2.1 version: link:../../packages/integrations/sitemap astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro examples/component: devDependencies: astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro examples/container-with-vitest: @@ -172,7 +172,7 @@ importers: specifier: ^4.1.0 version: link:../../packages/integrations/react astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro react: specifier: ^18.3.1 @@ -203,7 +203,7 @@ importers: specifier: ^3.14.3 version: 3.14.3 astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro examples/framework-multiple: @@ -230,7 +230,7 @@ importers: specifier: ^18.3.1 version: 18.3.1 astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro preact: specifier: ^10.24.3 @@ -260,7 +260,7 @@ importers: specifier: ^1.3.0 version: 1.3.0(preact@10.24.3) astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro preact: specifier: ^10.24.3 @@ -278,7 +278,7 @@ importers: specifier: ^18.3.1 version: 18.3.1 astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro react: specifier: ^18.3.1 @@ -293,7 +293,7 @@ importers: specifier: ^5.0.0 version: link:../../packages/integrations/solid astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro solid-js: specifier: ^1.9.3 @@ -305,7 +305,7 @@ importers: specifier: ^7.0.1 version: link:../../packages/integrations/svelte astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro svelte: specifier: ^5.1.16 @@ -317,7 +317,7 @@ importers: specifier: ^5.0.2 version: link:../../packages/integrations/vue astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro vue: specifier: ^3.5.12 @@ -329,25 +329,25 @@ importers: specifier: ^9.0.0 version: 9.0.0(astro@packages+astro) astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro examples/integration: devDependencies: astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro examples/minimal: dependencies: astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro examples/portfolio: dependencies: astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro examples/ssr: @@ -359,7 +359,7 @@ importers: specifier: ^7.0.1 version: link:../../packages/integrations/svelte astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro svelte: specifier: ^5.1.16 @@ -368,7 +368,7 @@ importers: examples/starlog: dependencies: astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro sass: specifier: ^1.80.6 @@ -380,7 +380,7 @@ importers: examples/toolbar-app: devDependencies: astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro examples/with-markdoc: @@ -389,7 +389,7 @@ importers: specifier: ^0.12.3 version: link:../../packages/integrations/markdoc astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro examples/with-mdx: @@ -401,7 +401,7 @@ importers: specifier: ^4.0.0 version: link:../../packages/integrations/preact astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro preact: specifier: ^10.24.3 @@ -416,7 +416,7 @@ importers: specifier: ^0.5.2 version: 0.5.2(nanostores@0.11.3)(preact@10.24.3) astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro nanostores: specifier: ^0.11.3 @@ -437,7 +437,7 @@ importers: specifier: ^1.6.4 version: 1.6.4 astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro autoprefixer: specifier: ^10.4.20 @@ -455,7 +455,7 @@ importers: examples/with-vitest: dependencies: astro: - specifier: ^5.0.7 + specifier: ^5.0.8 version: link:../../packages/astro vitest: specifier: ^2.1.6