elm-pages 3.0.21 → 3.0.23

package/README.md

@@ -11,7 +11,7 @@
 
 - [elm-pages Docs Site](https://elm-pages.com/docs)
 - [elm-pages site showcase](https://elm-pages.com/showcase/)
-- [elm-pages Elm API Docs](https://package.elm-lang.org/packages/dillonkearns/elm-pages/10.2.0/)
+- [elm-pages Elm API Docs](https://package.elm-lang.org/packages/dillonkearns/elm-pages/10.2.1/)
 - [Quick start repo](https://github.com/dillonkearns/elm-pages-starter) [(live site hosted here)](https://elm-pages-starter.netlify.com)
 - [Introducing `elm-pages` blog post](https://elm-pages.com/blog/introducing-elm-pages)
 - [`examples` folder](https://github.com/dillonkearns/elm-pages/blob/master/examples/) (includes https://elm-pages.com site source) Use `git clone --recurse-submodules https://github.com/dillonkearns/elm-pages.git` so that there aren't missing files when you try to build the examples.

package/generator/src/cli.js

@@ -180,6 +180,10 @@ async function main() {
       "Output path for compiled script",
       "./myscript.mjs"
     )
+    .option(
+      "--set-version <version>",
+      "Set the version string for the bundled script"
+    )
     .option(
       "--external <package-or-pattern>",
       "build site to be served under a base path",
@@ -236,7 +240,8 @@ await renderer.runGenerator(
   [...process.argv].splice(2),
   customBackendTask,
   Elm,
-  "${moduleName}"
+  "${moduleName}",
+  "${options.setVersion || "Version not set."}"
 );
         `;
         // source: https://github.com/evanw/esbuild/pull/2067#issuecomment-1073039746

package/generator/src/compatibility-key.js

@@ -1,3 +1,3 @@
 export const compatibilityKey = 22;
 
-export const packageVersion = "3.0.21";
+export const packageVersion = "3.0.23";

package/generator/src/render.js

@@ -77,12 +77,14 @@ export async function render(
  * @param {string[]} cliOptions
  * @param {any} portsFile
  * @param {string} scriptModuleName
+ * @param {string} versionMessage
  */
 export async function runGenerator(
   cliOptions,
   portsFile,
   elmModule,
-  scriptModuleName
+  scriptModuleName,
+  versionMessage
 ) {
   global.isRunningGenerator = true;
   // const { fs, resetInMemoryFs } = require("./request-cache-fs.js")(true);
@@ -100,7 +102,8 @@ export async function runGenerator(
       scriptModuleName,
       "production",
       "",
-      true
+      true,
+      versionMessage
     );
     return result;
   } catch (error) {
@@ -119,6 +122,7 @@ export async function runGenerator(
  * @param {typeof import("fs") | import("memfs").IFs} fs
  * @param {boolean} hasFsAccess
  * @param {string} scriptModuleName
+ * @param {string} versionMessage
  */
 function runGeneratorAppHelp(
   cliOptions,
@@ -128,12 +132,22 @@ function runGeneratorAppHelp(
   scriptModuleName,
   mode,
   pagePath,
-  hasFsAccess
+  hasFsAccess,
+  versionMessage
 ) {
   const isDevServer = mode !== "build";
   let patternsToWatch = new Set();
   let app = null;
   let killApp;
+  // Handle version flag with early return
+  if (
+    cliOptions.length === 1 &&
+    (cliOptions[0] === "--version" || cliOptions[0] === "-v")
+  ) {
+    console.log(versionMessage);
+    return Promise.resolve();
+  }
+
   return new Promise((resolve, reject) => {
     const isBytes = pagePath.match(/content\.dat\/?$/);
 
@@ -141,7 +155,7 @@ function runGeneratorAppHelp(
       flags: {
         compatibilityKey,
         argv: ["", `elm-pages run ${scriptModuleName}`, ...cliOptions],
-        versionMessage: "1.2.3",
+        versionMessage,
       },
     });
 

package/generator/template/elm.json

@@ -14,7 +14,7 @@
             "dillonkearns/elm-bcp47-language-tag": "2.0.0",
             "dillonkearns/elm-form": "3.0.1",
             "dillonkearns/elm-markdown": "7.0.1",
-            "dillonkearns/elm-pages": "10.2.0",
+            "dillonkearns/elm-pages": "10.2.1",
             "elm/browser": "1.0.2",
             "elm/bytes": "1.0.8",
             "elm/core": "1.0.5",

package/generator/template/package.json

@@ -9,7 +9,7 @@
   "devDependencies": {
     "elm-codegen": "^0.6.1",
     "elm-optimize-level-2": "^0.3.5",
-    "elm-pages": "3.0.21",
+    "elm-pages": "3.0.23",
     "elm-review": "^2.12.0",
     "elm-tooling": "^1.15.1",
     "lamdera": "^0.19.1-1.3.2",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "elm-pages",
   "type": "module",
-  "version": "3.0.21",
+  "version": "3.0.23",
   "homepage": "https://elm-pages.com",
   "moduleResolution": "node",
   "description": "Hybrid Elm framework with full-stack and static routes.",

package/src/Test/Html/Internal/ElmHtml/InternalTypes.elm

@@ -2,7 +2,7 @@ module Test.Html.Internal.ElmHtml.InternalTypes exposing
     ( ElmHtml(..), TextTagRecord, NodeRecord, CustomNodeRecord, MarkdownNodeRecord
     , Facts, Tagger, EventHandler, ElementKind(..)
     , Attribute(..), AttributeRecord, NamespacedAttributeRecord, PropertyRecord, EventRecord
-    , decodeElmHtml, emptyFacts, toElementKind, decodeAttribute
+    , decodeElmHtml, emptyFacts, toElementKind, decodeAttribute, isUnsafeName
     )
 
 {-| Internal types used to represent Elm Html in pure Elm
@@ -13,7 +13,7 @@ module Test.Html.Internal.ElmHtml.InternalTypes exposing
 
 @docs Attribute, AttributeRecord, NamespacedAttributeRecord, PropertyRecord, EventRecord
 
-@docs decodeElmHtml, emptyFacts, toElementKind, decodeAttribute
+@docs decodeElmHtml, emptyFacts, toElementKind, decodeAttribute, isUnsafeName
 
 -}
 
@@ -21,6 +21,7 @@ import Dict exposing (Dict)
 import Html.Events
 import Json.Decode exposing (field)
 import Json.Encode
+import Regex exposing (Regex)
 import Test.Html.Internal.ElmHtml.Constants as Constants exposing (..)
 import Test.Html.Internal.ElmHtml.Helpers exposing (..)
 import Test.Html.Internal.ElmHtml.Markdown exposing (..)
@@ -124,6 +125,7 @@ type ElementKind
     | EscapableRawTextElements
     | ForeignElements
     | NormalElements
+    | InvalidElements
 
 
 type HtmlContext msg
@@ -510,12 +512,27 @@ escapableRawTextElements =
 -}
 
 
+unsafeName : Regex
+unsafeName =
+    {- https://github.com/preactjs/preact-render-to-string/blob/27f340b6e7d77ec7775a49a78d105cad26fa0857/src/lib/util.js#L2 -}
+    Regex.fromString "[\\s\\n\\\\/='\"\\0<>]"
+        |> Maybe.withDefault Regex.never
+
+
+isUnsafeName : String -> Bool
+isUnsafeName name =
+    Regex.contains unsafeName name
+
+
 {-| Identify the kind of element. Helper to convert an tag name into a type for
 pattern matching.
 -}
 toElementKind : String -> ElementKind
 toElementKind element =
-    if List.member element voidElements then
+    if isUnsafeName element then
+        InvalidElements
+
+    else if List.member element voidElements then
         VoidElements
 
     else if List.member element rawTextElements then

package/src/Test/Html/Internal/ElmHtml/ToString.elm

@@ -115,23 +115,25 @@ nodeRecordToString options { tag, children, facts } =
                     styleValues
                         |> List.map (\( key, value ) -> key ++ ":" ++ value ++ ";")
                         |> String.join ""
-                        |> (\styleString -> "style=\"" ++ styleString ++ "\"")
+                        |> (\styleString -> "style=\"" ++ escapeHtml styleString ++ "\"")
                         |> Just
 
         classes =
             Dict.get "className" facts.stringAttributes
-                |> Maybe.map (\name -> "class=\"" ++ name ++ "\"")
+                |> Maybe.map (\name -> "class=\"" ++ escapeHtml name ++ "\"")
 
         stringAttributes =
             Dict.filter (\k v -> k /= "className") facts.stringAttributes
                 |> Dict.toList
+                |> List.filter (\( k, _ ) -> not (isUnsafeName k))
                 |> List.map (Tuple.mapFirst propertyToAttributeName)
-                |> List.map (\( k, v ) -> k ++ "=\"" ++ v ++ "\"")
+                |> List.map (\( k, v ) -> k ++ "=\"" ++ escapeHtml v ++ "\"")
                 |> String.join " "
                 |> Just
 
         boolAttributes =
             Dict.toList facts.boolAttributes
+                |> List.filter (\( k, _ ) -> not (isUnsafeName k))
                 |> List.filterMap
                     (\( k, v ) ->
                         if v then
@@ -144,6 +146,9 @@ nodeRecordToString options { tag, children, facts } =
                 |> Just
     in
     case toElementKind tag of
+        InvalidElements ->
+            [ "<!-- invalid element -->" ]
+
         {- Void elements only have a start tag; end tags must not be
            specified for void elements.
         -}
@@ -187,10 +192,15 @@ escapeRawText kind rawText =
             rawText
 
         _ ->
-            {- https://github.com/elm/virtual-dom/blob/5a5bcf48720bc7d53461b3cd42a9f19f119c5503/src/Elm/Kernel/VirtualDom.server.js#L8-L26 -}
-            rawText
-                |> String.replace "&" "&amp;"
-                |> String.replace "<" "&lt;"
-                |> String.replace ">" "&gt;"
-                |> String.replace "\"" "&quot;"
-                |> String.replace "'" "&#039;"
+            escapeHtml rawText
+
+
+escapeHtml : String -> String
+escapeHtml rawText =
+    {- https://github.com/elm/virtual-dom/blob/5a5bcf48720bc7d53461b3cd42a9f19f119c5503/src/Elm/Kernel/VirtualDom.server.js#L8-L26 -}
+    rawText
+        |> String.replace "&" "&amp;"
+        |> String.replace "<" "&lt;"
+        |> String.replace ">" "&gt;"
+        |> String.replace "\"" "&quot;"
+        |> String.replace "'" "&#039;"