Update lib and samples to Angular 4

Author: eitanp461

e2e/app.e2e-spec.ts

@@ -2,7 +2,7 @@ const path = require('path');
 
 import { browser, element, by } from 'protractor';
 
-// Using require instead of import until clodinary-core has typings and can be loaded by tsc 
+// Using require instead of import until clodinary-core has typings and can be loaded by tsc
 // Assumes CLOUDINARY_URL environment variable is set, see https://github.com/cloudinary/cloudinary_npm
 const cloudinary = require('cloudinary');
 
@@ -42,7 +42,7 @@ describe('Sample photo upload E2E Tests', function () {
     it(`should upload a new image successfully`, () => {
         element(by.className('upload_link')).click();
 
-        expect(element(by.className('upload_button')).getText()).toEqual('Upload');
+        expect<any>(element(by.className('upload_button')).getText()).toEqual('Upload');
 
         // Set properties of file to upload
         element(by.className('form-control')).sendKeys(tag);

package.json

@@ -43,23 +43,24 @@
   },
   "homepage": "https://github.com/cloudinary/cloudinary_angular",
   "dependencies": {
-    "@angular/common": "^2.4.3",
-    "@angular/compiler-cli": "^2.2.4",
-    "@angular/core": "^2.4.3",
-    "@angular/platform-server": "^2.4.3",
+    "@angular/common": "^4.0.1",
+    "@angular/compiler-cli": "^4.0.1",
+    "@angular/core": "^4.0.1",
+    "@angular/platform-server": "^4.0.1",
     "core-js": "^2.4.1",
-    "reflect-metadata": "^0.1.8",
+    "reflect-metadata": "^0.1.10",
     "rxjs": "^5.0.1",
-    "zone.js": "^0.7.2"
+    "zone.js": "^0.8.5"
   },
   "devDependencies": {
-    "@angular/compiler": "^2.4.3",
-    "@angular/platform-browser": "^2.4.3",
-    "@angular/platform-browser-dynamic": "^2.4.3",
-    "@types/jasmine": "^2.5.36",
-    "@types/node": "^6.0.46",
-    "@types/selenium-webdriver": "^2.53.36",
-    "canonical-path": "0.0.2",
+    "@angular/animations": "4.0.1",
+    "@angular/compiler": "^4.0.1",
+    "@angular/platform-browser": "^4.0.1",
+    "@angular/platform-browser-dynamic": "^4.0.1",
+    "@types/jasmine": "^2.5.47",
+    "@types/node": "^7.0.12",
+    "@types/selenium-webdriver": "^3.0.1",
+    "canonical-path": "^0.0.2",
     "cloudinary": "^1.4.6",
     "cloudinary-core": "^2.1.9",
     "concurrently": "^3.1.0",

samples/angular-cli-sample/.angular-cli.json

@@ -1,6 +1,7 @@
 {
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "project": {
-    "name": "angular-cli-sample"
+    "name": "angular4-cli-sample"
   },
   "apps": [
     {
@@ -12,15 +13,15 @@
       ],
       "index": "index.html",
       "main": "main.ts",
+      "polyfills": "polyfills.ts",
       "test": "test.ts",
-      "tsconfig": "tsconfig.json",
-      "testTsconfig": "tsconfig.json",
+      "tsconfig": "tsconfig.app.json",
+      "testTsconfig": "tsconfig.spec.json",
       "prefix": "app",
       "styles": [
         "styles.css"
       ],
-      "scripts": [
-      ],
+      "scripts": [],
       "environmentSource": "environments/environment.ts",
       "environments": {
         "dev": "environments/environment.ts",
@@ -33,20 +34,24 @@
       "config": "./protractor.conf.js"
     }
   },
+  "lint": [
+    {
+      "project": "src/tsconfig.app.json"
+    },
+    {
+      "project": "src/tsconfig.spec.json"
+    },
+    {
+      "project": "e2e/tsconfig.e2e.json"
+    }
+  ],
   "test": {
     "karma": {
       "config": "./karma.conf.js"
     }
   },
   "defaults": {
     "styleExt": "css",
-    "class": {
-      "spec": false
-    },
-    "component": {
-      "spec": true,
-      "inlineStyle": false,
-      "inlineTemplate": false
-    }
+    "component": {}
   }
 }

samples/angular-cli-sample/.gitignore

@@ -1,11 +1,9 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
-# Exclude custom typings
-!src/typings.d.ts
-
 # compiled output
 /dist
 /tmp
+/out-tsc
 
 # dependencies
 /node_modules
@@ -17,6 +15,7 @@
 .c9/
 *.launch
 .settings/
+*.sublime-workspace
 
 # IDE - VSCode
 .vscode/*
@@ -28,7 +27,7 @@
 # misc
 /.sass-cache
 /connect.lock
-/coverage/*
+/coverage
 /libpeerconnection.log
 npm-debug.log
 testem.log
@@ -38,6 +37,6 @@ testem.log
 /e2e/*.js
 /e2e/*.map
 
-#System Files
+# System Files
 .DS_Store
 Thumbs.db

samples/angular-cli-sample/README.md

@@ -1,8 +1,9 @@
-# AngularCliSample
+# Angular4CliSample
 
-This project was generated with [angular-cli](https://github.com/angular/angular-cli) version 1.0.0-beta.26.
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.0.0.
 
 ## Development server
+
 Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
 
 ## Code scaffolding
@@ -22,10 +23,6 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.
 Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
 Before running the tests make sure you are serving the app via `ng serve`.
 
-## Deploying to GitHub Pages
-
-Run `ng github-pages:deploy` to deploy to GitHub Pages.
-
 ## Further help
 
-To get more help on the `angular-cli` use `ng help` or go check out the [Angular-CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

samples/angular-cli-sample/e2e/app.e2e-spec.ts

@@ -1,10 +1,10 @@
-import { AngularCliSamplePage } from './app.po';
+import { Angular4CliSamplePage } from './app.po';
 
-describe('angular-cli-sample App', function() {
-  let page: AngularCliSamplePage;
+describe('angular4-cli-sample App', () => {
+  let page: Angular4CliSamplePage;
 
   beforeEach(() => {
-    page = new AngularCliSamplePage();
+    page = new Angular4CliSamplePage();
   });
 
   it('should display message saying app works', () => {

samples/angular-cli-sample/e2e/app.po.ts

@@ -1,6 +1,6 @@
 import { browser, element, by } from 'protractor';
 
-export class AngularCliSamplePage {
+export class Angular4CliSamplePage {
   navigateTo() {
     return browser.get('/');
   }

samples/angular-cli-sample/e2e/tsconfig.e2e.json

@@ -0,0 +1,12 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/e2e",
+    "module": "commonjs",
+    "target": "es5",
+    "types":[
+      "jasmine",
+      "node"
+    ]
+  }
+}

samples/angular-cli-sample/package.json

@@ -1,51 +1,46 @@
 {
-  "name": "angular-cli-sample",
+  "name": "angular4-cli-sample",
   "version": "0.0.0",
   "license": "MIT",
-  "angular-cli": {},
   "scripts": {
     "ng": "ng",
-    "start": "ng serve --aot --progres --target=production",
-    "build": "ng build --aot --progres --target=production",
-    "lint": "tslint \"src/**/*.ts\" --project src/tsconfig.json --type-check && tslint \"e2e/**/*.ts\" --project e2e/tsconfig.json --type-check",
+    "start": "ng serve",
+    "build": "ng build",
     "test": "ng test",
-    "pree2e": "webdriver-manager update --standalone false --gecko false",
-    "e2e": "protractor"
+    "lint": "ng lint",
+    "e2e": "ng e2e"
   },
   "private": true,
   "dependencies": {
-    "@angular/common": "^2.3.1",
-    "@angular/compiler": "^2.3.1",
-    "@angular/core": "^2.3.1",
-    "@angular/forms": "^2.3.1",
-    "@angular/http": "^2.3.1",
-    "@angular/platform-browser": "^2.3.1",
-    "@angular/platform-browser-dynamic": "^2.3.1",
-    "@angular/router": "^3.3.1",
-    "@cloudinary/angular": "^2.1.1",
-    "cloudinary-core": "^2.3.0",
+    "@angular/common": "^4.0.0",
+    "@angular/compiler": "^4.0.0",
+    "@angular/core": "^4.0.0",
+    "@angular/forms": "^4.0.0",
+    "@angular/http": "^4.0.0",
+    "@angular/platform-browser": "^4.0.0",
+    "@angular/platform-browser-dynamic": "^4.0.0",
+    "@angular/router": "^4.0.0",
     "core-js": "^2.4.1",
-    "lodash": "^4.17.4",
-    "rxjs": "^5.0.1",
-    "ts-helpers": "^1.1.1",
-    "zone.js": "^0.7.2"
+    "rxjs": "^5.1.0",
+    "zone.js": "^0.8.4"
   },
   "devDependencies": {
-    "@angular/cli": "^1.0.0-rc.1",
-    "@angular/compiler-cli": "^2.3.1",
+    "@angular/cli": "1.0.0",
+    "@angular/compiler-cli": "^4.0.0",
     "@types/jasmine": "2.5.38",
-    "@types/node": "^6.0.42",
-    "codelyzer": "~2.0.0-beta.1",
-    "jasmine-core": "2.5.2",
-    "jasmine-spec-reporter": "2.5.0",
-    "karma": "1.2.0",
-    "karma-chrome-launcher": "^2.0.0",
-    "karma-cli": "^1.0.1",
-    "karma-jasmine": "^1.0.2",
-    "karma-remap-istanbul": "^0.2.1",
-    "protractor": "~4.0.13",
-    "ts-node": "1.2.1",
-    "tslint": "^4.3.0",
-    "typescript": "~2.0.3"
+    "@types/node": "~6.0.60",
+    "codelyzer": "~2.0.0",
+    "jasmine-core": "~2.5.2",
+    "jasmine-spec-reporter": "~3.2.0",
+    "karma": "~1.4.1",
+    "karma-chrome-launcher": "~2.0.0",
+    "karma-cli": "~1.0.1",
+    "karma-jasmine": "~1.1.0",
+    "karma-jasmine-html-reporter": "^0.2.2",
+    "karma-coverage-istanbul-reporter": "^0.2.0",
+    "protractor": "~5.1.0",
+    "ts-node": "~2.0.0",
+    "tslint": "~4.5.0",
+    "typescript": "~2.2.0"
   }
 }

samples/angular-cli-sample/src/app/app.component.spec.ts

@@ -1,17 +1,15 @@
-/* tslint:disable:no-unused-variable */
-
 import { TestBed, async } from '@angular/core/testing';
+
 import { AppComponent } from './app.component';
 
 describe('AppComponent', () => {
-  beforeEach(() => {
+  beforeEach(async(() => {
     TestBed.configureTestingModule({
       declarations: [
         AppComponent
       ],
-    });
-    TestBed.compileComponents();
-  });
+    }).compileComponents();
+  }));
 
   it('should create the app', async(() => {
     const fixture = TestBed.createComponent(AppComponent);