elm-pages 3.0.12 → 3.0.14

package/generator/src/build.js

@@ -97,6 +97,9 @@ export async function run(options) {
         configFile: false,
         root: process.cwd(),
         base: options.base,
+        assetsInclude: [
+          '/elm-pages.js'
+        ],
         ssr: false,
 
         build: {
@@ -232,9 +235,9 @@ export async function render(request) {
     // isBase64Encoded
     return {
         body: response.body.body,
-        statusCode: response.statusCode,
+        statusCode: response.body.statusCode,
         kind: response.kind,
-        headers: response.headers,
+        headers: response.body.headers,
         isBase64Encoded: response.body.isBase64Encoded,
     }
   } else {
@@ -683,15 +686,22 @@ function _HtmlAsJson_toJson(html) {
 
   await fsPromises.writeFile(
     ELM_FILE_PATH().replace(/\.js$/, ".cjs"),
-    elmFileContent
+    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!';");
+  } else {
+    return input;
+  }
 }
 
 async function runAdapter(adaptFn, processedIndexTemplate) {

package/generator/src/cli.js

@@ -150,11 +150,8 @@ async function main() {
           debug: "debug",
           executableName,
           mainModule: "ScriptMain",
+          isScript: true,
         });
-        fs.renameSync(
-          `${projectDirectory}/elm-stuff/elm-pages/elm.js`,
-          `${projectDirectory}/elm-stuff/elm-pages/elm.cjs`
-        );
         process.chdir(cwd);
         await renderer.runGenerator(
           unprocessedCliOptions,
@@ -203,6 +200,7 @@ async function main() {
         debug: options.debug,
         executableName,
         mainModule: "ScriptMain",
+        isScript: true,
       });
       // await runTerser(`${projectDirectory}/elm-stuff/elm-pages/elm.js`);
       fs.renameSync(
@@ -398,7 +396,7 @@ async function compileElmForScript(elmModulePath) {
   }
   // await codegen.generate("");
   ensureDirSync(path.join(process.cwd(), ".elm-pages", "http-response-cache"));
-  if (fs.existsSync("./codegen/")) {
+  if (fs.existsSync("./codegen/") && process.env.SKIP_ELM_CODEGEN !== "true") {
     await runElmCodegenInstall();
   }
 

package/generator/src/compatibility-key.js

@@ -1,3 +1,3 @@
-export const compatibilityKey = 21;
+export const compatibilityKey = 22;
 
-export const packageVersion = "3.0.11";
+export const packageVersion = "3.0.14";

package/generator/src/dev-server.js

@@ -175,6 +175,9 @@ export async function start(options) {
           base: options.base,
           port: options.port,
         },
+        assetsInclude: [
+          '/elm-pages.js'
+        ],
         appType: "custom",
         configFile: false,
         root: process.cwd(),