From d993060c62ce112327a67e1a889b6f128c77db4c Mon Sep 17 00:00:00 2001 From: buchslava Date: Thu, 15 Oct 2015 13:08:11 +0300 Subject: [PATCH] Updated: angular2 0.40.0 integration --- components/file-upload/file-drop.ts | 3 +- components/file-upload/file-select.ts | 3 +- components/module.ts | 4 ++- demo/components/file-upload-section.ts | 4 +-- package.json | 23 ++++++-------- tsconfig.json | 11 ++----- webpack.config.js | 44 ++++++++++++++++---------- 7 files changed, 48 insertions(+), 44 deletions(-) diff --git a/components/file-upload/file-drop.ts b/components/file-upload/file-drop.ts index 20c01fe..50ce2b2 100644 --- a/components/file-upload/file-drop.ts +++ b/components/file-upload/file-drop.ts @@ -1,7 +1,6 @@ import { Component, View, OnInit, OnDestroy, OnChanges, - Directive, LifecycleEvent, - EventEmitter, ElementRef, Renderer, + Directive, EventEmitter, ElementRef, Renderer, CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass } from 'angular2/angular2'; diff --git a/components/file-upload/file-select.ts b/components/file-upload/file-select.ts index 3dc31e2..cba1b65 100644 --- a/components/file-upload/file-select.ts +++ b/components/file-upload/file-select.ts @@ -2,8 +2,7 @@ import { Component, View, OnInit, OnDestroy, OnChanges, - Directive, LifecycleEvent, - EventEmitter, ElementRef, Renderer, + Directive, EventEmitter, ElementRef, Renderer, CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass } from 'angular2/angular2'; diff --git a/components/module.ts b/components/module.ts index a799f35..23fd0d6 100644 --- a/components/module.ts +++ b/components/module.ts @@ -1,3 +1,5 @@ +/// + declare module 'ng2-file-upload' { - export * from 'index'; + export = require('index'); } diff --git a/demo/components/file-upload-section.ts b/demo/components/file-upload-section.ts index 7b6acac..05936ab 100644 --- a/demo/components/file-upload-section.ts +++ b/demo/components/file-upload-section.ts @@ -1,6 +1,6 @@ /// -import {Component, View, CORE_DIRECTIVES, NgNonBindable} from 'angular2/angular2'; +import {Component, View, CORE_DIRECTIVES} from 'angular2/angular2'; import {tabs} from 'ng2-bootstrap'; import {SimpleDemo} from './file-upload/simple-demo'; @@ -65,7 +65,7 @@ tabDesc.forEach(desc => { `, - directives: [SimpleDemo, tabs, CORE_DIRECTIVES, NgNonBindable] + directives: [SimpleDemo, tabs, CORE_DIRECTIVES] }) export class FileUploadSection { private currentHeading:string = 'Simple'; diff --git a/package.json b/package.json index 70a8f56..5790aca 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ng2-file-upload", - "version": "0.0.1", + "version": "0.40.0", "description": "angular2 file upload directives", "scripts": { "deploy": "NODE_ENV=production webpack -p --progress --color --optimize-minimize --optimize-dedupe --optimize-occurence-order", @@ -40,14 +40,11 @@ }, "homepage": "https://github.com/valor-software/ng2-file-upload#readme", "dependencies": { - "angular2": "2.0.0-alpha.37", - "es6-promise": "3.0.2", - "moment": "^2.10.6", - "ng2-bootstrap": "^0.37.0", - "reflect-metadata": "0.1.1", - "rtts_assert": "2.0.0-alpha.37", - "traceur-runtime": "0.0.59", - "zone.js": "0.5.4" + "angular2": "^2.0.0-alpha.40", + "ng2-bootstrap": "^0.40.0", + "reflect-metadata": "0.1.2", + "ts-loader": "0.5.6", + "zone.js": "0.5.8" }, "devDependencies": { "bootstrap": "^3.3.5", @@ -65,14 +62,14 @@ "html-loader": "^0.3.0", "markdown-loader": "^0.1.7", "marked": "^0.3.5", + "moment": "^2.10.6", "pre-commit": "^1.1.1", "prismjs": "valorkin/prism", "prismjs-loader": "0.0.2", "raw-loader": "^0.5.1", "require-dir": "^0.3.0", - "typescript": "^1.5.3", - "typescript-simple-loader": "^0.3.4", - "webpack": "^1.11.0", - "webpack-dev-server": "^1.10.1" + "typescript": "^1.6.2", + "webpack": "^1.12.2", + "webpack-dev-server": "^1.12.0" } } diff --git a/tsconfig.json b/tsconfig.json index 76c9bb0..867d345 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,5 @@ { - "version": "1.5.3", + "version": "1.6.2", "compilerOptions": { "target": "es5", "module": "commonjs", @@ -15,21 +15,16 @@ "noImplicitAny": false }, "filesGlob": [ - "./**/*.ts", "!./node_modules/**/*.ts" ], "files": [ + "./tsd.d.ts", "./components/file-upload/file-select.ts", "./components/file-upload/file-item.ts", "./components/file-upload/file-like-object.ts", "./components/file-upload/file-drop.ts", "./components/file-upload/file-uploader.ts", "./components/index.ts", - "./components/module.ts", - "./demo/components/file-upload-section.ts", - "./demo/components/file-upload/simple-demo.ts", - "./demo/index.ts", - "./tsd.d.ts", - "./typings/tsd.d.ts" + "./components/module.ts" ] } diff --git a/webpack.config.js b/webpack.config.js index 9f33710..e857d52 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -28,10 +28,16 @@ var absDest = path.join(__dirname, dest); var config = { // isProduction ? 'source-map' : 'evale', devtool: 'source-map', - debug: true, - cache: false, + cache: true, + + verbose: true, + displayErrorDetails: true, context: __dirname, + stats: { + colors: true, + reasons: true + }, resolve: { root: __dirname, @@ -42,11 +48,10 @@ var config = { entry: { angular2: [ // Angular 2 Deps - 'traceur-runtime', 'zone.js', 'reflect-metadata', - 'rtts_assert/rtts_assert', - 'angular2/angular2' + 'angular2/angular2', + 'angular2/core' ], 'angular2-file-upload': ['components'], 'angular2-file-upload-demo': 'demo' @@ -67,15 +72,10 @@ var config = { proxy: { '*/api/*': 'http://localhost:3000/' }, - - /*noInfo: false, - hot: true, - inline: true, - devtool: 'eval',*/ - contentBase: src, publicPath: dest }, + markdownLoader: { langPrefix: 'language-', highlight: function (code, lang) { @@ -107,8 +107,21 @@ var config = { // Support for .ts files. { test: /\.ts$/, - loader: 'typescript-simple', + loader: 'ts', + query: { + ignoreDiagnostics: [ + // TS2305 -> Module 'ng' has no exported member + 2305, + // TS2307 -> Cannot find external module + 2307, + // TS2300 -> Duplicate identifier + 2300, + // TS2309 -> An export assignment cannot be used in a module with other exported elements. + 2309 + ] + }, exclude: [ + /\.min\.js$/, /\.spec\.ts$/, /\.e2e\.ts$/, /web_modules/, @@ -118,7 +131,8 @@ var config = { } ], noParse: [ - /rtts_assert\/src\/rtts_assert/ + /rtts_assert\/src\/rtts_assert/, + /reflect-metadata/ ] }, @@ -160,9 +174,7 @@ var config = { minRatio: 0.8 }) ]); - }, - - stats: {colors: true, reasons: true} + } }; config.pushPlugins();