@marko/run 0.1.8 → 0.1.10

package/dist/adapter/index.cjs

@@ -266,7 +266,7 @@ function adapter() {
       });
     },
     async startPreview(entry, options) {
-      const { port, envFile } = options;
+      const { port = 3e3, envFile } = options;
       const { nodeArgs } = (0, import_parse_node_args.default)(options.args);
       const args = [...nodeArgs, entry];
       const server = await spawnServer("node", args, port, envFile);

package/dist/adapter/index.js

@@ -231,7 +231,7 @@ function adapter() {
       });
     },
     async startPreview(entry, options) {
-      const { port, envFile } = options;
+      const { port = 3e3, envFile } = options;
       const { nodeArgs } = parseNodeArgs(options.args);
       const args = [...nodeArgs, entry];
       const server = await spawnServer("node", args, port, envFile);

package/dist/cli/index.mjs

@@ -90,12 +90,17 @@ async function resolveAdapter(root, options, log) {
   const { resolvePackageData } = await import("vite");
   const pkg = resolvePackageData(".", root);
   if (pkg) {
-    const dependecies = { ...pkg.data.dependecies, ...pkg.data.devDependencies };
+    const dependecies = {
+      ...pkg.data.dependecies,
+      ...pkg.data.devDependencies
+    };
     for (const name of Object.keys(dependecies)) {
       if (name.startsWith("@marko/run-adapter") || name.indexOf("marko-run-adapter") !== -1) {
         try {
           const module2 = await import(name);
-          log && console.log(`Using adapter ${name} listed in your package.json dependecies`);
+          log && console.log(
+            `Using adapter ${name} listed in your package.json dependecies`
+          );
           return module2.default();
         } catch (err) {
           log && console.warn(`Attempt to use package '${name}' failed`, err);

package/dist/runtime/index.d.ts

@@ -1,5 +1,5 @@
 import { NotHandled, NotMatched } from "./namespace";
-import { GetPaths, PostPaths, GetablePath, GetableHref, PostablePath, PostableHref, Platform, HandlerTypeFn, RuntimeModule, AnyRoute, AnyContext, AnyHandler } from "./types";
+import type { GetPaths, PostPaths, GetablePath, GetableHref, PostablePath, PostableHref, Platform, HandlerTypeFn, RuntimeModule, AnyRoute, AnyContext, AnyHandler } from "./types";
 declare global {
     var __marko_run__: RuntimeModule;
     namespace MarkoRun {

package/dist/runtime/types.d.ts

@@ -3,7 +3,7 @@ type OneOrMany<T> = T | T[];
 type NoParams = {};
 export interface Platform {
 }
-export interface Context<TRoute extends AnyRoute = AnyRoute> {
+export interface Context<TRoute extends Route = AnyRoute> {
     readonly url: URL;
     readonly request: Request;
     readonly route: TRoute["path"];
@@ -12,13 +12,13 @@ export interface Context<TRoute extends AnyRoute = AnyRoute> {
     readonly platform: Platform;
     readonly serializedGlobals: Record<string, boolean>;
 }
-export type MultiRouteContext<TRoute extends AnyRoute> = TRoute extends any ? Context<TRoute> : never;
+export type MultiRouteContext<TRoute extends Route> = TRoute extends any ? Context<TRoute> : never;
 export type ParamsObject = Record<string, string>;
 export type InputObject = Record<PropertyKey, any>;
 export type NextFunction = () => Awaitable<Response>;
-export type HandlerLike<TRoute extends AnyRoute = AnyRoute> = Awaitable<OneOrMany<RouteHandler<TRoute>>>;
-export type RouteHandler<TRoute extends AnyRoute = AnyRoute> = (context: MultiRouteContext<TRoute>, next: NextFunction) => Awaitable<Response | null | void>;
-export interface Route<Params extends ParamsObject, Meta, Path extends string> {
+export type HandlerLike<TRoute extends Route = AnyRoute> = Awaitable<OneOrMany<RouteHandler<TRoute>>>;
+export type RouteHandler<TRoute extends Route = AnyRoute> = (context: MultiRouteContext<TRoute>, next: NextFunction) => Awaitable<Response | null | void>;
+export interface Route<Params extends ParamsObject = ParamsObject, Meta = unknown, Path extends string = string> {
     path: Path;
     params: Params;
     meta: Meta;
@@ -79,11 +79,11 @@ type AnyParams = 0 extends HasAppData ? ParamsObject : never;
 type AnyMeta = 0 extends HasAppData ? unknown : never;
 export type Routes = AppData extends {
     routes: infer T;
-} ? T : Record<string, Route<ParamsObject, unknown, string>>;
+} ? T : Record<string, Route>;
 export type AnyRoute = Routes[keyof Routes];
 export type AnyContext = MultiRouteContext<AnyRoute>;
-export type AnyHandler<Params extends AnyParams = AnyParams, Meta extends AnyMeta = AnyMeta> = 0 extends HasAppData ? HandlerLike<Route<Params, Meta, string>> : HandlerLike<AnyRoute>;
-export type HandlerTypeFn<THandler extends HandlerLike = AnyHandler> = 0 extends HasAppData ? <Params extends ParamsObject = ParamsObject, Meta = unknown>(handler: HandlerLike<Route<Params, Meta, string>>) => HandlerLike<Route<Params, Meta, string>> : (handler: THandler) => THandler;
+export type AnyHandler<Params extends AnyParams = AnyParams, Meta extends AnyMeta = AnyMeta> = 0 extends HasAppData ? HandlerLike<Route<Params, Meta>> : HandlerLike<AnyRoute>;
+export type HandlerTypeFn<TRoute extends Route = AnyRoute> = 0 extends HasAppData ? <Params extends ParamsObject = ParamsObject, Meta = unknown>(handler: HandlerLike<Route<Params, Meta>>) => HandlerLike<Route<Params, Meta>> : (handler: HandlerLike<TRoute>) => HandlerLike<TRoute>;
 export type GetPaths = AppData extends {
     getPaths: infer T;
 } ? T : string;

package/dist/vite/index.cjs

@@ -987,7 +987,7 @@ async function renderRouteTypeInfo(routes, pathPrefix = ".", adapter) {
   Do NOT manually edit this file or your changes will be lost.
 */
 `,
-    `import "@marko/run/namespace";`,
+    `import { NotHandled, NotMatched, GetPaths, PostPaths, GetablePath, GetableHref, PostablePath, PostableHref, Platform } from "@marko/run/namespace";`,
     `import type Run from "@marko/run";`
   );
   const headWriter = writer.branch("head");
@@ -1130,11 +1130,11 @@ function writeModuleDeclaration(writer, path3, routeType, moduleTypes) {
     const isMarko = path3.endsWith(".marko");
     writer.write(`
   namespace MarkoRun {
-    export * from "@marko/run/namespace";
+    export { NotHandled, NotMatched, GetPaths, PostPaths, GetablePath, GetableHref, PostablePath, PostableHref, Platform };
     export type Route = ${routeType};
     export type Context = Run.MultiRouteContext<Route>${isMarko ? " & Marko.Global" : ""};
     export type Handler = Run.HandlerLike<Route>;
-    export const route: Run.HandlerTypeFn<Handler>;
+    export const route: Run.HandlerTypeFn<Route>;
   }`);
   }
   writer.writeLines(`
@@ -1452,7 +1452,7 @@ function markoRun(opts = {}) {
       name: "marko-run-vite:pre",
       enforce: "pre",
       async config(config2, env) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         const externalPluginOptions = getExternalPluginOptions(config2);
         if (externalPluginOptions) {
           opts = (0, import_vite.mergeConfig)(opts, externalPluginOptions);
@@ -1460,7 +1460,11 @@ function markoRun(opts = {}) {
         root = normalizePath(config2.root || process.cwd());
         isBuild = env.command === "build";
         isSSRBuild = isBuild && Boolean((_a = config2.build) == null ? void 0 : _a.ssr);
-        adapter = await resolveAdapter(root, opts, config2.logLevel !== "silent" && !isBuild || isSSRBuild);
+        adapter = await resolveAdapter(
+          root,
+          opts,
+          config2.logLevel !== "silent" && !isBuild || isSSRBuild
+        );
         if (adapter) {
           const externalAdapterConfig = getExternalAdapterOptions(config2);
           if (externalAdapterConfig && adapter.configure) {
@@ -1487,6 +1491,44 @@ function markoRun(opts = {}) {
         typesDir = import_path2.default.join(root, ".marko-run");
         devEntryFile = import_path2.default.join(root, "index.html");
         devEntryFilePosix = normalizePath(devEntryFile);
+        const assetsDir = ((_c = config2.build) == null ? void 0 : _c.assetsDir) || "assets";
+        let rollupOutputOptions = (_e = (_d = config2.build) == null ? void 0 : _d.rollupOptions) == null ? void 0 : _e.output;
+        if (isBuild && !isSSRBuild) {
+          const defaultRollupOutputOptions = {
+            assetFileNames({ name }) {
+              if (name && name.indexOf("_marko-virtual_id_") < 0) {
+                return `${assetsDir}/${getEntryFileName(name) || "[name]"}-[hash].[ext]`;
+              }
+              return `${assetsDir}/_[hash].[ext]`;
+            },
+            entryFileNames(info) {
+              let name = getEntryFileName(info.facadeModuleId);
+              if (!name) {
+                for (let id of info.moduleIds) {
+                  name = getEntryFileName(id);
+                  if (name) {
+                    break;
+                  }
+                }
+              }
+              return `${assetsDir}/${name || "[name]"}-[hash].js`;
+            },
+            chunkFileNames: `${assetsDir}/_[hash].js`
+          };
+          if (!rollupOutputOptions) {
+            rollupOutputOptions = defaultRollupOutputOptions;
+          } else if (!Array.isArray(rollupOutputOptions)) {
+            rollupOutputOptions = {
+              ...defaultRollupOutputOptions,
+              ...rollupOutputOptions
+            };
+          } else {
+            rollupOutputOptions = rollupOutputOptions.map((options) => ({
+              ...defaultRollupOutputOptions,
+              ...options
+            }));
+          }
+        }
         let pluginConfig = {
           logLevel: isBuild ? "warn" : void 0,
           define: isBuild ? {
@@ -1496,10 +1538,13 @@ function markoRun(opts = {}) {
             noExternal: /@marko\/run/
           },
           build: {
-            emptyOutDir: isSSRBuild
+            emptyOutDir: isSSRBuild,
+            rollupOptions: {
+              output: rollupOutputOptions
+            }
           }
         };
-        const adapterConfig = await ((_c = adapter == null ? void 0 : adapter.viteConfig) == null ? void 0 : _c.call(adapter, config2));
+        const adapterConfig = await ((_f = adapter == null ? void 0 : adapter.viteConfig) == null ? void 0 : _f.call(adapter, config2));
         if (adapterConfig) {
           pluginConfig = (0, import_vite.mergeConfig)(pluginConfig, adapterConfig);
         }
@@ -1619,6 +1664,15 @@ function markoRun(opts = {}) {
     {
       name: "marko-run-vite:post",
       enforce: "post",
+      generateBundle(options, bundle) {
+        if (options.sourcemap && options.sourcemap !== "inline") {
+          for (const key of Object.keys(bundle)) {
+            if (key.endsWith(".map") && !bundle[key.slice(0, -4)]) {
+              delete bundle[key];
+            }
+          }
+        }
+      },
       async writeBundle(options, bundle) {
         var _a;
         if (isSSRBuild) {
@@ -1735,12 +1789,17 @@ async function resolveAdapter(root, options, log) {
   const { resolvePackageData } = await import("vite");
   const pkg = resolvePackageData(".", root);
   if (pkg) {
-    const dependecies = { ...pkg.data.dependecies, ...pkg.data.devDependencies };
+    const dependecies = {
+      ...pkg.data.dependecies,
+      ...pkg.data.devDependencies
+    };
     for (const name of Object.keys(dependecies)) {
       if (name.startsWith("@marko/run-adapter") || name.indexOf("marko-run-adapter") !== -1) {
         try {
           const module3 = await import(name);
-          log && console.log(`Using adapter ${name} listed in your package.json dependecies`);
+          log && console.log(
+            `Using adapter ${name} listed in your package.json dependecies`
+          );
           return module3.default();
         } catch (err) {
           log && console.warn(`Attempt to use package '${name}' failed`, err);
@@ -1753,6 +1812,11 @@ async function resolveAdapter(root, options, log) {
   log && console.log("Using default adapter");
   return module2.default();
 }
+var markoEntryFileRegex = /__marko-run__([^_]+)__(.+)\.marko.([^.]+)$/;
+function getEntryFileName(file) {
+  const match = file && markoEntryFileRegex.exec(file);
+  return match ? `${match[2].replace(/__/g, "-")}` : void 0;
+}
 
 // src/vite/utils/server.ts
 var import_net = __toESM(require("net"), 1);

package/dist/vite/index.js

@@ -950,7 +950,7 @@ async function renderRouteTypeInfo(routes, pathPrefix = ".", adapter) {
   Do NOT manually edit this file or your changes will be lost.
 */
 `,
-    `import "@marko/run/namespace";`,
+    `import { NotHandled, NotMatched, GetPaths, PostPaths, GetablePath, GetableHref, PostablePath, PostableHref, Platform } from "@marko/run/namespace";`,
     `import type Run from "@marko/run";`
   );
   const headWriter = writer.branch("head");
@@ -1093,11 +1093,11 @@ function writeModuleDeclaration(writer, path3, routeType, moduleTypes) {
     const isMarko = path3.endsWith(".marko");
     writer.write(`
   namespace MarkoRun {
-    export * from "@marko/run/namespace";
+    export { NotHandled, NotMatched, GetPaths, PostPaths, GetablePath, GetableHref, PostablePath, PostableHref, Platform };
     export type Route = ${routeType};
     export type Context = Run.MultiRouteContext<Route>${isMarko ? " & Marko.Global" : ""};
     export type Handler = Run.HandlerLike<Route>;
-    export const route: Run.HandlerTypeFn<Handler>;
+    export const route: Run.HandlerTypeFn<Route>;
   }`);
   }
   writer.writeLines(`
@@ -1414,7 +1414,7 @@ function markoRun(opts = {}) {
       name: "marko-run-vite:pre",
       enforce: "pre",
       async config(config2, env) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         const externalPluginOptions = getExternalPluginOptions(config2);
         if (externalPluginOptions) {
           opts = mergeConfig(opts, externalPluginOptions);
@@ -1422,7 +1422,11 @@ function markoRun(opts = {}) {
         root = normalizePath(config2.root || process.cwd());
         isBuild = env.command === "build";
         isSSRBuild = isBuild && Boolean((_a = config2.build) == null ? void 0 : _a.ssr);
-        adapter = await resolveAdapter(root, opts, config2.logLevel !== "silent" && !isBuild || isSSRBuild);
+        adapter = await resolveAdapter(
+          root,
+          opts,
+          config2.logLevel !== "silent" && !isBuild || isSSRBuild
+        );
         if (adapter) {
           const externalAdapterConfig = getExternalAdapterOptions(config2);
           if (externalAdapterConfig && adapter.configure) {
@@ -1449,6 +1453,44 @@ function markoRun(opts = {}) {
         typesDir = path2.join(root, ".marko-run");
         devEntryFile = path2.join(root, "index.html");
         devEntryFilePosix = normalizePath(devEntryFile);
+        const assetsDir = ((_c = config2.build) == null ? void 0 : _c.assetsDir) || "assets";
+        let rollupOutputOptions = (_e = (_d = config2.build) == null ? void 0 : _d.rollupOptions) == null ? void 0 : _e.output;
+        if (isBuild && !isSSRBuild) {
+          const defaultRollupOutputOptions = {
+            assetFileNames({ name }) {
+              if (name && name.indexOf("_marko-virtual_id_") < 0) {
+                return `${assetsDir}/${getEntryFileName(name) || "[name]"}-[hash].[ext]`;
+              }
+              return `${assetsDir}/_[hash].[ext]`;
+            },
+            entryFileNames(info) {
+              let name = getEntryFileName(info.facadeModuleId);
+              if (!name) {
+                for (let id of info.moduleIds) {
+                  name = getEntryFileName(id);
+                  if (name) {
+                    break;
+                  }
+                }
+              }
+              return `${assetsDir}/${name || "[name]"}-[hash].js`;
+            },
+            chunkFileNames: `${assetsDir}/_[hash].js`
+          };
+          if (!rollupOutputOptions) {
+            rollupOutputOptions = defaultRollupOutputOptions;
+          } else if (!Array.isArray(rollupOutputOptions)) {
+            rollupOutputOptions = {
+              ...defaultRollupOutputOptions,
+              ...rollupOutputOptions
+            };
+          } else {
+            rollupOutputOptions = rollupOutputOptions.map((options) => ({
+              ...defaultRollupOutputOptions,
+              ...options
+            }));
+          }
+        }
         let pluginConfig = {
           logLevel: isBuild ? "warn" : void 0,
           define: isBuild ? {
@@ -1458,10 +1500,13 @@ function markoRun(opts = {}) {
             noExternal: /@marko\/run/
           },
           build: {
-            emptyOutDir: isSSRBuild
+            emptyOutDir: isSSRBuild,
+            rollupOptions: {
+              output: rollupOutputOptions
+            }
           }
         };
-        const adapterConfig = await ((_c = adapter == null ? void 0 : adapter.viteConfig) == null ? void 0 : _c.call(adapter, config2));
+        const adapterConfig = await ((_f = adapter == null ? void 0 : adapter.viteConfig) == null ? void 0 : _f.call(adapter, config2));
         if (adapterConfig) {
           pluginConfig = mergeConfig(pluginConfig, adapterConfig);
         }
@@ -1581,6 +1626,15 @@ function markoRun(opts = {}) {
     {
       name: "marko-run-vite:post",
       enforce: "post",
+      generateBundle(options, bundle) {
+        if (options.sourcemap && options.sourcemap !== "inline") {
+          for (const key of Object.keys(bundle)) {
+            if (key.endsWith(".map") && !bundle[key.slice(0, -4)]) {
+              delete bundle[key];
+            }
+          }
+        }
+      },
       async writeBundle(options, bundle) {
         var _a;
         if (isSSRBuild) {
@@ -1697,12 +1751,17 @@ async function resolveAdapter(root, options, log) {
   const { resolvePackageData } = await import("vite");
   const pkg = resolvePackageData(".", root);
   if (pkg) {
-    const dependecies = { ...pkg.data.dependecies, ...pkg.data.devDependencies };
+    const dependecies = {
+      ...pkg.data.dependecies,
+      ...pkg.data.devDependencies
+    };
     for (const name of Object.keys(dependecies)) {
       if (name.startsWith("@marko/run-adapter") || name.indexOf("marko-run-adapter") !== -1) {
         try {
           const module2 = await import(name);
-          log && console.log(`Using adapter ${name} listed in your package.json dependecies`);
+          log && console.log(
+            `Using adapter ${name} listed in your package.json dependecies`
+          );
           return module2.default();
         } catch (err) {
           log && console.warn(`Attempt to use package '${name}' failed`, err);
@@ -1715,6 +1774,11 @@ async function resolveAdapter(root, options, log) {
   log && console.log("Using default adapter");
   return module.default();
 }
+var markoEntryFileRegex = /__marko-run__([^_]+)__(.+)\.marko.([^.]+)$/;
+function getEntryFileName(file) {
+  const match = file && markoEntryFileRegex.exec(file);
+  return match ? `${match[2].replace(/__/g, "-")}` : void 0;
+}
 
 // src/vite/utils/server.ts
 import net from "net";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/run",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "The Marko application framework.",
   "license": "MIT",
   "homepage": "https://github.com/marko-js/run/tree/main/packages/run",