Merge branch 'next' into feat/remove-render-script-option

Author: florian-lefebvre

.changeset/silver-deers-buy.md

@@ -0,0 +1,5 @@
+---
+"@astrojs/compiler": major
+---
+
+Removes `experimentalScriptOrder` from `TransformOptions`. It is now the default and only behavior

cmd/astro-wasm/astro-wasm.go

@@ -135,11 +135,6 @@ func makeTransformOptions(options js.Value) transform.TransformOptions {
 		scopedStyleStrategy = "where"
 	}
 
-	experimentalScriptOrder := false
-	if jsBool(options.Get("experimentalScriptOrder")) {
-		experimentalScriptOrder = true
-	}
-
 	return transform.TransformOptions{
 		Filename:                filename,
 		NormalizedFilename:      normalizedFilename,
@@ -153,7 +148,6 @@ func makeTransformOptions(options js.Value) transform.TransformOptions {
 		ScopedStyleStrategy:     scopedStyleStrategy,
 		TransitionsAnimationURL: transitionsAnimationURL,
 		AnnotateSourceFile:      annotateSourceFile,
-		ExperimentalScriptOrder: experimentalScriptOrder,
 	}
 }
 

internal/printer/printer_css_test.go

@@ -87,7 +87,7 @@ func TestPrinterCSS(t *testing.T) {
 			}
 
 			hash := astro.HashString(code)
-			opts := transform.TransformOptions{Scope: hash, ScopedStyleStrategy: scopedStyleStrategy, ExperimentalScriptOrder: true}
+			opts := transform.TransformOptions{Scope: hash, ScopedStyleStrategy: scopedStyleStrategy}
 			transform.ExtractStyles(doc, &opts)
 			transform.Transform(doc, opts, handler.NewHandler(code, "/test.astro")) // note: we want to test Transform in context here, but more advanced cases could be tested separately
 			result := PrintCSS(code, doc, transform.TransformOptions{

internal/printer/printer_test.go

@@ -2073,7 +2073,6 @@ import Analytics from '../components/Analytics.astro';
 			hash := astro.HashString(code)
 			transformOptions := transform.TransformOptions{
 				Scope:                   hash,
-				ExperimentalScriptOrder: true,
 			}
 			transform.ExtractStyles(doc, &transformOptions)
 			transform.Transform(doc, transformOptions, h) // note: we want to test Transform in context here, but more advanced cases could be tested separately

internal/transform/transform.go

@@ -34,7 +34,6 @@ type TransformOptions struct {
 	ResolvePath             func(string) string
 	PreprocessStyle         interface{}
 	AnnotateSourceFile      bool
-	ExperimentalScriptOrder bool
 }
 
 func Transform(doc *astro.Node, opts TransformOptions, h *handler.Handler) *astro.Node {
@@ -120,11 +119,7 @@ func ExtractStyles(doc *astro.Node, opts *TransformOptions) {
 				return
 			}
 			// append node to maintain authored order
-			if opts.ExperimentalScriptOrder {
-				doc.Styles = append(doc.Styles, n)
-			} else {
-				doc.Styles = append([]*astro.Node{n}, doc.Styles...)
-			}
+			doc.Styles = append(doc.Styles, n)
 		}
 	})
 	// Important! Remove styles from original location *after* walking the doc
@@ -434,11 +429,7 @@ func ExtractScript(doc *astro.Node, n *astro.Node, opts *TransformOptions, h *ha
 
 			// append node to maintain authored order
 			if shouldAdd {
-				if opts.ExperimentalScriptOrder {
-					doc.Scripts = append(doc.Scripts, n)
-				} else {
-					doc.Scripts = append([]*astro.Node{n}, doc.Scripts...)
-				}
+				doc.Scripts = append(doc.Scripts, n)
 				n.HandledScript = true
 			}
 		} else {

packages/compiler/src/shared/types.ts

@@ -59,7 +59,6 @@ export interface TransformOptions {
 		attrs: Record<string, string>
 	) => null | Promise<PreprocessorResult | PreprocessorError>;
 	annotateSourceFile?: boolean;
-	experimentalScriptOrder?: boolean;
 }
 
 export type ConvertToTSXOptions = Pick<

packages/compiler/test/scripts/order.ts

@@ -6,10 +6,7 @@ test('outputs scripts in expected order', async () => {
 	const result = await transform(
 		`
     <script>console.log(1)</script>
-    <script>console.log(2)</script>`,
-		{
-			experimentalScriptOrder: true,
-		}
+    <script>console.log(2)</script>`
 	);
 
 	const scripts = result.scripts;

packages/compiler/test/styles/sass.ts

@@ -33,7 +33,6 @@ test.before(async () => {
 	result = await transform(FIXTURE, {
 		sourcemap: true,
 		preprocessStyle,
-		experimentalScriptOrder: true,
 	});
 });