同步 next 分支代码

.eslintignore

@@ -11,9 +11,16 @@ packages/taro-transformer-wx/tt.js
 packages/taro-transformer-wx/t.js
 packages/taro-cli/src/jdreact/template/*.js
 packages/taro-cli/templates
-/packages/taro-components/loader
+packages/taro-cli/src/rn
+packages/taro-components/loader
 packages/taro-webpack-runner/src/__tests__/__snapshots__
 packages/taro-webpack-runner/src/__tests__/fixtures
 packages/taro-mini-runner/src/__tests__/__snapshots__
 packages/taro-mini-runner/src/__tests__/fixtures
 packages/taro-cli/src/__tests__/fixtures
+packages/taro/types
+packages/taro-components-rn
+packages/taro-rn
+packages/taro-rn-runner
+packages/taro-router-rn
+packages/taro-mini-runner/src/quickapp

.eslintrc.js

@@ -7,19 +7,24 @@ module.exports = {
     'plugin:react/recommended'
   ],
   'rules': {
+    'no-use-before-define': 0,
     'no-unused-vars': 'off',
+    'camelcase': 0,
     '@typescript-eslint/explicit-function-return-type': 0,
+    "indent": "off",
     '@typescript-eslint/indent': ['error', 2],
+    '@typescript-eslint/explicit-module-boundary-types': 0,
     '@typescript-eslint/no-unused-vars': ['error', { 'argsIgnorePattern': '^_', 'args': 'after-used', }],
     '@typescript-eslint/no-empty-function': 0,
-    '@typescript-eslint/no-use-before-define': 0,
+    '@typescript-eslint/no-use-before-define': ['warn', { 'functions': false, 'classes': false }],
     '@typescript-eslint/no-non-null-assertion': 0,
     '@typescript-eslint/no-explicit-any': 0,
     '@typescript-eslint/no-var-requires': 0,
     '@typescript-eslint/interface-name-prefix': 0,
     '@typescript-eslint/member-delimiter-style': 0,
     '@typescript-eslint/camelcase': 0,
     '@typescript-eslint/no-namespace': 0,
+    '@typescript-eslint/ban-ts-comment': 0,
     'standard/no-callback-literal': 0,
     'no-console': ['error', { allow: ['warn', 'error'] }],
     'prefer-spread': 0,
@@ -28,7 +33,7 @@ module.exports = {
     'react/jsx-uses-vars': 'warn',
     'react/prop-types': 0,
     'react/no-find-dom-node': 0,
-    'no-unused-expressions': 0
+    'no-unused-expressions': 0,
     // 'camelcase': ['error', {allow: ['^internal_', '^unstable_']}]
   },
   'env': {

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: 新建一个新的 Issue
-    url: https://tls.jd.com/taro-issue-helper
+    url: https://issue.taro.zone/
     about: 请点击 「Open」 按钮打开新链接创建 Issue

.github/workflows/nodejs.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
-      fail-fast: false      
+      fail-fast: false
       matrix:
         node-version: [12.x, 13.x, 14.x]
 

README.md

@@ -130,7 +130,7 @@ Taro 非常欢迎社区开发者为 Taro 贡献代码，在贡献之前请先阅
 
 ## 特别鸣谢
 
-[![nanjingboy](https://avatars1.githubusercontent.com/u/1390888?s=100&v=4)](https://github.com/nanjingboy/) | [![jsNewbee](https://avatars3.githubusercontent.com/u/20449400?s=100&v=4)](https://github.com/js-newbee/) | [![Qiyu8](https://avatars2.githubusercontent.com/u/15245051?s=100&v=4)](https://github.com/Qiyu8/) | [![Garfield550](https://avatars2.githubusercontent.com/u/3471836?s=100&v=4)](https://github.com/Qiyu8/)
+[![nanjingboy](https://avatars1.githubusercontent.com/u/1390888?s=100&v=4)](https://github.com/nanjingboy/) | [![jsNewbee](https://avatars3.githubusercontent.com/u/20449400?s=100&v=4)](https://github.com/js-newbee/) | [![Qiyu8](https://avatars2.githubusercontent.com/u/15245051?s=100&v=4)](https://github.com/Qiyu8/) | [![Garfield550](https://avatars2.githubusercontent.com/u/3471836?s=100&v=4)](https://github.com/Garfield550/)
 :---:|:---:|:---:|:---:
 [nanjingboy](https://github.com/nanjingboy/) | [jsNewbee](https://github.com/js-newbee/) |  [Qiyu8](https://github.com/Qiyu8/) |  [Garfield Lee](https://github.com/Garfield550/)
 

lerna.json

@@ -36,7 +36,13 @@
     "packages/taro-with-weapp",
     "packages/taroize",
     "packages/stylelint-taro-rn",
-    "packages/stylelint-config-taro-rn"
+    "packages/stylelint-config-taro-rn",
+    "packages/taro-weapp",
+    "packages/taro-alipay",
+    "packages/taro-swan",
+    "packages/taro-tt",
+    "packages/taro-qq",
+    "packages/taro-jd"
   ],
   "command": {
     "publish": {
@@ -47,6 +53,6 @@
       "license": "MIT"
     }
   },
-  "version": "3.2.0-beta.0",
+  "version": "3.1.2",
   "npmClient": "yarn"
 }

package.json

@@ -4,7 +4,7 @@
   "main": "index.js",
   "private": true,
   "scripts": {
-    "lint": "eslint packages/  --ext .js --ext .ts",
+    "lint": "eslint packages/  --ext .js --ext .ts --ext .tsx",
     "docs:rename-version": "cd website && docusaurus-rename-version",
     "clear-all": "rimraf package-lock.json packages/*/node_modules packages/*/package-lock.json packages/*/yarn.lock",
     "bootstrap:ci": "lerna bootstrap --npm-client=yarn",
@@ -17,7 +17,7 @@
     "release:lerna": "lerna version --exact --no-git-tag-version",
     "release:beta": "lerna publish --force-publish=* --exact --skip-temp-tag  --preid=beta --npm-tag=beta",
     "release": "npm-run-all build release:lerna && npm run changelog && node ./build/docs-version.js",
-    "test": "lerna run --parallel --scope babel-preset-taro  --scope @tarojs/components --scope @tarojs/loader --scope @tarojs/react --scope @tarojs/webpack-runner --scope @tarojs/mini-runner test:ci"
+    "test": "lerna run --scope @tarojs/cli --scope babel-preset-taro  --scope @tarojs/components --scope @tarojs/loader --scope @tarojs/react --scope @tarojs/webpack-runner --scope @tarojs/mini-runner --scope @tarojs/runtime --scope @tarojs/taro-rn --scope @tarojs/components-rn test:ci"
   },
   "repository": {
     "type": "git",
@@ -53,13 +53,14 @@
     "@babel/plugin-proposal-do-expressions": "7.10.4",
     "@babel/plugin-proposal-object-rest-spread": "7.11.0",
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
-    "@babel/plugin-transform-react-jsx": "7.10.4",
+    "@babel/plugin-transform-react-jsx": "7.12.17",
     "@babel/plugin-transform-runtime": "7.11.0",
     "@babel/preset-env": "7.11.0",
-    "@babel/preset-react": "7.10.4",
-    "@babel/preset-typescript": "7.10.4",
+    "@babel/preset-react": "7.12.13",
+    "@babel/preset-typescript": "7.12.17",
     "@commitlint/cli": "^7.2.1",
     "@commitlint/config-conventional": "^9.0.1",
+    "@rollup/plugin-babel": "5.2.1",
     "@rollup/plugin-replace": "^2.2.0",
     "@types/babel-generator": "^6.25.3",
     "@types/babel-traverse": "^6.25.5",
@@ -70,14 +71,16 @@
     "@types/jest": "^26.0.14",
     "@types/lodash": "^4.14.142",
     "@types/node": "^12.7.11",
+    "@types/react": "16.9.49",
     "@types/sinon": "^7.5.0",
     "@types/tapable": "1.0.5",
     "@types/webpack": "^4.39.3",
-    "@typescript-eslint/eslint-plugin": "^2.23.0",
-    "@typescript-eslint/parser": "^2.23.0",
+    "@typescript-eslint/eslint-plugin": "^4.15.1",
+    "@typescript-eslint/parser": "^4.15.1",
     "@vue/compiler-core": "^3.0.0-beta.14",
     "@vue/runtime-core": "^3.0.0-beta.14",
     "@vue/runtime-dom": "^3.0.0-beta.14",
+    "@wojtekmaj/enzyme-adapter-react-17": "^0.4.1",
     "@zerollup/ts-transform-paths": "^1.7.3",
     "babel-core": "6.26.3",
     "babel-eslint": "10.0.1",
@@ -92,7 +95,6 @@
     "cross-env": "^7.0.2",
     "css-loader": "^0.28.10",
     "enzyme": "^3.10.0",
-    "enzyme-adapter-react-16": "^1.14.0",
     "enzyme-to-json": "^3.4.2",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.4.0",
@@ -101,7 +103,7 @@
     "eslint-loader": "^2.0.0",
     "eslint-plugin-flowtype": "^3.2.0",
     "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-jest": "^22.17.0",
+    "eslint-plugin-jest": "24.1.5",
     "eslint-plugin-node": "^10.0.0",
     "eslint-plugin-prettier": "^3.1.1",
     "eslint-plugin-promise": "^4.2.1",
@@ -130,11 +132,11 @@
     "ora": "^2.1.0",
     "power-assert": "^1.6.1",
     "prettier": "^1.18.2",
-    "react": "^16.10.2",
-    "react-dom": "^16.10.2",
+    "react": "^17.0.0",
+    "react-dom": "^17.0.0",
     "react-native": "^0.61.2",
     "react-native-mock-render": "^0.1.5",
-    "react-test-renderer": "^16.10.2",
+    "react-test-renderer": "^17.0.0",
     "redux": "^4.0.4",
     "rimraf": "^2.6.2",
     "rollup": "^1.23.1",
@@ -152,7 +154,7 @@
     "style-loader": "^0.20.3",
     "stylelint": "^13.6.1",
     "ts-jest": "26.4.0",
-    "typescript": "^3.8.3",
+    "typescript": "^4.1.0",
     "vue": "^2.6.11",
     "vue-loader": "^15.9.3",
     "vue-template-compiler": "^2.6.11",

packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-react-jsx-to-rn-stylesheet",
-  "version": "3.2.0-beta.0",
+  "version": "3.1.1",
   "description": "Transform stylesheet selector to style in JSX Elements.",
   "license": "MIT",
   "main": "dist/index.js",
@@ -24,6 +24,6 @@
   },
   "dependencies": {
     "camelize": "^1.0.0",
-    "taro-css-to-react-native": "3.2.0-beta.0"
+    "taro-css-to-react-native": "3.1.1"
   }
 }

packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/src/types.ts

@@ -11,16 +11,16 @@ type BabelTransformationFile = {
     root: string
     plugins: unknown[]
     presets: unknown[]
-    parserOpts: object
-    generatorOpts: object
+    parserOpts: Record<string, any>
+    generatorOpts: Record<string, any>
   }
-  declarations: object
+  declarations: Record<string, any>
   path: NodePath | null
-  ast: object
+  ast: Record<string, any>
   scope: unknown
-  metadata: object
+  metadata: Record<string, any>
   code: string
-  inputMap: object | null
+  inputMap: Record<string, any> | null
 }
 
 export type Opts = {

packages/babel-plugin-transform-react-jsx-to-rn-stylesheet/yarn.lock

@@ -5,3 +5,4 @@
 camelize@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b"
+  integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=

packages/babel-plugin-transform-taroapi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-taroapi",
-  "version": "3.2.0-beta.0",
+  "version": "3.1.2",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc"

packages/babel-preset-taro/__tests__/index.spec.js

@@ -22,12 +22,6 @@ describe('babel-preset-taro', () => {
     })
 
     expect(config.sourceType).toBe('unambiguous')
-
-    const [override] = config.overrides
-
-    const [, [_, reactConfig]] = override.presets
-    expect(reactConfig.pragma).toBe('React.createElement')
-    expect(reactConfig.pragmaFrag).toBe('React.Fragment')
   })
 
   it('vue', () => {

packages/babel-preset-taro/index.js

@@ -14,13 +14,22 @@ module.exports = (_, options = {}) => {
   const isVue3 = options.framework === 'vue3'
   const moduleName = options.framework.charAt(0).toUpperCase() + options.framework.slice(1)
 
-  if (isNerv || isReact) {
+  if (isNerv) {
     presets.push([require('@babel/preset-react'), {
       pragma: `${moduleName}.createElement`,
       pragmaFrag: `${moduleName}.Fragment`
     }])
   }
 
+  if (isReact) {
+    presets.push([require('@babel/preset-react'), {
+      runtime: options.reactJsxRuntime || 'automatic'
+    }])
+    if (process.env.TARO_ENV === 'h5' && process.env.NODE_ENV !== 'production' && options.hot !== false) {
+      plugins.push([require('react-refresh/babel')])
+    }
+  }
+
   if (options.ts) {
     const config = {}
     if (isNerv || isReact) {

packages/babel-preset-taro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-taro",
-  "version": "3.2.0-beta.0",
+  "version": "3.1.2",
   "description": "> TODO: description",
   "author": "yuche <i@yuche.me>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/babel-preset-taro#readme",
@@ -31,18 +31,19 @@
     "@babel/plugin-syntax-jsx": "^7.10.4",
     "@babel/plugin-transform-runtime": "7.11.0",
     "@babel/preset-env": "7.11.0",
-    "@babel/preset-react": "7.10.4",
-    "@babel/preset-typescript": "7.10.4",
+    "@babel/preset-react": "7.12.13",
+    "@babel/preset-typescript": "7.12.17",
     "@babel/runtime": "^7.11.2",
-    "@tarojs/helper": "3.2.0-beta.0",
-    "@tarojs/taro-h5": "3.2.0-beta.0",
-    "@tarojs/taro-rn": "3.2.0-beta.0",
+    "@tarojs/taro-h5": "3.1.2",
     "babel-plugin-dynamic-import-node": "^2.3.3",
+    "babel-plugin-transform-taroapi": "3.1.2",
+    "core-js": "^3.6.5",
+    "@tarojs/helper": "3.1.1",
+    "@tarojs/taro-rn": "3.1.1",
     "babel-plugin-global-define": "^1.0.3",
     "babel-plugin-transform-imports-api": "^1.0.0",
-    "babel-plugin-transform-react-jsx-to-rn-stylesheet": "3.2.0-beta.0",
-    "babel-plugin-transform-taroapi": "3.2.0-beta.0",
-    "core-js": "^3.6.5",
-    "metro-react-native-babel-preset": "^0.63.0"
+    "babel-plugin-transform-react-jsx-to-rn-stylesheet": "3.1.1",
+    "metro-react-native-babel-preset": "^0.63.0",
+    "react-refresh": "0.9.0"
   }
 }