Browse Source

Configs unified.

pull/297/head
Sebastian 8 years ago
parent
commit
0ef24af0b4
  1. 5
      src/Squidex/app-config/webpack.run.base.js
  2. 9
      src/Squidex/app-config/webpack.run.dev.js
  3. 7
      src/Squidex/app-config/webpack.run.prod.js
  4. 9
      src/Squidex/app-config/webpack.test.coverage.js
  5. 11
      src/Squidex/app-config/webpack.test.js

5
src/Squidex/app-config/webpack.run.base.js

@ -1,7 +1,8 @@
const webpack = require('webpack'), const webpack = require('webpack'),
webpackMerge = require('webpack-merge'), webpackMerge = require('webpack-merge'),
commonConfig = require('./webpack.config.js'), path = require('path'),
helpers = require('./helpers'); helpers = require('./helpers'),
commonConfig = require('./webpack.config.js');
const plugins = { const plugins = {
HtmlWebpackPlugin: require('html-webpack-plugin') HtmlWebpackPlugin: require('html-webpack-plugin')

9
src/Squidex/app-config/webpack.run.dev.js

@ -1,6 +1,8 @@
const webpackMerge = require('webpack-merge'), const webpack = require('webpack'),
runConfig = require('./webpack.run.base.js'), webpackMerge = require('webpack-merge'),
helpers = require('./helpers'); path = require('path'),
helpers = require('./helpers'),
runConfig = require('./webpack.run.base.js');
module.exports = webpackMerge(runConfig, { module.exports = webpackMerge(runConfig, {
mode: 'development', mode: 'development',
@ -37,6 +39,7 @@ module.exports = webpackMerge(runConfig, {
} }
] ]
}, },
devServer: { devServer: {
headers: { headers: {
'Access-Control-Allow-Origin': '*' 'Access-Control-Allow-Origin': '*'

7
src/Squidex/app-config/webpack.run.prod.js

@ -1,13 +1,14 @@
const webpack = require('webpack'), const webpack = require('webpack'),
webpackMerge = require('webpack-merge'), webpackMerge = require('webpack-merge'),
runConfig = require('./webpack.run.base.js'), path = require('path'),
helpers = require('./helpers'); helpers = require('./helpers'),
runConfig = require('./webpack.run.base.js');
const plugins = { const plugins = {
// https://www.npmjs.com/package/@ngtools/webpack // https://www.npmjs.com/package/@ngtools/webpack
NgToolsWebpack: require('@ngtools/webpack'), NgToolsWebpack: require('@ngtools/webpack'),
// https://github.com/webpack-contrib/mini-css-extract-plugin // https://github.com/webpack-contrib/mini-css-extract-plugin
MiniCssExtractPlugin: require('mini-css-extract-plugin'), MiniCssExtractPlugin: require('mini-css-extract-plugin')
}; };
helpers.removeLoaders(runConfig, ['scss', 'ts']); helpers.removeLoaders(runConfig, ['scss', 'ts']);

9
src/Squidex/app-config/webpack.test.coverage.js

@ -1,7 +1,8 @@
var webpackMerge = require('webpack-merge'), const webpack = require('webpack'),
path = require('path'), webpackMerge = require('webpack-merge'),
helpers = require('./helpers'), path = require('path'),
testConfig = require('./webpack.test.js'); helpers = require('./helpers'),
testConfig = require('./webpack.test.js');
helpers.removeLoaders(testConfig, ['ts']); helpers.removeLoaders(testConfig, ['ts']);

11
src/Squidex/app-config/webpack.test.js

@ -1,7 +1,8 @@
 var webpack = require('webpack'),  const webpack = require('webpack'),
webpackMerge = require('webpack-merge'), webpackMerge = require('webpack-merge'),
commonConfig = require('./webpack.config.js'), path = require('path'),
helpers = require('./helpers'); helpers = require('./helpers'),
commonConfig = require('./webpack.config.js');
module.exports = webpackMerge(commonConfig, { module.exports = webpackMerge(commonConfig, {
mode: 'development', mode: 'development',
@ -12,5 +13,5 @@ module.exports = webpackMerge(commonConfig, {
* Do not change, leave as is or it wont work. * Do not change, leave as is or it wont work.
* See: https://webpack.js.org/configuration/devtool/ * See: https://webpack.js.org/configuration/devtool/
*/ */
devtool: 'inline-source-map', devtool: 'inline-source-map'
}); });
Loading…
Cancel
Save