-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'v18' into v18-fix-table-active-button-color
# Conflicts: # packages/primeng/src/accordion/accordion.ts # packages/primeng/src/autocomplete/autocomplete.ts # packages/primeng/src/avatar/avatar.ts # packages/primeng/src/avatargroup/avatargroup.ts # packages/primeng/src/blockui/blockui.ts # packages/primeng/src/breadcrumb/breadcrumb.ts # packages/primeng/src/button/button.ts # packages/primeng/src/calendar/calendar.ts # packages/primeng/src/carousel/carousel.ts # packages/primeng/src/checkbox/checkbox.ts # packages/primeng/src/confirmdialog/confirmdialog.ts # packages/primeng/src/confirmpopup/confirmpopup.ts # packages/primeng/src/contextmenu/contextmenu.ts # packages/primeng/src/dataview/dataview.ts # packages/primeng/src/datepicker/datepicker.ts # packages/primeng/src/dialog/dialog.ts # packages/primeng/src/divider/divider.ts # packages/primeng/src/dock/dock.ts # packages/primeng/src/drawer/drawer.ts # packages/primeng/src/dropdown/dropdown.ts # packages/primeng/src/editor/editor.ts # packages/primeng/src/fileupload/fileupload.ts # packages/primeng/src/image/image.ts # packages/primeng/src/inplace/inplace.ts # packages/primeng/src/inputgroup/inputgroup.ts # packages/primeng/src/inputicon/inputicon.ts # packages/primeng/src/inputmask/inputmask.ts # packages/primeng/src/inputotp/inputotp.ts # packages/primeng/src/inputswitch/inputswitch.ts # packages/primeng/src/knob/knob.ts # packages/primeng/src/listbox/listbox.ts # packages/primeng/src/megamenu/megamenu.ts # packages/primeng/src/menu/menu.ts # packages/primeng/src/menubar/menubar.ts # packages/primeng/src/message/message.ts # packages/primeng/src/messages/messages.ts # packages/primeng/src/multiselect/multiselect.ts # packages/primeng/src/orderlist/orderlist.ts # packages/primeng/src/organizationchart/organizationchart.ts # packages/primeng/src/overlaybadge/overlaybadge.ts # packages/primeng/src/overlaypanel/overlaypanel.ts # packages/primeng/src/paginator/paginator.ts # packages/primeng/src/panel/panel.ts # packages/primeng/src/panelmenu/panelmenu.ts # packages/primeng/src/picklist/picklist.ts # packages/primeng/src/popover/popover.ts # packages/primeng/src/progressbar/progressbar.ts # packages/primeng/src/progressspinner/progressspinner.ts # packages/primeng/src/radiobutton/radiobutton.ts # packages/primeng/src/scrollpanel/scrollpanel.ts # packages/primeng/src/select/select.ts # packages/primeng/src/selectbutton/selectbutton.ts # packages/primeng/src/skeleton/skeleton.ts # packages/primeng/src/slider/slider.ts # packages/primeng/src/splitbutton/splitbutton.ts # packages/primeng/src/splitter/splitter.ts # packages/primeng/src/steps/steps.ts # packages/primeng/src/table/table.ts # packages/primeng/src/tabmenu/tabmenu.ts # packages/primeng/src/tabview/tabview.ts # packages/primeng/src/terminal/terminal.ts # packages/primeng/src/tieredmenu/tieredmenu.ts # packages/primeng/src/timeline/timeline.ts # packages/primeng/src/toast/toast.ts # packages/primeng/src/togglebutton/togglebutton.ts # packages/primeng/src/toggleswitch/toggleswitch.ts # packages/primeng/src/tree/tree.ts # packages/primeng/src/treetable/treetable.ts # packages/themes/src/presets/aura/datatable/index.ts # packages/themes/src/presets/lara/datatable/index.ts # packages/themes/src/presets/nora/datatable/index.ts
- Loading branch information
Showing
5,557 changed files
with
3,383,510 additions
and
430,861 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
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 @@ | ||
* text=auto eol=lf |
This file was deleted.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,47 +16,55 @@ jobs: | |
runs-on: ubuntu-latest | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
strategy: | ||
matrix: | ||
node-version: [16.x, 18.x] | ||
|
||
steps: | ||
- name: Verify Linked Issue | ||
uses: hattan/[email protected] | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
with: | ||
message: 'Thanks a lot for your contribution! But, PR does not seem to be linked to any issues. Please [manually link to an issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#manually-linking-a-pull-request-or-branch-to-an-issue-using-the-issue-sidebar) or mention it in the description using #<issue_id>.' | ||
message: 'Thanks a lot for your contribution! But, PR does not seem to be linked to any issues. Please [manually link to an issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#manually-linking-a-pull-request-or-branch-to-an-issue-using-the-issue-sidebar).' | ||
|
||
- uses: actions/checkout@v3 | ||
- uses: actions/setup-node@v3 | ||
with: | ||
node-version: 16 | ||
cache: 'npm' | ||
node-version: ${{ matrix.node-version }} | ||
cache: 'pnpm' | ||
|
||
- name: Install packages | ||
run: | | ||
npm install | ||
pnpm install | ||
- name: Code Format | ||
id: codeFormat | ||
run: | | ||
npm run format:check | ||
pnpm run format:check | ||
#- name: Unit Test | ||
# id: unitTest | ||
# run: | | ||
# npm run test:headless | ||
# pnpm run test:headless | ||
|
||
- name: Add Code Format Fail Comment | ||
if: always() && steps.codeFormat.outcome == 'failure' | ||
uses: thollander/actions-comment-pull-request@v1 | ||
uses: actions-cool/issues-helper@v3 | ||
with: | ||
message: | | ||
Thanks a lot for your contribution! But, PR does not seem to fit our code format standards. Please run the 'npm run format' command and commit the changes. | ||
actions: 'create-comment' | ||
token: ${{ secrets.GITHUB_TOKEN }} | ||
issue-number: ${{ github.event.issue.number }} | ||
body: | | ||
Thanks a lot for your contribution! But, PR does not seem to fit our code format standards. Please run the 'pnpm run format' command and commit the changes. | ||
#- name: Add Unit Test Fail Comment | ||
# if: always() && steps.unitTest.outcome == 'failure' | ||
# uses: thollander/actions-comment-pull-request@v1 | ||
# with: | ||
# message: | | ||
# Thanks a lot for your contribution! But, Unit tests failed. You can check the unit tests with the command 'npm run test:headless' and commit the changes. | ||
# Thanks a lot for your contribution! But, Unit tests failed. You can check the unit tests with the command 'pnpm run test:headless' and commit the changes. | ||
|
||
# - name: Add Label | ||
# if: ${{ failure() }} | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
npx lint-staged |
This file was deleted.
Oops, something went wrong.
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 @@ | ||
shamefully-hoist=true |
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 |
---|---|---|
|
@@ -8,3 +8,7 @@ styles | |
node_modules | ||
.vscode | ||
.angular | ||
*.md | ||
*.yml | ||
/tsconfig.json | ||
*.json |
Oops, something went wrong.