From f3981cd03e1bd2e18d3b52a8be3a2a083568c0cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20Farkas?= Date: Tue, 3 May 2016 21:29:57 +0200 Subject: [PATCH] Update dependencies (mostly angular2 to rc.0). --- package.json | 24 ++++++++++++-------- src/boot.ts | 4 +--- src/components/svg-keyboard-key.component.ts | 2 +- src/components/svg-keyboard.component.ts | 2 +- src/components/svg-module.component.ts | 2 +- src/main-app.component.ts | 2 +- src/services/data-provider.service.ts | 2 +- src/services/mapper.service.ts | 2 +- typings.json | 2 +- 9 files changed, 22 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index aec1d7c2..328bb9e1 100644 --- a/package.json +++ b/package.json @@ -8,35 +8,39 @@ }, "license": "GPL-3.0", "devDependencies": { - "angular2": "2.0.0-beta.17", - "browser-stdout": "^1.3.0", "browser-sync": "^2.11.0", - "es6-shim": "^0.35.0", "gulp": "^3.9.1", "gulp-if": "^2.0.0", "gulp-sass": "^2.2.0", "gulp-sourcemaps": "^1.6.0", - "json-loader": "^0.5.4", - "reflect-metadata": "0.1.2", - "rxjs": "5.0.0-beta.6", "ts-loader": "^0.8.2", "tslint": "^3.8.1", "typings": "^0.8.1", "webpack": "^1.13.0", "webpack-dev-server": "^1.14.1", "webpack-svgstore-plugin": "^2.1.5", - "xml-loader": "^1.1.0", - "yargs": "^4.2.0", - "zone.js": "^0.6.12" + "yargs": "^4.2.0" }, "dependencies": { + "@angular/common": "^2.0.0-rc.0", + "@angular/compiler": "^2.0.0-rc.0", + "@angular/core": "2.0.0-rc.0", + "@angular/platform-browser": "^2.0.0-rc.0", + "@angular/platform-browser-dynamic": "^2.0.0-rc.0", "bootstrap": "^3.3.6", + "browser-stdout": "^1.3.0", + "es6-shim": "^0.35.0", "font-awesome": "^4.5.0", "handlebars": "^4.0.5", "jquery": "^2.2.2", + "json-loader": "^0.5.4", + "reflect-metadata": "^0.1.3", + "rxjs": "5.0.0-beta.6", "select2": "^4.0.2", "sortablejs": "^1.4.2", - "typescript": "^1.8.10" + "typescript": "^1.8.10", + "xml-loader": "^1.1.0", + "zone.js": "^0.6.12" }, "scripts": { "postinstall": "typings install", diff --git a/src/boot.ts b/src/boot.ts index b5ad99c4..fd9c3a28 100644 --- a/src/boot.ts +++ b/src/boot.ts @@ -1,5 +1,4 @@ -import { bootstrap } from 'angular2/platform/browser'; -import { HTTP_PROVIDERS } from 'angular2/http'; +import { bootstrap } from '@angular/platform-browser-dynamic'; import { MainAppComponent } from './main-app.component'; @@ -9,7 +8,6 @@ import {MapperService} from './services/mapper.service'; process.stdout = require('browser-stdout')(); bootstrap(MainAppComponent, [ - HTTP_PROVIDERS, DataProviderService, MapperService ]).catch(err => console.error(err)); diff --git a/src/components/svg-keyboard-key.component.ts b/src/components/svg-keyboard-key.component.ts index 83c22929..d35c5a22 100644 --- a/src/components/svg-keyboard-key.component.ts +++ b/src/components/svg-keyboard-key.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, OnChanges, SimpleChange } from 'angular2/core'; +import { Component, OnInit, Input, OnChanges, SimpleChange } from '@angular/core'; import {KeyAction} from '../../config-serializer/config-items/KeyAction'; import {KeystrokeAction} from '../../config-serializer/config-items/KeystrokeAction'; diff --git a/src/components/svg-keyboard.component.ts b/src/components/svg-keyboard.component.ts index 7ad83a19..88bb88a2 100644 --- a/src/components/svg-keyboard.component.ts +++ b/src/components/svg-keyboard.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input} from 'angular2/core'; +import { Component, OnInit, Input} from '@angular/core'; import {Module} from '../../config-serializer/config-items/Module'; import {SvgModule} from './svg-module.model'; diff --git a/src/components/svg-module.component.ts b/src/components/svg-module.component.ts index ca5bfe74..b76a6375 100644 --- a/src/components/svg-module.component.ts +++ b/src/components/svg-module.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from 'angular2/core'; +import { Component, OnInit, Input } from '@angular/core'; import {SvgKeyboardKey} from './svg-keyboard-key.model'; import {SvgKeyboardKeyComponent} from './svg-keyboard-key.component'; diff --git a/src/main-app.component.ts b/src/main-app.component.ts index 5859bffa..8b811715 100644 --- a/src/main-app.component.ts +++ b/src/main-app.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, AfterViewInit, Renderer, ViewChildren, QueryList, ElementRef} from 'angular2/core'; +import { Component, OnInit, AfterViewInit, Renderer, ViewChildren, QueryList, ElementRef} from '@angular/core'; import {UhkConfiguration} from '../config-serializer/config-items/UhkConfiguration'; import {Layers} from '../config-serializer/config-items/Layers'; diff --git a/src/services/data-provider.service.ts b/src/services/data-provider.service.ts index d67a647d..1810d994 100644 --- a/src/services/data-provider.service.ts +++ b/src/services/data-provider.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from 'angular2/core'; +import { Injectable } from '@angular/core'; @Injectable() export class DataProviderService { diff --git a/src/services/mapper.service.ts b/src/services/mapper.service.ts index 83d0ed1e..452e8b8e 100644 --- a/src/services/mapper.service.ts +++ b/src/services/mapper.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from 'angular2/core'; +import { Injectable } from '@angular/core'; @Injectable() export class MapperService { diff --git a/typings.json b/typings.json index 67a29df3..e886e264 100644 --- a/typings.json +++ b/typings.json @@ -1,6 +1,6 @@ { "ambientDependencies": { "node": "registry:dt/node#4.0.0+20160319033040", - "es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#7de6c3dd94feaeb21f20054b9f30d5dabc5efabd" + "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654" } }