Merge pull request #163 from antonybudianto/regular-update

update e2e, gulp tsc breaking change update

Author: antonybudianto

config/gulp/config.js

@@ -10,8 +10,7 @@ module.exports = function () {
         tmpApp = tmp + 'app/',
         tmpTest = tmp + 'test/',
         testHelper = test + 'test-helpers/',
-        e2e = test + 'e2e/',
-        tmpE2E = tmpTest + 'e2e/',
+        e2e = root + 'e2e/',
         assets = src + 'assets/',
         assetsPath = {
             styles: assets + 'styles/',
@@ -69,7 +68,6 @@ module.exports = function () {
         tmp: tmp,
         tmpApp: tmpApp,
         tmpTest: tmpTest,
-        tmpE2E: tmpE2E,
         testHelper: testHelper,
         e2e: e2e,
         e2eConfig: e2eConfig,

config/gulp/tasks/test.js

@@ -34,8 +34,8 @@ gulp.task('unit-test', ['tsc'], function (done) {
 
 gulp.task('e2e', ['e2e-test']);
 gulp.task('driver-update', gulpProtractor['webdriver_update']);
-gulp.task('e2e-test', ['driver-update', 'tsc-e2e'], function () {
-    gulp.src(config.tmpE2E + '**/*.spec.js')
+gulp.task('e2e-test', ['driver-update'], function () {
+    gulp.src(config.e2e + '**/*.spec.ts')
     .pipe(gulpProtractor.protractor({
         configFile: 'config/test/protractor.conf.js',
         args: ['--baseUrl', config.e2eConfig.seleniumTarget]

config/gulp/tasks/typescript.js

@@ -8,12 +8,10 @@ var argv = require('yargs').argv;
 
 /* Initialize TS Project */
 var typingFiles = [
-    'typings/index.d.ts',
     config.src + 'manual_typings/**/*.d.ts'
 ];
 var tsUnitFiles = [].concat(config.tsTestFiles.unit, config.tsTestFiles.helper);
-var tsE2EFiles = [].concat(config.tsTestFiles.e2e, config.tsTestFiles.helper);
-var tsFiles = [].concat(config.tsFiles, tsUnitFiles, tsE2EFiles);
+var tsFiles = [].concat(config.tsFiles, tsUnitFiles);
 
 /* Watch changed typescripts file and compile it */
 gulp.task('watch-ts', function () {
@@ -36,10 +34,6 @@ gulp.task('tsc-unit', ['clean-ts-test'], function () {
     return compileTs(tsUnitFiles);
 });
 
-gulp.task('tsc-e2e', ['clean-ts-test'], function () {
-    return compileTs(tsE2EFiles);
-});
-
 /* Lint typescripts */
 gulp.task('tslint', function () {
     return lintTs(tsFiles);
@@ -53,10 +47,6 @@ gulp.task('tslint-unit', function () {
     return lintTs(tsUnitFiles);
 });
 
-gulp.task('tslint-e2e', function () {
-    return lintTs(tsE2EFiles);
-});
-
 function lintTs(files) {
     return gulp.src(files)
         .pipe(tslint({
@@ -80,7 +70,7 @@ function compileTs(files, watchMode) {
         }))
         .pipe(tslint.report())
         .pipe(sourcemaps.init())
-        .pipe(ts(tsProject))
+        .pipe(tsProject())
         .on('error', function () {
             if (watchMode) {
                 return;

config/test/karma.conf.js

@@ -73,7 +73,7 @@ module.exports = function(config) {
 
   dependencies.forEach(function(key) {
     configuration.files.push({
-        pattern: 'node_modules/' + key + '/**/*.js',
+        pattern: 'node_modules/' + key + '/**/!(*.spec)+(.js)',
         included: false,
         watched: false
     });

config/test/protractor.conf.js

@@ -1,3 +1,5 @@
+require('ts-node/register');
+
 var glob = require('glob');
 var seleniumPath = '../node_modules/gulp-protractor/node_modules/protractor/selenium/';
 var seleniumJarPath = '';

src/test/e2e/home/home.spec.ts e2e/home/home.spec.tssrc/test/e2e/home/home.spec.ts renamed to e2e/home/home.spec.ts

@@ -13,7 +13,6 @@
     "npm": "~3.0.0"
   },
   "scripts": {
-    "postinstall": "typings install",
     "start": "gulp serve-dev",
     "test": "gulp test",
     "e2e": "gulp e2e",
@@ -42,17 +41,21 @@
     "url": "https://github.com/antonybudianto/angular2-starter/issues"
   },
   "dependencies": {
-    "@angular/common": "2.0.0",
-    "@angular/compiler": "2.0.0",
-    "@angular/core": "2.0.0",
-    "@angular/forms": "2.0.0",
-    "@angular/http": "2.0.0",
-    "@angular/platform-browser": "2.0.0",
-    "@angular/platform-browser-dynamic": "2.0.0",
-    "@angular/router": "3.0.0",
+    "@angular/common": "~2.0.2",
+    "@angular/compiler": "~2.0.2",
+    "@angular/core": "~2.0.2",
+    "@angular/forms": "~2.0.2",
+    "@angular/http": "~2.0.2",
+    "@angular/platform-browser": "~2.0.2",
+    "@angular/platform-browser-dynamic": "~2.0.2",
+    "@angular/router": "~3.0.2",
     "@ngstarter/systemjs-extension": "1.0.0-rc.4",
+    "@types/core-js": "^0.9.34",
+    "@types/jasmine": "^2.5.35",
+    "@types/lodash": "^4.14.37",
+    "@types/selenium-webdriver": "^2.44.28",
     "bootstrap-sass": "^3.3.7",
-    "codelyzer": "0.0.28",
+    "codelyzer": "1.0.0-beta.0",
     "core-js": "^2.4.1",
     "del": "~2.2.2",
     "font-awesome": "^4.6.3",
@@ -66,13 +69,13 @@
     "gulp-sass": "^2.3.2",
     "gulp-sourcemaps": "^1.6.0",
     "gulp-template": "^4.0.0",
-    "gulp-tslint": "6.1.1",
-    "gulp-typescript": "~2.13.6",
+    "gulp-tslint": "6.1.2",
+    "gulp-typescript": "~3.0.2",
     "gulp-uglify": "~2.0.0",
     "gulp-useref": "~3.1.2",
     "jasmine-core": "~2.5.0",
     "jquery": "^3.1.0",
-    "karma": "~1.2.0",
+    "karma": "~1.3.0",
     "karma-coverage": "~1.1.1",
     "karma-ie-launcher": "^1.0.0",
     "karma-jasmine": "~1.0.2",
@@ -86,12 +89,13 @@
     "rxjs": "5.0.0-beta.12",
     "systemjs": "^0.19.37",
     "tslint": "~3.15.1",
-    "typings": "^1.3.2",
-    "yargs": "^5.0.0",
+    "typescript": "~2.0.3",
+    "yargs": "^6.0.0",
     "zone.js": "^0.6.21"
   },
   "devDependencies": {
     "browser-sync": "^2.14.0",
-    "connect-history-api-fallback": "^1.2.0"
+    "connect-history-api-fallback": "^1.2.0",
+    "ts-node": "^1.4.0"
   }
 }

package.json

@@ -13,7 +13,7 @@
     .ng-valid[required] {
       border-left: 5px solid #42A948; /* green */
     }
-    .ng-invalid {
+    .ng-invalid:not(form) {
       border-left: 5px solid orange; /* orange */
     }
 </style>

src/app/todolist/todolist.html

@@ -80,14 +80,7 @@
     "use-output-property-decorator": true,
     "use-host-property-decorator": true,
     "no-attribute-parameter-decorator": true,
-    "no-input-rename": true,
-    "no-output-rename": true,
-    "no-forward-ref" :true,
-    "use-life-cycle-interface": true,
-    "use-pipe-transform-interface": true,
-    "pipe-naming": [true, "camelCase", "as"],
-    "component-class-suffix": true,
-    "directive-class-suffix": true,
-    "import-destructuring-spacing": true
+    "no-forward-ref": true,
+    "pipe-naming": [true, "camelCase", "as"]
   }
 }