docs(upgrade) get project structure up to date with the latest in angular/angular-phonecat#289

Author: teropa

public/docs/_examples/upgrade/ts/classes/.bowerrc

@@ -1,3 +1,3 @@
 {
-  "directory": "src/bower_components"
+  "directory": "app/bower_components"
 }

public/docs/_examples/upgrade/ts/classes/.gitignore

@@ -1,6 +1,6 @@
-src/app/**/*.js
-src/app/**/*.js.map
-src/test/unit/**/*.js
-src/test/unit/**/*.js.map
-src/test/e2e/**/*.js
-src/test/e2e/**/*.js.map
+app/**/*.js
+app/**/*.js.map
+test/unit/**/*.js
+test/unit/**/*.js.map
+test/e2e/**/*.js
+test/e2e/**/*.js.map

public/docs/_examples/upgrade/ts/classes/src/css/.gitkeep renamed to public/docs/_examples/upgrade/ts/classes/app/css/.gitkeep

@@ -15,9 +15,9 @@
   <script src="bower_components/angular-resource/angular-resource.js"></script>
   <script>
     System.config({
-      packages: {'app': {defaultExtension: 'js'}}
+      packages: {'js': {defaultExtension: 'js'}}
     });
-    System.import('app/app');
+    System.import('js/app.module');
   </script>
   <!-- #enddocregion scripts -->
 </head>

public/docs/_examples/upgrade/ts/classes/src/css/animations.css renamed to public/docs/_examples/upgrade/ts/classes/app/css/animations.css

@@ -5,9 +5,9 @@
 /// <reference path="../../typings/angularjs/angular-route.d.ts" />
 // #enddocregion
 
-import core from './core/core';
-import phoneList from './phone_list/phone_list';
-import phoneDetail from './phone_detail/phone_detail';
+import core from './core/core.module';
+import phoneList from './phone_list/phone_list.module';
+import phoneDetail from './phone_detail/phone_detail.module';
 
 angular.module('phonecatApp', [
   'ngRoute',
@@ -21,12 +21,12 @@ configure.$inject = ['$routeProvider'];
 function configure($routeProvider) {
   $routeProvider.
     when('/phones', {
-      templateUrl: 'app/phone_list/phone_list.html',
+      templateUrl: 'js/phone_list/phone_list.html',
       controller: 'PhoneListCtrl',
       controllerAs: 'vm'
     }).
     when('/phones/:phoneId', {
-      templateUrl: 'app/phone_detail/phone_detail.html',
+      templateUrl: 'js/phone_detail/phone_detail.html',
       controller: 'PhoneDetailCtrl',
       controllerAs: 'vm'
     }).

public/docs/_examples/upgrade/ts/classes/src/css/app.css renamed to public/docs/_examples/upgrade/ts/classes/app/css/app.css

@@ -1,6 +1,6 @@
 // #docregion
-import Phone from './phone_factory';
-import checkmarkFilter from './checkmark_filter';
+import Phone from './phone.factory';
+import checkmarkFilter from './checkmark.filter';
 
 export default angular.module('phonecat.core', [
     'ngResource'

public/docs/_examples/upgrade/ts/classes/src/img/.gitkeep renamed to public/docs/_examples/upgrade/ts/classes/app/img/.gitkeep

@@ -1,5 +1,5 @@
 // #docregion
-import PhoneDetailCtrl from './phone_detail_controller';
+import PhoneDetailCtrl from './phone_detail.controller';
 
 export default angular.module('phonecat.detail', [
     'ngRoute',

public/docs/_examples/upgrade/ts/classes/src/img/glyphicons-halflings-white.png renamed to public/docs/_examples/upgrade/ts/classes/app/img/glyphicons-halflings-white.png

@@ -1,5 +1,5 @@
 // #docregion
-import PhoneListCtrl from './phone_list_controller';
+import PhoneListCtrl from './phone_list.controller';
 
 export default angular.module('phonecat.list', ['phonecat.core'])
   .controller('PhoneListCtrl', PhoneListCtrl);

public/docs/_examples/upgrade/ts/classes/src/img/glyphicons-halflings.png renamed to public/docs/_examples/upgrade/ts/classes/app/img/glyphicons-halflings.png

@@ -27,15 +27,15 @@
     "start": "http-server -a 0.0.0.0 -p 8000",
 
     "pretest": "npm install",
-    "test": "node node_modules/karma/bin/karma start src/test/karma.conf.js",
-    "test-single-run": "node node_modules/karma/bin/karma start src/test/karma.conf.js  --single-run",
+    "test": "node node_modules/karma/bin/karma start test/karma.conf.js",
+    "test-single-run": "node node_modules/karma/bin/karma start test/karma.conf.js  --single-run",
 
     "preupdate-webdriver": "npm install",
     "update-webdriver": "webdriver-manager update",
 
     "preprotractor": "npm run update-webdriver",
-    "protractor": "protractor src/test/protractor-conf.js",
+    "protractor": "protractor test/protractor-conf.js",
 
-    "tsc": "tsc -p src -w"
+    "tsc": "tsc -p . -w"
   }
 }

public/docs/_examples/upgrade/ts/classes/src/index.html renamed to public/docs/_examples/upgrade/ts/classes/app/index.html

@@ -8,7 +8,7 @@ declare var browser:any, element:any, by:any;
 describe('PhoneCat App', function() {
 
   it('should redirect index.html to index.html#/phones', function() {
-    browser.get('src/index.html');
+    browser.get('app/index.html');
     browser.getLocationAbsUrl().then(function(url) {
         expect(url).toEqual('/phones');
       });
@@ -18,7 +18,7 @@ describe('PhoneCat App', function() {
   describe('Phone list view', function() {
 
     beforeEach(function() {
-      browser.get('src/index.html#/phones');
+      browser.get('app/index.html#/phones');
     });
 
 
@@ -78,7 +78,7 @@ describe('PhoneCat App', function() {
   describe('Phone detail view', function() {
 
     beforeEach(function() {
-      browser.get('src/index.html#/phones/nexus-s');
+      browser.get('app/index.html#/phones/nexus-s');
     });
 
 

public/docs/_examples/upgrade/ts/classes/src/app/app.ts renamed to public/docs/_examples/upgrade/ts/classes/app/js/app.module.ts

@@ -1,19 +1,19 @@
 module.exports = function(config){
   config.set({
 
-    basePath : '../..',
+    basePath : '..',
 
     // #docregion files
     files : [
-      'src/bower_components/angular/angular.js',
-      'src/bower_components/angular-route/angular-route.js',
-      'src/bower_components/angular-resource/angular-resource.js',
-      'src/bower_components/angular-animate/angular-animate.js',
-      'src/bower_components/angular-mocks/angular-mocks.js',
+      'app/bower_components/angular/angular.js',
+      'app/bower_components/angular-route/angular-route.js',
+      'app/bower_components/angular-resource/angular-resource.js',
+      'app/bower_components/angular-animate/angular-animate.js',
+      'app/bower_components/angular-mocks/angular-mocks.js',
       'node_modules/systemjs/dist/system.src.js',
-      'src/test/karma_test_shim.js',
-      {pattern: 'src/app/**/*.js', included: false, watched: true},
-      {pattern: 'src/test/unit/**/*.js', included: false, watched: true}
+      'test/karma_test_shim.js',
+      {pattern: 'app/js/**/*.js', included: false, watched: true},
+      {pattern: 'test/unit/**/*.js', included: false, watched: true}
     ],
     // #enddocregion files
 

public/docs/_examples/upgrade/ts/classes/src/app/core/checkmark_filter.ts renamed to public/docs/_examples/upgrade/ts/classes/app/js/core/checkmark.filter.ts

@@ -5,15 +5,15 @@ __karma__.loaded = function() {};
 
 System.config({
   packages: {
-    'base/src/app': {
+    'base/app/js': {
       defaultExtension: false,
       format: 'register',
       map: Object.keys(window.__karma__.files).
             filter(onlyAppFiles).
             reduce(function createPathRecords(pathsMapping, appPath) {
               // creates local module name mapping to global path with karma's fingerprint in path, e.g.:
               // './hero.service': '/base/src/app/hero.service.js?f4523daf879cfb7310ef6242682ccf10b2041b3e'
-              var moduleName = appPath.replace(/^\/base\/src\/app\//, './').replace(/\.js$/, '');
+              var moduleName = appPath.replace(/^\/base\/app\/js\//, './').replace(/\.js$/, '');
               pathsMapping[moduleName] = appPath + '?' + window.__karma__.files[appPath]
               return pathsMapping;
             }, {})
@@ -36,9 +36,9 @@ Promise.all(
 });
 
 function onlyAppFiles(filePath) {
-  return /^\/base\/src\/app\/.*\.js$/.test(filePath)
+  return /^\/base\/app\/js\/.*\.js$/.test(filePath)
 }
 
 function onlySpecFiles(path) {
-  return /_spec\.js$/.test(path);
+  return /\.spec\.js$/.test(path);
 }

public/docs/_examples/upgrade/ts/classes/src/app/core/core.ts renamed to public/docs/_examples/upgrade/ts/classes/app/js/core/core.module.ts

@@ -0,0 +1,3 @@
+// #docregion
+/// <reference path="../typings/jasmine/jasmine.d.ts" />
+/// <reference path="../typings/angularjs/angular-mocks.d.ts" />

public/docs/_examples/upgrade/ts/classes/src/app/core/phone_factory.ts renamed to public/docs/_examples/upgrade/ts/classes/app/js/core/phone.factory.ts

@@ -1,5 +1,5 @@
 // #docregion top
-import '../../app/core/core';
+import '../../app/js/core/core.module';
 // #enddocregion top
 
 describe('checkmarkFilter', function() {

public/docs/_examples/upgrade/ts/classes/src/app/phone_detail/phone_detail_controller.ts renamed to public/docs/_examples/upgrade/ts/classes/app/js/phone_detail/phone_detail.controller.ts

@@ -1,5 +1,5 @@
 // #docregion top
-import '../../app/core/core';
+import '../../app/js/core/core.module';
 // #enddocregion top
 
 describe('phoneFactory', function() {

public/docs/_examples/upgrade/ts/classes/src/app/phone_detail/phone_detail.html renamed to public/docs/_examples/upgrade/ts/classes/app/js/phone_detail/phone_detail.html

@@ -1,5 +1,5 @@
 // #docregion top
-import '../../app/phone_detail/phone_detail';
+import '../../app/js/phone_detail/phone_detail.module';
 // #enddocregion top
 
 describe('PhoneDetailCtrl', function(){

public/docs/_examples/upgrade/ts/ng2_initial/src/app/phone_detail/phone_detail.ts renamed to public/docs/_examples/upgrade/ts/classes/app/js/phone_detail/phone_detail.module.ts

@@ -1,5 +1,5 @@
 // #docregion top
-import '../../app/phone_list/phone_list';
+import '../../app/js/phone_list/phone_list.module';
 // #enddocregion top
 
 describe('PhoneListCtrl', function(){

public/docs/_examples/upgrade/ts/classes/src/app/phone_list/phone_list_controller.ts renamed to public/docs/_examples/upgrade/ts/classes/app/js/phone_list/phone_list.controller.ts

@@ -6,5 +6,8 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "removeComments": false
-  }
+  },
+  "exclude": [
+    "node_modules"
+  ]
 }

public/docs/_examples/upgrade/ts/classes/src/app/phone_list/phone_list.html renamed to public/docs/_examples/upgrade/ts/classes/app/js/phone_list/phone_list.html

@@ -1,3 +1,3 @@
 {
-  "directory": "src/bower_components"
+  "directory": "app/bower_components"
 }

public/docs/_examples/upgrade/ts/typescript-conversion/src/app/phone_list/phone_list.ts renamed to public/docs/_examples/upgrade/ts/classes/app/js/phone_list/phone_list.module.ts

@@ -1,6 +1,6 @@
-src/app/**/*.js
-src/app/**/*.js.map
-src/test/unit/**/*.js
-src/test/unit/**/*.js.map
-src/test/e2e/**/*.js
-src/test/e2e/**/*.js.map
+app/**/*.js
+app/**/*.js.map
+test/unit/**/*.js
+test/unit/**/*.js.map
+test/e2e/**/*.js
+test/e2e/**/*.js.map

public/docs/_examples/upgrade/ts/classes/src/phones/dell-streak-7.json renamed to public/docs/_examples/upgrade/ts/classes/app/phones/dell-streak-7.json

@@ -17,7 +17,7 @@
   <script>
     System.config({
       packages: {
-        'app': {
+        'js': {
           defaultExtension: 'js'
         },
         '../node_modules/rxjs': {
@@ -29,7 +29,7 @@
         'rxjs/operator/*': '../node_modules/rxjs/add/operator/*.js'
       }
     });
-    System.import('app/app');
+    System.import('js/app.module');
   </script>
 </head>
 <body>

public/docs/_examples/upgrade/ts/classes/src/phones/dell-venue.json renamed to public/docs/_examples/upgrade/ts/classes/app/phones/dell-venue.json

@@ -11,9 +11,9 @@ import upgradeAdapter from './core/upgrade_adapter';
 // #docregion http-import
 import {HTTP_PROVIDERS} from 'angular2/http';
 // #enddocregion http-import
-import core from './core/core';
-import phoneList from './phone_list/phone_list';
-import phoneDetail from './phone_detail/phone_detail';
+import core from './core/core.module';
+import phoneList from './phone_list/phone_list.module';
+import phoneDetail from './phone_detail/phone_detail.module';
 
 upgradeAdapter.addProvider(HTTP_PROVIDERS);
 // #docregion upgrade-route-params

public/docs/_examples/upgrade/ts/classes/src/phones/droid-2-global-by-motorola.json renamed to public/docs/_examples/upgrade/ts/classes/app/phones/droid-2-global-by-motorola.json

@@ -10,7 +10,7 @@ interface PhoneRouteParams {
 
 @Component({
   selector: 'pc-phone-detail',
-  templateUrl: 'app/phone_detail/phone_detail.html',
+  templateUrl: 'js/phone_detail/phone_detail.html',
   pipes: [CheckmarkPipe]
 })
 class PhoneDetail {

public/docs/_examples/upgrade/ts/classes/src/phones/droid-pro-by-motorola.json renamed to public/docs/_examples/upgrade/ts/classes/app/phones/droid-pro-by-motorola.json

@@ -8,7 +8,7 @@ interface PhoneRouteParams {
 
 @Component({
   selector: 'pc-phone-detail',
-  templateUrl: 'app/phone_detail/phone_detail.html'
+  templateUrl: 'js/phone_detail/phone_detail.html'
 })
 class PhoneDetail {
   phone:Phone = undefined;

public/docs/_examples/upgrade/ts/classes/src/phones/lg-axis.json renamed to public/docs/_examples/upgrade/ts/classes/app/phones/lg-axis.json

@@ -7,7 +7,7 @@ import OrderByPipe from './OrderByPipe';
 
 @Component({
   selector: 'pc-phone-list',
-  templateUrl: 'app/phone_list/phone_list.html',
+  templateUrl: 'js/phone_list/phone_list.html',
   pipes: [PhoneFilterPipe, OrderByPipe],
 })
 class PhoneList {

public/docs/_examples/upgrade/ts/classes/src/phones/motorola-atrix-4g.json renamed to public/docs/_examples/upgrade/ts/classes/app/phones/motorola-atrix-4g.json

@@ -4,7 +4,7 @@ import {Phones, Phone} from '../core/Phones';
 
 @Component({
   selector: 'pc-phone-list',
-  templateUrl: 'app/phone_list/phone_list.html'
+  templateUrl: 'js/phone_list/phone_list.html'
 })
 class PhoneList {
 // #enddocregion top

public/docs/_examples/upgrade/ts/classes/src/phones/motorola-bravo-with-motoblur.json renamed to public/docs/_examples/upgrade/ts/classes/app/phones/motorola-bravo-with-motoblur.json

@@ -28,15 +28,15 @@
     "start": "http-server -a 0.0.0.0 -p 8000",
 
     "pretest": "npm install",
-    "test": "node node_modules/karma/bin/karma start src/test/karma.conf.js",
-    "test-single-run": "node node_modules/karma/bin/karma start src/test/karma.conf.js  --single-run",
+    "test": "node node_modules/karma/bin/karma start test/karma.conf.js",
+    "test-single-run": "node node_modules/karma/bin/karma start test/karma.conf.js  --single-run",
 
     "preupdate-webdriver": "npm install",
     "update-webdriver": "webdriver-manager update",
 
     "preprotractor": "npm run update-webdriver",
-    "protractor": "protractor src/test/protractor-conf.js",
+    "protractor": "protractor test/protractor-conf.js",
 
-    "tsc": "tsc -p src -w"
+    "tsc": "tsc -p . -w"
   }
 }

public/docs/_examples/upgrade/ts/classes/src/phones/motorola-charm-with-motoblur.json renamed to public/docs/_examples/upgrade/ts/classes/app/phones/motorola-charm-with-motoblur.json

@@ -5,7 +5,7 @@
 describe('PhoneCat App', function() {
 
   it('should redirect index.html to index.html#/phones', function() {
-    browser.get('src/index.html');
+    browser.get('app/index.html');
     browser.getLocationAbsUrl().then(function(url) {
         expect(url).toEqual('/phones');
       });
@@ -15,7 +15,7 @@ describe('PhoneCat App', function() {
   describe('Phone list view', function() {
 
     beforeEach(function() {
-      browser.get('src/index.html#/phones');
+      browser.get('app/index.html#/phones');
     });
 
     it('should filter the phone list as a user types into the search box', function() {
@@ -87,7 +87,7 @@ describe('PhoneCat App', function() {
   describe('Phone detail view', function() {
 
     beforeEach(function() {
-      browser.get('src/index.html#/phones/nexus-s');
+      browser.get('app/index.html#/phones/nexus-s');
     });