From 23d9de85dbcfb29d5e75808f886d16c133f73966 Mon Sep 17 00:00:00 2001 From: Dmitriy Shekhovtsov Date: Wed, 14 Oct 2015 17:11:18 +0300 Subject: [PATCH] version(0.42.0): updated ng2 and build process --- components/accordion/accordion.ts | 2 - components/index.ts | 2 - components/module.ts | 3 -- components/position.ts | 2 - gulpfile.js | 29 --------------- package.json | 61 ++++++++++++++----------------- tsconfig.json | 30 +-------------- tsd.d.ts | 1 - typings/tsd.d.ts | 5 --- 9 files changed, 29 insertions(+), 106 deletions(-) delete mode 100644 components/module.ts delete mode 100644 typings/tsd.d.ts diff --git a/components/accordion/accordion.ts b/components/accordion/accordion.ts index 4a5e9f4b36..e9336ec3b7 100644 --- a/components/accordion/accordion.ts +++ b/components/accordion/accordion.ts @@ -1,5 +1,3 @@ -/// - import { Component, View, Directive, OnInit, OnDestroy, diff --git a/components/index.ts b/components/index.ts index 2b128f2d59..b6d8a0aa2d 100644 --- a/components/index.ts +++ b/components/index.ts @@ -1,5 +1,3 @@ -/// - export * from './accordion/accordion'; export * from './alert/alert'; export * from './buttons/button-radio'; diff --git a/components/module.ts b/components/module.ts deleted file mode 100644 index 98c25d3bb9..0000000000 --- a/components/module.ts +++ /dev/null @@ -1,3 +0,0 @@ -declare module 'ng2-bootstrap' { - // export * from 'index'; -} diff --git a/components/position.ts b/components/position.ts index 52c18f7ef5..20f7db5411 100644 --- a/components/position.ts +++ b/components/position.ts @@ -1,5 +1,3 @@ -/// - import { Injectable, ElementRef diff --git a/gulpfile.js b/gulpfile.js index 723499832f..6ef497ec64 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -17,41 +17,12 @@ gulp.paths = { require('require-dir')('./gulp-tasks'); -var typescript = require('gulp-tsc'); -var options = require('./tsconfig.json').compilerOptions; -options.emitError = false; - -var o = { - target: 'es5', - module: 'commonjs', - outDir: 'dist', - sourceRoot: 'dist', - mapRoot: 'dist', - keepTree: true, - declaration: true, - noEmitOnError: true, - emitError: false, - sourceMap: true, - removeComments: true, - noResolve: false, - suppressImplicitAnyIndexErrors: true, - safe: false, - emitDecoratorMetadata: true, - experimentalDecorators: true -}; - var clean = require('gulp-clean'); gulp.task('clean', function () { return gulp.src('dist', {read: false}) .pipe(clean()); }); -gulp.task('compile', ['clean'], function () { - gulp.src(['components/**/*.ts']) - .pipe(typescript(o)) - .pipe(gulp.dest(options.outDir)); -}); - gulp.task('default', function () { gulp.start('lint'); }); diff --git a/package.json b/package.json index 51b8e47392..885b6fe706 100644 --- a/package.json +++ b/package.json @@ -1,27 +1,20 @@ { "name": "ng2-bootstrap", - "version": "0.40.0", + "version": "0.42.0", "description": "angular2 bootstrap components", "scripts": { "deploy": "NODE_ENV=production webpack -p --progress --color --optimize-minimize --optimize-dedupe --optimize-occurence-order", - "prepublish": "gulp compile", + "prepublish": "gulp clean && tsc", "prestart": "npm install", "server": "webpack-dev-server --hot --inline --colors --display-error-details --display-cached", "start": "npm run server", "test": "gulp lint" }, "main": "dist/index.js", - "typescript": { - "definition": [ - "dist/module.d.ts", - "typings/es6-object.d.ts" - ] - }, + "typings": "dist/index.d.ts", "files": [ "dist", - "components", - "typings", - "tsd.d.ts" + "components" ], "keywords": [ "angular2", @@ -40,35 +33,35 @@ }, "homepage": "https://github.com/valor-software/ng2-bootstrap#readme", "dependencies": { - "angular2": "^2.0.0-alpha.40", + "angular2": "2.0.0-alpha.42", "reflect-metadata": "0.1.2", "ts-loader": "0.5.6", "zone.js": "0.5.8" }, "devDependencies": { - "bootstrap": "^3.3.5", - "clean-webpack-plugin": "^0.1.3", - "compression-webpack-plugin": "^0.2.0", - "eslint": "^1.1.0", - "exports-loader": "^0.6.2", - "file-loader": "^0.8.4", - "gulp": "^3.9.0", - "gulp-clean": "^0.3.1", - "gulp-eslint": "^1.0.0", - "gulp-size": "^2.0.0", - "gulp-tsc": "^1.1.1", - "gulp-tslint": "^3.1.2", - "html-loader": "^0.3.0", - "markdown-loader": "^0.1.7", - "marked": "^0.3.5", - "moment": "^2.10.6", - "pre-commit": "^1.1.1", + "bootstrap": "3.3.5", + "clean-webpack-plugin": "0.1.3", + "compression-webpack-plugin": "0.2.0", + "eslint": "1.6.0", + "exports-loader": "0.6.2", + "file-loader": "0.8.4", + "gulp": "3.9.0", + "gulp-clean": "0.3.1", + "gulp-eslint": "1.0.0", + "gulp-size": "2.0.0", + "gulp-tsc": "1.1.1", + "gulp-tslint": "3.3.1", + "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.6.2", - "webpack": "^1.12.2", - "webpack-dev-server": "^1.12.0" + "raw-loader": "0.5.1", + "require-dir": "0.3.0", + "typescript": "1.6.2", + "webpack": "1.12.2", + "webpack-dev-server": "1.12.0" } } diff --git a/tsconfig.json b/tsconfig.json index 07ef990f3d..bd977db074 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,36 +14,10 @@ "noEmitOnError": false, "noImplicitAny": false }, - "filesGlob": [ - "!./node_modules/**/*.ts" + "exclude": [ + "node_modules" ], "files": [ - "./tsd.d.ts", - - "./components/accordion/accordion.ts", - "./components/alert/alert.ts", - "./components/buttons/button-checkbox.ts", - "./components/buttons/button-radio.ts", - "./components/carousel/carousel.ts", - "./components/collapse/collapse.ts", - "./components/dropdown/dropdown-menu.ts", - "./components/dropdown/dropdown-service.ts", - "./components/dropdown/dropdown-toggle.ts", - "./components/dropdown/dropdown.interfaces.ts", - "./components/dropdown/dropdown.ts", - "./components/dropdown/index.ts", - "./components/pagination/pagination.ts", - "./components/progressbar/progressbar.ts", - "./components/rating/rating.ts", - "./components/tabs/tabs.ts", - "./components/timepicker/timepicker.ts", - "./components/typeahead/typeahead.ts", - - "./components/common.ts", - "./components/position.ts", - - "./components/ng2-bootstrap-config.ts", - "./components/index.ts" ] } diff --git a/tsd.d.ts b/tsd.d.ts index 1c3f52332a..897f829a38 100644 --- a/tsd.d.ts +++ b/tsd.d.ts @@ -1,3 +1,2 @@ /// /// -/// diff --git a/typings/tsd.d.ts b/typings/tsd.d.ts deleted file mode 100644 index 9205ecac26..0000000000 --- a/typings/tsd.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -/// -/// -/// -/// -///