Merge branch 'dev'

tan-alu · Mar 8, 2019 · 5a76442 · 5a76442
2 parents 9d8b904 + 43048bb
commit 5a76442
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 13 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -3,7 +3,7 @@ title: Change Log
 toc: hidden
 ---
 
-### 2.1.3
+### 2.1.4
 
 `2019-03-08`
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,7 @@ title: 更新日志
 toc: hidden
 ---
 
-### 2.1.3
+### 2.1.4
 
 `2019-03-08`
 

diff --git a/build/rollup/build-component.rollup.js b/build/rollup/build-component.rollup.js
@@ -42,7 +42,10 @@ function compileVueStylus (content, cb, compiler, filePath) {
       if (err) {
         throw err
       }
-      const {plugins} = await findPostcssConfig()
+      const {plugins} = await findPostcssConfig({
+        env: process.env.NODE_ENV
+      })
+
       postcss(plugins)
         .process(css, {
           from: undefined
@@ -197,4 +200,4 @@ function main() {
     })
 }
 
-main()
+main()
diff --git a/build/rollup/rollup-plugin-config.js b/build/rollup/rollup-plugin-config.js
@@ -62,7 +62,9 @@ async function vueWarpper() {
   const {
     options,
     plugins,
-  } = await findPostcssConfig({})
+  } = await findPostcssConfig({
+    env: process.env.NODE_ENV
+  })
   return [
     css({
       output: path.resolve(distDir, fileName)

diff --git a/build/rollup/rollup-plugin-example-config.js b/build/rollup/rollup-plugin-example-config.js
@@ -1,5 +1,6 @@
 
 const path = require('path')
+const fs = require('fs')
 const aliasPlugin = require('rollup-plugin-alias')
 const replacePlugin = require('rollup-plugin-replace')
 const jsonPlugin = require('rollup-plugin-json')
@@ -36,10 +37,17 @@ async function vueWarpper() {
   const {
     options,
     plugins,
-  } = await findPostcssConfig({})
+  } = await findPostcssConfig({
+    env: process.env.NODE_ENV
+  })
+
   return [
     css({
-      output: path.resolve(distDir, fileName)
+      output(styles) {
+        setTimeout(function () {
+          fs.writeFileSync(path.resolve(distDir, fileName), styles)
+        }, 0)
+      }
     }),
     vuePlugin({
       css: false,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mand-mobile",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "A Vue.js 2.0 Mobile UI Toolkit",
   "homepage": "https://github.com/didi/mand-mobile",
   "main": "lib/mand-mobile.umd.js",
@@ -37,7 +37,7 @@
     "build:mand-mobile-esm": "cross-env NODE_ENV=production BUILD_TYPE=esm node build/rollup/build-mand-mobile.rollup",
     "build:mand-mobile-umd": "cross-env NODE_ENV=production BUILD_TYPE=umd node build/rollup/build-mand-mobile.rollup",
     "build:mand-mobile-variables": "npm run build:variables && cross-env NODE_ENV=production BUILD_TYPE=variables node build/rollup/build-mand-mobile.rollup",
-    "build:components": "cross-env NODE_ENV=production && node build/rollup/build-component.rollup",
+    "build:components": "cross-env NODE_ENV=production node build/rollup/build-component.rollup",
     "build:responsive": "node build/rollup/build-vw-responsive",
     "build:variables": "node build/rollup/build-css-variables",
     "build:analysis": "cross-env NODE_ENV=production node build/webpack/build-mand-mobile --analysis",

diff --git a/postcss.config.js b/postcss.config.js
@@ -1,9 +1,8 @@
 
 // https://github.com/michael-ciniawsky/postcss-load-config
 const browserslist = require('./package.json').browserslist
-module.exports = () => ({
-  plugins: {
-    'postcss-pxtorem': process.env.NODE_ENV !== 'production' ? { rootValue: 100, minPixelValue: 2, propWhiteList: [] } : false,
+module.exports = () => {
+  const plugins = {
     'postcss-url': {url: 'inline'},
     'cssnano': {
       preset: ['default', {
@@ -16,4 +15,12 @@ module.exports = () => ({
     },
     'autoprefixer': { browsers: browserslist }
   }
-})
+
+  if (process.env.NODE_ENV !== 'production' || process.env.BUILD_TYPE === 'example') {
+    plugins['postcss-pxtorem'] = { rootValue: 100, minPixelValue: 2, propWhiteList: [] }
+  }
+
+  return {
+    plugins
+  }
+}