Merge bed39ca into ca9a50d

hoodiehq · Nov 7, 2019 · 301be70 · 301be70
2 parents ca9a50d + bed39ca
commit 301be70
Show file tree

Hide file tree

Showing 23 changed files with 12,518 additions and 8,553 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ branches:
 jobs:
   include:
     - stage: test
-      node_js: 6
+      node_js: 8
       script: 
         - npm run test
         - npm run coverage

diff --git a/bin/setup.js b/bin/setup.js
@@ -13,14 +13,14 @@ if (isInstallIntoApp) {
 
   packageJson.scripts = packageJson.scripts || {}
 
-  if (packageJson.scripts[ 'start' ]) {
-    if (!(packageJson.scripts[ 'start' ].startsWith('hoodie'))) {
-      log.info('setup', 'start script already set to "' + packageJson.scripts[ 'start' ] +
+  if (packageJson.scripts.start) {
+    if (!(packageJson.scripts.start.startsWith('hoodie'))) {
+      log.info('setup', 'start script already set to "' + packageJson.scripts.start +
       ', you can start hoodie with "npm run start-hoodie" instead')
-      packageJson.scripts[ 'start-hoodie' ] = 'hoodie'
+      packageJson.scripts['start-hoodie'] = 'hoodie'
     }
   } else {
-    packageJson.scripts[ 'start' ] = 'hoodie'
+    packageJson.scripts.start = 'hoodie'
   }
 
   var newPackageJson = JSON.stringify(packageJson, null, 2)

diff --git a/cli/log.js b/cli/log.js
@@ -4,15 +4,15 @@ var log = require('npmlog')
 var headingPrefix = process.platform === 'darwin' ? emoji.get('dog') + '  ' : ''
 
 log.style = {
-  silly: {inverse: true, bold: true},
-  verbose: {fg: 'brightBlue', bold: true},
-  info: {fg: 'brightGreen', bold: true},
-  http: {fg: 'brightGreen', bold: true},
-  warn: {fg: 'brightYellow', bold: true},
-  error: {fg: 'brightRed', bold: true},
+  silly: { inverse: true, bold: true },
+  verbose: { fg: 'brightBlue', bold: true },
+  info: { fg: 'brightGreen', bold: true },
+  http: { fg: 'brightGreen', bold: true },
+  warn: { fg: 'brightYellow', bold: true },
+  error: { fg: 'brightRed', bold: true },
   silent: undefined
 }
-log.prefixStyle = {fg: 'magenta'}
+log.prefixStyle = { fg: 'magenta' }
 log.headingStyle = {}
 log.disp = {
   silly: 'Sill',