Merge branch 'master' of https://github.com/NervJS/taro

NervJS · Jun 7, 2018 · 5ae7f25 · 5ae7f25
2 parents a47cf71 + 76a6f95
commit 5ae7f25
Show file tree

Hide file tree

Showing 19 changed files with 26 additions and 21 deletions.
diff --git a/docs/composition.md b/docs/composition.md
@@ -10,7 +10,8 @@
 | [`@tarojs/router`](https://www.npmjs.com/package/@tarojs/router) |  taro h5 路由  |
 | [`@tarojs/async-await`](https://www.npmjs.com/package/@tarojs/async-await)      |  支持使用 asyn/await 语法  |
 | [`@tarojs/cli`](https://www.npmjs.com/package/@tarojs/cli) | taro开发工具   |
-| [`@tarojs/webpack-runner`](https://www.npmjs.com/package/@tarojs/webpack-runner) |  taro h5 端 webpack 编译工具  |
+| [`@tarojs/taro-rn-runner`](https://www.npmjs.com/package/@tarojs/rn-runner) |  taro ReactNative 打包编译工具  |
+| [`@tarojs/webpack-runner`](https://www.npmjs.com/package/@tarojs/webpack-runner) |  taro h5 端 webpack 打包编译工具  |
 | [`@tarojs/components`](https://www.npmjs.com/package/@tarojs/components) | taro 标准组件库，h5 版 |
 | [`@tarojs/components-rn`](https://www.npmjs.com/package/@tarojs/components-rn) |  taro 标准组件库，RractNative 版  |
 | [`@tarojs/plugin-babel`](https://www.npmjs.com/package/@tarojs/plugin-babel) |  taro babel 编译插件  |

diff --git a/lerna.json b/lerna.json
@@ -23,7 +23,7 @@
       "message": "chore(release): publish %s"
     }
   },
-  "version": "0.0.37",
+  "version": "0.0.38",
   "npmClient": "yarn",
   "npmClientArgs": [
     "--no-lockfile"

diff --git a/packages/taro-async-await/package.json b/packages/taro-async-await/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/async-await",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "taro async await",
   "main": "index.js",
   "scripts": {

diff --git a/packages/taro-cli/package.json b/packages/taro-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/cli",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "cli tool for taro",
   "main": "index.js",
   "scripts": {

diff --git a/packages/taro-cli/src/h5.js b/packages/taro-cli/src/h5.js
@@ -135,6 +135,10 @@ function processEntry (code) {
                 value.properties.forEach(node => {
                   if (node.key.name === 'position') tabbarPos = node.value.value
                 })
+              } else if ((key.name === 'iconPath' || key.name === 'selectedIconPath') && t.isStringLiteral(value)) {
+                astPath.replaceWith(
+                  t.objectProperty(t.stringLiteral(key.name), t.callExpression(t.identifier('require'), [t.stringLiteral(`./${value.value}`)]))
+                )
               }
             }
           })

diff --git a/packages/taro-components-rn/package.json b/packages/taro-components-rn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-rn",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "多端解决方案基础组件（RN）",
   "main": "./src/index.js",
   "scripts": {

diff --git a/packages/taro-components/package.json b/packages/taro-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "",
   "main": "./dist/index.js",
   "module": "./src/components/index.js",

diff --git a/packages/taro-h5/package.json b/packages/taro-h5/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-h5",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "Taro h5 framework",
   "main": "index.js",
   "files": [
@@ -25,7 +25,7 @@
     "nervjs": "^1.2.17"
   },
   "dependencies": {
-    "@tarojs/taro": "0.0.37",
+    "@tarojs/taro": "0.0.38",
     "jsonp-retry": "^1.0.3",
     "nervjs": "^1.2.18"
   }

diff --git a/packages/taro-plugin-babel/package.json b/packages/taro-plugin-babel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-babel",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "Taro babel编译",
   "main": "index.js",
   "scripts": {

diff --git a/packages/taro-plugin-csso/package.json b/packages/taro-plugin-csso/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-csso",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "Taro压缩CSS文件",
   "main": "index.js",
   "scripts": {

diff --git a/packages/taro-plugin-sass/package.json b/packages/taro-plugin-sass/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-sass",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "Taro编译sass文件",
   "main": "index.js",
   "scripts": {

diff --git a/packages/taro-plugin-uglifyjs/package.json b/packages/taro-plugin-uglifyjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-uglifyjs",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "Taro压缩JS文件",
   "main": "index.js",
   "scripts": {

diff --git a/packages/taro-redux/package.json b/packages/taro-redux/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/redux",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "Redux for Taro",
   "main": "index.js",
   "scripts": {

diff --git a/packages/taro-rn-runner/package.json b/packages/taro-rn-runner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/rn-runner",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "ReactNative build tool for taro",
   "main": "index.js",
   "scripts": {

diff --git a/packages/taro-rn/package.json b/packages/taro-rn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-rn",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "Taro RN framework",
   "main": "index.js",
   "files": [
@@ -22,7 +22,7 @@
   "author": "O2Team",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/taro": "0.0.37",
+    "@tarojs/taro": "0.0.38",
     "react-native": "^0.55.4"
   }
 }
diff --git a/packages/taro-router/package.json b/packages/taro-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/router",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "Taro-router",
   "main": "index.js",
   "module": "dist/index.esm.js",

diff --git a/packages/taro-weapp/package.json b/packages/taro-weapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro-weapp",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "Taro weapp framework",
   "main": "index.js",
   "files": [
@@ -22,7 +22,7 @@
   "author": "O2Team",
   "license": "MIT",
   "dependencies": {
-    "@tarojs/taro": "0.0.37",
+    "@tarojs/taro": "0.0.38",
     "prop-types": "^15.6.1"
   }
 }
diff --git a/packages/taro-webpack-runner/package.json b/packages/taro-webpack-runner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/webpack-runner",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "webpack runner for taro",
   "main": "index.js",
   "scripts": {

diff --git a/packages/taro/package.json b/packages/taro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/taro",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "Taro framework",
   "main": "index.js",
   "typings": "types/index.d.ts",