fix: allow action to override global config

saojs · Dec 2, 2018 · 14d1fbf · 14d1fbf
1 parent 676a7f9
commit 14d1fbf
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/lib/runActions.js b/lib/runActions.js
@@ -19,7 +19,7 @@ module.exports = async (config, context) => {
       stream.source(['!**/node_modules/**'].concat(action.files), {
         baseDir: path.resolve(
           context.generator.path,
-          config.templateDir || 'template'
+          action.templateDir || config.templateDir || 'template'
         )
       })
 
@@ -63,6 +63,7 @@ module.exports = async (config, context) => {
             const transformer = require('jstransformer')(
               require(`jstransformer-${config.transformer || 'ejs'}`)
             )
+            const templateData = action.templateData || config.templateData
             stream.writeContents(
               relativePath,
               transformer.render(
@@ -71,9 +72,9 @@ module.exports = async (config, context) => {
                 Object.assign(
                   {},
                   context.answers,
-                  typeof config.templateData === 'function'
-                    ? config.templateData.call(context, context)
-                    : config.templateData,
+                  typeof templateData === 'function'
+                    ? templateData.call(context, context)
+                    : templateData,
                   {
                     context
                   }