@madebyseed/seed-cli-tools 2.1.1 → 2.2.1

package/lib/tasks/build-js.js

@@ -16,10 +16,6 @@ var chokidar = require('chokidar');
 
 var minify = composer(uglifyjs, console);
 
-var gulpWebpack = require('webpack-stream');
-
-var webpack = require('webpack');
-
 var utils = require("./includes/utilities");
 
 var config = require('./includes/config.js');
@@ -30,7 +26,9 @@ function processThemeJs() {
   messages.logProcessFiles('build:js');
   return gulp.src([config.roots.js, "!".concat(config.roots.vendorJs)], {
     allowEmpty: true
-  }).pipe(plumber(utils.errorHandler)).pipe(gulpif(config.usesModuleBundler, gulpWebpack(config.plugins.webpack, webpack), include())).pipe(gulpif(config.optimize && !config.usesModuleBundler, minify())).pipe(gulp.dest(config.dist.assets));
+  }).pipe(plumber(utils.errorHandler)).pipe(include({
+    separateInputs: true
+  })).pipe(gulpif(config.optimize && !config.usesModuleBundler, minify())).pipe(gulp.dest(config.dist.assets));
 }
 
 function processVendorJs() {

package/lib/tasks/build-utils.js

@@ -17,7 +17,7 @@ var utils = require("./includes/utilities.js");
 var messages = require("./includes/messages.js");
 
 var assetsPaths = [config.src.assets, config.src.templates, config.src.sections, config.src.snippets, config.src.blocks, config.src.locales, config.src.config, config.src.layout];
-var themeSettingsAssets = [config.tmp.templates, config.tmp.config];
+var themeSettingsAssets = [config.tmp.templates, config.tmp.config, config.tmp.sectionsJson, config.tmp.blocksJson, config.tmp.locales];
 /**
  * Copies files from one fold to another, creating a new dir if doesn't exists and
  * overwriting if it does exist

package/lib/tasks/includes/config.js

@@ -95,7 +95,9 @@ var config = {
     templates: "tmp/templates/**/*",
     snippets: "tmp/snippets/*",
     sections: "tmp/sections/*",
+    sectionsJson: "tmp/sections/*.json",
     blocks: "tmp/blocks/*",
+    blocksJson: "tmp/blocks/*.json",
     locales: "tmp/locales/*",
     config: "tmp/config/*",
     layout: "tmp/layout/*",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@madebyseed/seed-cli-tools",
-  "version": "2.1.1",
+  "version": "2.2.1",
   "description": "Seed CLI Tools",
   "main": "index.js",
   "scripts": {
@@ -8,6 +8,7 @@
     "start": "npm run clean && babel -w -d lib/ src/",
     "test": "npm run lint",
     "prepublish": "npm test && npm run clean && babel -d lib/ src/",
+    "dev": "npm run prepublish && npm link",
     "lint": "eslint --max-warnings 0 src/",
     "lint-allow-warning": "eslint src/"
   },
@@ -56,5 +57,5 @@
     "webpack-stream": "^7.0.0",
     "yargs": "^17.0.1"
   },
-  "gitHead": "adebf3adcf1cafaf15ce55333cf72535489cd06b"
+  "gitHead": "bf1fc8efec7921816461f48b7c8f5fae70bb6a64"
 }

package/src/tasks/build-js.js

@@ -6,8 +6,7 @@ const include = require('gulp-include');
 const plumber = require('gulp-plumber');
 const chokidar = require('chokidar');
 const minify = composer(uglifyjs, console)
-const gulpWebpack = require('webpack-stream');
-const webpack = require('webpack');
+
 
 const utils = require("./includes/utilities");
 const config = require('./includes/config.js');
@@ -15,9 +14,10 @@ const messages = require('./includes/messages.js');
 
 function processThemeJs() {
   messages.logProcessFiles('build:js');
+
   return gulp.src([config.roots.js, `!${config.roots.vendorJs}`], { allowEmpty: true })
     .pipe(plumber(utils.errorHandler))
-    .pipe(gulpif(config.usesModuleBundler, gulpWebpack(config.plugins.webpack, webpack), include()))
+    .pipe(include({ separateInputs: true }))
     .pipe(gulpif(config.optimize && !config.usesModuleBundler, minify()))
     .pipe(gulp.dest(config.dist.assets))
 }

package/src/tasks/build-utils.js

@@ -19,7 +19,13 @@ const assetsPaths = [
   config.src.layout,
 ];
 
-const themeSettingsAssets = [config.tmp.templates, config.tmp.config];
+const themeSettingsAssets = [
+  config.tmp.templates,
+  config.tmp.config,
+  config.tmp.sectionsJson,
+  config.tmp.blocksJson,
+  config.tmp.locales
+];
 
 /**
  * Copies files from one fold to another, creating a new dir if doesn't exists and

package/src/tasks/includes/config.js

@@ -90,7 +90,9 @@ const config = {
     templates: "tmp/templates/**/*",
     snippets: "tmp/snippets/*",
     sections: "tmp/sections/*",
+    sectionsJson: "tmp/sections/*.json",
     blocks: "tmp/blocks/*",
+    blocksJson: "tmp/blocks/*.json",
     locales: "tmp/locales/*",
     config: "tmp/config/*",
     layout: "tmp/layout/*",