Merge pull request #23 from angular/master

Update upstream

Author: GulajavaMinistudio

CHANGELOG.md

@@ -1,3 +1,19 @@
+<a name="1.0.4"></a>
+## [1.0.4](https://github.com/angular/angular-cli/compare/v1.0.3...v1.0.4) (2017-05-18)
+
+
+### Bug Fixes
+
+* **@angular/cli:** adds language to index.html for accessibility ([1d99472](https://github.com/angular/angular-cli/commit/1d99472))
+* **@angular/cli:** allow e2e multi capabilities ([8a7f6dd](https://github.com/angular/angular-cli/commit/8a7f6dd)), closes [#975](https://github.com/angular/angular-cli/issues/975)
+* **@angular/cli:** enable full node module resolution for project deps ([#6276](https://github.com/angular/angular-cli/issues/6276)) ([1659b74](https://github.com/angular/angular-cli/commit/1659b74))
+* **@angular/cli:** if user pass a full path, use the path ([#6341](https://github.com/angular/angular-cli/issues/6341)) ([013a3ea](https://github.com/angular/angular-cli/commit/013a3ea))
+* **@angular/cli:** prefix `historyApiFallback.index` with `deployUrl` ([#6279](https://github.com/angular/angular-cli/issues/6279)) ([26ecebf](https://github.com/angular/angular-cli/commit/26ecebf))
+* **@angular/cli:** proper generation when the target dir exists ([#5929](https://github.com/angular/angular-cli/issues/5929)) ([895b759](https://github.com/angular/angular-cli/commit/895b759))
+* **@angular/cli:** put vendor ngfactory in vendor chunk ([afa3ac5](https://github.com/angular/angular-cli/commit/afa3ac5))
+* **@angular/cli:** supress module file modification when generating guard with dry-run flag ([114ee50](https://github.com/angular/angular-cli/commit/114ee50))
+
+
 <a name="1.1.0-rc.0"></a>
 # [1.1.0-rc.0](https://github.com/angular/angular-cli/compare/v1.1.0-beta.1...v1.1.0-rc.0) (2017-05-15)
 

docs/documentation/stories.md

@@ -26,3 +26,4 @@
  - [Application Environments](stories/application-environments)
  - [Autoprefixer Configuration](stories/autoprefixer)
  - [Deploy to GitHub Pages](stories/githug-pages)
+ - [Linked Library](stories/linked-library)

docs/documentation/stories/global-scripts.md

@@ -32,12 +32,25 @@ global library, and one imported as a module.
 This is especially bad for libraries with plugins, like JQuery, because each copy will have
 different plugins.
 
-Instead, download typings for your library (`npm install @types/jquery`) which will give you
-access to the global variables exposed by that library.
+Instead, download typings for your library (`npm install @types/jquery`) and follow
+the [3rd Party Library Installation](https://github.com/angular/angular-cli/wiki/stories-third-party-lib) steps,
+this will give you access to the global variables exposed by that library.
 
 If the global library you need to use does not have global typings, you can also declare them
 manually in `src/typings.d.ts` as `any`:
 
 ```
 declare var libraryName: any;
-```
+```
+
+When working with scripts that extend other libraries, for instance with JQuery plugins
+(e.g, `$('.test').myPlugin();`), since the installed `@types/jquery` may not include `myPlugin`,
+you would need to add an interface like the one below in `src/typings.d.ts`.
+
+```
+interface JQuery {
+  myPlugin(options?: any): any;
+}
+```
+
+Otherwise you may see `[TS][Error] Property 'myPlugin' does not exist on type 'JQuery'.` in your IDE.

docs/documentation/stories/linked-library.md

@@ -0,0 +1,62 @@
+# Linked libraries
+
+While working on a library, it is common to use [npm link](https://docs.npmjs.com/cli/link) to
+avoid reinstalling the library on every build.
+
+While this is very useful there are a few caveats to keep in mind.
+
+## The library needs to be AOT compatible
+
+Angular CLI does static analysis even without the `--aot` flag in order to detect lazy-loade routes.
+If your library is not AOT compatible, you will likely get a static analysis error.
+
+## The library still needs to be rebuilt on every change
+
+Angular libraries are usually built using TypeScript and thus require to be built before they
+are published.
+For simple cases, a linked library might work even without a build step, but this is the exception
+rather than the norm.
+
+If a library is not being built using its own build step, then it is being compiled by the
+Angular CLI build system and there is no guarantee that it will be correctly built.
+Even if it works on development it might not work when deployed.
+
+When linking a library remember to have your build step running in watch mode and the library's
+`package.json` pointing at the correct entry points (e.g. 'main' should point at a `.js` file, not
+a `.ts` file).
+
+## Use TypesScript path mapping for Peer Dependencies
+
+Angular libraries should list all `@angular/*` dependencies as
+[Peer Dependencies](https://nodejs.org/en/blog/npm/peer-dependencies/).
+This insures that, when modules ask for Angular, they all get the exact same module.
+If a library lists `@angular/core` in `dependencies` instead of `peerDependencies` then it might
+get a *different* Angular module instead, which will cause your application to break.
+
+While developing a library, you'll need to have all of your peer dependencies also installed
+via `devDependencies` - otherwise you could not compile.
+A linked library will then have it's own set of Angular libraries that it is using for building,
+located in it's `node_modules` folder.
+This can cause problems while building or running your application.
+
+To get around this problem you can use the TypeScript
+[path mapping](https://www.typescriptlang.org/docs/handbook/module-resolution.html#path-mapping).
+With it, you can tell TypeScript that it should load some modules from a specific location.
+
+You should list all the peer dependencies that your library uses in `./tsconfig.json`, pointing
+them at the local copy in the apps `node_modules` folder.
+This ensures that you all will always load the local copies of the modules your library asks for.
+
+```
+{
+  "compilerOptions": {
+    // ...
+    // Note: these paths are relative to `baseUrl` path.
+    "paths": {
+      "@angular/*": [
+        "../node_modules/@angular/*"
+      ]
+    }
+  }
+}
+```

package.json

@@ -68,6 +68,7 @@
     "loader-utils": "^1.0.2",
     "lodash": "^4.11.1",
     "magic-string": "^0.19.0",
+    "memory-fs": "^0.4.1",
     "minimatch": "^3.0.3",
     "node-modules-path": "^1.0.0",
     "nopt": "^4.0.1",

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

@@ -99,6 +99,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}Guard`);
       const fileName = stringUtils.dasherize(`${options.entity.name}.guard`);
       const fullGeneratePath = path.join(this.project.root, this.generatePath);

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

@@ -12,7 +12,6 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
   const { projectRoot, buildOptions, appConfig } = wco;
 
   const appRoot = path.resolve(projectRoot, appConfig.root);
-  const nodeModules = path.resolve(projectRoot, 'node_modules');
 
   let extraPlugins: any[] = [];
 
@@ -23,10 +22,16 @@ export function getBrowserConfig(wco: WebpackConfigOptions) {
   ]);
 
   if (buildOptions.vendorChunk) {
+    // Separate modules from node_modules into a vendor chunk.
+    const nodeModules = path.resolve(projectRoot, 'node_modules');
+    // --aot puts the generated *.ngfactory.ts in src/$$_gendir/node_modules.
+    const genDirNodeModules = path.resolve(appRoot, '$$_gendir', 'node_modules');
+
     extraPlugins.push(new webpack.optimize.CommonsChunkPlugin({
       name: 'vendor',
       chunks: ['main'],
-      minChunks: (module: any) => module.resource && module.resource.startsWith(nodeModules)
+      minChunks: (module: any) => module.resource &&
+        (module.resource.startsWith(nodeModules) || module.resource.startsWith(genDirNodeModules))
     }));
   }
 

packages/@angular/cli/package.json

@@ -53,6 +53,7 @@
     "less": "^2.7.2",
     "less-loader": "^4.0.2",
     "lodash": "^4.11.1",
+    "memory-fs": "^0.4.1",
     "minimatch": "^3.0.3",
     "node-modules-path": "^1.0.0",
     "nopt": "^4.0.1",

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

@@ -39,11 +39,13 @@ class JsonWebpackSerializer {
   };
   public variables: {[name: string]: string} = {
     'nodeModules': `path.join(process.cwd(), 'node_modules')`,
+    'genDirNodeModules':
+      `path.join(process.cwd(), '${this._appRoot}', '$$_gendir', 'node_modules')`,
   };
   private _postcssProcessed = false;
 
 
-  constructor(private _root: string, private _dist: string) {}
+  constructor(private _root: string, private _dist: string, private _appRoot: string) {}
 
   private _escape(str: string) {
     return '\uFF01' + str + '\uFF01';
@@ -398,7 +400,7 @@ export default Task.extend({
     }
 
     const webpackConfig = new NgCliWebpackConfig(runTaskOptions, appConfig).buildConfig();
-    const serializer = new JsonWebpackSerializer(process.cwd(), outputPath);
+    const serializer = new JsonWebpackSerializer(process.cwd(), outputPath, appConfig.root);
     const output = serializer.serialize(webpackConfig);
     const webpackConfigStr = `${serializer.generateVariables()}\n\nmodule.exports = ${output};\n`;
 

packages/@angular/cli/tasks/extract-i18n.ts

@@ -1,25 +1,18 @@
 import * as webpack from 'webpack';
-import * as path from 'path';
-import * as rimraf from 'rimraf';
+import { XI18nWebpackConfig } from '../models/webpack-xi18n-config';
+import { getAppFromConfig } from '../utilities/app-utils';
 
 const Task = require('../ember-cli/lib/models/task');
+const MemoryFS = require('memory-fs');
 
-import {XI18nWebpackConfig} from '../models/webpack-xi18n-config';
-import {getAppFromConfig} from '../utilities/app-utils';
 
 export const Extracti18nTask = Task.extend({
   run: function (runTaskOptions: any) {
-
-    const project = this.project;
-
     const appConfig = getAppFromConfig(runTaskOptions.app);
 
-    const buildDir = '.tmp';
-    const genDir = runTaskOptions.outputPath || appConfig.root;
-
     const config = new XI18nWebpackConfig({
-      genDir,
-      buildDir,
+      genDir: runTaskOptions.outputPath || appConfig.root,
+      buildDir: '.tmp',
       i18nFormat: runTaskOptions.i18nFormat,
       locale: runTaskOptions.locale,
       outFile: runTaskOptions.outFile,
@@ -29,6 +22,7 @@ export const Extracti18nTask = Task.extend({
     }, appConfig).buildConfig();
 
     const webpackCompiler = webpack(config);
+    webpackCompiler.outputFileSystem = new MemoryFS();
 
     return new Promise((resolve, reject) => {
       const callback: webpack.compiler.CompilerCallback = (err, stats) => {
@@ -45,15 +39,11 @@ export const Extracti18nTask = Task.extend({
 
       webpackCompiler.run(callback);
     })
-      .then(() => {
-        // Deletes temporary build folder
-        rimraf.sync(path.resolve(project.root, buildDir));
-      })
-      .catch((err: Error) => {
-        if (err) {
-          this.ui.writeError('\nAn error occured during the i18n extraction:\n'
-            + ((err && err.stack) || err));
-        }
-      });
+    .catch((err: Error) => {
+      if (err) {
+        this.ui.writeError('\nAn error occured during the i18n extraction:\n'
+          + ((err && err.stack) || err));
+      }
+    });
   }
 });

packages/@angular/cli/utilities/dynamic-path-parser.ts

@@ -1,6 +1,6 @@
 import * as path from 'path';
 import * as process from 'process';
-import * as fs from 'fs';
+import * as fs from 'fs-extra';
 const stringUtils = require('ember-cli-string-utils');
 
 export function dynamicPathParser(project: any, entityName: string, appConfig: any) {
@@ -38,7 +38,7 @@ export function dynamicPathParser(project: any, entityName: string, appConfig: a
       // Folder not found, create it, and return it
       const dasherizedPart = stringUtils.dasherize(part);
       const dasherizedDirName = path.join(tempPath, dasherizedPart);
-      fs.mkdirSync(dasherizedDirName);
+      fs.mkdirpSync(dasherizedDirName);
       return dasherizedDirName;
 
     }, parsedOutputPath.root);

packages/@angular/cli/utilities/find-parent-module.ts

@@ -26,7 +26,7 @@ export default function findParentModule(
     if (files.length === 1) {
       return path.join(pathToCheck, files[0]);
     } else if (files.length > 1) {
-      throw new SilentError(`Multiple module files found: ${pathToCheck.replace(sourceRoot, '')}`);
+      throw new SilentError(`Multiple module files found: ${JSON.stringify(files)}`);
     }
 
     // move to parent directory

packages/@angular/cli/utilities/resolve-module-file.ts

@@ -7,17 +7,19 @@ export function resolveModulePath(
   let baseModuleName = moduleNameFromFlag;
   let parentFolders = '';
 
+  // If it's a full path from the cwd, we use it as is.
+  if (fs.existsSync(moduleNameFromFlag) && fs.statSync(moduleNameFromFlag).isFile()) {
+    return path.resolve(moduleNameFromFlag);
+  }
+
   if (baseModuleName.includes(path.sep)) {
     const splitPath = baseModuleName.split(path.sep);
     baseModuleName = splitPath.pop();
     parentFolders = splitPath.join(path.sep);
   }
 
   if (baseModuleName.includes('.')) {
-    baseModuleName = baseModuleName
-      .split('.')
-      .filter(part => part !== 'module' && part !== 'ts')
-      .join('.');
+    baseModuleName = baseModuleName.replace(/(\.module)?(\.ts)?$/, '');
   }
 
   const baseModuleWithFileSuffix = `${baseModuleName}.module.ts`;