Merge branch 'alexfriesen-master' into 9.0.0

nestjs · May 17, 2022 · 61bcb7f · 61bcb7f
2 parents 707a3e0 + ddd95b8
commit 61bcb7f
Show file tree

Hide file tree

Showing 9 changed files with 271 additions and 292 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -122,10 +122,10 @@
     "eventsource": "2.0.2",
     "fancy-log": "2.0.0",
     "fastify": "3.29.0",
-    "fastify-cors": "6.1.0",
-    "fastify-formbody": "5.3.0",
-    "fastify-multipart": "5.4.0",
-    "fastify-static": "4.7.0",
+    "@fastify/cors": "7.0.0",
+    "@fastify/formbody": "6.0.0",
+    "@fastify/multipart": "6.0.0",
+    "@fastify/static": "5.0.0",
     "graphql": "15.8.0",
     "graphql-tools": "8.2.9",
     "gulp": "4.0.2",

diff --git a/packages/platform-fastify/adapters/fastify-adapter.ts b/packages/platform-fastify/adapters/fastify-adapter.ts
@@ -380,8 +380,8 @@ export class FastifyAdapter<
 
   public useStaticAssets(options: FastifyStaticOptions) {
     return this.register(
-      loadPackage('fastify-static', 'FastifyAdapter.useStaticAssets()', () =>
-        require('fastify-static'),
+      loadPackage('@fastify/static', 'FastifyAdapter.useStaticAssets()', () =>
+        require('@fastify/static'),
       ),
       options,
     );
@@ -421,14 +421,14 @@ export class FastifyAdapter<
   }
 
   public enableCors(options: CorsOptions | CorsOptionsDelegate<TRequest>) {
-    this.register(import('fastify-cors'), options);
+    this.register(import('@fastify/cors'), options);
   }
 
   public registerParserMiddleware() {
     if (this._isParserRegistered) {
       return;
     }
-    this.register(import('fastify-formbody'));
+    this.register(import('@fastify/formbody'));
     this._isParserRegistered = true;
   }
 

diff --git a/packages/platform-fastify/interfaces/external/fastify-static-options.interface.ts b/packages/platform-fastify/interfaces/external/fastify-static-options.interface.ts
@@ -2,15 +2,28 @@
  * "fastify-static" interfaces
  * @see https://github.com/fastify/fastify-static/blob/master/index.d.ts
  */
+import { Stats } from 'fs';
+
+interface ExtendedInformation {
+  fileCount: number;
+  totalFileCount: number;
+  folderCount: number;
+  totalFolderCount: number;
+  totalSize: number;
+  lastModified: number;
+}
 
 interface ListDir {
   href: string;
   name: string;
+  stats: Stats;
+  extendedInfo?: ExtendedInformation;
 }
 
 interface ListFile {
   href: string;
   name: string;
+  stats: Stats;
 }
 
 interface ListRender {
@@ -21,6 +34,8 @@ interface ListOptions {
   format: 'json' | 'html';
   names: string[];
   render: ListRender;
+  extendedFolderInfo?: boolean;
+  jsonFormat?: 'names' | 'extended';
 }
 
 // Passed on to `send`
@@ -48,6 +63,11 @@ export interface FastifyStaticOptions extends SendOptions {
   wildcard?: boolean;
   list?: boolean | ListOptions;
   allowedPath?: (pathName: string, root?: string) => boolean;
+  /**
+   * @description
+   * Opt-in to looking for pre-compressed files
+   */
+  preCompressed?: boolean;
 
   // Passed on to `send`
   acceptRanges?: boolean;

diff --git a/packages/platform-fastify/interfaces/external/point-of-view-options.interface.ts b/packages/platform-fastify/interfaces/external/point-of-view-options.interface.ts
@@ -9,7 +9,6 @@ export interface PointOfViewOptions {
     nunjucks?: any;
     pug?: any;
     handlebars?: any;
-    marko?: any;
     mustache?: any;
     'art-template'?: any;
     twig?: any;

diff --git a/packages/platform-fastify/interfaces/nest-fastify-application.interface.ts b/packages/platform-fastify/interfaces/nest-fastify-application.interface.ts
@@ -16,7 +16,7 @@ import { FastifyStaticOptions, PointOfViewOptions } from './external';
 export interface NestFastifyApplication extends INestApplication {
   /**
    * A wrapper function around native `fastify.register()` method.
-   * Example `app.register(require('fastify-formbody'))
+   * Example `app.register(require('@fastify/formbody'))
    * @returns {Promise<FastifyInstance>}
    */
   register<Options extends FastifyPluginOptions = any>(

diff --git a/packages/platform-fastify/package.json b/packages/platform-fastify/package.json
@@ -18,15 +18,25 @@
   },
   "dependencies": {
     "fastify": "3.29.0",
-    "fastify-cors": "6.1.0",
-    "fastify-formbody": "5.3.0",
+    "@fastify/cors": "7.0.0",
+    "@fastify/formbody": "6.0.0",
     "light-my-request": "4.10.1",
     "middie": "6.1.0",
     "path-to-regexp": "3.2.0",
     "tslib": "2.4.0"
   },
   "peerDependencies": {
     "@nestjs/common": "^8.0.0",
-    "@nestjs/core": "^8.0.0"
+    "@nestjs/core": "^8.0.0",
+    "@fastify/static": "^5.0.0",
+    "point-of-view": "^5.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@fastify/static": {
+      "optional": true
+    },
+    "point-of-view": {
+      "optional": true
+    }
   }
 }
diff --git a/sample/17-mvc-fastify/package-lock.json b/sample/17-mvc-fastify/package-lock.json
diff --git a/sample/17-mvc-fastify/package.json b/sample/17-mvc-fastify/package.json
@@ -22,7 +22,7 @@
     "@nestjs/common": "8.2.3",
     "@nestjs/core": "8.2.3",
     "@nestjs/platform-fastify": "8.2.3",
-    "fastify-static": "4.5.0",
+    "@fastify/static": "5.0.0",
     "handlebars": "4.7.7",
     "point-of-view": "4.15.3",
     "reflect-metadata": "0.1.13",