Merge branch 'main' into feat/vercel-adapter

withastro · Mar 28, 2022 · ef9e81a · ef9e81a
2 parents a878a5c + 6667c41
commit ef9e81a
Show file tree

Hide file tree

Showing 42 changed files with 210 additions and 62 deletions.
diff --git a/examples/blog-multiple-authors/package.json b/examples/blog-multiple-authors/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/preact": "^0.0.2",
-    "astro": "^0.25.2",
+    "astro": "^0.25.3",
     "sass": "^1.49.9"
   },
   "dependencies": {

diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -9,7 +9,7 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.25.2",
+    "astro": "^0.25.3",
     "@astrojs/preact": "^0.0.2"
   },
   "dependencies": {

diff --git a/examples/component/demo/package.json b/examples/component/demo/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@example/my-component": "workspace:*",
-    "astro": "^0.25.2"
+    "astro": "^0.25.3"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
@@ -8,6 +8,6 @@
     "serve": "astro --project-root demo preview"
   },
   "devDependencies": {
-    "astro": "^0.25.2"
+    "astro": "^0.25.3"
   }
 }
diff --git a/examples/docs/package.json b/examples/docs/package.json
@@ -20,6 +20,6 @@
   "devDependencies": {
     "@astrojs/preact": "^0.0.2",
     "@astrojs/react": "^0.0.2",
-    "astro": "^0.25.2"
+    "astro": "^0.25.3"
   }
 }
diff --git a/examples/env-vars/package.json b/examples/env-vars/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.25.2"
+    "astro": "^0.25.3"
   }
 }
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.25.2"
+    "astro": "^0.25.3"
   }
 }
diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/lit": "^0.0.2",
-    "astro": "^0.25.2"
+    "astro": "^0.25.3"
   },
   "dependencies": {
     "@webcomponents/template-shadowroot": "^0.1.0",

diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json
@@ -15,7 +15,7 @@
     "@astrojs/solid-js": "^0.0.3",
     "@astrojs/svelte": "^0.0.2",
     "@astrojs/vue": "^0.0.2",
-    "astro": "^0.25.2"
+    "astro": "^0.25.3"
   },
   "dependencies": {
     "@webcomponents/template-shadowroot": "^0.1.0",

diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/preact": "^0.0.2",
-    "astro": "^0.25.2"
+    "astro": "^0.25.3"
   },
   "dependencies": {
     "preact": "^10.6.6"

diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/react": "^0.0.2",
-    "astro": "^0.25.2"
+    "astro": "^0.25.3"
   },
   "dependencies": {
     "react": "^17.0.2",

diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/solid-js": "^0.0.3",
-    "astro": "^0.25.2"
+    "astro": "^0.25.3"
   },
   "dependencies": {
     "solid-js": "^1.3.13"

diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/svelte": "^0.0.2",
-    "astro": "^0.25.2"
+    "astro": "^0.25.3"
   },
   "dependencies": {
     "svelte": "^3.46.4"

diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/vue": "^0.0.2",
-    "astro": "^0.25.2"
+    "astro": "^0.25.3"
   },
   "dependencies": {
     "vue": "^3.2.31"

diff --git a/examples/integrations-playground/package.json b/examples/integrations-playground/package.json
@@ -15,7 +15,7 @@
     "@astrojs/sitemap": "^0.0.2",
     "@astrojs/tailwind": "^0.0.2",
     "@astrojs/turbolinks": "^0.0.2",
-    "astro": "^0.25.2"
+    "astro": "^0.25.3"
   },
   "dependencies": {
     "@webcomponents/template-shadowroot": "^0.1.0",

diff --git a/examples/minimal/package.json b/examples/minimal/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.25.2"
+    "astro": "^0.25.3"
   }
 }
diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.25.2"
+    "astro": "^0.25.3"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/preact": "^0.0.2",
-    "astro": "^0.25.2",
+    "astro": "^0.25.3",
     "sass": "^1.49.9"
   },
   "dependencies": {

diff --git a/examples/ssr/package.json b/examples/ssr/package.json
@@ -13,7 +13,7 @@
   "devDependencies": {
     "@astrojs/svelte": "^0.0.2",
     "@astrojs/node": "^0.0.2",
-    "astro": "^0.25.2",
+    "astro": "^0.25.3",
     "concurrently": "^7.0.0",
     "lightcookie": "^1.0.25",
     "unocss": "^0.15.6",

diff --git a/examples/starter/package.json b/examples/starter/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.25.2"
+    "astro": "^0.25.3"
   }
 }
diff --git a/examples/subpath/package.json b/examples/subpath/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/react": "^0.0.2",
-    "astro": "^0.25.2",
+    "astro": "^0.25.3",
     "sass": "^1.49.9"
   },
   "dependencies": {

diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/markdown-remark": "^0.7.0",
-    "astro": "^0.25.2",
+    "astro": "^0.25.3",
     "hast-util-select": "5.0.1",
     "rehype-autolink-headings": "^6.1.1",
     "rehype-slug": "^5.0.1",

diff --git a/examples/with-markdown-shiki/package.json b/examples/with-markdown-shiki/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@astrojs/markdown-remark": "^0.7.0",
-    "astro": "^0.25.2"
+    "astro": "^0.25.3"
   }
 }
diff --git a/examples/with-markdown/package.json b/examples/with-markdown/package.json
@@ -14,7 +14,7 @@
     "@astrojs/react": "^0.0.2",
     "@astrojs/svelte": "^0.0.2",
     "@astrojs/vue": "^0.0.2",
-    "astro": "^0.25.2"
+    "astro": "^0.25.3"
   },
   "dependencies": {
     "preact": "^10.6.6",

diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json
@@ -25,6 +25,6 @@
     "@astrojs/solid-js": "^0.0.3",
     "@astrojs/svelte": "^0.0.2",
     "@astrojs/vue": "^0.0.2",
-    "astro": "^0.25.2"
+    "astro": "^0.25.3"
   }
 }
diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/tailwind": "^0.0.2",
-    "astro": "^0.25.2",
+    "astro": "^0.25.3",
     "autoprefixer": "^10.4.4",
     "canvas-confetti": "^1.5.1",
     "postcss": "^8.4.12",

diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json
@@ -9,7 +9,7 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^0.25.2",
+    "astro": "^0.25.3",
     "vite-plugin-pwa": "0.11.11",
     "workbox-window": "^6.5.2"
   }

diff --git a/packages/astro/CHANGELOG.md b/packages/astro/CHANGELOG.md
@@ -1,5 +1,11 @@
 # astro
 
+## 0.25.3
+
+### Patch Changes
+
+- [#2918](https://github.com/withastro/astro/pull/2918) [`77354c89`](https://github.com/withastro/astro/commit/77354c89bd606beba71231cce6ce935905de68a7) Thanks [@matthewp](https://github.com/matthewp)! - Prevent CSS from being added to the wrong pages
+
 ## 0.25.2
 
 ### Patch Changes

diff --git a/packages/astro/package.json b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astro",
-  "version": "0.25.2",
+  "version": "0.25.3",
   "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/internal.ts b/packages/astro/src/core/build/internal.ts
@@ -105,6 +105,10 @@ export function getPageDataByViteID(internals: BuildInternals, viteid: ViteID):
 	return undefined;
 }
 
+export function hasPageDataByViteID(internals: BuildInternals, viteid: ViteID): boolean {
+	return internals.pagesByViteID.has(viteid);
+}
+
 export function* eachPageData(internals: BuildInternals) {
 	yield* internals.pagesByComponent.values();
 }
diff --git a/packages/astro/src/core/build/scan-based-build.ts b/packages/astro/src/core/build/scan-based-build.ts
@@ -76,6 +76,7 @@ export async function build(opts: ScanBasedBuildOptions): Promise<RollupOutput |
 			}),
 			rollupPluginAstroBuildCSS({
 				internals,
+				legacy: true,
 			}),
 			...(viteConfig.plugins || []),
 		],

diff --git a/packages/astro/src/core/build/static-build.ts b/packages/astro/src/core/build/static-build.ts
@@ -132,7 +132,6 @@ async function ssrBuild(opts: StaticBuildOptions, internals: BuildInternals, inp
 					entryFileNames: opts.buildConfig.serverEntry,
 					chunkFileNames: 'chunks/chunk.[hash].mjs',
 					assetFileNames: 'assets/asset.[hash][extname]',
-					inlineDynamicImports: true,
 				},
 			},
 			// must match an esbuild target
@@ -147,6 +146,7 @@ async function ssrBuild(opts: StaticBuildOptions, internals: BuildInternals, inp
 			vitePluginPages(opts, internals),
 			rollupPluginAstroBuildCSS({
 				internals,
+				legacy: false,
 			}),
 			...(viteConfig.plugins || []),
 			// SSR needs to be last
@@ -200,6 +200,7 @@ async function clientBuild(opts: StaticBuildOptions, internals: BuildInternals,
 			vitePluginHoistedScripts(astroConfig, internals),
 			rollupPluginAstroBuildCSS({
 				internals,
+				legacy: false,
 			}),
 			...(viteConfig.plugins || []),
 		],

diff --git a/packages/astro/src/core/build/vite-plugin-pages.ts b/packages/astro/src/core/build/vite-plugin-pages.ts
@@ -6,7 +6,7 @@ import { eachPageData } from './internal.js';
 import { isBuildingToSSR } from '../util.js';
 
 export const virtualModuleId = '@astrojs-pages-virtual-entry';
-const resolvedVirtualModuleId = '\0' + virtualModuleId;
+export const resolvedVirtualModuleId = '\0' + virtualModuleId;
 
 export function vitePluginPages(opts: StaticBuildOptions, internals: BuildInternals): VitePlugin {
 	return {