-
Notifications
You must be signed in to change notification settings - Fork 262
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev-harmony' into feat/pulltorefresh-standard
# Conflicts: # packages/nutui-taro-demo-rn/scripts/taro/adapted.js # packages/nutui-taro-demo-rn/src/app.config.ts # src/utils/use-touch.ts
- Loading branch information
Showing
783 changed files
with
28,890 additions
and
24,877 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,8 +15,21 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - run: npm i fs-extra --force | ||
| - run: node scripts/copy-docs-h5-or-taro.js | ||
|
|
||
| - name: Install pnpm | ||
| run: corepack enable pnpm | ||
|
|
||
| - uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: '18' | ||
| cache: 'pnpm' | ||
|
|
||
| - name: Install dependencies | ||
| run: pnpm install | ||
|
|
||
| - name: Generate doc files | ||
| run: node scripts/copy-docs-h5-or-taro.js | ||
|
|
||
| - name : Sync | ||
| uses : JamesIves/[email protected] | ||
| with : | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,8 +16,21 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - run: npm i fs-extra --force | ||
| - run: node scripts/copy-migrate-from-v1.js | ||
|
|
||
| - name: Install pnpm | ||
| run: corepack enable pnpm | ||
|
|
||
| - uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: '18' | ||
| cache: 'pnpm' | ||
|
|
||
| - name: Install dependencies | ||
| run: pnpm install | ||
|
|
||
| - name: Copy migrate from v1 | ||
| run: node scripts/copy-migrate-from-v1.js | ||
|
|
||
| - name : Sync | ||
| uses : JamesIves/[email protected] | ||
| with : | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,8 +15,21 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - run: npm i fs-extra --force | ||
| - run: node scripts/copy-docs-h5-or-taro.js taro | ||
|
|
||
| - name: Install pnpm | ||
| run: corepack enable pnpm | ||
|
|
||
| - uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: '18' | ||
| cache: 'pnpm' | ||
|
|
||
| - name: Install dependencies | ||
| run: pnpm install | ||
|
|
||
| - name: Generate doc files | ||
| run: node scripts/copy-docs-h5-or-taro.js taro | ||
|
|
||
| - name : Sync | ||
| uses : JamesIves/[email protected] | ||
| with : | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
packages/nutui-codemod/transforms/package-name-migration.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| const findImportDeclaration = require('./utils/find-importDeclaration') | ||
|
|
||
| module.exports = (file, api, options) => { | ||
| const j = api.jscodeshift | ||
| const root = j(file.source) | ||
| const literals = findImportDeclaration(j, root, options.pkgInfo) | ||
| literals.forEach((path) => { | ||
| path.node.source.value = path.node.source.value.replace( | ||
| options.pkgInfo.ui, | ||
| options.pkgInfo.dongDesign | ||
| ) | ||
| }) | ||
|
|
||
| return root.toSource() | ||
| } |
7 changes: 7 additions & 0 deletions
7
packages/nutui-codemod/transforms/utils/find-importDeclaration.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| function findImportDeclaration(j, pathCollection, pkgInfo) { | ||
| return pathCollection.find(j.ImportDeclaration).filter((path) => { | ||
| return path.node.source && path.node.source.value.indexOf(pkgInfo.ui) !== -1 | ||
| }) | ||
| } | ||
|
|
||
| module.exports = findImportDeclaration |
Oops, something went wrong.