@cedarjs/api-server 1.0.0-canary.12509 → 1.0.0-canary.12511

package/dist/bin.js

@@ -1,11 +1,6 @@
 #!/usr/bin/env node
-"use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
 };
@@ -13,51 +8,36 @@ var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 
 // src/cliHelpers.ts
+import { getConfig } from "@cedarjs/project-config";
 function getAPIHost() {
   let host = process.env.REDWOOD_API_HOST;
-  host ??= (0, import_project_config.getConfig)().api.host;
+  host ??= getConfig().api.host;
   host ??= process.env.NODE_ENV === "production" ? "0.0.0.0" : "::";
   return host;
 }
 function getAPIPort() {
-  return process.env.REDWOOD_API_PORT ? parseInt(process.env.REDWOOD_API_PORT) : (0, import_project_config.getConfig)().api.port;
+  return process.env.REDWOOD_API_PORT ? parseInt(process.env.REDWOOD_API_PORT) : getConfig().api.port;
 }
 function getWebHost() {
   let host = process.env.REDWOOD_WEB_HOST;
-  host ??= (0, import_project_config.getConfig)().web.host;
+  host ??= getConfig().web.host;
   host ??= process.env.NODE_ENV === "production" ? "0.0.0.0" : "::";
   return host;
 }
 function getWebPort() {
-  return process.env.REDWOOD_WEB_PORT ? parseInt(process.env.REDWOOD_WEB_PORT) : (0, import_project_config.getConfig)().web.port;
+  return process.env.REDWOOD_WEB_PORT ? parseInt(process.env.REDWOOD_WEB_PORT) : getConfig().web.port;
 }
-var import_project_config;
 var init_cliHelpers = __esm({
   "src/cliHelpers.ts"() {
     "use strict";
-    import_project_config = require("@cedarjs/project-config");
   }
 });
 
 // src/createServerHelpers.ts
+import { parseArgs } from "util";
+import { coerceRootPath } from "@cedarjs/fastify-web/dist/helpers.js";
 function isCustomLoggerInstance(logger) {
   return !!logger && typeof logger === "object" && "info" in logger;
 }
@@ -83,7 +63,7 @@ function resolveOptions(options = {}, args) {
     resolvedOptions.fastifyServerOptions.logger = logger;
   }
   if (options.parseArgs) {
-    const { values } = (0, import_util.parseArgs)({
+    const { values } = parseArgs({
       options: {
         apiHost: {
           type: "string"
@@ -118,15 +98,13 @@ function resolveOptions(options = {}, args) {
       resolvedOptions.apiRootPath = values.apiRootPath;
     }
   }
-  resolvedOptions.apiRootPath = (0, import_helpers.coerceRootPath)(resolvedOptions.apiRootPath);
+  resolvedOptions.apiRootPath = coerceRootPath(resolvedOptions.apiRootPath);
   return resolvedOptions;
 }
-var import_util, import_helpers, getDefaultCreateServerOptions;
+var getDefaultCreateServerOptions;
 var init_createServerHelpers = __esm({
   "src/createServerHelpers.ts"() {
     "use strict";
-    import_util = require("util");
-    import_helpers = require("@cedarjs/fastify-web/dist/helpers");
     init_cliHelpers();
     getDefaultCreateServerOptions = () => ({
       apiRootPath: "/",
@@ -149,36 +127,36 @@ var init_createServerHelpers = __esm({
 });
 
 // src/fastify.ts
+import fs from "fs";
+import path from "path";
+import { pathToFileURL } from "url";
+import Fastify from "fastify";
+import { getAsyncStoreInstance } from "@cedarjs/context/dist/store";
+import { getPaths, getConfig as getConfig2 } from "@cedarjs/project-config";
 async function loadFastifyConfig() {
-  const serverConfigPath = import_path.default.join(
-    (0, import_project_config2.getPaths)().base,
-    (0, import_project_config2.getConfig)().api.serverConfig
+  const serverConfigPath = path.join(
+    getPaths().base,
+    getConfig2().api.serverConfig
   );
-  if (!import_fs.default.existsSync(serverConfigPath)) {
+  if (!fs.existsSync(serverConfigPath)) {
     return serverConfigFile;
   }
   if (!isServerConfigLoaded) {
     console.log(`Loading server config from ${serverConfigPath}`);
     console.log(`Loading server config from URL file://${serverConfigPath}`);
     console.log(
-      `Loading server config from URL ${(0, import_url.pathToFileURL)(serverConfigPath).href}`
+      `Loading server config from URL ${pathToFileURL(serverConfigPath).href}`
     );
-    const config3 = await import((0, import_url.pathToFileURL)(serverConfigPath).href);
+    const config3 = await import(pathToFileURL(serverConfigPath).href);
     serverConfigFile = { ...config3.default };
     isServerConfigLoaded = true;
   }
   return serverConfigFile;
 }
-var import_fs, import_path, import_url, import_fastify, import_store, import_project_config2, DEFAULT_OPTIONS, isServerConfigLoaded, serverConfigFile, createFastifyInstance, fastify_default;
+var DEFAULT_OPTIONS, isServerConfigLoaded, serverConfigFile, createFastifyInstance, fastify_default;
 var init_fastify = __esm({
   "src/fastify.ts"() {
     "use strict";
-    import_fs = __toESM(require("fs"));
-    import_path = __toESM(require("path"));
-    import_url = require("url");
-    import_fastify = __toESM(require("fastify"));
-    import_store = require("@cedarjs/context/dist/store");
-    import_project_config2 = require("@cedarjs/project-config");
     DEFAULT_OPTIONS = {
       logger: {
         level: process.env.NODE_ENV === "development" ? "debug" : "info"
@@ -197,9 +175,9 @@ var init_fastify = __esm({
     };
     createFastifyInstance = async (options) => {
       const { config: config3 } = await loadFastifyConfig();
-      const fastify2 = (0, import_fastify.default)(options || config3 || DEFAULT_OPTIONS);
+      const fastify2 = Fastify(options || config3 || DEFAULT_OPTIONS);
       fastify2.addHook("onRequest", (_req, _reply, done) => {
-        (0, import_store.getAsyncStoreInstance)().run(/* @__PURE__ */ new Map(), done);
+        getAsyncStoreInstance().run(/* @__PURE__ */ new Map(), done);
       });
       return fastify2;
     };
@@ -242,18 +220,18 @@ var init_utils = __esm({
 });
 
 // src/requestHandlers/awsLambdaFastify.ts
-var import_qs, lambdaEventForFastifyRequest, fastifyResponseForLambdaResult, fastifyResponseForLambdaError, requestHandler;
+import qs from "qs";
+var lambdaEventForFastifyRequest, fastifyResponseForLambdaResult, fastifyResponseForLambdaError, requestHandler;
 var init_awsLambdaFastify = __esm({
   "src/requestHandlers/awsLambdaFastify.ts"() {
     "use strict";
-    import_qs = __toESM(require("qs"));
     init_utils();
     lambdaEventForFastifyRequest = (request) => {
       return {
         httpMethod: request.method,
         headers: request.headers,
         path: request.urlData("path"),
-        queryStringParameters: import_qs.default.parse(request.url.split(/\?(.+)/)[1]),
+        queryStringParameters: qs.parse(request.url.split(/\?(.+)/)[1]),
         requestContext: {
           requestId: request.id,
           identity: {
@@ -331,23 +309,23 @@ var init_utils2 = __esm({
 });
 
 // src/plugins/lambdaLoader.ts
-var import_path2, import_ansis, import_fast_glob, import_project_config3, LAMBDA_FUNCTIONS, setLambdaFunctions, loadFunctionsFromDist, findApiDistFunctions, lambdaRequestHandler;
+import path2 from "path";
+import ansis from "ansis";
+import fg from "fast-glob";
+import { getPaths as getPaths2 } from "@cedarjs/project-config";
+var LAMBDA_FUNCTIONS, setLambdaFunctions, loadFunctionsFromDist, findApiDistFunctions, lambdaRequestHandler;
 var init_lambdaLoader = __esm({
   "src/plugins/lambdaLoader.ts"() {
     "use strict";
-    import_path2 = __toESM(require("path"));
-    import_ansis = __toESM(require("ansis"));
-    import_fast_glob = __toESM(require("fast-glob"));
-    import_project_config3 = require("@cedarjs/project-config");
     init_awsLambdaFastify();
     init_utils2();
     LAMBDA_FUNCTIONS = {};
     setLambdaFunctions = async (foundFunctions) => {
       const tsImport = Date.now();
-      console.log(import_ansis.default.dim.italic("Importing Server Functions... "));
+      console.log(ansis.dim.italic("Importing Server Functions... "));
       const imports = foundFunctions.map(async (fnPath) => {
         const ts = Date.now();
-        const routeName = import_path2.default.basename(fnPath).replace(".js", "");
+        const routeName = path2.basename(fnPath).replace(".js", "");
         const fnImport = await import(`file://${fnPath}`);
         const handler3 = (() => {
           if ("handler" in fnImport) {
@@ -370,22 +348,22 @@ var init_lambdaLoader = __esm({
           );
         }
         console.log(
-          import_ansis.default.magenta("/" + routeName),
-          import_ansis.default.dim.italic(Date.now() - ts + " ms")
+          ansis.magenta("/" + routeName),
+          ansis.dim.italic(Date.now() - ts + " ms")
         );
       });
       await Promise.all(imports);
       console.log(
-        import_ansis.default.dim.italic("...Done importing in " + (Date.now() - tsImport) + " ms")
+        ansis.dim.italic("...Done importing in " + (Date.now() - tsImport) + " ms")
       );
     };
     loadFunctionsFromDist = async (options = {}) => {
       const serverFunctions = findApiDistFunctions({
-        cwd: (0, import_project_config3.getPaths)().api.base,
+        cwd: getPaths2().api.base,
         options: options?.fastGlobOptions,
         discoverFunctionsGlob: options?.discoverFunctionsGlob
       });
-      const i = serverFunctions.findIndex((x) => import_path2.default.basename(x) === "graphql.js");
+      const i = serverFunctions.findIndex((x) => path2.basename(x) === "graphql.js");
       if (i >= 0) {
         const graphQLFn = serverFunctions.splice(i, 1)[0];
         serverFunctions.unshift(graphQLFn);
@@ -394,11 +372,11 @@ var init_lambdaLoader = __esm({
     };
     findApiDistFunctions = (params) => {
       const {
-        cwd = (0, import_project_config3.getPaths)().api.base,
+        cwd = getPaths2().api.base,
         options = {},
         discoverFunctionsGlob = "dist/functions/**/*.{ts,js}"
       } = params;
-      return import_fast_glob.default.sync(discoverFunctionsGlob, {
+      return fg.sync(discoverFunctionsGlob, {
         cwd,
         // We don't support deeply nested api functions, to maximise compatibility
         // with deployment providers
@@ -430,16 +408,20 @@ var init_lambdaLoader = __esm({
 });
 
 // src/plugins/api.ts
+import fastifyUrlData from "@fastify/url-data";
+import fastifyRawBody from "fastify-raw-body";
+import { getAsyncStoreInstance as getAsyncStoreInstance2 } from "@cedarjs/context/dist/store";
+import { coerceRootPath as coerceRootPath2 } from "@cedarjs/fastify-web/dist/helpers.js";
 async function redwoodFastifyAPI(fastify2, opts) {
   const redwoodOptions = opts.redwood ?? {};
   redwoodOptions.apiRootPath ??= "/";
-  redwoodOptions.apiRootPath = (0, import_helpers2.coerceRootPath)(redwoodOptions.apiRootPath);
+  redwoodOptions.apiRootPath = coerceRootPath2(redwoodOptions.apiRootPath);
   redwoodOptions.fastGlobOptions ??= {};
   redwoodOptions.loadUserConfig ??= false;
-  fastify2.register(import_url_data.default);
-  await fastify2.register(import_fastify_raw_body.default);
+  fastify2.register(fastifyUrlData);
+  await fastify2.register(fastifyRawBody);
   fastify2.addHook("onRequest", (_req, _reply, done) => {
-    (0, import_store2.getAsyncStoreInstance)().run(/* @__PURE__ */ new Map(), done);
+    getAsyncStoreInstance2().run(/* @__PURE__ */ new Map(), done);
   });
   fastify2.addContentTypeParser(
     ["application/x-www-form-urlencoded", "multipart/form-data"],
@@ -465,14 +447,9 @@ async function redwoodFastifyAPI(fastify2, opts) {
     discoverFunctionsGlob: redwoodOptions.discoverFunctionsGlob
   });
 }
-var import_url_data, import_fastify_raw_body, import_store2, import_helpers2;
 var init_api = __esm({
   "src/plugins/api.ts"() {
     "use strict";
-    import_url_data = __toESM(require("@fastify/url-data"));
-    import_fastify_raw_body = __toESM(require("fastify-raw-body"));
-    import_store2 = require("@cedarjs/context/dist/store");
-    import_helpers2 = require("@cedarjs/fastify-web/dist/helpers");
     init_fastify();
     init_lambdaLoader();
   }
@@ -483,20 +460,27 @@ var graphql_exports = {};
 __export(graphql_exports, {
   redwoodFastifyGraphQLServer: () => redwoodFastifyGraphQLServer
 });
+import fastifyMultiPart from "@fastify/multipart";
+import fastifyUrlData2 from "@fastify/url-data";
+import fg2 from "fast-glob";
+import { getAsyncStoreInstance as getAsyncStoreInstance3 } from "@cedarjs/context/dist/store";
+import { coerceRootPath as coerceRootPath3 } from "@cedarjs/fastify-web/dist/helpers.js";
+import { createGraphQLYoga } from "@cedarjs/graphql-server";
+import { getPaths as getPaths3 } from "@cedarjs/project-config";
 async function redwoodFastifyGraphQLServer(fastify2, options) {
   const redwoodOptions = options.redwood ?? {};
   redwoodOptions.apiRootPath ??= "/";
-  redwoodOptions.apiRootPath = (0, import_helpers3.coerceRootPath)(redwoodOptions.apiRootPath);
-  fastify2.register(import_url_data2.default);
-  fastify2.register(import_multipart.default);
+  redwoodOptions.apiRootPath = coerceRootPath3(redwoodOptions.apiRootPath);
+  fastify2.register(fastifyUrlData2);
+  fastify2.register(fastifyMultiPart);
   const method = ["GET", "POST", "OPTIONS"];
   fastify2.addHook("onRequest", (_req, _reply, done) => {
-    (0, import_store3.getAsyncStoreInstance)().run(/* @__PURE__ */ new Map(), done);
+    getAsyncStoreInstance3().run(/* @__PURE__ */ new Map(), done);
   });
   try {
     if (!redwoodOptions.graphql) {
-      const [graphqlFunctionPath] = await (0, import_fast_glob2.default)("dist/functions/graphql.{ts,js}", {
-        cwd: (0, import_project_config4.getPaths)().api.base,
+      const [graphqlFunctionPath] = await fg2("dist/functions/graphql.{ts,js}", {
+        cwd: getPaths3().api.base,
         absolute: true
       });
       const filePath = `file://${graphqlFunctionPath}`;
@@ -516,7 +500,7 @@ async function redwoodFastifyGraphQLServer(fastify2, options) {
         method.push("PUT");
       }
     }
-    const { yoga } = (0, import_graphql_server.createGraphQLYoga)(graphqlOptions);
+    const { yoga } = createGraphQLYoga(graphqlOptions);
     const graphQLYogaHandler = async (req, reply) => {
       const response = await yoga.handleNodeRequest(req, {
         req,
@@ -557,22 +541,22 @@ async function redwoodFastifyGraphQLServer(fastify2, options) {
 function trimSlashes(path5) {
   return path5.replace(/^\/|\/$/g, "");
 }
-var import_multipart, import_url_data2, import_fast_glob2, import_store3, import_helpers3, import_graphql_server, import_project_config4;
 var init_graphql = __esm({
   "src/plugins/graphql.ts"() {
     "use strict";
-    import_multipart = __toESM(require("@fastify/multipart"));
-    import_url_data2 = __toESM(require("@fastify/url-data"));
-    import_fast_glob2 = __toESM(require("fast-glob"));
-    import_store3 = require("@cedarjs/context/dist/store");
-    import_helpers3 = require("@cedarjs/fastify-web/dist/helpers");
-    import_graphql_server = require("@cedarjs/graphql-server");
-    import_project_config4 = require("@cedarjs/project-config");
     init_awsLambdaFastify();
   }
 });
 
 // src/createServer.ts
+import fs2 from "fs";
+import path3 from "path";
+import ansis2 from "ansis";
+import { config } from "dotenv-defaults";
+import fg3 from "fast-glob";
+import fastify from "fastify";
+import { getAsyncStoreInstance as getAsyncStoreInstance4 } from "@cedarjs/context/dist/store";
+import { getConfig as getConfig3, getPaths as getPaths4 } from "@cedarjs/project-config";
 async function createServer(options = {}) {
   const {
     apiRootPath,
@@ -582,13 +566,13 @@ async function createServer(options = {}) {
     apiPort,
     apiHost
   } = resolveOptions(options);
-  const serverConfigPath = import_path3.default.join(
-    (0, import_project_config5.getPaths)().base,
-    (0, import_project_config5.getConfig)().api.serverConfig
+  const serverConfigPath = path3.join(
+    getPaths4().base,
+    getConfig3().api.serverConfig
   );
-  if (import_fs2.default.existsSync(serverConfigPath)) {
+  if (fs2.existsSync(serverConfigPath)) {
     console.warn(
-      import_ansis2.default.yellow(
+      ansis2.yellow(
         [
           "",
           `Ignoring \`config\` and \`configureServer\` in api/server.config.js.`,
@@ -608,14 +592,14 @@ async function createServer(options = {}) {
       )
     );
   }
-  const server = Object.assign((0, import_fastify3.default)(fastifyServerOptions), {
+  const server = Object.assign(fastify(fastifyServerOptions), {
     // `start` will get replaced further down in this file
     start: async () => {
       throw new Error("Not implemented yet");
     }
   });
   server.addHook("onRequest", (_req, _reply, done) => {
-    (0, import_store4.getAsyncStoreInstance)().run(/* @__PURE__ */ new Map(), done);
+    getAsyncStoreInstance4().run(/* @__PURE__ */ new Map(), done);
   });
   await server.register(redwoodFastifyAPI, {
     redwood: {
@@ -627,8 +611,8 @@ async function createServer(options = {}) {
       configureServer: configureApiServer
     }
   });
-  const [graphqlFunctionPath] = await (0, import_fast_glob3.default)("dist/functions/graphql.{ts,js}", {
-    cwd: (0, import_project_config5.getPaths)().api.base,
+  const [graphqlFunctionPath] = await fg3("dist/functions/graphql.{ts,js}", {
+    cwd: getPaths4().api.base,
     absolute: true
   });
   if (graphqlFunctionPath) {
@@ -647,7 +631,7 @@ async function createServer(options = {}) {
   });
   server.addHook("onListen", (done) => {
     console.log(
-      `Server listening at ${import_ansis2.default.magenta(
+      `Server listening at ${ansis2.magenta(
         `${server.listeningOrigin}${apiRootPath}`
       )}`
     );
@@ -662,24 +646,15 @@ async function createServer(options = {}) {
   };
   return server;
 }
-var import_fs2, import_path3, import_ansis2, import_dotenv_defaults, import_fast_glob3, import_fastify3, import_store4, import_project_config5;
 var init_createServer = __esm({
   "src/createServer.ts"() {
     "use strict";
-    import_fs2 = __toESM(require("fs"));
-    import_path3 = __toESM(require("path"));
-    import_ansis2 = __toESM(require("ansis"));
-    import_dotenv_defaults = require("dotenv-defaults");
-    import_fast_glob3 = __toESM(require("fast-glob"));
-    import_fastify3 = __toESM(require("fastify"));
-    import_store4 = require("@cedarjs/context/dist/store");
-    import_project_config5 = require("@cedarjs/project-config");
     init_createServerHelpers();
     init_api();
     if (!process.env.REDWOOD_ENV_FILES_LOADED) {
-      (0, import_dotenv_defaults.config)({
-        path: import_path3.default.join((0, import_project_config5.getPaths)().base, ".env"),
-        defaults: import_path3.default.join((0, import_project_config5.getPaths)().base, ".env.defaults"),
+      config({
+        path: path3.join(getPaths4().base, ".env"),
+        defaults: path3.join(getPaths4().base, ".env.defaults"),
         multiline: true
       });
       process.env.REDWOOD_ENV_FILES_LOADED = "true";
@@ -688,10 +663,12 @@ var init_createServer = __esm({
 });
 
 // src/apiCLIConfigHandler.ts
+import ansis3 from "ansis";
+import { coerceRootPath as coerceRootPath4 } from "@cedarjs/fastify-web";
 async function handler(options = {}) {
   const timeStart = Date.now();
-  console.log(import_ansis3.default.dim.italic("Starting API Server..."));
-  options.apiRootPath = (0, import_fastify_web.coerceRootPath)(options.apiRootPath ?? "/");
+  console.log(ansis3.dim.italic("Starting API Server..."));
+  options.apiRootPath = coerceRootPath4(options.apiRootPath ?? "/");
   const fastify2 = await createServer({
     apiRootPath: options.apiRootPath,
     apiHost: options.host,
@@ -704,36 +681,35 @@ async function handler(options = {}) {
   );
   fastify2.log.trace(`Registered plugins
 ${fastify2.printPlugins()}`);
-  console.log(import_ansis3.default.dim.italic("Took " + (Date.now() - timeStart) + " ms"));
+  console.log(ansis3.dim.italic("Took " + (Date.now() - timeStart) + " ms"));
   let address = fastify2.listeningOrigin;
   if (process.env.NODE_ENV !== "production") {
     address = address.replace(/http:\/\/\[::\]/, "http://localhost");
   }
-  const apiServer = import_ansis3.default.magenta(`${address}${options.apiRootPath}`);
-  const graphqlEndpoint = import_ansis3.default.magenta(`${apiServer}graphql`);
+  const apiServer = ansis3.magenta(`${address}${options.apiRootPath}`);
+  const graphqlEndpoint = ansis3.magenta(`${apiServer}graphql`);
   console.log(`API server listening at ${apiServer}`);
   console.log(`GraphQL endpoint at ${graphqlEndpoint}`);
   process?.send?.("ready");
 }
-var import_ansis3, import_fastify_web;
 var init_apiCLIConfigHandler = __esm({
   "src/apiCLIConfigHandler.ts"() {
     "use strict";
-    import_ansis3 = __toESM(require("ansis"));
-    import_fastify_web = require("@cedarjs/fastify-web");
     init_createServer();
   }
 });
 
 // src/bothCLIConfigHandler.ts
+import ansis4 from "ansis";
+import { redwoodFastifyWeb, coerceRootPath as coerceRootPath5 } from "@cedarjs/fastify-web";
 async function handler2(options) {
   const timeStart = Date.now();
-  console.log(import_ansis4.default.dim.italic("Starting API and Web Servers..."));
+  console.log(ansis4.dim.italic("Starting API and Web Servers..."));
   options.webHost ??= getWebHost();
   options.webPort ??= getWebPort();
   options.apiHost ??= getAPIHost();
   options.apiPort ??= getAPIPort();
-  options.apiRootPath = (0, import_fastify_web2.coerceRootPath)(options.apiRootPath ?? "/");
+  options.apiRootPath = coerceRootPath5(options.apiRootPath ?? "/");
   const apiProxyTarget = [
     "http://",
     options.apiHost.includes(":") ? `[${options.apiHost}]` : options.apiHost,
@@ -742,7 +718,7 @@ async function handler2(options) {
     options.apiRootPath
   ].join("");
   const webFastify = await fastify_default();
-  webFastify.register(import_fastify_web2.redwoodFastifyWeb, {
+  webFastify.register(redwoodFastifyWeb, {
     redwood: {
       apiProxyTarget
     }
@@ -772,12 +748,12 @@ ${webFastify.printPlugins()}`);
   );
   apiFastify.log.trace(`Registered plugins
 ${apiFastify.printPlugins()}`);
-  console.log(import_ansis4.default.dim.italic("Took " + (Date.now() - timeStart) + " ms"));
-  const webServer = import_ansis4.default.green(webFastify.listeningOrigin);
-  const apiServer = import_ansis4.default.magenta(
+  console.log(ansis4.dim.italic("Took " + (Date.now() - timeStart) + " ms"));
+  const webServer = ansis4.green(webFastify.listeningOrigin);
+  const apiServer = ansis4.magenta(
     `${apiFastify.listeningOrigin}${options.apiRootPath}`
   );
-  const graphqlEndpoint = import_ansis4.default.magenta(`${apiServer}graphql`);
+  const graphqlEndpoint = ansis4.magenta(`${apiServer}graphql`);
   console.log(`Web server listening at ${webServer}`);
   console.log(`API server listening at ${apiServer}`);
   console.log(`GraphQL endpoint at ${graphqlEndpoint}`);
@@ -791,12 +767,9 @@ function getListenTextResolver(side) {
     return `${side} server listening at ${address}`;
   };
 }
-var import_ansis4, import_fastify_web2;
 var init_bothCLIConfigHandler = __esm({
   "src/bothCLIConfigHandler.ts"() {
     "use strict";
-    import_ansis4 = __toESM(require("ansis"));
-    import_fastify_web2 = require("@cedarjs/fastify-web");
     init_cliHelpers();
     init_createServer();
     init_fastify();
@@ -804,12 +777,16 @@ var init_bothCLIConfigHandler = __esm({
 });
 
 // src/bin.ts
-var import_path4 = __toESM(require("path"));
-var import_dotenv_defaults2 = require("dotenv-defaults");
-var import_helpers4 = require("yargs/helpers");
-var import_yargs = __toESM(require("yargs/yargs"));
-var import_project_config6 = require("@cedarjs/project-config");
-var import_web_server = require("@cedarjs/web-server");
+import path4 from "path";
+import { config as config2 } from "dotenv-defaults";
+import { hideBin } from "yargs/helpers";
+import yargs from "yargs/yargs";
+import { getPaths as getPaths5 } from "@cedarjs/project-config";
+import {
+  description as webDescription,
+  builder as webBuilder,
+  handler as webHandler
+} from "@cedarjs/web-server";
 
 // src/apiCLIConfig.ts
 var description = "Start a server for serving the api side";
@@ -878,15 +855,15 @@ function builder2(yargs2) {
 // src/bin.ts
 init_bothCLIConfigHandler();
 if (!process.env.REDWOOD_ENV_FILES_LOADED) {
-  (0, import_dotenv_defaults2.config)({
-    path: import_path4.default.join((0, import_project_config6.getPaths)().base, ".env"),
-    defaults: import_path4.default.join((0, import_project_config6.getPaths)().base, ".env.defaults"),
+  config2({
+    path: path4.join(getPaths5().base, ".env"),
+    defaults: path4.join(getPaths5().base, ".env.defaults"),
     multiline: true
   });
   process.env.REDWOOD_ENV_FILES_LOADED = "true";
 }
 process.env.NODE_ENV ??= "production";
-(0, import_yargs.default)((0, import_helpers4.hideBin)(process.argv)).scriptName("rw-server").strict().alias("h", "help").alias("v", "version").command(
+yargs(hideBin(process.argv)).scriptName("rw-server").strict().alias("h", "help").alias("v", "version").command(
   "$0",
   description2,
   // @ts-expect-error The yargs types seem wrong; it's ok for builder to be a function
@@ -900,8 +877,8 @@ process.env.NODE_ENV ??= "production";
   handler
 ).command(
   "web",
-  import_web_server.description,
+  webDescription,
   // @ts-expect-error The yargs types seem wrong; it's ok for builder to be a function
-  import_web_server.builder,
-  import_web_server.handler
+  webBuilder,
+  webHandler
 ).parse();

package/dist/bothCLIConfig.js

@@ -1,38 +1,3 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var bothCLIConfig_exports = {};
-__export(bothCLIConfig_exports, {
-  builder: () => builder,
-  description: () => description,
-  handler: () => handler
-});
-module.exports = __toCommonJS(bothCLIConfig_exports);
 const description = "Start a server for serving the api and web sides";
 function builder(yargs) {
   yargs.options({
@@ -68,9 +33,8 @@ async function handler(options) {
   const { handler: handler2 } = await import("./bothCLIConfigHandler.js");
   await handler2(options);
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   builder,
   description,
   handler
-});
+};

package/dist/bothCLIConfigHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bothCLIConfigHandler.d.ts","sourceRoot":"","sources":["../src/bothCLIConfigHandler.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnD,wBAAsB,OAAO,CAAC,OAAO,EAAE,iBAAiB,iBAmEvD"}
+{"version":3,"file":"bothCLIConfigHandler.d.ts","sourceRoot":"","sources":["../src/bothCLIConfigHandler.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAEnD,wBAAsB,OAAO,CAAC,OAAO,EAAE,iBAAiB,iBAmEvD"}