elm-pages 3.0.0-beta.12 → 3.0.0-beta.13

package/generator/review/elm-stuff/generated-code/elm-community/elm-test/0.19.1-revision10/install/elm.json

@@ -0,0 +1,25 @@
+{
+    "type": "application",
+    "source-directories": [
+        "."
+    ],
+    "elm-version": "0.19.1",
+    "dependencies": {
+        "direct": {
+            "elm/core": "1.0.5",
+            "elm/json": "1.1.3",
+            "elm-explorations/test": "2.1.0"
+        },
+        "indirect": {
+            "elm/bytes": "1.0.8",
+            "elm/html": "1.0.0",
+            "elm/random": "1.0.0",
+            "elm/time": "1.0.0",
+            "elm/virtual-dom": "1.0.3"
+        }
+    },
+    "test-dependencies": {
+        "direct": {},
+        "indirect": {}
+    }
+}

package/generator/review/elm-stuff/generated-code/elm-community/elm-test/0.19.1-revision7/install/elm.json

@@ -0,0 +1,41 @@
+{
+    "type": "application",
+    "source-directories": [
+        "."
+    ],
+    "elm-version": "0.19.1",
+    "dependencies": {
+        "direct": {
+            "elm/core": "1.0.5",
+            "elm/html": "1.0.0",
+            "elm/regex": "1.0.0",
+            "elm-community/result-extra": "2.4.0",
+            "elm-explorations/test": "2.0.1",
+            "jfmengels/elm-review": "2.10.0",
+            "mdgriffith/elm-codegen": "2.0.0",
+            "stil4m/elm-syntax": "7.2.9",
+            "the-sett/elm-syntax-dsl": "6.0.2"
+        },
+        "indirect": {
+            "Chadtech/elm-bool-extra": "2.4.2",
+            "elm/bytes": "1.0.8",
+            "elm/json": "1.1.3",
+            "elm/parser": "1.1.0",
+            "elm/project-metadata-utils": "1.0.2",
+            "elm/random": "1.0.0",
+            "elm/time": "1.0.0",
+            "elm/virtual-dom": "1.0.3",
+            "elm-community/basics-extra": "4.1.0",
+            "elm-community/list-extra": "8.7.0",
+            "elm-community/maybe-extra": "5.3.0",
+            "miniBill/elm-unicode": "1.0.2",
+            "rtfeldman/elm-hex": "1.0.0",
+            "stil4m/structured-writer": "1.0.3",
+            "the-sett/elm-pretty-printer": "3.0.0"
+        }
+    },
+    "test-dependencies": {
+        "direct": {},
+        "indirect": {}
+    }
+}

package/generator/review/elm-stuff/tests-0.19.1/elm.json

@@ -1 +1 @@
-{"type":"application","source-directories":["../../src","../../tests","../../../../src","src"],"elm-version":"0.19.1","dependencies":{"direct":{"elm/core":"1.0.5","elm/html":"1.0.0","elm/json":"1.1.3","elm/regex":"1.0.0","elm-community/result-extra":"2.4.0","elm-explorations/test":"2.0.1","jfmengels/elm-review":"2.10.0","mdgriffith/elm-codegen":"2.0.0","mpizenberg/elm-test-runner":"6.0.0","stil4m/elm-syntax":"7.2.9","the-sett/elm-syntax-dsl":"6.0.2"},"indirect":{"Chadtech/elm-bool-extra":"2.4.2","elm/bytes":"1.0.8","elm/parser":"1.1.0","elm/project-metadata-utils":"1.0.2","elm/random":"1.0.0","elm/time":"1.0.0","elm/virtual-dom":"1.0.3","elm-community/basics-extra":"4.1.0","elm-community/list-extra":"8.7.0","elm-community/maybe-extra":"5.3.0","miniBill/elm-unicode":"1.0.2","rtfeldman/elm-hex":"1.0.0","stil4m/structured-writer":"1.0.3","the-sett/elm-pretty-printer":"3.0.0"}},"test-dependencies":{"direct":{},"indirect":{}}}
+{"type":"application","source-directories":["../../src","../../tests","../../../../src","src"],"elm-version":"0.19.1","dependencies":{"direct":{"elm/core":"1.0.5","elm/html":"1.0.0","elm/json":"1.1.3","elm/regex":"1.0.0","elm-explorations/test":"2.1.0","jfmengels/elm-review":"2.10.0","mdgriffith/elm-codegen":"2.0.0","mpizenberg/elm-test-runner":"6.0.0","stil4m/elm-syntax":"7.2.9","the-sett/elm-syntax-dsl":"6.0.2"},"indirect":{"Chadtech/elm-bool-extra":"2.4.2","elm/bytes":"1.0.8","elm/parser":"1.1.0","elm/project-metadata-utils":"1.0.2","elm/random":"1.0.0","elm/time":"1.0.0","elm/virtual-dom":"1.0.3","elm-community/basics-extra":"4.1.0","elm-community/list-extra":"8.7.0","elm-community/maybe-extra":"5.3.0","miniBill/elm-unicode":"1.0.2","rtfeldman/elm-hex":"1.0.0","stil4m/structured-writer":"1.0.3","the-sett/elm-pretty-printer":"3.0.0"}},"test-dependencies":{"direct":{},"indirect":{}}}

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

@@ -7897,7 +7897,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

@@ -29457,7 +29457,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: 2434458748, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 2354343056, 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: 2434458748,
+  initialSeed: 2354343056,
   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/review/elm.json

@@ -9,8 +9,8 @@
         "direct": {
             "elm/core": "1.0.5",
             "elm/html": "1.0.0",
+            "elm/json": "1.1.3",
             "elm/regex": "1.0.0",
-            "elm-community/result-extra": "2.4.0",
             "jfmengels/elm-review": "2.10.0",
             "mdgriffith/elm-codegen": "2.0.0",
             "stil4m/elm-syntax": "7.2.9",
@@ -19,7 +19,6 @@
         "indirect": {
             "Chadtech/elm-bool-extra": "2.4.2",
             "elm/bytes": "1.0.8",
-            "elm/json": "1.1.3",
             "elm/parser": "1.1.0",
             "elm/project-metadata-utils": "1.0.2",
             "elm/random": "1.0.0",
@@ -28,6 +27,7 @@
             "elm-community/basics-extra": "4.1.0",
             "elm-community/list-extra": "8.7.0",
             "elm-community/maybe-extra": "5.3.0",
+            "elm-explorations/test": "2.1.0",
             "miniBill/elm-unicode": "1.0.2",
             "rtfeldman/elm-hex": "1.0.0",
             "stil4m/structured-writer": "1.0.3",
@@ -36,7 +36,7 @@
     },
     "test-dependencies": {
         "direct": {
-            "elm-explorations/test": "2.0.1"
+            "elm-explorations/test": "2.1.0"
         },
         "indirect": {}
     }

package/generator/src/build.js

@@ -208,7 +208,7 @@ async function run(options) {
     );
   } catch (error) {
     if (error) {
-      console.error(error);
+      console.error(restoreColorSafe(error));
     }
     buildError = true;
     process.exitCode = 1;

package/generator/src/cli.js

@@ -111,6 +111,9 @@ async function main() {
       }
       try {
         // await codegen.generate("");
+        ensureDirSync(
+          path.join(process.cwd(), ".elm-pages", "http-response-cache")
+        );
         if (fs.existsSync("./codegen/")) {
           await runElmCodegenInstall();
         }
@@ -156,7 +159,8 @@ async function main() {
             }
           });
         const portsPath = await portDataSourceCompiled;
-        const resolvedPortsPath = path.join(process.cwd(), portsPath);
+        const resolvedPortsPath =
+          portsPath && path.join(process.cwd(), portsPath);
 
         process.chdir("./script");
         // TODO have option for compiling with --debug or not (maybe allow running with elm-optimize-level-2 as well?)

package/generator/src/compatibility-key.js

@@ -1 +1 @@
-module.exports = { compatibilityKey: 2 };
+module.exports = { compatibilityKey: 3 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elm-pages",
-  "version": "3.0.0-beta.12",
+  "version": "3.0.0-beta.13",
   "homepage": "https://elm-pages.com",
   "moduleResolution": "node",
   "description": "Type-safe static sites, written in pure elm with your own custom elm-markup syntax.",
@@ -33,7 +33,7 @@
     "devcert": "^1.2.2",
     "elm-doc-preview": "^5.0.5",
     "elm-hot": "^1.1.6",
-    "esbuild": "^0.15.14",
+    "esbuild": "^0.16.1",
     "fs-extra": "^10.1.0",
     "globby": "11.0.4",
     "gray-matter": "^4.0.3",
@@ -44,8 +44,8 @@
     "node-fetch": "^2.6.7",
     "object-hash": "^2.2.0",
     "serve-static": "^1.15.0",
-    "terser": "^5.15.1",
-    "vite": "^3.2.4",
+    "terser": "^5.16.1",
+    "vite": "^3.2.5",
     "which": "^2.0.2"
   },
   "devDependencies": {

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

@@ -3,4 +3,4 @@ module Pages.Internal.Platform.CompatibilityKey exposing (currentCompatibilityKe
 
 currentCompatibilityKey : Int
 currentCompatibilityKey =
-    2
+    3

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

@@ -19,7 +19,7 @@ import Pages.Internal.Platform.CompatibilityKey
 import Pages.Internal.Platform.Effect as Effect exposing (Effect)
 import Pages.Internal.Platform.StaticResponses as StaticResponses exposing (StaticResponses)
 import Pages.Internal.Platform.ToJsPayload as ToJsPayload
-import Pages.Script exposing (Script(..))
+import Pages.Internal.Script
 import Pages.StaticHttp.Request
 import Pages.StaticHttpRequest as StaticHttpRequest
 import RequestsAndPending exposing (RequestsAndPending)
@@ -61,7 +61,7 @@ app config =
         cliConfig : Program.Config (DataSource ())
         cliConfig =
             case config.data of
-                Generator theCliConfig ->
+                Pages.Internal.Script.Script theCliConfig ->
                     theCliConfig HtmlPrinter.htmlToString
     in
     Program.stateful

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

@@ -143,7 +143,7 @@ nextStep ({ allRawResponses, errors } as model) maybeRoutes =
                         hasPermanentError : Bool
                         hasPermanentError =
                             case staticRequestsStatus of
-                                StaticHttpRequest.HasPermanentError _ ->
+                                StaticHttpRequest.HasPermanentError _ _ ->
                                     True
 
                                 _ ->
@@ -155,7 +155,7 @@ nextStep ({ allRawResponses, errors } as model) maybeRoutes =
 
                         ( allUrlsKnown, knownUrlsToFetch ) =
                             case staticRequestsStatus of
-                                StaticHttpRequest.Incomplete newUrlsToFetch ->
+                                StaticHttpRequest.Incomplete newUrlsToFetch _ ->
                                     ( False, newUrlsToFetch )
 
                                 _ ->
@@ -214,8 +214,38 @@ nextStep ({ allRawResponses, errors } as model) maybeRoutes =
                 maskedToUnmasked
                     |> Dict.Extra.removeMany alreadyPerformed
                     |> Dict.values
+
+            updatedStaticResponses : StaticResponses
+            updatedStaticResponses =
+                case staticRequestsStatus of
+                    StaticHttpRequest.HasPermanentError _ nextReq ->
+                        case model.staticResponses of
+                            ApiRequest (NotFetched _ dict) ->
+                                ApiRequest (NotFetched nextReq dict)
+
+                            StaticResponses (NotFetched _ dict) ->
+                                ApiRequest (NotFetched nextReq dict)
+
+                            CheckIfHandled _ _ _ ->
+                                -- TODO change this too, or maybe this is fine?
+                                model.staticResponses
+
+                    StaticHttpRequest.Incomplete _ nextReq ->
+                        case model.staticResponses of
+                            ApiRequest (NotFetched _ dict) ->
+                                ApiRequest (NotFetched nextReq dict)
+
+                            StaticResponses (NotFetched _ dict) ->
+                                ApiRequest (NotFetched nextReq dict)
+
+                            CheckIfHandled _ _ _ ->
+                                -- TODO change this too, or maybe this is fine?
+                                model.staticResponses
+
+                    StaticHttpRequest.Complete ->
+                        model.staticResponses
         in
-        ( model.staticResponses, Continue newAllRawResponses newThing maybeRoutes )
+        ( updatedStaticResponses, Continue newAllRawResponses newThing maybeRoutes )
 
     else
         let
@@ -228,7 +258,7 @@ nextStep ({ allRawResponses, errors } as model) maybeRoutes =
                             maybePermanentError : Maybe StaticHttpRequest.Error
                             maybePermanentError =
                                 case staticRequestsStatus of
-                                    StaticHttpRequest.HasPermanentError theError ->
+                                    StaticHttpRequest.HasPermanentError theError _ ->
                                         Just theError
 
                                     _ ->
@@ -295,7 +325,7 @@ nextStep ({ allRawResponses, errors } as model) maybeRoutes =
                                     maybePermanentError : Maybe StaticHttpRequest.Error
                                     maybePermanentError =
                                         case staticRequestsStatus of
-                                            StaticHttpRequest.HasPermanentError theError ->
+                                            StaticHttpRequest.HasPermanentError theError _ ->
                                                 Just theError
 
                                             _ ->

package/src/Pages/Internal/Script.elm

@@ -0,0 +1,16 @@
+module Pages.Internal.Script exposing (Script(..))
+
+import Cli.Program as Program
+import DataSource exposing (DataSource)
+import Html exposing (Html)
+
+
+{-| -}
+type Script
+    = Script
+        ((Maybe { indent : Int, newLines : Bool }
+          -> Html Never
+          -> String
+         )
+         -> Program.Config (DataSource ())
+        )

package/src/Pages/Script.elm

@@ -1,5 +1,5 @@
 module Pages.Script exposing
-    ( Script(..)
+    ( Script
     , withCliOptions, withoutCliOptions
     , writeFile
     , log
@@ -28,20 +28,14 @@ import Cli.Program as Program
 import DataSource exposing (DataSource)
 import DataSource.Http
 import DataSource.Internal.Request
-import Html exposing (Html)
 import Json.Decode as Decode
 import Json.Encode as Encode
+import Pages.Internal.Script
 
 
 {-| -}
-type Script
-    = Generator
-        ((Maybe { indent : Int, newLines : Bool }
-          -> Html Never
-          -> String
-         )
-         -> Program.Config (DataSource ())
-        )
+type alias Script =
+    Pages.Internal.Script.Script
 
 
 {-| -}
@@ -78,7 +72,7 @@ log message =
 {-| -}
 withoutCliOptions : DataSource () -> Script
 withoutCliOptions execute =
-    Generator
+    Pages.Internal.Script.Script
         (\_ ->
             Program.config
                 |> Program.add
@@ -93,7 +87,7 @@ withoutCliOptions execute =
 {-| -}
 withCliOptions : Program.Config cliOptions -> (cliOptions -> DataSource ()) -> Script
 withCliOptions config execute =
-    Generator
+    Pages.Internal.Script.Script
         (\_ ->
             config
                 |> Program.mapConfig execute

package/src/Pages/StaticHttpRequest.elm

@@ -118,12 +118,12 @@ cacheRequestResolution :
     -> RequestsAndPending
     -> Status value
 cacheRequestResolution request rawResponses =
-    cacheRequestResolutionHelp [] rawResponses request
+    cacheRequestResolutionHelp [] rawResponses request request
 
 
 type Status value
-    = Incomplete (List Pages.StaticHttp.Request.Request)
-    | HasPermanentError Error
+    = Incomplete (List Pages.StaticHttp.Request.Request) (RawRequest value)
+    | HasPermanentError Error (RawRequest value)
     | Complete
 
 
@@ -131,24 +131,26 @@ cacheRequestResolutionHelp :
     List Pages.StaticHttp.Request.Request
     -> RequestsAndPending
     -> RawRequest value
+    -> RawRequest value
     -> Status value
-cacheRequestResolutionHelp foundUrls rawResponses request =
+cacheRequestResolutionHelp foundUrls rawResponses parentRequest request =
     case request of
         RequestError error ->
             case error of
                 MissingHttpResponse _ _ ->
                     -- TODO do I need to pass through continuation URLs here? -- Incomplete (urlList ++ foundUrls)
-                    Incomplete foundUrls
+                    Incomplete foundUrls parentRequest
 
                 DecoderError _ ->
-                    HasPermanentError error
+                    HasPermanentError error parentRequest
 
                 UserCalledStaticHttpFail _ ->
-                    HasPermanentError error
+                    HasPermanentError error parentRequest
 
         Request urlList lookupFn ->
             cacheRequestResolutionHelp urlList
                 rawResponses
+                request
                 (lookupFn Nothing rawResponses)
 
         ApiRoute _ ->