elm-pages 3.0.9 → 3.0.10

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: 3733738384, fuzzRuns: 100, filter: null };
+const flags = { initialSeed: 4173409726, 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,14 +75,14 @@ let testsCount, todoTests;
 let reporter;
 let runners = [];
 let working = false;
-let workersCount = 2;
+let workersCount = 4;
 let startWorkCallback = function(){};
 const verbosity = 0;
 
 // Create a long lived reporter worker
 const { Elm } = require("./Reporter.elm.js");
 const flags = {
-  initialSeed: 3733738384,
+  initialSeed: 4173409726,
   fuzzRuns: 100,
   mode: "consoleNoColor",
   verbosity: verbosity,

package/generator/review/elm.json

@@ -11,9 +11,9 @@
             "elm/html": "1.0.0",
             "elm/json": "1.1.3",
             "elm/regex": "1.0.0",
-            "jfmengels/elm-review": "2.13.0",
-            "mdgriffith/elm-codegen": "3.0.0",
-            "stil4m/elm-syntax": "7.2.9",
+            "jfmengels/elm-review": "2.13.1",
+            "mdgriffith/elm-codegen": "4.1.1",
+            "stil4m/elm-syntax": "7.3.2",
             "the-sett/elm-syntax-dsl": "6.0.2"
         },
         "indirect": {
@@ -25,18 +25,17 @@
             "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",
-            "elm-explorations/test": "2.1.1",
-            "miniBill/elm-unicode": "1.0.3",
+            "elm-explorations/test": "2.1.2",
+            "miniBill/elm-unicode": "1.1.0",
             "rtfeldman/elm-hex": "1.0.0",
             "stil4m/structured-writer": "1.0.3",
-            "the-sett/elm-pretty-printer": "3.0.0"
+            "the-sett/elm-pretty-printer": "3.1.0"
         }
     },
     "test-dependencies": {
         "direct": {
-            "elm-explorations/test": "2.1.1"
+            "elm-explorations/test": "2.1.2"
         },
         "indirect": {}
     }

package/generator/src/build.js

@@ -100,7 +100,7 @@ export async function run(options) {
         ssr: false,
 
         build: {
-          manifest: true,
+          manifest: '___vite-manifest___.json',
           outDir: "dist",
           rollupOptions: {
             input: "elm-stuff/elm-pages/index.html",
@@ -123,7 +123,7 @@ export async function run(options) {
       fullOutputPath,
       withoutExtension
     );
-    const assetManifestPath = path.join(process.cwd(), "dist/manifest.json");
+    const assetManifestPath = path.join(process.cwd(), "dist/___vite-manifest___.json");
     const manifest = JSON.parse(
       await fsPromises.readFile(assetManifestPath, { encoding: "utf-8" })
     );
@@ -155,7 +155,7 @@ export async function run(options) {
         `<script defer src="/elm.${browserElmHash}.js" type="text/javascript"></script>`
       );
     await fsPromises.writeFile("dist/template.html", processedIndexTemplate);
-    await fsPromises.unlink(assetManifestPath);
+    // await fsPromises.unlink(assetManifestPath);
     const portBackendTaskCompiled = esbuild
       .build({
         entryPoints: ["./custom-backend-task"],

package/generator/src/cli.js

@@ -346,7 +346,7 @@ async function requireElm(compiledElmPath) {
   const warnOriginal = console.warn;
   console.warn = function () {};
 
-  let Elm = (await import(path.resolve(compiledElmPath))).default;
+  let Elm = (await import(url.pathToFileURL(path.resolve(compiledElmPath)).href)).default;
   console.warn = warnOriginal;
   return Elm;
 }

package/generator/src/codegen.js

@@ -72,7 +72,7 @@ export async function generate(basePath) {
 }
 
 function writeFetcherModules(basePath, fetcherData) {
-  Promise.all(
+  return Promise.all(
     fetcherData.map(([name, fileContent]) => {
       let filePath = path.join(basePath, `/Fetcher/${name.join("/")}.elm`);
       ensureDirSync(path.dirname(filePath));

package/generator/src/compatibility-key.js

@@ -1,3 +1,3 @@
-export const compatibilityKey = 20;
+export const compatibilityKey = 21;
 
-export const packageVersion = "3.0.8";
+export const packageVersion = "3.0.10";

package/generator/src/render.js

@@ -512,12 +512,7 @@ async function readFileJobNew(req, patternsToWatch) {
   try {
     patternsToWatch.add(filePath);
 
-    const fileContents = // TODO can I remove this hack?
-      (
-        await fsPromises.readFile(
-          path.join(process.env.LAMBDA_TASK_ROOT || process.cwd(), filePath)
-        )
-      ).toString();
+    const fileContents = (await fsPromises.readFile(filePath)).toString();
     // TODO does this throw an error if there is invalid frontmatter?
     const parsedFile = matter(fileContents);
 

package/generator/template/app/ErrorPage.elm

@@ -3,7 +3,6 @@ module ErrorPage exposing (ErrorPage(..), Model, Msg, head, init, internalError,
 import Effect exposing (Effect)
 import Head
 import Html exposing (Html)
-import Html.Events exposing (onClick)
 import View exposing (View)
 
 
@@ -54,20 +53,24 @@ view : ErrorPage -> Model -> View Msg
 view error model =
     { body =
         [ Html.div []
-            [ Html.p [] [ Html.text "Page not found. Maybe try another URL?" ]
-            , Html.div []
-                [ Html.button
-                    [ onClick Increment
-                    ]
-                    [ Html.text
-                        (model.count
-                            |> String.fromInt
-                        )
-                    ]
+            [ Html.p []
+                [ Html.text <|
+                    case error of
+                        NotFound ->
+                            "Page not found. Maybe try another URL?"
+
+                        InternalError string ->
+                            "Something went wrong.\n" ++ string
                 ]
             ]
         ]
-    , title = "This is a NotFound Error"
+    , title =
+        case error of
+            NotFound ->
+                "Page Not Found"
+
+            InternalError string ->
+                "Unexpected Error"
     }
 
 

package/generator/template/codegen/elm.codegen.json

@@ -1,12 +1,12 @@
 {
-    "elm-codegen-version": "0.2.0",
+    "elm-codegen-version": "0.5.1",
     "codegen-helpers": {
         "packages": {
             "elm/core": "1.0.5",
             "dillonkearns/elm-form": "3.0.0",
             "elm/html": "1.0.0",
             "rtfeldman/elm-css": "18.0.0",
-            "dillonkearns/elm-pages": "10.0.0",
+            "dillonkearns/elm-pages": "10.0.3",
             "elm/json": "1.1.3"
         },
         "local": [

package/generator/template/elm-tooling.json

@@ -1,6 +1,6 @@
 {
     "tools": {
         "elm": "0.19.1",
-        "elm-format": "0.8.5"
+        "elm-format": "0.8.7"
     }
 }

package/generator/template/gitignore

@@ -2,4 +2,5 @@ node_modules/
 elm-stuff/
 dist/
 .elm-pages/
-functions/render/elm-pages-cli.js
+functions/render/elm-pages-cli.mjs
+functions/server-render/elm-pages-cli.mjs

package/generator/template/netlify.toml

@@ -1,7 +1,7 @@
 [build]
   functions = "functions/"
   publish = "dist/"
-  command = "mkdir bin && export PATH=\"/opt/build/repo/bin:$PATH\" && echo $PATH && curl https://static.lamdera.com/bin/linux/lamdera -o bin/lamdera && chmod a+x bin/lamdera && export ELM_HOME=\"$NETLIFY_BUILD_BASE/cache/elm\" && npm install && npm run build"
+  command = "export ELM_HOME=\"$NETLIFY_BUILD_BASE/cache/elm\" && npm install && npm run build"
 
 [dev]
   command = "npm start"

package/generator/template/package.json

@@ -7,12 +7,13 @@
     "build": "elm-pages build"
   },
   "devDependencies": {
-    "elm-codegen": "^0.3.0",
+    "elm-codegen": "^0.5.1",
     "elm-optimize-level-2": "^0.3.5",
-    "elm-pages": "^3.0.3",
-    "elm-review": "^2.10.2",
-    "elm-tooling": "^1.14.0",
-    "vite": "^4.3.5"
+    "elm-pages": "^3.0.10",
+    "elm-review": "^2.10.3",
+    "elm-tooling": "^1.15.0",
+    "lamdera": "^0.19.1-1.2.1-1",
+    "vite": "^5.0.11"
   },
   "dependencies": {
     "@netlify/functions": "^1.4.0"

package/generator/template/script/elm.json

@@ -8,19 +8,19 @@
     "dependencies": {
         "direct": {
             "dillonkearns/elm-cli-options-parser": "3.2.0",
-            "dillonkearns/elm-pages": "10.0.0",
+            "dillonkearns/elm-pages": "10.0.3",
             "elm/bytes": "1.0.8",
             "elm/core": "1.0.5",
             "elm/html": "1.0.0",
             "elm/json": "1.1.3",
-            "mdgriffith/elm-codegen": "3.0.0"
+            "mdgriffith/elm-codegen": "4.1.1"
         },
         "indirect": {
             "Chadtech/elm-bool-extra": "2.4.2",
             "avh4/elm-color": "1.0.0",
             "danfishgold/base64-bytes": "1.1.0",
             "danyx23/elm-mimetype": "4.0.1",
-            "dillonkearns/elm-bcp47-language-tag": "1.0.1",
+            "dillonkearns/elm-bcp47-language-tag": "2.0.0",
             "dillonkearns/elm-date-or-date-time": "2.0.0",
             "dillonkearns/elm-form": "3.0.0",
             "elm/browser": "1.0.2",

package/generator/template/script/src/AddStaticRoute.elm

@@ -0,0 +1,87 @@
+module AddStaticRoute exposing (run)
+
+import BackendTask
+import Cli.Option as Option
+import Cli.OptionsParser as OptionsParser
+import Cli.Program as Program
+import Elm
+import Elm.Annotation as Type
+import Elm.Case
+import Gen.BackendTask
+import Gen.Effect as Effect
+import Gen.Html as Html
+import Gen.Platform.Sub
+import Gen.View
+import Pages.Script as Script exposing (Script)
+import Scaffold.Route exposing (Type(..))
+
+
+type alias CliOptions =
+    { moduleName : List String
+    }
+
+
+run : Script
+run =
+    Script.withCliOptions program
+        (\cliOptions ->
+            cliOptions
+                |> createFile
+                |> Script.writeFile
+                |> BackendTask.allowFatal
+        )
+
+
+program : Program.Config CliOptions
+program =
+    Program.config
+        |> Program.add
+            (OptionsParser.build CliOptions
+                |> OptionsParser.with (Option.requiredPositionalArg "module" |> Scaffold.Route.moduleNameCliArg)
+            )
+
+
+createFile : CliOptions -> { path : String, body : String }
+createFile { moduleName } =
+    Scaffold.Route.preRender
+        { moduleName = moduleName
+        , pages =
+            Gen.BackendTask.succeed
+                (Elm.list [])
+        , data =
+            ( Alias (Type.record [])
+            , \routeParams ->
+                Gen.BackendTask.succeed (Elm.record [])
+            )
+        , head = \app -> Elm.list []
+        }
+        |> Scaffold.Route.buildWithLocalState
+            { view =
+                \{ shared, model, app } ->
+                    Gen.View.make_.view
+                        { title = moduleName |> String.join "." |> Elm.string
+                        , body =
+                            Elm.list
+                                [ Html.h2 [] [ Html.text "New Page" ]
+                                ]
+                        }
+            , update =
+                \{ shared, app, msg, model } ->
+                    Elm.Case.custom msg
+                        (Type.named [] "Msg")
+                        [ Elm.Case.branch0 "NoOp"
+                            (Elm.tuple model
+                                Effect.none
+                            )
+                        ]
+            , init =
+                \{ shared, app } ->
+                    Elm.tuple (Elm.record []) Effect.none
+            , subscriptions =
+                \{ routeParams, path, shared, model } ->
+                    Gen.Platform.Sub.none
+            , model =
+                Alias (Type.record [])
+            , msg =
+                Custom [ Elm.variant "NoOp" ]
+            }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "elm-pages",
   "type": "module",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "homepage": "https://elm-pages.com",
   "moduleResolution": "node",
   "description": "Type-safe static sites, written in pure elm with your own custom elm-markup syntax.",
@@ -27,45 +27,46 @@
   "dependencies": {
     "busboy": "^1.6.0",
     "chokidar": "^3.5.3",
-    "commander": "^10.0.1",
+    "commander": "^11.1.0",
     "connect": "^3.7.0",
     "cookie-signature": "^1.2.1",
     "cross-spawn": "7.0.3",
     "devcert": "^1.2.2",
     "elm-doc-preview": "^5.0.5",
     "elm-hot": "^1.1.6",
-    "esbuild": "^0.17.18",
-    "fs-extra": "^11.1.1",
-    "globby": "13.1.4",
+    "esbuild": "^0.19.11",
+    "fs-extra": "^11.2.0",
+    "globby": "14.0.0",
     "gray-matter": "^4.0.3",
     "jsesc": "^3.0.2",
     "kleur": "^4.1.5",
-    "make-fetch-happen": "^11.1.1",
-    "memfs": "^3.5.1",
+    "make-fetch-happen": "^13.0.0",
+    "memfs": "^4.6.0",
     "micromatch": "^4.0.5",
     "serve-static": "^1.15.0",
-    "terser": "^5.17.1",
-    "vite": "^4.3.5",
-    "which": "^3.0.1"
+    "terser": "^5.26.0",
+    "vite": "^5.0.11",
+    "which": "^4.0.0"
   },
   "devDependencies": {
-    "@types/cross-spawn": "^6.0.2",
-    "@types/fs-extra": "^11.0.1",
-    "@types/make-fetch-happen": "^10.0.1",
-    "@types/micromatch": "^4.0.2",
-    "@types/node": "^20.1.0",
-    "@types/serve-static": "^1.15.1",
-    "cypress": "^13.3.0",
-    "elm-codegen": "^0.3.0",
+    "@types/cross-spawn": "^6.0.6",
+    "@types/fs-extra": "^11.0.4",
+    "@types/make-fetch-happen": "^10.0.4",
+    "@types/micromatch": "^4.0.6",
+    "@types/node": "^20.10.7",
+    "@types/serve-static": "^1.15.5",
+    "cypress": "^13.6.2",
+    "elm-codegen": "^0.5.1",
     "elm-optimize-level-2": "^0.3.5",
-    "elm-review": "^2.10.2",
+    "elm-review": "^2.10.3",
     "elm-test": "^0.19.1-revision12",
-    "elm-tooling": "^1.14.0",
-    "elm-verify-examples": "^5.2.0",
+    "elm-tooling": "^1.15.0",
+    "elm-verify-examples": "^5.3.0",
     "elmi-to-json": "^1.4.3",
-    "typescript": "^5.0.4",
-    "vite": "^4.3.5",
-    "vitest": "^0.31.0"
+    "lamdera": "^0.19.1-1.2.1-1",
+    "typescript": "^5.3.3",
+    "vite": "^5.0.11",
+    "vitest": "^1.1.3"
   },
   "files": [
     "adapter/",

package/src/ApiRoute.elm

@@ -120,41 +120,52 @@ You define your ApiRoute's in `app/Api.elm`. Here's a simple example:
     requestPrinterExample : ApiRoute ApiRoute.Response
     requestPrinterExample =
         ApiRoute.succeed
-            (Server.Request.map4
-                (\rawBody method cookies queryParams ->
-                    Encode.object
-                        [ ( "rawBody"
-                          , rawBody
-                                |> Maybe.map Encode.string
-                                |> Maybe.withDefault Encode.null
-                          )
-                        , ( "method"
-                          , method
-                                |> Server.Request.methodToString
-                                |> Encode.string
-                          )
-                        , ( "cookies"
-                          , cookies
-                                |> Encode.dict
-                                    identity
-                                    Encode.string
-                          )
-                        , ( "queryParams"
-                          , queryParams
-                                |> Encode.dict
-                                    identity
-                                    (Encode.list Encode.string)
-                          )
-                        ]
-                        |> Response.json
-                        |> BackendTask.succeed
-                )
-                Server.Request.rawBody
-                Server.Request.method
-                Server.Request.allCookies
-                Server.Request.queryParams
+            (\pageId revisionId request ->
+                Encode.object
+                    [ ( "pageId"
+                      , Encode.string pageId
+                      )
+                    , ( "revisionId"
+                      , Encode.string revisionId
+                      )
+                    , ( "body"
+                      , request
+                            |> Server.Request.body
+                            |> Maybe.map Encode.string
+                            |> Maybe.withDefault Encode.null
+                      )
+                    , ( "method"
+                      , request
+                            |> Server.Request.method
+                            |> Server.Request.methodToString
+                            |> Encode.string
+                      )
+                    , ( "cookies"
+                      , request
+                            |> Server.Request.cookies
+                            |> Encode.dict
+                                identity
+                                Encode.string
+                      )
+                    , ( "queryParams"
+                      , request
+                            |> Server.Request.queryParams
+                            |> Encode.dict
+                                identity
+                                (Encode.list Encode.string)
+                      )
+                    ]
+                    |> Response.json
+                    |> BackendTask.succeed
             )
-            |> ApiRoute.literal "api"
+            -- Path: /pages/:pageId/revisions/:revisionId/request-test
+            |> ApiRoute.literal "pages"
+            |> ApiRoute.slash
+            |> ApiRoute.capture
+            |> ApiRoute.slash
+            |> ApiRoute.literal "revisions"
+            |> ApiRoute.slash
+            |> ApiRoute.capture
             |> ApiRoute.slash
             |> ApiRoute.literal "request-test"
             |> ApiRoute.serverRender

package/src/BackendTask/File.elm

@@ -5,7 +5,8 @@ module BackendTask.File exposing
     )
 
 {-| This module lets you read files from the local filesystem as a [`BackendTask`](BackendTask#BackendTask).
-File paths are relative to the root of your `elm-pages` project (next to the `elm.json` file and `src/` directory).
+File paths are relative to the root of your `elm-pages` project (next to the `elm.json` file and `src/` directory), or
+you can pass in absolute paths beginning with a `/`.
 
 
 ## Files With Frontmatter

package/src/BackendTask.elm

@@ -199,27 +199,28 @@ combineHelp items =
     List.foldl (map2 (::)) (succeed []) items |> map List.reverse
 
 
-{-| Like map, but it takes in two `Request`s.
-
-    view siteMetadata page =
-        StaticHttp.map2
-            (\elmPagesStars elmMarkdownStars ->
-                { view =
-                    \model viewForPage ->
-                        { title = "Repo Stargazers"
-                        , body = starsView elmPagesStars elmMarkdownStars
-                        }
-                , head = head elmPagesStars elmMarkdownStars
-                }
-            )
-            (get
-                "https://api.github.com/repos/dillonkearns/elm-pages"
-                (Decode.field "stargazers_count" Decode.int)
-            )
-            (get
-                "https://api.github.com/repos/dillonkearns/elm-markdown"
-                (Decode.field "stargazers_count" Decode.int)
+{-| Like map, but it takes in two `BackendTask`s.
+
+    import BackendTask exposing (BackendTask)
+    import BackendTask.Env as Env
+    import BackendTask.Http
+    import FatalError exposing (FatalError)
+    import Json.Decode as Decode
+
+    type alias Data =
+        { pokemon : List String, envValue : Maybe String }
+
+    data : BackendTask FatalError Data
+    data =
+        BackendTask.map2 Data
+            (BackendTask.Http.getJson
+                "https://pokeapi.co/api/v2/pokemon/?limit=100&offset=0"
+                (Decode.field "results"
+                    (Decode.list (Decode.field "name" Decode.string))
+                )
+                |> BackendTask.allowFatal
             )
+            (Env.get "HELLO")
 
 -}
 map2 : (a -> b -> c) -> BackendTask error a -> BackendTask error b -> BackendTask error c
@@ -334,28 +335,15 @@ andMap =
     map2 (|>)
 
 
-{-| This is useful for prototyping with some hardcoded data, or for having a view that doesn't have any StaticHttp data.
+{-| This is useful for prototyping with some hardcoded data, or for having a view that doesn't have any BackendTask data.
 
-    import BackendTask
+    import BackendTask exposing (BackendTask)
+
+    type alias RouteParams = { name : String }
 
-    view :
-        List ( PagePath, Metadata )
-        ->
-            { path : PagePath
-            , frontmatter : Metadata
-            }
-        ->
-            StaticHttp.Request
-                { view : Model -> View -> { title : String, body : Html Msg }
-                , head : List (Head.Tag Pages.PathKey)
-                }
-    view siteMetadata page =
-        StaticHttp.succeed
-            { view =
-                \model viewForPage ->
-                    mainView model viewForPage
-            , head = head page.frontmatter
-            }
+    pages : BackendTask error (List RouteParams)
+    pages =
+        BackendTask.succeed [ { name = "elm-pages" } ]
 
 -}
 succeed : a -> BackendTask error a

package/src/FatalError.elm

@@ -20,8 +20,8 @@ For example, if you wanted to handle possible errors to present them to the user
         BackendTask.Http.getJson "https://api.github.com/repos/dillonkearns/elm-pages"
             (Decode.field "description" Decode.string)
             |> BackendTask.onError
-                (\error ->
-                    case FatalError.unwrap error of
+                (\{ recoverable } ->
+                    case recoverable of
                         BackendTask.Http.BadStatus metadata string ->
                             if metadata.statusCode == 401 || metadata.statusCode == 403 || metadata.statusCode == 404 then
                                 BackendTask.succeed "Either this repo doesn't exist or you don't have access to it."