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

package/dist/helpers.js

@@ -1,32 +1,8 @@
-"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 helpers_exports = {};
-__export(helpers_exports, {
-  coerceRootPath: () => coerceRootPath
-});
-module.exports = __toCommonJS(helpers_exports);
 function coerceRootPath(path) {
   const prefix = !path.startsWith("/") ? "/" : "";
   const suffix = !path.endsWith("/") ? "/" : "";
   return `${prefix}${path}${suffix}`;
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   coerceRootPath
-});
+};

package/dist/web.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../src/web.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAA;AAI5E,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE7C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AAE1D,OAAO,EAAE,cAAc,EAAE,CAAA;AACzB,YAAY,EAAE,wBAAwB,EAAE,CAAA;AAExC,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,wBAAwB,iBA0G/B"}
+{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../src/web.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAA;AAI5E,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE7C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AAE1D,OAAO,EAAE,cAAc,EAAE,CAAA;AACzB,YAAY,EAAE,wBAAwB,EAAE,CAAA;AAWxC,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,eAAe,EACxB,IAAI,EAAE,wBAAwB,iBA0I/B"}

package/dist/web.js

@@ -1,46 +1,12 @@
-"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);
-
 // src/web.ts
-var web_exports = {};
-__export(web_exports, {
-  coerceRootPath: () => coerceRootPath,
-  redwoodFastifyWeb: () => redwoodFastifyWeb
-});
-module.exports = __toCommonJS(web_exports);
-var import_node_fs = __toESM(require("node:fs"));
-var import_path = __toESM(require("path"));
-var import_http_proxy = __toESM(require("@fastify/http-proxy"));
-var import_static = __toESM(require("@fastify/static"));
-var import_url_data = __toESM(require("@fastify/url-data"));
-var import_fast_glob = __toESM(require("fast-glob"));
-var import_project_config2 = require("@cedarjs/project-config");
+import fs from "node:fs";
+import path from "path";
+import fastifyCompress from "@fastify/compress";
+import httpProxy from "@fastify/http-proxy";
+import fastifyStatic from "@fastify/static";
+import fastifyUrlData from "@fastify/url-data";
+import fg from "fast-glob";
+import { getPaths } from "@cedarjs/project-config";
 
 // src/helpers.ts
 function coerceRootPath(path2) {
@@ -50,13 +16,13 @@ function coerceRootPath(path2) {
 }
 
 // src/resolveOptions.ts
-var import_project_config = require("@cedarjs/project-config");
+import { getConfig } from "@cedarjs/project-config";
 function resolveOptions(options) {
   const redwoodOptions = options.redwood ?? {};
   const flags = {
     shouldRegisterApiUrl: false
   };
-  redwoodOptions.apiUrl ??= (0, import_project_config.getConfig)().web.apiUrl;
+  redwoodOptions.apiUrl ??= getConfig().web.apiUrl;
   const apiUrlIsFullyQualifiedUrl = isFullyQualifiedUrl(redwoodOptions.apiUrl);
   if (redwoodOptions.apiHost && !redwoodOptions.apiProxyTarget) {
     redwoodOptions.apiProxyTarget = redwoodOptions.apiHost;
@@ -95,12 +61,26 @@ function isFullyQualifiedUrl(url) {
 }
 
 // src/web.ts
+var ONE_YEAR_IN_SECONDS = 60 * 60 * 24 * 365;
+var HASHED_ASSET_FILENAME = /-[0-9a-f]{8,}\.[^./]+$/i;
 async function redwoodFastifyWeb(fastify, opts) {
   const { redwoodOptions, flags } = resolveOptions(opts);
-  fastify.register(import_url_data.default);
-  fastify.register(import_static.default, { root: (0, import_project_config2.getPaths)().web.dist });
+  fastify.register(fastifyUrlData);
+  fastify.register(fastifyCompress);
+  const assetsDir = path.join(getPaths().web.dist, "assets") + path.sep;
+  fastify.register(fastifyStatic, {
+    root: getPaths().web.dist,
+    cacheControl: false,
+    setHeaders: (res, filePath) => {
+      const isHashedAsset = filePath.startsWith(assetsDir) && HASHED_ASSET_FILENAME.test(path.basename(filePath));
+      res.setHeader(
+        "Cache-Control",
+        isHashedAsset ? `public, max-age=${ONE_YEAR_IN_SECONDS}, immutable` : "no-cache"
+      );
+    }
+  });
   if (redwoodOptions.apiProxyTarget) {
-    fastify.register(import_http_proxy.default, {
+    fastify.register(httpProxy, {
       prefix: redwoodOptions.apiUrl,
       upstream: redwoodOptions.apiProxyTarget,
       disableCache: true,
@@ -133,8 +113,8 @@ async function redwoodFastifyWeb(fastify, opts) {
     fastify.all(apiUrlWarningPath, apiUrlHandler);
     fastify.all(`${apiUrlWarningPath}*`, apiUrlHandler);
   }
-  const prerenderedFiles = await (0, import_fast_glob.default)("**/*.html", {
-    cwd: (0, import_project_config2.getPaths)().web.dist,
+  const prerenderedFiles = await fg("**/*.html", {
+    cwd: getPaths().web.dist,
     ignore: ["index.html", "200.html", "404.html"]
   });
   for (const prerenderedFile of prerenderedFiles) {
@@ -144,11 +124,11 @@ async function redwoodFastifyWeb(fastify, opts) {
       reply.sendFile(prerenderedFile);
     });
   }
-  const prerenderIndexPath = import_path.default.join((0, import_project_config2.getPaths)().web.dist, "200.html");
-  const fallbackIndexPath = import_node_fs.default.existsSync(prerenderIndexPath) ? "200.html" : "index.html";
+  const prerenderIndexPath = path.join(getPaths().web.dist, "200.html");
+  const fallbackIndexPath = fs.existsSync(prerenderIndexPath) ? "200.html" : "index.html";
   fastify.setNotFoundHandler({}, (req, reply) => {
     const urlData = req.urlData();
-    const requestHasExtension = !!import_path.default.extname(urlData.path ?? "");
+    const requestHasExtension = !!path.extname(urlData.path ?? "");
     if (requestHasExtension && urlData.path?.startsWith("/assets/")) {
       reply.code(404);
       return reply.send("Not Found");
@@ -157,8 +137,7 @@ async function redwoodFastifyWeb(fastify, opts) {
     return reply.sendFile(fallbackIndexPath);
   });
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   coerceRootPath,
   redwoodFastifyWeb
-});
+};

package/package.json

@@ -1,38 +1,39 @@
 {
   "name": "@cedarjs/fastify-web",
-  "version": "5.0.6",
+  "version": "5.0.7-next.219",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
     "directory": "packages/adapters/fastify/web"
   },
   "license": "MIT",
-  "type": "commonjs",
+  "type": "module",
   "main": "./dist/web.js",
   "types": "./dist/web.d.ts",
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "node ./build.mts && yarn build:types",
+    "build": "node ./build.mts",
     "build:pack": "yarn pack -o cedarjs-fastify-web.tgz",
-    "build:types": "tsc --build --verbose",
+    "build:types": "tsc --build --verbose ./tsconfig.build.json",
     "prepublishOnly": "NODE_ENV=production yarn build",
     "test": "vitest run",
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/project-config": "5.0.6",
-    "@fastify/http-proxy": "11.5.0",
+    "@cedarjs/project-config": "5.0.7-next.219",
+    "@fastify/compress": "9.1.1",
+    "@fastify/http-proxy": "11.6.0",
     "@fastify/static": "8.3.0",
     "@fastify/url-data": "6.0.3",
     "fast-glob": "3.3.3"
   },
   "devDependencies": {
-    "@cedarjs/framework-tools": "5.0.6",
-    "fastify": "5.8.5",
+    "@cedarjs/framework-tools": "5.0.7-next.219",
+    "fastify": "5.10.0",
     "typescript": "5.9.3",
-    "vitest": "3.2.6"
+    "vitest": "4.1.10"
   },
   "engines": {
     "node": ">=24"