feat(build): support appConfig and processor for json config

Author: allen-zh

packages/mars-build/src/compiler/file/base.js

@@ -8,11 +8,11 @@
 
 const buildInProcessors = require('./processor');
 
-async function process(source, processors) {
+async function process(source, processors, file) {
     for (const processor of processors) {
         const {name, options = {}, process} = processor;
         if (typeof process === 'function') {
-            source = await process(source, options);
+            source = await process(source, options, file);
         }
         else if (buildInProcessors[name]) {
             source = await buildInProcessors[name](source, options);
@@ -54,14 +54,14 @@ function getFileCompiler(compile, config) {
         const lang = file.lang || file.type;
         let source = (file.contents && file.contents.toString()) || '';
         // preprocessors
-        source = await process(source, getExtProcessors(preprocessors, lang));
+        source = await process(source, getExtProcessors(preprocessors, lang), file);
         // compile
         options.path = file.path;
         options.file = file;
         const result =  await compile(source, options, fileOptions);
         // postprocessors
         let {code, ...rest} = result;
-        code = await process(code, getExtProcessors(postprocessors, lang));
+        code = await process(code, getExtProcessors(postprocessors, lang), file);
         // overwrite file contents
         file.contents = Buffer.from(code || '');
         return rest;

packages/mars-build/src/compiler/sfc/compiler.js

@@ -10,6 +10,7 @@ exports.compile = async function compile(file, options) {
     const {template, script, styles, config: configFile} = file;
     const blockConfig = configFile.$options.config;
     const mpConfig = blockConfig && blockConfig.config;
+    const marsConfig = options._config;
     // const isComponent = mpConfig && mpConfig.component === true;
 
     const {compilers, isApp, fPath, target, coreRelativePath, baseName} = options;
@@ -26,11 +27,16 @@ exports.compile = async function compile(file, options) {
         coreRelativePath,
         target,
         renderStr: !isApp ? renderFunctionName : null,
-        dest: options._config.dest
+        dest: marsConfig.dest
     });
 
     // use configFile.$options.config first
     config = mpConfig ? mpConfig : config;
+    // prefer appConfig in marsConfig
+    if (isApp) {
+        const appConfig = marsConfig.appConfig && marsConfig.appConfig.config;
+        config = appConfig || config;
+    }
 
     // app.vue has no template
     if (!isApp) {

packages/mars-build/src/gulp-mars-h5.js

@@ -112,6 +112,7 @@ async function compile(file, opt) {
         fileSuffix,
         fPath
     }, opt);
+    const marsConfig = options._config;
 
     const {
         templateCompiler,
@@ -141,11 +142,17 @@ async function compile(file, opt) {
         mpConfig,
         target: options.target,
         path: fPath + '.vue',
-        dest: options._config.dest,
-        mars: options._config.h5 || {}
+        dest: marsConfig.dest,
+        mars: marsConfig.h5 || {}
     });
     // use blockConfig first
     config = mpConfig ? mpConfig : (scriptRet && scriptRet.config);
+    // prefer appConfig in marsConfig
+    if (isApp) {
+        const appConfig = marsConfig.appConfig && marsConfig.appConfig.config;
+        config = appConfig || config;
+    }
+
     // if (config && config.pages) {
     //     config.pages = config.pages.filter(item => !/\.(swan|mp)$/.test(item));
     // }
@@ -226,7 +233,7 @@ async function compile(file, opt) {
         // let routerContent = fs.readFileSync(__dirname + '/h5/template/router.js');
         // routerContent = compileRouter(routerContent, {
         //     config,
-        //     mars: options._config.h5 || null
+        //     mars: marsConfig.h5 || null
         // });
         // fs.writeFileSync(options.dest + '/router.js', routerContent);
 
@@ -346,7 +353,7 @@ async function compile(file, opt) {
     // content = compileMain(content, {
     //     mainOptions,
     //     componentSet,
-    //     mars: options._config.h5 || {}
+    //     mars: marsConfig.h5 || {}
     // });
     // fs.writeFileSync(options.dest + '/main.js', content);
 
@@ -387,6 +394,9 @@ ${styles.contents.toString() || ''}
     });
     templateFile.writeFileSync();
 
+    // just compile configFile
+    // to involve processors
+    await configCompiler(configFile, {components: scriptRet.components, config});
     return file;
 }