Skip to content

Commit

Permalink
Merge branch 'v18' into v18-fix-table-active-button-color
Browse files Browse the repository at this point in the history
# 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
EnricoMessall committed Nov 26, 2024
2 parents 5aca296 + 6254365 commit 34cdab4
Show file tree
Hide file tree
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.
72 changes: 0 additions & 72 deletions .eslintrc.json

This file was deleted.

1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto eol=lf
23 changes: 0 additions & 23 deletions .github/workflows/comment_by_label.yml

This file was deleted.

40 changes: 40 additions & 0 deletions .github/workflows/issue-labeled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,43 @@ jobs:
issue-number: ${{ github.event.issue.number }}
body: |
We're unable to replicate your issue, if you are able to create a reproducer by using [PrimeNG Issue Template](https://stackblitz.com/github/primefaces/primeng-issue-template) or add details please edit this issue. This issue will be closed if no activities in 20 days.
- name: Needs Upvote
if: contains(github.event.label.name, 'Needs Upvote')
uses: actions-cool/issues-helper@v3
with:
actions: 'create-comment'
token: ${{ secrets.GITHUB_TOKEN }}
issue-number: ${{ github.event.issue.number }}
body: |
Thanks a lot for this issue! PrimeNG team's roadmap is busy, but community feedback is crucial in prioritization. The more upvotes help ensure this fix can be addressed quickly or the related PR can be merged soon.
- name: Needs More Information
if: contains(github.event.label.name, 'Needs More Information')
uses: actions-cool/issues-helper@v3
with:
actions: 'create-comment'
token: ${{ secrets.GITHUB_TOKEN }}
issue-number: ${{ github.event.issue.number }}
body: |
More information is needed to find a solution. A runnable StackBlitz example and additional details would be helpful.
- name: Wontfix
if: contains(github.event.label.name, 'Wontfix')
uses: actions-cool/issues-helper@v3
with:
actions: 'create-comment'
token: ${{ secrets.GITHUB_TOKEN }}
issue-number: ${{ github.event.issue.number }}
body: |
Unfortunately, this issue cannot be fixed due to technical limitations. PrimeNg team has decided not to pursue a fix, as addressing it would introduce other complications. Thanks a lot for your understanding!
- name: Help Wanted
if: contains(github.event.label.name, 'Help Wanted')
uses: actions-cool/issues-helper@v3
with:
actions: 'create-comment'
token: ${{ secrets.GITHUB_TOKEN }}
issue-number: ${{ github.event.issue.number }}
body: |
Due to PrimeNG team's busy roadmap, this issue is available for anyone to work on. [**Make sure to reference this issue in your pull request.**](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) :sparkles: Thank you for your contribution! :sparkles:
8 changes: 4 additions & 4 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
nightly:
if: github.repository == 'primefaces/primeng' && github.ref == 'refs/heads/master'
if: github.repository == 'primefaces/primeng' && github.ref == 'refs/heads/v18'
runs-on: ubuntu-latest
name: Node ${{ matrix.node-version }}

Expand All @@ -24,9 +24,9 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
cache: 'pnpm'

- name: Build
run: |
npm install
npm run build:lib
pnpm install
pnpm run build
10 changes: 5 additions & 5 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
cache: 'pnpm'

- name: Build
run: |
npm install
pnpm install
- name: Code Format
if: ${{ success() }}
run: |
npm run format:check
pnpm run format:check
- name: Security Check
if: ${{ success() }}
run: |
npm run security:check
pnpm run security:check
#- name: Test
# if: ${{ success() }}
# run: |
# npm run test:headless
# pnpm run test:headless
28 changes: 18 additions & 10 deletions .github/workflows/pr-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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() }}
Expand Down
10 changes: 6 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
/components
/resources
/aot
dist

# dependencies
/node_modules
**/node_modules

# IDEs and editors
/.idea
Expand All @@ -20,9 +21,6 @@
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode

# misc
/.sass-cache
/connect.lock
Expand All @@ -39,6 +37,7 @@ testem.log

# System Files
.DS_Store
**/.DS_Store
Thumbs.db

# type doc
Expand All @@ -48,3 +47,6 @@ api-generator/themedoc.json
.nx

builder/node_modules

# primeng packages
packages/primeng/src/package.json
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
npx lint-staged
66 changes: 0 additions & 66 deletions .npmignore

This file was deleted.

1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
shamefully-hoist=true
4 changes: 4 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@ styles
node_modules
.vscode
.angular
*.md
*.yml
/tsconfig.json
*.json
Loading

0 comments on commit 34cdab4

Please sign in to comment.