Skip to content

Commit

Permalink
Merge branch '4.x' into refactor/dependencies
Browse files Browse the repository at this point in the history
* 4.x: (191 commits)
  chore(release): publish 4.0.0-beta.66 --tag=beta
  fix: 修复harmony上+string ts报错
  chore(release): publish 4.0.0-beta.65 --tag=beta
  fix: 修复文字节点不更新
  feat: 更新@tarojs/parse-css-to-stylesheet版本
  feat: 修改安全区域的获取方式
  fix(harmony): 更新组件模式入口与 customRoutes 关联
  feat: 更新半编译的text模版
  feat: 完善 moveable 功能 (#15680)
  feat: 添加xy的初始化 (#15665)
  chore(release): publish 4.0.0-beta.64 --tag=beta
  feat: 暴露 internalInstanceKey
  chore(release): publish 4.0.0-beta.63 --tag=beta
  Feat/compile replace component (#15644)
  fix(harmony): 优化 resource 更新判断
  chore(release): publish 4.0.0-beta.62 --tag=beta
  test: update snapshot
  feat(lint): 更新规则限制
  chore(deps): bump pnpm/action-setup from 2.4.0 to 3.0.0
  fix(router): transition 默认置空 (#15577)
  ...

# Conflicts:
#	package.json
#	packages/babel-plugin-transform-taroapi/package.json
#	packages/babel-preset-taro/package.json
#	packages/eslint-config-taro/package.json
#	packages/stylelint-taro-rn/package.json
#	packages/taro-cli-convertor/package.json
#	packages/taro-cli-convertor/src/util/index.ts
#	packages/taro-cli/package.json
#	packages/taro-cli/src/cli.ts
#	packages/taro-cli/templates/default/package.json.tmpl
#	packages/taro-components-advanced/src/utils/vue-render.ts
#	packages/taro-components-library-vue2/package.json
#	packages/taro-components-rn/package.json
#	packages/taro-helper/package.json
#	packages/taro-mini-runner/package.json
#	packages/taro-mini-runner/src/__tests__/__snapshots__/alipay.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/bytedance.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/common-style.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/config.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/custom-tabbar.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/jd.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/qq.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/react.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/sass.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/swan.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/ts.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/vue.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap
#	packages/taro-mini-runner/src/__tests__/qq.spec.ts
#	packages/taro-mini-runner/src/__tests__/utils/compiler.ts
#	packages/taro-mini-runner/src/loaders/miniXScriptLoader.ts
#	packages/taro-mini-runner/src/plugins/MiniPlugin.ts
#	packages/taro-mini-runner/src/webpack/chain.ts
#	packages/taro-plugin-html/package.json
#	packages/taro-plugin-mini-ci/src/SwanCI.ts
#	packages/taro-plugin-vue2/package.json
#	packages/taro-react/tsconfig.json
#	packages/taro-rn-runner/package.json
#	packages/taro-rn-supporter/package.json
#	packages/taro-rn/package.json
#	packages/taro-router-rn/package.json
#	packages/taro-router/package.json
#	packages/taro-runtime-rn/package.json
#	packages/taro-runtime/src/__tests__/nerv.spec.js
#	packages/taro-transformer-wx/package.json
#	packages/taro-transformer-wx/src/class.ts
#	packages/taro-transformer-wx/src/index.ts
#	packages/taro-tt/package.json
#	packages/taro-webpack-runner/package.json
#	packages/taro-webpack-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
#	packages/taro-webpack-runner/src/__tests__/__snapshots__/react.spec.ts.snap
#	packages/taro-webpack-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap
#	packages/taro-webpack-runner/src/index.ts
#	packages/taro-webpack-runner/src/utils/chain.ts
#	packages/taro-webpack5-runner/package.json
#	packages/taro-webpack5-runner/src/__tests__/__snapshots__/babel.spec.ts.snap
#	packages/taro-webpack5-runner/src/__tests__/__snapshots__/compiler-macros.spec.ts.snap
#	packages/taro-webpack5-runner/src/__tests__/__snapshots__/config.spec.ts.snap
#	packages/taro-webpack5-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap
#	packages/taro-webpack5-runner/src/__tests__/__snapshots__/mini-platform.spec.ts.snap
#	packages/taro-webpack5-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap
#	packages/taro-webpack5-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap
#	packages/taro-webpack5-runner/src/__tests__/__snapshots__/sass.spec.ts.snap
#	packages/taro-webpack5-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap
#	packages/taro-webpack5-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap
#	packages/taro-webpack5-runner/src/__tests__/__snapshots__/ts.spec.ts.snap
#	packages/taro-webpack5-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap
#	packages/taro-webpack5-runner/src/__tests__/bundled/globby/index.js
#	packages/taro-webpack5-runner/src/loaders/miniCompilerLoader.ts
#	packages/taroize/__tests__/__snapshots__/utils.test.ts.snap
#	packages/taroize/__tests__/__snapshots__/wxml.test.ts.snap
#	packages/taroize/package.json
#	pnpm-lock.yaml
  • Loading branch information
koppthe committed May 10, 2024
2 parents 33e9a01 + bb455f6 commit f951dce
Show file tree
Hide file tree
Showing 1,273 changed files with 71,474 additions and 19,209 deletions.
30 changes: 20 additions & 10 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
module.exports = {
parser: '@typescript-eslint/parser',
plugins: ['@typescript-eslint', 'import', 'jest', 'react', 'simple-import-sort', 'prettier'],
plugins: [
'@typescript-eslint',
'import',
'jest',
'react',
'simple-import-sort'
],
extends: [
'eslint:recommended',
'standard',
'plugin:@typescript-eslint/recommended',
'plugin:react/jsx-runtime',
'plugin:react/recommended',
'prettier',
],
rules: {
'@typescript-eslint/ban-ts-comment': 0,
Expand All @@ -27,29 +32,34 @@ module.exports = {
'@typescript-eslint/no-use-before-define': [1, { functions: false, classes: false }],
'@typescript-eslint/no-var-requires': 0,
camelcase: 0,
'comma-spacing': 2,
'eol-last': 2,
'import/first': 2,
'import/newline-after-import': 2,
'import/no-duplicates': 2,
indent: 0,
'keyword-spacing': 2,
'comma-dangle': 0,
'comma-spacing': 2,
'no-console': [2, { allow: ['warn', 'error'] }],
'no-empty': 1,
'no-multiple-empty-lines': 2,
'no-multi-spaces': 2,
'no-multiple-empty-lines': 0,
'no-mixed-operators': 0,
'no-prototype-builtins': 0,
'no-unused-expressions': 0,
'no-unused-vars': 'off',
'no-use-before-define': 0,
'import/first': 2,
'import/newline-after-import': 2,
'import/no-duplicates': 2,
'import/no-named-default': 'off',
indent: 0,
'keyword-spacing': 2,
'object-curly-spacing': 2,
'operator-linebreak': [2, 'after', {
overrides: { '?': 'before', ':': 'before' },
}],
'prefer-spread': 0,
'prefer-rest-params': 0,
'react/jsx-uses-vars': 1,
'react/prop-types': 0,
'react/no-find-dom-node': 0,
'react/no-unknown-property': 0,
'import/no-named-default': 'off',
quotes: [2, 'single', { avoidEscape: true, allowTemplateLiterals: true }],
semi: [2, 'never'],
'simple-import-sort/imports': [
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/build-rust-binding.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ jobs:
set -e &&
pnpm build:binding:release --target x86_64-unknown-linux-gnu &&
strip crates/native_binding/*.node
- host: ubuntu-20.04
target: x86_64-unknown-linux-musl
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
build: set -e && pnpm build:binding:release && strip crates/native_binding/*.node
- host: macos-11
target: aarch64-apple-darwin
build: |
Expand All @@ -42,7 +46,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup pnpm
uses: pnpm/action-setup@v2.4.0
uses: pnpm/action-setup@v3.0.0
with:
version: 8
- name: Setup Node.js ${{ matrix.node-version }}
Expand Down
18 changes: 10 additions & 8 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ jobs:
target: x86_64-pc-windows-msvc
- host: ubuntu-latest
target: x86_64-unknown-linux-gnu
- host: ubuntu-latest
target: x86_64-unknown-linux-musl
exclude:
- node-version: 16.x
host: macos-11
Expand All @@ -60,7 +62,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup pnpm
uses: pnpm/action-setup@v2.4.0
uses: pnpm/action-setup@v3.0.0
with:
version: 8
- name: Setup Node.js ${{ matrix.node-version }}
Expand Down Expand Up @@ -90,9 +92,9 @@ jobs:
path: crates/native_binding
- name: Test bindings
run: pnpm test:binding
if: ${{ matrix.target != 'x86_64-unknown-linux-gnu' }}
if: ${{ matrix.host != 'ubuntu-latest' }}
- name: Test bindings with docker
if: ${{ matrix.target == 'x86_64-unknown-linux-gnu' }}
if: ${{ matrix.host == 'ubuntu-latest' }}
# 暂时使用了一个第三方的 docker 镜像
run: docker run --rm -v $(pwd):/build -w /build chf007/pnpm pnpm test:binding
# 以下的测试流程应该在所有平台都执行,但 windows 好像还有些问题,因此目前只在 ubuntu-latest 执行
Expand All @@ -118,39 +120,39 @@ jobs:

# 以下 coverage 流程通过 artifact 拆分文件作为单独 job 上传时间损耗过长,因此在在 node test 后直接继续执行
- name: Upload [taro-cli] coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
if: ${{ matrix.host == 'ubuntu-latest' }}
with:
move_coverage_to_trash: true
flags: taro-cli
files: ./packages/taro-cli/coverage/clover.xml
token: ${{ secrets.CODECOV_TOKEN }}
- name: Upload runner coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
if: ${{ matrix.host == 'ubuntu-latest' }}
with:
move_coverage_to_trash: true
flags: taro-runner
files: ./packages/taro-webpack5-runner/coverage/clover.xml
token: ${{ secrets.CODECOV_TOKEN }}
- name: Upload [taro-runtime] coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
if: ${{ matrix.host == 'ubuntu-latest' }}
with:
move_coverage_to_trash: true
flags: taro-runtime
files: ./packages/taro-runtime/coverage/clover.xml
token: ${{ secrets.CODECOV_TOKEN }}
- name: Upload [taro-web] coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
if: ${{ matrix.host == 'ubuntu-latest' }}
with:
move_coverage_to_trash: true
flags: taro-web
files: ./packages/taro-components/coverage/clover.xml,./packages/taro-h5/coverage/clover.xml,./packages/taro-router/coverage/clover.xml
token: ${{ secrets.CODECOV_TOKEN }}
- name: Upload rest coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
if: ${{ matrix.host == 'ubuntu-latest' }}
with:
token: ${{ secrets.CODECOV_TOKEN }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
- '2.x'
- '3.x'
- '4.x'
# When Release Pull Request is merged
pull_request:
branches:
- main
Expand Down Expand Up @@ -85,7 +86,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup pnpm
uses: pnpm/action-setup@v2.4.0
uses: pnpm/action-setup@v3.0.0
with:
version: 8
- name: Setup Node 16
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-components-types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
${{ runner.os }}-
- name: install
uses: pnpm/action-setup@v2.4.0
uses: pnpm/action-setup@v3.0.0
with:
version: 8
run_install: |
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ common/autoinstallers/*/.npmrc

target/
debug/
!packages/taro-platform-harmony-hybrid/src/api/apis/base/debug

# Binding artifacts
artifacts
Expand All @@ -84,4 +85,4 @@ artifacts
*.node

# harmony-hybrid extend-h5-apis file
packages/taro-platform-harmony-hybrid/src/api/apis/extend-h5-apis.ts
packages/taro-platform-harmony-hybrid/src/api/apis/extend-h5-apis.ts
Loading

0 comments on commit f951dce

Please sign in to comment.