diff --git a/.github/workflows/add-label.yml b/.github/workflows/add-label.yml index 0f7f6e7942..315712e9d7 100644 --- a/.github/workflows/add-label.yml +++ b/.github/workflows/add-label.yml @@ -19,7 +19,7 @@ jobs: echo "${{github.event_name}}" if [[ "${{ github.event.pull_request.base.ref }}" == "next" ]]; then echo "label=2.x" >> $GITHUB_ENV - elif [[ "${{ github.event.pull_request.base.ref }}" == "V3.0" ]]; then + elif [[ "${{ github.event.pull_request.base.ref }}" == "feat_v3.x" ]]; then echo "label=3.x" >> $GITHUB_ENV else echo "label=" >> $GITHUB_ENV diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd3035c323..59717e80c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: push: branches: - next - - V3.0 + - feat_v3.x pull_request: types: [opened, synchronize, reopened] workflow_dispatch: diff --git a/.github/workflows/sync-h5.yml b/.github/workflows/sync-h5.yml index e786f64982..31f6dc06a6 100644 --- a/.github/workflows/sync-h5.yml +++ b/.github/workflows/sync-h5.yml @@ -3,7 +3,7 @@ name: sync to docs-h5 on: push: branches: - - V3.0 + - feat_v3.x paths: - '.github/workflows/**' - 'src/**' diff --git a/.github/workflows/sync-migrate.yml b/.github/workflows/sync-migrate.yml index b286c0155b..99f40cafcb 100644 --- a/.github/workflows/sync-migrate.yml +++ b/.github/workflows/sync-migrate.yml @@ -3,7 +3,7 @@ name: sync to migrate on: push: branches: - - V3.0 + - feat_v3.x paths: - '.github/workflows/**' - 'src/**' diff --git a/.github/workflows/sync-taro.yml b/.github/workflows/sync-taro.yml index 48565efc27..64ca04d724 100644 --- a/.github/workflows/sync-taro.yml +++ b/.github/workflows/sync-taro.yml @@ -3,7 +3,7 @@ name: sync to docs-taro on: push: branches: - - V3.0 + - feat_v3.x paths: - '.github/workflows/**' - 'src/**' diff --git a/packages/nutui-taro-demo/.gitignore b/packages/nutui-taro-demo/.gitignore index c17aedddeb..49c9914ee1 100644 --- a/packages/nutui-taro-demo/.gitignore +++ b/packages/nutui-taro-demo/.gitignore @@ -13,5 +13,6 @@ src/exhibition/ src/feedback/ src/layout/ src/nav/ +src/app.config.ts .npmrc nutui-react/ diff --git a/packages/nutui-taro-demo/src/app.config.ts b/packages/nutui-taro-demo/src/app.config.ts deleted file mode 100644 index 7357a2dbf7..0000000000 --- a/packages/nutui-taro-demo/src/app.config.ts +++ /dev/null @@ -1,139 +0,0 @@ - -const subPackages = [ - { - "root": "base", - "pages": [ - "pages/button/index", - "pages/cell/index", - "pages/configprovider/index", - "pages/icon/index", - "pages/image/index", - "pages/overlay/index" - ] - }, - { - "root": "layout", - "pages": [ - "pages/divider/index", - "pages/grid/index", - "pages/layout/index", - "pages/safearea/index", - "pages/space/index", - "pages/sticky/index" - ] - }, - { - "root": "nav", - "pages": [ - "pages/backtop/index", - "pages/elevator/index", - "pages/fixednav/index", - "pages/hoverbutton/index", - "pages/navbar/index", - "pages/sidenavbar/index", - "pages/tabbar/index", - "pages/tabs/index" - ] - }, - { - "root": "dentry", - "pages": [ - "pages/address/index", - "pages/calendar/index", - "pages/calendarcard/index", - "pages/cascader/index", - "pages/checkbox/index", - "pages/datepicker/index", - "pages/form/index", - "pages/input/index", - "pages/inputnumber/index" - ] - }, - { - "root": "dataentry", - "pages": [ - "pages/menu/index", - "pages/numberkeyboard/index", - "pages/picker/index", - "pages/radio/index", - "pages/range/index", - "pages/rate/index", - "pages/searchbar/index", - "pages/shortpassword/index", - "pages/signature/index", - "pages/switch/index", - "pages/textarea/index", - "pages/uploader/index" - ] - }, - { - "root": "feedback", - "pages": [ - "pages/actionsheet/index", - "pages/badge/index", - "pages/dialog/index", - "pages/drag/index", - "pages/empty/index", - "pages/infiniteloading/index", - "pages/loading/index", - "pages/noticebar/index", - "pages/notify/index", - "pages/popover/index", - "pages/popup/index", - "pages/pulltorefresh/index", - "pages/resultpage/index", - "pages/skeleton/index", - "pages/swipe/index", - "pages/toast/index" - ] - }, - { - "root": "exhibition", - "pages": [ - "pages/animate/index", - "pages/animatingnumbers/index", - "pages/avatar/index", - "pages/circleprogress/index", - "pages/collapse/index", - "pages/countdown/index", - "pages/ellipsis/index", - "pages/imagepreview/index", - "pages/indicator/index", - "pages/pagination/index", - "pages/price/index", - "pages/progress/index", - "pages/steps/index", - "pages/swiper/index", - "pages/table/index", - "pages/tag/index", - "pages/tour/index", - "pages/video/index", - "pages/virtuallist/index" - ] - }, - { - "root": "business", - "pages": [ - "pages/avatarcropper/index", - "pages/barrage/index", - "pages/card/index", - "pages/timeselect/index", - "pages/trendarrow/index", - "pages/watermark/index" - ] - } -]; - -export default defineAppConfig({ - pages: ['pages/index/index'], - subPackages, - window: { - backgroundTextStyle: 'light', - navigationBarBackgroundColor: '#fff', - navigationBarTitleText: 'NutUI-React', - navigationBarTextStyle: 'black' - }, - components: ['pages/index/index', ...(subPackages.map(subPackage => { - return subPackage.pages.map(page => `${subPackage.root}/${page}`) - }).flat())] -}) \ No newline at end of file