From ce98c80ca7a810c8314b3d49c98610ceef8a8ee7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Sat, 4 Jun 2016 11:06:06 +0200 Subject: Clean client modules --- client/config/webpack.common.js | 6 ------ client/config/webpack.dev.js | 19 ------------------ client/package.json | 43 +++++++++++++++++------------------------ client/tsconfig.json | 18 ++++++++++------- 4 files changed, 29 insertions(+), 57 deletions(-) diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js index a48518a35..eb6b7aef4 100644 --- a/client/config/webpack.common.js +++ b/client/config/webpack.common.js @@ -147,12 +147,6 @@ module.exports = { loader: 'json-loader' }, - /* - * Raw loader support for *.css files - * Returns file content as string - * - * See: https://github.com/webpack/raw-loader - */ { test: /\.scss$/, exclude: /node_modules/, diff --git a/client/config/webpack.dev.js b/client/config/webpack.dev.js index 02e9857f7..8c6d1aac7 100644 --- a/client/config/webpack.dev.js +++ b/client/config/webpack.dev.js @@ -120,25 +120,6 @@ module.exports = webpackMerge(commonConfig, { resourcePath: 'src' }, - /** - * Webpack Development Server configuration - * Description: The webpack-dev-server is a little node.js Express server. - * The server emits information about the compilation state to the client, - * which reacts to those events. - * - * See: https://webpack.github.io/docs/webpack-dev-server.html - */ - devServer: { - port: METADATA.port, - host: METADATA.host, - historyApiFallback: true, - watchOptions: { - aggregateTimeout: 300, - poll: 1000 - }, - outputPath: helpers.root('dist') - }, - /* * Include polyfills or mocks for various node stuff * Description: Node configuration diff --git a/client/package.json b/client/package.json index 670697b0f..d2d039437 100644 --- a/client/package.json +++ b/client/package.json @@ -27,54 +27,47 @@ "@angular/platform-browser-dynamic": "2.0.0-rc.1", "@angular/router-deprecated": "2.0.0-rc.1", "angular-pipes": "^2.0.0", + "awesome-typescript-loader": "^0.17.0", "blueimp-file-upload": "^9.12.1", "bootstrap-loader": "^1.0.8", "bootstrap-sass": "^3.3.6", - "core-js": "^2.4.0", - "es6-promise": "^3.0.2", - "es6-shim": "^0.35.0", - "jquery": "^2.2.3", - "jquery.ui.widget": "^1.10.3", - "ng2-bootstrap": "^1.0.16", - "normalize.css": "^4.1.1", - "reflect-metadata": "0.1.3", - "rxjs": "5.0.0-beta.6", - "systemjs": "0.19.27", - "webtorrent": "^0.93.2", - "zone.js": "0.6.12" - }, - "devDependencies": { - "awesome-typescript-loader": "^0.17.0", - "codelyzer": "0.0.19", "compression-webpack-plugin": "^0.3.1", "copy-webpack-plugin": "^3.0.1", + "core-js": "^2.4.0", "css-loader": "^0.23.1", + "es6-promise": "^3.0.2", "es6-promise-loader": "^1.0.1", - "exports-loader": "^0.6.3", - "expose-loader": "^0.7.1", + "es6-shim": "^0.35.0", "file-loader": "^0.8.5", "html-webpack-plugin": "^2.19.0", - "imports-loader": "^0.6.5", + "jquery": "^2.2.3", + "jquery.ui.widget": "^1.10.3", "json-loader": "^0.5.4", + "ng2-bootstrap": "^1.0.16", "node-sass": "^3.7.0", + "normalize.css": "^4.1.1", "raw-loader": "^0.5.1", + "reflect-metadata": "0.1.3", "resolve-url-loader": "^1.4.3", + "rxjs": "5.0.0-beta.6", "sass-loader": "^3.2.0", "source-map-loader": "^0.1.5", - "standard": "^7.0.1", "style-loader": "^0.13.1", - "systemjs-builder": "^0.15.16", "ts-helpers": "^1.1.1", - "ts-node": "^0.7.3", "tslint": "^3.7.4", "tslint-loader": "^2.1.4", "typescript": "^1.8.10", "typings": "^1.0.4", "url-loader": "^0.5.7", "webpack": "^1.13.1", - "webpack-dev-server": "^1.14.1", "webpack-md5-hash": "0.0.5", - "webpack-merge": "^0.13.0" + "webpack-merge": "^0.13.0", + "webtorrent": "^0.93.2", + "zone.js": "0.6.12" + }, + "devDependencies": { + "codelyzer": "0.0.19", + "standard": "^7.0.1" }, "standard": { "ignore": [ @@ -82,4 +75,4 @@ "bundles/" ] } -} +} \ No newline at end of file diff --git a/client/tsconfig.json b/client/tsconfig.json index 1832d7b7e..3b903f8c8 100644 --- a/client/tsconfig.json +++ b/client/tsconfig.json @@ -6,8 +6,16 @@ "sourceMap": true, "emitDecoratorMetadata": true, "experimentalDecorators": true, - "removeComments": false, - "noImplicitAny": false + "noImplicitAny": false, + "noEmitHelpers": true + }, + "awesomeTypescriptLoaderOptions": { + "forkChecker": true + }, + "compileOnSave": false, + "buildOnSave": false, + "atom": { + "rewriteTsconfig": true }, "filesGlob": [ "**/*.ts", @@ -18,7 +26,6 @@ "typings/main", "typings/main.d.ts" ], - "compileOnSave": false, "files": [ "src/app/app.component.ts", "src/app/friends/friend.service.ts", @@ -62,8 +69,5 @@ "typings/globals/jquery/index.d.ts", "typings/globals/node/index.d.ts", "typings/index.d.ts" - ], - "atom": { - "rewriteTsconfig": true - } + ] } -- cgit v1.2.3