Merge branch 'remaxjs:master' into master

remaxjs · Jan 6, 2022 · e7e54e5 · e7e54e5
2 parents 3b8995f + 2ef5efc
commit e7e54e5
Show file tree

Hide file tree

Showing 48 changed files with 326 additions and 137 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.15.11](https://github.com/remaxjs/remax/compare/v2.15.10...v2.15.11) (2022-01-05)
+
+### Bug Fixes
+
+- 去掉 Babel 缓存 ([#1812](https://github.com/remaxjs/remax/issues/1812)) ([159ae6d](https://github.com/remaxjs/remax/commit/159ae6dc28436f768d0120d39585d59558fe3d5f))
+- **wechat:** Video[enable-auto-rotation] 类型错误 ([#1798](https://github.com/remaxjs/remax/issues/1798)) ([e6291d8](https://github.com/remaxjs/remax/commit/e6291d876b5fcd91da82de16d532607c40272a26))
+- **wechat:** 修正 AdCustom 组件找不到模板 ([#1807](https://github.com/remaxjs/remax/issues/1807)) ([eb581e3](https://github.com/remaxjs/remax/commit/eb581e3a113aa738ba58abeb2032daaab342bb4e))
+
 ## [2.15.10](https://github.com/remaxjs/remax/compare/v2.15.9...v2.15.10) (2021-12-18)
 
 ### Bug Fixes

diff --git a/lerna.json b/lerna.json
@@ -7,7 +7,7 @@
  "private": false
  }
  },
- "version": "2.15.10",
+ "version": "2.15.11",
  "npmClient": "yarn",
  "useWorkspaces": true
 }
diff --git a/packages/babel-plugin-remax-host-component/CHANGELOG.md b/packages/babel-plugin-remax-host-component/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.15.11](https://github.com/remaxjs/remax/compare/v2.15.10...v2.15.11) (2022-01-05)
+
+**Note:** Version bump only for package babel-plugin-remax-host-component
+
 ## [2.15.10](https://github.com/remaxjs/remax/compare/v2.15.9...v2.15.10) (2021-12-18)
 
 **Note:** Version bump only for package babel-plugin-remax-host-component

diff --git a/packages/babel-plugin-remax-host-component/package.json b/packages/babel-plugin-remax-host-component/package.json
@@ -1,6 +1,6 @@
 {
  "name": "babel-plugin-remax-host-component",
- "version": "2.15.10",
+ "version": "2.15.11",
  "description": "使用真正的 React 构建跨平台小程序",
  "author": "Wei Zhu <[email protected]>",
  "homepage": "https://remaxjs.org",
@@ -28,13 +28,13 @@
  "@babel/helper-plugin-utils": "^7.10.4",
  "@babel/traverse": "^7.11.0",
  "@babel/types": "^7.11.0",
- "@remax/macro": "2.15.10",
- "@remax/shared": "2.15.10"
+ "@remax/macro": "2.15.11",
+ "@remax/shared": "2.15.11"
  },
  "devDependencies": {
  "@babel/core": "^7.11.0",
  "@babel/plugin-syntax-jsx": "^7.10.4",
- "@remax/build-store": "2.15.10"
+ "@remax/build-store": "2.15.11"
  },
  "gitHead": "14d4b95d916a55e4ecbe5fbda933bbc57018d7df"
 }
diff --git a/packages/babel-plugin-remax-lifecycle/CHANGELOG.md b/packages/babel-plugin-remax-lifecycle/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.15.11](https://github.com/remaxjs/remax/compare/v2.15.10...v2.15.11) (2022-01-05)
+
+**Note:** Version bump only for package babel-plugin-remax-lifecycle
+
 ## [2.15.10](https://github.com/remaxjs/remax/compare/v2.15.9...v2.15.10) (2021-12-18)
 
 **Note:** Version bump only for package babel-plugin-remax-lifecycle

diff --git a/packages/babel-plugin-remax-lifecycle/package.json b/packages/babel-plugin-remax-lifecycle/package.json
@@ -1,6 +1,6 @@
 {
  "name": "babel-plugin-remax-lifecycle",
- "version": "2.15.10",
+ "version": "2.15.11",
  "description": "使用真正的 React 构建跨平台小程序",
  "author": "Wei Zhu <[email protected]>",
  "homepage": "https://remaxjs.org",
@@ -28,11 +28,11 @@
  "@babel/helper-plugin-utils": "^7.10.4",
  "@babel/traverse": "^7.11.0",
  "@babel/types": "^7.11.0",
- "@remax/shared": "2.15.10"
+ "@remax/shared": "2.15.11"
  },
  "devDependencies": {
  "@babel/core": "^7.11.0",
- "@remax/build-store": "2.15.10"
+ "@remax/build-store": "2.15.11"
  },
  "gitHead": "14d4b95d916a55e4ecbe5fbda933bbc57018d7df"
 }
diff --git a/packages/babel-plugin-remax-regenerator-runtime/CHANGELOG.md b/packages/babel-plugin-remax-regenerator-runtime/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.15.11](https://github.com/remaxjs/remax/compare/v2.15.10...v2.15.11) (2022-01-05)
+
+**Note:** Version bump only for package babel-plugin-remax-regenerator-runtime
+
 ## [2.15.10](https://github.com/remaxjs/remax/compare/v2.15.9...v2.15.10) (2021-12-18)
 
 **Note:** Version bump only for package babel-plugin-remax-regenerator-runtime

diff --git a/packages/babel-plugin-remax-regenerator-runtime/package.json b/packages/babel-plugin-remax-regenerator-runtime/package.json
@@ -1,6 +1,6 @@
 {
  "name": "babel-plugin-remax-regenerator-runtime",
- "version": "2.15.10",
+ "version": "2.15.11",
  "description": "使用真正的 React 构建跨平台小程序",
  "author": "Wei Zhu <[email protected]>",
  "homepage": "https://remaxjs.org",

diff --git a/packages/babel-plugin-remax-turbo-render/CHANGELOG.md b/packages/babel-plugin-remax-turbo-render/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.15.11](https://github.com/remaxjs/remax/compare/v2.15.10...v2.15.11) (2022-01-05)
+
+**Note:** Version bump only for package babel-plugin-remax-turbo-render
+
 ## [2.15.10](https://github.com/remaxjs/remax/compare/v2.15.9...v2.15.10) (2021-12-18)
 
 **Note:** Version bump only for package babel-plugin-remax-turbo-render

diff --git a/packages/babel-plugin-remax-turbo-render/package.json b/packages/babel-plugin-remax-turbo-render/package.json
@@ -1,6 +1,6 @@
 {
  "name": "babel-plugin-remax-turbo-render",
- "version": "2.15.10",
+ "version": "2.15.11",
  "description": "使用真正的 React 构建跨平台小程序",
  "author": "Wei Zhu <[email protected]>",
  "homepage": "https://remaxjs.org",
@@ -31,7 +31,7 @@
  },
  "devDependencies": {
  "@babel/core": "^7.11.0",
- "@remax/build-store": "2.15.10",
+ "@remax/build-store": "2.15.11",
  "@types/jest": "^26.0.8",
  "babel-plugin-tester": "^9.2.0"
  },

diff --git a/packages/babel-preset-remax/CHANGELOG.md b/packages/babel-preset-remax/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.15.11](https://github.com/remaxjs/remax/compare/v2.15.10...v2.15.11) (2022-01-05)
+
+**Note:** Version bump only for package babel-preset-remax
+
 ## [2.15.10](https://github.com/remaxjs/remax/compare/v2.15.9...v2.15.10) (2021-12-18)
 
 **Note:** Version bump only for package babel-preset-remax

diff --git a/packages/babel-preset-remax/package.json b/packages/babel-preset-remax/package.json
@@ -1,6 +1,6 @@
 {
  "name": "babel-preset-remax",
- "version": "2.15.10",
+ "version": "2.15.11",
  "description": "remax babel preset",
  "main": "lib/index.js",
  "types": "lib/index.d.ts",

diff --git a/packages/postcss-remax-tag/CHANGELOG.md b/packages/postcss-remax-tag/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.15.11](https://github.com/remaxjs/remax/compare/v2.15.10...v2.15.11) (2022-01-05)
+
+**Note:** Version bump only for package @remax/postcss-tag
+
 ## [2.15.10](https://github.com/remaxjs/remax/compare/v2.15.9...v2.15.10) (2021-12-18)
 
 **Note:** Version bump only for package @remax/postcss-tag

diff --git a/packages/postcss-remax-tag/package.json b/packages/postcss-remax-tag/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@remax/postcss-tag",
- "version": "2.15.10",
+ "version": "2.15.11",
  "main": "index.js",
  "repository": "[email protected]:remaxjs/remax.git",
  "author": "Caihuanyu <[email protected]>",

diff --git a/packages/remax-ali/CHANGELOG.md b/packages/remax-ali/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.15.11](https://github.com/remaxjs/remax/compare/v2.15.10...v2.15.11) (2022-01-05)
+
+**Note:** Version bump only for package @remax/ali
+
 ## [2.15.10](https://github.com/remaxjs/remax/compare/v2.15.9...v2.15.10) (2021-12-18)
 
 **Note:** Version bump only for package @remax/ali

diff --git a/packages/remax-ali/package.json b/packages/remax-ali/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@remax/ali",
- "version": "2.15.10",
+ "version": "2.15.11",
  "description": "Remax for Ali",
  "main": "./cjs/index.js",
  "esnext": "./esm/index.js",
@@ -16,11 +16,11 @@
  "repository": "git+https://github.com/remaxjs/remax.git",
  "license": "MIT",
  "dependencies": {
- "@remax/shared": "2.15.10",
+ "@remax/shared": "2.15.11",
  "mini-types": "^0.1.1"
  },
  "devDependencies": {
- "@remax/types": "2.15.10",
+ "@remax/types": "2.15.11",
  "@types/react": "^16.9.33",
  "@types/react-test-renderer": "^16.9.1",
  "react": "^16.12.0",

diff --git a/packages/remax-build-store/CHANGELOG.md b/packages/remax-build-store/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.15.11](https://github.com/remaxjs/remax/compare/v2.15.10...v2.15.11) (2022-01-05)
+
+**Note:** Version bump only for package @remax/build-store
+
 ## [2.15.10](https://github.com/remaxjs/remax/compare/v2.15.9...v2.15.10) (2021-12-18)
 
 **Note:** Version bump only for package @remax/build-store

diff --git a/packages/remax-build-store/package.json b/packages/remax-build-store/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@remax/build-store",
- "version": "2.15.10",
+ "version": "2.15.11",
  "description": "使用真正的 React 构建跨平台小程序",
  "author": "Wei Zhu <[email protected]>",
  "homepage": "https://remaxjs.org",
@@ -24,10 +24,10 @@
  "test:debug": "npx --node-arg=--inspect-brk jest -i"
  },
  "dependencies": {
- "@remax/shared": "2.15.10"
+ "@remax/shared": "2.15.11"
  },
  "devDependencies": {
- "@remax/types": "2.15.10"
+ "@remax/types": "2.15.11"
  },
  "publishConfig": {
  "access": "public"

diff --git a/packages/remax-cli/CHANGELOG.md b/packages/remax-cli/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.15.11](https://github.com/remaxjs/remax/compare/v2.15.10...v2.15.11) (2022-01-05)
+
+### Bug Fixes
+
+- 去掉 Babel 缓存 ([#1812](https://github.com/remaxjs/remax/issues/1812)) ([159ae6d](https://github.com/remaxjs/remax/commit/159ae6dc28436f768d0120d39585d59558fe3d5f))
+
 ## [2.15.10](https://github.com/remaxjs/remax/compare/v2.15.9...v2.15.10) (2021-12-18)
 
 ### Bug Fixes

diff --git a/packages/remax-cli/package.json b/packages/remax-cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@remax/cli",
- "version": "2.15.10",
+ "version": "2.15.11",
  "description": "Remax 是一个全新的基于 React 的小程序开发框架",
  "main": "./lib/index.js",
  "keywords": [
@@ -32,21 +32,21 @@
  "@babel/preset-typescript": "^7.7.4",
  "@babel/register": "^7.7.0",
  "@babel/types": "^7.7.4",
- "@remax/build-store": "2.15.10",
- "@remax/macro": "2.15.10",
- "@remax/plugin-devtools": "2.15.10",
- "@remax/plugin-error-screen": "2.15.10",
+ "@remax/build-store": "2.15.11",
+ "@remax/macro": "2.15.11",
+ "@remax/plugin-devtools": "2.15.11",
+ "@remax/plugin-error-screen": "2.15.11",
  "@remax/postcss-px2units": "^0.2.0",
- "@remax/postcss-tag": "2.15.10",
- "@remax/shared": "2.15.10",
+ "@remax/postcss-tag": "2.15.11",
+ "@remax/shared": "2.15.11",
  "address": "^1.1.2",
  "babel-loader": "^8.1.0",
  "babel-plugin-module-resolver": "^4.0.0",
- "babel-plugin-remax-host-component": "2.15.10",
- "babel-plugin-remax-lifecycle": "2.15.10",
- "babel-plugin-remax-regenerator-runtime": "2.15.10",
- "babel-plugin-remax-turbo-render": "2.15.10",
- "babel-preset-remax": "2.15.10",
+ "babel-plugin-remax-host-component": "2.15.11",
+ "babel-plugin-remax-lifecycle": "2.15.11",
+ "babel-plugin-remax-regenerator-runtime": "2.15.11",
+ "babel-plugin-remax-turbo-render": "2.15.11",
+ "babel-preset-remax": "2.15.11",
  "chokidar": "^3.4.0",
  "clean-webpack-plugin": "^3.0.0",
  "copy-webpack-plugin": "^5.1.1",
@@ -82,11 +82,11 @@
  },
  "devDependencies": {
  "@babel/traverse": "^7.7.4",
- "@remax/ali": "2.15.10",
- "@remax/one": "2.15.10",
- "@remax/toutiao": "2.15.10",
- "@remax/types": "2.15.10",
- "@remax/wechat": "2.15.10",
+ "@remax/ali": "2.15.11",
+ "@remax/one": "2.15.11",
+ "@remax/toutiao": "2.15.11",
+ "@remax/types": "2.15.11",
+ "@remax/wechat": "2.15.11",
  "@types/babel__traverse": "^7.0.8",
  "@types/detect-port": "^1.3.0",
  "@types/ejs": "^3.0.0",

diff --git a/packages/remax-cli/src/build/webpack/config.mini.ts b/packages/remax-cli/src/build/webpack/config.mini.ts
@@ -110,7 +110,6 @@ export default function webpackConfig(builder: Builder): webpack.Configuration {
  .options({
  usePlugins: [TurboRender.preprocess(options)],
  reactPreset: false,
- cacheDirectory: true,
  });
  }
 
@@ -155,7 +154,6 @@ export default function webpackConfig(builder: Builder): webpack.Configuration {
  ],
  reactPreset: true,
  api: builder.api,
- cacheDirectory: true,
  compact: process.env.NODE_ENV === 'production',
  })
  .end()

diff --git a/packages/remax-component-scripts/CHANGELOG.md b/packages/remax-component-scripts/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.15.11](https://github.com/remaxjs/remax/compare/v2.15.10...v2.15.11) (2022-01-05)
+
+**Note:** Version bump only for package @remax/component-scripts
+
 ## [2.15.10](https://github.com/remaxjs/remax/compare/v2.15.9...v2.15.10) (2021-12-18)
 
 **Note:** Version bump only for package @remax/component-scripts

diff --git a/packages/remax-component-scripts/package.json b/packages/remax-component-scripts/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@remax/component-scripts",
- "version": "2.15.10",
+ "version": "2.15.11",
  "description": "Remax 是一个全新的基于 React 的小程序开发框架",
  "main": "./lib/index.js",
  "bin": {
@@ -29,7 +29,7 @@
  "test:debug": "npx --node-arg=--inspect-brk jest -i"
  },
  "dependencies": {
- "@remax/cli": "2.15.10",
+ "@remax/cli": "2.15.11",
  "@remax/father-build": "^1.19.8",
  "@types/lodash": "^4.14.171",
  "less": "^4.1.1",

diff --git a/packages/remax-framework-shared/CHANGELOG.md b/packages/remax-framework-shared/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.15.11](https://github.com/remaxjs/remax/compare/v2.15.10...v2.15.11) (2022-01-05)
+
+**Note:** Version bump only for package @remax/framework-shared
+
 ## [2.15.10](https://github.com/remaxjs/remax/compare/v2.15.9...v2.15.10) (2021-12-18)
 
 **Note:** Version bump only for package @remax/framework-shared

diff --git a/packages/remax-framework-shared/package.json b/packages/remax-framework-shared/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@remax/framework-shared",
- "version": "2.15.10",
+ "version": "2.15.11",
  "description": "使用真正的 React 构建跨平台小程序",
  "author": "Wei Zhu <[email protected]>",
  "homepage": "https://remaxjs.org",
@@ -24,7 +24,7 @@
  "react-is": "^17.0.2"
  },
  "devDependencies": {
- "@remax/types": "2.15.10",
+ "@remax/types": "2.15.11",
  "@types/react": "^16.9.33",
  "@types/react-is": "^16.7.1",
  "react-test-renderer": "^16.9.0"

diff --git a/packages/remax-macro/CHANGELOG.md b/packages/remax-macro/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.15.11](https://github.com/remaxjs/remax/compare/v2.15.10...v2.15.11) (2022-01-05)
+
+**Note:** Version bump only for package @remax/macro
+
 ## [2.15.10](https://github.com/remaxjs/remax/compare/v2.15.9...v2.15.10) (2021-12-18)
 
 **Note:** Version bump only for package @remax/macro