fix: enable running tests without building

package.json

@@ -8,10 +8,10 @@
   "scripts": {
     "@ci:build": "npm run build",
     "@ci:lint": "eslint --format unix . && prettier . --check --with-node-modules --log-level=warn",
-    "@ci:release": "npm run build && changeset publish && npm ci",
+    "@ci:release": "npm run build && node scripts/pkg-toggle && changeset publish && node scripts/pkg-toggle && npm ci",
     "@ci:test": "cross-env NODE_OPTIONS=\"--max-old-space-size=4096\" MARKO_DEBUG=1 c8 npm test",
     "@ci:version": "npm run build && npm run format && changeset version && npm i --package-lock-only",
-    "build": "npm run build -w packages -w packages/adapters",
+    "build": "npm run build -w packages -w packages/adapters --if-present",
     "build:examples": "npm run build -w examples",
     "change": "changeset add",
     "format": "eslint --format unix --fix .; prettier . --write --with-node-modules --log-level=warn",

packages/explorer/lib/index.d.ts

@@ -0,0 +1,4 @@
+export declare function start(port: number): Promise<{
+  port: number;
+  close(): Promise<void>;
+}>;

packages/explorer/index.ts → packages/explorer/lib/index.js

@@ -1,14 +1,11 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore-next-line - Errors during build due to missing types?
 import { spawnServerWorker } from "@marko/run/vite";
 import path from "path";
 import { fileURLToPath } from "url";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
 const entry = path.join(__dirname, "server.js");
 
-export async function start(port: number) {
+export async function start(port) {
   const worker = await spawnServerWorker(entry, [], port, undefined, false);
   return {
     port,

packages/explorer/server.ts → packages/explorer/lib/server.js

@@ -1,8 +1,6 @@
 import { exec } from "child_process";
 import compression from "compression";
 import { createServer } from "http";
-import { IncomingMessage } from "http";
-import { ServerResponse } from "http";
 import { dirname } from "path";
 import path from "path";
 import createStaticServe from "serve-static";
@@ -15,9 +13,9 @@ const packageDir = path.join(__dirname, "..");
 const appDir = path.join(packageDir, ".app");
 const entryFile = path.join(packageDir, "src", "index.ts");
 
-let buildPromise: Promise<void> | null = null;
+let buildPromise = null;
 async function build() {
-  return (buildPromise ??= new Promise<void>((resolve, reject) => {
+  return (buildPromise ??= new Promise((resolve, reject) => {
     exec(
       `marko-run build --output ${appDir} ${entryFile}`,
       { cwd: packageDir, env: { ...process.env, MR_EXPLORER: "false" } },
@@ -34,22 +32,38 @@ async function build() {
   }));
 }
 
-let middleware = (req: IncomingMessage, res: ServerResponse) => {
+let middleware = (req, res) => {
   build().then(() => middleware(req, res));
 };
 
 const compress = compression({
   flush: zlib.constants.Z_PARTIAL_FLUSH,
   threshold: 500,
 });
-const staticServe = createStaticServe(appDir, {
+const servePublic = createStaticServe(`${appDir}/public`, {
   index: false,
+  redirect: false,
+  maxAge: "10 minutes",
+});
+
+const serveAssets = createStaticServe(`${appDir}/public/assets`, {
+  index: false,
+  redirect: false,
   immutable: true,
+  fallthrough: false,
   maxAge: "365 days",
 });
 
 createServer((req, res) =>
-  compress(req as any, res as any, () =>
-    staticServe(req, res, () => middleware(req, res)),
-  ),
+  compress(req, res, () => {
+    if (req.url.startsWith("/assets/")) {
+      req.url = req.url.slice(7);
+      serveAssets(req, res, () => {
+        res.statusCode = 404;
+        res.end();
+      });
+    } else {
+      servePublic(req, res, () => middleware(req, res));
+    }
+  }),
 ).listen(PORT);

packages/explorer/package.json

@@ -15,17 +15,15 @@
   "type": "module",
   "exports": {
     ".": {
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "import": "./lib/index.js",
+      "types": "./lib/index.d.ts"
     }
   },
-  "main": "dist/index.cjs",
   "files": [
     "dist",
     "src"
   ],
   "scripts": {
-    "build": "tsc -b tsconfig.build.json && tsx scripts/build.ts",
     "dev": "MR_EXPLORER=false marko-run",
     "preview": "MR_EXPLORER=false marko-run preview"
   },
@@ -42,6 +40,9 @@
     "typescript": "^5.7.2",
     "vite": "^6.0.0"
   },
+  "peerDependencies": {
+    "@marko/run": "^0"
+  },
   "logo": {
     "url": "https://github.com/marko-js/run/raw/main/assets/marko-run.png"
   }

packages/explorer/tsconfig.json

@@ -3,7 +3,7 @@
     "strict": true,
     "target": "es6",
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "allowSyntheticDefaultImports": true,
     "resolveJsonModule": true,
     "lib": ["es2018", "dom"]

packages/run/package.json

@@ -14,59 +14,14 @@
   "author": "Ryan Turnquist <[email protected]>",
   "type": "module",
   "exports": {
-    ".": {
-      "types": "./dist/runtime/index.d.ts",
-      "import": "./dist/runtime/index.js",
-      "require": "./dist/runtime/index.cjs"
-    },
-    "./namespace": {
-      "types": "./dist/runtime/namespace.d.ts"
-    },
-    "./router": {
-      "types": "./dist/runtime/router.d.ts",
-      "import": "./dist/runtime/router.js",
-      "require": "./dist/runtime/router.cjs"
-    },
-    "./vite": {
-      "types": "./dist/vite/index.d.ts",
-      "import": "./dist/vite/index.js",
-      "require": "./dist/vite/index.cjs"
-    },
-    "./adapter/middleware": {
-      "types": "./dist/adapter/middleware.d.ts",
-      "import": "./dist/adapter/middleware.js",
-      "require": "./dist/adapter/middleware.cjs"
-    },
-    "./adapter": {
-      "types": "./dist/adapter/index.d.ts",
-      "import": "./dist/adapter/index.js",
-      "require": "./dist/adapter/index.cjs"
-    }
-  },
-  "main": "./src/runtime/index.ts",
-  "types": "./dist/runtime/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "*": [
-        "./dist/runtime/index.d.ts"
-      ],
-      "namespace": [
-        "./dist/runtime/namespace.d.ts"
-      ],
-      "router": [
-        "./dist/runtime/router.d.ts"
-      ],
-      "vite": [
-        "./dist/vite/index.d.ts"
-      ],
-      "adapter/middleware": [
-        "./dist/adapter/middleware.d.ts"
-      ],
-      "adapter": [
-        "./dist/adapter/index.d.ts"
-      ]
-    }
+    ".": "./src/runtime/index.ts",
+    "./namespace": "./src/runtime/namespace.ts",
+    "./router": "./src/runtime/router.ts",
+    "./vite": "./src/vite/index.ts",
+    "./adapter/middleware": "./src/adapter/middleware.ts",
+    "./adapter": "./src/adapter/index.ts"
   },
+  "types": "./src/runtime/index.ts",
   "bin": {
     "marko-run": "./dist/cli/index.mjs"
   },
@@ -75,7 +30,7 @@
   ],
   "scripts": {
     "build": "rm -rf ./dist && tsc -b && tsx scripts/build.ts",
-    "test": "cross-env NODE_ENV=test mocha \"./src/**/__tests__/*.test.?(c)ts\"",
+    "test": "cross-env NODE_ENV=test NODE_OPTIONS='$NODE_OPTIONS --import tsx' mocha \"./src/**/__tests__/*.test.?(c)ts\"",
     "test:inspect": "npm test -- --inspect",
     "test:update": "npm test -- --update",
     "test:watch": "npm test -- --watch"
@@ -106,6 +61,7 @@
     "@marko/fixture-snapshots": "^2.2.1",
     "@marko/testing-library": "^6.2.0",
     "@types/debug": "^4.1.12",
+    "@types/diff": "^7.0.0",
     "@types/glob": "^8.1.0",
     "@types/human-format": "^1.0.3",
     "@types/jsdom": "^21.1.7",

packages/run/package.toggle.json

@@ -0,0 +1,43 @@
+{
+  "exports": {
+    ".": {
+      "types": "./dist/runtime/index.d.ts",
+      "import": "./dist/runtime/index.js",
+      "require": "./dist/runtime/index.cjs"
+    },
+    "./namespace": {
+      "types": "./dist/runtime/namespace.d.ts"
+    },
+    "./router": {
+      "types": "./dist/runtime/router.d.ts",
+      "import": "./dist/runtime/router.js",
+      "require": "./dist/runtime/router.cjs"
+    },
+    "./vite": {
+      "types": "./dist/vite/index.d.ts",
+      "import": "./dist/vite/index.js",
+      "require": "./dist/vite/index.cjs"
+    },
+    "./adapter/middleware": {
+      "types": "./dist/adapter/middleware.d.ts",
+      "import": "./dist/adapter/middleware.js",
+      "require": "./dist/adapter/middleware.cjs"
+    },
+    "./adapter": {
+      "types": "./dist/adapter/index.d.ts",
+      "import": "./dist/adapter/index.js",
+      "require": "./dist/adapter/index.cjs"
+    }
+  },
+  "types": "./dist/runtime/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "*": ["./dist/runtime/index.d.ts"],
+      "namespace": ["./dist/runtime/namespace.d.ts"],
+      "router": ["./dist/runtime/router.d.ts"],
+      "vite": ["./dist/vite/index.d.ts"],
+      "adapter/middleware": ["./dist/adapter/middleware.d.ts"],
+      "adapter": ["./dist/adapter/index.d.ts"]
+    }
+  }
+}

packages/run/src/__tests__/main.test.cts → packages/run/src/__tests__/main.test.ts

@@ -2,17 +2,18 @@ import { defaultNormalizer, defaultSerializer } from "@marko/fixture-snapshots";
 import { diffLines } from "diff";
 import fs from "fs";
 import { JSDOM } from "jsdom";
-// import url from 'url'
-import snap from "mocha-snap";
+import mochaSnap from "mocha-snap";
 import { createRequire } from "module";
 import path from "path";
 import * as playwright from "playwright";
+import url from "url";
 
 import * as cli from "../cli/commands";
 import type { Options } from "../vite";
 import { SpawnedServer, waitForServer } from "../vite/utils/server";
 
-// const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
+const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
+const snap = (mochaSnap as any).default as typeof mochaSnap;
 
 // https://github.com/esbuild-kit/tsx/issues/113
 const { toString } = Function.prototype;