Skip to content

Commit

Permalink
progress ++
Browse files Browse the repository at this point in the history
  • Loading branch information
margox committed Aug 31, 2018
1 parent 43e2191 commit 81e4041
Show file tree
Hide file tree
Showing 43 changed files with 788 additions and 4,919 deletions.
3 changes: 2 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"@babel/react"
],
"plugins": [
"@babel/plugin-proposal-class-properties"
"@babel/transform-runtime",
"@babel/proposal-class-properties"
]
}
3 changes: 3 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules
dist
example
40 changes: 40 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
module.exports = {
"parser": "babel-eslint",
"env": {
"browser": true,
"commonjs": true,
"es6": true,
"node": true
},
"extends": "eslint:recommended",
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2018,
"sourceType": "module"
},
"plugins": [
"react"
],
"rules": {
"react/jsx-uses-react": [1],
"react/jsx-uses-vars": [2],
"indent": [
"error",
2
],
"linebreak-style": [
"error",
"unix"
],
"quotes": [
"error",
"single"
],
"semi": [
"error",
"never"
]
}
};
18 changes: 15 additions & 3 deletions build/webpack.base.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
var path = require('path')
, ExtractTextPlugin = require('extract-text-webpack-plugin')
, fs = require('fs')
, ExtractTextPlugin = require('extract-text-webpack-plugin')

module.exports = {
module: {
Expand All @@ -14,8 +15,19 @@ module.exports = {
])
}, {
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: ['babel-loader']
exclude: [
/node_modules/,
/dist/
],
use: [
{
loader: 'babel-loader',
options: {
...JSON.parse(fs.readFileSync(path.resolve(__dirname, '../.babelrc'))),
},
},
'eslint-loader'
]
}, {
test: /\.(png|svg)$/,
use: [
Expand Down
5 changes: 3 additions & 2 deletions build/webpack.development.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var webpack = require('webpack')
, merge = require('webpack-merge')
var merge = require('webpack-merge')
, path = require('path')
, ExtractTextPlugin = require('extract-text-webpack-plugin')
, HtmlWebpackPlugin = require('html-webpack-plugin')
, baseConfigs = require('./webpack.base')

Expand All @@ -15,6 +15,7 @@ module.exports = merge(baseConfigs, {
filename: '[name].js'
},
plugins: [
new ExtractTextPlugin('index.css'),
new HtmlWebpackPlugin({
template: './example/index.html'
})
Expand Down
7 changes: 3 additions & 4 deletions build/webpack.production.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
var webpack = require('webpack')
, merge = require('webpack-merge')
var merge = require('webpack-merge')
, ExtractTextPlugin = require('extract-text-webpack-plugin')
, OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin')
, path = require('path')
Expand Down Expand Up @@ -30,10 +29,10 @@ module.exports = merge(baseConfigs, {
'immutable': 'immutable'
},
optimization: {
minimize: false,
minimize: true,
},
plugins: [
new ExtractTextPlugin("index.css"),
new ExtractTextPlugin('index.css'),
new OptimizeCssAssetsPlugin({
assetNameRegExp: /.css$/,
cssProcessor: require('cssnano'),
Expand Down
2 changes: 1 addition & 1 deletion dist/index.css

Large diffs are not rendered by default.

Loading

0 comments on commit 81e4041

Please sign in to comment.