storyblok 3.10.0 → 3.10.4

package/.travis.yml

@@ -1,6 +1,5 @@
 language: node_js
 node_js:
-  - 10
-  - 12
+  - 14
 after_success:
-  - npx semantic-release
+  - npx semantic-release

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storyblok",
-  "version": "3.10.0",
+  "version": "3.10.4",
   "description": "A simple CLI to start Storyblok from your command line.",
   "keywords": [
     "storyblok",
@@ -21,24 +21,24 @@
   "author": "Dominik Angerer <dominikangerer1@gmail.com>, Alexander Feiglstorfer <delooks@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "axios": "^0.19.2",
+    "axios": "^0.21.1",
     "chalk": "^4.1.0",
     "clear": "0.1.0",
     "commander": "^5.1.0",
-    "fast-csv": "^4.3.1",
+    "fast-csv": "^4.3.6",
     "figlet": "^1.5.0",
     "form-data": "^3.0.0",
     "fs-extra": "^9.0.1",
-    "github-download": "^0.5.0",
+    "git-clone": "^0.1.0",
     "inquirer": "^7.3.2",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.21",
     "netrc": "0.1.4",
     "on-change": "^2.0.1",
-    "opn": "^6.0.0",
+    "open": "^6.0.0",
     "p-series": "^2.1.0",
     "path": "^0.12.7",
-    "storyblok-js-client": "^2.5.2",
-    "update-notifier": "^4.1.0",
+    "storyblok-js-client": "^3.3.1",
+    "update-notifier": "^5.1.0",
     "xml-js": "^1.6.11"
   },
   "engines": {

package/src/tasks/quickstart.js

@@ -1,4 +1,4 @@
-const opn = require('opn')
+const open = require('open')
 const chalk = require('chalk')
 const lastStep = require('../utils/last-step')
 
@@ -79,7 +79,7 @@ const quickstart = async (api, answers, spaceId) => {
     console.log(`${chalk.green('✓')} - Starting Storyblok in your browser`)
 
     setTimeout(() => {
-      opn('http://' + answers.spaceDomain + '/_quickstart?quickstart=' + answers.loginToken)
+      open('http://' + answers.spaceDomain + '/_quickstart?quickstart=' + answers.loginToken)
       process.exit(0)
     }, 2000)
   } catch (e) {

package/src/tasks/sync.js

@@ -272,7 +272,11 @@ const SyncSpaces = {
 const sync = (types, options) => {
   SyncSpaces.init(options)
 
-  const tasks = types.map(_type => {
+  const tasks = types.sort((a, b) => {
+    if (a === 'folders') return -1
+    if (b === 'folders') return 1
+    return 0
+  }).map(_type => {
     const command = `sync${capitalize(_type)}`
 
     return () => SyncSpaces[command]()

package/src/utils/last-step.js

@@ -2,7 +2,7 @@
 
 const fs = require('fs')
 const chalk = require('chalk')
-const ghdownload = require('github-download')
+const ghdownload = require('git-clone')
 const replace = require('./replace')
 
 const getFinalStep = type => {
@@ -48,8 +48,8 @@ const lastStep = answers => {
 
     console.log(chalk.green('✓') + ' - The github repository ' + gitRepo + ' will be cloned now...')
 
-    ghdownload(gitRepo, outputDir)
-      .on('error', function (err) {
+    ghdownload(gitRepo, outputDir, async (err) => {
+      if(err) {
         if (err.code === 'ENOTEMPTY') {
           console.log(chalk.red('  Oh Snap! It seems that you already have a project with the name: ' + name))
           reject(new Error('This repository already has been cloned'))
@@ -62,8 +62,7 @@ const lastStep = answers => {
         console.log(chalk.red('X Don\'t forget to mark it with the tag `storyblok` so will can find it.'))
 
         return reject(err)
-      })
-      .on('end', async function () {
+      } else {
         const finalStep = getFinalStep(type)
 
         console.log(chalk.green('✓') + ' - ' + chalk.white('Your Storyblok project is ready for you!'))
@@ -101,7 +100,8 @@ const lastStep = answers => {
         } catch (e) {
           return reject(new Error('An error occurred when finish the download repository task ' + e.message))
         }
-      })
+      }
+    })
   })
 }