Merge branch 'master' into lecture/177

Anthony Gore · Anthony Gore · commit b4746ab83381 · 2018-04-16T17:31:32.000+07:00
diff --git a/README.md b/README.md
@@ -10,54 +10,49 @@ See the completed project here: [http://vuejs-calendar.vuejsdevelopers.com/](htt
 
 #### Pre-installation
 
-- Ensure [NPM](https://docs.npmjs.com) and [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) are installed on your system
+- Ensure [Node.js  >=5.10](https://nodejs.org/en/download/), [NPM](https://docs.npmjs.com) and [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) are installed on your system
 
 #### Installation
 
 1. Install this code on your local system
- 
-    **Option 1 (recommended)**
     
-    1. Fork this repository (see top right corner)
+    1. Fork this repository (click 'Fork' button in top right corner)
     2. Clone the forked repository on your local file system
     
         ```
         cd /path/to/install/location
         
-        git clone git@github.com:[your_username]/vuejs-calendar.git
-        ```
-    
-    **Option 2 (easier)**
-    
-    This option is better if you're not a Github user or are not sure how to setup SSH keys
-    
+        git clone https://github.com/[your_username]/vuejs-calendar.git
+        ```  
+   
+2. Change into directory
+
+    ```
+    cd vuejs-calendar
     ```
-    cd /path/to/install/location
     
-    git clone https://github.com/vuejsdevelopers/vuejs-calendar.git
-    ```    
-   
-2. Install dependencies
+3. Install dependencies
 
     ```
+    cd vuejs-calendar
     npm install
     ```
 
-3. Create a `.env` file by copying the sample
+4. Create a `.env` file by copying the sample
 
     ```
     cp .env_sample .env
     ```
     
     Edit the .env file and replace any variables if needed
     
-4. Start project
+5. Start project
 
     ```
     npm run start
     ```
 
-5. Your site will be available at *localhost:[PORT]* where `PORT` is whatever value is set in your `.env` file.
+Your site will be available at *localhost:[PORT]* where `PORT` is whatever value is set in your `.env` file.
 
 
 #### Lecture branches
diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
   "name": "vue-calendar",
-  "version": "1.0.0",
-  "description": "Ultimate Vue.js Developers Course",
+  "version": "1.1.0",
+  "description": "Ultimate Vue.js Developers Course - Vue.js Calendar",
   "main": "server.js",
-  "author": "Anthony Gore <info@getjsdojo.com>",
+  "author": "Anthony Gore <anthony@vuejsdevelopers.com>",
   "repository": {
     "type": "git",
     "url": "https://github.com/vuejsdevelopers/vuejs-calendar"
@@ -14,6 +14,9 @@
     "build": "rimraf dist && cross-env NODE_ENV=production webpack --config webpack.config.js --progress --hide-modules",
     "webpack-config-output": "rimraf tmp && mkdir tmp && cross-env NODE_ENV=production node ./scripts/webpack-config-output.js && cross-env NODE_ENV=development node ./scripts/webpack-config-output.js"
   },
+  "engines": {
+    "node": ">=5.10"
+  },
   "dependencies": {
     "body-parser": "~1.15.2",
     "cross-env": "~3.1.3",
@@ -31,11 +34,13 @@
     "axios": "^0.15.3",
     "babel-core": "~6.26.0",
     "babel-loader": "~6.4.1",
+    "babel-plugin-es6-promise": "~1.1.1",
     "babel-plugin-transform-es2015-destructuring": "~6.23.0",
     "babel-plugin-transform-runtime": "~6.23.0",
     "babel-preset-env": "~1.6.1",
     "cross-env": "~3.0.0",
     "css-loader": "~0.25.0",
+    "es6-promise": "~4.2.4",
     "extract-text-webpack-plugin": "~2.1.2",
     "file-loader": "~0.9.0",
     "js-object-pretty-print": "~0.2.0",
diff --git a/webpack.config.js b/webpack.config.js
@@ -18,7 +18,7 @@ var baseConfig = {
           loader: 'babel-loader',
           options: {
             "presets": [ [ "env" ] ],
-            "plugins": [ "transform-es2015-destructuring", "transform-runtime" ]
+            "plugins": [ "transform-es2015-destructuring", "transform-runtime", "es6-promise" ]
           }
         }],
         exclude: /node_modules/
@@ -107,4 +107,4 @@ let targets = [ 'web', 'node' ].map((target) => {
   return obj;
 });
 
-module.exports = targets;
+module.exports = targets;
