Skip to content

Commit 402c738

Browse files
authored
Merge pull request #64 from yisibl/add-autoprefixer
New: Add autoprefixer
2 parents 57b0ca7 + 77fd1a5 commit 402c738

File tree

11 files changed

+304
-354
lines changed

11 files changed

+304
-354
lines changed

build/utils.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ exports.cssLoaders = function (options) {
3636

3737
// http://vuejs.github.io/vue-loader/en/configurations/extract-css.html
3838
return {
39-
css: generateLoaders(['css']),
40-
postcss: generateLoaders(['css']),
41-
less: generateLoaders(['css', 'less']),
42-
sass: generateLoaders(['css', 'sass?indentedSyntax']),
43-
scss: generateLoaders(['css', 'sass']),
44-
stylus: generateLoaders(['css', 'stylus']),
45-
styl: generateLoaders(['css', 'stylus'])
39+
css: generateLoaders(['css?-autoprefixer']),
40+
postcss: generateLoaders(['css?-autoprefixer']),
41+
less: generateLoaders(['css?-autoprefixer', 'less']),
42+
sass: generateLoaders(['css?-autoprefixer', 'sass?indentedSyntax']),
43+
scss: generateLoaders(['css?-autoprefixer', 'sass']),
44+
stylus: generateLoaders(['css?-autoprefixer', 'stylus']),
45+
styl: generateLoaders(['css?-autoprefixer', 'stylus'])
4646
}
4747
}
4848

build/webpack.base.conf.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,22 @@ module.exports = {
2020
filename: '[name].js'
2121
},
2222
resolve: {
23-
extensions: ['', '.js', '.vue'],
23+
// require 时省略的扩展名,如:require('module') 不需要 module.js
24+
extensions: ['', '.js', '.vue', '.scss', '.css'],
2425
fallback: [path.join(__dirname, '../node_modules')],
2526
alias: {
2627
'vue$': 'vue/dist/vue',
2728
'src': path.resolve(__dirname, '../src'),
2829
'assets': path.resolve(__dirname, '../src/assets'),
29-
'components': path.resolve(__dirname, '../src/components')
30+
'components': path.resolve(__dirname, '../src/components'),
31+
'filter': path.resolve(__dirname, '../src/filters.js')
3032
}
3133
},
3234
resolveLoader: {
3335
fallback: [path.join(__dirname, '../node_modules')]
3436
},
3537
module: {
36-
preLoaders: [
37-
{
38+
preLoaders: [{
3839
test: /\.vue$/,
3940
loader: 'eslint',
4041
include: projectRoot,
@@ -47,8 +48,7 @@ module.exports = {
4748
exclude: /node_modules/
4849
}
4950
],
50-
loaders: [
51-
{
51+
loaders: [{
5252
test: /\.vue$/,
5353
loader: 'vue'
5454
},
@@ -87,7 +87,7 @@ module.exports = {
8787
loaders: utils.cssLoaders({ sourceMap: useCssSourceMap }),
8888
postcss: [
8989
require('autoprefixer')({
90-
browsers: ['last 2 versions']
90+
browsers: ['last 3 versions', 'Android >= 4.4', 'iOS >= 6']
9191
})
9292
]
9393
}

src/assets/scss/about.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
padding: 50px 15px;
44
line-height: 1.5;
55
background: #f7f7f7;
6-
6+
display: flex;
7+
78
dt {
89
@extend .title;
910
padding: 1em 0;
@@ -19,4 +20,4 @@
1920
color: #42b983;
2021
}
2122

22-
}
23+
}

0 commit comments

Comments
 (0)