Merge branch 'master' into git-author-vars

Author: beeman

docs/documentation/generate/component.md

@@ -19,3 +19,7 @@
 `--change-detection` (`-cd`) set the change detection strategy
 
 `--skip-import` allows for skipping the module import
+
+`--module` (`-m`) allows specification of the declaring module
+
+`--export` specifies if declaring module exports the component

docs/documentation/generate/directive.md

@@ -11,3 +11,7 @@
 `--spec` specifies if a spec file is generated
 
 `--skip-import` allows for skipping the module import
+
+`--module` (`-m`) allows specification of the declaring module
+
+`--export` specifies if declaring module exports the directive

docs/documentation/generate/pipe.md

@@ -9,3 +9,7 @@
 `--spec` specifies if a spec file is generated
 
 `--skip-import` allows for skipping the module import
+
+`--module` (`-m`) allows specification of the declaring module
+
+`--export` specifies if declaring module exports the pipe

docs/documentation/generate/service.md

@@ -7,3 +7,5 @@
 `--flat` flag to indicate if a dir is created
 
 `--spec` specifies if a spec file is generated
+
+`--module` (`-m`) allows specification of the declaring module

docs/documentation/stories/include-bootstrap.md

@@ -0,0 +1,43 @@
+# Include [Bootstrap](http://getbootstrap.com/)
+
+[Bootstrap](http://getbootstrap.com/) is a popular CSS framework which can be used within an Angular project.
+This guide will walk you through adding bootstrap to your Angular CLI project and configuring it to use bootstrap.
+
+Create a new project and navigate into the project
+```
+ng new my-app
+cd my-app
+```
+
+With the new project created and ready you will next need to install bootstrap to your project as a dependency.
+Using the `--save` option the dependency will be saved in package.json
+```
+// version 3.x
+npm install bootstrap --save
+
+// version 4.x
+npm install bootstrap@next --save
+```
+
+Now that the project is set up it must be configured to include the bootstrap CSS.
+
+Open the file `angular-cli.json` from the root of your project.
+Under the property `apps` the first item in that array is the default application.
+There is a property `styles` which allows external global styles to be applied to your application.
+Specify the path to `bootstrap.min.css`
+```
+// version 3.x and 4.x
+"../node_modules/bootstrap/dist/css/bootstrap.min.css"
+```
+
+With the application configured, run `ng serve` to run your application in develop mode.
+In your browser navigate to the application `localhost:4200`.
+Make a change to your application to ensure that the CSS library has been included.
+A quick test is to add the following markup to `app.component.html`
+```
+<button class="btn btn-primary">Test Button</button>
+```
+After saving this file, return to the browser to see the bootstrap styled button.
+
+
+**Note:** When you make changes to `angular-cli.json` you will need to re-start `ng serve` to pick up configuration changes.

docs/documentation/stories/using-corporate-proxy.md

@@ -0,0 +1,42 @@
+# Using corporate proxy
+
+If you work behind a corporate proxy, the regular [backend proxy](http://github.com/angular/angular-cli#proxy-to-backend) configuration will not work if you try to proxy calls to any URL outside your local network.
+
+In this case, you can configure the backend proxy to redirect calls through your corporate proxy using an agent:
+
+```bash
+npm install --save-dev https-proxy-agent
+```
+
+Then instead of using a `proxy.conf.json` file, we create a file called `proxy.conf.js` with the content
+
+```js
+var HttpsProxyAgent = require('https-proxy-agent');
+var proxyConfig = [{
+  context: '/api',
+  target: 'http://your-remote-server.com:3000',
+  secure: false
+}];
+
+function setupForCorporateProxy(proxyConfig) {
+  var proxyServer = process.env.http_proxy || process.env.HTTP_PROXY;
+  if (proxyServer) {
+    var agent = new HttpsProxyAgent(proxyServer);
+    console.log('Using corporate proxy server: ' + proxyServer);
+    proxyConfig.forEach(function(entry) {
+      entry.agent = agent;
+    });
+  }
+  return proxyConfig;
+}
+
+module.exports = setupForCorporateProxy(proxyConfig);
+```
+
+and edit the `package.json` file's start script accordingly
+
+```json
+"start": "ng serve --proxy-config proxy.conf.js",
+```
+
+This way if you have a `http_proxy` or `HTTP_PROXY` environment variable defined, an agent will automatically be added to pass calls through your corporate proxy when running `npm start`.

package.json

@@ -90,7 +90,6 @@
     "postcss-loader": "^0.9.1",
     "quick-temp": "0.1.5",
     "raw-loader": "^0.5.1",
-    "readline2": "0.1.1",
     "reflect-metadata": "^0.1.8",
     "remap-istanbul": "^0.6.4",
     "resolve": "^1.1.7",
@@ -114,7 +113,7 @@
     "typescript": "~2.0.3",
     "url-loader": "^0.5.7",
     "walk-sync": "^0.2.6",
-    "webpack": "2.2.0-rc.4",
+    "webpack": "2.2.0",
     "webpack-dev-server": "2.2.0-rc.0",
     "webpack-merge": "^0.14.0",
     "webpack-sources": "^0.1.3",

packages/@ngtools/webpack/package.json

@@ -37,6 +37,6 @@
     "@angular/tsc-wrapped": "^0.5.0",
     "typescript": "^2.0.2",
     "reflect-metadata": "^0.1.8",
-    "webpack": "2.2.0-rc.4"
+    "webpack": "2.2.0"
   }
 }

packages/@ngtools/webpack/src/loader.spec.ts

@@ -0,0 +1,27 @@
+import * as ts from 'typescript';
+import {removeModuleIdOnlyForTesting} from './loader';
+import {WebpackCompilerHost} from './compiler_host';
+import {TypeScriptFileRefactor} from './refactor';
+
+describe('@ngtools/webpack', () => {
+  describe('loader', () => {
+    describe('removeModuleId', () => {
+      it('should work', () => {
+        const host = new WebpackCompilerHost({}, '');
+        host.writeFile('/file.ts', `
+          export const obj = { moduleId: 123 };
+          export const obj2 = { moduleId: 123, otherValue: 1 };
+          export const obj2 = { otherValue: 1, moduleId: 123 };
+        `, false);
+
+        const program = ts.createProgram(['/file.ts'], {}, host);
+
+        const refactor = new TypeScriptFileRefactor('/file.ts', host, program);
+        removeModuleIdOnlyForTesting(refactor);
+
+        expect(refactor.sourceText).toMatch(/obj = \{\s+};/);
+        expect(refactor.sourceText).toMatch(/obj2 = \{\s*otherValue: 1\s*};/);
+      });
+    });
+  });
+});

packages/@ngtools/webpack/src/loader.ts

@@ -97,10 +97,10 @@ function _removeModuleId(refactor: TypeScriptFileRefactor) {
   refactor.findAstNodes(sourceFile, ts.SyntaxKind.ObjectLiteralExpression, true)
     // Get all their property assignments.
     .filter((node: ts.ObjectLiteralExpression) =>
-      node.properties.some(prop => prop.name.getText() == 'moduleId'))
+      node.properties.some(prop => _getContentOfKeyLiteral(sourceFile, prop.name) == 'moduleId'))
     .forEach((node: ts.ObjectLiteralExpression) => {
       const moduleIdProp = node.properties.filter((prop: ts.ObjectLiteralElement, idx: number) => {
-        return prop.name.getText() == 'moduleId';
+        return _getContentOfKeyLiteral(sourceFile, prop.name) == 'moduleId';
       })[0];
       // get the trailing comma
       const moduleIdCommaProp = moduleIdProp.parent.getChildAt(1).getChildren()[1];