Merge branch 'master' into yarn

* master:
  ls-starter-kyts (#340)
  cleans up the package.jsons (#352)

# Conflicts:
#	packages/kyt-utils/package.json

e2e_tests/tests/cli.test.js

@@ -2,19 +2,20 @@ const path = require('path');
 const fs = require('fs');
 const shell = require('shelljs');
 const kill = require('../utils/psKill');
-
-// Explicitly set to "npm" until yarn 0.18 (https://github.com/yarnpkg/yarn/pull/1498) is released
-// const ypm = require('../../packages/kyt-utils/yarnOrNpm')();
-const ypm = 'npm';
+const ypm = require('../../packages/kyt-cli/utils/yarnOrNpm')();
 
 const pkgJsonPath = path.join(__dirname, './../pkg.json');
 
 describe('KYT CLI', () => {
+  beforeAll(() => {
+    shell.rm('-rf', 'cli-test');
+    shell.rm('-rf', 'test-packages');
+  });
   it('installs kyt', () => {
     // create test packages
     shell.mkdir('test-packages');
     shell.exec('cp -r ./packages/kyt-utils ./test-packages');
-    shell.exec('cp -r ./packages/kyt-core ./test-packages/');
+    shell.exec('cp -r ./packages/kyt-core ./test-packages');
     shell.exec('cp -r ./packages/kyt-cli ./test-packages');
     // Update package Json to point to local kyt-utils
     const utilsPath = 'file:../kyt-utils';

package.json

@@ -3,6 +3,11 @@
   "version": "0.0.0",
   "description": "<p align=\"center\"><img src=\"/images/kyt-logo-large.png\"></p>",
   "main": "index.js",
+  "author": "NYTimes",
+  "license": "Apache-2.0",
+  "repository": "git+https://github.com/nytimes/kyt",
+  "bugs": "https://github.com/nytimes/kyt/issues",
+  "homepage": "https://github.com/nytimes/kyt#readme",
   "directories": {
     "doc": "docs"
   },
@@ -11,7 +16,9 @@
       "<rootDir>/packages/starter-kyts",
       "<rootDir>/e2e_tests"
     ],
-    "collectCoverageFrom": ["**/*.js"],
+    "collectCoverageFrom": [
+      "**/*.js"
+    ],
     "coveragePathIgnorePatterns": [
       "<rootDir>/node_modules",
       "<rootDir>/packages/*/node_modules",
@@ -26,22 +33,12 @@
     "test": "jest",
     "test-watch": "jest --watch",
     "test-coverage": "jest --coverage",
-    "e2e": "jest --config ./e2e_tests/jest.config.json --verbose --no-cache",
+    "e2e": "jest -i --config ./e2e_tests/jest.config.json --verbose --no-cache",
     "lint": "packages/eslint-config-kyt/node_modules/.bin/eslint ./"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/NYTimes/kyt.git"
-  },
-  "author": "",
-  "license": "Apache-2.0",
-  "bugs": {
-    "url": "https://github.com/NYTimes/kyt/issues"
-  },
-  "homepage": "https://github.com/NYTimes/kyt#readme",
   "dependencies": {
+    "jest": "18.1.0",
     "ps-tree": "1.1.0",
-    "shelljs": "0.7.5",
-    "jest": "16.0.1"
+    "shelljs": "0.7.5"
   }
 }

packages/babel-presets/babel-preset-kyt-core/package.json

@@ -1,10 +1,13 @@
 {
   "name": "babel-preset-kyt-core",
   "version": "0.1.0-alpha.1",
-  "description": "an opinionated babel preset, best used with kyt",
+  "description": "An opinionated babel preset, best used with kyt",
   "main": "lib/index.js",
   "author": "NYTimes",
   "license": "Apache-2.0",
+  "repository": "git+https://github.com/nytimes/kyt/packages/kyt-babel-preset-core",
+  "bugs": "https://github.com/nytimes/kyt/issues",
+  "homepage": "https://github.com/nytimes/kyt#readme",
   "dependencies": {
     "babel-plugin-transform-es2015-modules-commonjs": "6.16.0",
     "babel-plugin-transform-runtime": "6.15.0",