michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
This reverts commit ca2d0728e4.
This commit is contained in:
Dan Jutan 2022-08-31 15:27:36 -04:00 committed by GitHub
parent ca2d0728e4
commit 23d4f80145
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 2824 additions and 2779 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/basics/package.json
View file

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

10
examples/basics/src/layouts/Layout.astro
View file

@ -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;
}

8
examples/blog/package.json
View file

@ -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"
}
}

5
examples/component/package.json
View file

@ -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
}
}

16
examples/docs/package.json
View file

@ -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"
}
}

10
examples/docs/src/components/Header/Header.astro
View file

@ -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>

50
examples/docs/src/components/LeftSidebar/LeftSidebar.astro
View file

@ -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>

29
examples/docs/src/layouts/MainLayout.astro
View file

@ -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>

4
examples/env-vars/package.json
View file

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

11
examples/framework-alpine/package.json
View file

@ -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": {}
}

10
examples/framework-lit/package.json
View file

@ -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"
}
}

11
examples/framework-multiple/package.json
View file

@ -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"
}
}

8
examples/framework-preact/package.json
View file

@ -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"
}
}

14
examples/framework-react/package.json
View file

@ -9,12 +9,14 @@
"preview": "astro preview",
"astro": "astro"
},
"dependencies": {
"astro": "^1.1.1",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"@astrojs/react": "^1.1.0",
"devDependencies": {
"@astrojs/react": "^1.1.1",
"@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"
}
}

8
examples/framework-solid/package.json
View file

@ -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"
}
}

8
examples/framework-svelte/package.json
View file

@ -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"
}
}

8
examples/framework-vue/package.json
View file

@ -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"
}
}

4
examples/minimal/package.json
View file

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

4
examples/non-html-pages/package.json
View file

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

6
examples/portfolio/package.json
View file

@ -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"
}
}

10
examples/ssr/package.json
View file

@ -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"
}
}

8
examples/subpath/package.json
View file

@ -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"
}
}

6
examples/with-markdown-plugins/package.json
View file

@ -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",

5
examples/with-markdown-shiki/package.json
View file

@ -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"
}
}

8
examples/with-mdx/package.json
View file

@ -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"
}
}

10
examples/with-nanostores/package.json
View file

@ -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"
}
}

4
examples/with-tailwindcss/package.json
View file

@ -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",

4
examples/with-vite-plugin-pwa/package.json
View file

@ -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"
}

4
examples/with-vitest/package.json
View file

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

5316
pnpm-lock.yaml
View file

File diff suppressed because it is too large Load diff