From 5aa853cc152c46eba815094ff7cd34a20a70d214 Mon Sep 17 00:00:00 2001 From: smallchill Date: Fri, 4 Jan 2019 12:11:37 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/plugin.config.js | 7 +++---- package.json | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config/plugin.config.js b/config/plugin.config.js index 44ded31..b9e842d 100644 --- a/config/plugin.config.js +++ b/config/plugin.config.js @@ -1,6 +1,6 @@ // Change theme plugin -// import MergeLessPlugin from 'antd-pro-merge-less'; +import MergeLessPlugin from 'antd-pro-merge-less'; import AntDesignThemePlugin from 'antd-theme-webpack-plugin'; import path from 'path'; @@ -11,13 +11,12 @@ export default config => { const outFile = path.join(__dirname, '../.temp/ant-design-pro.less'); const stylesDir = path.join(__dirname, '../src/'); - // mac os下有bug, 暂时先注释掉 - /*config.plugin('merge-less').use(MergeLessPlugin, [ + config.plugin('merge-less').use(MergeLessPlugin, [ { stylesDir, outFile, }, - ]);*/ + ]); config.plugin('ant-design-theme').use(AntDesignThemePlugin, [ { diff --git a/package.json b/package.json index d85fa4c..4da31ef 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,6 @@ "lodash-decorators": "^6.0.0", "memoize-one": "^5.0.0", "moment": "^2.22.2", - "npm": "^6.5.0", "numeral": "^2.0.6", "nzh": "^1.0.3", "omit.js": "^1.0.0",