Platform specific properties in manifest and copy assets folder

cli/xt-build.js

@@ -24,24 +24,27 @@ const Spinner = require('cli-spinner').Spinner;
 const exec = require('child_process').exec;
 const pkg = require('../package.json');
 const env = {prod: 'prod', dev: 'dev'};
+const platform = {chrome: 'chrome', firefox: 'firefox'};
 const texts = require('../config/texts').xtBuild;
 const gulpfile = path.resolve(__dirname, '../config/gulpfile.js');
 
 program
     .version(pkg.version)
     .option('-e --env <env>', texts.envArg, /^(dev|prod)$/i, env.prod)
+    .option('-p <platform>', texts.platformArg, /^(chrome|firefox)$/i, platform.chrome)
     .option('-c --config <config>', texts.configFileArg, /^(.*)$/i)
     .option('-w --watch', texts.watchArg)
     .parse(process.argv);
 
-const {watch, env: programEnv, config} = program.opts();
+const {watch, env: programEnv, config, p: platformEnv} = program.opts();
 
 const args = [
     watch ? 'gulp watch' : 'gulp',
     util.format('--gulpfile "%s"', gulpfile),
     util.format('--config "%s"', path.resolve(process.cwd(), config || './.xtbuild.json')),
     util.format('--pkg', path.resolve(process.cwd(), './package.json')),
     util.format('--%s', programEnv),
+    util.format('--%s', platformEnv),
     '--colors'
 ].join(' ');
 

config/build.json

@@ -10,11 +10,10 @@
   "html": "./src/**/*.html",
   "scss": "./src/**/*.scss",
   "scss_bundles": null,
-  "icons": [
-    "./assets/img/**/*.png",
-    "./assets/img/**/*.gif",
-    "./assets/img/**/*.jpg",
-    "./assets/img/**/*.svg"
+  "assets": [
+    "./assets/**/*",
+    "!./assets/locales",
+    "!./assets/locales/**/*"
   ],
   "copyAsIs": [],
   "locales_dir": "./assets/locales/",

config/gulpfile.js

@@ -2,11 +2,13 @@ const fs = require('fs');
 const gulp = require('gulp');
 const del = require('del');
 const chalk = require('chalk');
+const gulpChange = require('gulp-change');
 const paths = require('./build.json');
 const plugins = require('gulp-load-plugins')();
 const webpack = require('webpack-stream');
 const argv = require('yargs').argv;
 const isProd = argv.prod;
+const isFirefox = argv.firefox;
 
 /** switch to project working directory **/
 process.chdir(paths.projectRootDir);
@@ -126,15 +128,27 @@ const copyManifest = () => {
 
     const {version} = pkg;
 
+    const performChange = (content) => {
+        let mft = JSON.parse(content);
+
+        if (isFirefox && mft.firefox) mft = {...mft, ...mft.firefox};
+        else if (!isFirefox && mft.chrome) mft = {...mft, ...mft.chrome};
+        delete mft.chrome;
+        delete mft.firefox;
+
+        return JSON.stringify(mft);
+    }
+
     return gulp.src(paths.manifest)
         .pipe(plugins.jsonEditor({version}))
+        .pipe(gulpChange(performChange))
         .pipe(plugins.jsonminify())
         .pipe(gulp.dest(paths.dist));
 };
 
-const copyImages = () => {
-    return gulp.src(paths.icons)
-        .pipe(gulp.dest(paths.dist + '/icons'));
+const copyAssets = () => {
+    return gulp.src(paths.assets)
+        .pipe(gulp.dest(paths.dist + '/assets'));
 };
 
 const locales = done => {
@@ -199,9 +213,9 @@ const watch = () => {
     gulp.watch(getArray(paths.js), scripts);
     gulp.watch(getArray(paths.scss), styles);
     gulp.watch(getArray(paths.html), buildHtml);
+    gulp.watch(getArray(paths.assets), copyAssets);
     gulp.watch([paths.locales_dir + '**/*.json'], locales);
     gulp.watch(paths.manifest, copyManifest);
-    gulp.watch(getArray(paths.icons), copyImages);
     gulp.watch(getArray(paths.copyAsIs), copyAs);
     gulp.watch(getArray(paths.commands_watch_path || ''), custom_commands);
 };
@@ -213,7 +227,7 @@ const build = gulp.series(
         styles,
         copyAs,
         copyManifest,
-        copyImages,
+        copyAssets,
         locales,
         buildHtml,
         custom_commands

config/init/package.json

@@ -10,7 +10,9 @@
   },
   "scripts": {
     "start": "xt-build -e dev -w",
+    "start:firefox": "xt-build -e dev -p firefox -w",
     "build": "xt-build -e prod",
+    "build:firefox": "xt-build -e prod -p firefox",
     "clean": "xt-clean",
     "docs": "xt-docs",
     "test": "xt-test",

config/texts.js

@@ -146,6 +146,8 @@ exports.xtBuild = {
 
     watchArg: 'Enable watch',
 
+    platformArg: 'Platform',
+
     configFileArg: 'Path to configuration file, default: .xtbuild.json in root, or xtbuild in package.json)',
 
     onBuildSuccess: _ => (

package.json

@@ -63,6 +63,7 @@
     "foodoc": "^0.0.9",
     "globby": "^11.0.3",
     "gulp": "^4.0.2",
+    "gulp-change": "^1.0.2",
     "gulp-clean-css": "^4.3.0",
     "gulp-concat": "^2.6.1",
     "gulp-htmlmin": "^5.0.1",