Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"commit": false,
"linked": [],
"access": "public",
"baseBranch": "main",
"baseBranch": "next",
"updateInternalDependencies": "patch",
"ignore": []
}
12 changes: 12 additions & 0 deletions .changeset/little-spoons-search.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
"@astrojs/compiler": major
---

Removes the first argument of `$$result.createAstro()`

`$$result.createAstro()` does not accept an `AstroGlobalPartial` as the first argument anymore:

```diff
-const Astro = $$result.createAstro($$Astro, $$props, $$slots);
+const Astro = $$result.createAstro($$props, $$slots);
```
5 changes: 5 additions & 0 deletions .changeset/neat-camels-raise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@astrojs/compiler": major
---

Removes `renderScript` from `TransformOptions`. It is now the default and only behavior
5 changes: 5 additions & 0 deletions .changeset/silver-deers-buy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@astrojs/compiler": major
---

Removes `experimentalScriptOrder` from `TransformOptions`. It is now the default and only behavior
12 changes: 0 additions & 12 deletions cmd/astro-wasm/astro-wasm.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,16 +135,6 @@ func makeTransformOptions(options js.Value) transform.TransformOptions {
scopedStyleStrategy = "where"
}

renderScript := false
if jsBool(options.Get("renderScript")) {
renderScript = true
}

experimentalScriptOrder := false
if jsBool(options.Get("experimentalScriptOrder")) {
experimentalScriptOrder = true
}

return transform.TransformOptions{
Filename: filename,
NormalizedFilename: normalizedFilename,
Expand All @@ -158,8 +148,6 @@ func makeTransformOptions(options js.Value) transform.TransformOptions {
ScopedStyleStrategy: scopedStyleStrategy,
TransitionsAnimationURL: transitionsAnimationURL,
AnnotateSourceFile: annotateSourceFile,
RenderScript: renderScript,
ExperimentalScriptOrder: experimentalScriptOrder,
}
}

Expand Down
2 changes: 1 addition & 1 deletion internal/printer/__printer_js__/Empty_script.snap
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const $$metadata = $$createMetadata(import.meta.url, { modules: [], hydra

const $$Component = $$createComponent(($$result, $$props, $$slots) => {

return $$render``;
return $$render`${$$renderScript($$result,"?astro&type=script&index=0&lang.ts")}`;
}, undefined, undefined);
export default $$Component;
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export const $$metadata = $$createMetadata(import.meta.url, { modules: [{ module
const $$Astro = $$createAstro('https://astro.build');
const Astro = $$Astro;
const $$Component = $$createComponent(($$result, $$props, $$slots) => {
const Astro = $$result.createAstro($$Astro, $$props, $$slots);
const Astro = $$result.createAstro($$props, $$slots);
Astro.self = $$Component;

// Component Imports
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export const $$metadata = $$createMetadata(import.meta.url, { modules: [], hydra
const $$Astro = $$createAstro('https://astro.build');
const Astro = $$Astro;
const $$Component = $$createComponent(($$result, $$props, $$slots) => {
const Astro = $$result.createAstro($$Astro, $$props, $$slots);
const Astro = $$result.createAstro($$props, $$slots);
Astro.self = $$Component;

interface MarkdownFrontmatter {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const $$metadata = $$createMetadata(import.meta.url, { modules: [], hydra
const $$Astro = $$createAstro('https://astro.build');
const Astro = $$Astro;
const $$Component = $$createComponent(($$result, $$props, $$slots) => {
const Astro = $$result.createAstro($$Astro, $$props, $$slots);
const Astro = $$result.createAstro($$props, $$slots);
Astro.self = $$Component;

return $$render`${$$maybeRenderHead($$result)}<div class:list="something"${$$spreadAttributes(Astro.props)}></div>`;
Expand Down
2 changes: 1 addition & 1 deletion internal/printer/__printer_js__/class_with_spread.snap
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const $$metadata = $$createMetadata(import.meta.url, { modules: [], hydra
const $$Astro = $$createAstro('https://astro.build');
const Astro = $$Astro;
const $$Component = $$createComponent(($$result, $$props, $$slots) => {
const Astro = $$result.createAstro($$Astro, $$props, $$slots);
const Astro = $$result.createAstro($$props, $$slots);
Astro.self = $$Component;

return $$render`${$$maybeRenderHead($$result)}<div class="something"${$$spreadAttributes(Astro.props)}></div>`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const $$metadata = $$createMetadata("/projects/app/src/components/RenderN
const $$Astro = $$createAstro('https://astro.build');
const Astro = $$Astro;
const $$RenderNode = $$createComponent(($$result, $$props, $$slots) => {
const Astro = $$result.createAstro($$Astro, $$props, $$slots);
const Astro = $$result.createAstro($$props, $$slots);
Astro.self = $$RenderNode;

return $$render`${($$render`${$$renderComponent($$result,'Fragment',Fragment,{},{"default": () => $$render`${$$renderComponent($$result,'Fragment',Fragment,{},{"default": () => $$render`${$$unescapeHTML(`<${Node.tag} ${stringifyAttributes(Node.attributes)}>`)}`,})}${Node.children.map((child) => ($$render`${$$renderComponent($$result,'Astro.self',Astro.self,{"node":(child)})}`))}${$$renderComponent($$result,'Fragment',Fragment,{},{"default": () => $$render`${$$unescapeHTML(`</${Node.tag}>`)}`,})}`,})}`)}`;
Expand Down
2 changes: 1 addition & 1 deletion internal/printer/__printer_js__/complex_table.snap
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export const $$metadata = $$createMetadata(import.meta.url, { modules: [], hydra
const $$Astro = $$createAstro('https://astro.build');
const Astro = $$Astro;
const $$Component = $$createComponent(($$result, $$props, $$slots) => {
const Astro = $$result.createAstro($$Astro, $$props, $$slots);
const Astro = $$result.createAstro($$props, $$slots);
Astro.self = $$Component;

return $$render`<html lang="en">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const $$metadata = $$createMetadata(import.meta.url, { modules: [], hydra

const $$Component = $$createComponent(($$result, $$props, $$slots) => {

return $$render``;
return $$render`${$$renderScript($$result,"?astro&type=script&index=0&lang.ts")}`;
}, undefined, undefined);
export default $$Component;
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const $$metadata = $$createMetadata(import.meta.url, { modules: [], hydra

const $$Component = $$createComponent(($$result, $$props, $$slots) => {

return $$render`<script>var one = 'one';</script><script>(function(){${$$defineScriptVars({foo:'bar'})}var three = foo;})();</script><script>(function(){${$$defineScriptVars({foo:'bar'})}var four = foo;})();</script>`;
return $$render`<script>var one = 'one';</script>${$$renderScript($$result,"?astro&type=script&index=0&lang.ts")}<script>(function(){${$$defineScriptVars({foo:'bar'})}var three = foo;})();</script><script>(function(){${$$defineScriptVars({foo:'bar'})}var four = foo;})();</script>`;
}, undefined, undefined);
export default $$Component;
```
Expand Down
2 changes: 1 addition & 1 deletion internal/printer/__printer_js__/dynamic_import.snap
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export const $$metadata = $$createMetadata(import.meta.url, { modules: [], hydra
const $$Astro = $$createAstro('https://astro.build');
const Astro = $$Astro;
const $$Component = $$createComponent(async ($$result, $$props, $$slots) => {
const Astro = $$result.createAstro($$Astro, $$props, $$slots);
const Astro = $$result.createAstro($$props, $$slots);
Astro.self = $$Component;

const markdownDocs = await Astro.glob('../markdown/*.md')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export const $$metadata = $$createMetadata(import.meta.url, { modules: [], hydra
const $$Astro = $$createAstro('https://astro.build');
const Astro = $$Astro;
const $$Component = $$createComponent(($$result, $$props, $$slots) => {
const Astro = $$result.createAstro($$Astro, $$props, $$slots);
const Astro = $$result.createAstro($$props, $$slots);
Astro.self = $$Component;

return $$render`${$$renderComponent($$result,'Layout',Layout,{"title":"Welcome to Astro."},{"default": () => $$render`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const $$metadata = $$createMetadata(import.meta.url, { modules: [], hydra
const $$Astro = $$createAstro('https://astro.build');
const Astro = $$Astro;
const $$Component = $$createComponent(($$result, $$props, $$slots) => {
const Astro = $$result.createAstro($$Astro, $$props, $$slots);
const Astro = $$result.createAstro($$props, $$slots);
Astro.self = $$Component;

return $$render`${$$renderComponent($$result,'Layout',Layout,{"title":"Welcome to Astro."},{"default": () => $$render`
Expand Down
2 changes: 1 addition & 1 deletion internal/printer/__printer_js__/import.meta.env.snap
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export async function getStaticPaths() {
});
}
const $$Component = $$createComponent(async ($$result, $$props, $$slots) => {
const Astro = $$result.createAstro($$Astro, $$props, $$slots);
const Astro = $$result.createAstro($$props, $$slots);
Astro.self = $$Component;

const { product } = Astro.props;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const $$metadata = $$createMetadata("/projects/app/src/pages/page.astro",

const $$Page = $$createComponent(($$result, $$props, $$slots) => {

return $$render`${$$renderComponent($$result,'Layout',Layout,{})}`;
return $$render`${$$renderScript($$result,"/projects/app/src/pages/page.astro?astro&type=script&index=0&lang.ts")}${$$renderComponent($$result,'Layout',Layout,{})}`;
}, '/projects/app/src/pages/page.astro', undefined);
export default $$Page;
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const $$metadata = $$createMetadata(import.meta.url, { modules: [], hydra

const $$Component = $$createComponent(($$result, $$props, $$slots) => {

return $$render`${$$maybeRenderHead($$result)}<a class="test">ツ</a>`;
return $$render`${$$renderScript($$result,"?astro&type=script&index=0&lang.ts")}${$$maybeRenderHead($$result)}<a class="test">ツ</a>`;
}, undefined, undefined);
export default $$Component;
```
Expand Down
2 changes: 1 addition & 1 deletion internal/printer/__printer_js__/nested_expressions.snap
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const $$metadata = $$createMetadata(import.meta.url, { modules: [], hydra
const $$Astro = $$createAstro('https://astro.build');
const Astro = $$Astro;
const $$Component = $$createComponent(($$result, $$props, $$slots) => {
const Astro = $$result.createAstro($$Astro, $$props, $$slots);
const Astro = $$result.createAstro($$props, $$slots);
Astro.self = $$Component;

return $$render`${$$maybeRenderHead($$result)}<article>${(previous || next) && $$render`<aside>${previous && $$render`<div>Previous Article: <a rel="prev"${$$addAttribute(new URL(previous.link, Astro.site).pathname, "href")}>${previous.text}</a></div>`}${next && $$render`<div>Next Article: <a rel="next"${$$addAttribute(new URL(next.link, Astro.site).pathname, "href")}>${next.text}</a></div>`}</aside>`}</article>`;
Expand Down
2 changes: 1 addition & 1 deletion internal/printer/__printer_js__/nested_expressions_II.snap
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const $$metadata = $$createMetadata(import.meta.url, { modules: [], hydra
const $$Astro = $$createAstro('https://astro.build');
const Astro = $$Astro;
const $$Component = $$createComponent(($$result, $$props, $$slots) => {
const Astro = $$result.createAstro($$Astro, $$props, $$slots);
const Astro = $$result.createAstro($$props, $$slots);
Astro.self = $$Component;

return $$render`${$$maybeRenderHead($$result)}<article>${(previous || next) && $$render`<aside>${previous && $$render`<div>Previous Article: <a rel="prev"${$$addAttribute(new URL(previous.link, Astro.site).pathname, "href")}>${previous.text}</a></div>`} ${next && $$render`<div>Next Article: <a rel="next"${$$addAttribute(new URL(next.link, Astro.site).pathname, "href")}>${next.text}</a></div>`}</aside>`}</article>`;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

[TestPrinter/script_(renderScript:_true) - 1]
[TestPrinter/script - 1]
## Input

```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const $$metadata = $$createMetadata(import.meta.url, { modules: [], hydra

const $$Component = $$createComponent(($$result, $$props, $$slots) => {

return $$render`${$$maybeRenderHead($$result)}<div></div>`;
return $$render`${$$renderScript($$result,"?astro&type=script&index=0&lang.ts")}${$$maybeRenderHead($$result)}<div></div>`;
}, undefined, undefined);
export default $$Component;
```
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

[TestPrinter/script_external_(renderScript:_true) - 1]
[TestPrinter/script_external - 1]
## Input

```
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

[TestPrinter/script_external_in_expression_(renderScript:_true) - 1]
[TestPrinter/script_external_in_expression - 1]
## Input

```
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const $$metadata = $$createMetadata(import.meta.url, { modules: [], hydra

const $$Component = $$createComponent(($$result, $$props, $$slots) => {

return $$render``;
return $$render`${$$renderScript($$result,"?astro&type=script&index=0&lang.ts")}`;
}, undefined, undefined);
export default $$Component;
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const $$metadata = $$createMetadata(import.meta.url, { modules: [], hydra
const $$Component = $$createComponent(($$result, $$props, $$slots) => {

return $$render`${$$maybeRenderHead($$result)}<main>

${$$renderScript($$result,"?astro&type=script&index=0&lang.ts")}
</main>`;
}, undefined, undefined);
export default $$Component;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

[TestPrinter/script_in_expression_(renderScript:_true) - 1]
[TestPrinter/script_in_expression - 1]
## Input

```
Expand Down

This file was deleted.

This file was deleted.

Loading
Loading