wip

.gitignore

@@ -4,8 +4,10 @@
 
 node_modules/
 target/
+transpiled/
+types/
+bundled/
 out/
-out-*/
 coverage/
 obj/
 bin/

packages/npm/goodrouter/package.json

@@ -3,27 +3,26 @@
   "version": "2.1.4",
   "description": "a good router",
   "type": "module",
-  "main": "./out-commonjs/main.js",
-  "module": "./out/main.js",
-  "types": "./out/main.d.ts",
+  "main": "./bundled/main.cjs",
+  "module": "./bundled/main.js",
+  "types": "./types/main.d.ts",
   "exports": {
     ".": {
-      "require": "./out-commonjs/main.js",
-      "import": "./out/main.js",
-      "types": "./out/main.d.ts",
-      "browser": "./out/browser.js"
+      "require": "./bundled/main.cjs",
+      "import": "./bundled/main.js",
+      "types": "./types/main.d.ts"
     }
   },
   "files": [
-    "./out/**",
-    "./out-commonjs/**"
+    "./types/**",
+    "./bundled/**"
   ],
   "scripts": {
-    "prepack": "tsc --composite false; tsc --composite false --outDir out-commonjs --declaration false --module commonjs --moduleResolution Node10 ; echo {\\\"type\\\":\\\"commonjs\\\"}> out-commonjs/package.json",
+    "prepack": "./scripts/build.js",
     "pretest": "tsc --build",
     "build": "tsc --build",
-    "clean": "rm -rf out out-* ; tsc --build --clean",
-    "test": "node --test ./out/**/*.test.js"
+    "clean": "./scripts/clean.js",
+    "test": "node --test ./out/*.test.js ./out/*/*.test.js ./out/*/*/*.test.js"
   },
   "repository": {
     "type": "git",
@@ -48,6 +47,7 @@
     "itertools": "^2.2.5",
     "microtime": "^3.1.1",
     "prettier": "^3.2.5",
+    "rollup": "^4.12.1",
     "typescript": "^5.4.2"
   },
   "dependencies": {

packages/npm/goodrouter/scripts/build.js

@@ -0,0 +1,34 @@
+#!/usr/bin/env node
+
+import cp from "child_process";
+import path from "path";
+
+cp.spawnSync("tsc", [], { stdio: "inherit" });
+
+cp.spawnSync(
+    "rollup",
+    [
+        "--input",
+        path.resolve("transpiled", "main.js"),
+        "--file",
+        path.resolve("bundled", "main.js"),
+        "--sourcemap",
+        "--format",
+        "es",
+    ],
+    { stdio: "inherit" },
+);
+
+cp.spawnSync(
+    "rollup",
+    [
+        "--input",
+        path.resolve("transpiled", "main.js"),
+        "--file",
+        path.resolve("bundled", "main.cjs"),
+        "--sourcemap",
+        "--format",
+        "cjs",
+    ],
+    { stdio: "inherit" },
+);

packages/npm/goodrouter/scripts/clean.js

@@ -0,0 +1,8 @@
+#!/usr/bin/env node
+
+import fs from "fs";
+import path from "path";
+
+fs.rmSync(path.resolve("transpiled"), { recursive: true, force: true });
+fs.rmSync(path.resolve("types"), { recursive: true, force: true });
+fs.rmSync(path.resolve("bundled"), { recursive: true, force: true });

packages/npm/goodrouter/src/root.ts

@@ -0,0 +1,8 @@
+import path from "path";
+
+export const projectRoot = getProjectRoot();
+
+function getProjectRoot() {
+    const dirname = import.meta.dirname ?? __dirname;
+    return path.resolve(dirname, "..");
+}

packages/npm/goodrouter/src/testing/templates.ts

@@ -1,6 +1,6 @@
 import * as fs from "fs";
 import * as path from "path";
-import { projectRoot } from "../utils/root.js";
+import { projectRoot } from "../root.js";
 
 export function loadTemplates(name: string) {
     const filePath = path.join(

packages/npm/goodrouter/tsconfig.json

@@ -2,10 +2,11 @@
   "extends": "@tsconfig/node20",
   "compilerOptions": {
     "rootDir": "./src",
-    "outDir": "./out",
+    "outDir": "./transpiled",
+    "declarationDir": "./types",
     "sourceMap": true,
     "declaration": true,
-    "composite": true
+    "lib": ["es2023", "DOM"]
   },
   "include": ["src/**/*"]
 }

packages/npm/www/package.json

@@ -9,6 +9,7 @@
     "@11ty/eleventy": "^2.0.1",
     "github-markdown-css": "^5.5.1",
     "prettier": "^3.2.5",
+    "rollup": "^4.12.1",
     "typescript": "^5.4.2"
   }
 }