feat: adds client dir between src and app

Adds a directory layer in preparation for following the style guide in the blueprints
Updates to templates, tests and build process
Related to angular#316

Author: Brocco

addon/ng2/blueprints/component/files/src/app/__path__/__name__/__name__.css renamed to addon/ng2/blueprints/component/files/src/client/app/__path__/__name__/__name__.css

@@ -0,0 +1 @@
+/// <reference path="../../typings/browser.d.ts" />

addon/ng2/blueprints/component/files/src/app/__path__/__name__/__name__.html renamed to addon/ng2/blueprints/component/files/src/client/app/__path__/__name__/__name__.html

@@ -11,7 +11,7 @@ module.exports = {
   },
 
   beforeInstall: function (options) {
-    var routeConfigPath = path.join(options.project.root, 'src', 'app', 'route-config.ts');
+    var routeConfigPath = path.join(options.project.root, 'src', 'client', 'app', 'route-config.ts');
     try {
       fs.unlinkSync(routeConfigPath);
     } catch (e) {

addon/ng2/blueprints/component/files/src/app/__path__/__name__/__name__.spec.ts renamed to addon/ng2/blueprints/component/files/src/client/app/__path__/__name__/__name__.spec.ts

@@ -5,20 +5,30 @@ module.exports = function dynamicPathParser(project, entityName) {
   var projectRoot = project.root;
   var cwd = process.env.PWD;
 
-  var rootPath = path.join(projectRoot, 'src', 'app');
+  var rootPath = path.join(projectRoot, 'src', 'client', 'app');
 
   var outputPath = path.join(rootPath, entityName);
 
   if (entityName.indexOf(path.sep) === 0) {
     outputPath = path.join(rootPath, entityName.substr(1));
   } else if (cwd.indexOf(rootPath) >= 0) {
     outputPath = path.join(cwd, entityName);
-  } else if (cwd.indexOf(path.join(projectRoot, 'src')) >= 0 && entityName.indexOf('app') === 0) {
-    outputPath = path.join(cwd, entityName);
+  } else if (cwd.indexOf(path.join(projectRoot, 'src', 'client')) >= 0) {
+    if (entityName.indexOf('app') === 0) {
+      outputPath = path.join(cwd, entityName);
+    } else {
+      outputPath = path.join(cwd, 'app', entityName);
+    }
   } else if (cwd.indexOf(path.join(projectRoot, 'src')) >= 0) {
-    outputPath = path.join(cwd, 'app', entityName);
+    if (entityName.indexOf(path.join('client', 'app')) === 0) {
+      outputPath = path.join(cwd, entityName);
+    } else if (entityName.indexOf('client') === 0) {
+      outputPath = path.join(cwd, 'app', entityName);
+    } else {
+      outputPath = path.join(cwd, 'client', 'app', entityName);
+    }
   }
-
+  
   if (outputPath.indexOf(rootPath) < 0) {
     throw `Invalid path: "${entityName}" cannot be ` +
         `above the "${path.join('src', 'app')}" directory`;

addon/ng2/blueprints/component/files/src/app/__path__/__name__/__name__.ts renamed to addon/ng2/blueprints/component/files/src/client/app/__path__/__name__/__name__.ts

@@ -8,7 +8,7 @@ var Funnel = require('broccoli-funnel');
 var mergeTrees = require('broccoli-merge-trees');
 var uglify = require('broccoli-uglify-js');
 var Project = require('ember-cli/lib/models/project');
-var sourceDir = 'src';
+var sourceDir = 'src/client';
 
 module.exports = Angular2App;
 
@@ -18,7 +18,6 @@ function Angular2App(defaults, options) {
   this.options = options || {};
 }
 
-
 /**
  * Create and return the app build system tree that:
  * - Get the `assets` tree
@@ -168,7 +167,7 @@ Angular2App.prototype._getIndexTree = function () {
     'index.html'
   ];
 
-  var index = new Funnel('src', {
+  var index = new Funnel('src/client', {
     files: files,
     description: 'Funnel: index.html'
   });
@@ -189,9 +188,9 @@ Angular2App.prototype._getIndexTree = function () {
  * @return {Tree} Tree for the src dir.
  */
 Angular2App.prototype._getSourceTree = function () {
-  return new Funnel('src', {
+  return new Funnel('src/client', {
     include: ['*.ts', '**/*.ts', '**/*.d.ts'],
-    destDir: 'src'
+    destDir: 'src/client'
   });
 };
 
@@ -222,7 +221,7 @@ Angular2App.prototype._getTsTree = function () {
   var typingsTree = this._getTypingsTree();
   var sourceTree = this._getSourceTree();
 
-  var tsconfig = JSON.parse(fs.readFileSync('src/tsconfig.json', 'utf-8'));
+  var tsconfig = JSON.parse(fs.readFileSync('src/client/tsconfig.json', 'utf-8'));
   // Add all spec files to files. We need this because spec files are their own entry
   // point.
   fs.readdirSync(sourceDir).forEach(function addPathRecursive(name) {
@@ -253,8 +252,8 @@ Angular2App.prototype._getTsTree = function () {
   }
 
   tsTree = new Funnel(tsTree, {
-    srcDir: 'src',
-    exclude: tsTreeExcludes
+    srcDir: 'src/client',
+    // exclude: tsTreeExcludes
   });
 
   return tsTree;

addon/ng2/blueprints/directive/files/src/app/__path__/__name__/__name__.spec.ts renamed to addon/ng2/blueprints/directive/files/src/client/app/__path__/__name__/__name__.spec.ts

@@ -25,30 +25,37 @@ describe('dynamic path parser', () => {
     expect(result.name).to.equal(entityName);
   });
 
-  it(`parse from proj src${path.sep}app dir`, () => {
-    process.env.PWD = path.join(process.cwd(), 'src', 'app');
+  it(`parse from proj src${path.sep}client dir`, () => {
+    process.env.PWD = path.join(process.cwd(), 'src', 'client');
     var result = dynamicPathParser(project, entityName);
     expect(result.dir).to.equal('');
     expect(result.name).to.equal(entityName);
   });
 
-  it(`parse from proj src${path.sep}app${path.sep}child-dir`, () => {
-    process.env.PWD = path.join(process.cwd(), 'src', 'app', 'child-dir');
+  it(`parse from proj src${path.sep}client${path.sep}app dir`, () => {
+    process.env.PWD = path.join(process.cwd(), 'src', 'client', 'app');
+    var result = dynamicPathParser(project, entityName);
+    expect(result.dir).to.equal('');
+    expect(result.name).to.equal(entityName);
+  });
+
+  it(`parse from proj src${path.sep}client${path.sep}app${path.sep}child-dir`, () => {
+    process.env.PWD = path.join(process.cwd(), 'src', 'client', 'app', 'child-dir');
     var result = dynamicPathParser(project, entityName);
     expect(result.dir).to.equal(`${path.sep}child-dir`);
     expect(result.name).to.equal(entityName);
   });
 
-  it(`parse from proj src${path.sep}app${path.sep}child-dir w/ ..${path.sep}`, () => {
-    process.env.PWD = path.join(process.cwd(), 'src', 'app', 'child-dir');
+  it(`parse from proj src${path.sep}client${path.sep}app${path.sep}child-dir w/ ..${path.sep}`, () => {
+    process.env.PWD = path.join(process.cwd(), 'src', 'client', 'app', 'child-dir');
     var result = dynamicPathParser(project, '..' + path.sep + entityName);
     expect(result.dir).to.equal('');
     expect(result.name).to.equal(entityName);
   });
 
-  it(`parse from proj src${path.sep}app${path.sep}child-dir${path.sep}grand-child-dir w/ ..${path.sep}`,
+  it(`parse from proj src${path.sep}client${path.sep}app${path.sep}child-dir${path.sep}grand-child-dir w/ ..${path.sep}`,
     () => {
-      process.env.PWD = path.join(process.cwd(), 'src', 'app', 'child-dir', 'grand-child-dir');
+      process.env.PWD = path.join(process.cwd(), 'src', 'client', 'app', 'child-dir', 'grand-child-dir');
       var result = dynamicPathParser(project, '..' + path.sep + entityName);
       expect(result.dir).to.equal(`${path.sep}child-dir`);
       expect(result.name).to.equal(entityName);

addon/ng2/blueprints/directive/files/src/app/__path__/__name__/__name__.ts renamed to addon/ng2/blueprints/directive/files/src/client/app/__path__/__name__/__name__.ts

@@ -32,22 +32,22 @@ describe('Acceptance: ng generate component', function () {
 
   it('ng generate component my-comp', function () {
     return ng(['generate', 'component', 'my-comp']).then(() => {
-      var testPath = path.join(root, 'tmp', 'foo', 'src', 'app', 'my-comp', 'my-comp.ts');
+      var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', 'my-comp', 'my-comp.ts');
       expect(existsSync(testPath)).to.equal(true);
     });
   });
 
   it('ng generate component test' + path.sep + 'my-comp', function () {
     return ng(['generate', 'component', 'test' + path.sep + 'my-comp']).then(() => {
-      var testPath = path.join(root, 'tmp', 'foo', 'src', 'app', 'test', 'my-comp', 'my-comp.ts');
+      var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', 'test', 'my-comp', 'my-comp.ts');
       expect(existsSync(testPath)).to.equal(true);
     });
   });
 
   it('ng generate component test' + path.sep + '..' + path.sep + 'my-comp', function () {
     return ng(['generate', 'component', 'test' + path.sep + '..' + path.sep + 'my-comp'])
       .then(() => {
-        var testPath = path.join(root, 'tmp', 'foo', 'src', 'app', 'my-comp', 'my-comp.ts');
+        var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', 'my-comp', 'my-comp.ts');
         expect(existsSync(testPath)).to.equal(true);
       });
   });
@@ -57,14 +57,15 @@ describe('Acceptance: ng generate component', function () {
       process.chdir('./src');
       resolve();
     })
+      .then(() => process.chdir('./client'))
       .then(() => process.chdir('./app'))
       .then(() => fs.mkdirsSync('./1'))
       .then(() => process.chdir('./1'))
       .then(() => {
         return ng(['generate', 'component', 'my-comp'])
       })
       .then(() => {
-        var testPath = path.join(root, 'tmp', 'foo', 'src', 'app', '1', 'my-comp', 'my-comp.ts');
+        var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '1', 'my-comp', 'my-comp.ts');
         expect(existsSync(testPath)).to.equal(true);
       }, err => console.log('ERR: ', err));
   });
@@ -74,6 +75,7 @@ describe('Acceptance: ng generate component', function () {
       process.chdir('./src');
       resolve();
     })
+      .then(() => process.chdir('./client'))
       .then(() => process.chdir('./app'))
       .then(() => fs.mkdirsSync('./1'))
       .then(() => process.chdir('./1'))
@@ -82,7 +84,7 @@ describe('Acceptance: ng generate component', function () {
       })
       .then(() => {
         var testPath = path.join(
-          root, 'tmp', 'foo', 'src', 'app', '1', 'child-dir', 'my-comp', 'my-comp.ts');
+          root, 'tmp', 'foo', 'src', 'client', 'app', '1', 'child-dir', 'my-comp', 'my-comp.ts');
         expect(existsSync(testPath)).to.equal(true);
       }, err => console.log('ERR: ', err));
   });
@@ -93,6 +95,7 @@ describe('Acceptance: ng generate component', function () {
         process.chdir('./src');
         resolve();
       })
+        .then(() => process.chdir('./client'))
         .then(() => process.chdir('./app'))
         .then(() => fs.mkdirsSync('./1'))
         .then(() => process.chdir('./1'))
@@ -103,33 +106,34 @@ describe('Acceptance: ng generate component', function () {
         })
         .then(() => {
           var testPath =
-            path.join(root, 'tmp', 'foo', 'src', 'app', '1', 'my-comp', 'my-comp.ts');
+            path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '1', 'my-comp', 'my-comp.ts');
           expect(existsSync(testPath)).to.equal(true);
         }, err => console.log('ERR: ', err));
     });
 
   it('ng generate component ' + path.sep + 'my-comp from a child dir, gens under ' +
-    path.join('src', 'app'),
+    path.join('src', 'client', 'app'),
     () => {
       return new Promise(function (resolve) {
         process.chdir('./src');
         resolve();
       })
+        .then(() => process.chdir('./client'))
         .then(() => process.chdir('./app'))
         .then(() => fs.mkdirsSync('./1'))
         .then(() => process.chdir('./1'))
         .then(() => {
           return ng(['generate', 'component', path.sep + 'my-comp'])
         })
         .then(() => {
-          var testPath = path.join(root, 'tmp', 'foo', 'src', 'app', 'my-comp', 'my-comp.ts');
+          var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', 'my-comp', 'my-comp.ts');
           expect(existsSync(testPath)).to.equal(true);
         }, err => console.log('ERR: ', err));
     });
 
   it('ng generate component ..' + path.sep + 'my-comp from root dir will fail', () => {
     return ng(['generate', 'component', '..' + path.sep + 'my-comp']).then(() => {
-      var testPath = path.join(root, 'tmp', 'foo', 'src', 'app', '..', 'my-comp', 'my-comp.ts');
+      var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '..', 'my-comp', 'my-comp.ts');
       expect(existsSync(testPath)).to.equal(false);
     });
   });

addon/ng2/blueprints/ng2/files/src/app.ts renamed to addon/ng2/blueprints/ng2/files/src/client/app.ts

@@ -30,109 +30,113 @@ describe('Acceptance: ng generate directive', function () {
     return tmp.teardown('./tmp');
   });
 
-  it('ng generate directive my-comp', function () {
-    return ng(['generate', 'directive', 'my-comp']).then(() => {
-      var testPath = path.join(root, 'tmp', 'foo', 'src', 'app', 'my-comp', 'my-comp.ts');
+  it('ng generate directive my-dir', function () {
+    return ng(['generate', 'directive', 'my-dir']).then(() => {
+      var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', 'my-dir', 'my-dir.ts');
       expect(existsSync(testPath)).to.equal(true);
     });
   });
 
-  it('ng generate directive test' + path.sep + 'my-comp', function () {
-    return ng(['generate', 'directive', 'test' + path.sep + 'my-comp']).then(() => {
-      var testPath = path.join(root, 'tmp', 'foo', 'src', 'app', 'test', 'my-comp', 'my-comp.ts');
+  it('ng generate directive test' + path.sep + 'my-dir', function () {
+    return ng(['generate', 'directive', 'test' + path.sep + 'my-dir']).then(() => {
+      var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', 'test', 'my-dir', 'my-dir.ts');
       expect(existsSync(testPath)).to.equal(true);
     });
   });
 
-  it('ng generate directive test' + path.sep + '..' + path.sep + 'my-comp', function () {
-    return ng(['generate', 'directive', 'test' + path.sep + '..' + path.sep + 'my-comp'])
+  it('ng generate directive test' + path.sep + '..' + path.sep + 'my-dir', function () {
+    return ng(['generate', 'directive', 'test' + path.sep + '..' + path.sep + 'my-dir'])
       .then(() => {
-        var testPath = path.join(root, 'tmp', 'foo', 'src', 'app', 'my-comp', 'my-comp.ts');
+        var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', 'my-dir', 'my-dir.ts');
         expect(existsSync(testPath)).to.equal(true);
       });
   });
 
-  it('ng generate directive my-comp from a child dir', () => {
+  it('ng generate directive my-dir from a child dir', () => {
     return new Promise(function (resolve) {
       process.chdir('./src');
       resolve();
     })
+      .then(() => process.chdir('./client'))
       .then(() => process.chdir('./app'))
       .then(() => fs.mkdirsSync('./1'))
       .then(() => process.chdir('./1'))
       .then(() => {
         process.env.CWD = process.cwd();
-        return ng(['generate', 'directive', 'my-comp'])
+        return ng(['generate', 'directive', 'my-dir'])
       })
       .then(() => {
-        var testPath = path.join(root, 'tmp', 'foo', 'src', 'app', '1', 'my-comp', 'my-comp.ts');
+        var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '1', 'my-dir', 'my-dir.ts');
         expect(existsSync(testPath)).to.equal(true);
       }, err => console.log('ERR: ', err));
   });
 
-  it('ng generate directive child-dir' + path.sep + 'my-comp from a child dir', () => {
+  it('ng generate directive child-dir' + path.sep + 'my-dir from a child dir', () => {
     return new Promise(function (resolve) {
       process.chdir('./src');
       resolve();
     })
+      .then(() => process.chdir('./client'))
       .then(() => process.chdir('./app'))
       .then(() => fs.mkdirsSync('./1'))
       .then(() => process.chdir('./1'))
       .then(() => {
         process.env.CWD = process.cwd();
-        return ng(['generate', 'directive', 'child-dir' + path.sep + 'my-comp'])
+        return ng(['generate', 'directive', 'child-dir' + path.sep + 'my-dir'])
       })
       .then(() => {
         var testPath = path.join(
-          root, 'tmp', 'foo', 'src', 'app', '1', 'child-dir', 'my-comp', 'my-comp.ts');
+          root, 'tmp', 'foo', 'src', 'client', 'app', '1', 'child-dir', 'my-dir', 'my-dir.ts');
         expect(existsSync(testPath)).to.equal(true);
       }, err => console.log('ERR: ', err));
   });
 
-  it('ng generate directive child-dir' + path.sep + '..' + path.sep + 'my-comp from a child dir',
+  it('ng generate directive child-dir' + path.sep + '..' + path.sep + 'my-dir from a child dir',
     () => {
       return new Promise(function (resolve) {
         process.chdir('./src');
         resolve();
       })
+        .then(() => process.chdir('./client'))
         .then(() => process.chdir('./app'))
         .then(() => fs.mkdirsSync('./1'))
         .then(() => process.chdir('./1'))
         .then(() => {
           process.env.CWD = process.cwd();
           return ng(
-            ['generate', 'directive', 'child-dir' + path.sep + '..' + path.sep + 'my-comp'])
+            ['generate', 'directive', 'child-dir' + path.sep + '..' + path.sep + 'my-dir'])
         })
         .then(() => {
           var testPath =
-            path.join(root, 'tmp', 'foo', 'src', 'app', '1', 'my-comp', 'my-comp.ts');
+            path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '1', 'my-dir', 'my-dir.ts');
           expect(existsSync(testPath)).to.equal(true);
         }, err => console.log('ERR: ', err));
     });
 
-  it('ng generate directive ' + path.sep + 'my-comp from a child dir, gens under ' +
-    path.join('src', 'app'),
+  it('ng generate directive ' + path.sep + 'my-dir from a child dir, gens under ' +
+    path.join('src', 'client', 'app'),
     () => {
       return new Promise(function (resolve) {
         process.chdir('./src');
         resolve();
       })
+        .then(() => process.chdir('./client'))
         .then(() => process.chdir('./app'))
         .then(() => fs.mkdirsSync('./1'))
         .then(() => process.chdir('./1'))
         .then(() => {
           process.env.CWD = process.cwd();
-          return ng(['generate', 'directive', path.sep + 'my-comp'])
+          return ng(['generate', 'directive', path.sep + 'my-dir'])
         })
         .then(() => {
-          var testPath = path.join(root, 'tmp', 'foo', 'src', 'app', 'my-comp', 'my-comp.ts');
+          var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', 'my-dir', 'my-dir.ts');
           expect(existsSync(testPath)).to.equal(true);
         }, err => console.log('ERR: ', err));
     });
 
-  it('ng generate directive ..' + path.sep + 'my-comp from root dir will fail', () => {
-    return ng(['generate', 'directive', '..' + path.sep + 'my-comp']).then(() => {
-      var testPath = path.join(root, 'tmp', 'foo', 'src', 'app', '..', 'my-comp', 'my-comp.ts');
+  it('ng generate directive ..' + path.sep + 'my-dir from root dir will fail', () => {
+    return ng(['generate', 'directive', '..' + path.sep + 'my-dir']).then(() => {
+      var testPath = path.join(root, 'tmp', 'foo', 'src', 'client', 'app', '..', 'my-dir', 'my-dir.ts');
       expect(existsSync(testPath)).to.equal(false);
     });
   });