Separate css & js into text variants

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

gulpfile.js

@@ -1,6 +1,5 @@
 const { series, parallel, watch, src, dest } = require('gulp');
 const pump = require('pump');
-const fs = require('fs');
 const order = require('ordered-read-streams');
 
 const livereload = require('gulp-livereload');
@@ -13,57 +12,52 @@ const easyimport = require('postcss-easy-import');
 const autoprefixer = require('autoprefixer');
 const cssnano = require('cssnano');
 
-function serve(done) {
+const serve = (done) => {
     livereload.listen();
     done();
 }
 
-function hbs(done) {
+const hbs = (done) => {
     pump([
         src(['*.hbs', 'partials/**/*.hbs']),
         livereload()
     ], done);
 }
 
-function css(done) {
+const css = (variant) => (done) => {
     pump([
-        src('assets/css/main.css', { sourcemaps: true }),
+        src(`assets/css/${variant}/main.css`, { sourcemaps: true }),
         postcss([
             easyimport,
             autoprefixer(),
             cssnano()
         ]),
-        dest('assets/built/', { sourcemaps: '.' }),
+        dest(`assets/dist/${variant}/`, { sourcemaps: '.' }),
         livereload()
     ], done);
 }
 
-function getJsFiles(version) {
-    const jsFiles = [
-        src(`node_modules/@tryghost/shared-theme-assets/assets/js/${version}/lib/**/*.js`),
-        src(`node_modules/@tryghost/shared-theme-assets/assets/js/${version}/main.js`),
+const js = (variant) => (done) => {
+    const sources = [
+        src(`node_modules/@tryghost/shared-theme-assets/assets/js/v1/lib/**/*.js`),
+        src(`node_modules/@tryghost/shared-theme-assets/assets/js/v1/main.js`),
+        src(`assets/js/common/*.js`),
+        src(`assets/js/${variant}/main.js`)
     ];
 
-    if (fs.existsSync(`assets/js/lib`)) {
-        jsFiles.push(src(`assets/js/lib/*.js`));
-    }
-
-    jsFiles.push(src(`assets/js/main.js`));
-
-    return jsFiles;
-}
-
-function js(done) {
     pump([
-        order(getJsFiles('v1'), { sourcemaps: true }),
-        concat('main.min.js'),
+        order(sources, { sourcemaps: true }),
+        concat(`main.min.js`),
         uglify(),
-        dest('assets/built/', { sourcemaps: '.' }),
+        dest(`assets/dist/${variant}/`, { sourcemaps: '.' }),
         livereload()
     ], done);
 }
 
-function zipper(done) {
+const allCss = parallel(css('text'));
+const allJs = parallel(js('text'));
+
+const zipper = (done) => {
     const filename = require('./package.json').name + '.zip';
 
     pump([
@@ -83,10 +77,11 @@ function zipper(done) {
 }
 
 const hbsWatcher = () => watch(['*.hbs', 'partials/**/*.hbs'], hbs);
-const cssWatcher = () => watch('assets/css/**/*.css', css);
-const jsWatcher = () => watch('assets/js/**/*.js', js);
+const cssWatcher = () => parallel(watch('assets/css/**/*.css', allCss));
+const jsWatcher = () => parallel(watch('assets/js/**/*.js', allJs));
+
 const watcher = parallel(hbsWatcher, cssWatcher, jsWatcher);
-const build = series(css, js);
+const build = series(allCss, allJs);
 
 exports.build = build;
 exports.zip = series(build, zipper);