Miscellaneous Internal Changes

generator/src/basepath-middleware.js

@@ -1,5 +1,13 @@
 // this middleware is only active when (config.base !== '/')
 
+/**
+ * @import { NextHandleFunction } from "connect";
+ */
+
+/**
+ * @param {string} base
+ * @returns {NextHandleFunction}
+ */
 export function baseMiddleware(base) {
   // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
   return function viteBaseMiddleware(req, res, next) {

generator/src/build.js

@@ -21,8 +21,17 @@ import * as globby from "globby";
 import { fileURLToPath } from "url";
 import { copyFile } from "fs/promises";
 
+/**
+ * @type {Promise<{ worker: Worker }>[]}
+ */
 let pool = [];
+/**
+ * @type {(value: unknown) => void}
+ */
 let pagesReady;
+/**
+ * @type {(reason: unknown) => void}
+ */
 let pagesErrored;
 let pages = new Promise((resolve, reject) => {
   pagesReady = resolve;
@@ -73,7 +82,11 @@ export async function run(options) {
     // This is a temporary hack to avoid this warning. elm-pages manages compiling the Elm code without Vite's involvement, so it is external to Vite.
     // There is a pending issue to allow having external scripts in Vite, once this issue is fixed we can remove this hack:
     // https://github.com/vitejs/vite/issues/3533
-    if (messages && messages[0] && !messages[0].startsWith(`<script src="/elm.js">`)) {
+    if (
+      messages &&
+      messages[0] &&
+      !messages[0].startsWith(`<script src="/elm.js">`)
+    ) {
       console.info(...messages);
     }
   };
@@ -97,13 +110,11 @@ export async function run(options) {
         configFile: false,
         root: process.cwd(),
         base: options.base,
-        assetsInclude: [
-          '/elm-pages.js'
-        ],
+        assetsInclude: ["/elm-pages.js"],
         ssr: false,
 
         build: {
-          manifest: '___vite-manifest___.json',
+          manifest: "___vite-manifest___.json",
           outDir: "dist",
           rollupOptions: {
             input: "elm-stuff/elm-pages/index.html",
@@ -126,7 +137,10 @@ export async function run(options) {
       fullOutputPath,
       withoutExtension
     );
-    const assetManifestPath = path.join(process.cwd(), "dist/___vite-manifest___.json");
+    const assetManifestPath = path.join(
+      process.cwd(),
+      "dist/___vite-manifest___.json"
+    );
     const manifest = JSON.parse(
       await fsPromises.readFile(assetManifestPath, { encoding: "utf-8" })
     );
@@ -303,6 +317,8 @@ export async function render(request) {
 
 /**
  * @param {string} basePath
+ * @param {() => void} whenDone
+ * @returns {Promise<{worker: Worker}>}
  */
 function initWorker(basePath, whenDone) {
   return new Promise((resolve, reject) => {
@@ -686,19 +702,26 @@ function _HtmlAsJson_toJson(html) {
 
   await fsPromises.writeFile(
     ELM_FILE_PATH().replace(/\.js$/, ".cjs"),
-    applyScriptPatches(options, elmFileContent
-      .replace(
-        /return \$elm\$json\$Json\$Encode\$string\(.REPLACE_ME_WITH_JSON_STRINGIFY.\)/g,
-        `return ${forceThunksSource}
+    applyScriptPatches(
+      options,
+      elmFileContent
+        .replace(
+          /return \$elm\$json\$Json\$Encode\$string\(.REPLACE_ME_WITH_JSON_STRINGIFY.\)/g,
+          `return ${forceThunksSource}
   return _Json_wrap(forceThunks(html));
 `
-      )
-      .replace(`console.log('App dying')`, "")));
+        )
+        .replace(`console.log('App dying')`, "")
+    )
+  );
 }
 
 function applyScriptPatches(options, input) {
   if (options.isScript) {
-    return input.replace(`_Debug_crash(8, moduleName, region, message)`, "console.error('TODO in module `' + moduleName + '` ' + _Debug_regionToString(region) + '\\n\\n' + message); process.exitCode = 1; debugger; throw 'CRASH!';");
+    return input.replace(
+      `_Debug_crash(8, moduleName, region, message)`,
+      "console.error('TODO in module `' + moduleName + '` ' + _Debug_regionToString(region) + '\\n\\n' + message); process.exitCode = 1; debugger; throw 'CRASH!';"
+    );
   } else {
     return input;
   }

generator/tsconfig.json

@@ -1,12 +1,12 @@
 {
   "compilerOptions": {
-    "types": ["node"],
-    "moduleResolution": "node",
+    "module": "NodeNext",
+    "isolatedModules": true,
     "checkJs": true,
     "allowJs": true,
+    "noEmit": true,
     "strict": true,
-    "resolveJsonModule": true,
-    "lib": ["es2015", "es2017.object", "esnext", "dom"]
+    "lib": ["esnext", "dom"]
   },
   "exclude": ["node_modules", "generated"]
 }

package.json

@@ -3,8 +3,7 @@
   "type": "module",
   "version": "3.0.17",
   "homepage": "https://elm-pages.com",
-  "moduleResolution": "node",
-  "description": "Type-safe static sites, written in pure elm with your own custom elm-markup syntax.",
+  "description": "Hybrid Elm framework with full-stack and static routes.",
   "main": "index.js",
   "scripts": {
     "start": "cd examples/end-to-end && npm i && npx elm-pages dev",
@@ -50,12 +49,17 @@
     "which": "^5.0.0"
   },
   "devDependencies": {
+    "@types/busboy": "~1.5.4",
+    "@types/connect": "~3.4.38",
+    "@types/cookie-signature": "~1.1.2",
     "@types/cross-spawn": "^6.0.6",
     "@types/fs-extra": "^11.0.4",
+    "@types/jsesc": "~3.0.3",
     "@types/make-fetch-happen": "^10.0.4",
     "@types/micromatch": "^4.0.9",
     "@types/node": "^22.10.0",
     "@types/serve-static": "^1.15.7",
+    "@types/which": "~3.0.4",
     "cypress": "^13.16.0",
     "elm-codegen": "^0.6.1",
     "elm-optimize-level-2": "^0.3.5",

tsconfig.json

@@ -3,6 +3,7 @@
     "strict": true,
     "target": "ESNext",
     "module": "NodeNext",
-    "moduleResolution": "NodeNext"
+    "moduleResolution": "NodeNext",
+    "checkJs": true
   }
 }