在map循环中添加click事件不生效

lerna.json

@@ -26,6 +26,7 @@
     "packages/taro-swan",
     "packages/taro-alipay",
     "packages/taro-tt",
+    "packages/taro-quickapp",
     "packages/taro-webpack-runner",
     "packages/postcss-plugin-constparse",
     "packages/eslint-config-taro",

packages/eslint-config-taro/rules/jsx.js

@@ -226,10 +226,14 @@ module.exports = {
     //   beforeSelfClosing: 'always',
     //   afterOpening: 'never'
     // }],
+    'react/jsx-tag-spacing': ['error', { beforeSelfClosing: 'always' }],
 
     // Enforce spaces before the closing bracket of self-closing JSX elements
     // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/jsx-tag-spacing.md
     'react/jsx-tag-spacing': ["error", { "beforeSelfClosing": "always" }],
+    // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/jsx-space-before-closing.md
+    // Deprecated in favor of jsx-tag-spacing
+    // 'react/jsx-space-before-closing': ['error', 'always'],
 
     // // Prevent usage of Array index in keys
     // // https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-array-index-key.md

packages/eslint-plugin-taro/rules/index.js

@@ -3,10 +3,10 @@ const has = require('has')
 const allRules = {
   // 'if-statement-in-map-loop': require('./if-statement-in-map-loop'),
   'manipulate-jsx-as-array': require('./manipulate-jsx-as-array'),
-  // 'no-anonymous-function-in-props': require('./no-anonymous-function-in-props'),
-  'no-jsx-in-class-method': require('./no-jsx-in-class-method'),
+  //'no-anonymous-function-in-props': require('./no-anonymous-function-in-props'),
+  // 'no-jsx-in-class-method': require('./no-jsx-in-class-method'),
   'no-spread-in-props': require('./no-spread-in-props'),
-  'no-stateless-component': require('./no-stateless-component'),
+  // 'no-stateless-component': require('./no-stateless-component'),
   // 'jsx-handler-names': require('./jsx-handler-names'),
   'reserve-class-properties': require('./reserve-class-properties'),
   // 'function-naming': require('./function-naming'),

packages/taro-cli/bin/taro

@@ -1,18 +1,10 @@
 #! /usr/bin/env node
 
 const program = require('commander')
-const { getPkgVersion, printPkgVersion } = require('../src/util')
+const { getPkgVersion, printPkgVersion } = require('../dist/util')
 
 printPkgVersion()
 
-const startTime = new Date('2019-1-1 00:00').getTime()
-const endTime = new Date('2019-1-2 00:00').getTime()
-const nowTime = Date.now()
-if (nowTime >= startTime && nowTime <= endTime) {
-  const yearTxt = String(require('fs-extra').readFileSync(require('path').resolve(__dirname, 'year.txt')))
-  console.log(require('chalk').rgb(255, 87, 34)(yearTxt))
-}
-
 program
   .version(getPkgVersion())
   .usage('<command> [options]')
@@ -21,4 +13,5 @@ program
   .command('update', 'Update packages of taro')
   .command('convert', 'Convert weapp to taro')
   .command('info', 'Diagnostics Taro env info')
+  .command('doctor', 'Diagnose taro project')
   .parse(process.argv)

packages/taro-cli/bin/taro-build

@@ -5,20 +5,21 @@ const program = require('commander')
 const chalk = require('chalk')
 const _ = require('lodash')
 
-const build = require('../src/build')
-const { PROJECT_CONFIG } = require('../src/util')
+const build = require('../dist/build').default
+const { PROJECT_CONFIG } = require('../dist/util/constants')
 const projectConfPath = path.join(process.cwd(), PROJECT_CONFIG)
 
 program
-  .option('--type [typeName]', 'Build type, weapp/h5/rn/swan/alipay/tt')
+  .option('--type [typeName]', 'Build type, weapp/swan/alipay/tt/h5/quickapp/rn/qq')
   .option('--watch', 'Watch mode')
   .option('--env [env]', 'Env type')
   .option('--ui', 'Build Taro UI library')
+  .option('--port [port]', 'Specified port')
   .parse(process.argv)
 
 const args = program.args
-const { type, watch, ui } = program
-let { env } =  program
+const { type, watch, ui, port } = program
+let { env } = program
 
 env = process.env.NODE_ENV || env
 
@@ -46,10 +47,13 @@ if (env) {
   }
 }
 
+process.env.TARO_ENV = type
+
 const projectConf = require(projectConfPath)(_.merge)
 console.log(chalk.green(`开始编译项目 ${chalk.bold(projectConf.projectName)}`))
 
 build(args, {
   type,
-  watch
+  watch,
+  port: typeof port === 'string' ? port: undefined
 })

packages/taro-cli/bin/taro-convert

@@ -2,7 +2,7 @@
 
 const program = require('commander')
 
-const Convertor = require('../src/convertor')
+const Convertor = require('../dist/convertor').default
 
 program
   .parse(process.argv)

packages/taro-cli/bin/taro-doctor

@@ -0,0 +1,65 @@
+#!/usr/bin/env node
+
+const path = require('path')
+const program = require('commander')
+const _ = require('lodash/fp')
+const ora = require('ora')
+const chalk = require('chalk')
+const fs = require('fs-extra')
+const { PROJECT_CONFIG } = require('../dist/util/constants')
+const PROJECT_CONF_PATH = path.join(process.cwd(), PROJECT_CONFIG)
+
+if (!fs.existsSync(PROJECT_CONF_PATH)) {
+  console.log(chalk.red(`找不到项目配置文件${PROJECT_CONFIG}，请确定当前目录是Taro项目根目录!`))
+  process.exit(1)
+}
+
+const { validators } = require('../dist/doctor').default
+
+const NOTE_ALL_RIGHT = chalk.green('[✓] ')
+const NOTE_VALID = chalk.yellow('[!] ')
+const NOTE_INVALID = chalk.red('[✗] ')
+
+const titleChalk = chalk.hex('#aaa')
+const lineChalk = chalk.hex('#fff')
+const solutionChalk = chalk.hex('#999')
+
+function printReport (reports) {
+  _.forEach(report => {
+    console.log('\n' + titleChalk(report.desc))
+
+    if (report.raw) {
+      console.log(report.raw)
+      return
+    }
+
+    if (_.getOr(0, 'lines.length', report) === 0) {
+      console.log(`  ${NOTE_ALL_RIGHT}没有发现问题`)
+      return
+    }
+
+    _.forEach(line => {
+      console.log(
+        '  ' +
+        (line.valid ? NOTE_VALID : NOTE_INVALID) +
+        lineChalk(line.desc)
+      )
+      if (line.solution) {
+        console.log('      ' + solutionChalk(line.solution))
+      }
+    }, report.lines)
+  }, reports)
+}
+
+program
+  .option('-v --verbose', 'Print all message')
+  .parse(process.argv)
+
+async function diagnose () {
+  const spinner = ora('正在诊断项目...').start()
+  const reportsP = _.map(validator => validator(), validators)
+  const reports = await Promise.all(reportsP)
+  spinner.succeed('诊断完成')
+  printReport(reports)
+}
+diagnose()

packages/taro-cli/bin/taro-info

@@ -2,7 +2,7 @@
 const fs = require('fs')
 const path = require('path')
 const envinfo = require('envinfo')
-const {getPkgVersion, UPDATE_PACKAGE_LIST} = require('../src/util')
+const { getPkgVersion, UPDATE_PACKAGE_LIST } = require('../dist/util')
 const process = require('process')
 const program = require('commander')
 
@@ -37,7 +37,7 @@ function rnInfo (options) {
 }
 
 async function info (options) {
-  let info = await envinfo.run(
+  const info = await envinfo.run(
     {
       System: ['OS', 'Shell'],
       Binaries: ['Node', 'Yarn', 'npm'],

packages/taro-cli/bin/taro-init

@@ -2,7 +2,7 @@
 
 const program = require('commander')
 
-const Project = require('../src/project')
+const Project = require('../dist/project').default
 
 program
   .option('--name [name]', '项目名称')
@@ -15,7 +15,7 @@ program
 
 const args = program.args
 const { template, description, name, css } = program
-let typescript = ''
+let typescript = false
 
 /**
  * 非标准做法

packages/taro-cli/bin/taro-update

@@ -3,14 +3,13 @@ const path = require('path')
 const fs = require('fs-extra')
 const program = require('commander')
 const chalk = require('chalk')
-const { getPkgItemByKey } = require('../src/util')
+const { getPkgItemByKey, shouldUseYarn, shouldUseCnpm } = require('../dist/util')
 const ora = require('ora')
 const exec = require('child_process').exec
 const getLatestVersion = require('latest-version')
-const { PROJECT_CONFIG, UPDATE_PACKAGE_LIST} = require('../src/util')
+const { PROJECT_CONFIG, UPDATE_PACKAGE_LIST } = require('../dist/util/constants')
 const projectConfPath = path.join(process.cwd(), PROJECT_CONFIG)
 const pkgPath = path.join(process.cwd(), 'package.json')
-const { shouldUseYarn, shouldUseCnpm } = require('../src/util')
 
 const pkgName = getPkgItemByKey('name')
 
@@ -50,7 +49,7 @@ function updateSelf () {
     command = 'npm i -g @tarojs/cli@latest'
   }
 
-  let child = exec(command)
+  const child = exec(command)
 
   const spinner = ora('即将将 Taro 开发工具 taro-cli 更新到最新版本...').start()
 
@@ -103,7 +102,7 @@ async function updateProject () {
     command = 'npm install'
   }
 
-  let child = exec(command)
+  const child = exec(command)
 
   const spinner = ora('即将将项目所有 Taro 相关依赖更新到最新版本...').start()
 

packages/taro-cli/global.d.ts

@@ -0,0 +1,4 @@
+declare module '*.json' {
+  const value: any
+  export default value
+}

packages/taro-cli/package.json

@@ -4,7 +4,14 @@
   "description": "cli tool for taro",
   "main": "index.js",
   "scripts": {
-    "test": "jest"
+    "test": "jest",
+    "build": "run-s clean prod",
+    "dev": "tsc -w",
+    "prod": "tsc",
+    "clean": "rimraf dist",
+    "lint": "tslint src/**/*.ts --fix",
+    "lint:typecheck": "tslint -p tsconfig.json src/**/*.ts --fix",
+    "prepack": "npm run build"
   },
   "repository": {
     "type": "git",
@@ -25,8 +32,10 @@
   "dependencies": {
     "@tarojs/taroize": "1.2.13",
     "@tarojs/transformer-wx": "1.2.13",
+    "@types/request": "^2.48.1",
     "autoprefixer": "^8.4.1",
     "babel-core": "^6.26.3",
+    "babel-eslint": "^8.2.3",
     "babel-generator": "^6.26.1",
     "babel-plugin-danger-remove-unused-import": "^1.1.1",
     "babel-plugin-remove-dead-code": "^1.3.2",
@@ -46,16 +55,24 @@
     "css-to-react-native-transform": "^1.4.0",
     "ejs": "^2.6.1",
     "envinfo": "^6.0.1",
+    "eslint": "^4.15.0",
+    "eslint-config-taro": "^1.1.4",
+    "eslint-plugin-import": "^2.8.0",
+    "eslint-plugin-react": "^7.4.0",
+    "eslint-plugin-taro": "^1.1.4",
+    "eslint-plugin-typescript": "^0.12.0",
     "fs-extra": "^5.0.0",
     "generic-names": "^2.0.1",
     "glob": "^7.1.2",
     "inquirer": "^5.2.0",
+    "joi": "^14.0.6",
     "klaw": "^2.1.1",
     "latest-version": "^4.0.0",
     "lodash": "^4.17.5",
     "mem-fs": "^1.1.3",
     "mem-fs-editor": "^4.0.0",
     "minimatch": "^3.0.4",
+    "npm-check": "^5.9.0",
     "ora": "^2.0.0",
     "postcss": "^6.0.22",
     "postcss-modules-extract-imports": "^1.1.0",
@@ -66,23 +83,40 @@
     "postcss-pxtransform": "1.2.13",
     "postcss-taro-unit-transform": "1.2.13",
     "postcss-url": "^7.3.2",
-    "prettier": "^1.14.3",
+    "prettier": "^1.16.4",
     "prop-types": "^15.6.2",
+    "request": "^2.88.0",
     "resolve": "^1.6.0",
     "semver": "^5.5.0",
     "shelljs": "^0.8.1",
     "through2": "^2.0.3",
     "vinyl": "^2.1.0",
-    "vinyl-fs": "^3.0.2"
+    "vinyl-fs": "^3.0.2",
+    "yauzl": "2.10.0"
   },
   "devDependencies": {
+    "@tarojs/taro": "^1.2.2",
+    "@types/autoprefixer": "^9.1.1",
+    "@types/babel-core": "^6.25.5",
+    "@types/babel-generator": "^6.25.2",
+    "@types/babel-traverse": "^6.25.4",
+    "@types/babel-types": "^6.25.2",
+    "@types/fs-extra": "^5.0.4",
+    "@types/jest": "^23.3.10",
+    "@types/lodash": "^4.14.119",
+    "@types/node": "^10.12.18",
     "babel-jest": "^23.6.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-preset-env": "^1.7.0",
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
     "jest": "^23.6.0",
     "jest-react-native": "^18.0.0",
-    "react-native": "^0.55.4"
+    "npm-run-all": "^4.1.5",
+    "react-native": "^0.55.4",
+    "tslint": "^5.12.0",
+    "tslint-config-prettier": "^1.17.0",
+    "tslint-config-standard": "^8.0.1",
+    "typescript": "^3.2.2"
   }
 }