config.DIR.STATIC can be an array of directories. config.ADD_STATIC can be used to add

Author: jaeh

src/config.mjs

@@ -81,7 +81,15 @@ export const runConfig = async (args = {}) => {
   const MODULES = path.join(ASSETS, 'modules')
 
   // static directory, files in this dir get copied to conf.PUBLIC
-  const STATIC = path.join(ASSETS, 'static')
+  let STATIC = path.join(ASSETS, 'static')
+
+  if (conf.ADD_STATIC) {
+    if (!is.array(conf.ADD_STATIC)) {
+      conf.ADD_STATIC = [conf.ADD_STATIC]
+    }
+
+    STATIC = [STATIC, ...conf.ADD_STATIC]
+  }
 
   // themes dir, files in this dir get used as themes
   const THEMES = path.join(ASSETS, 'themes')
@@ -146,8 +154,8 @@ export const runConfig = async (args = {}) => {
 
   conf.ADD_CSS = conf.ADD_CSS
     ? conf.ADD_CSS.map(href =>
-        href.startsWith(conf.WEB_ROOT) ? href : replaceSlashSlash(`${conf.WEB_ROOT}/${href}`),
-      )
+      href.startsWith(conf.WEB_ROOT) ? href : replaceSlashSlash(`${conf.WEB_ROOT}/${href}`),
+    )
     : []
 
   // array of html tags that get appended after the #magic html tag

src/tasks/prepare/index.mjs

@@ -95,10 +95,25 @@ export const prepare = async (app, config) => {
 
   app.static = await prepareMetaFiles(app, config)
 
-  let staticExists = false
   try {
-    await fs.stat(config.DIR.STATIC)
-    staticExists = true
+    let staticDirs = config.DIR.STATIC
+    if (!is.array(staticDirs)) {
+      staticDirs = [staticDirs]
+    }
+
+    await Promise.all(staticDirs.map(async dir => {
+      const staticFiles = await fs.getFiles(dir)
+
+      if (!is.empty(staticFiles)) {
+        const staticPromises = staticFiles.map(async f => {
+          const name = f.replace(dir, '')
+          // TODO: use streams here
+          app.static[name] = await fs.readFile(f)
+        })
+
+        await Promise.all(staticPromises)
+      }
+    }))
   } catch (e) {
     // it's fine if the static dir does not exist,
     // but all other errors will throw.
@@ -107,19 +122,6 @@ export const prepare = async (app, config) => {
     }
   }
 
-  if (staticExists) {
-    const staticFiles = await fs.getFiles(config.DIR.STATIC)
-    if (!is.empty(staticFiles)) {
-      const staticPromises = staticFiles.map(async f => {
-        const name = f.replace(config.DIR.STATIC, '')
-        // TODO: use streams here
-        app.static[name] = await fs.readFile(f)
-      })
-
-      await Promise.all(staticPromises)
-    }
-  }
-
   app.style = await prepareThemes(app, config)
 
   // mutates app