Skip to content

Commit 6867b43

Browse files
committed
build: build 2.0.0-alpha.31
1 parent 4780cc0 commit 6867b43

File tree

4 files changed

+117
-209
lines changed

4 files changed

+117
-209
lines changed

build/utils.js

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/* eslint-disable guard-for-in */
2+
/* eslint-disable no-restricted-syntax */
13
const path = require('path');
24
const config = require('../config');
35
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
@@ -48,12 +50,7 @@ exports.cssLoaders = function (options) {
4850
// https://vue-loader.vuejs.org/en/configurations/extract-css.html
4951
return {
5052
css: generateLoaders(),
51-
// postcss: generateLoaders(),
52-
// less: generateLoaders('less'),
53-
// sass: generateLoaders('sass', { indentedSyntax: true }),
54-
scss: generateLoaders('sass'),
55-
// stylus: generateLoaders('stylus'),
56-
// styl: generateLoaders('stylus')
53+
scss: generateLoaders('sass', { implementation: require('sass') }),
5754
};
5855
};
5956

build/webpack.base.conf.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@ function resolve(dir) {
77
return path.join(__dirname, '..', dir);
88
}
99

10-
const allSource = [resolve('src'), resolve('example'), resolve('test')]
10+
const allSource = [resolve('src'), resolve('example'), resolve('test')];
1111

1212
module.exports = {
1313
output: {
1414
path: config.build.assetsRoot,
1515
publicPath: process.env.NODE_ENV === 'production' ? config.build.assetsPublicPath : config.dev.assetsPublicPath,
1616
filename: '[name].js',
17-
chunkFilename: '[name].js'
17+
chunkFilename: '[name].js',
1818
},
1919
resolve: {
2020
extensions: ['.js', '.vue', '.md', '.json'],
2121
alias: {
2222
vue$: 'vue/dist/vue.esm.js',
2323
'@': resolve('src'),
24-
'docs': resolve('docs'),
25-
'site': resolve('site')
24+
docs: resolve('docs'),
25+
site: resolve('site'),
2626
},
2727
},
2828
module: {
@@ -48,7 +48,7 @@ module.exports = {
4848
},
4949
{
5050
test: /\.md$/,
51-
use: ['vue-loader','zarm-vue-loader']
51+
use: ['vue-loader', 'zarm-vue-loader'],
5252
},
5353
{
5454
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "zarm-vue",
3-
"version": "2.0.0-alpha.30",
3+
"version": "2.0.0-alpha.31",
44
"description": "zarm in vue",
55
"tags": [
66
"zarm",
@@ -129,12 +129,12 @@
129129
"marked": "^0.7.0",
130130
"merge": "^1.2.1",
131131
"mini-css-extract-plugin": "^0.4.0",
132-
"node-sass": "^4.5.3",
133132
"normalize.css": "^8.0.0",
134133
"opn": "^5.1.0",
135134
"optimize-css-assets-webpack-plugin": "^4.0.2",
136135
"postcss-loader": "^2.0.6",
137136
"rimraf": "^2.6.1",
137+
"sass": "^1.22.9",
138138
"sass-loader": "^7.0.1",
139139
"shelljs": "^0.7.6",
140140
"stylelint": "^7.12.0",

0 commit comments

Comments
 (0)