gulp-blok - npm Package Compare versions

Comparing version 1.0.5 to 1.1.0

index.js

@@ -1,11 +0,11 @@
-var through = require('through2'),
-  gutil = require('gulp-util'),
-  path = require('path'),
-  isBinaryFile = require('isbinaryfile'),
-  unirest = require('unirest'),
-  PluginError = gutil.PluginError,
-  blok = {},
-  config = {},
-  PLUGIN_NAME = 'gulp-blok'
-  queue = [];
+var through = require('through2');
+var gutil = require('gulp-util');
+var path = require('path');
+var isBinaryFile = require('isbinaryfile');
+var unirest = require('unirest');
+var PluginError = gutil.PluginError;
+var blok = {};
+var config = {};
+var PLUGIN_NAME = 'gulp-blok';
+var queue = [];
 
@@ -17,10 +17,20 @@ // Set up blok API information
 blok._apiCall = function(method, props, callback) {
-  var req = unirest(method, 'https://' + config.options.url + '/api-v1/theme/' + config.options.themeId);
+  var params = {}
 
-  req.headers({
-    'x-api-key': config.options.apiKey
-  });
+  if (config.options.apiVersion > 1) {
+    var req = unirest(method, 'https://api.storyblok.com/v1/spaces/' + config.options.themeId + '/templates/create_or_update');
 
+    params.template = props
+    params.token = config.options.apiKey
+  } else {
+    var req = unirest(method, 'https://' + config.options.url + '/api-v1/theme/' + config.options.themeId);
+    var params = props
+
+    req.headers({
+      'x-api-key': config.options.apiKey
+    });
+  }
+
   req.type('json');
-  req.send(props);
+  req.send(params);
   req.end(callback);
@@ -113,34 +123,39 @@ }
 
-  var key = blok._makeAssetKey(filepath, 'dist');
+  var key = blok._makeAssetKey(filepath, config.options.basePath || 'dist');
   var isBinary = isBinaryFile(filepath);
-  var props = {
-    filepath: key
-  };
+  var props = {};
   var contents = file.contents;
 
+  if (config.options.apiVersion > 1) {
+    props.path = key
+  } else {
+    props.filepath = key
+  }
+
   if (isBinary) {
-      props.attachment = contents.toString('base64');
+    props.attachment = contents.toString('base64');
+    props.type = 'binary_asset';
   } else {
-      props.body = contents.toString();
+    props.body = contents.toString();
 
-      var keyParts = key.split('.');
-      var lastPart = keyParts[keyParts.length - 1];
+    var keyParts = key.split('.');
+    var lastPart = keyParts[keyParts.length - 1];
 
-      if (['js', 'css', 'svg', 'json'].indexOf(lastPart) > -1) {
-          gutil.log(gutil.colors.green('Found js/css/svg/json'));
-          props.type = 'asset';
-      }
+    if (['js', 'css', 'svg', 'json'].indexOf(lastPart) > -1) {
+      gutil.log(gutil.colors.green('Found js/css/svg/json'));
+      props.type = 'asset';
+    }
   }
 
   function onUpdate(res) {
-      var index = queue.indexOf(filepath);
-      queue.splice(index, 1);
+    var index = queue.indexOf(filepath);
+    queue.splice(index, 1);
 
-      if (res.error) {
-        gutil.log(gutil.colors.red('Error uploading file ' + JSON.stringify(res.body)));
-      } else if (!res.error) {
-        gutil.log(gutil.colors.green('File "' + key + '" uploaded.'));
-      }
+    if (res.error) {
+      gutil.log(gutil.colors.red('Error uploading file ' + JSON.stringify(res.error) + (res.body ? JSON.stringify(res.body) : '') ));
+    } else if (!res.error) {
+      gutil.log(gutil.colors.green('File "' + key + '" uploaded.'));
+    }
 
-      done();
+    done();
   }
@@ -174,8 +189,17 @@
   }
-  if (!options.hasOwnProperty('url')) {
-    throw new PluginError(PLUGIN_NAME, 'Error, url for blok does not exist!');
+
+  if (!options.hasOwnProperty('apiVersion')) {
+    options.apiVersion = 1
   }
+
+  if (options.apiVersion != 2) {
+    if (!options.hasOwnProperty('url')) {
+      throw new PluginError(PLUGIN_NAME, 'Error, url for blok does not exist!');
+    }
+  }
+
   if (!options.hasOwnProperty('themeId')) {
     throw new PluginError(PLUGIN_NAME, 'Error, themeId for blok does not exist!');
   }
+
   if (options.hasOwnProperty('uploadDone')) {
@@ -182,0 +206,0 @@ uploadDoneCb = options['uploadDone'];

package.json

 {
   "name": "gulp-blok",
-  "version": "1.0.5",
+  "version": "1.1.0",
   "description": "Tool to publish blok templates and assets",
@@ -5,0 +5,0 @@ "main": "index.js",

No alert changes

Improved metrics

Total package byte prevSize

6580

increased by10%

Lines of code

195

increased by9.55%

No dependency changes