diff options
Diffstat (limited to 'examples')
29 files changed, 141 insertions, 144 deletions
diff --git a/examples/basics/package.json b/examples/basics/package.json index 7b3979053..1e72ea317 100644 --- a/examples/basics/package.json +++ b/examples/basics/package.json @@ -9,7 +9,7 @@ "preview": "astro preview", "astro": "astro" }, - "dependencies": { - "astro": "^1.1.1" + "devDependencies": { + "astro": "^1.1.2" } } diff --git a/examples/basics/src/layouts/Layout.astro b/examples/basics/src/layouts/Layout.astro index 5c724bfdd..e39be4386 100644 --- a/examples/basics/src/layouts/Layout.astro +++ b/examples/basics/src/layouts/Layout.astro @@ -41,19 +41,15 @@ const { title } = Astro.props; margin: 0; } - -</style> - -<style is:global> - h1 { + :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; } diff --git a/examples/blog/package.json b/examples/blog/package.json index ca816c91c..a9278490c 100644 --- a/examples/blog/package.json +++ b/examples/blog/package.json @@ -9,10 +9,10 @@ "preview": "astro preview", "astro": "astro" }, - "dependencies": { - "astro": "^1.1.1", - "@astrojs/mdx": "^0.10.2", + "devDependencies": { + "@astrojs/mdx": "^0.10.3", "@astrojs/rss": "^1.0.0", - "@astrojs/sitemap": "^1.0.0" + "@astrojs/sitemap": "^1.0.0", + "astro": "^1.1.2" } } diff --git a/examples/component/package.json b/examples/component/package.json index 667fbf4ae..2abbbd270 100644 --- a/examples/component/package.json +++ b/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 } } diff --git a/examples/docs/package.json b/examples/docs/package.json index 034a1a47e..5ed95a744 100644 --- a/examples/docs/package.json +++ b/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" } } diff --git a/examples/docs/src/components/Header/Header.astro b/examples/docs/src/components/Header/Header.astro index 58fe46ee9..bada732a6 100644 --- a/examples/docs/src/components/Header/Header.astro +++ b/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> diff --git a/examples/docs/src/components/LeftSidebar/LeftSidebar.astro b/examples/docs/src/components/LeftSidebar/LeftSidebar.astro index 90aae26e2..d0fe8da4e 100644 --- a/examples/docs/src/components/LeftSidebar/LeftSidebar.astro +++ b/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]) => ( - <li> - <div class="nav-group"> - <h2>{header}</h2> - <ul> - {children.map((child) => { - const url = Astro.site?.pathname + child.link; - return ( - <li class="nav-link"> - <a href={url} aria-current={currentPageMatch === child.link ? 'page' : false}> - {child.text} - </a> - </li> - ); - })} - </ul> - </div> - </li> - )) - } + {Object.entries(sidebar).map(([header, children]) => ( + <li> + <div class="nav-group"> + <h2>{header}</h2> + <ul> + {children.map((child) => { + const url = Astro.site?.pathname + child.link; + return ( + <li class="nav-link"> + <a href={url} aria-current={currentPageMatch === child.link ? 'page' : false}> + {child.text} + </a> + </li> + ); + })} + </ul> + </div> + </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> diff --git a/examples/docs/src/layouts/MainLayout.astro b/examples/docs/src/layouts/MainLayout.astro index 60d43922a..79a2f81a9 100644 --- a/examples/docs/src/layouts/MainLayout.astro +++ b/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> diff --git a/examples/env-vars/package.json b/examples/env-vars/package.json index 268bce3fb..7c4ea8bd0 100644 --- a/examples/env-vars/package.json +++ b/examples/env-vars/package.json @@ -9,7 +9,7 @@ "preview": "astro preview", "astro": "astro" }, - "dependencies": { - "astro": "^1.1.1" + "devDependencies": { + "astro": "^1.1.2" } } diff --git a/examples/framework-alpine/package.json b/examples/framework-alpine/package.json index ca5fa96a2..c8d3ccca6 100644 --- a/examples/framework-alpine/package.json +++ b/examples/framework-alpine/package.json @@ -9,10 +9,11 @@ "preview": "astro preview", "astro": "astro" }, - "dependencies": { - "astro": "^1.1.1", - "alpinejs": "^3.10.2", + "devDependencies": { "@astrojs/alpinejs": "^0.1.1", - "@types/alpinejs": "^3.7.0" - } + "@types/alpinejs": "^3.7.0", + "alpinejs": "^3.10.2", + "astro": "^1.1.2" + }, + "dependencies": {} } diff --git a/examples/framework-lit/package.json b/examples/framework-lit/package.json index e7d54b897..a229f00ef 100644 --- a/examples/framework-lit/package.json +++ b/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", - "lit": "^2.2.5", - "@astrojs/lit": "^1.0.0", - "@webcomponents/template-shadowroot": "^0.1.0" + "@webcomponents/template-shadowroot": "^0.1.0", + "lit": "^2.2.5" } } diff --git a/examples/framework-multiple/package.json b/examples/framework-multiple/package.json index 5f4639bbd..b6def4f16 100644 --- a/examples/framework-multiple/package.json +++ b/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", - "@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" + "vue": "^3.2.37" } } diff --git a/examples/framework-preact/package.json b/examples/framework-preact/package.json index 4895418e0..b3a57ca3f 100644 --- a/examples/framework-preact/package.json +++ b/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", - "@astrojs/preact": "^1.0.2" + "preact": "^10.7.3" } } diff --git a/examples/framework-react/package.json b/examples/framework-react/package.json index 8b8b49789..f8c3958e7 100644 --- a/examples/framework-react/package.json +++ b/examples/framework-react/package.json @@ -9,12 +9,14 @@ "preview": "astro preview", "astro": "astro" }, + "devDependencies": { + "@astrojs/react": "^1.1.1", + "@types/react": "^18.0.10", + "@types/react-dom": "^18.0.5", + "astro": "^1.1.2" + }, "dependencies": { - "astro": "^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" + "react-dom": "^18.1.0" } } diff --git a/examples/framework-solid/package.json b/examples/framework-solid/package.json index 04f0f10e3..3bb81433a 100644 --- a/examples/framework-solid/package.json +++ b/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", - "@astrojs/solid-js": "^1.1.0" + "solid-js": "^1.4.3" } } diff --git a/examples/framework-svelte/package.json b/examples/framework-svelte/package.json index c56a0c87c..c33496ffe 100644 --- a/examples/framework-svelte/package.json +++ b/examples/framework-svelte/package.json @@ -9,9 +9,11 @@ "preview": "astro preview", "astro": "astro" }, - "dependencies": { - "svelte": "^3.48.0", + "devDependencies": { "@astrojs/svelte": "^1.0.0", - "astro": "^1.1.1" + "astro": "^1.1.2" + }, + "dependencies": { + "svelte": "^3.48.0" } } diff --git a/examples/framework-vue/package.json b/examples/framework-vue/package.json index 6b7baebeb..292d2cdad 100644 --- a/examples/framework-vue/package.json +++ b/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", - "@astrojs/vue": "^1.0.0" + "vue": "^3.2.37" } } diff --git a/examples/minimal/package.json b/examples/minimal/package.json index 04d398ca3..a4a670d94 100644 --- a/examples/minimal/package.json +++ b/examples/minimal/package.json @@ -9,7 +9,7 @@ "preview": "astro preview", "astro": "astro" }, - "dependencies": { - "astro": "^1.1.1" + "devDependencies": { + "astro": "^1.1.2" } } diff --git a/examples/non-html-pages/package.json b/examples/non-html-pages/package.json index 92a78a5e2..cacd793ea 100644 --- a/examples/non-html-pages/package.json +++ b/examples/non-html-pages/package.json @@ -9,7 +9,7 @@ "preview": "astro preview", "astro": "astro" }, - "dependencies": { - "astro": "^1.1.1" + "devDependencies": { + "astro": "^1.1.2" } } diff --git a/examples/portfolio/package.json b/examples/portfolio/package.json index 522b972a9..b1c724cf4 100644 --- a/examples/portfolio/package.json +++ b/examples/portfolio/package.json @@ -9,10 +9,12 @@ "preview": "astro preview", "astro": "astro" }, - "dependencies": { - "preact": "^10.7.3", + "devDependencies": { "@astrojs/preact": "^1.0.2", "astro": "^1.1.2", "sass": "^1.52.2" + }, + "dependencies": { + "preact": "^10.7.3" } } diff --git a/examples/ssr/package.json b/examples/ssr/package.json index 99d2f3e07..e5191a5c6 100644 --- a/examples/ssr/package.json +++ b/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" } } diff --git a/examples/subpath/package.json b/examples/subpath/package.json index 97b96a054..b46b1f7dd 100644 --- a/examples/subpath/package.json +++ b/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", - "@astrojs/react": "^1.1.0" + "react-dom": "^18.1.0" } } diff --git a/examples/with-markdown-plugins/package.json b/examples/with-markdown-plugins/package.json index 25bd8bc50..58cb5f8ff 100644 --- a/examples/with-markdown-plugins/package.json +++ b/examples/with-markdown-plugins/package.json @@ -9,9 +9,9 @@ "preview": "astro preview", "astro": "astro" }, - "dependencies": { - "astro": "^1.1.1", - "@astrojs/markdown-remark": "^1.1.0", + "devDependencies": { + "@astrojs/markdown-remark": "^1.1.1", + "astro": "^1.1.2", "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 index d6e724038..026c5e20e 100644 --- a/examples/with-markdown-shiki/package.json +++ b/examples/with-markdown-shiki/package.json @@ -9,7 +9,8 @@ "preview": "astro preview", "astro": "astro" }, - "dependencies": { - "astro": "^1.1.1" + "devDependencies": { + "@astrojs/markdown-remark": "^1.1.1", + "astro": "^1.1.2" } } diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json index dbc50912e..eae11685e 100644 --- a/examples/with-mdx/package.json +++ b/examples/with-mdx/package.json @@ -9,10 +9,10 @@ "preview": "astro preview", "astro": "astro" }, - "dependencies": { - "astro": "^1.1.1", - "preact": "^10.6.5", + "devDependencies": { + "@astrojs/mdx": "^0.10.3", "@astrojs/preact": "^1.0.2", - "@astrojs/mdx": "^0.10.2" + "astro": "^1.1.2", + "preact": "^10.6.5" } } diff --git a/examples/with-nanostores/package.json b/examples/with-nanostores/package.json index a34f2f3e4..2df7d723c 100644 --- a/examples/with-nanostores/package.json +++ b/examples/with-nanostores/package.json @@ -10,10 +10,12 @@ "astro": "astro" }, "dependencies": { - "astro": "^1.1.1", - "preact": "^10.7.3", - "@astrojs/preact": "^1.0.2", + "@nanostores/preact": "^0.1.3", "nanostores": "^0.5.12", - "@nanostores/preact": "^0.1.3" + "preact": "^10.7.3" + }, + "devDependencies": { + "@astrojs/preact": "^1.0.2", + "astro": "^1.1.2" } } diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json index 1a474d385..1995cdb42 100644 --- a/examples/with-tailwindcss/package.json +++ b/examples/with-tailwindcss/package.json @@ -9,9 +9,9 @@ "preview": "astro preview", "astro": "astro" }, - "dependencies": { - "astro": "^1.1.1", + "devDependencies": { "@astrojs/tailwind": "^1.0.0", + "astro": "^1.1.2", "autoprefixer": "^10.4.7", "canvas-confetti": "^1.5.1", "postcss": "^8.4.14", diff --git a/examples/with-vite-plugin-pwa/package.json b/examples/with-vite-plugin-pwa/package.json index d50881323..5e136750e 100644 --- a/examples/with-vite-plugin-pwa/package.json +++ b/examples/with-vite-plugin-pwa/package.json @@ -9,8 +9,8 @@ "preview": "astro preview", "astro": "astro" }, - "dependencies": { - "astro": "^1.1.1", + "devDependencies": { + "astro": "^1.1.2", "vite-plugin-pwa": "0.11.11", "workbox-window": "^6.5.3" } diff --git a/examples/with-vitest/package.json b/examples/with-vitest/package.json index d7aa60d2a..f61b9eae7 100644 --- a/examples/with-vitest/package.json +++ b/examples/with-vitest/package.json @@ -11,8 +11,8 @@ "astro": "astro", "test": "vitest" }, - "dependencies": { - "astro": "^1.1.1", + "devDependencies": { + "astro": "^1.1.2", "vitest": "^0.20.3" } } |