npm - @marko/run - Versions diffs - 0.0.1-beta1 → 0.0.1-beta3 - Mend

@marko/run 0.0.1-beta1 → 0.0.1-beta3

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 (41) hide show

package/dist/adapter/default-entry.mjs +9 -3
package/dist/adapter/dev-server.d.ts +1 -1
package/dist/adapter/index.cjs +23 -8
package/dist/adapter/index.js +22 -7
package/dist/adapter/middleware.cjs +200 -0
package/dist/adapter/middleware.d.ts +59 -0
package/dist/adapter/middleware.js +169 -0
package/dist/cli/default.config.mjs +1 -1
package/dist/cli/index.mjs +45 -24
package/dist/runtime/index.cjs +0 -16
package/dist/runtime/index.d.ts +10 -2
package/dist/runtime/index.js +0 -7
package/dist/runtime/internal.cjs +148 -0
package/dist/runtime/internal.d.ts +10 -0
package/dist/runtime/internal.js +115 -0
package/dist/runtime/router.cjs +6 -6
package/dist/runtime/router.d.ts +4 -4
package/dist/runtime/router.js +4 -4
package/dist/runtime/types.d.ts +31 -16
package/dist/runtime/utils.d.ts +3 -0
package/dist/vite/codegen/index.d.ts +4 -3
package/dist/vite/codegen/writer.d.ts +1 -1
package/dist/vite/constants.d.ts +3 -2
package/dist/vite/index.cjs +542 -275
package/dist/vite/index.d.ts +4 -3
package/dist/vite/index.js +539 -275
package/dist/vite/types.d.ts +9 -7
package/dist/vite/utils/config.d.ts +2 -2
package/dist/vite/utils/server.d.ts +3 -1
package/package.json +18 -6
package/dist/adapter/server-old.d.ts +0 -3
package/dist/adapter/server.d.ts +0 -6
package/dist/adapters/node/index.d.ts +0 -5
package/dist/adapters/node/server.d.ts +0 -3
package/dist/adapters/static/crawler.d.ts +0 -9
package/dist/adapters/static/default-entry.mjs +0 -1
package/dist/adapters/static/index.cjs +0 -371
package/dist/adapters/static/index.d.ts +0 -5
package/dist/adapters/static/index.js +0 -341
package/dist/adapters/static/server.d.ts +0 -3
package/dist/runtime/request.d.ts +0 -4

package/dist/adapters/static/index.js DELETED Viewed

@@ -1,341 +0,0 @@
-// src/adapters/static/index.ts
-import path from "path";
-import { fileURLToPath } from "url";
-import { Pool } from "undici";
-// src/adapters/static/crawler.ts
-import fs from "fs";
-import nodePath from "path";
-import { WritableStream as Parser } from "htmlparser2/lib/WritableStream";
-var noop = () => {
-};
-var ignoredRels = /* @__PURE__ */ new Set(["nofollow", "enclosure", "external"]);
-var contentType = "text/html";
-function createCrawler(makeRequest, opts = {}) {
-  const origin = opts.origin || `http://localhost`;
-  const out = nodePath.resolve(opts.out || "dist");
-  const notFoundPath = resolvePath(opts.notFoundPath || "/404/", origin);
-  let seen;
-  let queue;
-  let pending;
-  async function visit(path2) {
-    var _a, _b;
-    const parser = new Parser({
-      onopentag(name, attrs) {
-        const href = resolveHref(name, attrs);
-        const path3 = href && resolvePath(href, origin);
-        if (path3 !== void 0 && !seen.has(path3)) {
-          seen.add(path3);
-          queue.push(visit(path3));
-        }
-      }
-    });
-    const dirname = nodePath.join(out, path2);
-    const abortController = new AbortController();
-    let fsWriter;
-    try {
-      const url = new URL(path2, origin);
-      const req = new Request(url, {
-        method: "GET",
-        signal: abortController.signal,
-        headers: { accept: contentType }
-      });
-      const res = await makeRequest(req);
-      if (!((_a = res.headers.get("content-type")) == null ? void 0 : _a.includes(contentType))) {
-        abortController.abort();
-        return;
-      }
-      let redirect;
-      switch (res.status) {
-        case 200:
-          break;
-        case 404:
-          if (path2 !== notFoundPath) {
-            redirect = origin + notFoundPath;
-          }
-          break;
-        case 301: {
-          redirect = res.headers.get("location");
-          const redirectPath = resolvePath(redirect, origin);
-          if (redirectPath && !seen.has(redirectPath)) {
-            seen.add(redirectPath);
-            queue.push(visit(redirectPath));
-          }
-          break;
-        }
-        default: {
-          abortController.abort();
-          console.warn(`Status code ${res.status} was while crawling: '${path2}'`);
-          return;
-        }
-      }
-      await fs.promises.mkdir(dirname, { recursive: true }).catch(noop);
-      fsWriter = fs.createWriteStream(nodePath.join(dirname, "index.html"));
-      if (redirect) {
-        abortController.abort();
-        fsWriter.write(
-          `<!DOCTYPE html><meta http-equiv=Refresh content="0;url=${redirect.replace(
-            /"/g,
-            "&#40;"
-          )}">`
-        );
-      } else {
-        const writable = new WritableStream({
-          write(data) {
-            fsWriter.write(data);
-            parser.write(data);
-          }
-        });
-        await ((_b = res.body) == null ? void 0 : _b.pipeTo(writable));
-      }
-    } finally {
-      fsWriter == null ? void 0 : fsWriter.end();
-      parser.end();
-    }
-  }
-  return {
-    async crawl(paths = ["/"]) {
-      if (pending) {
-        await pending;
-      }
-      const startPaths = paths.map((path2) => resolvePath(path2, origin)).concat(notFoundPath);
-      seen = new Set(startPaths);
-      try {
-        queue = startPaths.map(visit);
-        while (queue.length) {
-          pending = Promise.all(queue);
-          queue = [];
-          await pending;
-        }
-      } finally {
-        pending = void 0;
-      }
-    }
-  };
-}
-function resolveHref(tagName, attrs) {
-  switch (tagName) {
-    case "a":
-      if (attrs.href && !(attrs.download || ignoredRels.has(attrs.rel))) {
-        return attrs.href;
-      }
-      break;
-    case "link":
-      if (attrs.href) {
-        switch (attrs.rel) {
-          case "alternate":
-          case "author":
-          case "canonical":
-          case "help":
-          case "license":
-          case "next":
-          case "prefetch":
-          case "prerender":
-          case "prev":
-          case "search":
-          case "tag":
-            return attrs.href;
-          case "preload":
-            if (attrs.as === "document") {
-              return attrs.href;
-            }
-            break;
-        }
-      }
-      break;
-    case "iframe":
-      return attrs.src;
-  }
-}
-function resolvePath(href, origin) {
-  const url = new URL(href, origin);
-  if (url.origin === origin) {
-    let { pathname } = url;
-    const lastChar = pathname.length - 1;
-    if (pathname[lastChar] !== "/") {
-      pathname += "/";
-    }
-    return pathname + url.search;
-  }
-}
-// src/adapters/static/index.ts
-import fs2 from "fs/promises";
-// src/vite/utils/server.ts
-import net from "net";
-import cp from "child_process";
-async function spawnServer(cmd, port = 0, wait = 3e4) {
-  if (port <= 0) {
-    port = await getAvailablePort();
-  }
-  const proc = cp.spawn(cmd, {
-    shell: true,
-    stdio: "inherit",
-    windowsHide: true,
-    env: { ...process.env, PORT: `${port}` }
-  });
-  const close = () => {
-    proc.unref();
-    proc.kill();
-  };
-  let remaining = wait > 0 ? wait : Infinity;
-  while (!await isPortInUse(port)) {
-    if (remaining >= 100) {
-      remaining -= 100;
-      await sleep(100);
-    } else {
-      close();
-      throw new Error(
-        `site-write: timeout while wating for server to start on port "${port}".`
-      );
-    }
-  }
-  return close;
-}
-async function isPortInUse(port) {
-  return new Promise((resolve) => {
-    const connection = net.connect(port).setNoDelay(true).setKeepAlive(false).on("error", () => done(false)).on("connect", () => done(true));
-    function done(connected) {
-      connection.end();
-      resolve(connected);
-    }
-  });
-}
-async function getAvailablePort() {
-  return new Promise((resolve) => {
-    const server = net.createServer().listen(0, () => {
-      const { port } = server.address();
-      server.close(() => resolve(port));
-    });
-  });
-}
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-// src/adapters/static/server.ts
-import createStaticServe from "serve-static";
-import { createServer as createHttpServer } from "http";
-import { createServer as createDevServer } from "vite";
-import { createMiddleware } from "@hattip/adapter-node";
-function noop2() {
-}
-async function server_default(dir) {
-  if (dir) {
-    const staticServe = createStaticServe(dir, {
-      index: "index.html",
-      immutable: true,
-      maxAge: "365 days"
-    });
-    return await createHttpServer((req, res) => staticServe(req, res, noop2));
-  }
-  const devServer = await createDevServer({
-    appType: "custom",
-    server: { middlewareMode: true }
-  });
-  let handler;
-  let middleware;
-  return devServer.middlewares.use(async (req, res, next) => {
-    try {
-      const module = await devServer.ssrLoadModule("@marko/run");
-      if (module.handler !== handler) {
-        handler = module.handler;
-        middleware = createMiddleware(handler);
-      }
-      await middleware(req, res, next);
-    } catch (err) {
-      if (err instanceof Error) {
-        devServer.ssrFixStacktrace(err);
-      }
-      return next(err);
-    }
-  });
-}
-// src/adapters/static/index.ts
-var __dirname = fileURLToPath(new URL(".", import.meta.url));
-function staticAdapter(_options = {}) {
-  return {
-    name: "static-adapter",
-    async config(_options2) {
-      return {
-        codegen: {
-          trailingSlashes: "RedirectWith"
-        }
-      };
-    },
-    async getEntryFile() {
-      return path.join(__dirname, "default-entry");
-    },
-    async startServer(port, dir) {
-      const server = await server_default(dir);
-      server.on("error", (err) => {
-        console.error(err);
-        process.exit(1);
-      });
-      return new Promise((resolve) => {
-        const listener = server.listen(port, () => {
-          const address = listener.address();
-          console.log(`Server started: http://localhost:${address.port}`);
-          resolve();
-        });
-      });
-    },
-    async buildEnd(routes, builtEntries, sourceEntries) {
-      var _a;
-      const pathsToVisit = [];
-      for (const route of routes) {
-        if (!((_a = route.params) == null ? void 0 : _a.length)) {
-          pathsToVisit.push(route.path);
-        }
-      }
-      const defaultEntry = await this.getEntryFile();
-      if (sourceEntries[0] === defaultEntry) {
-        const { router } = await import(builtEntries[0]);
-        const crawler = createCrawler(router, {});
-        await crawler.crawl(pathsToVisit);
-      } else {
-        const port = await getAvailablePort();
-        const origin = `http://localhost:${port}`;
-        const client = new Pool(origin);
-        const closeServer = await spawnServer(`node ${builtEntries[0]}`, port);
-        const crawler = createCrawler(
-          async (request) => {
-            const url = new URL(request.url);
-            const headers = {};
-            request.headers.forEach((value, key) => {
-              headers[key] = value;
-            });
-            const responseData = await client.request({
-              path: url.pathname + url.search,
-              method: request.method,
-              signal: request.signal,
-              headers
-            });
-            return new Response(responseData.body, {
-              status: responseData.statusCode,
-              headers: responseData.headers
-            });
-          },
-          {
-            origin
-          }
-        );
-        try {
-          await crawler.crawl(pathsToVisit);
-        } finally {
-          await client.close();
-          closeServer();
-        }
-      }
-      for (const file of builtEntries) {
-        await fs2.rm(file, { maxRetries: 5 }).catch(() => {
-        });
-      }
-    }
-  };
-}
-export {
-  staticAdapter as default
-};

package/dist/adapters/static/server.d.ts DELETED Viewed

@@ -1,3 +0,0 @@
-/// <reference types="node" />
-import { type Server } from "http";
-export default function (dir?: string): Promise<Server>;

package/dist/runtime/request.d.ts DELETED Viewed

@@ -1,4 +0,0 @@
-/// <reference types="node" />
-import type { ServerResponse, IncomingMessage } from "http";
-export declare function createWebRequest<NodeRequest extends IncomingMessage = IncomingMessage>(nodeRequest: NodeRequest, url: URL): Request;
-export declare function applyWebResponse<NodeRequest extends IncomingMessage = IncomingMessage>(nodeResponse: ServerResponse<NodeRequest>, webResponse: Response): Promise<void>;