diff options
Diffstat (limited to 'language-web/webpack.config.js')
-rw-r--r-- | language-web/webpack.config.js | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/language-web/webpack.config.js b/language-web/webpack.config.js index c51d55d6..801a705c 100644 --- a/language-web/webpack.config.js +++ b/language-web/webpack.config.js | |||
@@ -25,11 +25,9 @@ const publicHost = process.env['PUBLIC_HOST'] || listenHost; | |||
25 | const publicPort = portNumberOrElse('PUBLIC_PORT', listenPort); | 25 | const publicPort = portNumberOrElse('PUBLIC_PORT', listenPort); |
26 | 26 | ||
27 | const resolveSources = sources => path.resolve(__dirname, 'src', sources); | 27 | const resolveSources = sources => path.resolve(__dirname, 'src', sources); |
28 | const resolveGenerated = sources => path.resolve(__dirname, 'build/generated/sources', sources); | ||
29 | const mainJsSources = resolveSources('main/js'); | 28 | const mainJsSources = resolveSources('main/js'); |
30 | const babelLoaderFilters = { | 29 | const babelLoaderFilters = { |
31 | include: [mainJsSources], | 30 | include: [mainJsSources], |
32 | exclude: [resolveSources('main/js/xtext')], | ||
33 | }; | 31 | }; |
34 | const babelPresets = [ | 32 | const babelPresets = [ |
35 | [ | 33 | [ |
@@ -150,12 +148,8 @@ module.exports = { | |||
150 | modules: [ | 148 | modules: [ |
151 | 'node_modules', | 149 | 'node_modules', |
152 | mainJsSources, | 150 | mainJsSources, |
153 | resolveGenerated('xtext/js'), | ||
154 | ], | 151 | ], |
155 | extensions: ['.js', '.jsx', '.ts', '.tsx'], | 152 | extensions: ['.js', '.jsx', '.ts', '.tsx'], |
156 | alias: { | ||
157 | images: resolveSources('main/images'), | ||
158 | }, | ||
159 | }, | 153 | }, |
160 | devtool: devMode ? 'inline-source-map' : 'source-map', | 154 | devtool: devMode ? 'inline-source-map' : 'source-map', |
161 | optimization: { | 155 | optimization: { |
@@ -193,7 +187,10 @@ module.exports = { | |||
193 | host: listenHost, | 187 | host: listenHost, |
194 | port: listenPort, | 188 | port: listenPort, |
195 | proxy: { | 189 | proxy: { |
196 | '/xtext-service': `${apiPort === 443 ? 'https' : 'http'}://${apiHost}:${apiPort}`, | 190 | '/xtext-service': { |
191 | target: `${apiPort === 443 ? 'https' : 'http'}://${apiHost}:${apiPort}`, | ||
192 | ws: true, | ||
193 | }, | ||
197 | }, | 194 | }, |
198 | }, | 195 | }, |
199 | plugins: [ | 196 | plugins: [ |