Skip to content
Snippets Groups Projects
Commit ab1cec2a authored by Tamlyn Rhodes's avatar Tamlyn Rhodes
Browse files

fix: update production Webpack config

Remove ExtractTextPlugin since it's no use with Styled Components
Remove separate rules definition per environment because they had drifted out of sync
Enable GraphQL endpoint with new server config param
parent a4110939
No related branches found
No related tags found
1 merge request!34fix: update production Webpack config
Pipeline #6364 passed with stages
in 4 minutes and 47 seconds
...@@ -15,6 +15,7 @@ module.exports = { ...@@ -15,6 +15,7 @@ module.exports = {
port: 3000, port: 3000,
logger, logger,
uploads: 'uploads', uploads: 'uploads',
enableExperimentalGraphql: true,
typeDefs: ` typeDefs: `
type Manuscript { type Manuscript {
id: ID! id: ID!
......
...@@ -13,7 +13,7 @@ module.exports = { ...@@ -13,7 +13,7 @@ module.exports = {
], ],
webpackConfig: { webpackConfig: {
module: { module: {
rules: require('./webpack/rules.development.js'), rules: require('./webpack/rules.js'),
}, },
}, },
context: { context: {
......
File moved
const ExtractTextPlugin = require('extract-text-webpack-plugin')
const include = require('./babel-includes')
const stringReplaceRule = require('./string-replace')
module.exports = [
stringReplaceRule,
{
oneOf: [
// ES6 JS
{
test: /\.jsx?$/,
include,
loader: 'babel-loader',
options: {
presets: [
[require('babel-preset-env'), { modules: false }],
require('babel-preset-react'),
require('babel-preset-stage-2'),
],
},
},
// CSS Modules
{
test: /\.local\.css$/,
include,
use: ExtractTextPlugin.extract({
fallback: 'style-loader',
use: [
{
loader: 'css-loader',
options: {
modules: true,
localIdentName: '[name]_[local]-[hash:base64:8]',
},
},
],
}),
},
// global CSS
{
test: /\.css$/,
use: ExtractTextPlugin.extract({
fallback: 'style-loader',
use: ['css-loader'],
}),
},
// files
{
exclude: [/\.jsx?$/, /\.html$/, /\.json$/],
loader: 'file-loader',
options: {
name: 'static/media/[name].[hash:8].[ext]',
},
},
],
},
]
...@@ -2,7 +2,7 @@ const config = require('config') ...@@ -2,7 +2,7 @@ const config = require('config')
const path = require('path') const path = require('path')
const webpack = require('webpack') const webpack = require('webpack')
const CopyWebpackPlugin = require('copy-webpack-plugin') const CopyWebpackPlugin = require('copy-webpack-plugin')
const rules = require('./rules.development') const rules = require('./rules')
const resolve = require('./common-resolve') const resolve = require('./common-resolve')
module.exports = [ module.exports = [
......
...@@ -5,11 +5,10 @@ const config = require('config') ...@@ -5,11 +5,10 @@ const config = require('config')
const path = require('path') const path = require('path')
const webpack = require('webpack') const webpack = require('webpack')
const CleanWebpackPlugin = require('clean-webpack-plugin') const CleanWebpackPlugin = require('clean-webpack-plugin')
const ExtractTextPlugin = require('extract-text-webpack-plugin')
const HtmlWebpackPlugin = require('html-webpack-plugin') const HtmlWebpackPlugin = require('html-webpack-plugin')
const CopyWebpackPlugin = require('copy-webpack-plugin') const CopyWebpackPlugin = require('copy-webpack-plugin')
const UglifyJSPlugin = require('uglifyjs-webpack-plugin') const UglifyJSPlugin = require('uglifyjs-webpack-plugin')
const rules = require('./rules.production') const rules = require('./rules')
const resolve = require('./common-resolve') const resolve = require('./common-resolve')
module.exports = [ module.exports = [
...@@ -47,7 +46,6 @@ module.exports = [ ...@@ -47,7 +46,6 @@ module.exports = [
[config.authsome.mode]: config.authsome.mode, [config.authsome.mode]: config.authsome.mode,
[config.validations]: config.validations, [config.validations]: config.validations,
}), }),
new ExtractTextPlugin('styles/main.css'),
new CopyWebpackPlugin([{ from: '../static' }]), new CopyWebpackPlugin([{ from: '../static' }]),
new webpack.optimize.AggressiveMergingPlugin(), new webpack.optimize.AggressiveMergingPlugin(),
new webpack.optimize.OccurrenceOrderPlugin(), new webpack.optimize.OccurrenceOrderPlugin(),
......
...@@ -2,7 +2,7 @@ const config = require('config') ...@@ -2,7 +2,7 @@ const config = require('config')
const path = require('path') const path = require('path')
const webpack = require('webpack') const webpack = require('webpack')
const CopyWebpackPlugin = require('copy-webpack-plugin') const CopyWebpackPlugin = require('copy-webpack-plugin')
const rules = require('./rules.development') const rules = require('./rules')
const resolve = require('./common-resolve') const resolve = require('./common-resolve')
module.exports = [ module.exports = [
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment