@cedarjs/web-server 5.0.6 → 5.0.7-next.219

package/dist/bin.js

@@ -1,79 +1,70 @@
 #!/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;
-};
-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 });
+var __esm = (fn, res, err) => function __init() {
+  if (err) throw err[0];
+  try {
+    return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+  } catch (e) {
+    throw err = [e], e;
   }
-  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/webServer.ts
+import fs from "node:fs";
+import path from "node:path";
+import ansis from "ansis";
+import Fastify from "fastify";
+import { redwoodFastifyWeb } from "@cedarjs/fastify-web";
+import {
+  getConfig,
+  getPaths,
+  parsePort,
+  readEnvVar
+} from "@cedarjs/project-config";
 async function serveWeb(options = {}) {
   const start = Date.now();
-  console.log(import_ansis.default.dim.italic("Starting Web Server..."));
-  const distIndexExists = import_node_fs.default.existsSync(
-    import_node_path.default.join((0, import_project_config.getPaths)().web.dist, "index.html")
+  console.log(ansis.dim.italic("Starting Web Server..."));
+  const distIndexExists = fs.existsSync(
+    path.join(getPaths().web.dist, "index.html")
   );
   if (!distIndexExists) {
     throw new Error(
       "no built files to serve; run `yarn cedar build web` before serving the web side"
     );
   }
-  if (process.env.REDWOOD_WEB_PORT) {
-    options.port ??= parseInt(process.env.REDWOOD_WEB_PORT);
+  const webPort = readEnvVar("CEDAR_WEB_PORT", {
+    deprecatedAlias: "REDWOOD_WEB_PORT"
+  });
+  if (webPort) {
+    options.port ??= parsePort(webPort, "CEDAR_WEB_PORT");
   }
-  options.port ??= (0, import_project_config.getConfig)().web.port;
-  options.host ??= process.env.REDWOOD_WEB_HOST;
-  options.host ??= (0, import_project_config.getConfig)().web.host;
-  options.host ??= process.env.NODE_ENV === "production" ? "0.0.0.0" : "::";
-  if (process.env.NODE_ENV === "production" && options.host !== "0.0.0.0") {
-    console.warn(
-      `Warning: host '${options.host}' may need to be '0.0.0.0' in production for containerized deployments`
-    );
+  if (process.env.PORT) {
+    options.port ??= parsePort(process.env.PORT, "PORT");
   }
-  const fastify = (0, import_fastify.default)({
+  options.port ??= getConfig().web.port;
+  options.host ??= readEnvVar("CEDAR_WEB_HOST", {
+    deprecatedAlias: "REDWOOD_WEB_HOST"
+  });
+  options.host ??= process.env.HOST;
+  options.host ??= getConfig().web.host;
+  options.host ??= "::";
+  const fastify = Fastify({
     requestTimeout: 15e3,
     logger: {
       level: process.env.LOG_LEVEL ?? (process.env.NODE_ENV === "development" ? "debug" : "warn")
     }
   });
-  fastify.register(import_fastify_web.redwoodFastifyWeb, { redwood: options });
+  fastify.register(redwoodFastifyWeb, { redwood: options });
   const address = await fastify.listen({
     port: options.port,
     host: options.host
   });
-  console.log(import_ansis.default.dim.italic("Took " + (Date.now() - start) + " ms"));
-  console.log(`Web server listening at ${import_ansis.default.green(address)}`);
+  console.log(ansis.dim.italic("Took " + (Date.now() - start) + " ms"));
+  console.log(`Web server listening at ${ansis.green(address)}`);
 }
-var import_node_fs, import_node_path, import_ansis, import_fastify, import_fastify_web, import_project_config;
 var init_webServer = __esm({
   "src/webServer.ts"() {
     "use strict";
-    import_node_fs = __toESM(require("node:fs"));
-    import_node_path = __toESM(require("node:path"));
-    import_ansis = __toESM(require("ansis"));
-    import_fastify = __toESM(require("fastify"));
-    import_fastify_web = require("@cedarjs/fastify-web");
-    import_project_config = require("@cedarjs/project-config");
   }
 });
 
@@ -94,11 +85,11 @@ var init_cliConfigHandler = __esm({
 });
 
 // src/bin.ts
-var import_path = __toESM(require("path"));
-var import_dotenv_defaults = require("dotenv-defaults");
-var import_helpers = require("yargs/helpers");
-var import_yargs = __toESM(require("yargs/yargs"));
-var import_project_config2 = require("@cedarjs/project-config");
+import path2 from "path";
+import { config } from "dotenv-defaults";
+import { hideBin } from "yargs/helpers";
+import yargs from "yargs/yargs";
+import { getPaths as getPaths2 } from "@cedarjs/project-config";
 
 // src/cliConfig.ts
 var description = "Start a server for serving the web side";
@@ -110,7 +101,7 @@ function builder(yargs2) {
       alias: "p"
     },
     host: {
-      description: "The host to listen on. Note that you most likely want this to be '0.0.0.0' in production",
+      description: "The host to listen on",
       type: "string"
     },
     apiProxyTarget: {
@@ -129,15 +120,15 @@ function builder(yargs2) {
 // src/bin.ts
 init_cliConfigHandler();
 if (!process.env.CEDAR_ENV_FILES_LOADED) {
-  (0, import_dotenv_defaults.config)({
-    path: import_path.default.join((0, import_project_config2.getPaths)().base, ".env"),
-    defaults: import_path.default.join((0, import_project_config2.getPaths)().base, ".env.defaults"),
+  config({
+    path: path2.join(getPaths2().base, ".env"),
+    defaults: path2.join(getPaths2().base, ".env.defaults"),
     multiline: true
   });
   process.env.CEDAR_ENV_FILES_LOADED = "true";
 }
 process.env.NODE_ENV ??= "production";
-(0, import_yargs.default)((0, import_helpers.hideBin)(process.argv)).scriptName("cedar-web-server").alias("h", "help").alias("v", "version").strict().example(
+yargs(hideBin(process.argv)).scriptName("cedar-web-server").alias("h", "help").alias("v", "version").strict().example(
   "yarn $0 --api-url=/api --api-proxy-target=https://api.redwood.horse",
   "Start the web server and proxy requests made to '/api' to 'https://api.redwood.horse'"
 ).example(

package/dist/cliConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cliConfig.d.ts","sourceRoot":"","sources":["../src/cliConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE/C,eAAO,MAAM,WAAW,4CAA4C,CAAA;AAEpE,wBAAgB,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,QA0BjD;AAED,wBAAsB,OAAO,CAAC,OAAO,EAAE,aAAa,iBAGnD"}
+{"version":3,"file":"cliConfig.d.ts","sourceRoot":"","sources":["../src/cliConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAA;AAEjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE/C,eAAO,MAAM,WAAW,4CAA4C,CAAA;AAEpE,wBAAgB,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,QAwBjD;AAED,wBAAsB,OAAO,CAAC,OAAO,EAAE,aAAa,iBAGnD"}

package/dist/cliConfig.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 cliConfig_exports = {};
-__export(cliConfig_exports, {
-  builder: () => builder,
-  description: () => description,
-  handler: () => handler
-});
-module.exports = __toCommonJS(cliConfig_exports);
 const description = "Start a server for serving the web side";
 function builder(yargs) {
   yargs.options({
@@ -42,7 +7,7 @@ function builder(yargs) {
       alias: "p"
     },
     host: {
-      description: "The host to listen on. Note that you most likely want this to be '0.0.0.0' in production",
+      description: "The host to listen on",
       type: "string"
     },
     apiProxyTarget: {
@@ -61,9 +26,8 @@ async function handler(options) {
   const { handler: handler2 } = await import("./cliConfigHandler.js");
   await handler2(options);
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   builder,
   description,
   handler
-});
+};

package/dist/cliConfigHandler.js

@@ -1,36 +1,12 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var cliConfigHandler_exports = {};
-__export(cliConfigHandler_exports, {
-  handler: () => handler
-});
-module.exports = __toCommonJS(cliConfigHandler_exports);
-var import_webServer = require("./webServer.js");
+import { serveWeb } from "./webServer.js";
 async function handler(options) {
   try {
-    await (0, import_webServer.serveWeb)(options);
+    await serveWeb(options);
   } catch (error) {
     process.exitCode ||= 1;
     console.error(`Error: ${error.message}`);
   }
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   handler
-});
+};

package/dist/webServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webServer.d.ts","sourceRoot":"","sources":["../src/webServer.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE/C,wBAAsB,QAAQ,CAAC,OAAO,GAAE,aAAkB,iBA8CzD"}
+{"version":3,"file":"webServer.d.ts","sourceRoot":"","sources":["../src/webServer.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE/C,wBAAsB,QAAQ,CAAC,OAAO,GAAE,aAAkB,iBA6DzD"}

package/dist/webServer.js

@@ -1,80 +1,55 @@
-"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 webServer_exports = {};
-__export(webServer_exports, {
-  serveWeb: () => serveWeb
-});
-module.exports = __toCommonJS(webServer_exports);
-var import_node_fs = __toESM(require("node:fs"));
-var import_node_path = __toESM(require("node:path"));
-var import_ansis = __toESM(require("ansis"));
-var import_fastify = __toESM(require("fastify"));
-var import_fastify_web = require("@cedarjs/fastify-web");
-var import_project_config = require("@cedarjs/project-config");
+import fs from "node:fs";
+import path from "node:path";
+import ansis from "ansis";
+import Fastify from "fastify";
+import { redwoodFastifyWeb } from "@cedarjs/fastify-web";
+import {
+  getConfig,
+  getPaths,
+  parsePort,
+  readEnvVar
+} from "@cedarjs/project-config";
 async function serveWeb(options = {}) {
   const start = Date.now();
-  console.log(import_ansis.default.dim.italic("Starting Web Server..."));
-  const distIndexExists = import_node_fs.default.existsSync(
-    import_node_path.default.join((0, import_project_config.getPaths)().web.dist, "index.html")
+  console.log(ansis.dim.italic("Starting Web Server..."));
+  const distIndexExists = fs.existsSync(
+    path.join(getPaths().web.dist, "index.html")
   );
   if (!distIndexExists) {
     throw new Error(
       "no built files to serve; run `yarn cedar build web` before serving the web side"
     );
   }
-  if (process.env.REDWOOD_WEB_PORT) {
-    options.port ??= parseInt(process.env.REDWOOD_WEB_PORT);
+  const webPort = readEnvVar("CEDAR_WEB_PORT", {
+    deprecatedAlias: "REDWOOD_WEB_PORT"
+  });
+  if (webPort) {
+    options.port ??= parsePort(webPort, "CEDAR_WEB_PORT");
   }
-  options.port ??= (0, import_project_config.getConfig)().web.port;
-  options.host ??= process.env.REDWOOD_WEB_HOST;
-  options.host ??= (0, import_project_config.getConfig)().web.host;
-  options.host ??= process.env.NODE_ENV === "production" ? "0.0.0.0" : "::";
-  if (process.env.NODE_ENV === "production" && options.host !== "0.0.0.0") {
-    console.warn(
-      `Warning: host '${options.host}' may need to be '0.0.0.0' in production for containerized deployments`
-    );
+  if (process.env.PORT) {
+    options.port ??= parsePort(process.env.PORT, "PORT");
   }
-  const fastify = (0, import_fastify.default)({
+  options.port ??= getConfig().web.port;
+  options.host ??= readEnvVar("CEDAR_WEB_HOST", {
+    deprecatedAlias: "REDWOOD_WEB_HOST"
+  });
+  options.host ??= process.env.HOST;
+  options.host ??= getConfig().web.host;
+  options.host ??= "::";
+  const fastify = Fastify({
     requestTimeout: 15e3,
     logger: {
       level: process.env.LOG_LEVEL ?? (process.env.NODE_ENV === "development" ? "debug" : "warn")
     }
   });
-  fastify.register(import_fastify_web.redwoodFastifyWeb, { redwood: options });
+  fastify.register(redwoodFastifyWeb, { redwood: options });
   const address = await fastify.listen({
     port: options.port,
     host: options.host
   });
-  console.log(import_ansis.default.dim.italic("Took " + (Date.now() - start) + " ms"));
-  console.log(`Web server listening at ${import_ansis.default.green(address)}`);
+  console.log(ansis.dim.italic("Took " + (Date.now() - start) + " ms"));
+  console.log(`Web server listening at ${ansis.green(address)}`);
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   serveWeb
-});
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/web-server",
-  "version": "5.0.6",
+  "version": "5.0.7-next.219",
   "description": "CedarJS's server for the Web side",
   "repository": {
     "type": "git",
@@ -8,7 +8,7 @@
     "directory": "packages/web-server"
   },
   "license": "MIT",
-  "type": "commonjs",
+  "type": "module",
   "main": "./dist/cliConfig.js",
   "types": "./dist/cliConfig.d.ts",
   "bin": {
@@ -19,23 +19,23 @@
     "dist"
   ],
   "scripts": {
-    "build": "node ./build.mts && yarn build:types",
+    "build": "node ./build.mts",
     "build:pack": "yarn pack -o cedarjs-web-server.tgz",
-    "build:types": "tsc --build --verbose",
+    "build:types": "tsc --build --verbose ./tsconfig.build.json",
     "build:watch": "nodemon --watch src --ext \"js,jsx,ts,tsx\" --ignore dist --exec \"yarn build && yarn fix:permissions\"",
     "fix:permissions": "chmod +x dist/index.js; chmod +x dist/watch.js",
     "prepublishOnly": "NODE_ENV=production yarn build"
   },
   "dependencies": {
-    "@cedarjs/fastify-web": "5.0.6",
-    "@cedarjs/project-config": "5.0.6",
-    "ansis": "4.2.0",
+    "@cedarjs/fastify-web": "5.0.7-next.219",
+    "@cedarjs/project-config": "5.0.7-next.219",
+    "ansis": "4.3.1",
     "dotenv-defaults": "5.0.2",
-    "fastify": "5.8.5",
+    "fastify": "5.10.0",
     "yargs": "17.7.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "5.0.6",
+    "@cedarjs/framework-tools": "5.0.7-next.219",
     "typescript": "5.9.3"
   },
   "engines": {