refactor(server): Move DefaultAssetServer config into default config

server/cli/assets/vendure-config.hbs

@@ -3,7 +3,6 @@
     gripePaymentHandler,
     defaultEmailTypes,
     HandlebarsMjmlGenerator,
-    DefaultAssetServerPlugin,
     {{#if isTs}}VendureConfig,{{/if}}
 } {{#if isTs}}from 'vendure'; {{ else }}= require('vendure');{{/if}}
 {{#if isTs }}
@@ -47,23 +46,7 @@ const path = require('path');
     importExportOptions: {
         importAssetsDir: path.join(__dirname, 'vendure', 'import-assets'),
     },
-    plugins: [
-        new DefaultAssetServerPlugin({
-            route: 'assets',
-            assetUploadDir: path.join(__dirname, 'vendure', 'assets'),
-            port: 4000,
-            hostname: 'http://localhost',
-            previewMaxHeight: 1600,
-            previewMaxWidth: 1600,
-            presets: [
-                { name: 'tiny', width: 50, height: 50, mode: 'crop' },
-                { name: 'thumb', width: 150, height: 150, mode: 'crop' },
-                { name: 'small', width: 300, height: 300, mode: 'resize' },
-                { name: 'medium', width: 500, height: 500, mode: 'resize' },
-                { name: 'large', width: 800, height: 800, mode: 'resize' },
-            ],
-        }),
-    ],
+    plugins: [],
 };
 {{#if isTs}}
 {{else}}

server/dev-config.ts

@@ -7,7 +7,6 @@ import { gripePaymentHandler } from './src/config/payment-method/gripe-payment-m
 import { OrderProcessOptions, VendureConfig } from './src/config/vendure-config';
 import { defaultEmailTypes } from './src/email/default-email-types';
 import { HandlebarsMjmlGenerator } from './src/email/handlebars-mjml-generator';
-import { DefaultAssetServerPlugin } from './src/plugin/default-asset-server/default-asset-server-plugin';
 
 /**
  * Config settings used during development
@@ -47,21 +46,5 @@ export const devConfig: VendureConfig = {
     importExportOptions: {
         importAssetsDir: path.join(__dirname, 'import-assets'),
     },
-    plugins: [
-        new DefaultAssetServerPlugin({
-            route: 'assets',
-            assetUploadDir: path.join(__dirname, 'assets'),
-            port: 4000,
-            hostname: 'http://localhost',
-            previewMaxHeight: 1600,
-            previewMaxWidth: 1600,
-            presets: [
-                { name: 'tiny', width: 50, height: 50, mode: 'crop' },
-                { name: 'thumb', width: 150, height: 150, mode: 'crop' },
-                { name: 'small', width: 300, height: 300, mode: 'resize' },
-                { name: 'medium', width: 500, height: 500, mode: 'resize' },
-                { name: 'large', width: 800, height: 800, mode: 'resize' },
-            ],
-        }),
-    ],
+    plugins: [],
 };

server/src/config/default-config.ts

@@ -1,8 +1,10 @@
+import * as path from 'path';
+
 import { LanguageCode } from '../../../shared/generated-types';
 import { API_PATH, API_PORT } from '../../../shared/shared-constants';
 import { CustomFields } from '../../../shared/shared-types';
-
 import { ReadOnlyRequired } from '../common/types/common-types';
+import { DefaultAssetServerPlugin } from '../plugin';
 
 import { DefaultAssetNamingStrategy } from './asset-naming-strategy/default-asset-naming-strategy';
 import { NoAssetPreviewStrategy } from './asset-preview-strategy/no-asset-preview-strategy';
@@ -89,5 +91,21 @@ export const defaultConfig: ReadOnlyRequired<VendureConfig> = {
         User: [],
     } as ReadOnlyRequired<CustomFields>,
     middleware: [],
-    plugins: [],
+    plugins: [
+        new DefaultAssetServerPlugin({
+            route: 'assets',
+            assetUploadDir: path.join(__dirname, 'assets'),
+            port: 4000,
+            hostname: 'http://localhost',
+            previewMaxHeight: 1600,
+            previewMaxWidth: 1600,
+            presets: [
+                { name: 'tiny', width: 50, height: 50, mode: 'crop' },
+                { name: 'thumb', width: 150, height: 150, mode: 'crop' },
+                { name: 'small', width: 300, height: 300, mode: 'resize' },
+                { name: 'medium', width: 500, height: 500, mode: 'resize' },
+                { name: 'large', width: 800, height: 800, mode: 'resize' },
+            ],
+        }),
+    ],
 };

server/src/config/email/email-transport-options.ts

@@ -1,8 +1,8 @@
+import { GeneratedEmailContext } from '../../email/email-context';
+
 /**
  * A subset of the SMTP transport options of Nodemailer (https://nodemailer.com/smtp/)
  */
-import { GeneratedEmailContext } from '../../email/email-context';
-
 export interface SMTPTransportOptions {
     type: 'smtp';
     /** the hostname or IP address to connect to (defaults to ‘localhost’) */