reverts back to 2 spaces instead of 4

This commit is contained in:
James
2018-07-18 12:52:51 -04:00
parent 3857ed4b63
commit 83f135ef22
5 changed files with 47 additions and 47 deletions

View File

@@ -6,7 +6,7 @@ insert_final_newline = true
[*.js]
indent_style = space
indent_size = 4
indent_size = 2
[*.html]
indent_style = space

View File

@@ -150,7 +150,7 @@ module.exports = exports = {
"func-names": WARN,
"func-style": [ WARN, "declaration" ],
"id-length": [ WARN, { "min": 2, "max": 32 } ],
"indent": [ WARN, 4 ],
"indent": [ WARN, 2 ],
"jsx-quotes": [ WARN, "prefer-double" ],
"keyword-spacing": [ WARN, { "before": true, "after": true} ],
// "linebreak-style": [ WARN, "unix" ],

View File

@@ -2,29 +2,29 @@ let HtmlWebpackPlugin = require('html-webpack-plugin');
let ExtractTextPlugin = require('extract-text-webpack-plugin');
module.exports = {
entry: './src/client/index.js',
module: {
rules: [
{
test: /\.js$/,
exclude: /node_modules/,
use: {
loader: 'babel-loader'
}
}, {
test: /\.scss$/,
use: ExtractTextPlugin.extract({
fallback: 'style-loader',
use: 'css-loader!sass-loader'
})
}
]
},
plugins: [
new HtmlWebpackPlugin({
template: './src/client/index.html',
filename: './index.html'
}),
new ExtractTextPlugin('style.css')
entry: './src/client/index.js',
module: {
rules: [
{
test: /\.js$/,
exclude: /node_modules/,
use: {
loader: 'babel-loader'
}
}, {
test: /\.scss$/,
use: ExtractTextPlugin.extract({
fallback: 'style-loader',
use: 'css-loader!sass-loader'
})
}
]
},
plugins: [
new HtmlWebpackPlugin({
template: './src/client/index.html',
filename: './index.html'
}),
new ExtractTextPlugin('style.css')
]
};

View File

@@ -1,19 +1,19 @@
let OptiizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
let OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
let UglifyJSPlugin = require('uglifyjs-webpack-plugin');
module.exports = {
optimization: {
minimizer: [
new UglifyJSPlugin({
uglifyOptions: {
mangle: {
keep_fnames: true
}
}
})
]
},
plugins: [
new OptimizeCssAssetsPlugin()
optimization: {
minimizer: [
new UglifyJSPlugin({
uglifyOptions: {
mangle: {
keep_fnames: true
}
}
})
]
}
},
plugins: [
new OptimizeCssAssetsPlugin()
]
};

View File

@@ -4,13 +4,13 @@ let baseConfig = require('./webpack.base.config');
let optConfig = require('./webpack.opt.config');
function prodConfig(env) {
const NODE_ENV = env.NODE_ENV ? env.NODE_ENV : 'development';
const NODE_ENV = env.NODE_ENV ? env.NODE_ENV : 'development';
return {
plugins: [
new webpack.DefinePlugin({ 'process.env.NODE_ENV': JSON.stringify(NODE_ENV) })
]
};
return {
plugins: [
new webpack.DefinePlugin({ 'process.env.NODE_ENV': JSON.stringify(NODE_ENV) })
]
};
}
module.exports = merge.smart(baseConfig, optConfig, prodConfig);