aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/config
diff options
context:
space:
mode:
Diffstat (limited to 'client/config')
-rw-r--r--client/config/webpack.common.js29
-rw-r--r--client/config/webpack.dev.js36
2 files changed, 44 insertions, 21 deletions
diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js
index 80d77b400..6067d94e7 100644
--- a/client/config/webpack.common.js
+++ b/client/config/webpack.common.js
@@ -119,8 +119,25 @@ module.exports = function (options) {
119 119
120 { 120 {
121 test: /\.(sass|scss)$/, 121 test: /\.(sass|scss)$/,
122 use: ['css-to-string-loader', 'css-loader?sourceMap', 'resolve-url-loader', 'sass-loader?sourceMap'], 122 use: [
123 exclude: [ helpers.root('src', 'styles') ] 123 'css-to-string-loader',
124 'css-loader?sourceMap',
125 'resolve-url-loader',
126 {
127 loader: 'sass-loader',
128 options: {
129 sourceMap: true
130 }
131 },
132 {
133 loader: 'sass-resources-loader',
134 options: {
135 resources: [
136 helpers.root('src/sass/_variables.scss')
137 ]
138 }
139 }
140 ]
124 }, 141 },
125 { test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/, use: 'url-loader?limit=10000&minetype=application/font-woff' }, 142 { test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/, use: 'url-loader?limit=10000&minetype=application/font-woff' },
126 { test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, use: 'file-loader' }, 143 { test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, use: 'file-loader' },
@@ -133,7 +150,10 @@ module.exports = function (options) {
133 { 150 {
134 test: /\.html$/, 151 test: /\.html$/,
135 loader: 'raw-loader', 152 loader: 'raw-loader',
136 exclude: [ helpers.root('src/index.html'), helpers.root('src/standalone/videos/embed.html') ] 153 exclude: [
154 helpers.root('src/index.html'),
155 helpers.root('src/standalone/videos/embed.html')
156 ]
137 } 157 }
138 158
139 ] 159 ]
@@ -262,7 +282,8 @@ module.exports = function (options) {
262 new LoaderOptionsPlugin({ 282 new LoaderOptionsPlugin({
263 options: { 283 options: {
264 sassLoader: { 284 sassLoader: {
265 precision: 10 285 precision: 10,
286 includePaths: [ helpers.root('src/sass') ]
266 } 287 }
267 } 288 }
268 }), 289 }),
diff --git a/client/config/webpack.dev.js b/client/config/webpack.dev.js
index 3468dba78..5e0f36d7f 100644
--- a/client/config/webpack.dev.js
+++ b/client/config/webpack.dev.js
@@ -90,23 +90,24 @@ module.exports = function (env) {
90 90
91 module: { 91 module: {
92 92
93 rules: [ 93 // Too slow, life is short
94 { 94 // rules: [
95 test: /\.ts$/, 95 // {
96 use: [ 96 // test: /\.ts$/,
97 { 97 // use: [
98 loader: 'tslint-loader', 98 // {
99 options: { 99 // loader: 'tslint-loader',
100 configFile: 'tslint.json' 100 // options: {
101 } 101 // configFile: 'tslint.json'
102 } 102 // }
103 ], 103 // }
104 exclude: [ 104 // ],
105 /\.(spec|e2e)\.ts$/, 105 // exclude: [
106 /node_modules\// 106 // /\.(spec|e2e)\.ts$/,
107 ] 107 // /node_modules\//
108 } 108 // ]
109 ] 109 // }
110 // ]
110 }, 111 },
111 112
112 plugins: [ 113 plugins: [
@@ -202,6 +203,7 @@ module.exports = function (env) {
202 tslint: { 203 tslint: {
203 emitErrors: false, 204 emitErrors: false,
204 failOnHint: false, 205 failOnHint: false,
206 typeCheck: true,
205 resourcePath: 'src' 207 resourcePath: 'src'
206 }, 208 },
207 209