diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2016-06-04 11:06:06 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2016-06-04 11:06:06 +0200 |
commit | ce98c80ca7a810c8314b3d49c98610ceef8a8ee7 (patch) | |
tree | ad9e6470f4418ca1552baeec14b90c47a2332d42 | |
parent | c21f59d334b748be99188688c9578c9cd5432874 (diff) | |
download | PeerTube-ce98c80ca7a810c8314b3d49c98610ceef8a8ee7.tar.gz PeerTube-ce98c80ca7a810c8314b3d49c98610ceef8a8ee7.tar.zst PeerTube-ce98c80ca7a810c8314b3d49c98610ceef8a8ee7.zip |
Clean client modules
-rw-r--r-- | client/config/webpack.common.js | 6 | ||||
-rw-r--r-- | client/config/webpack.dev.js | 19 | ||||
-rw-r--r-- | client/package.json | 43 | ||||
-rw-r--r-- | 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 = { | |||
147 | loader: 'json-loader' | 147 | loader: 'json-loader' |
148 | }, | 148 | }, |
149 | 149 | ||
150 | /* | ||
151 | * Raw loader support for *.css files | ||
152 | * Returns file content as string | ||
153 | * | ||
154 | * See: https://github.com/webpack/raw-loader | ||
155 | */ | ||
156 | { | 150 | { |
157 | test: /\.scss$/, | 151 | test: /\.scss$/, |
158 | exclude: /node_modules/, | 152 | 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, { | |||
120 | resourcePath: 'src' | 120 | resourcePath: 'src' |
121 | }, | 121 | }, |
122 | 122 | ||
123 | /** | ||
124 | * Webpack Development Server configuration | ||
125 | * Description: The webpack-dev-server is a little node.js Express server. | ||
126 | * The server emits information about the compilation state to the client, | ||
127 | * which reacts to those events. | ||
128 | * | ||
129 | * See: https://webpack.github.io/docs/webpack-dev-server.html | ||
130 | */ | ||
131 | devServer: { | ||
132 | port: METADATA.port, | ||
133 | host: METADATA.host, | ||
134 | historyApiFallback: true, | ||
135 | watchOptions: { | ||
136 | aggregateTimeout: 300, | ||
137 | poll: 1000 | ||
138 | }, | ||
139 | outputPath: helpers.root('dist') | ||
140 | }, | ||
141 | |||
142 | /* | 123 | /* |
143 | * Include polyfills or mocks for various node stuff | 124 | * Include polyfills or mocks for various node stuff |
144 | * Description: Node configuration | 125 | * 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 @@ | |||
27 | "@angular/platform-browser-dynamic": "2.0.0-rc.1", | 27 | "@angular/platform-browser-dynamic": "2.0.0-rc.1", |
28 | "@angular/router-deprecated": "2.0.0-rc.1", | 28 | "@angular/router-deprecated": "2.0.0-rc.1", |
29 | "angular-pipes": "^2.0.0", | 29 | "angular-pipes": "^2.0.0", |
30 | "awesome-typescript-loader": "^0.17.0", | ||
30 | "blueimp-file-upload": "^9.12.1", | 31 | "blueimp-file-upload": "^9.12.1", |
31 | "bootstrap-loader": "^1.0.8", | 32 | "bootstrap-loader": "^1.0.8", |
32 | "bootstrap-sass": "^3.3.6", | 33 | "bootstrap-sass": "^3.3.6", |
33 | "core-js": "^2.4.0", | ||
34 | "es6-promise": "^3.0.2", | ||
35 | "es6-shim": "^0.35.0", | ||
36 | "jquery": "^2.2.3", | ||
37 | "jquery.ui.widget": "^1.10.3", | ||
38 | "ng2-bootstrap": "^1.0.16", | ||
39 | "normalize.css": "^4.1.1", | ||
40 | "reflect-metadata": "0.1.3", | ||
41 | "rxjs": "5.0.0-beta.6", | ||
42 | "systemjs": "0.19.27", | ||
43 | "webtorrent": "^0.93.2", | ||
44 | "zone.js": "0.6.12" | ||
45 | }, | ||
46 | "devDependencies": { | ||
47 | "awesome-typescript-loader": "^0.17.0", | ||
48 | "codelyzer": "0.0.19", | ||
49 | "compression-webpack-plugin": "^0.3.1", | 34 | "compression-webpack-plugin": "^0.3.1", |
50 | "copy-webpack-plugin": "^3.0.1", | 35 | "copy-webpack-plugin": "^3.0.1", |
36 | "core-js": "^2.4.0", | ||
51 | "css-loader": "^0.23.1", | 37 | "css-loader": "^0.23.1", |
38 | "es6-promise": "^3.0.2", | ||
52 | "es6-promise-loader": "^1.0.1", | 39 | "es6-promise-loader": "^1.0.1", |
53 | "exports-loader": "^0.6.3", | 40 | "es6-shim": "^0.35.0", |
54 | "expose-loader": "^0.7.1", | ||
55 | "file-loader": "^0.8.5", | 41 | "file-loader": "^0.8.5", |
56 | "html-webpack-plugin": "^2.19.0", | 42 | "html-webpack-plugin": "^2.19.0", |
57 | "imports-loader": "^0.6.5", | 43 | "jquery": "^2.2.3", |
44 | "jquery.ui.widget": "^1.10.3", | ||
58 | "json-loader": "^0.5.4", | 45 | "json-loader": "^0.5.4", |
46 | "ng2-bootstrap": "^1.0.16", | ||
59 | "node-sass": "^3.7.0", | 47 | "node-sass": "^3.7.0", |
48 | "normalize.css": "^4.1.1", | ||
60 | "raw-loader": "^0.5.1", | 49 | "raw-loader": "^0.5.1", |
50 | "reflect-metadata": "0.1.3", | ||
61 | "resolve-url-loader": "^1.4.3", | 51 | "resolve-url-loader": "^1.4.3", |
52 | "rxjs": "5.0.0-beta.6", | ||
62 | "sass-loader": "^3.2.0", | 53 | "sass-loader": "^3.2.0", |
63 | "source-map-loader": "^0.1.5", | 54 | "source-map-loader": "^0.1.5", |
64 | "standard": "^7.0.1", | ||
65 | "style-loader": "^0.13.1", | 55 | "style-loader": "^0.13.1", |
66 | "systemjs-builder": "^0.15.16", | ||
67 | "ts-helpers": "^1.1.1", | 56 | "ts-helpers": "^1.1.1", |
68 | "ts-node": "^0.7.3", | ||
69 | "tslint": "^3.7.4", | 57 | "tslint": "^3.7.4", |
70 | "tslint-loader": "^2.1.4", | 58 | "tslint-loader": "^2.1.4", |
71 | "typescript": "^1.8.10", | 59 | "typescript": "^1.8.10", |
72 | "typings": "^1.0.4", | 60 | "typings": "^1.0.4", |
73 | "url-loader": "^0.5.7", | 61 | "url-loader": "^0.5.7", |
74 | "webpack": "^1.13.1", | 62 | "webpack": "^1.13.1", |
75 | "webpack-dev-server": "^1.14.1", | ||
76 | "webpack-md5-hash": "0.0.5", | 63 | "webpack-md5-hash": "0.0.5", |
77 | "webpack-merge": "^0.13.0" | 64 | "webpack-merge": "^0.13.0", |
65 | "webtorrent": "^0.93.2", | ||
66 | "zone.js": "0.6.12" | ||
67 | }, | ||
68 | "devDependencies": { | ||
69 | "codelyzer": "0.0.19", | ||
70 | "standard": "^7.0.1" | ||
78 | }, | 71 | }, |
79 | "standard": { | 72 | "standard": { |
80 | "ignore": [ | 73 | "ignore": [ |
@@ -82,4 +75,4 @@ | |||
82 | "bundles/" | 75 | "bundles/" |
83 | ] | 76 | ] |
84 | } | 77 | } |
85 | } | 78 | } \ 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 @@ | |||
6 | "sourceMap": true, | 6 | "sourceMap": true, |
7 | "emitDecoratorMetadata": true, | 7 | "emitDecoratorMetadata": true, |
8 | "experimentalDecorators": true, | 8 | "experimentalDecorators": true, |
9 | "removeComments": false, | 9 | "noImplicitAny": false, |
10 | "noImplicitAny": false | 10 | "noEmitHelpers": true |
11 | }, | ||
12 | "awesomeTypescriptLoaderOptions": { | ||
13 | "forkChecker": true | ||
14 | }, | ||
15 | "compileOnSave": false, | ||
16 | "buildOnSave": false, | ||
17 | "atom": { | ||
18 | "rewriteTsconfig": true | ||
11 | }, | 19 | }, |
12 | "filesGlob": [ | 20 | "filesGlob": [ |
13 | "**/*.ts", | 21 | "**/*.ts", |
@@ -18,7 +26,6 @@ | |||
18 | "typings/main", | 26 | "typings/main", |
19 | "typings/main.d.ts" | 27 | "typings/main.d.ts" |
20 | ], | 28 | ], |
21 | "compileOnSave": false, | ||
22 | "files": [ | 29 | "files": [ |
23 | "src/app/app.component.ts", | 30 | "src/app/app.component.ts", |
24 | "src/app/friends/friend.service.ts", | 31 | "src/app/friends/friend.service.ts", |
@@ -62,8 +69,5 @@ | |||
62 | "typings/globals/jquery/index.d.ts", | 69 | "typings/globals/jquery/index.d.ts", |
63 | "typings/globals/node/index.d.ts", | 70 | "typings/globals/node/index.d.ts", |
64 | "typings/index.d.ts" | 71 | "typings/index.d.ts" |
65 | ], | 72 | ] |
66 | "atom": { | ||
67 | "rewriteTsconfig": true | ||
68 | } | ||
69 | } | 73 | } |