Skip to content

Commit

Permalink
Merge branch 'master' into feat-rn-comps-pref
Browse files Browse the repository at this point in the history
  • Loading branch information
hiyuki authored Jan 21, 2025
2 parents 8d381da + 87d27fd commit 8da0655
Show file tree
Hide file tree
Showing 252 changed files with 6,760 additions and 9,369 deletions.
15 changes: 9 additions & 6 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ module.exports = {
sourceType: 'module'
},
extends: 'standard',
plugins: [
'html',
'jest'
],
plugins: ['html', 'jest'],
globals: {
wx: 'readonly',
my: 'readonly',
Expand Down Expand Up @@ -45,7 +42,7 @@ module.exports = {
extends: [
'standard',
'plugin:@typescript-eslint/eslint-recommended',
'plugin:@typescript-eslint/recommended',
'plugin:@typescript-eslint/recommended'
],
plugins: ['@typescript-eslint'],
rules: {
Expand All @@ -56,7 +53,13 @@ module.exports = {
'@typescript-eslint/no-empty-interface': 0,
'@typescript-eslint/no-unused-vars': 0,
'@typescript-eslint/no-non-null-assertion': 0,
camelcase: 0,
camelcase: 0
}
}, {
files: ['packages/webpack-plugin/lib/runtime/components/react/**/*.{js,jsx,ts,tsx}'],
plugins: ['react-hooks'],
rules: {
'react-hooks/rules-of-hooks': 'error'
}
}
]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ jobs:
- uses: technote-space/get-diff-action@v4
with:
PATTERNS: |
+(docs|docs-vuepress)/**/*
+(docs|docs-vuepress)/.*/**/*
+(docs|docs-vitepress)/**/*
+(docs|docs-vitepress)/.*/**/*
# vuepress生成最终文档
- name: generate docs file
if: env.GIT_DIFF
Expand All @@ -30,6 +30,6 @@ jobs:
username: ${{ secrets.DOCS_SERVER_USER }}
key: ${{ secrets.DOCS_SERVER_KEY }}
command_timeout: "20m"
source: "./docs-vuepress/.vuepress/dist/"
source: "./docs-vitepress/.vitepress/dist/"
strip_components: 4
target: "${{ secrets.DOCS_SERVER_DIR }}"
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ package-lock.json
pnpm-lock.yaml
yarn.lock
.DS_Store
docs-vuepress/.vuepress/dist
elevate/
packages/webpack-plugin/lib/runtime/components/react/dist/
docs-vitepress/.vitepress/dist
docs-vitepress/.vitepress/cache
dev-dist
packages/webpack-plugin/lib/runtime/components/react/dist/
Loading

0 comments on commit 8da0655

Please sign in to comment.