From 0a4f1ded25cbc87c930c4794980764a6f2db10a9 Mon Sep 17 00:00:00 2001 From: oasis-cloud Date: Thu, 30 May 2024 13:49:52 +0800 Subject: [PATCH 1/5] =?UTF-8?q?chore(demo):=20=E6=9B=B4=E6=96=B0=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=BC=95=E7=94=A8=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/audio/demo.taro.tsx | 2 +- src/packages/avatar/demo.taro.tsx | 2 +- src/packages/badge/demo.taro.tsx | 2 +- src/packages/button/demo.taro.tsx | 2 +- src/packages/circleprogress/demo.taro.tsx | 2 +- src/packages/divider/demo.taro.tsx | 2 +- src/packages/icon/demo.taro.tsx | 2 +- src/packages/icon/demos/taro/demo7.tsx | 2 +- src/packages/image/demo.taro.tsx | 2 +- src/packages/inputnumber/demo.taro.tsx | 2 +- src/packages/overlay/demo.taro.tsx | 2 +- src/packages/pagination/demo.taro.tsx | 2 +- src/packages/price/demo.taro.tsx | 2 +- src/packages/progress/demo.taro.tsx | 2 +- src/packages/radio/demo.taro.tsx | 2 +- src/packages/rate/demo.taro.tsx | 2 +- src/packages/skeleton/demo.taro.tsx | 2 +- src/packages/space/demo.taro.tsx | 2 +- src/packages/sticky/demo.taro.tsx | 2 +- src/packages/swipe/demo.taro.tsx | 4 ++-- src/packages/table/demo.taro.tsx | 2 +- src/packages/virtuallist/demo.taro.tsx | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/packages/audio/demo.taro.tsx b/src/packages/audio/demo.taro.tsx index c24565da42..6db0eb01b4 100644 --- a/src/packages/audio/demo.taro.tsx +++ b/src/packages/audio/demo.taro.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react' import Taro from '@tarojs/taro' -import { Cell, Audio } from '@/packages/nutui.react.taro' +import { Cell, Audio } from '@nutui/nutui-react-taro' import Header from '@/sites/components/header' const formatseconds = (value: string) => { diff --git a/src/packages/avatar/demo.taro.tsx b/src/packages/avatar/demo.taro.tsx index 67f0777025..ed04862957 100644 --- a/src/packages/avatar/demo.taro.tsx +++ b/src/packages/avatar/demo.taro.tsx @@ -1,7 +1,7 @@ import React from 'react' import Taro from '@tarojs/taro' +import { Cell } from '@nutui/nutui-react-taro' import { useTranslate } from '@/sites/assets/locale/taro' -import { Cell } from '@/packages/nutui.react.taro' import Header from '@/sites/components/header' import '@/packages/avatar/demo.scss' import Demo1 from './demos/taro/demo1' diff --git a/src/packages/badge/demo.taro.tsx b/src/packages/badge/demo.taro.tsx index 58768efa12..71d9ac6013 100644 --- a/src/packages/badge/demo.taro.tsx +++ b/src/packages/badge/demo.taro.tsx @@ -1,6 +1,6 @@ import Taro from '@tarojs/taro' import React from 'react' -import { Cell } from '@/packages/nutui.react.taro' +import { Cell } from '@nutui/nutui-react-taro' import { useTranslate } from '@/sites/assets/locale/taro' import Header from '@/sites/components/header' import Demo1 from './demos/taro/demo1' diff --git a/src/packages/button/demo.taro.tsx b/src/packages/button/demo.taro.tsx index dee1a19501..45d640b3eb 100644 --- a/src/packages/button/demo.taro.tsx +++ b/src/packages/button/demo.taro.tsx @@ -1,8 +1,8 @@ import React from 'react' import Taro from '@tarojs/taro' +import { Cell } from '@nutui/nutui-react-taro' import { useTranslate } from '@/sites/assets/locale/taro' import Header from '@/sites/components/header' -import { Cell } from '@/packages/nutui.react.taro' import Demo1 from './demos/taro/demo1' import Demo2 from './demos/taro/demo2' import Demo3 from './demos/taro/demo3' diff --git a/src/packages/circleprogress/demo.taro.tsx b/src/packages/circleprogress/demo.taro.tsx index 42b17cc707..3e232683cb 100644 --- a/src/packages/circleprogress/demo.taro.tsx +++ b/src/packages/circleprogress/demo.taro.tsx @@ -1,7 +1,7 @@ import React from 'react' import Taro from '@tarojs/taro' +import { Cell } from '@nutui/nutui-react-taro' import { useTranslate } from '@/sites/assets/locale/taro' -import { Cell } from '@/packages/nutui.react.taro' import Header from '@/sites/components/header' import '@/packages/circleprogress/demo.scss' import Demo1 from './demos/taro/demo1' diff --git a/src/packages/divider/demo.taro.tsx b/src/packages/divider/demo.taro.tsx index 431c07204b..adf2960b45 100644 --- a/src/packages/divider/demo.taro.tsx +++ b/src/packages/divider/demo.taro.tsx @@ -1,6 +1,6 @@ import React from 'react' import Taro from '@tarojs/taro' -import { Cell } from '@/packages/nutui.react.taro' +import { Cell } from '@nutui/nutui-react-taro' import { useTranslate } from '@/sites/assets/locale/taro' import Header from '@/sites/components/header' import Demo1 from './demos/taro/demo1' diff --git a/src/packages/icon/demo.taro.tsx b/src/packages/icon/demo.taro.tsx index 6b7db24a5d..e9e19ef65e 100644 --- a/src/packages/icon/demo.taro.tsx +++ b/src/packages/icon/demo.taro.tsx @@ -1,8 +1,8 @@ import React, { useState } from 'react' import Taro from '@tarojs/taro' import '@nutui/icons-react-taro/dist/style_iconfont.css' +import { Cell, Toast } from '@nutui/nutui-react-taro' import { useTranslate } from '@/sites/assets/locale/taro' -import { Cell, Toast } from '@/packages/nutui.react.taro' import Header from '@/sites/components/header' import Demo1 from './demos/taro/demo1' import Demo2 from './demos/taro/demo2' diff --git a/src/packages/icon/demos/taro/demo7.tsx b/src/packages/icon/demos/taro/demo7.tsx index 36b217d41a..97ccfa89b4 100644 --- a/src/packages/icon/demos/taro/demo7.tsx +++ b/src/packages/icon/demos/taro/demo7.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react' import { IconFontConfig, IconFont } from '@nutui/icons-react-taro' -import { Cell, Toast } from '@/packages/nutui.react.taro' +import { Cell, Toast } from '@nutui/nutui-react-taro' import { camelCase } from '@/utils/camel-case' const Demo7 = () => { diff --git a/src/packages/image/demo.taro.tsx b/src/packages/image/demo.taro.tsx index afe034ebb8..5886082c39 100644 --- a/src/packages/image/demo.taro.tsx +++ b/src/packages/image/demo.taro.tsx @@ -1,7 +1,7 @@ import React from 'react' import Taro from '@tarojs/taro' +import { Cell } from '@nutui/nutui-react-taro' import { useTranslate } from '@/sites/assets/locale/taro' -import { Cell } from '@/packages/nutui.react.taro' import Header from '@/sites/components/header' import Demo1 from './demos/taro/demo1' import Demo2 from './demos/taro/demo2' diff --git a/src/packages/inputnumber/demo.taro.tsx b/src/packages/inputnumber/demo.taro.tsx index e2b4904184..be23f1bbe0 100644 --- a/src/packages/inputnumber/demo.taro.tsx +++ b/src/packages/inputnumber/demo.taro.tsx @@ -1,7 +1,7 @@ import React from 'react' import Taro from '@tarojs/taro' +import { Cell } from '@nutui/nutui-react-taro' import { useTranslate } from '@/sites/assets/locale/taro' -import { Cell } from '@/packages/nutui.react.taro' import Header from '@/sites/components/header' import Demo1 from './demos/taro/demo1' diff --git a/src/packages/overlay/demo.taro.tsx b/src/packages/overlay/demo.taro.tsx index 19074dbb2c..eb95e316e1 100644 --- a/src/packages/overlay/demo.taro.tsx +++ b/src/packages/overlay/demo.taro.tsx @@ -1,7 +1,7 @@ import React from 'react' import Taro from '@tarojs/taro' +import { Cell } from '@nutui/nutui-react-taro' import { useTranslate } from '@/sites/assets/locale/taro' -import { Cell } from '@/packages/nutui.react.taro' import '@/packages/overlay/demo.scss' import Header from '@/sites/components/header' import Demo2 from './demos/taro/demo2' diff --git a/src/packages/pagination/demo.taro.tsx b/src/packages/pagination/demo.taro.tsx index 03a2eb62b4..5243aa1698 100644 --- a/src/packages/pagination/demo.taro.tsx +++ b/src/packages/pagination/demo.taro.tsx @@ -1,6 +1,6 @@ import React from 'react' import Taro from '@tarojs/taro' -import { Cell } from '@/packages/nutui.react.taro' +import { Cell } from '@nutui/nutui-react-taro' import { useTranslate } from '@/sites/assets/locale/taro' import Header from '@/sites/components/header' import Demo1 from './demos/taro/demo1' diff --git a/src/packages/price/demo.taro.tsx b/src/packages/price/demo.taro.tsx index 59e56f99f3..f9ee8d4488 100644 --- a/src/packages/price/demo.taro.tsx +++ b/src/packages/price/demo.taro.tsx @@ -1,6 +1,6 @@ import React from 'react' import Taro from '@tarojs/taro' -import { Cell } from '@/packages/nutui.react.taro' +import { Cell } from '@nutui/nutui-react-taro' import { useTranslate } from '@/sites/assets/locale/taro' import Header from '@/sites/components/header' import Demo1 from './demos/taro/demo1' diff --git a/src/packages/progress/demo.taro.tsx b/src/packages/progress/demo.taro.tsx index a7b6b119c0..b69c5f5983 100644 --- a/src/packages/progress/demo.taro.tsx +++ b/src/packages/progress/demo.taro.tsx @@ -1,7 +1,7 @@ import React from 'react' import Taro from '@tarojs/taro' +import { Cell } from '@nutui/nutui-react-taro' import { useTranslate } from '@/sites/assets/locale/taro' -import { Cell } from '@/packages/nutui.react.taro' import Header from '@/sites/components/header' import Demo1 from './demos/taro/demo1' import Demo2 from './demos/taro/demo2' diff --git a/src/packages/radio/demo.taro.tsx b/src/packages/radio/demo.taro.tsx index 7b7806fdd0..c5f9802872 100644 --- a/src/packages/radio/demo.taro.tsx +++ b/src/packages/radio/demo.taro.tsx @@ -1,7 +1,7 @@ import React from 'react' import Taro from '@tarojs/taro' +import { Cell } from '@nutui/nutui-react-taro' import { useTranslate } from '@/sites/assets/locale/taro' -import { Cell } from '@/packages/nutui.react.taro' import Header from '@/sites/components/header' import Demo1 from './demos/taro/demo1' import Demo2 from './demos/taro/demo2' diff --git a/src/packages/rate/demo.taro.tsx b/src/packages/rate/demo.taro.tsx index 5257d78ae1..53e880de0c 100644 --- a/src/packages/rate/demo.taro.tsx +++ b/src/packages/rate/demo.taro.tsx @@ -1,6 +1,6 @@ import React, { CSSProperties } from 'react' import Taro from '@tarojs/taro' -import { Cell } from '@/packages/nutui.react.taro' +import { Cell } from '@nutui/nutui-react-taro' import Header from '@/sites/components/header' import { useTranslate } from '@/sites/assets/locale/taro' import Demo1 from './demos/taro/demo1' diff --git a/src/packages/skeleton/demo.taro.tsx b/src/packages/skeleton/demo.taro.tsx index ae5d93b44b..bc3416bd7a 100644 --- a/src/packages/skeleton/demo.taro.tsx +++ b/src/packages/skeleton/demo.taro.tsx @@ -1,6 +1,6 @@ import React from 'react' import Taro from '@tarojs/taro' -import { Cell } from '@/packages/nutui.react.taro' +import { Cell } from '@nutui/nutui-react-taro' import '@/packages/skeleton/demo.scss' import { useTranslate } from '@/sites/assets/locale/taro' import Header from '@/sites/components/header' diff --git a/src/packages/space/demo.taro.tsx b/src/packages/space/demo.taro.tsx index d6cf66518c..faac49b2e2 100644 --- a/src/packages/space/demo.taro.tsx +++ b/src/packages/space/demo.taro.tsx @@ -1,6 +1,6 @@ import React from 'react' import Taro from '@tarojs/taro' -import { Cell } from '@/packages/nutui.react.taro' +import { Cell } from '@nutui/nutui-react-taro' import { useTranslate } from '@/sites/assets/locale/taro' import Header from '@/sites/components/header' import Demo1 from './demos/taro/demo1' diff --git a/src/packages/sticky/demo.taro.tsx b/src/packages/sticky/demo.taro.tsx index f9d7606ebc..0129171afa 100644 --- a/src/packages/sticky/demo.taro.tsx +++ b/src/packages/sticky/demo.taro.tsx @@ -1,6 +1,6 @@ import React from 'react' import { getEnv } from '@tarojs/taro' -import { Cell } from '@/packages/nutui.react.taro' +import { Cell } from '@nutui/nutui-react-taro' import { useTranslate } from '@/sites/assets/locale/taro' import Header from '@/sites/components/header' import Demo1 from './demos/taro/demo1' diff --git a/src/packages/swipe/demo.taro.tsx b/src/packages/swipe/demo.taro.tsx index 28fd7004a4..b5a997936e 100644 --- a/src/packages/swipe/demo.taro.tsx +++ b/src/packages/swipe/demo.taro.tsx @@ -2,7 +2,6 @@ import React, { useRef, useState } from 'react' import Taro from '@tarojs/taro' import { View } from '@tarojs/components' import { Del } from '@nutui/icons-react-taro' -import { useTranslate } from '@/sites/assets/locale/taro' import { Button, Cell, @@ -10,7 +9,8 @@ import { Dialog, InputNumber, Swipe, -} from '@/packages/nutui.react.taro' +} from '@nutui/nutui-react-taro' +import { useTranslate } from '@/sites/assets/locale/taro' import Header from '@/sites/components/header' type TSwipeDemo = { diff --git a/src/packages/table/demo.taro.tsx b/src/packages/table/demo.taro.tsx index db5cc247c3..8e0c73842f 100644 --- a/src/packages/table/demo.taro.tsx +++ b/src/packages/table/demo.taro.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react' import Taro from '@tarojs/taro' -import { Toast } from '@/packages/nutui.react.taro' +import { Toast } from '@nutui/nutui-react-taro' import { useTranslate } from '@/sites/assets/locale/taro' import Header from '@/sites/components/header' import Demo1 from './demos/taro/demo1' diff --git a/src/packages/virtuallist/demo.taro.tsx b/src/packages/virtuallist/demo.taro.tsx index 772d5974f1..654d3c6122 100644 --- a/src/packages/virtuallist/demo.taro.tsx +++ b/src/packages/virtuallist/demo.taro.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react' import Taro from '@tarojs/taro' +import { Cell, Radio } from '@nutui/nutui-react-taro' import { useTranslate } from '@/sites/assets/locale/taro' -import { Cell, Radio } from '@/packages/nutui.react.taro' import Header from '@/sites/components/header' import Demo1 from './demos/taro/demo1' From e60518b83fc110adc9a657cadcbef2064f773f38 Mon Sep 17 00:00:00 2001 From: oasis-cloud Date: Thu, 30 May 2024 14:49:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?chore(demo):=20=E6=9B=B4=E6=96=B0=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=BC=95=E7=94=A8=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b16d801e86..20345be738 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,6 +16,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Enable Corepack before setting up Node + run: corepack enable - name: Install pnpm run: corepack enable @@ -46,10 +48,10 @@ jobs: - name: Install dependencies run: pnpm install - + - name: Run test run: npm run test - + - name: Upload coverage reports to Codecov if: ${{ always() }} uses: codecov/codecov-action@v4 From b6916696bc4ef9b65ef04188a29269c9955707d9 Mon Sep 17 00:00:00 2001 From: oasis-cloud Date: Thu, 30 May 2024 14:57:28 +0800 Subject: [PATCH 3/5] =?UTF-8?q?chore(demo):=20=E6=9B=B4=E6=96=B0=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=BC=95=E7=94=A8=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 20345be738..ddc255a2f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,8 +16,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Enable Corepack before setting up Node - run: corepack enable + - name: yarn + run: yarn set version latest --yarn-path - name: Install pnpm run: corepack enable From cbedc9154eed405b2616b87dec000004909def9a Mon Sep 17 00:00:00 2001 From: oasis-cloud Date: Thu, 30 May 2024 15:06:44 +0800 Subject: [PATCH 4/5] =?UTF-8?q?chore(demo):=20=E6=9B=B4=E6=96=B0=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=BC=95=E7=94=A8=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ddc255a2f1..236ef177bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,11 +16,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: yarn - run: yarn set version latest --yarn-path - name: Install pnpm - run: corepack enable + run: corepack enable pnpm - uses: actions/setup-node@v4 with: From 371d117518b502b9779ec77903d4f35855504931 Mon Sep 17 00:00:00 2001 From: oasis-cloud Date: Thu, 30 May 2024 15:07:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?chore(demo):=20=E6=9B=B4=E6=96=B0=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=BC=95=E7=94=A8=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 236ef177bd..276c5abdc8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: - uses: actions/checkout@v4 - name: Install pnpm - run: corepack enable + run: corepack enable pnpm - uses: actions/setup-node@v4 with: @@ -62,7 +62,7 @@ jobs: - uses: actions/checkout@v4 - name: Install pnpm - run: corepack enable + run: corepack enable pnpm - uses: actions/setup-node@v4 with: