apply prettier formating

This commit is contained in:
Prettier
2018-07-07 01:17:37 +04:00
committed by Aleksey Gurianov
parent 5d1201351a
commit 2df3aa01d4
38 changed files with 215 additions and 190 deletions
+42 -38
View File
@@ -28,15 +28,15 @@ const commonStyleLoaders = [
require('postcss-url')({ url: 'inline', maxSize: 5 }),
require('postcss-wrap')({ selector: `#${NODE_ID}` }),
require('postcss-csso'),
]
}
],
},
},
{
loader: 'sass-loader',
options: {
includePaths: [path.resolve(__dirname, 'app')],
}
}
},
},
];
module.exports = {
@@ -50,11 +50,11 @@ module.exports = {
output: {
path: publicFolder,
filename: `[name].js`,
chunkFilename: '[name].js'
chunkFilename: '[name].js',
},
resolve: {
extensions: ['.jsx', '.js'],
modules: [path.resolve(__dirname, 'app'), path.resolve(__dirname, 'node_modules')]
modules: [path.resolve(__dirname, 'app'), path.resolve(__dirname, 'node_modules')],
},
module: {
rules: [
@@ -64,30 +64,28 @@ module.exports = {
use: {
loader: 'babel-loader',
options: babelOptions,
}
},
},
{
test: /\.scss$/,
use: env === 'production'
? ExtractText.extract({
fallback: 'style-loader',
use: commonStyleLoaders,
})
: [
'style-loader',
...commonStyleLoaders,
],
use:
env === 'production'
? ExtractText.extract({
fallback: 'style-loader',
use: commonStyleLoaders,
})
: ['style-loader', ...commonStyleLoaders],
},
{
test: /\.(png|jpg|jpeg|gif|svg)$/,
use: {
loader: 'file-loader',
options: {
name: `files/[name].[hash].[ext]`
}
}
}
]
name: `files/[name].[hash].[ext]`,
},
},
},
],
},
plugins: [
new Clean(publicFolder),
@@ -114,32 +112,38 @@ module.exports = {
filename: 'last-comments.html',
inject: false,
}),
...(env === 'production' ? [] : [new Html({
template: path.resolve(__dirname, 'dev.ejs'),
filename: 'dev.html',
inject: false,
})]),
...(env === 'production'
? []
: [
new Html({
template: path.resolve(__dirname, 'dev.ejs'),
filename: 'dev.html',
inject: false,
}),
]),
new ExtractText({
filename: `remark.css`,
allChunks: true
allChunks: true,
}),
new webpack.optimize.ModuleConcatenationPlugin(),
...(env === 'production' ? [new webpack.optimize.UglifyJsPlugin()] : []),
...(process.env.CI === 'true' ? [] : [
new BundleAnalyze({
analyzerMode: 'static',
reportFilename: 'report.html',
defaultSizes: 'parsed',
generateStatsFile: false,
logLevel: 'info',
openAnalyzer: false
})
]),
...(process.env.CI === 'true'
? []
: [
new BundleAnalyze({
analyzerMode: 'static',
reportFilename: 'report.html',
defaultSizes: 'parsed',
generateStatsFile: false,
logLevel: 'info',
openAnalyzer: false,
}),
]),
new Copy(['./iframe.html']),
],
watch: env === 'dev',
watchOptions: {
ignored: /(node_modules|\.vendor\.js$)/
ignored: /(node_modules|\.vendor\.js$)/,
},
devServer: {
host: '0.0.0.0',