Merge branch 'master' into feature_pass_number

18334772796 · Apr 26, 2018 · 6821b5f · 6821b5f
2 parents 999a355 + 0460a76
commit 6821b5f
Show file tree

Hide file tree

Showing 48 changed files with 80 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ title: 更新日志
 ---
 
 <!-- CUTOFF -->
+### 1.0.9
+`2018-04-26`
+- 修复issue#47
+
 ### 1.0.8
 `2018-04-24`
 - Button组件点击事件无需`.native`修饰符

diff --git a/build/rollup/build-component.rollup.js b/build/rollup/build-component.rollup.js
@@ -9,17 +9,18 @@ const babel = bluebird.promisifyAll(require('babel-core'))
 const TARGET_LIB_BASE = 'lib'
 const SRC_BASE = 'components'
 
-
 function babelPluginInsertCssImportForVue ({ types: t }) {
   function computedSameDirCssPosition(filePath) {
     const filePathParse = path.parse(filePath)
     return `./style/${filePathParse.name}.css`
   }
+  const globalCssLiteral = '../_style/global.css'
   return {
     visitor: {
       Program(path, state) {
         const importLiteral = computedSameDirCssPosition(state.opts.filePath)
         path.unshiftContainer('body', t.ImportDeclaration([],t.StringLiteral(importLiteral)))
+        path.unshiftContainer('body', t.ImportDeclaration([],t.StringLiteral(globalCssLiteral)))
       }
     }
   }
@@ -141,6 +142,18 @@ function compileJsAndReplace(filePath){
     })
 }
 
+function compileGlobalStylus() {
+  const filePath = path.resolve(TARGET_LIB_BASE, '_style/global.styl')
+  const targetPath = path.resolve(TARGET_LIB_BASE, '_style/global.css')
+  const fileContent = fs.readFileSync(filePath, {
+    encoding: 'utf8',
+  })
+  return compileVueStylus(fileContent, (err, cssContent) => {
+    fs.writeFileAsync(targetPath, cssContent)
+  })
+
+}
+
 function compileAndReplaceAllJsFile() {
   const fileGlob = `${TARGET_LIB_BASE}/**/*.js`
   const jsFiles = glob.sync(fileGlob)
@@ -162,7 +175,7 @@ function compileAndReplaceAllVueFile() {
 
 function main() {
   return move('lib')
-    .then(() => Promise.all([compileAndReplaceAllJsFile(), compileAndReplaceAllVueFile()]))
+    .then(() => Promise.all([compileAndReplaceAllJsFile(), compileAndReplaceAllVueFile(), compileGlobalStylus()]))
     .catch(e => console.info(e))
 }
 

diff --git a/docs/static/js/DesignResource.332e6cfe.js b/docs/static/js/DesignResource.332e6cfe.js
diff --git a/docs/static/js/DocsChangelog.76d0f5a4.js b/docs/static/js/DocsChangelog.76d0f5a4.js
diff --git a/docs/static/js/DocsComponentsBasicActionBar.6d60f495.js b/docs/static/js/DocsComponentsBasicActionBar.6d60f495.js
diff --git a/docs/static/js/DocsComponentsBasicButton.bc157ee0.js b/docs/static/js/DocsComponentsBasicButton.bc157ee0.js
diff --git a/docs/static/js/DocsComponentsBasicDropMenu.32942471.js b/docs/static/js/DocsComponentsBasicDropMenu.32942471.js
diff --git a/docs/static/js/DocsComponentsBasicIcon.e19b0778.js b/docs/static/js/DocsComponentsBasicIcon.e19b0778.js
diff --git a/docs/static/js/DocsComponentsBasicImageReader.e84fffa4.js b/docs/static/js/DocsComponentsBasicImageReader.e84fffa4.js
diff --git a/docs/static/js/DocsComponentsBasicImageViewer.aa1bd222.js b/docs/static/js/DocsComponentsBasicImageViewer.aa1bd222.js
diff --git a/docs/static/js/DocsComponentsBasicNoticeBar.8fbfd18a.js b/docs/static/js/DocsComponentsBasicNoticeBar.8fbfd18a.js
diff --git a/docs/static/js/DocsComponentsBasicStepper.27ddb897.js b/docs/static/js/DocsComponentsBasicStepper.27ddb897.js
diff --git a/docs/static/js/DocsComponentsBasicSteps.f5b52094.js b/docs/static/js/DocsComponentsBasicSteps.f5b52094.js
diff --git a/docs/static/js/DocsComponentsBasicSwiper.acb2a4cf.js b/docs/static/js/DocsComponentsBasicSwiper.acb2a4cf.js
diff --git a/docs/static/js/DocsComponentsBasicTabBar.22ff758f.js b/docs/static/js/DocsComponentsBasicTabBar.22ff758f.js
diff --git a/docs/static/js/DocsComponentsBasicTabs.23dce2f6.js b/docs/static/js/DocsComponentsBasicTabs.23dce2f6.js
diff --git a/docs/static/js/DocsComponentsBasicTag.c82b4c08.js b/docs/static/js/DocsComponentsBasicTag.c82b4c08.js
diff --git a/docs/static/js/DocsComponentsBusinessCaptcha.18fa007d.js b/docs/static/js/DocsComponentsBusinessCaptcha.18fa007d.js
diff --git a/docs/static/js/DocsComponentsBusinessCashier.5f757812.js b/docs/static/js/DocsComponentsBusinessCashier.5f757812.js
diff --git a/docs/static/js/DocsComponentsBusinessChart.b92a1df3.js b/docs/static/js/DocsComponentsBusinessChart.b92a1df3.js
diff --git a/docs/static/js/DocsComponentsBusinessLandscape.d47c4972.js b/docs/static/js/DocsComponentsBusinessLandscape.d47c4972.js
diff --git a/docs/static/js/DocsComponentsBusinessResultPage.4b827a2d.js b/docs/static/js/DocsComponentsBusinessResultPage.4b827a2d.js
diff --git a/docs/static/js/DocsComponentsFeedbackActionSheet.9abab9e0.js b/docs/static/js/DocsComponentsFeedbackActionSheet.9abab9e0.js
diff --git a/docs/static/js/DocsComponentsFeedbackDatePicker.2425609f.js b/docs/static/js/DocsComponentsFeedbackDatePicker.2425609f.js
diff --git a/docs/static/js/DocsComponentsFeedbackDialog.75a4f096.js b/docs/static/js/DocsComponentsFeedbackDialog.75a4f096.js
diff --git a/docs/static/js/DocsComponentsFeedbackPicker.ea0199cd.js b/docs/static/js/DocsComponentsFeedbackPicker.ea0199cd.js
diff --git a/docs/static/js/DocsComponentsFeedbackPopup.1642108d.js b/docs/static/js/DocsComponentsFeedbackPopup.1642108d.js
diff --git a/docs/static/js/DocsComponentsFeedbackSelector.82523070.js b/docs/static/js/DocsComponentsFeedbackSelector.82523070.js
diff --git a/docs/static/js/DocsComponentsFeedbackTabPicker.a49a471c.js b/docs/static/js/DocsComponentsFeedbackTabPicker.a49a471c.js
diff --git a/docs/static/js/DocsComponentsFeedbackTip.7fa062aa.js b/docs/static/js/DocsComponentsFeedbackTip.7fa062aa.js
diff --git a/docs/static/js/DocsComponentsFeedbackToast.fdd7ff30.js b/docs/static/js/DocsComponentsFeedbackToast.fdd7ff30.js
diff --git a/docs/static/js/DocsComponentsFormAgree.2a5d1b73.js b/docs/static/js/DocsComponentsFormAgree.2a5d1b73.js
diff --git a/docs/static/js/DocsComponentsFormCodebox.8477e82f.js b/docs/static/js/DocsComponentsFormCodebox.8477e82f.js
diff --git a/docs/static/js/DocsComponentsFormField.69b122c2.js b/docs/static/js/DocsComponentsFormField.69b122c2.js
diff --git a/docs/static/js/DocsComponentsFormInputItem.3a070dc0.js b/docs/static/js/DocsComponentsFormInputItem.3a070dc0.js
diff --git a/docs/static/js/DocsComponentsFormNumberKeyboard.607f4a8d.js b/docs/static/js/DocsComponentsFormNumberKeyboard.607f4a8d.js
diff --git a/docs/static/js/DocsComponentsFormRadio.d532433c.js b/docs/static/js/DocsComponentsFormRadio.d532433c.js
diff --git a/docs/static/js/DocsComponentsFormSwitch.75c0b739.js b/docs/static/js/DocsComponentsFormSwitch.75c0b739.js
diff --git a/docs/static/js/DocsDevelopment.0b5604cf.js b/docs/static/js/DocsDevelopment.0b5604cf.js
diff --git a/docs/static/js/DocsIntroduce.b608357c.js b/docs/static/js/DocsIntroduce.b608357c.js
diff --git a/docs/static/js/DocsPreview.5d59e199.js b/docs/static/js/DocsPreview.5d59e199.js
diff --git a/docs/static/js/DocsStarted.37a1fbde.js b/docs/static/js/DocsStarted.37a1fbde.js
diff --git a/docs/static/js/DocsTheme.dc48a789.js b/docs/static/js/DocsTheme.dc48a789.js
diff --git a/docs/static/js/app.78b46c74.js b/docs/static/js/app.78b46c74.js
diff --git a/docs/static/js/manifest.32b000e7.js b/docs/static/js/manifest.32b000e7.js
diff --git a/docs/static/js/vendor.b46908c4.js b/docs/static/js/vendor.b46908c4.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mand-mobile",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "A Vue.js 2.0 Mobile UI Toolkit",
   "homepage": "https://github.com/didi/mand-mobile",
   "main": "lib/mand-mobile.umd.js",
@@ -22,8 +22,8 @@
     "assets"
   ],
   "scripts": {
-    "dev:webpack": "webpack-dashboard -m -- node build/webpack/dev-server",
-    "dev": "node build/rollup/dev-server.rollup",
+    "dev": "webpack-dashboard -m -- node build/webpack/dev-server",
+    "dev:rollup": "node build/rollup/dev-server.rollup",
     "dev:site": "cd site && npm start",
     "create": "node build/component-init.js",
     "cz": "git-cz",

diff --git a/site/package.json b/site/package.json
@@ -13,7 +13,7 @@
     "indices": "node ./build/bin/gen-indices --log"
   },
   "dependencies": {
-    "mand-mobile": "^1.0.7",
+    "mand-mobile": "^1.0.9",
     "vue": "^2.5.2",
     "vue-clipboard2": "^0.1.0",
     "vue-qrcode-component": "^2.1.1",