elm-pages 3.0.0-beta.7 → 3.0.0-beta.8

package/codegen/elm-pages-codegen.js

@@ -35471,9 +35471,9 @@ var $author$project$GenerateMain$otherFile = F2(
 										$author$project$Elm$list(
 											A2(
 												$elm$core$List$map,
-												function (_v59) {
-													var route = _v59.a;
-													var params = _v59.b;
+												function (_v63) {
+													var route = _v63.a;
+													var params = _v63.b;
 													var pattern = '/' + A2(
 														$elm$core$String$join,
 														'/',
@@ -35523,9 +35523,9 @@ var $author$project$GenerateMain$otherFile = F2(
 													$elm$core$List$concatMap,
 													function (route) {
 														var params = $author$project$Pages$Internal$RoutePattern$toVariantName(route).params;
-														var _v58 = $author$project$Pages$Internal$RoutePattern$repeatWithoutOptionalEnding(params);
-														if (_v58.$ === 'Just') {
-															var repeated = _v58.a;
+														var _v62 = $author$project$Pages$Internal$RoutePattern$repeatWithoutOptionalEnding(params);
+														if (_v62.$ === 'Just') {
+															var repeated = _v62.a;
 															return _List_fromArray(
 																[
 																	_Utils_Tuple2(route, repeated),
@@ -35624,9 +35624,9 @@ var $author$project$GenerateMain$otherFile = F2(
 						[
 							A2(
 							$author$project$Elm$Case$patternToBranch,
-							function (_v56) {
-								var first = _v56.a;
-								var rest = _v56.b;
+							function (_v60) {
+								var first = _v60.a;
+								var rest = _v60.b;
 								return $author$project$GenerateMain$append(
 									_List_fromArray(
 										[
@@ -35743,20 +35743,20 @@ var $author$project$GenerateMain$otherFile = F2(
 			function (args) {
 				if ((((((((args.b && args.b.b) && args.b.b.b) && args.b.b.b.b) && args.b.b.b.b.b) && args.b.b.b.b.b.b) && args.b.b.b.b.b.b.b) && args.b.b.b.b.b.b.b.b) && (!args.b.b.b.b.b.b.b.b.b)) {
 					var pageFormState = args.a;
-					var _v40 = args.b;
-					var fetchers = _v40.a;
-					var _v41 = _v40.b;
-					var transition = _v41.a;
-					var _v42 = _v41.b;
-					var page = _v42.a;
-					var _v43 = _v42.b;
-					var maybePageUrl = _v43.a;
-					var _v44 = _v43.b;
-					var globalData = _v44.a;
+					var _v44 = args.b;
+					var fetchers = _v44.a;
 					var _v45 = _v44.b;
-					var pageData = _v45.a;
+					var transition = _v45.a;
 					var _v46 = _v45.b;
-					var actionData = _v46.a;
+					var page = _v46.a;
+					var _v47 = _v46.b;
+					var maybePageUrl = _v47.a;
+					var _v48 = _v47.b;
+					var globalData = _v48.a;
+					var _v49 = _v48.b;
+					var pageData = _v49.a;
+					var _v50 = _v49.b;
+					var actionData = _v50.a;
 					return A2(
 						$author$project$Elm$withType,
 						$author$project$Elm$Annotation$record(
@@ -35797,8 +35797,8 @@ var $author$project$GenerateMain$otherFile = F2(
 									[
 										A2(
 										$author$project$Elm$Case$patternToBranch,
-										function (_v47) {
-											var data = _v47.b;
+										function (_v51) {
+											var data = _v51.b;
 											return $author$project$Elm$record(
 												_List_fromArray(
 													[
@@ -35887,7 +35887,7 @@ var $author$project$GenerateMain$otherFile = F2(
 																				$author$project$Elm$Pattern$var('subModel'))),
 																			A2(
 																			$author$project$Elm$Case$patternToBranch,
-																			function (_v48) {
+																			function (_v52) {
 																				return modelMismatchView.value;
 																			},
 																			$author$project$Elm$Pattern$ignore)
@@ -35912,9 +35912,9 @@ var $author$project$GenerateMain$otherFile = F2(
 										function (route) {
 											return A2(
 												$author$project$Elm$Case$patternToBranch,
-												function (_v49) {
-													var maybeRouteParams = _v49.a;
-													var data = _v49.b;
+												function (_v53) {
+													var maybeRouteParams = _v53.a;
+													var data = _v53.b;
 													return $author$project$Elm$Let$toExpression(
 														A4(
 															$author$project$Elm$Let$fn,
@@ -35935,7 +35935,7 @@ var $author$project$GenerateMain$otherFile = F2(
 																			A3($author$project$GenerateMain$destructureRouteVariant, $author$project$GenerateMain$ActionData, 'justActionData', route)),
 																			A2(
 																			$author$project$Elm$Case$patternToBranch,
-																			function (_v53) {
+																			function (_v57) {
 																				return $author$project$Elm$nothing;
 																			},
 																			$author$project$Elm$Pattern$ignore)
@@ -36043,7 +36043,7 @@ var $author$project$GenerateMain$otherFile = F2(
 																																			A2(
 																																				$author$project$Gen$Dict$map,
 																																				F2(
-																																					function (_v50, fetcherState) {
+																																					function (_v54, fetcherState) {
 																																						return A2(
 																																							$author$project$Gen$Pages$Transition$map,
 																																							function (ad) {
@@ -36061,7 +36061,7 @@ var $author$project$GenerateMain$otherFile = F2(
 																									A3($author$project$GenerateMain$destructureRouteVariant, $author$project$GenerateMain$Model, 'subModel', route)),
 																									A2(
 																									$author$project$Elm$Case$patternToBranch,
-																									function (_v51) {
+																									function (_v55) {
 																										return modelMismatchView.value;
 																									},
 																									$author$project$Elm$Pattern$ignore)
@@ -36125,7 +36125,7 @@ var $author$project$GenerateMain$otherFile = F2(
 									_List_fromArray(
 										[
 											$author$project$Elm$Case$otherwise(
-											function (_v54) {
+											function (_v58) {
 												return $author$project$Elm$record(
 													_List_fromArray(
 														[
@@ -36134,7 +36134,7 @@ var $author$project$GenerateMain$otherFile = F2(
 															A2(
 																$author$project$Elm$fn,
 																_Utils_Tuple2('_', $elm$core$Maybe$Nothing),
-																function (_v55) {
+																function (_v59) {
 																	return $author$project$Elm$record(
 																		_List_fromArray(
 																			[
@@ -36274,7 +36274,7 @@ var $author$project$GenerateMain$otherFile = F2(
 												return errorPage;
 											}),
 											$author$project$Elm$Case$otherwise(
-											function (_v38) {
+											function (_v42) {
 												return $author$project$Elm$value(
 													{
 														annotation: $elm$core$Maybe$Nothing,
@@ -36419,9 +36419,9 @@ var $author$project$GenerateMain$otherFile = F2(
 										},
 										currentGlobalModel)),
 								$author$project$Elm$Let$letIn(
-									function (_v33) {
-										var sharedModel = _v33.a;
-										var globalCmd = _v33.b;
+									function (_v37) {
+										var sharedModel = _v37.a;
+										var globalCmd = _v37.b;
 										return $author$project$Elm$Let$toExpression(
 											A4(
 												$author$project$Elm$Let$tuple,
@@ -36457,9 +36457,9 @@ var $author$project$GenerateMain$otherFile = F2(
 																			function (route) {
 																				return A2(
 																					$author$project$Elm$Case$patternToBranch,
-																					function (_v35) {
-																						var maybeRouteParams = _v35.a;
-																						var thisPageData = _v35.b;
+																					function (_v39) {
+																						var maybeRouteParams = _v39.a;
+																						var thisPageData = _v39.b;
 																						return A3(
 																							$author$project$Gen$Tuple$call_.mapBoth,
 																							A2($author$project$GenerateMain$routeVariantExpression, $author$project$GenerateMain$Model, route),
@@ -36520,7 +36520,7 @@ var $author$project$GenerateMain$otherFile = F2(
 																																	},
 																																	A3($author$project$GenerateMain$destructureRouteVariant, $author$project$GenerateMain$ActionData, 'thisActionData', route)),
 																																	$author$project$Elm$Case$otherwise(
-																																	function (_v36) {
+																																	function (_v40) {
 																																		return $author$project$Elm$nothing;
 																																	})
 																																]));
@@ -36572,7 +36572,7 @@ var $author$project$GenerateMain$otherFile = F2(
 																			[
 																				A2(
 																				$author$project$Elm$Case$patternToBranch,
-																				function (_v37) {
+																				function (_v41) {
 																					return initErrorPage.call(pageData);
 																				},
 																				$author$project$Elm$Pattern$ignore)
@@ -36581,9 +36581,9 @@ var $author$project$GenerateMain$otherFile = F2(
 														nothing: initErrorPage.call(pageData)
 													}),
 												$author$project$Elm$Let$letIn(
-													function (_v34) {
-														var templateModel = _v34.a;
-														var templateCmd = _v34.b;
+													function (_v38) {
+														var templateModel = _v38.a;
+														var templateCmd = _v38.b;
 														return A2(
 															$author$project$Elm$tuple,
 															$author$project$Elm$record(
@@ -36693,6 +36693,13 @@ var $author$project$GenerateMain$otherFile = F2(
 						$author$project$Elm$Annotation$function,
 						_List_fromArray(
 							[
+								$author$project$Elm$Annotation$maybe(
+								$author$project$Elm$Annotation$record(
+									_List_fromArray(
+										[
+											_Utils_Tuple2('indent', $author$project$Elm$Annotation$int),
+											_Utils_Tuple2('newLines', $author$project$Elm$Annotation$bool)
+										]))),
 								$author$project$Gen$Html$annotation_.html($author$project$Gen$Basics$annotation_.never)
 							]),
 						$author$project$Elm$Annotation$string))),
@@ -36824,10 +36831,10 @@ var $author$project$GenerateMain$otherFile = F2(
 								[
 									A2(
 									$author$project$Elm$Case$patternToBranch,
-									function (_v32) {
-										var a = _v32.a;
-										var b = _v32.b;
-										var c = _v32.c;
+									function (_v36) {
+										var a = _v36.a;
+										var b = _v36.b;
+										var c = _v36.c;
 										return A3(
 											$author$project$Elm$triple,
 											A2(
@@ -36947,20 +36954,20 @@ var $author$project$GenerateMain$otherFile = F2(
 			function (args) {
 				if ((((((((args.b && args.b.b) && args.b.b.b) && args.b.b.b.b) && args.b.b.b.b.b) && args.b.b.b.b.b.b) && args.b.b.b.b.b.b.b) && args.b.b.b.b.b.b.b.b) && (!args.b.b.b.b.b.b.b.b.b)) {
 					var pageFormState = args.a;
-					var _v11 = args.b;
-					var fetchers = _v11.a;
-					var _v12 = _v11.b;
-					var transition = _v12.a;
-					var _v13 = _v12.b;
-					var sharedData = _v13.a;
-					var _v14 = _v13.b;
-					var pageData = _v14.a;
-					var _v15 = _v14.b;
-					var navigationKey = _v15.a;
+					var _v15 = args.b;
+					var fetchers = _v15.a;
 					var _v16 = _v15.b;
-					var msg = _v16.a;
+					var transition = _v16.a;
 					var _v17 = _v16.b;
-					var model = _v17.a;
+					var sharedData = _v17.a;
+					var _v18 = _v17.b;
+					var pageData = _v18.a;
+					var _v19 = _v18.b;
+					var navigationKey = _v19.a;
+					var _v20 = _v19.b;
+					var msg = _v20.a;
+					var _v21 = _v20.b;
+					var model = _v21.a;
 					return A2(
 						$author$project$Elm$withType,
 						A2(
@@ -37003,9 +37010,9 @@ var $author$project$GenerateMain$otherFile = F2(
 															[
 																A2(
 																$author$project$Elm$Case$patternToBranch,
-																function (_v19) {
-																	var pageModel = _v19.a;
-																	var thisPageData = _v19.b;
+																function (_v23) {
+																	var pageModel = _v23.a;
+																	var thisPageData = _v23.b;
 																	return A3(
 																		$author$project$Gen$Tuple$call_.mapBoth,
 																		$author$project$Elm$val('ModelErrorPage____'),
@@ -37035,7 +37042,7 @@ var $author$project$GenerateMain$otherFile = F2(
 																		$author$project$Elm$Pattern$var('thisPageData')))),
 																A2(
 																$author$project$Elm$Case$patternToBranch,
-																function (_v20) {
+																function (_v24) {
 																	return A2(
 																		$author$project$Elm$tuple,
 																		A2($author$project$Elm$get, 'page', model),
@@ -37044,9 +37051,9 @@ var $author$project$GenerateMain$otherFile = F2(
 																$author$project$Elm$Pattern$ignore)
 															])),
 													$author$project$Elm$Let$letIn(
-														function (_v18) {
-															var updatedPageModel = _v18.a;
-															var pageCmd = _v18.b;
+														function (_v22) {
+															var updatedPageModel = _v22.a;
+															var pageCmd = _v22.b;
 															return A2(
 																$author$project$Elm$tuple,
 																A2(
@@ -37091,9 +37098,9 @@ var $author$project$GenerateMain$otherFile = F2(
 																A2($author$project$Elm$get, 'global', model)
 															])),
 													$author$project$Elm$Let$letIn(
-														function (_v21) {
-															var sharedModel = _v21.a;
-															var globalCmd = _v21.b;
+														function (_v25) {
+															var sharedModel = _v25.a;
+															var globalCmd = _v25.b;
 															return A2(
 																$author$project$Elm$tuple,
 																A2(
@@ -37194,9 +37201,9 @@ var $author$project$GenerateMain$otherFile = F2(
 														navigationKey,
 														$author$project$Elm$Let$letIn(
 															F2(
-																function (_v22, _v23) {
-																	var updatedModel = _v23.a;
-																	var cmd = _v23.b;
+																function (_v26, _v27) {
+																	var updatedModel = _v27.a;
+																	var cmd = _v27.b;
 																	return A2(
 																		$author$project$Elm$Case$maybe,
 																		A2(
@@ -37256,9 +37263,9 @@ var $author$project$GenerateMain$otherFile = F2(
 																										A2($author$project$Elm$get, 'global', model)
 																									])),
 																							$author$project$Elm$Let$letIn(
-																								function (_v24) {
-																									var updatedGlobalModel = _v24.a;
-																									var globalCmd = _v24.b;
+																								function (_v28) {
+																									var updatedGlobalModel = _v28.a;
+																									var globalCmd = _v28.b;
 																									return A2(
 																										$author$project$Elm$tuple,
 																										A2(
@@ -37332,13 +37339,13 @@ var $author$project$GenerateMain$otherFile = F2(
 														[
 															A2(
 															$author$project$Elm$Case$patternToBranch,
-															function (_v25) {
-																var pageModel = _v25.a;
-																var thisPageData = _v25.b;
-																var _v26 = _v25.c;
-																var maybeRouteParams = _v26.a;
-																var pageUrl = _v26.b;
-																var justPage = _v26.c;
+															function (_v29) {
+																var pageModel = _v29.a;
+																var thisPageData = _v29.b;
+																var _v30 = _v29.c;
+																var maybeRouteParams = _v30.a;
+																var pageUrl = _v30.b;
+																var justPage = _v30.c;
 																return $author$project$Elm$Let$toExpression(
 																	A3(
 																		$author$project$Elm$Let$destructure,
@@ -37400,7 +37407,7 @@ var $author$project$GenerateMain$otherFile = F2(
 																								A2(
 																									$author$project$Gen$Dict$map,
 																									F2(
-																										function (_v29, fetcherState) {
+																										function (_v33, fetcherState) {
 																											return A2(
 																												$author$project$Gen$Pages$Transition$map,
 																												function (ad) {
@@ -37417,7 +37424,7 @@ var $author$project$GenerateMain$otherFile = F2(
 																																},
 																																A3($author$project$GenerateMain$destructureRouteVariant, $author$project$GenerateMain$ActionData, 'justActionData', route)),
 																																$author$project$Elm$Case$otherwise(
-																																function (_v30) {
+																																function (_v34) {
 																																	return $author$project$Elm$nothing;
 																																})
 																															]));
@@ -37432,12 +37439,12 @@ var $author$project$GenerateMain$otherFile = F2(
 																						A2($author$project$Elm$get, 'global', model)
 																					]))),
 																		$author$project$Elm$Let$letIn(
-																			function (_v27) {
-																				var updatedPageModel = _v27.a;
-																				var pageCmd = _v27.b;
-																				var _v28 = _v27.c;
-																				var newGlobalModel = _v28.a;
-																				var newGlobalCmd = _v28.b;
+																			function (_v31) {
+																				var updatedPageModel = _v31.a;
+																				var pageCmd = _v31.b;
+																				var _v32 = _v31.c;
+																				var newGlobalModel = _v32.a;
+																				var newGlobalCmd = _v32.b;
 																				return A2(
 																					$author$project$Elm$tuple,
 																					A2(
@@ -37495,7 +37502,7 @@ var $author$project$GenerateMain$otherFile = F2(
 																		$author$project$Elm$Pattern$var('justPage'))))),
 															A2(
 															$author$project$Elm$Case$patternToBranch,
-															function (_v31) {
+															function (_v35) {
 																return A2($author$project$Elm$tuple, model, $author$project$GenerateMain$effectNone);
 															},
 															$author$project$Elm$Pattern$ignore)
@@ -37735,7 +37742,7 @@ var $author$project$GenerateMain$otherFile = F2(
 													$author$project$Elm$Case$branch1,
 													routeVariant,
 													_Utils_Tuple2('_', $author$project$Elm$Annotation$unit),
-													function (_v9) {
+													function (_v13) {
 														return mappedDecoder;
 													}) : A2($author$project$Elm$Case$branch0, routeVariant, mappedDecoder);
 											},
@@ -37917,9 +37924,9 @@ var $author$project$GenerateMain$otherFile = F2(
 																return $author$project$Elm$list(
 																	A2(
 																		$elm$core$List$map,
-																		function (_v8) {
-																			var key = _v8.a;
-																			var value = _v8.b;
+																		function (_v12) {
+																			var key = _v12.a;
+																			var value = _v12.b;
 																			return A2(
 																				$author$project$Elm$tuple,
 																				$author$project$Elm$string(key),
@@ -38054,7 +38061,7 @@ var $author$project$GenerateMain$otherFile = F2(
 																},
 																A3($author$project$GenerateMain$destructureRouteVariant, $author$project$GenerateMain$Model, 'templateModel', route)),
 																$author$project$Elm$Case$otherwise(
-																function (_v6) {
+																function (_v10) {
 																	return $author$project$Gen$Platform$Sub$none;
 																})
 															]));
@@ -38152,8 +38159,14 @@ var $author$project$GenerateMain$otherFile = F2(
 												_List_fromArray(
 													[
 														getStaticRoutes.reference,
-														$author$project$Elm$Extra$fnIgnore(
-														$author$project$Elm$string(''))
+														A3(
+														$author$project$Elm$fn2,
+														_Utils_Tuple2('a', $elm$core$Maybe$Nothing),
+														_Utils_Tuple2('b', $elm$core$Maybe$Nothing),
+														F2(
+															function (_v8, _v9) {
+																return $author$project$Elm$string('');
+															}))
 													])))))))))));
 		var pathsToGenerateHandler = A2(
 			$author$project$Elm$Extra$topLevelValue,
@@ -38235,8 +38248,14 @@ var $author$project$GenerateMain$otherFile = F2(
 													_List_fromArray(
 														[
 															getStaticRoutes.reference,
-															$author$project$Elm$Extra$fnIgnore(
-															$author$project$Elm$string(''))
+															A3(
+															$author$project$Elm$fn2,
+															_Utils_Tuple2('a', $elm$core$Maybe$Nothing),
+															_Utils_Tuple2('b', $elm$core$Maybe$Nothing),
+															F2(
+																function (_v6, _v7) {
+																	return $author$project$Elm$string('');
+																}))
 														]))))))))))));
 		var action = A3(
 			$author$project$Elm$Declare$fn,

package/generator/dead-code-review/elm-stuff/tests-0.19.1/js/node_runner.js

@@ -75,7 +75,7 @@ console.elmlog = (str) => logs.push(str + "\n");
 const { Elm } = require("./Runner.elm.js");
 
 // Start the Elm app
-const flags = { initialSeed: 2254786925, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 343221655, fuzzRuns: 100, filter: null };
 const app = Elm.Runner.init({ flags: flags });
 
 // Record the timing at which we received the last "runTest" message

package/generator/dead-code-review/elm-stuff/tests-0.19.1/js/node_supervisor.js

@@ -82,7 +82,7 @@ const verbosity = 0;
 // Create a long lived reporter worker
 const { Elm } = require("./Reporter.elm.js");
 const flags = {
-  initialSeed: 2254786925,
+  initialSeed: 343221655,
   fuzzRuns: 100,
   mode: "consoleNoColor",
   verbosity: verbosity,

package/generator/review/elm-stuff/tests-0.19.1/js/node_runner.js

@@ -75,7 +75,7 @@ console.elmlog = (str) => logs.push(str + "\n");
 const { Elm } = require("./Runner.elm.js");
 
 // Start the Elm app
-const flags = { initialSeed: 3791732356, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 2255331163, fuzzRuns: 100, filter: null };
 const app = Elm.Runner.init({ flags: flags });
 
 // Record the timing at which we received the last "runTest" message

package/generator/review/elm-stuff/tests-0.19.1/js/node_supervisor.js

@@ -82,7 +82,7 @@ const verbosity = 0;
 // Create a long lived reporter worker
 const { Elm } = require("./Reporter.elm.js");
 const flags = {
-  initialSeed: 3791732356,
+  initialSeed: 2255331163,
   fuzzRuns: 100,
   mode: "consoleNoColor",
   verbosity: verbosity,

package/generator/src/build.js

@@ -117,10 +117,25 @@ async function run(options) {
       "dist/elm-stuff/elm-pages/index.html",
       "utf-8"
     );
-    const preloads = `<link rel="modulepreload" href="/${manifest["elm-stuff/elm-pages/index.html"]["file"]}" />`;
+    const preloadFiles = [
+      `elm.${browserElmHash}.js`,
+      ...Object.entries(manifest).map((entry) => entry[1].file),
+    ].map((file) => path.join(options.base, file));
+    const userProcessedPreloads = preloadFiles.flatMap((file) => {
+      const userPreloadForFile = config.preloadTagForFile(file);
+      if (userPreloadForFile === true) {
+        return [defaultPreloadForFile(file)];
+      } else if (userPreloadForFile === false) {
+        return [];
+      } else if (typeof userPreloadForFile === "string") {
+        return [userPreloadForFile];
+      } else {
+        throw `I expected preloadTagForFile in elm-pages.config.mjs to return a string or boolean, but instead it returned: ${userPreloadForFile}`;
+      }
+    });
 
     const processedIndexTemplate = indexTemplate
-      .replace("<!-- PLACEHOLDER_PRELOADS -->", preloads)
+      .replace("<!-- PLACEHOLDER_PRELOADS -->", userProcessedPreloads.join(""))
       .replace(
         '<script defer src="/elm.js" type="text/javascript"></script>',
         `<script defer src="/elm.${browserElmHash}.js" type="text/javascript"></script>`
@@ -620,6 +635,31 @@ async function runAdapter(adaptFn, processedIndexTemplate) {
   }
 }
 
+// Source: https://github.com/vitejs/vite/blob/c53ffec3465d2d28d08d29ca61313469e03f5dd6/playground/ssr-vue/src/entry-server.js#L50-L68
+/**
+ * @param {string} file
+ */
+function defaultPreloadForFile(file) {
+  if (file.endsWith(".js")) {
+    return `<link rel="modulepreload" crossorigin href="${file}">`;
+  } else if (file.endsWith(".css")) {
+    return `<link rel="preload" href="${file}" as="style">`;
+  } else if (file.endsWith(".woff")) {
+    return ` <link rel="preload" href="${file}" as="font" type="font/woff" crossorigin>`;
+  } else if (file.endsWith(".woff2")) {
+    return ` <link rel="preload" href="${file}" as="font" type="font/woff2" crossorigin>`;
+  } else if (file.endsWith(".gif")) {
+    return ` <link rel="preload" href="${file}" as="image" type="image/gif">`;
+  } else if (file.endsWith(".jpg") || file.endsWith(".jpeg")) {
+    return ` <link rel="preload" href="${file}" as="image" type="image/jpeg">`;
+  } else if (file.endsWith(".png")) {
+    return ` <link rel="preload" href="${file}" as="image" type="image/png">`;
+  } else {
+    // TODO
+    return "";
+  }
+}
+
 /** @typedef { { route : string; contentJson : string; head : SeoTag[]; html: string; body: string; } } FromElm */
 /** @typedef {HeadTag | JsonLdTag} SeoTag */
 /** @typedef {{ name: string; attributes: string[][]; type: 'head' }} HeadTag */

package/generator/src/config.js

@@ -1,7 +1,9 @@
 const path = require("path");
 
 async function resolveConfig() {
-  return await import(path.join(process.cwd(), "elm-pages.config.mjs"))
+  const initialConfig = await await import(
+    path.join(process.cwd(), "elm-pages.config.mjs")
+  )
     .then(async (elmPagesConfig) => {
       return (
         elmPagesConfig.default || {
@@ -18,21 +20,21 @@ async function resolveConfig() {
         vite: {},
       };
     });
+
+  return {
+    preloadTagForFile: function () {
+      return true;
+    },
+    headTagsTemplate: defaultHeadTagsTemplate,
+    vite: {},
+    ...initialConfig,
+  };
 }
 
 function defaultHeadTagsTemplate(context) {
   return `
 <link rel="stylesheet" href="/style.css" />
-<meta charset="UTF-8" />
-<meta name="viewport" content="width=device-width,initial-scale=1" />
 <meta name="generator" content="elm-pages v${context.cliVersion}" />
-<meta name="mobile-web-app-capable" content="yes" />
-<meta name="theme-color" content="#ffffff" />
-<meta name="apple-mobile-web-app-capable" content="yes" />
-<meta
-  name="apple-mobile-web-app-status-bar-style"
-  content="black-translucent"
-/>
 `;
 }
 

package/generator/src/pre-render-html.js

@@ -25,20 +25,18 @@ function templateHtml(devMode, userHeadTagsTemplate) {
   return /* html */ `<!DOCTYPE html>
 <!-- ROOT --><html lang="en">
   <head>
+    <meta charset="UTF-8" />
     <title><!-- PLACEHOLDER_TITLE --></title>
     ${
       devMode
-        ? `
-    <script src="/hmr.js" type="text/javascript"></script>
+        ? `<script src="/hmr.js" type="text/javascript"></script>
     <link rel="stylesheet" href="/dev-style.css">`
-        : `
-    <!-- PLACEHOLDER_PRELOADS -->`
+        : `<!-- PLACEHOLDER_PRELOADS -->`
     }
     <script defer src="/elm.js" type="text/javascript"></script>
     ${
       devMode
-        ? `<script src="/elm-pages.js" type="module"></script>
-`
+        ? `<script src="/elm-pages.js" type="module"></script>`
         : `<script defer src="${path.join(
             __dirname,
             "../static-code/elm-pages.js"

package/generator/template/app/Api.elm

@@ -9,7 +9,7 @@ import Route exposing (Route)
 
 routes :
     DataSource (List Route)
-    -> (Html Never -> String)
+    -> (Maybe { indent : Int, newLines : Bool } -> Html Never -> String)
     -> List (ApiRoute ApiRoute.Response)
 routes getStaticRoutes htmlToString =
     []

package/generator/template/app/Site.elm

@@ -14,6 +14,11 @@ config =
 
 head : DataSource (List Head.Tag)
 head =
-    [ Head.sitemapLink "/sitemap.xml"
+    [ Head.metaName "viewport" (Head.raw "width=device-width,initial-scale=1")
+    , Head.metaName "mobile-web-app-capable" (Head.raw "yes")
+    , Head.metaName "theme-color" (Head.raw "#ffffff")
+    , Head.metaName "apple-mobile-web-app-capable" (Head.raw "yes")
+    , Head.metaName "apple-mobile-web-app-status-bar-style" (Head.raw "black-translucent")
+    , Head.sitemapLink "/sitemap.xml"
     ]
         |> DataSource.succeed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elm-pages",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.0-beta.8",
   "homepage": "https://elm-pages.com",
   "moduleResolution": "node",
   "description": "Type-safe static sites, written in pure elm with your own custom elm-markup syntax.",

package/src/HtmlPrinter.elm

@@ -8,15 +8,19 @@ import Test.Html.Internal.ElmHtml.ToString exposing (defaultFormatOptions, nodeT
 import VirtualDom
 
 
-htmlToString : Html msg -> String
-htmlToString viewHtml =
+htmlToString : Maybe { indent : Int, newLines : Bool } -> Html msg -> String
+htmlToString formatOptions viewHtml =
     case
         Decode.decodeValue
             (decodeElmHtml (\_ _ -> VirtualDom.Normal (Decode.succeed ())))
             (asJsonView viewHtml)
     of
         Ok str ->
-            nodeToStringWithOptions defaultFormatOptions str
+            nodeToStringWithOptions
+                (formatOptions
+                    |> Maybe.withDefault defaultFormatOptions
+                )
+                str
 
         Err err ->
             "Error pre-rendering HTML in HtmlPrinter.elm: " ++ Decode.errorToString err

package/src/Pages/Internal/Platform/Cli.elm

@@ -880,7 +880,7 @@ sendSinglePageProgress site contentJson config model info =
                                                     , headers = record.headers
                                                     }
                                                     { head = config.view Dict.empty Dict.empty Nothing currentPage Nothing sharedData pageData Nothing |> .head
-                                                    , view = viewValue.body |> List.map HtmlPrinter.htmlToString |> String.join "\n"
+                                                    , view = viewValue.body |> List.map (HtmlPrinter.htmlToString Nothing) |> String.join "\n"
                                                     , title = viewValue.title
                                                     }
                                     )
@@ -1221,7 +1221,7 @@ render404Page config sharedData model path notFoundReason =
 
 bodyToString : List (Html msg) -> String
 bodyToString body =
-    body |> List.map HtmlPrinter.htmlToString |> String.join "\n"
+    body |> List.map (HtmlPrinter.htmlToString Nothing) |> String.join "\n"
 
 
 urlToRoute : ProgramConfig userMsg userModel route pageData actionData sharedData effect mappedMsg errorPage -> Url -> route

package/src/Pages/ProgramConfig.elm

@@ -88,7 +88,10 @@ type alias ProgramConfig userMsg userModel route pageData actionData sharedData
         }
         -> userMsg
     , apiRoutes :
-        (Html Never -> String)
+        (Maybe { indent : Int, newLines : Bool }
+         -> Html Never
+         -> String
+        )
         -> List (ApiRoute.ApiRoute ApiRoute.Response)
     , pathPatterns : List RoutePattern
     , basePath : List String
@@ -98,7 +101,7 @@ type alias ProgramConfig userMsg userModel route pageData actionData sharedData
     , encodeResponse : ResponseSketch pageData actionData sharedData -> Bytes.Encode.Encoder
     , encodeAction : actionData -> Bytes.Encode.Encoder
     , decodeResponse : Bytes.Decode.Decoder (ResponseSketch pageData actionData sharedData)
-    , globalHeadTags : Maybe ((Html Never -> String) -> DataSource (List Head.Tag))
+    , globalHeadTags : Maybe ((Maybe { indent : Int, newLines : Bool } -> Html Never -> String) -> DataSource (List Head.Tag))
     , cmdToEffect : Cmd userMsg -> effect
     , perform :
         { fetchRouteData :