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

NervJS · Mar 25, 2019 · 2448ae7 · 2448ae7
2 parents 5fb6fab + 3589621
commit 2448ae7
Show file tree

Hide file tree

Showing 25 changed files with 89 additions and 70 deletions.
diff --git a/docs/config.md b/docs/config.md
@@ -54,7 +54,10 @@ const config = {
           }
         }
       }
-    }
+    },
+    // 替换 JSX 中的属性名，参考：
+    // https://github.com/NervJS/taro/issues/2077
+    jsxAttributeNameReplace: {}
   },
   // H5 端专用配置
   h5: {

diff --git a/docs/event.md b/docs/event.md
@@ -93,14 +93,16 @@ class Popper extends Component {
 
   render () {
     const name = 'test'
-    return <Button onClick={(e) => {
-      e.stopPropagation()
-      this.setState({
-        name
-      })
-    }}>
-      {this.state.name}
-    </Button>
+    return (
+      <Button onClick={(e) => {
+        e.stopPropagation()
+        this.setState({
+          name
+        })
+      }}>
+        {this.state.name}
+      </Button>
+    )
   }
 }
 ```

diff --git a/docs/spec-for-taro.md b/docs/spec-for-taro.md
@@ -1104,7 +1104,7 @@ render () {
     <MyComponent className='long body' foo='bar'>
       <MyChild />
     </MyComponent>
-  );
+  )
 }
 
 // good

diff --git a/docs/taroize.md b/docs/taroize.md
@@ -137,7 +137,7 @@ Taro 会将原始文件的生命周期钩子函数转换为 Taro 的生命周期
 | onHide | componentDidHide |
 | onReady | componentDidMount |
 | onUnload | componentWillUnmount |
-| onError | componentCatchError |
+| onError | componentDidCatchError |
 | App.onLaunch | componentWillMount |
 | Component.created | componentWillMount |
 | attached | componentDidMount |

diff --git a/packages/taro-cli/__tests__/__snapshots__/rn.test.js.snap b/packages/taro-cli/__tests__/__snapshots__/rn.test.js.snap
@@ -19,7 +19,7 @@ let App = (_temp = _class = class App extends Component {
   componentDidMount() {}
   componentDidShow() {}
   componentDidHide() {}
-  componentCatchError() {}
+  componentDidCatchError() {}
   render() {
     return <RootStack />;
   }
@@ -79,7 +79,7 @@ let App = (_temp = _class = class App extends Component {
 
   componentDidHide() {}
 
-  componentCatchError() {}
+  componentDidCatchError() {}
 
   render() {
     return <RootStack />;
@@ -161,7 +161,7 @@ let App = (_temp = _class = class App extends Component {
 
   componentDidHide() {}
 
-  componentCatchError() {}
+  componentDidCatchError() {}
 
   render() {
     return <Provider store={store}>
@@ -217,7 +217,7 @@ let App = (_temp = _class = class App extends Component {
 
   componentDidHide() {}
 
-  componentCatchError() {}
+  componentDidCatchError() {}
 
   render() {
     return <RootStack />;

diff --git a/packages/taro-cli/__tests__/mocks/app.js b/packages/taro-cli/__tests__/mocks/app.js
@@ -51,7 +51,7 @@ class App extends Component {
 
   componentDidHide () {}
 
-  componentCatchError () {}
+  componentDidCatchError () {}
 
   render () {
     return (
@@ -88,7 +88,7 @@ class App extends Component {
 
   componentDidHide () {}
 
-  componentCatchError () {}
+  componentDidCatchError () {}
 
   render () {
     return (
@@ -133,7 +133,7 @@ class App extends Component {
 
   componentDidHide () {}
 
-  componentCatchError () {}
+  componentDidCatchError () {}
 
   render () {
     return (

diff --git a/packages/taro-cli/src/build.js b/packages/taro-cli/src/build.js
@@ -8,13 +8,12 @@ const CONFIG = require('./config')
 
 const appPath = process.cwd()
 
-
 function build (args, buildConfig) {
   const { type, watch } = buildConfig
   const configDir = require(path.join(appPath, Util.PROJECT_CONFIG))(_.merge)
   const outputPath = path.join(appPath, configDir.outputRoot || CONFIG.OUTPUT_DIR)
   if (!fs.existsSync(outputPath)) {
-    fs.mkdirSync(outputPath)
+    fs.ensureDirSync(outputPath)
   } else {
     if (type !== Util.BUILD_TYPES.H5) {
       Util.emptyDirectory(outputPath)

diff --git a/packages/taro-cli/src/convertor.js b/packages/taro-cli/src/convertor.js
@@ -116,7 +116,7 @@ class Convertor {
     if (fs.existsSync(this.convertRoot)) {
       emptyDirectory(this.convertRoot, { excludes: ['node_modules'] })
     } else {
-      fs.mkdirpSync(this.convertRoot)
+      fs.ensureDirSync(this.convertRoot)
     }
   }
 

diff --git a/packages/taro-cli/src/util/index.js b/packages/taro-cli/src/util/index.js
@@ -263,7 +263,7 @@ exports.getRootPath = function () {
 exports.getTaroPath = function () {
   const taroPath = path.join(exports.homedir(), '.taro')
   if (!fs.existsSync(taroPath)) {
-    fs.mkdirSync(taroPath)
+    fs.ensureDirSync(taroPath)
   }
   return taroPath
 }

diff --git a/packages/taro-cli/src/weapp.js b/packages/taro-cli/src/weapp.js
@@ -866,7 +866,8 @@ function isFileToBeTaroComponent (code, sourcePath, outputPath) {
     isNormal: true,
     isTyped: Util.REG_TYPESCRIPT.test(sourcePath),
     adapter: buildAdapter,
-    env: constantsReplaceList
+    env: constantsReplaceList,
+    jsxAttributeNameReplace: weappConf.jsxAttributeNameReplace
   })
   const { ast } = transformResult
   let isTaroComponent = false
@@ -979,7 +980,8 @@ async function compileScriptFile (content, sourceFilePath, outputFilePath, adapt
     isNormal: true,
     isTyped: false,
     adapter,
-    env: constantsReplaceList
+    env: constantsReplaceList,
+    jsxAttributeNameReplace: weappConf.jsxAttributeNameReplace
   })
   const res = parseAst(PARSE_AST_TYPE.NORMAL, transformResult.ast, [], sourceFilePath, outputFilePath)
   return res.code
@@ -1102,7 +1104,8 @@ async function buildEntry () {
       isApp: true,
       isTyped: Util.REG_TYPESCRIPT.test(entryFilePath),
       adapter: buildAdapter,
-      env: constantsReplaceList
+      env: constantsReplaceList,
+      jsxAttributeNameReplace: weappConf.jsxAttributeNameReplace
     })
     // app.js的template忽略
     const res = parseAst(PARSE_AST_TYPE.ENTRY, transformResult.ast, [], entryFilePath, outputEntryFilePath)
@@ -1337,7 +1340,8 @@ async function buildSinglePage (page) {
       isRoot: true,
       isTyped: Util.REG_TYPESCRIPT.test(pageJs),
       adapter: buildAdapter,
-      env: constantsReplaceList
+      env: constantsReplaceList,
+      jsxAttributeNameReplace: weappConf.jsxAttributeNameReplace
     })
     const pageDepComponents = transformResult.components
     const compressTemplate = useCompileConf.compressTemplate
@@ -1774,7 +1778,8 @@ async function buildSingleComponent (componentObj, buildConfig = {}) {
       isTyped: Util.REG_TYPESCRIPT.test(component),
       isNormal: false,
       adapter: buildAdapter,
-      env: constantsReplaceList
+      env: constantsReplaceList,
+      jsxAttributeNameReplace: weappConf.jsxAttributeNameReplace
     })
     const compressTemplate = useCompileConf.compressTemplate
     const componentWXMLContent = (isProduction && compressTemplate) ? transformResult.compressedTemplate : transformResult.template
@@ -1926,7 +1931,8 @@ function compileDepScripts (scriptFiles) {
             isNormal: true,
             isTyped: Util.REG_TYPESCRIPT.test(item),
             adapter: buildAdapter,
-            env: constantsReplaceList
+            env: constantsReplaceList,
+            jsxAttributeNameReplace: weappConf.jsxAttributeNameReplace
           })
           const ast = transformResult.ast
           const res = parseAst(PARSE_AST_TYPE.NORMAL, ast, [], item, outputItem)

diff --git a/packages/taro-cli/templates/default/index.js b/packages/taro-cli/templates/default/index.js
@@ -26,10 +26,10 @@ module.exports = function (creater, params, helper, cb) {
   }
   const currentStyleExt = styleExtMap[css] || 'css'
 
-  fs.mkdirSync(projectPath)
-  fs.mkdirSync(sourceDir)
-  fs.mkdirSync(configDir)
-  fs.mkdirSync(path.join(sourceDir, 'pages'))
+  fs.ensureDirSync(projectPath)
+  fs.ensureDirSync(sourceDir)
+  fs.ensureDirSync(configDir)
+  fs.ensureDirSync(path.join(sourceDir, 'pages'))
 
   creater.template(template, 'pkg', path.join(projectPath, 'package.json'), {
     description,

diff --git a/packages/taro-cli/templates/default/indexhtml b/packages/taro-cli/templates/default/indexhtml
@@ -8,7 +8,7 @@
   <meta name="format-detection" content="telephone=no,address=no">
   <meta name="apple-mobile-web-app-status-bar-style" content="white">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
-  <title>Taro</title>
+  <title></title>
   <script>
     !function(x){function w(){var v,u,t,tes,s=x.document,r=s.documentElement,a=r.getBoundingClientRect().width;if(!v&&!u){var n=!!x.navigator.appVersion.match(/AppleWebKit.*Mobile.*/);v=x.devicePixelRatio;tes=x.devicePixelRatio;v=n?v:1,u=1/v}if(a>=640){r.style.fontSize="40px"}else{if(a<=320){r.style.fontSize="20px"}else{r.style.fontSize=a/320*20+"px"}}}x.addEventListener("resize",function(){w()});w()}(window);
   </script>

diff --git a/packages/taro-cli/templates/mobx/index.js b/packages/taro-cli/templates/mobx/index.js
@@ -26,10 +26,10 @@ module.exports = function (creater, params, helper, cb) {
   }
   const currentStyleExt = styleExtMap[css] || 'css'
 
-  fs.mkdirSync(projectPath)
-  fs.mkdirSync(sourceDir)
-  fs.mkdirSync(configDir)
-  fs.mkdirSync(path.join(sourceDir, 'pages'))
+  fs.ensureDirSync(projectPath)
+  fs.ensureDirSync(sourceDir)
+  fs.ensureDirSync(configDir)
+  fs.ensureDirSync(path.join(sourceDir, 'pages'))
 
   creater.template(template, 'pkg', path.join(projectPath, 'package.json'), {
     description,

diff --git a/packages/taro-cli/templates/mobx/indexhtml b/packages/taro-cli/templates/mobx/indexhtml
@@ -8,7 +8,7 @@
   <meta name="format-detection" content="telephone=no,address=no">
   <meta name="apple-mobile-web-app-status-bar-style" content="white">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
-  <title>Taro</title>
+  <title></title>
   <script>
     !function(x){function w(){var v,u,t,tes,s=x.document,r=s.documentElement,a=r.getBoundingClientRect().width;if(!v&&!u){var n=!!x.navigator.appVersion.match(/AppleWebKit.*Mobile.*/);v=x.devicePixelRatio;tes=x.devicePixelRatio;v=n?v:1,u=1/v}if(a>=640){r.style.fontSize="40px"}else{if(a<=320){r.style.fontSize="20px"}else{r.style.fontSize=a/320*20+"px"}}}x.addEventListener("resize",function(){w()});w()}(window);
   </script>

diff --git a/packages/taro-cli/templates/redux/appjs b/packages/taro-cli/templates/redux/appjs
@@ -49,8 +49,6 @@ class App extends Component {
 
   componentDidHide () {}
 
-  componentCatchError () {}
-
   componentDidCatchError () {}
 
   // 在 App 类中的 render() 函数没有实际作用

diff --git a/packages/taro-cli/templates/redux/index.js b/packages/taro-cli/templates/redux/index.js
@@ -30,14 +30,14 @@ module.exports = function (creater, params, helper, cb) {
   }
   const currentStyleExt = styleExtMap[css] || 'css'
 
-  fs.mkdirSync(projectPath)
-  fs.mkdirSync(sourceDir)
-  fs.mkdirSync(configDir)
-  fs.mkdirSync(path.join(sourceDir, 'pages'))
-  fs.mkdirSync(constantsDir)
-  fs.mkdirSync(actionsDir)
-  fs.mkdirSync(reducersDir)
-  fs.mkdirSync(storeDir)
+  fs.ensureDirSync(projectPath)
+  fs.ensureDirSync(sourceDir)
+  fs.ensureDirSync(configDir)
+  fs.ensureDirSync(path.join(sourceDir, 'pages'))
+  fs.ensureDirSync(constantsDir)
+  fs.ensureDirSync(actionsDir)
+  fs.ensureDirSync(reducersDir)
+  fs.ensureDirSync(storeDir)
 
   creater.template(template, 'pkg', path.join(projectPath, 'package.json'), {
     description,

diff --git a/packages/taro-cli/templates/redux/indexhtml b/packages/taro-cli/templates/redux/indexhtml
@@ -8,7 +8,7 @@
   <meta name="format-detection" content="telephone=no,address=no">
   <meta name="apple-mobile-web-app-status-bar-style" content="white">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
-  <title>Taro</title>
+  <title></title>
   <script>
     !function(x){function w(){var v,u,t,tes,s=x.document,r=s.documentElement,a=r.getBoundingClientRect().width;if(!v&&!u){var n=!!x.navigator.appVersion.match(/AppleWebKit.*Mobile.*/);v=x.devicePixelRatio;tes=x.devicePixelRatio;v=n?v:1,u=1/v}if(a>=640){r.style.fontSize="40px"}else{if(a<=320){r.style.fontSize="20px"}else{r.style.fontSize=a/320*20+"px"}}}x.addEventListener("resize",function(){w()});w()}(window);
   </script>

diff --git a/packages/taro-cli/templates/wxcloud/client/indexhtml b/packages/taro-cli/templates/wxcloud/client/indexhtml
@@ -8,7 +8,7 @@
   <meta name="format-detection" content="telephone=no,address=no">
   <meta name="apple-mobile-web-app-status-bar-style" content="white">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" >
-  <title>Taro</title>
+  <title></title>
   <script>
     !function(x){function w(){var v,u,t,tes,s=x.document,r=s.documentElement,a=r.getBoundingClientRect().width;if(!v&&!u){var n=!!x.navigator.appVersion.match(/AppleWebKit.*Mobile.*/);v=x.devicePixelRatio;tes=x.devicePixelRatio;v=n?v:1,u=1/v}if(a>=640){r.style.fontSize="40px"}else{if(a<=320){r.style.fontSize="20px"}else{r.style.fontSize=a/320*20+"px"}}}x.addEventListener("resize",function(){w()});w()}(window);
   </script>

diff --git a/packages/taro-cli/templates/wxcloud/index.js b/packages/taro-cli/templates/wxcloud/index.js
@@ -30,12 +30,12 @@ module.exports = function (creater, params, helper, cb) {
   }
   const currentStyleExt = styleExtMap[css] || 'css'
 
-  fs.mkdirSync(projectPath)
-  fs.mkdirSync(projectClientPath)
-  fs.mkdirSync(projectCloudPath)
-  fs.mkdirSync(sourceDir)
-  fs.mkdirSync(configDir)
-  fs.mkdirSync(path.join(sourceDir, 'pages'))
+  fs.ensureDirSync(projectPath)
+  fs.ensureDirSync(projectClientPath)
+  fs.ensureDirSync(projectCloudPath)
+  fs.ensureDirSync(sourceDir)
+  fs.ensureDirSync(configDir)
+  fs.ensureDirSync(path.join(sourceDir, 'pages'))
 
   creater.template(template, path.join(clientDirName, 'pkg'), path.join(projectClientPath, 'package.json'), {
     description,

diff --git a/packages/taro-transformer-wx/src/index.ts b/packages/taro-transformer-wx/src/index.ts
@@ -440,6 +440,18 @@ export default function transform (options: Options): TransformResult {
     },
     JSXAttribute (path) {
       const { name, value } = path.node
+
+      if (options.jsxAttributeNameReplace) {
+        for (const r in options.jsxAttributeNameReplace) {
+          if (options.jsxAttributeNameReplace.hasOwnProperty(r)) {
+            const element = options.jsxAttributeNameReplace[r]
+            if (t.isJSXIdentifier(name, { name: r })) {
+              path.node.name = t.jSXIdentifier(element)
+            }
+          }
+        }
+      }
+
       if (!t.isJSXIdentifier(name) || value === null || t.isStringLiteral(value) || t.isJSXElement(value)) {
         return
       }

diff --git a/packages/taro-transformer-wx/src/options.ts b/packages/taro-transformer-wx/src/options.ts
@@ -11,7 +11,8 @@ export interface Options {
   isTyped: boolean,
   isNormal?: boolean,
   env?: object,
-  adapter?: Adapters
+  adapter?: Adapters,
+  jsxAttributeNameReplace?: Object
 }
 
 export const transformOptions: Options = {} as any

diff --git a/packages/taro-transformer-wx/src/render.ts b/packages/taro-transformer-wx/src/render.ts
@@ -1440,8 +1440,10 @@ export class RenderParser {
             JSXAttribute: !t.isIdentifier(indexParam) ? noop : (path: NodePath<t.JSXAttribute>) => {
               const { value } = path.node
               if (t.isJSXExpressionContainer(value) && t.isIdentifier(value.expression, { name: indexParam.name })) {
-                // tslint:disable-next-line:no-console
-                console.warn(codeFrameError(value.expression, '建议修改：使用循环的 index 变量作为 key 是一种反优化。参考：https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-array-index-key.md').message)
+                if (process.env.TERM_PROGRAM) { // 无法找到 cli 名称的工具（例如 idea/webstorm）显示这个报错可能会乱码
+                  // tslint:disable-next-line:no-console
+                  console.log(codeFrameError(value.expression, '建议修改：使用循环的 index 变量作为 key 是一种反优化。参考：https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-array-index-key.md').message)
+                }
               }
             },
             JSXExpressionContainer: this.replaceIdWithTemplate(),

diff --git a/packages/taro-webpack-runner/src/util/chain.ts b/packages/taro-webpack-runner/src/util/chain.ts
@@ -375,21 +375,17 @@ const getModule = ({
     test: fontReg,
     use: {
       urlLoader: getUrlLoader([defaultFontUrlLoaderOption, {
-        options: {
-          name: `${staticDirectory}/fonts/[name].[ext]`,
-          ...fontUrlLoaderOption
-        }
+        name: `${staticDirectory}/fonts/[name].[ext]`,
+        ...fontUrlLoaderOption
       }])
     }
   }
   rule.image = {
     test: imageReg,
     use: {
       urlLoader: getUrlLoader([defaultImageUrlLoaderOption, {
-        options: {
-          name: `${staticDirectory}/images/[name].[ext]`,
-          ...imageUrlLoaderOption
-        }
+        name: `${staticDirectory}/images/[name].[ext]`,
+        ...imageUrlLoaderOption
       }])
     }
   }