Merge branch 'master' into uncached-requests

# Conflicts:
#	examples/docs/package-lock.json
#	examples/end-to-end/package-lock.json

.github/workflows/ci.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Setup for cypress
         run: (cd examples/end-to-end && npm install && npx elm-tooling install && rm -rf elm-stuff && npx elm-pages gen && lamdera make app/Route/Index.elm)
       - name: Cypress tests
-        uses: cypress-io/github-action@v4
+        uses: cypress-io/github-action@v5
         with:
           start: npm start
           wait-on: "http://localhost:1234"
@@ -102,7 +102,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./examples/base-path/dist
       - name: Elm Publish
-        uses: dillonkearns/elm-publish-action@v1
+        uses: dillonkearns/elm-publish-action@c42e6b74c43830ba50fcd0b5bd1a99baf3cb350f
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path-to-elm: ./node_modules/.bin/elm

cypress/e2e/api-routes.cy.ts

@@ -69,21 +69,21 @@ it("missing expected query param", () => {
   });
 });
 
-it("multi-part form post", () => {
-  const formData = new FormData();
-  formData.set("first", "Multipart");
-  cy.request({
-    method: "POST",
-    url: "/api/greet",
-    body: formData,
-  }).then((res) => {
-    expect(res.headers["content-type"]).to.eq("text/plain");
-    expect(res.status).to.eq(200);
-    expect(Cypress.Blob.arrayBufferToBinaryString(res.body)).to.eq(
-      "Hello Multipart"
-    );
-  });
-});
+// it("multi-part form post", () => {
+//   const formData = new FormData();
+//   formData.set("first", "Multipart");
+//   cy.request({
+//     method: "POST",
+//     url: "/api/greet",
+//     body: formData,
+//   }).then((res) => {
+//     expect(res.headers["content-type"]).to.eq("text/plain");
+//     expect(res.status).to.eq(200);
+//     expect(Cypress.Blob.arrayBufferToBinaryString(res.body)).to.eq(
+//       "Hello Multipart"
+//     );
+//   });
+// });
 
 it("decodes xml", () => {
   cy.request({

package-lock.json

@@ -42,7 +42,7 @@
         "@types/micromatch": "^4.0.2",
         "@types/node": "^18.11.9",
         "@types/serve-static": "^1.15.0",
-        "cypress": "^11.1.0",
+        "cypress": "^12.0.2",
         "elm-codegen": "^0.2.0",
         "elm-optimize-level-2": "^0.3.5",
         "elm-review": "^2.8.2",
@@ -1661,9 +1661,9 @@
       }
     },
     "node_modules/cypress": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-11.2.0.tgz",
-      "integrity": "sha512-u61UGwtu7lpsNWLUma/FKNOsrjcI6wleNmda/TyKHe0dOBcVjbCPlp1N6uwFZ0doXev7f/91YDpU9bqDCFeBLA==",
+      "version": "12.0.2",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.0.2.tgz",
+      "integrity": "sha512-WnLx1DpnbF1vbpDBkgP14rK5yS3U+Gvxrv2fsB4Owma26oIyENj7DDRnsJbSZuTfG4mcuUJxAkRHJR2wBqBfMA==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -1714,7 +1714,7 @@
         "cypress": "bin/cypress"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": "^14.0.0 || ^16.0.0 || >=18.0.0"
       }
     },
     "node_modules/cypress/node_modules/@types/node": {
@@ -8171,9 +8171,9 @@
       }
     },
     "cypress": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-11.2.0.tgz",
-      "integrity": "sha512-u61UGwtu7lpsNWLUma/FKNOsrjcI6wleNmda/TyKHe0dOBcVjbCPlp1N6uwFZ0doXev7f/91YDpU9bqDCFeBLA==",
+      "version": "12.0.2",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.0.2.tgz",
+      "integrity": "sha512-WnLx1DpnbF1vbpDBkgP14rK5yS3U+Gvxrv2fsB4Owma26oIyENj7DDRnsJbSZuTfG4mcuUJxAkRHJR2wBqBfMA==",
       "dev": true,
       "requires": {
         "@cypress/request": "^2.88.10",

package.json

@@ -54,7 +54,7 @@
     "@types/micromatch": "^4.0.2",
     "@types/node": "^18.11.9",
     "@types/serve-static": "^1.15.0",
-    "cypress": "^11.1.0",
+    "cypress": "^12.0.2",
     "elm-codegen": "^0.2.0",
     "elm-optimize-level-2": "^0.3.5",
     "elm-review": "^2.8.2",
@@ -77,4 +77,4 @@
   "bin": {
     "elm-pages": "generator/src/cli.js"
   }
-}
+}