Merge branch 'master' into shake-dat-tree

Author: danbucholtz

CHANGELOG.md

@@ -1,3 +1,26 @@
+<a name="1.0.1"></a>
+## [1.0.1](https://github.com/driftyco/ionic-app-scripts/compare/v1.0.0...v1.0.1) (2017-02-07)
+
+### Breaking Changes
+
+This release was accidentally published with a breaking change for Deep Links. If you're using Deep Links, please don't upgrade to this version. We are in the process of changing the DeepLinks API slightly.
+
+### Bug Fixes
+
+* **angular:** support angular 2.3+ ngc api ([13e930a](https://github.com/driftyco/ionic-app-scripts/commit/13e930a))
+* **deep-linking:** works when there isn't a valid deep link config ([62f05fc](https://github.com/driftyco/ionic-app-scripts/commit/62f05fc))
+* **deep-links:** adjust paths for AoT ([4055d73](https://github.com/driftyco/ionic-app-scripts/commit/4055d73))
+* **sass:** output valid source maps, that chrome can parse ([#306](https://github.com/driftyco/ionic-app-scripts/issues/306)) ([6589550](https://github.com/driftyco/ionic-app-scripts/commit/6589550))
+* **source-maps:** always generate source map, then purge them if not needed in postprocess step ([d26b44c](https://github.com/driftyco/ionic-app-scripts/commit/d26b44c))
+
+
+### Features
+
+* **createWorker:** pass argv and config_argv to spawned processes ([#487](https://github.com/driftyco/ionic-app-scripts/issues/487)) ([02dfff8](https://github.com/driftyco/ionic-app-scripts/commit/02dfff8))
+* **lint:** new option to have stand alone lint bail ([b3bb906](https://github.com/driftyco/ionic-app-scripts/commit/b3bb906))
+
+
+
 <a name="1.0.0"></a>
 # [1.0.0](https://github.com/driftyco/ionic-app-scripts/compare/v0.0.48...v1.0.0) (2017-01-06)
 

README.md

@@ -176,7 +176,7 @@ These tasks are available within `ionic-app-scripts` and can be added to npm scr
 | `copy`     | Run the copy tasks, which by defaults copies the `src/assets/` and `src/index.html` files to `www`. |
 | `lint`     | Run the linter against the source `.ts` files, using the `tslint.json` config file at the root.     |
 | `minify`   | Minifies the output JS bundle and compresses the compiled CSS.                                      |
-| `sass`     | Sass compilation of used modules. Bundling must have as least ran once before Sass compilation.     |
+| `sass`     | Sass compilation of used modules. Bundling must have at least ran once before Sass compilation.     |
 | `watch`    | Runs watch for dev builds.                                                                          |
 
 Example NPM Script:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ionic/app-scripts",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Scripts for Ionic Projects",
   "homepage": "http://ionicframework.com/",
   "author": "Ionic Team <[email protected]> (http://ionic.io)",

src/dev-server/serve-config.ts

@@ -3,6 +3,7 @@ import * as path from 'path';
 export interface ServeConfig {
   httpPort: number;
   host: string;
+  hostBaseUrl: string;
   rootDir: string;
   wwwDir: string;
   buildDir: string;
@@ -21,4 +22,4 @@ export const LOGGER_DIR = '__ion-dev-server';
 export const IONIC_LAB_URL = '/ionic-lab';
 
 export const IOS_PLATFORM_PATH = path.join('platforms', 'ios', 'www');
-export const ANDROID_PLATFORM_PATH = path.join('platforms', 'android', 'assets', 'www');
+export const ANDROID_PLATFORM_PATH = path.join('platforms', 'android', 'assets', 'www');

src/index.ts

@@ -7,6 +7,7 @@ export { lint } from './lint';
 export { minify } from './minify';
 export { ngc } from './ngc';
 export { sass, sassUpdate } from './sass';
+export { serve } from './serve';
 export { transpile } from './transpile';
 export { uglifyjs } from './uglifyjs';
 export { watch, buildUpdate } from './watch';

src/serve.spec.ts

@@ -22,6 +22,7 @@ describe('test serve', () => {
     };
     configResults = {
       httpPort: 8100,
+      hostBaseUrl: 'http://localhost:8100',
       host: '0.0.0.0',
       rootDir: '/',
       wwwDir: '/www',
@@ -89,6 +90,7 @@ describe('test serve', () => {
     config.addArgv('--address');
     config.addArgv('127.0.0.1');
     configResults.host = '127.0.0.1';
+    configResults.hostBaseUrl = 'http://127.0.0.1:8101';
     config.addArgv('--livereload-port');
     config.addArgv('35729');
     configResults.liveReloadPort = 35729;

src/serve.ts

@@ -25,10 +25,13 @@ export function serve(context: BuildContext) {
 
   return findClosestOpenPort(host, notificationPort)
     .then((notificationPortFound) => {
+      const hostPort = getHttpServerPort(context);
+      const hostLocation = (host === '0.0.0.0') ? 'localhost' : host;
 
       config = {
-        httpPort: getHttpServerPort(context),
+        httpPort: hostPort,
         host: host,
+        hostBaseUrl: `http://${hostLocation}:${hostPort}`,
         rootDir: context.rootDir,
         wwwDir: context.wwwDir,
         buildDir: context.buildDir,
@@ -52,6 +55,7 @@ export function serve(context: BuildContext) {
     })
     .then(() => {
       onReady(config, context);
+      return config;
     }, (err: BuildError) => {
       throw err;
     })
@@ -65,16 +69,15 @@ export function serve(context: BuildContext) {
 }
 
 function onReady(config: ServeConfig, context: BuildContext) {
-  const host = config.host === '0.0.0.0' ? 'localhost' : config.host;
   if (config.launchBrowser || config.launchLab) {
-    const openOptions: string[] = [`http://${host}:${config.httpPort}`]
+    const openOptions: string[] = [config.hostBaseUrl]
       .concat(launchLab(context) ? [IONIC_LAB_URL] : [])
       .concat(browserOption(context) ? [browserOption(context)] : [])
       .concat(platformOption(context) ? ['?ionicplatform=', platformOption(context)] : []);
 
     open(openOptions.join(''), browserToLaunch(context));
   }
-  Logger.info(`dev server running: http://${host}:${config.httpPort}/`, 'green', true);
+  Logger.info(`dev server running: ${config.hostBaseUrl}/`, 'green', true);
   Logger.newLine();
 }