Skip to content

Commit 13c5c35

Browse files
ciriartevalorkin
authored andcommitted
feat(package): upgrade to angular 2.0.0-rc.1 (#176)
* Upgrade to angular 2.0.0-rc.1 * Add a simple .travis.yml closes #180 * Upgrade to ng2-bootstrap 1.0.16 * Install typings on prepublish * (chore) Fix rxjs dependency, moved it to dev dep * (chore) Upgrade to node 6. Keep mandatory deps.
1 parent 32219be commit 13c5c35

11 files changed

Lines changed: 76 additions & 39 deletions

File tree

.travis.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
language: node_js
2+
node_js:
3+
- "6"
4+
5+
script:
6+
- npm test
7+
- npm run deploy
8+
9+
addons:
10+
firefox: "42.0"
11+
apt:
12+
sources:
13+
- ubuntu-toolchain-r-test
14+
# required by node-gyp to build some packages
15+
packages:
16+
- g++-4.8

components/file-upload/file-drop.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Directive, EventEmitter, ElementRef } from 'angular2/core';
1+
import { Directive, EventEmitter, ElementRef } from '@angular/core';
22

33
import { FileUploader } from './file-uploader';
44

components/file-upload/file-select.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Directive, ElementRef } from 'angular2/core';
1+
import { Directive, ElementRef } from '@angular/core';
22

33
import {FileUploader} from './file-uploader';
44

demo/components/file-upload-section.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/// <reference path="../../tsd.d.ts" />
22

3-
import {Component, View} from 'angular2/core';
4-
import {CORE_DIRECTIVES} from 'angular2/common';
3+
import {Component} from '@angular/core';
4+
import {CORE_DIRECTIVES} from '@angular/common';
55

66
import {TAB_DIRECTIVES} from 'ng2-bootstrap/ng2-bootstrap';
77
import {SimpleDemo} from './file-upload/simple-demo';

demo/components/file-upload/simple-demo.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ <h3>Upload queue</h3>
5959
</tr>
6060
</thead>
6161
<tbody>
62-
<tr *ngFor="#item of uploader.queue">
62+
<tr *ngFor="let item of uploader.queue">
6363
<td><strong>{{ item?.file?.name }}</strong></td>
6464
<td *ngIf="uploader.isHTML5" nowrap>{{ item?.file?.size/1024/1024 | number:'.2' }} MB</td>
6565
<td *ngIf="uploader.isHTML5">

demo/components/file-upload/simple-demo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/// <reference path="../../../tsd.d.ts" />
22

3-
import {Component} from 'angular2/core';
4-
import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass, NgStyle} from 'angular2/common';
3+
import {Component} from '@angular/core';
4+
import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass, NgStyle} from '@angular/common';
55
import {FILE_UPLOAD_DIRECTIVES, FileUploader} from '../../../ng2-file-upload';
66

77
// webpack html imports

demo/index.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
/// <reference path="../tsd.d.ts" />
2-
import {bootstrap} from 'angular2/platform/browser';
3-
import {Component, View} from 'angular2/core';
4-
import {NgClass} from 'angular2/common';
2+
import {bootstrap} from '@angular/platform-browser-dynamic';
3+
import {Component} from '@angular/core';
4+
import {NgClass} from '@angular/common';
55

66
import {FileUploadSection} from './components/file-upload-section';
77

88
let gettingStarted = require('./getting-started.md');
99

1010
@Component({
11-
selector: 'app'
12-
})
13-
@View({
11+
selector: 'app',
1412
template: `
1513
<main class="bd-pageheader">
1614
<div class="container">

package.json

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "angular2 file upload directives",
55
"scripts": {
66
"deploy": "NODE_ENV=production webpack -p --progress --color --optimize-minimize --optimize-dedupe --optimize-occurence-order",
7-
"prepublish": "gulp clean && tsc",
7+
"prepublish": "gulp clean && ./node_modules/.bin/typings install && tsc",
88
"server": "webpack-dev-server --hot --inline --colors --display-error-details --display-cached",
99
"start": "npm run server",
1010
"test": "gulp lint"
@@ -27,40 +27,51 @@
2727
"url": "https://github.com/valor-software/ng2-file-upload/issues"
2828
},
2929
"homepage": "https://github.com/valor-software/ng2-file-upload#readme",
30-
"dependencies": {},
30+
"dependencies": {
31+
},
32+
"peerDependencies": {
33+
"@angular/common": "^2.0.0-rc.1",
34+
"@angular/core": "^2.0.0-rc.1"
35+
},
3136
"devDependencies": {
32-
"angular2": "2.0.0-beta.0",
33-
"reflect-metadata": "0.1.2",
34-
"rxjs": "5.0.0-beta.0",
35-
"zone.js": "0.6.10",
36-
"es6-shim": "0.33.13",
37+
"@angular/common": "^2.0.0-rc.1",
38+
"@angular/compiler": "^2.0.0-rc.1",
39+
"@angular/core": "^2.0.0-rc.1",
40+
"@angular/platform-browser": "^2.0.0-rc.1",
41+
"@angular/platform-browser-dynamic": "^2.0.0-rc.1",
3742
"bootstrap": "3.3.6",
38-
"clean-webpack-plugin": "0.1.8",
43+
"clean-webpack-plugin": "0.1.9",
3944
"compression-webpack-plugin": "0.3.1",
45+
"es6-promise": "^3.1.2",
46+
"es6-shim": "^0.35.0",
4047
"eslint": "1.10.3",
4148
"exports-loader": "0.6.3",
4249
"file-loader": "0.8.5",
4350
"gulp": "3.9.1",
4451
"gulp-clean": "0.3.2",
4552
"gulp-eslint": "1.1.1",
4653
"gulp-size": "2.1.0",
47-
"gulp-tsc": "1.1.4",
48-
"gulp-tslint": "4.3.5",
54+
"gulp-tsc": "1.1.5",
55+
"gulp-tslint": "5.0.0",
4956
"html-loader": "0.4.3",
5057
"markdown-loader": "0.1.7",
5158
"marked": "0.3.5",
52-
"moment": "2.11.2",
53-
"ng2-bootstrap": "1.0.11",
59+
"moment": "2.13.0",
60+
"ng2-bootstrap": "1.0.16",
5461
"pre-commit": "1.1.2",
5562
"prismjs": "valorkin/prism",
5663
"prismjs-loader": "0.0.2",
5764
"raw-loader": "0.5.1",
65+
"reflect-metadata": "0.1.2",
5866
"require-dir": "0.3.0",
67+
"rxjs": "5.0.0-beta.6",
5968
"ts-loader": "0.8.2",
60-
"tslint": "3.7.1",
61-
"typescript": "1.8.9",
62-
"webpack": "1.12.15",
63-
"webpack-dev-server": "1.14.0"
69+
"tslint": "3.9.0",
70+
"typescript": "1.8.10",
71+
"typings": "^0.8.1",
72+
"webpack": "1.13.0",
73+
"webpack-dev-server": "1.14.1",
74+
"zone.js": "^0.6.12"
6475
},
6576
"contributors": [
6677
{

tsconfig.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
{
2-
"version": "1.7.5",
32
"compilerOptions": {
43
"target": "es5",
54
"module": "commonjs",
6-
"sourceMap": true,
5+
"moduleResolution": "node",
6+
"sourceMap": false,
77
"declaration": true,
8-
"removeComments": true,
8+
"removeComments": false,
99
"emitDecoratorMetadata": true,
1010
"experimentalDecorators": true,
11+
"noImplicitAny": true,
1112
"listFiles": false,
12-
"noLib": false,
13-
"noImplicitAny": true
13+
"noLib": false
1414
},
1515
"exclude": [
1616
"node_modules"
1717
],
1818
"files": [
19-
"ng2-file-upload.ts"
19+
"./typings/browser.d.ts",
20+
"./ng2-file-upload.ts"
2021
]
21-
}
22+
}

typings.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"dependencies": {
3+
"webpack": "registry:npm/webpack#1.12.9+20160219013405"
4+
},
5+
"devDependencies": {},
6+
"ambientDependencies": {
7+
"es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654"
8+
}
9+
}

0 commit comments

Comments
 (0)