Merge branch 'next' into next

.eslintignore

@@ -1,4 +1,5 @@
 dist
+dist-h5
 lib
 node_modules
 *.d.ts

.github/workflows/nodejs.yml

@@ -51,7 +51,7 @@ jobs:
     - name: lint
       run: yarn run lint
     - name: build
-      run: yarn run build:parallel
+      run: yarn run build
     - name: test
       run: yarn test
       env:

lerna.json

@@ -35,6 +35,6 @@
       "license": "MIT"
     }
   },
-  "version": "3.0.10",
+  "version": "3.0.11",
   "npmClient": "yarn"
 }

package.json

@@ -1,12 +1,12 @@
 {
   "name": "taro",
-  "description": "Nerv-multi多端开发解决方案",
+  "description": "开放式跨端跨框架开发解决方案",
   "main": "index.js",
   "private": true,
   "scripts": {
     "lint": "eslint packages/  --ext .js --ext .ts",
     "docs:rename-version": "cd website && docusaurus-rename-version",
-    "clear-all": "rimraf package-lock.json packages/*/node_modules packages/*/package-lock.json",
+    "clear-all": "rimraf package-lock.json packages/*/node_modules packages/*/package-lock.json packages/*/yarn.lock",
     "bootstrap:ci": "lerna bootstrap --npm-client=yarn",
     "bootstrap:lerna": "lerna bootstrap",
     "bootstrap": "npm-run-all clear-all bootstrap:lerna",
@@ -67,7 +67,7 @@
     "@types/debug": "4.1.5",
     "@types/fs-extra": "8.1.0",
     "@types/hapi__joi": "16.0.12",
-    "@types/jest": "^24.0.18",
+    "@types/jest": "^26.0.14",
     "@types/lodash": "^4.14.142",
     "@types/node": "^12.7.11",
     "@types/react": "^16.9.5",
@@ -80,16 +80,17 @@
     "@vue/runtime-core": "^3.0.0-beta.14",
     "@vue/runtime-dom": "^3.0.0-beta.14",
     "@zerollup/ts-transform-paths": "^1.7.3",
-    "babel-core": "^6.26.3",
-    "babel-eslint": "^10.0.1",
-    "babel-jest": "^24.9.0",
-    "babel-loader": "^8.0.0-beta.0",
-    "babel-plugin-syntax-jsx": "^6.18.0",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-preset-power-assert": "^3.0.0",
+    "babel-core": "6.26.3",
+    "babel-eslint": "10.0.1",
+    "babel-jest": "24.9.0",
+    "babel-loader": "8.0.0-beta.0",
+    "babel-plugin-syntax-jsx": "6.18.0",
+    "babel-plugin-transform-class-properties": "6.24.1",
+    "babel-preset-power-assert": "3.0.0",
     "cli-highlight": "^2.1.4",
     "conventional-changelog-cli": "^2.0.1",
     "copy": "^0.3.2",
+    "cross-env": "^7.0.2",
     "css-loader": "^0.28.10",
     "enzyme": "^3.10.0",
     "enzyme-adapter-react-16": "^1.14.0",
@@ -112,12 +113,11 @@
     "gulp-typescript": "^5.0.1",
     "html-webpack-plugin": "^3.0.6",
     "husky": "^1.2.0",
-    "jest": "25.4",
+    "jest": "26.4.2",
     "jest-dom": "^1.3.1",
     "jest-enzyme": "^7.1.1",
     "jest-localstorage-mock": "^2.4.0",
     "jest-mock-console": "^1.0.0",
-    "karmatic": "^1.4.0",
     "lerna": "3.22.1",
     "lint-staged": "^10.2.11",
     "memfs": "^3.1.2",
@@ -152,7 +152,7 @@
     "sinon": "^7.5.0",
     "style-loader": "^0.20.3",
     "stylelint": "^13.6.1",
-    "ts-jest": "23",
+    "ts-jest": "26.4.0",
     "typescript": "^3.8.3",
     "vue": "^2.6.11",
     "vue-loader": "^15.9.3",

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

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

packages/babel-preset-taro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-preset-taro",
-  "version": "3.0.10",
+  "version": "3.0.11",
   "description": "> TODO: description",
   "author": "yuche <i@yuche.me>",
   "homepage": "https://github.com/nervjs/taro/tree/master/packages/babel-preset-taro#readme",
@@ -24,18 +24,18 @@
     "@babel/core": "*"
   },
   "dependencies": {
-    "@babel/core": "^7.8.0",
-    "@babel/plugin-proposal-class-properties": "^7.7.4",
-    "@babel/plugin-proposal-decorators": "^7.7.4",
-    "@babel/plugin-syntax-jsx": "^7.7.4",
-    "@babel/plugin-transform-runtime": "^7.7.4",
-    "@babel/preset-env": "^7.7.4",
-    "@babel/preset-react": "^7.7.4",
-    "@babel/preset-typescript": "^7.8.0",
-    "@babel/runtime": "^7.7.4",
-    "@tarojs/taro-h5": "3.0.10",
+    "@babel/core": "7.11.1",
+    "@babel/plugin-proposal-class-properties": "7.10.4",
+    "@babel/plugin-proposal-decorators": "7.10.5",
+    "@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/runtime": "^7.11.2",
+    "@tarojs/taro-h5": "^3.0.11",
     "babel-plugin-dynamic-import-node": "^2.3.3",
-    "babel-plugin-transform-taroapi": "3.0.10",
-    "core-js": "^3.6.3"
+    "babel-plugin-transform-taroapi": "^3.0.11",
+    "core-js": "^3.6.5"
   }
 }