Merge pull request #14 from angular/master

Update upstream

Author: GulajavaMinistudio

README.md

@@ -117,6 +117,8 @@ npm install --save-dev @angular/cli@latest
 npm install
 ```
 
+If you are updating to 1.0 from a beta or RC version, check out our [1.0 Update Guide](https://github.com/angular/angular-cli/wiki/stories-1.0-update).
+
 You can find more details about changes between versions in [CHANGELOG.md](https://github.com/angular/angular-cli/blob/master/CHANGELOG.md).
 
 

docs/documentation/config.md

@@ -4,6 +4,7 @@
 
 ## Overview
 `ng get [key]` Get a value from the configuration.
+`[key]` should be in JSON path format. Example: `a[3].foo.bar[2]`.
 
 ## Options
 <details>
@@ -21,6 +22,7 @@
 
 ## Overview
 `ng set [key]=[value]` Set a value in the configuration.
+`[key]` should be in JSON path format. Example: `a[3].foo.bar[2]`.
 
 ## Options
 <details>

packages/@angular/cli/blueprints/service/index.ts

@@ -103,6 +103,13 @@ export default Blueprint.extend({
       `;
       this._writeStatusToUI(chalk.yellow, 'WARNING', warningMessage);
     } else {
+      if (options.dryRun) {
+        this._writeStatusToUI(chalk.yellow,
+          'update',
+          path.relative(this.project.root, this.pathToModule));
+        return;
+      }
+
       const className = stringUtils.classify(`${options.entity.name}Service`);
       const fileName = stringUtils.dasherize(`${options.entity.name}.service`);
       const fullGeneratePath = path.join(this.project.root, this.generatePath);

packages/@angular/cli/models/webpack-configs/styles.ts

@@ -117,6 +117,8 @@ export function getStylesConfig(wco: WebpackConfigOptions) {
         loader: 'sass-loader',
         options: {
           sourceMap: cssSourceMap,
+          // bootstrap-sass requires a minimum precision of 8
+          precision: 8,
           includePaths
         }
       }]

packages/@angular/cli/tasks/eject.ts

@@ -320,6 +320,10 @@ class JsonWebpackSerializer {
   serialize(config: any): string {
     // config = Object.assign({}, config);
     config['plugins'] = this._pluginsReplacer(config['plugins']);
+    // Routes using PathLocationStrategy break without this.
+    config['devServer'] = {
+      'historyApiFallback': true
+    };
     config['resolve'] = this._resolveReplacer(config['resolve']);
     config['resolveLoader'] = this._resolveReplacer(config['resolveLoader']);
     config['entry'] = this._entryReplacer(config['entry']);

tests/e2e/tests/generate/service/service-dry-run.ts

@@ -0,0 +1,9 @@
+import {join} from 'path';
+import {ng} from '../../../utils/process';
+import {expectGitToBeClean} from '../../../utils/git';
+
+
+export default function() {
+  return ng('generate', 'service', 'test-service', '--module', 'app.module.ts', '--dry-run')
+    .then(() => expectGitToBeClean());
+}