Skip to content

Commit c5b230b

Browse files
committed
Updated to match airbnb styleguide
1 parent e2bdbb7 commit c5b230b

File tree

11 files changed

+1196
-3965
lines changed

11 files changed

+1196
-3965
lines changed

.babelrc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"presets": ["es2015", "stage-0"],
3-
"plugins": ["transform-runtime"]
4-
}
2+
"presets": ["es2015", "stage-0"],
3+
"plugins": ["transform-runtime"]
4+
}

.editorconfig

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
[*]
22
charset = utf-8
3-
indent_size = 4
3+
end_of_line = lf
44
indent_style = space
5-
trim_trailing_whitespace = true
5+
indent_size = 2
6+
insert_final_newline = true
7+
trim_trailing_whitespace = true

build/webpack.demos.config.js

Lines changed: 53 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,60 @@
1-
var path = require('path');
2-
var webpack = require('webpack')
3-
var ExtractTextPlugin = require('extract-text-webpack-plugin');
1+
const path = require('path');
2+
const ExtractTextPlugin = require('extract-text-webpack-plugin');
43

54
module.exports = {
6-
entry: ['./examples/src/main.js', './examples/src/main.scss'],
7-
output: {
8-
path: path.resolve(__dirname, '../examples/assets'),
9-
publicPath: '/examples/assets/',
10-
filename: 'main.js'
11-
},
12-
module: {
13-
loaders: [
5+
entry: ['./examples/src/main.js', './examples/src/main.scss'],
6+
output: {
7+
path: path.resolve(__dirname, '../examples/assets'),
8+
publicPath: '/examples/assets/',
9+
filename: 'main.js',
10+
},
11+
module: {
12+
loaders: [
13+
{
14+
test: /\.js$/,
15+
exclude: /node_modules/,
16+
loader: 'babel-loader',
17+
},
18+
{
19+
test: /\.vue$/,
20+
exclude: /node_modules/,
21+
loader: 'vue-loader',
22+
},
23+
],
24+
rules: [
25+
{
26+
test: /\.css$/,
27+
exclude: /node_modules/,
28+
loader: ExtractTextPlugin.extract({
29+
loader: 'css-loader',
30+
}),
31+
},
32+
{
33+
test: /\.(sass|scss)$/,
34+
exclude: /node_modules/,
35+
use: ExtractTextPlugin.extract({
36+
fallback: [{
37+
loader: 'style-loader',
38+
}],
39+
use: [
1440
{
15-
test: /\.js$/,
16-
exclude: /node_modules/,
17-
loader: 'babel-loader',
41+
loader: 'css-loader',
1842
},
1943
{
20-
test: /\.vue$/,
21-
exclude: /node_modules/,
22-
loader: 'vue-loader'
23-
}
24-
],
25-
rules: [
26-
{
27-
test: /\.css$/,
28-
exclude: /node_modules/,
29-
loader: ExtractTextPlugin.extract({
30-
loader: 'css-loader',
31-
}),
44+
loader: 'sass-loader',
45+
options: {
46+
outputStyle: 'compressed',
47+
},
3248
},
33-
{
34-
test: /\.(sass|scss)$/,
35-
exclude: /node_modules/,
36-
use: ExtractTextPlugin.extract({
37-
fallback: [{
38-
loader: 'style-loader',
39-
}],
40-
use: [
41-
{
42-
loader: "css-loader"
43-
},
44-
{
45-
loader: 'sass-loader',
46-
options: {
47-
outputStyle: 'compressed',
48-
}
49-
}
50-
]
51-
})
52-
}
53-
]
54-
},
55-
plugins: [
56-
new ExtractTextPlugin({
57-
filename: '[name].css',
58-
allChunks: true,
49+
],
5950
}),
60-
]
61-
}
51+
},
52+
],
53+
},
54+
plugins: [
55+
new ExtractTextPlugin({
56+
filename: '[name].css',
57+
allChunks: true,
58+
}),
59+
],
60+
};

0 commit comments

Comments
 (0)