diff --git a/config/webpack.common.js b/config/webpack.common.js index 0ad5966..e65e063 100644 --- a/config/webpack.common.js +++ b/config/webpack.common.js @@ -10,8 +10,6 @@ const helpers = require('./helpers'), /** * Webpack Plugins */ -// const AssetsPlugin = require('assets-webpack-plugin'); -// const autoprefixer = require('autoprefixer'); // const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin; // const CommonsChunkPlugin = webpack.optimize.CommonsChunkPlugin; const ContextReplacementPlugin = require('webpack/lib/ContextReplacementPlugin'); @@ -26,7 +24,6 @@ const LoaderOptionsPlugin = require('webpack/lib/LoaderOptionsPlugin'); const NormalModuleReplacementPlugin = require('webpack/lib/NormalModuleReplacementPlugin'); const OptimizeJsPlugin = require('optimize-js-plugin'); const ProvidePlugin = require('webpack/lib/ProvidePlugin'); -// const ScriptExtHtmlWebpackPlugin = require('script-ext-html-webpack-plugin'); const UglifyJsPlugin = require('webpack/lib/optimize/UglifyJsPlugin'); @@ -133,28 +130,11 @@ module.exports = { new webpack.LoaderOptionsPlugin({ options: { - /** - * Html loader advanced options - * - * See: https://github.com/webpack/html-loader#advanced-options - */ - // TODO: Need to workaround Angular 2's html syntax => #id [bind] (event) *ngFor - // htmlLoader: { - // minimize: true, - // removeAttributeQuotes: false, - // caseSensitive: true, - // customAttrSurround: [ - // [/#/, /(?:)/], - // [/\*/, /(?:)/], - // [/\[?\(?/, /(?:)/] - // ], - // customAttrAssign: [/\)?\]?=/] - // }, - tslintLoader: { emitErrors: false, failOnHint: false }, + /** * Sass * Reference: https://github.com/jtangelder/sass-loader diff --git a/package.json b/package.json index 104f1e3..8aa7457 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ "build:library": "gulp build-library", "build:components": "npm-run-all remove-dist bundle minify prebuild:add-require transpile-sass transpile copy-files postbuild:remove-require", "bundle": "webpack --config config/webpack.prod.js --progress --profile --bail", - "bundle-rollup": "rollup -c", "clean-dist": "rimraf dist dist-watch", "clean": "npm cache clean && npm run rimraf -- node_modules doc coverage dist bundles", "cleanup": "rimraf dist/package.json dist/bundles dist/src dist/index.d.ts dist/index.metadata.json dist/index.js dist/index.js.map dist/LICENSE dist/README.md", @@ -78,36 +77,23 @@ "@angular/common": "2.4.9", "@angular/compiler": "2.4.9", "@angular/compiler-cli": "2.4.9", - "@angular/forms": "2.4.9", "@angular/platform-browser": "2.4.9", "@angular/platform-browser-dynamic": "2.4.9", - "@angular/platform-server": "2.4.9", - "@angular/router": "3.4.9", "@krux/condition-jenkins": "1.0.1", "@types/jasmine": "2.5.43", - "angular2-load-children-loader": "0.1.3", - "angular2-router-loader": "0.3.5", "angular2-template-loader": "0.6.2", - "angular2-tree-component": "2.8.2", - "assets-webpack-plugin": "3.5.1", - "autoprefixer": "6.7.6", "awesome-typescript-loader": "3.1.2", "child_process": "1.0.2", - "clean-css": "4.0.8", "clean-webpack-plugin": "0.1.15", "codelyzer": "3.0.0-beta.3", "copy-webpack-plugin": "4.0.1", "copyfiles": "1.2.0", "core-js": "2.4.1", - "cpy-cli": "1.0.1", "cz-conventional-changelog": "2.0.0", "css-loader": "0.26.2", "del": "2.2.2", - "exports-loader": "0.6.4", - "expose-loader": "0.7.3", "extract-text-webpack-plugin": "2.1.0", "file-loader": "0.10.1", - "gh-pages": "0.12.0", "gulp": "3.9.1", "gulp-concat": "2.6.1", "gulp-changed": "2.0.0", @@ -125,11 +111,8 @@ "gulp-uglify": "2.0.1", "gulp-util": "3.0.8", "gulp-wait": "0.0.2", - "html-loader": "0.4.5", - "html-minifier": "3.4.0", "html-webpack-plugin": "2.28.0", "husky": "0.13.2", - "imports-loader": "0.7.1", "istanbul-instrumenter-loader": "2.0.0", "jasmine-core": "2.5.2", "json-loader": "0.5.4", @@ -146,50 +129,33 @@ "karma-sourcemap-loader": "0.3.7", "karma-webpack": "2.0.2", "mocha": "3.2.0", - "moment": "2.17.1", - "node-sass": "4.5.0", "npm-run-all": "4.0.2", - "null-loader": "0.1.1", - "opt-cli": "1.5.1", "optimize-js-plugin": "0.0.4", - "parse5": "2.2.3", "phantomjs-prebuilt": "2.1.14", - "postcss-loader": "1.3.3", - "precss": "1.4.0", "protractor": "5.1.1", "raw-loader": "0.5.1", "reflect-metadata": "0.1.10", - "resolve-url-loader": "2.0.2", "rimraf": "2.6.1", - "rollup": "0.41.4", - "rollup-plugin-angular-aot": "0.0.4", "run-sequence": "1.2.2", "rxjs": "5.0.1", "sass-loader": "6.0.3", - "script-ext-html-webpack-plugin": "1.7.1", "semantic-release": "6.3.2", "source-map-loader": "0.1.6", "string-replace-loader": "1.0.5", - "style-loader": "0.13.2", "to-string-loader": "1.1.5", "ts-helpers": "1.1.2", - "ts-loader": "2.0.1", "ts-node": "2.1.0", "tslint": "4.5.1", "tslint-loader": "3.4.3", "typedoc": "0.5.7", "typescript": "2.1.6", "uglify-js": "2.8.7", - "url-loader": "0.5.8", "webpack": "2.2.1", "webpack-bundle-analyzer": "2.3.0", "webpack-dashboard": "0.3.0", - "webpack-dev-middleware": "1.10.1", "webpack-dev-server": "2.4.1", - "webpack-dll-bundles-plugin": "1.0.0-beta.5", "webpack-md5-hash": "0.0.5", "webpack-merge": "3.0.0", - "webpack-validator": "2.3.0", "zone.js": "0.7.7" }, "release": { diff --git a/rollup.config.js b/rollup.config.js deleted file mode 100644 index 4c5c705..0000000 --- a/rollup.config.js +++ /dev/null @@ -1,23 +0,0 @@ -export default { - entry: 'dist/index.js', - dest: 'dist/bundles/ngx-base.js', - sourceMap: false, - format: 'umd', - moduleName: 'ngx.base', - globals: { - '@angular/core': 'ng.core', - '@angular/http': 'ng.http', - '@angular/router': 'ng.router', - 'lodash': 'lodash', - 'ngx-login-client': 'LoginModule', - 'rxjs/Observable': 'Rx', - 'rxjs/Subject': 'Rx', - 'rxjs/ReplaySubject': 'Rx', - 'rxjs/add/operator/filter': 'Rx.Observable.prototype', - 'rxjs/add/operator/map': 'Rx.Observable.prototype', - 'rxjs/add/operator/mergeMap': 'Rx.Observable.prototype', - 'rxjs/add/operator/toPromise': 'Rx.Observable.prototype', - 'rxjs/add/observable/fromEvent': 'Rx.Observable', - 'rxjs/add/observable/of': 'Rx.Observable' - } -} diff --git a/tsconfig.json b/tsconfig.json index 5c73ff8..8ad43b4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -21,7 +21,6 @@ "paths": { "@angular/core": ["node_modules/@angular/core"], "@angular/http": ["node_modules/@angular/http"], - "@angular/router": ["node_modules/@angular/router"], "rxjs/*": ["node_modules/rxjs/*"] }, "lib": [