From 80cb9d5891705a693c7490de81bfe402aefa5763 Mon Sep 17 00:00:00 2001 From: Joaquim Rodolfo Galli Date: Wed, 4 May 2016 18:41:59 -0400 Subject: [PATCH 1/4] Adicionado a biblioteca do angular2 RC.0.1 --- .travis.yml | 20 +++++++++ components/file-upload/file-drop.ts | 2 +- components/file-upload/file-select.ts | 2 +- demo/components/file-upload-section.ts | 4 +- demo/components/file-upload/simple-demo.html | 2 +- demo/components/file-upload/simple-demo.ts | 4 +- demo/index.ts | 12 +++-- gulpfile.js | 1 + ng2-file-upload.ts | 2 + package.json | 47 +++++++++++++------- tsconfig.json | 13 +++--- typings.json | 9 ++++ webpack.config.js | 8 ++-- 13 files changed, 87 insertions(+), 39 deletions(-) create mode 100644 .travis.yml create mode 100644 typings.json diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..100c80f6 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,20 @@ +language: node_js +node_js: + - "5" + - "4" + +before_install: +- npm install -g npm@latest + +script: +- npm test +- npm run deploy + +addons: + firefox: "42.0" + apt: + sources: + - ubuntu-toolchain-r-test + # required by node-gyp to build some packages + packages: + - g++-4.8 diff --git a/components/file-upload/file-drop.ts b/components/file-upload/file-drop.ts index 50d4a052..2de4812d 100644 --- a/components/file-upload/file-drop.ts +++ b/components/file-upload/file-drop.ts @@ -1,4 +1,4 @@ -import { Directive, EventEmitter, ElementRef } from 'angular2/core'; +import { Directive, EventEmitter, ElementRef } from '@angular/core'; import { FileUploader } from './file-uploader'; diff --git a/components/file-upload/file-select.ts b/components/file-upload/file-select.ts index 66ca2292..0fb75de0 100644 --- a/components/file-upload/file-select.ts +++ b/components/file-upload/file-select.ts @@ -1,4 +1,4 @@ -import { Directive, ElementRef } from 'angular2/core'; +import { Directive, ElementRef } from '@angular/core'; import {FileUploader} from './file-uploader'; diff --git a/demo/components/file-upload-section.ts b/demo/components/file-upload-section.ts index 81a2c497..5c3fe76b 100644 --- a/demo/components/file-upload-section.ts +++ b/demo/components/file-upload-section.ts @@ -1,7 +1,7 @@ /// -import {Component, View} from 'angular2/core'; -import {CORE_DIRECTIVES} from 'angular2/common'; +import {Component} from '@angular/core'; +import {CORE_DIRECTIVES} from '@angular/common'; import {TAB_DIRECTIVES} from 'ng2-bootstrap/ng2-bootstrap'; import {SimpleDemo} from './file-upload/simple-demo'; diff --git a/demo/components/file-upload/simple-demo.html b/demo/components/file-upload/simple-demo.html index 135f1e28..f59cb7a6 100644 --- a/demo/components/file-upload/simple-demo.html +++ b/demo/components/file-upload/simple-demo.html @@ -59,7 +59,7 @@

Upload queue

- + {{ item?.file?.name }} {{ item?.file?.size/1024/1024 | number:'.2' }} MB diff --git a/demo/components/file-upload/simple-demo.ts b/demo/components/file-upload/simple-demo.ts index cddc0433..3d031c5f 100644 --- a/demo/components/file-upload/simple-demo.ts +++ b/demo/components/file-upload/simple-demo.ts @@ -1,7 +1,7 @@ /// -import {Component} from 'angular2/core'; -import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass, NgStyle} from 'angular2/common'; +import {Component} from '@angular/core'; +import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass, NgStyle} from '@angular/common'; import {FILE_UPLOAD_DIRECTIVES, FileUploader} from '../../../ng2-file-upload'; // webpack html imports diff --git a/demo/index.ts b/demo/index.ts index 3a70956a..7bf13c01 100644 --- a/demo/index.ts +++ b/demo/index.ts @@ -1,16 +1,14 @@ -/// -import {bootstrap} from 'angular2/platform/browser'; -import {Component, View} from 'angular2/core'; -import {NgClass} from 'angular2/common'; +/// +import {bootstrap} from '@angular/platform-browser-dynamic'; +import {Component} from '@angular/core'; +import {NgClass} from '@angular/common'; import {FileUploadSection} from './components/file-upload-section'; let gettingStarted = require('./getting-started.md'); @Component({ - selector: 'app' -}) -@View({ + selector: 'app', template: `
diff --git a/gulpfile.js b/gulpfile.js index 2eb78a88..654d545a 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -26,4 +26,5 @@ gulp.task('clean', function () { gulp.task('default', function () { gulp.start('lint'); + }); diff --git a/ng2-file-upload.ts b/ng2-file-upload.ts index 74d20a4a..b6a0e8d1 100644 --- a/ng2-file-upload.ts +++ b/ng2-file-upload.ts @@ -1,3 +1,5 @@ +/// + export * from './components/file-upload/file-select'; export * from './components/file-upload/file-drop'; export * from './components/file-upload/file-uploader'; diff --git a/package.json b/package.json index ab9a2317..3eb59207 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "prepublish": "gulp clean && tsc", "server": "webpack-dev-server --hot --inline --colors --display-error-details --display-cached", "start": "npm run server", - "test": "gulp lint" + "test": "gulp lint", + "postinstall": "typings install" }, "main": "ng2-file-upload.js", "typings": "ng2-file-upload.d.ts", @@ -27,16 +28,25 @@ "url": "https://github.com/valor-software/ng2-file-upload/issues" }, "homepage": "https://github.com/valor-software/ng2-file-upload#readme", - "dependencies": {}, + "dependencies": { + }, + "peerDependencies": { + "@angular/common": "^2.0.0-rc.1", + "@angular/compiler": "^2.0.0-rc.1", + "@angular/core": "^2.0.0-rc.1", + "@angular/platform-browser": "^2.0.0-rc.1", + "@angular/platform-browser-dynamic": "^2.0.0-rc.1" +}, "devDependencies": { - "angular2": "2.0.0-beta.0", - "reflect-metadata": "0.1.2", - "rxjs": "5.0.0-beta.0", - "zone.js": "0.6.10", - "es6-shim": "0.33.13", + "@angular/common": "2.0.0-rc.1", + "@angular/compiler": "2.0.0-rc.1", + "@angular/core": "2.0.0-rc.1", + "@angular/platform-browser": "2.0.0-rc.1", + "@angular/platform-browser-dynamic": "2.0.0-rc.1", "bootstrap": "3.3.6", - "clean-webpack-plugin": "0.1.8", - "compression-webpack-plugin": "0.3.1", + "clean-webpack-plugin": "0.1.9", + "es6-promise": "^3.1.2", + "es6-shim": "^0.35.0", "eslint": "1.10.3", "exports-loader": "0.6.3", "file-loader": "0.8.5", @@ -44,23 +54,26 @@ "gulp-clean": "0.3.2", "gulp-eslint": "1.1.1", "gulp-size": "2.1.0", - "gulp-tsc": "1.1.4", - "gulp-tslint": "4.3.5", + "gulp-tsc": "1.1.5", + "gulp-tslint": "5.0.0", "html-loader": "0.4.3", "markdown-loader": "0.1.7", "marked": "0.3.5", - "moment": "2.11.2", - "ng2-bootstrap": "1.0.11", + "moment": "2.13.0", + "ng2-bootstrap": "^1.0.15", "pre-commit": "1.1.2", "prismjs": "valorkin/prism", "prismjs-loader": "0.0.2", "raw-loader": "0.5.1", + "reflect-metadata": "0.1.2", "require-dir": "0.3.0", + "rxjs": "^5.0.0-beta.6", "ts-loader": "0.8.2", - "tslint": "3.7.1", - "typescript": "1.8.9", - "webpack": "1.12.15", - "webpack-dev-server": "1.14.0" + "tslint": "3.9.0", + "typescript": "1.8.10", + "webpack": "1.13.0", + "webpack-dev-server": "1.14.1", + "zone.js": "^0.6.12" }, "contributors": [ { diff --git a/tsconfig.json b/tsconfig.json index f3203937..30fe8027 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,14 +1,15 @@ { - "version": "1.7.5", + "version": "1.7.6", "compilerOptions": { "target": "es5", "module": "commonjs", - "sourceMap": true, + "moduleResolution": "node", + "sourceMap": false, "declaration": true, - "removeComments": true, + "removeComments": false, "emitDecoratorMetadata": true, "experimentalDecorators": true, - "listFiles": false, + "listFiles": true, "noLib": false, "noImplicitAny": true }, @@ -16,6 +17,8 @@ "node_modules" ], "files": [ - "ng2-file-upload.ts" + "ng2-file-upload.ts", + "./typings/browser.d.ts", + "./ng2-file-upload.ts" ] } diff --git a/typings.json b/typings.json new file mode 100644 index 00000000..5fa43da4 --- /dev/null +++ b/typings.json @@ -0,0 +1,9 @@ +{ + "dependencies": { + "webpack": "registry:npm/webpack#1.12.9+20160219013405" + }, + "devDependencies": {}, + "ambientDependencies": { + "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654" + } +} diff --git a/webpack.config.js b/webpack.config.js index b98b7c18..8ee6d46c 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -48,10 +48,12 @@ var config = { entry: { angular2: [ // Angular 2 Deps - 'zone.js/dist/zone-microtask', + 'es6-shim', + 'es6-promise', + 'zone.js', 'reflect-metadata', - 'angular2/common', - 'angular2/core' + '@angular/common', + '@angular/core' ], 'angular2-file-upload': ['ng2-file-upload'], 'angular2-file-upload-demo': 'demo' From 7a18833df47a83157c06054fea7ae9740639b630 Mon Sep 17 00:00:00 2001 From: Joaquim Rodolfo Galli Date: Wed, 4 May 2016 18:42:37 -0400 Subject: [PATCH 2/4] Adicionado a biblioteca do angular2 RC.0.1 --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 654d545a..cbeaeadc 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -26,5 +26,5 @@ gulp.task('clean', function () { gulp.task('default', function () { gulp.start('lint'); - }); + From 434c67e2a82912cbe754cadb8398871d241cad05 Mon Sep 17 00:00:00 2001 From: Joaquim Rodolfo Galli Date: Fri, 6 May 2016 16:39:49 -0400 Subject: [PATCH 3/4] Changed the NG2-bootstrap version for RC.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3eb59207..949ce349 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "markdown-loader": "0.1.7", "marked": "0.3.5", "moment": "2.13.0", - "ng2-bootstrap": "^1.0.15", + "ng2-bootstrap": "git://github.com/valor-software/ng2-bootstrap.git#development", "pre-commit": "1.1.2", "prismjs": "valorkin/prism", "prismjs-loader": "0.0.2", From b966cbdc6dfb86eda2d08fdfa58f163da41172b4 Mon Sep 17 00:00:00 2001 From: Joaquim Rodolfo Galli Date: Fri, 6 May 2016 17:00:53 -0400 Subject: [PATCH 4/4] Changed package.json, remove postinstall: `typings install` --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 949ce349..e97ef075 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,7 @@ "prepublish": "gulp clean && tsc", "server": "webpack-dev-server --hot --inline --colors --display-error-details --display-cached", "start": "npm run server", - "test": "gulp lint", - "postinstall": "typings install" + "test": "gulp lint" }, "main": "ng2-file-upload.js", "typings": "ng2-file-upload.d.ts", @@ -67,7 +66,7 @@ "raw-loader": "0.5.1", "reflect-metadata": "0.1.2", "require-dir": "0.3.0", - "rxjs": "^5.0.0-beta.6", + "rxjs": "5.0.0-beta.6", "ts-loader": "0.8.2", "tslint": "3.9.0", "typescript": "1.8.10",