elm-pages 3.0.0-beta.4 → 3.0.0-beta.6

package/codegen/elm-pages-codegen.js

@@ -26323,6 +26323,16 @@ var $author$project$Gen$Pages$Transition$annotation_ = {
 		'Transition',
 		_List_Nil)
 };
+var $author$project$Gen$Platform$Sub$annotation_ = {
+	sub: function (subArg0) {
+		return A3(
+			$author$project$Elm$Annotation$namedWith,
+			_List_Nil,
+			'Sub',
+			_List_fromArray(
+				[subArg0]));
+	}
+};
 var $author$project$Gen$Server$Response$moduleName_ = _List_fromArray(
 	['Server', 'Response']);
 var $author$project$Gen$Server$Response$annotation_ = {
@@ -36725,82 +36735,154 @@ var $author$project$GenerateMain$otherFile = F2(
 		var fooFn = A6(
 			$author$project$Elm$Declare$fn4,
 			'fooFn',
-			_Utils_Tuple2('wrapModel', $elm$core$Maybe$Nothing),
-			_Utils_Tuple2('wrapMsg', $elm$core$Maybe$Nothing),
+			_Utils_Tuple2(
+				'wrapModel',
+				$elm$core$Maybe$Just(
+					A2(
+						$author$project$Elm$Annotation$function,
+						_List_fromArray(
+							[
+								$author$project$Elm$Annotation$var('a')
+							]),
+						A2($author$project$Elm$Annotation$named, _List_Nil, 'PageModel')))),
+			_Utils_Tuple2(
+				'wrapMsg',
+				$elm$core$Maybe$Just(
+					A2(
+						$author$project$Elm$Annotation$function,
+						_List_fromArray(
+							[
+								$author$project$Elm$Annotation$var('b')
+							]),
+						A2($author$project$Elm$Annotation$named, _List_Nil, 'Msg')))),
 			_Utils_Tuple2(
 				'model',
 				$elm$core$Maybe$Just(
 					A2($author$project$Elm$Annotation$named, _List_Nil, 'Model'))),
-			_Utils_Tuple2('triple', $elm$core$Maybe$Nothing),
+			_Utils_Tuple2(
+				'triple',
+				$elm$core$Maybe$Just(
+					A3(
+						$author$project$Elm$Annotation$triple,
+						$author$project$Elm$Annotation$var('a'),
+						A3(
+							$author$project$Elm$Annotation$namedWith,
+							_List_fromArray(
+								['Effect']),
+							'Effect',
+							_List_fromArray(
+								[
+									$author$project$Elm$Annotation$var('b')
+								])),
+						$author$project$Elm$Annotation$maybe(
+							A2(
+								$author$project$Elm$Annotation$named,
+								_List_fromArray(
+									['Shared']),
+								'Msg'))))),
 			F4(
 				function (wrapModel, wrapMsg, model, triple) {
-					return A3(
-						$author$project$Elm$Case$custom,
-						triple,
-						$author$project$Elm$Annotation$unit,
-						_List_fromArray(
-							[
+					return A2(
+						$author$project$Elm$withType,
+						A3(
+							$author$project$Elm$Annotation$triple,
+							A2($author$project$Elm$Annotation$named, _List_Nil, 'PageModel'),
+							A3(
+								$author$project$Elm$Annotation$namedWith,
+								_List_fromArray(
+									['Effect']),
+								'Effect',
+								_List_fromArray(
+									[
+										A2($author$project$Elm$Annotation$named, _List_Nil, 'Msg')
+									])),
+							A2(
+								$author$project$Elm$Annotation$tuple,
 								A2(
-								$author$project$Elm$Case$patternToBranch,
-								function (_v32) {
-									var a = _v32.a;
-									var b = _v32.b;
-									var c = _v32.c;
-									return A3(
-										$author$project$Elm$triple,
-										A2(
-											$author$project$Elm$apply,
-											wrapModel,
-											_List_fromArray(
-												[a])),
-										A2(
-											$author$project$Elm$apply,
-											$author$project$Elm$value(
-												{
-													annotation: $elm$core$Maybe$Nothing,
-													importFrom: _List_fromArray(
-														['Effect']),
-													name: 'map'
-												}),
+									$author$project$Elm$Annotation$named,
+									_List_fromArray(
+										['Shared']),
+									'Model'),
+								A3(
+									$author$project$Elm$Annotation$namedWith,
+									_List_fromArray(
+										['Effect']),
+									'Effect',
+									_List_fromArray(
+										[
+											A2(
+											$author$project$Elm$Annotation$named,
 											_List_fromArray(
-												[wrapMsg, b])),
-										A2(
-											$author$project$Elm$Case$maybe,
-											c,
-											{
-												just: _Utils_Tuple2(
-													'sharedMsg',
-													function (sharedMsg) {
-														return A2(
-															$author$project$Elm$apply,
-															A2(
-																$author$project$Elm$get,
-																'update',
-																$author$project$Elm$value(
-																	{
-																		annotation: $elm$core$Maybe$Nothing,
-																		importFrom: _List_fromArray(
-																			['Shared']),
-																		name: 'template'
-																	})),
-															_List_fromArray(
-																[
-																	sharedMsg,
-																	A2($author$project$Elm$get, 'global', model)
-																]));
+												['Shared']),
+											'Msg')
+										])))),
+						A3(
+							$author$project$Elm$Case$custom,
+							triple,
+							$author$project$Elm$Annotation$unit,
+							_List_fromArray(
+								[
+									A2(
+									$author$project$Elm$Case$patternToBranch,
+									function (_v32) {
+										var a = _v32.a;
+										var b = _v32.b;
+										var c = _v32.c;
+										return A3(
+											$author$project$Elm$triple,
+											A2(
+												$author$project$Elm$apply,
+												wrapModel,
+												_List_fromArray(
+													[a])),
+											A2(
+												$author$project$Elm$apply,
+												$author$project$Elm$value(
+													{
+														annotation: $elm$core$Maybe$Nothing,
+														importFrom: _List_fromArray(
+															['Effect']),
+														name: 'map'
 													}),
-												nothing: A2(
-													$author$project$Elm$tuple,
-													A2($author$project$Elm$get, 'global', model),
-													$author$project$GenerateMain$effectNone)
-											}));
-								},
-								A3(
-									$author$project$Elm$Pattern$triple,
-									$author$project$Elm$Pattern$var('a'),
-									$author$project$Elm$Pattern$var('b'),
-									$author$project$Elm$Pattern$var('c')))
-							]));
+												_List_fromArray(
+													[wrapMsg, b])),
+											A2(
+												$author$project$Elm$Case$maybe,
+												c,
+												{
+													just: _Utils_Tuple2(
+														'sharedMsg',
+														function (sharedMsg) {
+															return A2(
+																$author$project$Elm$apply,
+																A2(
+																	$author$project$Elm$get,
+																	'update',
+																	$author$project$Elm$value(
+																		{
+																			annotation: $elm$core$Maybe$Nothing,
+																			importFrom: _List_fromArray(
+																				['Shared']),
+																			name: 'template'
+																		})),
+																_List_fromArray(
+																	[
+																		sharedMsg,
+																		A2($author$project$Elm$get, 'global', model)
+																	]));
+														}),
+													nothing: A2(
+														$author$project$Elm$tuple,
+														A2($author$project$Elm$get, 'global', model),
+														$author$project$GenerateMain$effectNone)
+												}));
+									},
+									A3(
+										$author$project$Elm$Pattern$triple,
+										$author$project$Elm$Pattern$var('a'),
+										$author$project$Elm$Pattern$var('b'),
+										$author$project$Elm$Pattern$var('c')))
+								])));
 				}));
 		var update = A3(
 			$author$project$Elm$Declare$function,
@@ -37917,99 +37999,125 @@ var $author$project$GenerateMain$otherFile = F2(
 			F3(
 				function (maybeRoute, path, model) {
 					return A2(
-						$author$project$Elm$Case$maybe,
-						maybeRoute,
-						{
-							just: _Utils_Tuple2(
-								'justRoute',
-								function (justRoute) {
-									return A2(
-										branchHelper,
-										justRoute,
-										F2(
-											function (route, maybeRouteParams) {
-												return A3(
-													$author$project$Elm$Case$custom,
-													A2($author$project$Elm$get, 'page', model),
-													$author$project$Elm$Annotation$unit,
-													_List_fromArray(
-														[
-															A2(
-															$author$project$Elm$Case$patternToBranch,
-															function (templateModel) {
-																return A2(
-																	$author$project$Gen$Platform$Sub$call_.map,
-																	A2($author$project$GenerateMain$routeVariantExpression, $author$project$GenerateMain$Msg, route),
-																	A2(
-																		$author$project$Elm$apply,
+						$author$project$Elm$withType,
+						$author$project$Gen$Platform$Sub$annotation_.sub(
+							A2($author$project$Elm$Annotation$named, _List_Nil, 'Msg')),
+						A2(
+							$author$project$Elm$Case$maybe,
+							maybeRoute,
+							{
+								just: _Utils_Tuple2(
+									'justRoute',
+									function (justRoute) {
+										return A2(
+											branchHelper,
+											justRoute,
+											F2(
+												function (route, maybeRouteParams) {
+													return A3(
+														$author$project$Elm$Case$custom,
+														A2($author$project$Elm$get, 'page', model),
+														$author$project$Elm$Annotation$unit,
+														_List_fromArray(
+															[
+																A2(
+																$author$project$Elm$Case$patternToBranch,
+																function (templateModel) {
+																	return A2(
+																		$author$project$Gen$Platform$Sub$call_.map,
+																		A2($author$project$GenerateMain$routeVariantExpression, $author$project$GenerateMain$Msg, route),
 																		A2(
-																			$author$project$Elm$get,
-																			'subscriptions',
-																			$author$project$Elm$value(
-																				{
-																					annotation: $elm$core$Maybe$Nothing,
-																					importFrom: A2(
-																						$elm$core$List$cons,
-																						'Route',
-																						$author$project$Pages$Internal$RoutePattern$toModuleName(route)),
-																					name: 'route'
-																				})),
-																		_List_fromArray(
-																			[
-																				$author$project$Elm$nothing,
-																				A2(
-																				$elm$core$Maybe$withDefault,
-																				$author$project$Elm$record(_List_Nil),
-																				maybeRouteParams),
-																				path,
-																				templateModel,
-																				A2($author$project$Elm$get, 'global', model)
-																			])));
-															},
-															A3($author$project$GenerateMain$destructureRouteVariant, $author$project$GenerateMain$Model, 'templateModel', route)),
-															$author$project$Elm$Case$otherwise(
-															function (_v6) {
-																return $author$project$Gen$Platform$Sub$none;
-															})
-														]));
-											}));
-								}),
-							nothing: $author$project$Gen$Platform$Sub$none
-						});
+																			$author$project$Elm$apply,
+																			A2(
+																				$author$project$Elm$get,
+																				'subscriptions',
+																				$author$project$Elm$value(
+																					{
+																						annotation: $elm$core$Maybe$Nothing,
+																						importFrom: A2(
+																							$elm$core$List$cons,
+																							'Route',
+																							$author$project$Pages$Internal$RoutePattern$toModuleName(route)),
+																						name: 'route'
+																					})),
+																			_List_fromArray(
+																				[
+																					$author$project$Elm$nothing,
+																					A2(
+																					$elm$core$Maybe$withDefault,
+																					$author$project$Elm$record(_List_Nil),
+																					maybeRouteParams),
+																					path,
+																					templateModel,
+																					A2($author$project$Elm$get, 'global', model)
+																				])));
+																},
+																A3($author$project$GenerateMain$destructureRouteVariant, $author$project$GenerateMain$Model, 'templateModel', route)),
+																$author$project$Elm$Case$otherwise(
+																function (_v6) {
+																	return $author$project$Gen$Platform$Sub$none;
+																})
+															]));
+												}));
+									}),
+								nothing: $author$project$Gen$Platform$Sub$none
+							}));
 				}));
 		var subscriptions = A5(
 			$author$project$Elm$Declare$fn3,
 			'subscriptions',
-			_Utils_Tuple2('route', $elm$core$Maybe$Nothing),
-			_Utils_Tuple2('path', $elm$core$Maybe$Nothing),
-			_Utils_Tuple2('model', $elm$core$Maybe$Nothing),
+			_Utils_Tuple2(
+				'route',
+				$elm$core$Maybe$Just(
+					$author$project$Elm$Annotation$maybe(
+						A2(
+							$author$project$Elm$Annotation$named,
+							_List_fromArray(
+								['Route']),
+							'Route')))),
+			_Utils_Tuple2(
+				'path',
+				$elm$core$Maybe$Just(
+					A2(
+						$author$project$Elm$Annotation$named,
+						_List_fromArray(
+							['Path']),
+						'Path'))),
+			_Utils_Tuple2(
+				'model',
+				$elm$core$Maybe$Just(
+					A2($author$project$Elm$Annotation$named, _List_Nil, 'Model'))),
 			F3(
 				function (route, path, model) {
-					return $author$project$Gen$Platform$Sub$batch(
-						_List_fromArray(
-							[
-								A2(
-								$author$project$Gen$Platform$Sub$call_.map,
-								$author$project$Elm$val('MsgGlobal'),
-								A2(
-									$author$project$Elm$apply,
+					return A2(
+						$author$project$Elm$withType,
+						$author$project$Gen$Platform$Sub$annotation_.sub(
+							A2($author$project$Elm$Annotation$named, _List_Nil, 'Msg')),
+						$author$project$Gen$Platform$Sub$batch(
+							_List_fromArray(
+								[
 									A2(
-										$author$project$Elm$get,
-										'subscriptions',
-										$author$project$Elm$value(
-											{
-												annotation: $elm$core$Maybe$Nothing,
-												importFrom: _List_fromArray(
-													['Shared']),
-												name: 'template'
-											})),
-									_List_fromArray(
-										[
-											path,
-											A2($author$project$Elm$get, 'global', model)
-										]))),
-								A3(templateSubscriptions.call, route, path, model)
-							]));
+									$author$project$Gen$Platform$Sub$call_.map,
+									$author$project$Elm$val('MsgGlobal'),
+									A2(
+										$author$project$Elm$apply,
+										A2(
+											$author$project$Elm$get,
+											'subscriptions',
+											$author$project$Elm$value(
+												{
+													annotation: $elm$core$Maybe$Nothing,
+													importFrom: _List_fromArray(
+														['Shared']),
+													name: 'template'
+												})),
+										_List_fromArray(
+											[
+												path,
+												A2($author$project$Elm$get, 'global', model)
+											]))),
+									A3(templateSubscriptions.call, route, path, model)
+								])));
 				}));
 		var apiPatterns = A2(
 			$author$project$Elm$Extra$topLevelValue,
@@ -38796,7 +38904,7 @@ _Platform_export({'Generate':{'init':$author$project$Generate$main(
 			$elm$json$Json$Decode$field,
 			'templates',
 			$elm$json$Json$Decode$list(
-				$elm$json$Json$Decode$list($elm$json$Json$Decode$string)))))(0)}});var isBackend = false && typeof isLamdera !== 'undefined'
+				$elm$json$Json$Decode$list($elm$json$Json$Decode$string)))))(0)}});var isBackend = false && typeof isLamdera !== 'undefined';
 
 function _Platform_initialize(flagDecoder, args, init, update, subscriptions, stepperBuilder)
   {

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

@@ -6692,7 +6692,7 @@ _Platform_export({'Reporter':{'init':$author$project$Reporter$main(
 					'paths',
 					$elm$json$Json$Decode$list($elm$json$Json$Decode$string)));
 		},
-		A2($elm$json$Json$Decode$field, 'verbosity', $elm$json$Json$Decode$int)))(0)}});var isBackend = false && typeof isLamdera !== 'undefined'
+		A2($elm$json$Json$Decode$field, 'verbosity', $elm$json$Json$Decode$int)))(0)}});var isBackend = false && typeof isLamdera !== 'undefined';
 
 function _Platform_initialize(flagDecoder, args, init, update, subscriptions, stepperBuilder)
   {

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

@@ -25732,7 +25732,7 @@ _Platform_export({'Runner':{'init':$author$project$Runner$main(
 				},
 				A2($elm$json$Json$Decode$field, 'fuzzRuns', $elm$json$Json$Decode$int));
 		},
-		A2($elm$json$Json$Decode$field, 'initialSeed', $elm$json$Json$Decode$int)))(0)}});var isBackend = false && typeof isLamdera !== 'undefined'
+		A2($elm$json$Json$Decode$field, 'initialSeed', $elm$json$Json$Decode$int)))(0)}});var isBackend = false && typeof isLamdera !== 'undefined';
 
 function _Platform_initialize(flagDecoder, args, init, update, subscriptions, stepperBuilder)
   {

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: 4257486087, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 1035103192, 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

@@ -75,19 +75,19 @@ let testsCount, todoTests;
 let reporter;
 let runners = [];
 let working = false;
-let workersCount = 2;
+let workersCount = 10;
 let startWorkCallback = function(){};
 const verbosity = 0;
 
 // Create a long lived reporter worker
 const { Elm } = require("./Reporter.elm.js");
 const flags = {
-  initialSeed: 4257486087,
+  initialSeed: 1035103192,
   fuzzRuns: 100,
-  mode: "consoleNoColor",
+  mode: "consoleColor",
   verbosity: verbosity,
   globs: [],
-  paths: ["/home/runner/work/elm-pages-v3-beta/elm-pages-v3-beta/generator/dead-code-review/tests/Pages/Review/DeadCodeEliminateDataTest.elm"],
+  paths: ["/Users/dillonkearns/src/github.com/dillonkearns/elm-pages-v3-beta/generator/dead-code-review/tests/Pages/Review/DeadCodeEliminateDataTest.elm"],
 };
 reporter = Elm.Reporter.init({ flags: flags });
 

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

@@ -6692,7 +6692,7 @@ _Platform_export({'Reporter':{'init':$author$project$Reporter$main(
 					'paths',
 					$elm$json$Json$Decode$list($elm$json$Json$Decode$string)));
 		},
-		A2($elm$json$Json$Decode$field, 'verbosity', $elm$json$Json$Decode$int)))(0)}});var isBackend = false && typeof isLamdera !== 'undefined'
+		A2($elm$json$Json$Decode$field, 'verbosity', $elm$json$Json$Decode$int)))(0)}});var isBackend = false && typeof isLamdera !== 'undefined';
 
 function _Platform_initialize(flagDecoder, args, init, update, subscriptions, stepperBuilder)
   {

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

@@ -27514,7 +27514,7 @@ _Platform_export({'Runner':{'init':$author$project$Runner$main(
 				},
 				A2($elm$json$Json$Decode$field, 'fuzzRuns', $elm$json$Json$Decode$int));
 		},
-		A2($elm$json$Json$Decode$field, 'initialSeed', $elm$json$Json$Decode$int)))(0)}});var isBackend = false && typeof isLamdera !== 'undefined'
+		A2($elm$json$Json$Decode$field, 'initialSeed', $elm$json$Json$Decode$int)))(0)}});var isBackend = false && typeof isLamdera !== 'undefined';
 
 function _Platform_initialize(flagDecoder, args, init, update, subscriptions, stepperBuilder)
   {

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: 1646606691, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 1889275192, 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

@@ -75,19 +75,19 @@ let testsCount, todoTests;
 let reporter;
 let runners = [];
 let working = false;
-let workersCount = 2;
+let workersCount = 10;
 let startWorkCallback = function(){};
 const verbosity = 0;
 
 // Create a long lived reporter worker
 const { Elm } = require("./Reporter.elm.js");
 const flags = {
-  initialSeed: 1646606691,
+  initialSeed: 1889275192,
   fuzzRuns: 100,
-  mode: "consoleNoColor",
+  mode: "consoleColor",
   verbosity: verbosity,
   globs: [],
-  paths: ["/home/runner/work/elm-pages-v3-beta/elm-pages-v3-beta/generator/review/tests/Pages/Review/NoContractViolationsTest.elm"],
+  paths: ["/Users/dillonkearns/src/github.com/dillonkearns/elm-pages-v3-beta/generator/review/tests/Pages/Review/NoContractViolationsTest.elm"],
 };
 reporter = Elm.Reporter.init({ flags: flags });
 

package/generator/src/build.js

@@ -16,6 +16,7 @@ const { build } = require("vite");
 const preRenderHtml = require("./pre-render-html.js");
 const esbuild = require("esbuild");
 const { createHash } = require("crypto");
+const { merge_vite_configs } = require("./vite-utils.js");
 
 let pool = [];
 let pagesReady;
@@ -92,23 +93,25 @@ async function run(options) {
         );
         return {};
       });
-    const viteConfig = config.vite || {};
-
-    const buildComplete = build({
-      configFile: false,
-      root: process.cwd(),
-      base: options.base,
-      ssr: false,
-
-      build: {
-        manifest: true,
-        outDir: "dist",
-        rollupOptions: {
-          input: "elm-stuff/elm-pages/index.html",
+    const viteConfig = merge_vite_configs(
+      {
+        configFile: false,
+        root: process.cwd(),
+        base: options.base,
+        ssr: false,
+
+        build: {
+          manifest: true,
+          outDir: "dist",
+          rollupOptions: {
+            input: "elm-stuff/elm-pages/index.html",
+          },
         },
       },
-      ...viteConfig,
-    });
+      config.vite || {}
+    );
+
+    const buildComplete = build(viteConfig);
     const compileClientDone = compileElm(options);
     await buildComplete;
     await compileClientDone;