Merged release/1.0.0-beta into master

Author: piotrwitek

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
   "typescript.tsdk": "./node_modules/typescript/lib"
-}
+}

README.md

@@ -1,40 +1,36 @@
 ## HTTP Dev-Server with Hot-Reload for JavaScript (ES6 Modules)
 
-#### This library consist of:
-#### - Express HTTP Server enhanced with WebSocket emitter on file changes
-#### - SystemJS - ES6 Module Loader
-#### - WebSocket receiver for browser that trigger Hot-Reload for changed ES6 Modules
+#### Express Server ehnanced with Chokidar WebSocket Server emitting events on file changes
 
 - Npm package: https://www.npmjs.com/package/jspm-hmr
 - ReactJS Boilerplate using this dev-server - https://github.com/piotrwitek/react-redux-typescript-starter-kit
 
 ---
 
 ### Features
-- Quickly Bootstrap new Babel or TypeScript App using nice CLI Wizard - include Dev Server with Hot-Reload using SystemJS & JSPM
-- Fast & Scalable Hot-Reload Capabilities (perfect for ReactJS, Angular2, Vue & more...)
-- Live-reload static resources like styles (CSS, SCSS), images, fonts or HTML templates through [SystemJS Plugins Ecosystem](https://github.com/systemjs/systemjs#plugins)
-- Leveraging [SystemJS](https://github.com/systemjs/systemjs) for Universal Module Loading Support
+- Fast Hot-Reload - using [systemjs-hot-reloader](https://github.com/capaj/systemjs-hot-reloader)
+- Live-reload static files (e.g. styles (CSS/SCSS), images, fonts or HTML templates) through [SystemJS Plugins Ecosystem](https://github.com/systemjs/systemjs#plugins)
+- Universal Module Loading with [SystemJS](https://github.com/systemjs/systemjs)
+- Initialize minimal App with Babel or TypeScript transpilation workflow using CLI Wizard (including Hot-Reload configuration)
 
 ---
 
 ### Quick Start
-Includes:
-- Bootstrap Minimal App Boilerplate with fancy CLI Wizard
-- Transpilation workflow setup to choose: Babel or TypeScript
+- Bootstrap Minimal App Boilerplate guided by CLI Wizard
+- Transpilation workflow setup: choose Babel or TypeScript
 
 > __Tip:__ Confirm all Wizard Questions with Enter for default __Babel__ setup
 
-##### _ONE-LINE-COMMAND_
+##### _ONE-LINER_
 ```
 npm i jspm@beta jspm-hmr -D && ./node_modules/.bin/jspm init && ./node_modules/.bin/jspm i systemjs-hot-reloader && ./node_modules/.bin/jspm-hmr -I && npm start
 ```
 
-Now you can open `app.js` or `es6module.js` file, make some changes and save it to see __Hot-Reload__ update running application without page refresh!
+Now open `app.js` or `es6module.js` file from `src`, make some changes and save to see __Hot-Reload__ updates in running application without page reload!
 
 ---
 
-### Project setup
+### Project prerequisite
 
 - http://jspm.io - package manager and bundler for JS apps (webpack alternative)  
 `npm i jspm@beta -D`
@@ -49,7 +45,7 @@ Now you can open `app.js` or `es6module.js` file, make some changes and save it
 $ npm i jspm-hmr -D
 ```
 
-> __Tip:__ You can install it globally using -g flag so you can use it as simple http server in any directory on your machine
+> __Tip:__ You can install this module globally using -g flag and use it as a simple static http server in any folder on your machine
 
 > __Pro-Tip:__ You can use --init flag to initialize your project with index.html, app.js, server.js files - configured with hot-module-reload out-of-the-box
 
@@ -61,50 +57,55 @@ $ jspm-hmr [path] [options]
 ```
  Options:
 
-    -h, --help             output usage information
-    -V, --version          output the version number
-    -i, --init             CLI Wizard to bootstrap your project
-    -o, --open             automatically open browser (default: false)
-    -p, --port <number>    port number (default: 8888)
-    -c, --cache <seconds>  enable Cache-Control with max-age=<seconds> (default: -1)
-    -P, --proxy <url>      proxies requests to specified url    
-    -S, --ssl              enables https (by default uses built-in self-signed cert)
-    -K, --key <path>       path to ssl-key .pem file (overrides default key)
-    -C, --cert <path>      path to ssl-cert .pem file (overrides default cert)
+    -h, --help                      output usage information
+    -V, --version                   output the version number
+    -i, --init                      CLI Wizard to bootstrap your project
+    -o, --open                      automatically open browser (default: false)
+    -p, --port <number>             port number (default: 3000)
+    -a, --address <address>         custom address (default: localhost)
+    -c, --cache <seconds>           enable Cache-Control with max-age=<seconds> (default: -1)
+    -P, --proxy <address>:<port>    proxies requests to specified target
+    --proxy-route <route_path>      proxies only requests that match route path (default: *)
+    -S, --ssl                       enables https (by default uses built-in self-signed cert)
+    -K, --key <path>                path to ssl-key .pem file (overrides default key)
+    -C, --cert <path>               path to ssl-cert .pem file (overrides default cert)
+    -F, --fallback <rewrite_target> enable HTML5 History Api Fallback (/index.html)
+    --verbose                       more logging messages for: fallback
+    --disable-hmr                   disable Hot-Reload (Chokidar Socket Server)
 ---
 
 ### Examples:
 
-- Start dev server in PWD  on port "4444" & automatically open in browser (last active window takes precedence)
+- Start dev server in `pwd` on port "4444" & automatically open in browser (last active window takes precedence)
 ```
 $ jspm-hmr . --port 4444 --open
 ```
 
-- Start dev server in directory "dist" with caching set to "3600 sec" and proxy target set to "http://localhost:1234"
+- Start dev server in directory "dist" with caching set to "3600 sec" and proxy target set to "http://localhost:1234" with proxy route pattern equal to `/api/`
 ```
-$ jspm-hmr dist  --cache 3600 --proxy http://localhost:1234
+$ jspm-hmr dist  --cache 3600 --proxy http://localhost:1234 --proxy-route /api/
 ```
 
 - Start dev server in directory "dist" with https using built-in self-signed cert
 ```
 $ jspm-hmr dist --ssl
 ```
 
+- Start dev server in `pwd` with HTML5 History Api Fallback
+```
+$ jspm-hmr --fallback 
+```
+
 ---
 
 ### How it works
-Watches specified files for changes in chosen path and emits events through web sockets on changes to your client to reload that particular JavaScript modules that has changed.
-`-i` or `--init` flag will run CLI Wizard to bootstrap your `index.html`, `app.js` and `server.js` in your project folder with Dev Server and Hot-Reload configuration for quick start.
-
-It uses great [systemjs-hot-reloader](https://github.com/capaj/systemjs-hot-reloader) for Client and [chokidar-socket-emitter](https://github.com/capaj/chokidar-socket-emitter) for Dev Server.
-
----
+Chokidar process on dev server watches specified path for file changes and emits events through web socket to the browser web socket client to reload that particular JavaScript module that has been changed.
 
-### Dependencies:
-- [http-server](https://github.com/indexzero/http-server)
-- [chokidar-socket-emitter](https://github.com/capaj/chokidar-socket-emitter)
+Uses:
+- [systemjs-hot-reloader](https://github.com/capaj/systemjs-hot-reloader) for WebSocket Client
+- [chokidar-socket-emitter](https://github.com/capaj/chokidar-socket-emitter) for WebSocket Server
 
-### Peer Dependencies:
+### Mandatory Peer Dependencies:
 - [jspm](https://github.com/jspm/jspm-cli)
 - [systemjs-hot-reloader](https://github.com/capaj/systemjs-hot-reloader)
 

boilerplate/index.html

@@ -3,10 +3,10 @@
 
 <head>
 	<meta charset="utf-8">
-	<meta name="description" content="">
+	<meta name="description" content>
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 	<title>jspm-hmr</title>
-	<link rel="stylesheet" href="assets/loader-style.css">
+	<link href="assets/loader-style.css" rel="stylesheet">
 </head>
 
 <body>
@@ -31,7 +31,7 @@
 	<script type="text/javascript">
     SystemJS.import('systemjs-hot-reloader').then(function(HotReloader) {
       // if you're running server on custom port please remember to update below
-      new HotReloader.default('http://localhost:8888');
+      new HotReloader.default('http://localhost:3000');
     });
     // load main module of your app with SystemJS
     SystemJS.trace = true;
@@ -40,4 +40,4 @@
 	<!-- loading-app:end -->
 </body>
 
-</html>
+</html>

boilerplate/server.js

@@ -1,7 +1,23 @@
 'use strict';
 const jspmHmrServer = require('jspm-hmr');
+
 const options = {
-  open: true
+  fallback: '/index.html',
 };
 
-jspmHmrServer.start(options);
+// SERVER
+const server = jspmHmrServer.createServer(options);
+
+server
+  .listen(3000, (err) => {
+    console.log('[debug] %j', server.address());
+    console.log('\n>>> hit CTRL-C twice to exit <<<\n');
+  })
+  .on('error', function (err) {
+    if (err.code === 'EADDRINUSE') {
+      console.log(`\n[WARNING] Selected address is in use: ${URL}`);
+      console.log(`[WARNING] Please try again using different port or address...\n`);
+
+      process.exit();
+    }
+  });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jspm-hmr",
-  "version": "0.7.1",
+  "version": "1.0.0-0",
   "description": "HOT-RELOAD & DEV-SERVER for Vanilla JavaScript (ES6 Modules) - powered by SystemJS & JSPM",
   "author": "Piotr Witek <[email protected]> (http://piotrwitek.github.io)",
   "repository": "https://github.com/piotrwitek/jspm-hmr",
@@ -17,35 +17,41 @@
     "node": ">=4"
   },
   "scripts": {
-    "precommit": "npm run lint",
-    "prepush": "npm run check & npm test",
+    "precommit": "yarn run lint",
+    "prepush": "yarn run check & yarn test",
     "prepublishOnly": "yarn run reinstall && yarn run check && yarn run test && yarn run build",
-    "reinstall": "shx rm -rf node_modules/ && yarn install",
+    "clean": "shx rm -rf node_modules/",
+    "reinstall": "yarn run clean && yarn install",
     "build:es5": "shx rm -rf es5 && tsc -p src --outDir es5",
     "build:es6": "shx rm -rf es6 && tsc -p src --outDir es6 -t 'ES2015'",
     "build": "yarn run build:es5 & yarn run build:es6",
     "check": "yarn run lint & yarn run tsc",
     "lint": "tslint --project src/tsconfig.json",
     "tsc": "tsc -p src --noEmit",
     "test": "echo 'No tests yet!'",
-    "dev": "ts-node -P lib lib/cli.ts"
+    "dev": "ts-node -P src src/cli.ts boilerplate"
   },
   "dependencies": {
-    "chokidar-socket-emitter": "^0.5.2",
+    "chokidar-socket-emitter": "^0.6.0",
     "commander": "^2.9.0",
-    "http-server": "^0.9.0",
+    "compression": "^1.6.2",
+    "connect-history-api-fallback": "^1.3.0",
+    "express": "^4.14.1",
+    "http-proxy": "^1.16.2",
     "opener": "^1.4.1",
     "shelljs": "^0.7.6",
     "tslib": "^1.5.0"
   },
   "devDependencies": {
-    "@types/node": "^7.0.0",
-    "@types/shelljs": "^0.3.32",
-    "husky": "^0.12.0",
+    "@types/compression": "^0.0.33",
+    "@types/express": "^4.0.35",
+    "@types/node": "^7.0.5",
+    "@types/shelljs": "^0.6.0",
+    "husky": "^0.13.1",
     "shx": "^0.2.2",
-    "ts-node": "^2.0.0",
-    "tslint": "^4.3.1",
-    "typescript": "^2.1.5"
+    "ts-node": "^2.1.0",
+    "tslint": "^4.4.2",
+    "typescript": "^2.1.6"
   },
   "peerDependencies": {
     "jspm": ">=0.17.0-beta.20"