@marko/run 0.0.1-beta2 → 0.0.1-beta4

package/dist/vite/types.d.ts

@@ -3,23 +3,27 @@ import type { Options as MarkoViteOptions } from "@marko/vite";
 import type { ResolvedConfig, UserConfig } from "vite";
 export type { RoutableFileType, HttpVerb };
 export declare type StartServer = (port?: number) => Promise<void>;
+export interface AdapterConfig {
+    [name: PropertyKey]: any;
+}
 export interface Adapter {
     readonly name: string;
+    configure?(config: AdapterConfig): void;
     pluginOptions?(options: Options): Promise<Options> | Options | undefined;
     viteConfig?(config: UserConfig): Promise<UserConfig> | UserConfig | undefined;
     getEntryFile?(): Promise<string> | string;
-    startDev?(configFile: string, port: number): Promise<void> | void;
-    startPreview?(dir: string, entry?: string, port?: number): Promise<void> | void;
+    startDev?(configFile: string, port: number, envFile?: string): Promise<void> | void;
+    startPreview?(dir: string, entry?: string, port?: number, envFile?: string): Promise<void> | void;
     buildEnd?(config: ResolvedConfig, routes: Route[], builtEntries: string[], sourceEntries: string[]): Promise<void> | void;
+    writeTypeInfo?(): Promise<string> | string;
+}
+export interface RouterOptions {
+    trailingSlashes: 'Ignore' | 'RedirectWithout' | 'RedirectWith' | 'RewriteWithout' | 'RewriteWith';
 }
-export interface MarkoServeOptions {
+export interface MarkoServeOptions extends Partial<RouterOptions> {
     routesDir?: string;
     emitRoutes?(routes: Route[]): void | Promise<void>;
     adapter?: Adapter;
-    codegen?: CodegenOptions;
-}
-export interface CodegenOptions {
-    trailingSlashes: 'Ignore' | 'RedirectWithout' | 'RedirectWith' | 'RewriteWithout' | 'RewriteWith';
 }
 export declare type Options = MarkoServeOptions & MarkoViteOptions;
 export interface Route {
@@ -43,9 +47,11 @@ export interface SpecialRoutes {
     [RoutableFileTypes.Error]?: Route;
 }
 export interface RoutableFile {
+    id: string;
     name: string;
     type: RoutableFileType;
     filePath: string;
+    relativePath: string;
     importPath: string;
     verbs?: HttpVerb[];
 }
@@ -59,4 +65,5 @@ export interface RouteTrie {
 export interface BuiltRoutes {
     list: Route[];
     special: SpecialRoutes;
+    middleware: RoutableFile[];
 }

package/dist/vite/utils/config.d.ts

@@ -1,3 +1,5 @@
-import type { Options } from '../types';
-export declare function getMarkoServeOptions<T extends Record<string, any>>(viteConfig: T): Readonly<Options> | undefined;
-export declare function setMarkoServeOptions<T extends Record<string, any>>(viteConfig: T, options: Options): T;
+import type { Options, AdapterConfig } from '../types';
+export declare const getExternalPluginOptions: <T>(viteConfig: T) => Readonly<Options> | undefined;
+export declare const setExternalPluginOptions: <T>(viteConfig: T, value: Options) => T;
+export declare const getExternalAdapterOptions: <T>(viteConfig: T) => Readonly<AdapterConfig> | undefined;
+export declare const setExternalAdapterOptions: <T>(viteConfig: T, value: AdapterConfig) => T;

package/dist/vite/utils/server.d.ts

@@ -2,6 +2,8 @@ export interface SpawnedServer {
     port: number;
     close(): void;
 }
-export declare function spawnServer(cmd: string, port?: number, cwd?: string, wait?: number): Promise<SpawnedServer>;
+export declare function parseEnv(envFile: string): Promise<import("dotenv").DotenvParseOutput | undefined>;
+export declare function loadEnv(envFile: string): void;
+export declare function spawnServer(cmd: string, port?: number, env?: string | Record<string, string>, cwd?: string, wait?: number): Promise<SpawnedServer>;
 export declare function isPortInUse(port: number): Promise<boolean>;
 export declare function getAvailablePort(): Promise<number>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.0.1-beta2",
+  "version": "0.0.1-beta4",
   "description": "File-based routing for Marko based on Vite",
   "keywords": [],
   "author": "Ryan Turnquist <rturnq@gmail.com>",
@@ -33,6 +33,11 @@
       "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",
@@ -42,16 +47,19 @@
   "typesVersions": {
     "*": {
       "*": [
-        "./src/runtime/index.ts"
+        "./dist/runtime/index.d.ts"
       ],
       "router": [
-        "./src/runtime/router.ts"
+        "./dist/runtime/router.d.ts"
       ],
       "vite": [
-        "./src/vite/index.ts"
+        "./dist/vite/index.d.ts"
+      ],
+      "adapter/middleware": [
+        "./dist/adapter/middleware.d.ts"
       ],
       "adapter": [
-        "./src/adapter/index.ts"
+        "./dist/adapter/index.d.ts"
       ]
     }
   },
@@ -66,12 +74,14 @@
   "devDependencies": {
     "@babel/types": "^7.19.0",
     "@marko/compiler": "^5.22.6",
+    "@types/glob": "^8.0.1",
+    "@types/human-format": "^1.0.0",
     "@types/mocha": "^9.1.1",
-    "@types/node": "^18.7.6",
+    "@types/node": "^18.11.18",
     "acorn": "^8.8.0",
     "cross-env": "^7.0.3",
     "esbuild": "^0.15.7",
-    "marko": "^5.21.9",
+    "marko": "^5.22.4",
     "mocha": "^10.0.0",
     "mocha-snap": "^4.3.0",
     "prettier": "^2.7.1",
@@ -79,13 +89,15 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@hattip/adapter-node": "^0.0.24",
-    "@hattip/core": "^0.0.24",
-    "@marko/vite": "^2.3.11",
+    "@hattip/polyfills": "^0.0.27",
+    "@marko/vite": "^2.3.9",
     "cli-table3": "^0.6.3",
+    "compression": "^1.7.4",
+    "dotenv": "^16.0.3",
+    "glob": "^8.1.0",
     "gzip-size": "^7.0.0",
+    "human-format": "^1.0.0",
     "kleur": "^4.1.5",
-    "pretty-bytes": "^6.0.0",
     "sade": "^1.8.1",
     "serve-static": "^1.15.0",
     "vite": "^3.0.8"