Revert "Update templates to avoid devDependencies and :global (#4544)" (#4575)

This reverts commit ca2d0728e4.

examples/basics/package.json

@@ -9,7 +9,7 @@
     "preview": "astro preview",
     "astro": "astro"
   },
-  "dependencies": {
+  "devDependencies": {
-    "astro": "^1.1.1"
+    "astro": "^1.1.2"
   }
 }

examples/basics/src/layouts/Layout.astro

@@ -41,19 +41,15 @@ const { title } = Astro.props;
 		margin: 0;
 	}
 
-
+	:global(h1) {
-</style>
-
-<style is:global>
-	h1 {
 		font-size: var(--font-size-xl);
 	}
 
-	h2 {
+	:global(h2) {
 		font-size: var(--font-size-lg);
 	}
 
-	code {
+	:global(code) {
 		font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
 			Bitstream Vera Sans Mono, Courier New, monospace;
 	}

examples/blog/package.json

@@ -9,10 +9,10 @@
     "preview": "astro preview",
     "astro": "astro"
   },
-  "dependencies": {
+  "devDependencies": {
-    "astro": "^1.1.1",
+    "@astrojs/mdx": "^0.10.3",
-    "@astrojs/mdx": "^0.10.2",
     "@astrojs/rss": "^1.0.0",
-    "@astrojs/sitemap": "^1.0.0"
+    "@astrojs/sitemap": "^1.0.0",
+    "astro": "^1.1.2"
   }
 }

examples/component/package.json

@@ -7,12 +7,7 @@
     "build": "astro --root demo build",
     "serve": "astro --root demo preview"
   },
-<<<<<<< HEAD
-  "dependencies": {
-    "astro": "^1.1.1"
-=======
   "devDependencies": {
     "astro": "^1.1.2"
->>>>>>> main
   }
 }

examples/docs/package.json

@@ -11,17 +11,19 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.1",
-    "preact": "^10.7.3",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0",
-    "@astrojs/react": "^1.1.0",
-    "@astrojs/preact": "^1.0.2",
     "@algolia/client-search": "^4.13.1",
     "@docsearch/css": "^3.1.0",
     "@docsearch/react": "^3.1.0",
     "@types/react": "^17.0.45",
+    "preact": "^10.7.3",
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0"
+  },
+  "devDependencies": {
+    "@astrojs/preact": "^1.0.2",
     "@types/node": "^18.0.0",
-    "@types/react-dom": "^18.0.0"
+    "@types/react-dom": "^18.0.0",
+    "@astrojs/react": "^1.1.1",
+    "astro": "^1.1.2"
   }
 }

examples/docs/src/components/Header/Header.astro

@@ -135,15 +135,13 @@ const lang = getLanguageFromURL(currentPage);
 		max-width: 200px;
 	}
 
+	:global(.search-item > *) {
+		flex-grow: 1;
+	}
+
 	@media (min-width: 50em) {
 		.search-item {
 			max-width: 400px;
 		}
 	}
 </style>
-
-<style is:global>
-	.search-item > * {
-		flex-grow: 1;
-	}
-</style>

examples/docs/src/components/LeftSidebar/LeftSidebar.astro

@@ -14,27 +14,25 @@ const sidebar = SIDEBAR[langCode];
 
 <nav aria-labelledby="grid-left">
 	<ul class="nav-groups">
-		{
+		{Object.entries(sidebar).map(([header, children]) => (
-			Object.entries(sidebar).map(([header, children]) => (
+			<li>
-				<li>
+				<div class="nav-group">
-					<div class="nav-group">
+					<h2>{header}</h2>
-						<h2>{header}</h2>
+					<ul>
-						<ul>
+						{children.map((child) => {
-							{children.map((child) => {
+							const url = Astro.site?.pathname + child.link;
-								const url = Astro.site?.pathname + child.link;
+							return (
-								return (
+								<li class="nav-link">
-									<li class="nav-link">
+									<a href={url} aria-current={currentPageMatch === child.link ? 'page' : false}>
-										<a href={url} aria-current={currentPageMatch === child.link ? 'page' : false}>
+										{child.text}
-											{child.text}
+									</a>
-										</a>
+								</li>
-									</li>
+							);
-								);
+						})}
-							})}
+					</ul>
-						</ul>
+				</div>
-					</div>
+			</li>
-				</li>
+		))}
-			))
-		}
 	</ul>
 </nav>
 
@@ -103,15 +101,13 @@ const sidebar = SIDEBAR[langCode];
 		font-weight: 600;
 	}
 
+	:global(:root.theme-dark) .nav-link a[aria-current='page'] {
+		color: hsla(var(--color-base-white), 100%, 1);
+	}
+
 	@media (min-width: 50em) {
 		.nav-groups {
 			padding: 0;
 		}
 	}
 </style>
-
-<style is:global>
-	:root.theme-dark .nav-link a[aria-current='page'] {
-		color: hsla(var(--color-base-white), 100%, 1);
-	}
-</style>

examples/docs/src/layouts/MainLayout.astro

@@ -47,6 +47,11 @@ const githubEditUrl = `${CONFIG.GITHUB_EDIT_URL}/${currentFile}`;
 				overflow-x: hidden;
 			}
 
+			.layout :global(> *) {
+				width: 100%;
+				height: 100%;
+			}
+
 			.grid-sidebar {
 				height: 100vh;
 				position: sticky;
@@ -73,6 +78,15 @@ const githubEditUrl = `${CONFIG.GITHUB_EDIT_URL}/${currentFile}`;
 				display: none;
 			}
 
+			:global(.mobile-sidebar-toggle) {
+				overflow: hidden;
+			}
+
+			:global(.mobile-sidebar-toggle) #grid-left {
+				display: block;
+				top: 2rem;
+			}
+
 			@media (min-width: 50em) {
 				.layout {
 					overflow: initial;
@@ -102,21 +116,6 @@ const githubEditUrl = `${CONFIG.GITHUB_EDIT_URL}/${currentFile}`;
 				}
 			}
 		</style>
-		<style is:global>
-			.layout > * {
-				width: 100%;
-				height: 100%;
-			}
-
-			.mobile-sidebar-toggle {
-				overflow: hidden;
-			}
-
-			.mobile-sidebar-toggle #grid-left {
-				display: block;
-				top: 2rem;
-			}
-		</style>
 	</head>
 
 	<body>

examples/env-vars/package.json

@@ -9,7 +9,7 @@
     "preview": "astro preview",
     "astro": "astro"
   },
-  "dependencies": {
+  "devDependencies": {
-    "astro": "^1.1.1"
+    "astro": "^1.1.2"
   }
 }

examples/framework-alpine/package.json

@@ -9,10 +9,11 @@
     "preview": "astro preview",
     "astro": "astro"
   },
-  "dependencies": {
+  "devDependencies": {
-    "astro": "^1.1.1",
-    "alpinejs": "^3.10.2",
     "@astrojs/alpinejs": "^0.1.1",
-    "@types/alpinejs": "^3.7.0"
+    "@types/alpinejs": "^3.7.0",
-  }
+    "alpinejs": "^3.10.2",
+    "astro": "^1.1.2"
+  },
+  "dependencies": {}
 }

examples/framework-lit/package.json

@@ -9,10 +9,12 @@
     "preview": "astro preview",
     "astro": "astro"
   },
+  "devDependencies": {
+    "@astrojs/lit": "^1.0.1",
+    "astro": "^1.1.2"
+  },
   "dependencies": {
-    "astro": "^1.1.1",
+    "@webcomponents/template-shadowroot": "^0.1.0",
-    "lit": "^2.2.5",
+    "lit": "^2.2.5"
-    "@astrojs/lit": "^1.0.0",
-    "@webcomponents/template-shadowroot": "^0.1.0"
   }
 }

examples/framework-multiple/package.json

@@ -9,8 +9,6 @@
     "preview": "astro preview",
     "astro": "astro"
   },
-<<<<<<< HEAD
-=======
   "devDependencies": {
     "@astrojs/preact": "^1.0.2",
     "@astrojs/react": "^1.1.1",
@@ -19,19 +17,12 @@
     "@astrojs/vue": "^1.0.0",
     "astro": "^1.1.2"
   },
->>>>>>> main
   "dependencies": {
-    "astro": "^1.1.1",
     "preact": "^10.7.3",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "solid-js": "^1.4.3",
     "svelte": "^3.48.0",
-    "vue": "^3.2.37",
+    "vue": "^3.2.37"
-    "@astrojs/preact": "^1.0.2",
-    "@astrojs/react": "^1.1.0",
-    "@astrojs/solid-js": "^1.1.0",
-    "@astrojs/svelte": "^1.0.0",
-    "@astrojs/vue": "^1.0.0"
   }
 }

examples/framework-preact/package.json

@@ -9,9 +9,11 @@
     "preview": "astro preview",
     "astro": "astro"
   },
+  "devDependencies": {
+    "@astrojs/preact": "^1.0.2",
+    "astro": "^1.1.2"
+  },
   "dependencies": {
-    "astro": "^1.1.1",
+    "preact": "^10.7.3"
-    "preact": "^10.7.3",
-    "@astrojs/preact": "^1.0.2"
   }
 }

examples/framework-react/package.json

@@ -9,12 +9,14 @@
     "preview": "astro preview",
     "astro": "astro"
   },
-  "dependencies": {
+  "devDependencies": {
-    "astro": "^1.1.1",
+    "@astrojs/react": "^1.1.1",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0",
-    "@astrojs/react": "^1.1.0",
     "@types/react": "^18.0.10",
-    "@types/react-dom": "^18.0.5"
+    "@types/react-dom": "^18.0.5",
+    "astro": "^1.1.2"
+  },
+  "dependencies": {
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0"
   }
 }

examples/framework-solid/package.json

@@ -9,9 +9,11 @@
     "preview": "astro preview",
     "astro": "astro"
   },
+  "devDependencies": {
+    "@astrojs/solid-js": "^1.1.0",
+    "astro": "^1.1.2"
+  },
   "dependencies": {
-    "astro": "^1.1.1",
+    "solid-js": "^1.4.3"
-    "solid-js": "^1.4.3",
-    "@astrojs/solid-js": "^1.1.0"
   }
 }

examples/framework-svelte/package.json

@@ -9,9 +9,11 @@
     "preview": "astro preview",
     "astro": "astro"
   },
-  "dependencies": {
+  "devDependencies": {
-    "svelte": "^3.48.0",
     "@astrojs/svelte": "^1.0.0",
-    "astro": "^1.1.1"
+    "astro": "^1.1.2"
+  },
+  "dependencies": {
+    "svelte": "^3.48.0"
   }
 }

examples/framework-vue/package.json

@@ -9,9 +9,11 @@
     "preview": "astro preview",
     "astro": "astro"
   },
+  "devDependencies": {
+    "@astrojs/vue": "^1.0.0",
+    "astro": "^1.1.2"
+  },
   "dependencies": {
-    "astro": "^1.1.1",
+    "vue": "^3.2.37"
-    "vue": "^3.2.37",
-    "@astrojs/vue": "^1.0.0"
   }
 }

examples/minimal/package.json

@@ -9,7 +9,7 @@
     "preview": "astro preview",
     "astro": "astro"
   },
-  "dependencies": {
+  "devDependencies": {
-    "astro": "^1.1.1"
+    "astro": "^1.1.2"
   }
 }

examples/non-html-pages/package.json

@@ -9,7 +9,7 @@
     "preview": "astro preview",
     "astro": "astro"
   },
-  "dependencies": {
+  "devDependencies": {
-    "astro": "^1.1.1"
+    "astro": "^1.1.2"
   }
 }

examples/portfolio/package.json

@@ -9,10 +9,12 @@
     "preview": "astro preview",
     "astro": "astro"
   },
-  "dependencies": {
+  "devDependencies": {
-    "preact": "^10.7.3",
     "@astrojs/preact": "^1.0.2",
     "astro": "^1.1.2",
     "sass": "^1.52.2"
+  },
+  "dependencies": {
+    "preact": "^10.7.3"
   }
 }

examples/ssr/package.json

@@ -11,15 +11,15 @@
     "server": "node server/server.mjs"
   },
   "devDependencies": {
-  },
-  "dependencies": {
-    "astro": "^1.1.1",
-    "svelte": "^3.48.0",
-    "@astrojs/svelte": "^1.0.0",
     "@astrojs/node": "^1.0.0",
+    "@astrojs/svelte": "^1.0.0",
+    "astro": "^1.1.2",
     "concurrently": "^7.2.1",
     "lightcookie": "^1.0.25",
     "unocss": "^0.15.6",
     "vite-imagetools": "^4.0.4"
+  },
+  "dependencies": {
+    "svelte": "^3.48.0"
   }
 }

examples/subpath/package.json

@@ -9,10 +9,12 @@
     "preview": "astro preview",
     "astro": "astro"
   },
+  "devDependencies": {
+    "@astrojs/react": "^1.1.1",
+    "astro": "^1.1.2"
+  },
   "dependencies": {
-    "astro": "^1.1.1",
     "react": "^18.1.0",
-    "react-dom": "^18.1.0",
+    "react-dom": "^18.1.0"
-    "@astrojs/react": "^1.1.0"
   }
 }

examples/with-markdown-plugins/package.json

@@ -9,9 +9,9 @@
     "preview": "astro preview",
     "astro": "astro"
   },
-  "dependencies": {
+  "devDependencies": {
-    "astro": "^1.1.1",
+    "@astrojs/markdown-remark": "^1.1.1",
-    "@astrojs/markdown-remark": "^1.1.0",
+    "astro": "^1.1.2",
     "hast-util-select": "5.0.1",
     "rehype-autolink-headings": "^6.1.1",
     "rehype-slug": "^5.0.1",

examples/with-markdown-shiki/package.json

@@ -9,7 +9,8 @@
     "preview": "astro preview",
     "astro": "astro"
   },
-  "dependencies": {
+  "devDependencies": {
-    "astro": "^1.1.1"
+    "@astrojs/markdown-remark": "^1.1.1",
+    "astro": "^1.1.2"
   }
 }

examples/with-mdx/package.json

@@ -9,10 +9,10 @@
     "preview": "astro preview",
     "astro": "astro"
   },
-  "dependencies": {
+  "devDependencies": {
-    "astro": "^1.1.1",
+    "@astrojs/mdx": "^0.10.3",
-    "preact": "^10.6.5",
     "@astrojs/preact": "^1.0.2",
-    "@astrojs/mdx": "^0.10.2"
+    "astro": "^1.1.2",
+    "preact": "^10.6.5"
   }
 }

examples/with-nanostores/package.json

@@ -10,10 +10,12 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^1.1.1",
+    "@nanostores/preact": "^0.1.3",
-    "preact": "^10.7.3",
-    "@astrojs/preact": "^1.0.2",
     "nanostores": "^0.5.12",
-    "@nanostores/preact": "^0.1.3"
+    "preact": "^10.7.3"
+  },
+  "devDependencies": {
+    "@astrojs/preact": "^1.0.2",
+    "astro": "^1.1.2"
   }
 }

examples/with-tailwindcss/package.json

@@ -9,9 +9,9 @@
     "preview": "astro preview",
     "astro": "astro"
   },
-  "dependencies": {
+  "devDependencies": {
-    "astro": "^1.1.1",
     "@astrojs/tailwind": "^1.0.0",
+    "astro": "^1.1.2",
     "autoprefixer": "^10.4.7",
     "canvas-confetti": "^1.5.1",
     "postcss": "^8.4.14",

examples/with-vite-plugin-pwa/package.json

@@ -9,8 +9,8 @@
     "preview": "astro preview",
     "astro": "astro"
   },
-  "dependencies": {
+  "devDependencies": {
-    "astro": "^1.1.1",
+    "astro": "^1.1.2",
     "vite-plugin-pwa": "0.11.11",
     "workbox-window": "^6.5.3"
   }

examples/with-vitest/package.json

@@ -11,8 +11,8 @@
     "astro": "astro",
     "test": "vitest"
   },
-  "dependencies": {
+  "devDependencies": {
-    "astro": "^1.1.1",
+    "astro": "^1.1.2",
     "vitest": "^0.20.3"
   }
 }