Merge branch 'master' into fix/check-for-old-cli-version

Author: ValeryVS

CHANGELOG.md

@@ -1,3 +1,14 @@
+<a name="1.0.0-beta.15"></a>
+# [1.0.0-beta.15](https://github.com/angular/angular-cli/compare/v1.0.0-beta.14...v1.0.0-beta.15) (2016-09-20)
+
+
+### Bug Fixes
+
+* **help:** fix a bug where help was not available inside a project. ([#2146](https://github.com/angular/angular-cli/issues/2146)) ([5b880b2](https://github.com/angular/angular-cli/commit/5b880b2))
+* pin beta package versions ([#2236](https://github.com/angular/angular-cli/issues/2236)) ([638a54b](https://github.com/angular/angular-cli/commit/638a54b)), closes [#2234](https://github.com/angular/angular-cli/issues/2234)
+
+
+
 <a name="1.0.0-beta.14"></a>
 # [1.0.0-beta.14](https://github.com/angular/angular-cli/compare/v1.0.0-beta.11-webpack.2...v1.0.0-beta.14) (2016-09-15)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-cli",
-  "version": "1.0.0-beta.14",
+  "version": "1.0.0-beta.15",
   "description": "CLI tool for Angular",
   "main": "packages/angular-cli/lib/cli/index.js",
   "trackingCode": "UA-8594346-19",
@@ -91,7 +91,7 @@
     "remap-istanbul": "^0.6.4",
     "resolve": "^1.1.7",
     "rimraf": "^2.5.3",
-    "rxjs": "^5.0.0-beta.12",
+    "rxjs": "5.0.0-beta.12",
     "sass-loader": "^3.2.0",
     "script-loader": "^0.7.0",
     "shelljs": "^0.7.0",
@@ -109,8 +109,8 @@
     "typedoc": "^0.4.2",
     "typescript": "2.0.2",
     "url-loader": "^0.5.7",
-    "webpack": "^2.1.0-beta.22",
-    "webpack-dev-server": "^2.1.0-beta.3",
+    "webpack": "2.1.0-beta.22",
+    "webpack-dev-server": "2.1.0-beta.3",
     "webpack-md5-hash": "0.0.5",
     "webpack-merge": "^0.14.0",
     "zone.js": "^0.6.23"

packages/angular-cli/blueprints/directive/files/__path__/__name__.directive.spec.ts

@@ -1,7 +1,7 @@
 /* tslint:disable:no-unused-variable */
 
 import { TestBed, async } from '@angular/core/testing';
-import { <%= classifiedModuleName %> } from './<%= dasherizedModuleName %>.directive';
+import { <%= classifiedModuleName %>Directive } from './<%= dasherizedModuleName %>.directive';
 
 describe('Directive: <%= classifiedModuleName %>', () => {
   it('should create an instance', () => {

packages/angular-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-cli",
-  "version": "1.0.0-beta.14",
+  "version": "1.0.0-beta.15",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "trackingCode": "UA-8594346-19",
@@ -73,7 +73,7 @@
     "remap-istanbul": "^0.6.4",
     "resolve": "^1.1.7",
     "rimraf": "^2.5.3",
-    "rxjs": "^5.0.0-beta.12",
+    "rxjs": "5.0.0-beta.12",
     "sass-loader": "^3.2.0",
     "script-loader": "^0.7.0",
     "shelljs": "^0.7.0",
@@ -91,8 +91,8 @@
     "typedoc": "^0.4.2",
     "typescript": "2.0.2",
     "url-loader": "^0.5.7",
-    "webpack": "^2.1.0-beta.22",
-    "webpack-dev-server": "^2.1.0-beta.3",
+    "webpack": "2.1.0-beta.22",
+    "webpack-dev-server": "2.1.0-beta.3",
     "webpack-md5-hash": "0.0.5",
     "webpack-merge": "^0.14.0",
     "zone.js": "^0.6.23"

packages/angular-cli/plugins/karma.js

@@ -12,8 +12,8 @@ const init = (config) => {
   const environment = config.angularCli.environment || 'dev';
 
   // add webpack config
-  config.webpack = getWebpackTestConfig(config.basePath, environment, appConfig);
-  config.webpackMiddleware = {
+  const webpackConfig = getWebpackTestConfig(config.basePath, environment, appConfig);
+  const webpackMiddlewareConfig = {
     noInfo: true, // Hide webpack output because its noisy.
     stats: { // Also prevent chunk and module display output, cleaner look. Only emit errors.
       assets: false,
@@ -25,6 +25,8 @@ const init = (config) => {
       chunkModules: false
     }
   };
+  config.webpack = Object.assign(webpackConfig, config.webpack);
+  config.webpackMiddleware = Object.assign(webpackMiddlewareConfig, config.webpackMiddleware);
 
   // replace the angular-cli preprocessor with webpack+sourcemap
   Object.keys(config.preprocessors)

packages/ast-tools/package.json

@@ -20,7 +20,7 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "rxjs": "^5.0.0-beta.11",
+    "rxjs": "5.0.0-beta.11",
     "denodeify": "^1.2.1",
     "typescript": "2.0.0"
   }

packages/ast-tools/src/route-utils.spec.ts

@@ -84,6 +84,20 @@ describe('route utils', () => {
           expect(newContent).toEqual(`import { Router } from '@angular/router';\n`);
         });
     });
+    it('inserts subcomponent in win32 environment', () => {
+      let content = './level1\\level2/level2.component';
+      return nru.insertImport(sourceFile, 'level2', content).apply()
+        .then(() => readFile(sourceFile, 'utf8'))
+        .then(newContent => {
+          if (process.platform.startsWith('win')) {
+            expect(newContent).toEqual(
+            `import { level2 } from './level1/level2/level2.component';\n`);
+          } else {
+            expect(newContent).toEqual(
+            `import { level2 } from './level1\\level2/level2.component';\n`);
+          }
+        });
+    });
   });
 
   describe('bootstrapItem', () => {
@@ -124,7 +138,7 @@ describe('route utils', () => {
         .then(content => {
           expect(content).toEqual(
             `import routes from './routes';
-  import { provideRouter } from '@angular/router'; 
+  import { provideRouter } from '@angular/router';
   bootstrap(AppComponent, [ provideRouter(routes) ]);`);
         });
     });
@@ -299,7 +313,7 @@ export default [
     children: [
       { path: 'about', component: AboutComponent,
         children: [
-          { path: 'details', component: DetailsComponent }, 
+          { path: 'details', component: DetailsComponent },
           { path: 'more', component: MoreComponent }
         ]
       }
@@ -327,7 +341,7 @@ export default [
         children: [
           { path: 'more', component: MoreComponent,
             children: [
-              { path: 'sections', component: SectionsComponent } 
+              { path: 'sections', component: SectionsComponent }
             ]
           }
         ]
@@ -359,7 +373,7 @@ export default [
   { path: 'main', component: MainComponent }
   { path: 'home', component: HomeComponent,
     children: [
-      { path: 'about/:id', component: AboutComponent_1 }, 
+      { path: 'about/:id', component: AboutComponent_1 },
       { path: 'about', component: AboutComponent }
     ]
   }
@@ -447,7 +461,7 @@ export default [
 export default [
   { path: 'home', component: HomeComponent,
     children: [
-      { path: 'trap-queen', component: TrapQueenComponent }, 
+      { path: 'trap-queen', component: TrapQueenComponent },
       { path: 'about', component: AboutComponent,
         children: [
           { path: 'more', component: MoreComponent }
@@ -478,7 +492,7 @@ import { HomeComponent as HomeComponent_1 } from './app/home/home/home.component
 export default [
   { path: 'home', component: HomeComponent,
     children: [
-      { path: 'home', component: HomeComponent_1 } 
+      { path: 'home', component: HomeComponent_1 }
     ]
   }
 ];`;
@@ -487,7 +501,7 @@ export default [
     });
     it('throws error if components collide and there is repitition', () => {
       let editedFile = new InsertChange(routesFile, 16,
-        `\n  { path: 'about', component: AboutComponent, 
+        `\n  { path: 'about', component: AboutComponent,
     children: [
       { path: 'details/:id', component: DetailsComponent_1 },
       { path: 'details', component: DetailsComponent }
@@ -543,7 +557,7 @@ import { DetailsComponent as DetailsComponent_1 } from './app/about/description/
 export default [
   { path: 'home', component: HomeComponent,
     children: [
-      { path: 'more', component: MoreComponent, canDeactivate: [ MyGuard ], useAsDefault: true } 
+      { path: 'more', component: MoreComponent, canDeactivate: [ MyGuard ], useAsDefault: true }
     ]
   }
 ];`

packages/ast-tools/src/route-utils.ts

@@ -79,6 +79,9 @@ export function bootstrapItem(
 
 export function insertImport(fileToEdit: string, symbolName: string,
                                   fileName: string, isDefault = false): Change {
+  if (process.platform.startsWith('win')) {
+    fileName = fileName.replace(/\\/g, '/'); // correction in windows
+  }
   let rootNode = getRootNode(fileToEdit);
   let allImports = findNodes(rootNode, ts.SyntaxKind.ImportDeclaration);