Merge branch 'master' into webpack-feature-basehref

CHANGELOG.md

@@ -1,3 +1,21 @@
+<a name="1.0.0-beta.11-webpack.2"></a>
+# [1.0.0-beta.11-webpack.2](https://github.com/angular/angular-cli/compare/v1.0.0-beta.10-webpack...v1.0.0-beta.11-webpack.2) (2016-08-10)
+
+
+### Bug Fixes
+
+* **webpack-copy:** copies files from public/ directory to dist/ and preserves references ([b11bc94](https://github.com/angular/angular-cli/commit/b11bc94))
+* Set fs building/polyfill empty for better package support ([#1599](https://github.com/angular/angular-cli/issues/1599)) ([560ae8f](https://github.com/angular/angular-cli/commit/560ae8f))
+* Updated webpack-karma which has proper peer deps settings ([#1597](https://github.com/angular/angular-cli/issues/1597)) ([ace720b](https://github.com/angular/angular-cli/commit/ace720b))
+
+
+### Features
+
+* add utility functions for route generation ([#1330](https://github.com/angular/angular-cli/issues/1330)) ([4fd8e9c](https://github.com/angular/angular-cli/commit/4fd8e9c))
+* ngmodules and insert components based on the AST ([#1616](https://github.com/angular/angular-cli/issues/1616)) ([5bcb7be](https://github.com/angular/angular-cli/commit/5bcb7be))
+
+
+
 <a name="1.0.0-beta.11-webpack"></a>
 # [1.0.0-beta.11-webpack](https://github.com/angular/angular-cli/compare/v1.0.0-beta.10...v1.0.0-beta.11-webpack) (2016-08-02)
 

README.md

@@ -22,6 +22,8 @@ We're updating the build system in Angular-CLI to use webpack instead of Broccol
 
 You can install and update your projects using [these instructions](https://github.com/angular/angular-cli/blob/master/WEBPACK_UPDATE.md).
 
+**The current instructions on this file reflect usage for the `webpack` version.**
+
 ## Prerequisites
 
 The generated project has dependencies that require **Node 4 or greater**.

WEBPACK_UPDATE.md

@@ -54,6 +54,7 @@ Here is a summary of the file changes:
 
 Lastly, you can delete these files as they are not needed anymore.
   * `./config/karma-test-shim.js`
+  * `./config/environment.js`
   * `./src/system-config.ts`
   * `./angular-cli-build.js`
   * `./typings.json`

addon/ng2/blueprints/class/index.js

@@ -1,6 +1,5 @@
 const stringUtils = require('ember-cli-string-utils');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
-var addBarrelRegistration = require('../../utilities/barrel-management');
 
 module.exports = {
   description: '',
@@ -40,12 +39,5 @@ module.exports = {
         return this.fileName;
       }
     };
-  },
-
-  afterInstall: function() {
-    return addBarrelRegistration(
-      this, 
-      this.generatePath,
-      this.fileName);
   }
 };

addon/ng2/blueprints/component/index.js

@@ -2,9 +2,9 @@ var path = require('path');
 var chalk = require('chalk');
 var Blueprint = require('ember-cli/lib/models/blueprint');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
-var addBarrelRegistration = require('../../utilities/barrel-management');
 var getFiles = Blueprint.prototype.files;
 const stringUtils = require('ember-cli-string-utils');
+const astUtils = require('../../utilities/ast-utils');
 
 module.exports = {
   description: '',
@@ -15,7 +15,7 @@ module.exports = {
     { name: 'inline-template', type: Boolean, default: false, aliases: ['it'] },
     { name: 'inline-style', type: Boolean, default: false, aliases: ['is'] },
     { name: 'prefix', type: Boolean, default: true },
-    { name: 'nospec', type: Boolean, default: false }
+    { name: 'spec', type: Boolean, default: true }
   ],
 
   normalizeEntityName: function (entityName) {
@@ -50,7 +50,7 @@ module.exports = {
     return {
       dynamicPath: this.dynamicPath.dir.replace(this.dynamicPath.appRoot, ''),
       flat: options.flat,
-      nospec: options.nospec,
+      spec: options.spec,
       inlineTemplate: options.inlineTemplate,
       inlineStyle: options.inlineStyle,
       route: options.route,
@@ -64,19 +64,13 @@ module.exports = {
   files: function() {
     var fileList = getFiles.call(this);
 
-    if (this.options && this.options.flat) {
-      fileList = fileList.filter(p => p.indexOf('index.ts') <= 0);
-    }
-    if (this.options && !this.options.route) {
-      fileList = fileList.filter(p => p.indexOf(path.join('shared', 'index.ts')) <= 0);
-    }
     if (this.options && this.options.inlineTemplate) {
       fileList = fileList.filter(p => p.indexOf('.html') < 0);
     }
     if (this.options && this.options.inlineStyle) {
       fileList = fileList.filter(p => p.indexOf('.__styleext__') < 0);
     }
-    if (this.options && this.options.nospec) {
+    if (this.options && !this.options.spec) {
       fileList = fileList.filter(p => p.indexOf('__name__.component.spec.ts') < 0);
     }
 
@@ -119,13 +113,19 @@ module.exports = {
       return;
     }
 
-    if (!options.flat) {
-      return addBarrelRegistration(this, this.generatePath);
-    } else {
-      return addBarrelRegistration(
-        this,
-        this.generatePath,
-        options.entity.name + '.component');
+    const returns = [];
+    const modulePath = path.join(this.project.root, this.dynamicPath.appRoot, 'app.module.ts');
+    const className = stringUtils.classify(`${options.entity.name}Component`);
+    const fileName = stringUtils.dasherize(`${options.entity.name}.component`);
+    const componentDir = path.relative(this.dynamicPath.appRoot, this.generatePath);
+    const importPath = componentDir ? `./${componentDir}/${fileName}` : `./${fileName}`;
+
+    if (!options['skip-import']) {
+      returns.push(
+        astUtils.addComponentToModule(modulePath, className, importPath)
+          .then(change => change.apply()));
     }
+
+    return Promise.all(returns);
   }
 };

addon/ng2/blueprints/directive/index.js

@@ -1,8 +1,7 @@
 var path = require('path');
-var Blueprint = require('ember-cli/lib/models/blueprint');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
-var addBarrelRegistration = require('../../utilities/barrel-management');
-var getFiles = Blueprint.prototype.files;
+const stringUtils = require('ember-cli-string-utils');
+const astUtils = require('../../utilities/ast-utils');
 
 module.exports = {
   description: '',
@@ -27,16 +26,6 @@ module.exports = {
     };
   },
 
-  files: function() {
-    var fileList = getFiles.call(this);
-
-    if (this.options && this.options.flat) {
-      fileList = fileList.filter(p => p.indexOf('index.ts') <= 0);
-    }
-
-    return fileList;
-  },
-
   fileMapTokens: function (options) {
     // Return custom template variables here.
     return {
@@ -52,15 +41,23 @@ module.exports = {
   },
 
   afterInstall: function(options) {
-    if (!options.flat) {
-      return addBarrelRegistration(
-        this,
-        this.generatePath);
-    } else {
-      return addBarrelRegistration(
-        this,
-        this.generatePath,
-        options.entity.name + '.directive');
+    if (options.dryRun) {
+      return;
+    }
+
+    const returns = [];
+    const modulePath = path.join(this.project.root, this.dynamicPath.appRoot, 'app.module.ts');
+    const className = stringUtils.classify(`${options.entity.name}`);
+    const fileName = stringUtils.dasherize(`${options.entity.name}.directive`);
+    const componentDir = path.relative(this.dynamicPath.appRoot, this.generatePath);
+    const importPath = componentDir ? `./${componentDir}/${fileName}` : `./${fileName}`;
+
+    if (!options['skip-import']) {
+      returns.push(
+        astUtils.addComponentToModule(modulePath, className, importPath)
+          .then(change => change.apply()));
     }
+
+    return Promise.all(returns);
   }
 };

addon/ng2/blueprints/enum/index.js

@@ -1,6 +1,5 @@
 const stringUtils = require('ember-cli-string-utils');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
-var addBarrelRegistration = require('../../utilities/barrel-management');
 
 module.exports = {
   description: '',
@@ -33,12 +32,5 @@ module.exports = {
         return this.fileName;
       }
     };
-  },
-
-  afterInstall: function() {
-    return addBarrelRegistration(
-      this,
-      this.generatePath,
-      this.fileName);
   }
 };

addon/ng2/blueprints/interface/index.js

@@ -1,6 +1,5 @@
 const stringUtils = require('ember-cli-string-utils');
 var dynamicPathParser = require('../../utilities/dynamic-path-parser');
-var addBarrelRegistration = require('../../utilities/barrel-management');
 
 module.exports = {
   description: '',
@@ -47,12 +46,5 @@ module.exports = {
         return this.fileName;
       }
     };
-  },
-
-  afterInstall: function() {
-    return addBarrelRegistration(
-      this, 
-      this.generatePath,
-      this.fileName);
   }
 };

addon/ng2/blueprints/mobile/files/__path__/manifest.webapp

@@ -3,40 +3,34 @@
   "short_name": "<%= fullAppName %>",
   "icons": [
     {
-			"src": "/android-chrome-36x36.png",
+			"src": "icons/android-chrome-36x36.png",
 			"sizes": "36x36",
-			"type": "image/png",
-			"density": 0.75
+			"type": "image/png"
 		},
 		{
-			"src": "/android-chrome-48x48.png",
+			"src": "icons/android-chrome-48x48.png",
 			"sizes": "48x48",
-			"type": "image/png",
-			"density": 1
+			"type": "image/png"
 		},
 		{
-			"src": "/android-chrome-72x72.png",
+			"src": "icons/android-chrome-72x72.png",
 			"sizes": "72x72",
-			"type": "image/png",
-			"density": 1.5
+			"type": "image/png"
 		},
 		{
-			"src": "/android-chrome-96x96.png",
+			"src": "icons/android-chrome-96x96.png",
 			"sizes": "96x96",
-			"type": "image/png",
-			"density": 2
+			"type": "image/png"
 		},
 		{
-			"src": "/android-chrome-144x144.png",
+			"src": "icons/android-chrome-144x144.png",
 			"sizes": "144x144",
-			"type": "image/png",
-			"density": 3
+			"type": "image/png"
 		},
 		{
-			"src": "/android-chrome-192x192.png",
+			"src": "icons/android-chrome-192x192.png",
 			"sizes": "192x192",
-			"type": "image/png",
-			"density": 4
+			"type": "image/png"
 		}
   ],
   "theme_color": "#000000",

addon/ng2/blueprints/module/files/__path__/__name__.module.spec.ts

@@ -0,0 +1,15 @@
+/* tslint:disable:no-unused-variable */
+
+import <%= classifiedModuleName %>Module from './<%= dasherizedModuleName %>.module';
+
+describe('<%= classifiedModuleName %>Module', () => {
+  let <%= camelizedModuleName %>Module;
+
+  beforeEach(() => {
+    <%= camelizedModuleName %>Module = new <%= classifiedModuleName %>Module();
+  });
+
+  it('should create an instance', () => {
+    expect(<%= camelizedModuleName %>Module).toBeTruthy();
+  })
+});

addon/ng2/blueprints/module/files/__path__/__name__.module.ts

@@ -0,0 +1,8 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+@NgModule({
+  imports: [ CommonModule ],
+  declarations: []
+})
+export default class <%= classifiedModuleName %>Module { }

addon/ng2/blueprints/module/index.js

@@ -0,0 +1,45 @@
+var dynamicPathParser = require('../../utilities/dynamic-path-parser');
+var Blueprint = require('ember-cli/lib/models/blueprint');
+var getFiles = Blueprint.prototype.files;
+
+module.exports = {
+  description: '',
+
+  availableOptions: [
+    { name: 'spec', type: Boolean, default: false }
+  ],
+
+  normalizeEntityName: function (entityName) {
+    var parsedPath = dynamicPathParser(this.project, entityName);
+
+    this.dynamicPath = parsedPath;
+    return parsedPath.name;
+  },
+
+  locals: function (options) {
+    return { 
+      dynamicPath: this.dynamicPath.dir,
+      spec: options.spec
+    };
+  },
+
+  files: function() {
+    var fileList = getFiles.call(this);
+
+    if (!this.options || !this.options.spec) {
+      fileList = fileList.filter(p => p.indexOf('__name__.module.spec.ts') < 0);
+    }
+
+    return fileList;
+  },
+
+  fileMapTokens: function () {
+    // Return custom template variables here.
+    return {
+      __path__: () => {
+        this.generatePath = this.dynamicPath.dir;
+        return this.generatePath;
+      }
+    };
+  }
+};

addon/ng2/blueprints/ng2/files/__path__/app/app.module.ts

@@ -0,0 +1,21 @@
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms'
+import { HttpModule } from '@angular/http'
+
+import { AppComponent } from './app.component';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule,
+    FormsModule,
+    HttpModule
+  ],
+  providers: [],
+  entryComponents: [AppComponent],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }

addon/ng2/blueprints/ng2/files/__path__/app/index.ts

@@ -1,2 +1,3 @@
 export * from './environments/environment';
 export * from './app.component';
+export * from './app.module';