Merge branch 'main' into fix/vercel-cjs-bug

withastro · Apr 15, 2022 · 76349ae · 76349ae
2 parents d4f9608 + fa573f0
commit 76349ae
Show file tree

Hide file tree

Showing 87 changed files with 1,151 additions and 784 deletions.
diff --git a/.changeset/clean-cherries-bow.md b/.changeset/clean-cherries-bow.md
diff --git a/.changeset/quick-kangaroos-notice.md b/.changeset/quick-kangaroos-notice.md
diff --git a/.changeset/sharp-moose-perform.md b/.changeset/sharp-moose-perform.md
diff --git a/examples/blog-multiple-authors/package.json b/examples/blog-multiple-authors/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/preact": "^0.1.1",
-    "astro": "^1.0.0-beta.8",
+    "astro": "^1.0.0-beta.12",
     "sass": "^1.50.0"
   },
   "dependencies": {

diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/preact": "^0.1.1",
-    "astro": "^1.0.0-beta.8"
+    "astro": "^1.0.0-beta.12"
   },
   "dependencies": {
     "preact": "^10.7.1"

diff --git a/examples/component/demo/package.json b/examples/component/demo/package.json
@@ -10,6 +10,6 @@
   },
   "devDependencies": {
     "@example/my-component": "workspace:*",
-    "astro": "^1.0.0-beta.8"
+    "astro": "^1.0.0-beta.12"
   }
 }
diff --git a/examples/component/package.json b/examples/component/package.json
@@ -8,6 +8,6 @@
     "serve": "astro --root demo preview"
   },
   "devDependencies": {
-    "astro": "^1.0.0-beta.8"
+    "astro": "^1.0.0-beta.12"
   }
 }
diff --git a/examples/docs/package.json b/examples/docs/package.json
@@ -20,6 +20,6 @@
   "devDependencies": {
     "@astrojs/preact": "^0.1.1",
     "@astrojs/react": "^0.1.0",
-    "astro": "^1.0.0-beta.8"
+    "astro": "^1.0.0-beta.12"
   }
 }
diff --git a/examples/env-vars/package.json b/examples/env-vars/package.json
@@ -9,6 +9,6 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^1.0.0-beta.8"
+    "astro": "^1.0.0-beta.12"
   }
 }
diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json
@@ -9,7 +9,7 @@
     "preview": "astro preview"
   },
   "devDependencies": {
-    "astro": "^1.0.0-beta.8"
+    "astro": "^1.0.0-beta.12"
   },
   "dependencies": {
     "alpinejs": "^3.9.6"

diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/lit": "^0.1.1",
-    "astro": "^1.0.0-beta.8"
+    "astro": "^1.0.0-beta.12"
   },
   "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.1.1",
     "@astrojs/svelte": "^0.1.1",
     "@astrojs/vue": "^0.1.1",
-    "astro": "^1.0.0-beta.8"
+    "astro": "^1.0.0-beta.12"
   },
   "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.1.1",
-    "astro": "^1.0.0-beta.8"
+    "astro": "^1.0.0-beta.12"
   },
   "dependencies": {
     "preact": "^10.7.1"

diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/react": "^0.1.0",
-    "astro": "^1.0.0-beta.8"
+    "astro": "^1.0.0-beta.12"
   },
   "dependencies": {
     "react": "^18.0.0",

diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/solid-js": "^0.1.1",
-    "astro": "^1.0.0-beta.8"
+    "astro": "^1.0.0-beta.12"
   },
   "dependencies": {
     "solid-js": "^1.3.14"

diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/svelte": "^0.1.1",
-    "astro": "^1.0.0-beta.8"
+    "astro": "^1.0.0-beta.12"
   },
   "dependencies": {
     "svelte": "^3.47.0"

diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/vue": "^0.1.1",
-    "astro": "^1.0.0-beta.8"
+    "astro": "^1.0.0-beta.12"
   },
   "dependencies": {
     "vue": "^3.2.31"

diff --git a/examples/integrations-playground/package.json b/examples/integrations-playground/package.json
@@ -13,9 +13,9 @@
     "@astrojs/partytown": "^0.1.2",
     "@astrojs/react": "^0.1.0",
     "@astrojs/sitemap": "^0.1.0",
-    "@astrojs/tailwind": "^0.1.2",
+    "@astrojs/tailwind": "^0.2.0",
     "@astrojs/turbolinks": "^0.1.1",
-    "astro": "^1.0.0-beta.8"
+    "astro": "^1.0.0-beta.12"
   },
   "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": "^1.0.0-beta.8"
+    "astro": "^1.0.0-beta.12"
   }
 }
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": "^1.0.0-beta.8"
+    "astro": "^1.0.0-beta.12"
   }
 }
diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/preact": "^0.1.1",
-    "astro": "^1.0.0-beta.8",
+    "astro": "^1.0.0-beta.12",
     "sass": "^1.50.0"
   },
   "dependencies": {

diff --git a/examples/ssr/package.json b/examples/ssr/package.json
@@ -11,7 +11,7 @@
   "devDependencies": {
     "@astrojs/node": "^0.1.1",
     "@astrojs/svelte": "^0.1.1",
-    "astro": "^1.0.0-beta.8",
+    "astro": "^1.0.0-beta.12",
     "concurrently": "^7.1.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": "^1.0.0-beta.8"
+    "astro": "^1.0.0-beta.12"
   }
 }
diff --git a/examples/starter/public/assets/logo.svg → examples/starter/public/logo.svg b/examples/starter/public/assets/logo.svg → examples/starter/public/logo.svg
diff --git a/examples/starter/src/components/Logo.astro b/examples/starter/src/components/Logo.astro
@@ -0,0 +1,9 @@
+---
+// Export a "Props" interface to .
+export interface Props {
+    height?: number,
+    width?: number,
+}
+const {height = 80, width = 60 } = Astro.props;
+---
+<img height={height} width={width} src="/logo.svg" alt="Astro logo">
diff --git a/examples/starter/src/components/Tour.astro b/examples/starter/src/components/Tour.astro
diff --git a/examples/starter/src/content/Tour.md b/examples/starter/src/content/Tour.md
@@ -0,0 +1,28 @@
+## 🚀 Project Structure
+
+Inside of your Astro project, you'll see the following folders and files:
+
+```
+├── public/
+│   ├── logo.svg
+│   └── favicon.ico
+├── src/
+│   ├── components/
+│   │   └── Logo.astro
+│   ├── content/
+│   │   └── Tour.md
+│   └── pages/
+│       └── index.astro
+└── package.json
+```
+
+Astro looks for `.astro` or `.md` files in the `src/pages/` directory.
+Each page is exposed as a route based on its file name.
+
+There's nothing special about `src/components/`, but that's where we like to put any Astro/React/Vue/Svelte/Preact components.
+
+Any static assets, like images, can be placed in the `public/` directory.
+
+## 👀 Want to learn more?
+
+Check out the [Astro Documentation](https://github.com/withastro/astro) site or jump into our [Discord server](https://astro.build/chat).
diff --git a/examples/starter/src/pages/index.astro b/examples/starter/src/pages/index.astro
@@ -1,10 +1,8 @@
 ---
-// Style Imports
+import {Content as TourContent} from '../content/Tour.md';
+import Logo from '../components/Logo.astro';
 import '../styles/global.css';
 import '../styles/home.css';
-// Component Imports
-import Tour from '../components/Tour.astro';
-// You can import components from any supported Framework here!
 /* ASTRO:COMPONENT_IMPORTS */
 
 // Component Script:
@@ -31,25 +29,51 @@ let title = 'My Astro Site';
 			gap: 1em;
 			max-width: min(100%, 68ch);
 		}
+		article {
+			padding-top: 2em;
+			line-height: 1.5;
+			display: flex;
+			flex-direction: column;
+			gap: 1em;
+			max-width: 70ch;
+		}
+		.banner {
+			text-align: center;
+			font-size: 1.2rem;
+			background: var(--color-light);
+			padding: 1em 1.5em;
+			padding-left: 0.75em;
+			border-radius: 4px;
+		}
+	</style>
+	<style is:global>
+		pre {
+			padding: 1rem;
+		}
 	</style>
 </head>
 <body>
 	<main>
 		<header>
 			<div>
-				<img width="60" height="80" src="/assets/logo.svg" alt="Astro logo">
+				<Logo width={60} height={80} />
 				<h1>Welcome to <a href="https://astro.build/">Astro</a></h1>
 			</div>
 		</header>
 
-		<Tour />
+		<article>
+			<div class="banner">
+				<p><strong>🧑‍🚀 Seasoned astronaut?</strong> Delete this template and have fun!</p>
+			</div>
+			<TourContent />
+		</article>
 
 		<!--
 
 		You can also use imported framework components directly in your markup!
 		
 		Note: by default, these components are NOT interactive on the client.
-		The `:visible` directive tells Astro to make it interactive.
+		The `client:visible` directive tells Astro to make it interactive.
 		
 		See https://docs.astro.build/core-concepts/component-hydration/ 
 

diff --git a/examples/subpath/package.json b/examples/subpath/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "@astrojs/react": "^0.1.0",
-    "astro": "^1.0.0-beta.8",
+    "astro": "^1.0.0-beta.12",
     "sass": "^1.50.0"
   },
   "dependencies": {