Merge pull request #1522 from escral/master

Author: cossssmin

src/commands/build.js

@@ -298,14 +298,19 @@ export default async (config = {}) => {
 
     /**
      * Copy static files
-     *
-     * TODO: support an array of objects with source and destination,
-     * i.e. static: [{ source: 'src/assets', destination: 'assets' }, ...]
      */
-    const staticSourcePaths = getRootDirectories([...new Set(get(config, 'build.static.source', []))])
+    let staticFiles = get(config, 'build.static', [])
+
+    if (!Array.isArray(staticFiles)) {
+        staticFiles = [staticFiles]
+    }
 
-    for await (const rootDir of staticSourcePaths) {
-      await cp(rootDir, path.join(buildOutputPath, get(config, 'build.static.destination')), { recursive: true })
+    for (const definition of staticFiles) {
+      const staticSourcePaths = getRootDirectories([...new Set(definition.source)])
+
+      for await (const rootDir of staticSourcePaths) {
+        await cp(rootDir, path.join(buildOutputPath, definition.destination), { recursive: true })
+      }
     }
 
     const allOutputFiles = await fg.glob(path.join(buildOutputPath, '**/*'))

src/server/index.js

@@ -252,6 +252,14 @@ export default async (config = {}) => {
       }
     })
 
+  let staticFiles = get(config, 'build.static', [])
+
+  if (!Array.isArray(staticFiles)) {
+    staticFiles = [staticFiles]
+  }
+
+  const staticFilesSourcePaths = staticFiles.flatMap((definition) => definition.source)
+
   /**
    * Global watcher
    *
@@ -263,7 +271,7 @@ export default async (config = {}) => {
     'maizzle.config*.{js,cjs,ts}',
     'tailwind*.config.{js,ts}',
     '**/*.css',
-    ...get(config, 'build.static.source', []),
+    ...staticFilesSourcePaths,
     ...get(config, 'server.watch', []),
   ])
 
@@ -365,7 +373,7 @@ export default async (config = {}) => {
   const srcFoldersList = await fg.glob(
     [
       '**/*/',
-      ...get(config, 'build.static.source', [])
+      ...staticFilesSourcePaths,
     ], {
     onlyFiles: false,
     ignore: [

types/build.d.ts

@@ -99,7 +99,10 @@ export default interface BuildConfig {
      * @default undefined
      */
     destination?: string;
-  };
+  } | Array<{
+    source?: string[];
+    destination?: string;
+  }>
 
   /**
    * Type of spinner to show in the console.