npm - elm-pages - Versions diffs - 3.0.0-beta.9 → 3.0.1 - Mend

elm-pages 3.0.0-beta.9 → 3.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (208) hide show

package/generator/src/init.js CHANGED Viewed

@@ -1,12 +1,15 @@
-const fs = require("fs");
-const copySync = require("fs-extra").copySync;
-const path = require("path");
-const kleur = require("kleur");
+import * as fs from "fs";
+import * as fsExtra from "fs-extra";
+import * as path from "path";
+import * as kleur from "kleur/colors";
+import { fileURLToPath } from "url";
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 /**
  * @param {string} name
  */
-async function run(name) {
+export async function run(name) {
   console.log("Creating " + name + " project...");
   const appRoot = path.resolve(name.toString());
@@ -14,7 +17,7 @@ async function run(name) {
   if (!fs.existsSync(name)) {
     try {
-      copySync(template, appRoot);
+      await fsExtra.copy(template, appRoot);
       fs.renameSync(
         path.resolve(appRoot, "gitignore"),
         path.resolve(appRoot, ".gitignore")
@@ -36,5 +39,3 @@ async function run(name) {
     kleur.green("Project is successfully created in `" + appRoot + "`.")
   );
 }
-module.exports = { run };

package/generator/src/pre-render-html.js CHANGED Viewed

@@ -1,11 +1,12 @@
-const seo = require("./seo-renderer.js");
-const cliVersion = require("../../package.json").version;
-const path = require("path");
+import * as seo from "./seo-renderer.js";
+import * as path from "node:path";
+import { fileURLToPath } from "node:url";
+import { packageVersion } from "./compatibility-key.js";
 /** @typedef { { head: any[]; errors: any[]; html: string; route: string; title: string; } } Arg */
 /** @typedef { { tag : 'PageProgress'; args : Arg[] } } PageProgress */
-function wrapHtml(basePath, fromElm, contentDatPayload) {
+export function wrapHtml(basePath, fromElm, contentDatPayload) {
   const seoData = seo.gather(fromElm.head);
   return {
     kind: "html-template",
@@ -21,7 +22,9 @@ function wrapHtml(basePath, fromElm, contentDatPayload) {
  * @param {boolean} devMode
  * @param {(context: {cliVersion: string;}) => string} userHeadTagsTemplate
  */
-function templateHtml(devMode, userHeadTagsTemplate) {
+export function templateHtml(devMode, userHeadTagsTemplate) {
+  const __filename = fileURLToPath(import.meta.url);
+  const __dirname = path.dirname(__filename);
   return /* html */ `<!DOCTYPE html>
 <!-- ROOT --><html lang="en">
   <head>
@@ -42,7 +45,7 @@ function templateHtml(devMode, userHeadTagsTemplate) {
             "../static-code/elm-pages.js"
           )}" type="module"></script>`
     }
-    ${indent(userHeadTagsTemplate({ cliVersion }))}
+    ${indent(userHeadTagsTemplate({ cliVersion: packageVersion }))}
     <!-- PLACEHOLDER_HEAD_AND_DATA -->
   </head>
   <body>
@@ -65,7 +68,7 @@ function indent(snippet) {
 /**
  * @param {string} processedTemplate
  */
-function replaceTemplate(processedTemplate, info) {
+export function replaceTemplate(processedTemplate, info) {
   return processedTemplate
     .replace(
       /<!--\s*PLACEHOLDER_HEAD_AND_DATA\s*-->/,
@@ -76,9 +79,3 @@ function replaceTemplate(processedTemplate, info) {
     .replace(/<!--\s*PLACEHOLDER_HTML\s* -->/, info.html)
     .replace(/<!-- ROOT -->\S*<html lang="en">/m, info.rootElement);
 }
-module.exports = {
-  wrapHtml,
-  templateHtml,
-  replaceTemplate,
-};

package/generator/src/render-test.js ADDED Viewed

@@ -0,0 +1,109 @@
+const renderer = require("../../generator/src/render");
+const path = require("path");
+const compiledElmPath = path.join(process.cwd(), "elm-stuff/elm-pages/elm.js");
+const codegen = require("./codegen.js");
+const {
+  compileElmForBrowser,
+  runElmReview,
+  compileCliApp,
+} = require("./compile-elm.js");
+const { restoreColorSafe } = require("./error-formatter");
+async function run({ pathname, serverRequest }) {
+  try {
+    const basePath = "/";
+    await codegen.generate(basePath);
+    console.log("Compiling...");
+    await compileCliApp(
+      { port: 1234, base: basePath, https: false, debug: true },
+      ".elm-pages/Main.elm",
+      path.join(process.cwd(), "elm-stuff/elm-pages/", "elm.js"),
+      // "elm.js",
+      "elm-stuff/elm-pages/",
+      path.join("elm-stuff/elm-pages/", "elm.js")
+    );
+    console.log("Compiling DONE");
+    const portsFilePath =
+      ".elm-pages/compiled-ports/custom-backend-task-FA2IJND6.js";
+    const mode = "dev-server";
+    const renderResult = await renderer.render(
+      portsFilePath,
+      basePath,
+      require(compiledElmPath),
+      mode,
+      pathname,
+      serverRequest,
+      function (patterns) {},
+      true
+    );
+    console.log("renderResult", renderResult);
+  } catch (error) {
+    console.log("ERROR");
+    console.log(restoreColorSafe(error));
+  }
+}
+// run({
+//   serverRequest: {
+//     method: "POST",
+//     headers: {
+//       host: "localhost:1234",
+//       cookie: "darkMode=%7B%7D.X1hjuYBa1OZulUomD5yrPy6VcYeY3sC7SKZVGViT0Q4",
+//       accept: "*/*",
+//       "accept-language": "en-US,en;q=0.9",
+//       connection: "keep-alive",
+//       "content-type": "application/x-www-form-urlencoded",
+//       origin: "http://localhost:1234",
+//       referer: "http://localhost:1234/dark-mode",
+//     },
+//     rawUrl: "http://localhost:1234/dark-mode/content.dat",
+//     body: "name=1",
+//     requestTime: 1671391652138,
+//     multiPartFormData: null,
+//   },
+//   pathname: "/dark-mode/content.dat",
+// });
+// run({
+//   pathname: "/fetcher/content.dat",
+//   serverRequest: {
+//     method: "POST",
+//     headers: {
+//       host: "localhost:1234",
+//       cookie: "darkMode=%7B%7D",
+//       accept: "*/*",
+//       "content-type": "application/x-www-form-urlencoded",
+//       origin: "http://localhost:1234",
+//       referer: "http://localhost:1234/fetcher",
+//     },
+//     rawUrl: "http://localhost:1234/fetcher/content.dat",
+//     body: "name=1",
+//     requestTime: 1671296755228,
+//     multiPartFormData: null,
+//   },
+// });
+run({
+  serverRequest: {
+    method: "POST",
+    headers: {
+      host: "localhost:1234",
+      "cache-control": "max-age=0",
+      accept:
+        "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8",
+      "content-type": "application/x-www-form-urlencoded",
+      referer: "http://localhost:1234/login",
+      cookie:
+        "darkMode=%7B%22darkMode%22%3A%22%22%7D.vtrl8xZXjtx9E3iidJrgurAz4Vk7rnMQmf6zKiAbwNo; mysession=%7B%7D.YX1rW5PIpRFkjgIjLn4p9iyl5r9kWLYHqQUYxAYKJgQ",
+    },
+    rawUrl: "http://localhost:1234/login/content.dat",
+    body: "name=1",
+    requestTime: 1671391652138,
+    multiPartFormData: null,
+  },
+  pathname: "/login/content.dat",
+});

package/generator/src/render-worker.js CHANGED Viewed

@@ -1,19 +1,19 @@
-const renderer = require("../../generator/src/render");
-const path = require("path");
-const fs = require("./dir-helpers.js");
-const compiledElmPath = path.join(process.cwd(), "elm-stuff/elm-pages/elm.js");
-const { parentPort, threadId, workerData } = require("worker_threads");
-let Elm;
-global.staticHttpCache = {};
+import * as renderer from "../../generator/src/render.js";
+import * as path from "node:path";
+import * as fs from "./dir-helpers.js";
+import { readFileSync, writeFileSync } from "node:fs";
+import { parentPort, threadId, workerData } from "node:worker_threads";
+import * as url from "node:url";
 async function run({ mode, pathname, serverRequest, portsFilePath }) {
   console.time(`${threadId} ${pathname}`);
   try {
-    const renderResult = await renderer(
-      portsFilePath,
+    const renderResult = await renderer.render(
+      typeof portsFilePath === "string"
+        ? await import(url.pathToFileURL(path.resolve(portsFilePath)).href)
+        : portsFilePath,
       workerData.basePath,
-      requireElm(mode),
+      await requireElm(mode),
       mode,
       pathname,
       serverRequest,
@@ -42,20 +42,17 @@ async function run({ mode, pathname, serverRequest, portsFilePath }) {
   console.timeEnd(`${threadId} ${pathname}`);
 }
-function requireElm(mode) {
-  if (mode === "build") {
-    if (!Elm) {
-      const warnOriginal = console.warn;
-      console.warn = function () {};
-      Elm = require(compiledElmPath);
-      console.warn = warnOriginal;
-    }
-    return Elm;
-  } else {
-    delete require.cache[require.resolve(compiledElmPath)];
-    return require(compiledElmPath);
-  }
+async function requireElm(mode) {
+  const compiledElmPath = path.join(
+    process.cwd(),
+    "elm-stuff/elm-pages/elm.cjs"
+  );
+  let pathAsUrl = url.pathToFileURL(compiledElmPath);
+  const warnOriginal = console.warn;
+  console.warn = function () {};
+  const Elm = (await import(pathAsUrl.toString())).default;
+  console.warn = warnOriginal;
+  return Elm;
 }
 async function outputString(
@@ -67,13 +64,13 @@ async function outputString(
       const args = fromElm;
       const normalizedRoute = args.route.replace(/index$/, "");
       await fs.tryMkdir(`./dist/${normalizedRoute}`);
-      const template = await fs.readFileSync("./dist/template.html", "utf8");
-      fs.writeFileSync(
+      const template = readFileSync("./dist/template.html", "utf8");
+      writeFileSync(
         `dist/${normalizedRoute}/index.html`,
         renderTemplate(template, fromElm)
       );
       args.contentDatPayload &&
-        fs.writeFileSync(
+        writeFileSync(
           `dist/${normalizedRoute}/content.dat`,
           Buffer.from(args.contentDatPayload.buffer)
         );