-
\ No newline at end of file
diff --git a/examples/snowpack/astro/layouts/main.hmx b/examples/snowpack/astro/layouts/main.hmx
index c0793e3b8..d66a96baf 100644
--- a/examples/snowpack/astro/layouts/main.hmx
+++ b/examples/snowpack/astro/layouts/main.hmx
@@ -6,24 +6,16 @@
}
+- {context.title} -
-
-
+
-
-
-
\ No newline at end of file
+
+
-
+
+
+ + {context.title} +
+
+
-
+
+
+
-
-
-
+
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/examples/snowpack/astro/layouts/post.hmx b/examples/snowpack/astro/layouts/post.hmx
index f71824483..aca8fc6c0 100644
--- a/examples/snowpack/astro/layouts/post.hmx
+++ b/examples/snowpack/astro/layouts/post.hmx
@@ -1,143 +1,141 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
-
-
- -
+
+ +
+
-
+
+
-
-
+
+
+
+
\ No newline at end of file
diff --git a/examples/snowpack/astro/pages/guides.hmx b/examples/snowpack/astro/pages/guides.hmx
index 2bf7f2cc3..0c56ce5a4 100644
--- a/examples/snowpack/astro/pages/guides.hmx
+++ b/examples/snowpack/astro/pages/guides.hmx
@@ -42,38 +42,32 @@
}
-+ {context.title} +
-+ Using Snowpack +
-- {context.title} -
- -- Using Snowpack -
- -
-
-
- -
- {context.guides.map((post) => {
- return
- {post.title} ; - })} -
-
- -
- Popular Integration Guides -
- -
- {context.communityGuides.map((post) => {
- return
-
+
+
+
-
\ No newline at end of file
+
+-
+ {context.guides.map((post) => {
+ return
- {post.title} ; })} -
+
+ +
+ Popular Integration Guides +
+ +
+ {context.communityGuides.map((post) => {
+ return
+
\ No newline at end of file
diff --git a/examples/snowpack/astro/pages/index.hmx b/examples/snowpack/astro/pages/index.hmx
index 03f03f8ce..82568f246 100644
--- a/examples/snowpack/astro/pages/index.hmx
+++ b/examples/snowpack/astro/pages/index.hmx
@@ -3,95 +3,91 @@
import Hero from '../components/Hero.hmx';
export const layout = 'layouts/base.hmx';
- export function setup({context}) {
+ export function setup({ context }) {
return {}
}
-
-
-
-
-
-
-
+
-
-
-
- 
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/examples/snowpack/astro/pages/news.hmx b/examples/snowpack/astro/pages/news.hmx
index f1350ed3f..51b7f616e 100644
--- a/examples/snowpack/astro/pages/news.hmx
+++ b/examples/snowpack/astro/pages/news.hmx
@@ -25,58 +25,54 @@
}
-
-
-
-
-
+
+
-
-
- - Snowpack is a lightning-fast frontend build tool, designed for the modern web. - It is an alternative to heavier, more complex bundlers like webpack or Parcel in your development - workflow. Snowpack leverages JavaScript's native module system (known - as - ESM) to avoid unnecessary work and stay fast no matter how big your project grows. -
-Once you try it, it's impossible to go back to anything else.
--
-
-
-
Instant startup
- Snowpack's unbundled web development server - starts up in 50ms or less - and stays fast in large projects. -
- -
-
Build once, cache forever
- Snowpack never builds the same file twice. Powered by JavaScript’s native module system (ESM) in the - browser. -
- -
-
HMR feat. Fast Refresh
- No refresh required. See changes reflected instantly in the browser with - HMR + Fast Refresh - for React, Preact & Svelte. -
- -
-
Out-of-the-box support
- Enjoy Snowpack's built-in support for JSX, TypeScript, React, Preact, CSS Modules - and more. -
- -
-
Optimize for production
- Build for production with built-in optimizations and plugin support for your favorite bundlers. -
- -
-
Plugins? Plugins!
- Babel? Sass? MDX? Browse the entire - Snowpack Plugin Catalog - to connect your favorite build tool (or - create your own!) -
-
+
+
+
+
+
+
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
-
+
+
+
+
-
+
+
+ + Snowpack is a lightning-fast frontend build tool, designed for the modern web. + It is an alternative to heavier, more complex bundlers like webpack or Parcel in your development + workflow. Snowpack leverages JavaScript's native module system (known + as + ESM) to avoid unnecessary work and stay fast no matter how big your project grows. +
+Once you try it, it's impossible to go back to anything else.
+-
+
-
+
Instant startup
+ Snowpack's unbundled web development server + starts up in 50ms or less + and stays fast in large projects. +
+ -
+
Build once, cache forever
+ Snowpack never builds the same file twice. Powered by JavaScript’s native module system (ESM) in the + browser. +
+ -
+
HMR feat. Fast Refresh
+ No refresh required. See changes reflected instantly in the browser with + HMR + Fast Refresh + for React, Preact & Svelte. +
+ -
+
Out-of-the-box support
+ Enjoy Snowpack's built-in support for JSX, TypeScript, React, Preact, CSS Modules + and more. +
+ -
+
Optimize for production
+ Build for production with built-in optimizations and plugin support for your favorite bundlers. +
+ -
+
Plugins? Plugins!
+ Babel? Sass? MDX? Browse the entire + Snowpack Plugin Catalog + to connect your favorite build tool (or + create your own!) +
+
+ Get the latest news, blog posts, and tutorials on Snowpack. Also available via RSS. +
-- Get the latest news, blog posts, and tutorials on Snowpack. Also available via RSS. -
++ Got something that you think we should feature? + Submit it! +
-- Got something that you think we should feature? - Submit it! -
++ In case you're curious, the best pokemon is {context.pokemonData.name}. +
-- In case you're curious, the best pokemon is {context.pokemonData.name}. -
+
+
+ 
+
-
-
+
-
\ No newline at end of file
+();
let headItem: JsxItem | undefined;
- let bodyItem: JsxItem | undefined;
let items: JsxItem[] = [];
- let mode: 'JSX' | 'SCRIPT' | 'SLOT' = 'JSX';
let collectionItem: JsxItem | undefined;
let currentItemName: string | undefined;
let currentDepth = 0;
@@ -225,10 +223,6 @@ export async function codegen(ast: Ast, { compileOptions }: CodeGenOptions): Pro
}
collectionItem!.jsx += `,(${code.trim().replace(/\;$/, '')})`;
return;
- case 'Slot':
- mode = 'SLOT';
- collectionItem!.jsx += `,child`;
- return;
case 'Comment':
return;
case 'Fragment':
@@ -239,8 +233,8 @@ export async function codegen(ast: Ast, { compileOptions }: CodeGenOptions): Pro
}
break;
+ case 'Slot':
case 'Head':
- case 'Body':
case 'InlineComponent':
case 'Title':
case 'Element': {
@@ -251,7 +245,6 @@ export async function codegen(ast: Ast, { compileOptions }: CodeGenOptions): Pro
const attributes = getAttributes(node.attributes);
currentDepth++;
currentItemName = name;
-
if (!collectionItem) {
collectionItem = { name, jsx: '' };
if (node.type === 'Head') {
@@ -259,14 +252,13 @@ export async function codegen(ast: Ast, { compileOptions }: CodeGenOptions): Pro
headItem = collectionItem;
return;
}
- if (node.type === 'Body') {
- collectionItem.jsx += `h(Fragment, null`;
- bodyItem = collectionItem;
- return;
- }
items.push(collectionItem);
}
collectionItem.jsx += collectionItem.jsx === '' ? '' : ',';
+ if (node.type === 'Slot') {
+ collectionItem.jsx += `(children`;
+ return;
+ }
const COMPONENT_NAME_SCANNER = /^[A-Z]/;
if (!COMPONENT_NAME_SCANNER.test(name)) {
collectionItem.jsx += `h("${name}", ${attributes ? generateAttributes(attributes) : 'null'}`;
@@ -296,9 +288,6 @@ export async function codegen(ast: Ast, { compileOptions }: CodeGenOptions): Pro
}
case 'Text': {
const text = getTextFromAttribute(node);
- if (mode === 'SLOT') {
- return;
- }
if (!text.trim()) {
return;
}
@@ -323,17 +312,11 @@ export async function codegen(ast: Ast, { compileOptions }: CodeGenOptions): Pro
case 'Attribute':
case 'Comment':
return;
- case 'Slot': {
- const name = node.name;
- if (name === 'slot') {
- mode = 'JSX';
- }
- return;
- }
case 'Fragment':
if (!collectionItem) {
return;
}
+ case 'Slot':
case 'Head':
case 'Body':
case 'Title':
@@ -360,7 +343,6 @@ export async function codegen(ast: Ast, { compileOptions }: CodeGenOptions): Pro
return {
script: script + '\n' + Array.from(additionalImports).join('\n'),
head: headItem,
- body: bodyItem,
items,
};
}
diff --git a/src/compiler/parse/state/tag.ts b/src/compiler/parse/state/tag.ts
index 898aaed12..8ce297bfd 100644
--- a/src/compiler/parse/state/tag.ts
+++ b/src/compiler/parse/state/tag.ts
@@ -14,8 +14,8 @@ import list from '../../utils/list.js';
const valid_tag_name = /^\!?[a-zA-Z]{1,}:?[a-zA-Z0-9\-]*/;
const meta_tags = new Map([
- ['slot:head', 'Head'],
- ['slot:body', 'Body'],
+ ['astro:head', 'Head'],
+ // ['slot:body', 'Body'],
// ['astro:options', 'Options'],
// ['astro:window', 'Window'],
// ['astro:body', 'Body'],
diff --git a/src/optimize/styles.ts b/src/optimize/styles.ts
index 1353cb006..abb69810b 100644
--- a/src/optimize/styles.ts
+++ b/src/optimize/styles.ts
@@ -134,7 +134,7 @@ export default function ({ filename, fileID }: { filename: string; fileID: strin
const code = node.content.styles;
const typeAttr = (node.attributes || []).find(({ name }: { name: string }) => name === 'type');
styleNodes.push(node);
- styleTransformPromises.push(transformStyle(code, { type: (typeAttr.value[0] && typeAttr.value[0].raw) || undefined, filename, fileID }));
+ styleTransformPromises.push(transformStyle(code, { type: (typeAttr && typeAttr.value[0] && typeAttr.value[0].raw) || undefined, filename, fileID }));
// TODO: we should delete the old untransformed
+ Join us on Discord to discuss Snowpack, meet other developers in our community, and show off what you’re
+ working on!
+
-
-
-
+ {context.news.reverse().map((item) =>
+
- {context.news.reverse().map((item) =>
-
- Join us on Discord to discuss Snowpack, meet other developers in our community, and show off what you’re
- working on!
-
+
+
\ No newline at end of file
diff --git a/examples/snowpack/astro/pages/plugins.hmx b/examples/snowpack/astro/pages/plugins.hmx
index 8749f0169..31dd04b49 100644
--- a/examples/snowpack/astro/pages/plugins.hmx
+++ b/examples/snowpack/astro/pages/plugins.hmx
@@ -13,19 +13,14 @@
}
-Who's Using Snowpack?
+ +
+
+ {context.users.map((user) =>
+
-
-
\ No newline at end of file
+ + { context.title } +
-- { context.title } -
+Customize Snowpack with optimized build plugins.
+To learn more about our plugin system, check out the
+ Plugin API.
Can't find what you need?
+ Creating your own plugin is easy!
+
Customize Snowpack with optimized build plugins.
-To learn more about our plugin system, check out the
- Plugin API.
Can't find what you need?
- Creating your own plugin is easy!
-