2.3.0

2.3.0 - 2017-04-29
------------------------------------------------------------
* Closes #32 - adds choice for Javascript or Typescript flavoured kit
* Improves formatting of new project's `package.json`
* Bumps NPM:
 fs-extra  ^2.1.2  →  ^3.0.0
 yargs  ^7.0.2  →  ^7.1.0
 yauzl  ^2.7.0  →  ^2.8.0

Author: leebenson

CHANGELOG

@@ -1,3 +1,16 @@
+2.3.0 - 2017-04-29
+------------------------------------------------------------
+* Closes #32 - adds choice for Javascript or Typescript flavoured kit
+* Improves formatting of new project's `package.json`
+* Bumps NPM:
+ fs-extra  ^2.1.2  →  ^3.0.0
+ yargs  ^7.0.2  →  ^7.1.0
+ yauzl  ^2.7.0  →  ^2.8.0
+
+2.2.2 - 2017-04-16
+------------------------------------------------------------
+* Defaults to 'UNLICENSED' when creating a new starter kit
+
 2.2.1 - 2017-04-16
 ------------------------------------------------------------
 * Removes redundant root files (README.md, CHANGELOG, LICENSE) from extracted starter kit

cli/index.js

@@ -123,8 +123,8 @@ const validate = {
 
   // Project description.  Accept any character, max length 32
   license(val) {
-    if (!/^none$/i.test(val) && !spdx.valid(val)) {
-      return 'Invalid license. Enter "None" if none.';
+    if (!/^UNLICENSED$/.test(val) && !spdx.valid(val)) {
+      return 'Invalid license. Enter "UNLICENSED" if not licensed.';
     }
 
     return true;
@@ -202,7 +202,7 @@ const args = yargs
           name: 'license',
           type: 'input',
           message: 'License?',
-          default: 'MIT',
+          default: 'UNLICENSED',
           validate: validate.license,
           when: validate.option(args.license, validate.license),
         },
@@ -219,6 +219,21 @@ const args = yargs
           validate: validate.path,
           when: validate.option(args.path, validate.path),
         },
+        {
+          name: 'repo',
+          type: 'list',
+          message: 'Which version of the kit would you like?',
+          choices: [
+            {
+              name: 'Javascript (ES6)',
+              value: 'kit',
+            },
+            {
+              name: 'Typescript',
+              value: 'kit.ts',
+            },
+          ]
+        }
       ];
 
       // Once questions have been answered, we'll have an `answers` object
@@ -243,7 +258,7 @@ const args = yargs
 
         // Download the .zip containing the kit's source code
         request
-          .get('https://github.com/reactql/kit/archive/master.zip')
+          .get(`https://github.com/reactql/${args.repo}/archive/master.zip`)
           .pipe(
             file.on('finish', () => {
               console.log('Extracting archive...');
@@ -294,11 +309,17 @@ const args = yargs
                   const pkgJsonFile = path.resolve(args.path, 'package.json');
                   const pkgJson = require(pkgJsonFile);
 
-                  fse.writeJsonSync(pkgJsonFile, Object.assign(pkgJson, {
-                    name: args.name,
-                    description: args.desc,
-                    license: args.license,
-                  }));
+                  fse.writeJsonSync(
+                    pkgJsonFile,
+                    Object.assign(pkgJson, {
+                      name: args.name,
+                      description: args.desc,
+                      license: args.license,
+                    }),
+                    {
+                      spaces: 2,
+                    }
+                  );
 
                   // Remove root files that irrelevant to the new project
                   ['README.md', 'CHANGELOG', 'LICENSE'].forEach(file => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactql",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "description": "Universal React+GraphQL starter kit: React, Apollo, Webpack 2, React Router 4, PostCSS, SSR",
   "main": "cli/index.js",
   "scripts": {
@@ -39,15 +39,15 @@
     "chalk": "^1.1.3",
     "command-exists": "^1.2.2",
     "cross-spawn": "^5.1.0",
-    "fs-extra": "^2.1.2",
+    "fs-extra": "^3.0.0",
     "inquirer": "^3.0.6",
     "mkdirp": "^0.5.1",
     "request": "^2.81.0",
     "spdx": "^0.5.1",
     "temp": "^0.8.3",
     "update-notifier": "^2.1.0",
-    "yargs": "^7.0.2",
-    "yauzl": "^2.7.0"
+    "yargs": "^7.1.0",
+    "yauzl": "^2.8.0"
   },
   "devDependencies": {
     "eslint": "^3.19.0",

yarn.lock

@@ -645,12 +645,13 @@ form-data@~2.1.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
-fs-extra@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.1.2.tgz#046c70163cef9aad46b0e4a7fa467fb22d71de35"
+fs-extra@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.0.tgz#244e0c4b0b8818f54040ec049d8a2bddc1202861"
   dependencies:
     graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
+    jsonfile "^3.0.0"
+    universalify "^0.1.0"
 
 fs.realpath@^1.0.0:
   version "1.0.0"
@@ -726,7 +727,7 @@ got@^6.7.1:
     unzip-response "^2.0.1"
     url-parse-lax "^1.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
@@ -979,9 +980,9 @@ json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
-jsonfile@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+jsonfile@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.0.tgz#92e7c7444e5ffd5fa32e6a9ae8b85034df8347d0"
   optionalDependencies:
     graceful-fs "^4.1.6"
 
@@ -1002,12 +1003,6 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.3.6"
 
-klaw@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
-  optionalDependencies:
-    graceful-fs "^4.1.9"
-
 latest-version@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
@@ -1317,7 +1312,7 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-readable-stream@^2.1.5, readable-stream@^2.2.2:
+readable-stream@^2.2.2:
   version "2.2.9"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
   dependencies:
@@ -1624,13 +1619,6 @@ text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
-through2@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  dependencies:
-    readable-stream "^2.1.5"
-    xtend "~4.0.1"
-
 through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -1681,6 +1669,10 @@ unique-string@^1.0.0:
   dependencies:
     crypto-random-string "^1.0.0"
 
+universalify@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.0.tgz#9eb1c4651debcc670cc94f1a75762332bb967778"
+
 unzip-response@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
@@ -1780,7 +1772,7 @@ xdg-basedir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
 
-xtend@^4.0.0, xtend@~4.0.1:
+xtend@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
@@ -1798,9 +1790,9 @@ yargs-parser@^5.0.0:
   dependencies:
     camelcase "^3.0.0"
 
-yargs@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.0.2.tgz#115b97df1321823e8b8648e8968c782521221f67"
+yargs@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
   dependencies:
     camelcase "^3.0.0"
     cliui "^3.2.0"
@@ -1816,9 +1808,9 @@ yargs@^7.0.2:
     y18n "^3.2.1"
     yargs-parser "^5.0.0"
 
-yauzl@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.7.0.tgz#e21d847868b496fc29eaec23ee87fdd33e9b2bce"
+yauzl@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.8.0.tgz#79450aff22b2a9c5a41ef54e02db907ccfbf9ee2"
   dependencies:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.0.1"