2.0.1

2.0.1 - 2017-04-11
------------------------------------------------------------
* Fixes #15 - rest/spread inside objects, e.g. `{ ...whatever }` should
now work
* Updates `.gitignore` to exclude files across the whole repo, so
starter kit `node_modules` can be built and tested locally
* Adds `yarn.lock`, as a starter point for Yarn bundling
* Adds default MIT license to `starter/files/package.json` and as a
default CLI choice, to match this repo
* Closes #12 - redundant `starter/files/package.json` entries and and
`json-loader` removed
* Adds `prop-types` NPM, and migrates from the deprecated
`React.PropTypes` style (still a known issue in react-router 4.0.0--
fixed in
remix-run/react-router@d601722f8515eea3910
bb3a69313f3f2fc37df16)
* Bumps NPM packages:
 react               ^15.4.2  →  ^15.5.3
 react-apollo         ^1.0.0  →   ^1.0.1
 react-dom           ^15.4.2  →  ^15.5.3
 react-helmet         ^5.0.2  →   ^5.0.3
 babel-core          ^6.24.0  →  ^6.24.1
 babel-preset-env     ^1.3.2  →   ^1.3.3
 babel-preset-react  ^6.23.0  →  ^6.24.1
 babel-register      ^6.24.0  →  ^6.24.1
 webpack              ^2.3.2  →   ^2.3.3

.gitignore

@@ -2,42 +2,42 @@
 **/.DS_Store
 
 # Logs
-logs
-*.log
-npm-debug.log*
+**/logs
+**/*.log
+**/npm-debug.log*
 
 # Runtime data
-pids
-*.pid
-*.seed
+**/pids
+**/*.pid
+**/*.seed
 
 # Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
+**/lib-cov
 
 # Coverage directory used by tools like istanbul
-coverage
+**/coverage
 
 # nyc test coverage
-.nyc_output
+**/.nyc_output
 
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
+**/.grunt
 
 # node-waf configuration
-.lock-wscript
+**/.lock-wscript
 
 # Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
+**/build/Release
 
 # Dependency directories
-node_modules
-jspm_packages
+**/node_modules
+**/jspm_packages
 
 # Optional npm cache directory
-.npm
+**/.npm
 
 # Optional REPL history
-.node_repl_history
+**/.node_repl_history
 
 # Distribution
-dist
+**/dist

CHANGELOG

@@ -1,3 +1,22 @@
+2.0.1 - 2017-04-11
+------------------------------------------------------------
+* Fixes #15 - rest/spread inside objects, e.g. `{ ...whatever }` should now work
+* Updates `.gitignore` to exclude files across the whole repo, so starter kit `node_modules` can be built and tested locally
+* Adds `yarn.lock`, as a starter point for Yarn bundling
+* Adds default MIT license to `starter/files/package.json` and as a default CLI choice, to match this repo
+* Closes #12 - redundant `starter/files/package.json` entries and and `json-loader` removed
+* Adds `prop-types` NPM, and migrates from the deprecated `React.PropTypes` style (still a known issue in react-router 4.0.0-- fixed in https://github.com/ReactTraining/react-router/commit/d601722f8515eea3910bb3a69313f3f2fc37df16)
+* Bumps NPM packages:
+ react               ^15.4.2  →  ^15.5.3
+ react-apollo         ^1.0.0  →   ^1.0.1
+ react-dom           ^15.4.2  →  ^15.5.3
+ react-helmet         ^5.0.2  →   ^5.0.3
+ babel-core          ^6.24.0  →  ^6.24.1
+ babel-preset-env     ^1.3.2  →   ^1.3.3
+ babel-preset-react  ^6.23.0  →  ^6.24.1
+ babel-register      ^6.24.0  →  ^6.24.1
+ webpack              ^2.3.2  →   ^2.3.3
+
 2.0.0 - 2017-04-10
 ------------------------------------------------------------
 * Adds CLI - no more manual git cloning!

cli/index.js

@@ -37,7 +37,7 @@ updateNotifier({ pkg: package, updateCheckInterval: 0 }).notify();
  Helper functions
 */
 
-// Show emoji only on supported platforms
+// Show emoji only on supported platforms.  Otherwise, backspace to erase.
 function emoji(ifSupported, ifNot='\b') {
   return os.type() === 'Darwin' ? `${ifSupported} ` : ifNot;
 }
@@ -52,7 +52,7 @@ ${msg}
   `.trim());
 }
 
-// Finished instructions.  Show the user how to use the starer kit
+// Finished instructions.  Show the user how to use the starter kit
 function finished(dir) {
   return `
 ${separator}
@@ -205,7 +205,7 @@ const args = yargs
           name: 'license',
           type: 'input',
           message: 'License?',
-          default: 'ISC',
+          default: 'MIT',
           validate: validate.license,
           when: validate.option(args.license, validate.license),
         },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactql",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Universal React+GraphQL starter kit: React, Apollo, Webpack 2, React Router 4, PostCSS, SSR",
   "main": "cli/index.js",
   "scripts": {

starter/files/kit/lib/apollo.js

@@ -2,7 +2,7 @@
 // IMPORTS
 
 // React propTypes
-import { PropTypes } from 'react';
+import PropTypes from 'prop-types';
 
 // Apollo client library
 import { createNetworkInterface, ApolloClient } from 'react-apollo';

starter/files/kit/views/ssr.js

@@ -4,7 +4,8 @@
 
 // ----------------------
 // IMPORTS
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 
 // ----------------------
 

starter/files/kit/webpack/base.js

@@ -85,12 +85,6 @@ export default new WebpackConfig().merge({
           },
         ],
       },
-
-      // .json files will become objects that we can use in JS, like any other
-      {
-        test: /\.json$/,
-        loader: 'json-loader',
-      },
     ],
   },
 

starter/files/kit/webpack/browser.js

@@ -72,6 +72,7 @@ export default new WebpackConfig().extend('[root]/base.js').merge({
                 'react',
               ],
               plugins: [
+                'transform-object-rest-spread',
                 'syntax-dynamic-import',
               ],
             },

starter/files/kit/webpack/server.js

@@ -110,6 +110,7 @@ export default new WebpackConfig().extend({
             'react',
           ],
           plugins: [
+            'transform-object-rest-spread',
             'syntax-dynamic-import',
           ],
         },

starter/files/package.json

@@ -1,8 +1,8 @@
 {
-  "name": "",
+  "name": "reactql-app",
   "version": "0.1.0",
   "description": "",
-  "license": "",
+  "license": "MIT",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "webpack --colors",
@@ -18,12 +18,13 @@
     "babel-eslint": "^7.2.1",
     "babel-loader": "^6.4.1",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
+    "babel-plugin-transform-object-rest-spread": "^6.23.0",
     "babel-polyfill": "^6.23.0",
     "babel-preset-env": "^1.3.2",
     "babel-preset-react": "^6.23.0",
     "babel-register": "^6.24.0",
     "chalk": "^1.1.3",
-    "compression-webpack-plugin": "^0.3.2",
+    "compression-webpack-plugin": "^0.4.0",
     "css-loader": "^0.28.0",
     "eslint": "^3.19.0",
     "eslint-config-airbnb": "^14.1.0",
@@ -35,13 +36,11 @@
     "extract-text-webpack-plugin": "^2.1.0",
     "file-loader": "^0.11.1",
     "image-webpack-loader": "^3.3.0",
-    "json-loader": "^0.5.4",
     "node-sass": "^4.5.2",
     "postcss-cssnext": "^2.10.0",
     "postcss-loader": "^1.3.3",
     "postcss-partial-import": "^3.1.1",
     "progress-bar-webpack-plugin": "^1.9.3",
-    "react-router-dom": "^4.0.0",
     "resolve-url-loader": "^2.0.2",
     "sass-loader": "^6.0.3",
     "style-loader": "^0.16.1",
@@ -59,6 +58,7 @@
     "less": "^2.7.2",
     "less-loader": "^4.0.3",
     "microseconds": "^0.1.0",
+    "prop-types": "^15.5.6",
     "react": "^15.4.2",
     "react-apollo": "^1.0.0",
     "react-dom": "^15.4.2",

starter/files/src/app.js

@@ -3,6 +3,7 @@
 
 // React
 import React from 'react';
+import PropTypes from 'prop-types';
 
 // GraphQL
 import { gql, graphql } from 'react-apollo';
@@ -41,8 +42,8 @@ const Page = ({ match }) => (
 // Specify PropTypes if the `match` object, which is injected to props by
 // the <Route> component
 Page.propTypes = {
-  match: React.PropTypes.shape({
-    params: React.PropTypes.object,
+  match: PropTypes.shape({
+    params: PropTypes.object,
   }).isRequired,
 };
 
@@ -92,9 +93,9 @@ const Message = ({ data }) => {
 // Add propTypes for React to expect data from GraphQL
 Message.propTypes = {
   data: mergeData({
-    allMessages: React.PropTypes.arrayOf(
-      React.PropTypes.shape({
-        text: React.PropTypes.string.isRequired,
+    allMessages: PropTypes.arrayOf(
+      PropTypes.shape({
+        text: PropTypes.string.isRequired,
       }).isRequired,
     ),
   }),