Skip to content

Commit

Permalink
Merge branch 'release-v3.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
jedrzejchalubek committed Aug 16, 2018
2 parents b8c457e + 7a0cd6f commit 55c3475
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"extends": [
"plugin:vue/essential"
],
"rules": {
"indent": ["error", 2]
},
Expand Down
8 changes: 7 additions & 1 deletion build/rules/sass.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ const ExtractTextPlugin = require("extract-text-webpack-plugin")

const config = require('../app.config')

/**
* Internal application SASS files.
* Have build-in autoprefixing.
*/
module.exports = {
test: /\.s[ac]ss$/,
include: config.paths.sass,
Expand All @@ -21,7 +25,9 @@ module.exports = {
loader: 'postcss-loader',
options: {
sourceMap: true,
plugins: () => [autoprefixer(config.settings.autoprefixer)]
plugins: () => [
autoprefixer(config.settings.autoprefixer)
]
}
},

Expand Down
14 changes: 11 additions & 3 deletions build/rules/vue.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
const autoprefixer = require('autoprefixer')

const config = require('../app.config')

/**
* Internal application Vue files.
* Supports .vue compoent format with SASS.
* Internal application Vue files. Supports `.vue` component format.
* Rule is configured for `<style lang="sass/scss">` styles section.
*/
module.exports = {
test: /\.vue$/,
Expand All @@ -9,6 +13,10 @@ module.exports = {
loaders: {
scss: 'vue-style-loader!css-loader!sass-loader',
sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax'
}
},
postcss: [
autoprefixer(config.settings.autoprefixer)
],
autoprefixer: false
}
}
2 changes: 1 addition & 1 deletion build/utils/env.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ const dotenv = require('dotenv').config()
*/
module.exports = (variable, defaults) => {
return (process.env[variable]) ? process.env[variable] : defaults
}
}
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
"development": "cross-env NODE_ENV=development webpack --progress --hide-modules --config build/webpack.config.js",
"prod": "npm run production",
"production": "cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.config.js",
"watch": "npm run development -- --watch && webpack-dev-server --progress --colors"
"watch": "npm run development -- --watch && webpack-dev-server --progress --colors",
"lint:js": "eslint resources/assets/js/**/*.{js,vue}",
"lint:sass": "stylelint resources/assets/sass/**/*.{scss,sass}",
"lint": "npm run lint:js && npm run lint:sass"
},
"dependencies": {},
"devDependencies": {
Expand All @@ -22,6 +25,7 @@
"dotenv": "^5.0.1",
"eslint": "^4.10.0",
"eslint-loader": "^1.9.0",
"eslint-plugin-vue": "^4.7.1",
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^0.11.1",
"imagemin-webpack-plugin": "^1.4.4",
Expand Down

0 comments on commit 55c3475

Please sign in to comment.