Merge branch 'prod'

primefaces · Feb 16, 2025 · a16ef0c · a16ef0c
2 parents 32425c2 + 95e5b0e
commit a16ef0c
Show file tree

Hide file tree

Showing 10 changed files with 138 additions and 133 deletions.
diff --git a/apps/showcase/assets/data/menu.json b/apps/showcase/assets/data/menu.json
@@ -511,7 +511,7 @@
                     "routerLink": "/guides/accessibility"
                 },
                 {
-                    "name": "Migration to V18",
+                    "name": "Migration to v18+",
                     "routerLink": "/guides/migration"
                 },
                 {
@@ -546,12 +546,6 @@
                 }
             ]
         },
-        {
-            "name": "Contribution",
-            "routerLink": "/contribution",
-            "icon": "pi pi-users",
-            "badge": "NEW"
-        },
         {
             "name": "Discover",
             "icon": "pi pi-search",
@@ -560,6 +554,10 @@
                     "name": "About Us",
                     "routerLink": "/team"
                 },
+                {
+                    "name": "Roadmap",
+                    "routerLink": "/roadmap"
+                },
                 {
                     "name": "Source Code",
                     "href": "https://github.com/primefaces/primeng"
@@ -568,6 +566,12 @@
                     "name": "Changelog",
                     "href": "https://github.com/primefaces/primeng/blob/master/CHANGELOG.md"
                 },
+                {
+                    "name": "Contribution",
+                    "routerLink": "/contribution",
+                    "icon": "pi pi-users",
+                    "badge": "NEW"
+                },
                 {
                     "name": "Store",
                     "href": "https://www.primefaces.org/store/"

diff --git a/apps/showcase/doc/animateonscroll/basicdoc.ts b/apps/showcase/doc/animateonscroll/basicdoc.ts
@@ -6,7 +6,7 @@ import { Component } from '@angular/core';
     standalone: false,
     template: `
         <app-docsectiontext>
-            <p>Animation classes are defined with the <i>enterClass</i> and <i>leaveClass</i> properties. This example utilizes PrimeFlex animations however any valid CSS animation is supported.</p>
+            <p>Animation classes are defined with the <i>enterClass</i> and <i>leaveClass</i> properties. This example utilizes tailwindcss-primeui plugin animations however any valid CSS animation is supported.</p>
         </app-docsectiontext>
         <div class="card flex flex-col items-center overflow-hidden">
             <div class="flex flex-col items-center gap-2">

diff --git a/apps/showcase/doc/guides/guidesdoc.module.ts b/apps/showcase/doc/guides/guidesdoc.module.ts
@@ -21,6 +21,7 @@ import { BreakingChangesDoc } from './migration/breakingchangesdoc';
 import { DeprecatedComponentsDoc } from './migration/deprecatedcomponentsdoc';
 import { MigrationOverviewDoc } from './migration/migrationoverviewdoc';
 import { RenamedComponentsDoc } from './migration/renamedcomponentsdoc';
+import { CompatibilityDoc } from './primeflex/compatibilitydoc';
 import { MigrationDoc } from './primeflex/migrationdoc';
 import { OverviewDoc } from './primeflex/overviewdoc';
 import { TailwindCSSDoc } from './primeflex/tailwindcssdoc';
@@ -41,6 +42,7 @@ import { TailwindCSSDoc } from './primeflex/tailwindcssdoc';
         BootstrapDoc,
         NormalizeDoc,
         OverviewDoc,
+        CompatibilityDoc,
         TailwindCSSDoc,
         MigrationDoc,
         BreakingChangesDoc,

diff --git a/apps/showcase/doc/guides/migration/breakingchangesdoc.ts b/apps/showcase/doc/guides/migration/breakingchangesdoc.ts
@@ -42,8 +42,8 @@ import { Component } from '@angular/core';
                 <li><i class="mark">.p-highlight</i>, each component have its own class such as <i class="mark">.p-select-option-selected</i>.</li>
                 <li><i class="mark">.p-fluid</i>, use the new built-in <i class="mark">fluid</i> property of the supported components or the <i class="mark">Fluid</i> component.</li>
             </ul>
-            <h4>Premium Templates</h4>
-            <p>Application templates like Apollo do not support PrimeNG v18 yet, all templates will be updated to PrimeNG v18 by the end of the 2024.</p>
+            <h4>PrimeFlex CSS</h4>
+            <p>In case you are using PrimeFlex CSS library, upgrade to PrimeFlex v4 since PrimeFlex v3 is not compatible with PrimeNG v18+</p>
         </app-docsectiontext>
     `
 })

diff --git a/apps/showcase/doc/guides/primeflex/compatibilitydoc.ts b/apps/showcase/doc/guides/primeflex/compatibilitydoc.ts
@@ -0,0 +1,26 @@
+import { Component } from '@angular/core';
+
+@Component({
+    selector: 'compatibility-doc',
+    standalone: false,
+    template: `
+        <app-docsectiontext>
+            <p>The compatible versions to choose the correct combination.</p>
+            <div class="doc-tablewrapper">
+                <table class="doc-table">
+                    <tbody>
+                        <tr>
+                            <td>PrimeNG v18 and newer</td>
+                            <td>PrimeFlex v4</td>
+                        </tr>
+                        <tr>
+                            <td>PrimeNG v17 and older</td>
+                            <td>PrimeFlex v3</td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </app-docsectiontext>
+    `
+})
+export class CompatibilityDoc {}
diff --git a/apps/showcase/doc/skeleton/carddoc.ts b/apps/showcase/doc/skeleton/carddoc.ts
@@ -6,7 +6,7 @@ import { Component } from '@angular/core';
     standalone: false,
     template: `
         <app-docsectiontext>
-            <p>Sample Card implementation using different Skeleton components and PrimeFlex CSS utilities.</p>
+            <p>Sample Card implementation using different Skeleton components and Tailwind CSS utilities.</p>
         </app-docsectiontext>
         <div class="card">
             <div class="rounded border border-surface-200 dark:border-surface-700 p-6 bg-surface-0 dark:bg-surface-900">

diff --git a/apps/showcase/doc/skeleton/datatabledoc.ts b/apps/showcase/doc/skeleton/datatabledoc.ts
@@ -6,7 +6,7 @@ import { Component, OnInit } from '@angular/core';
     standalone: false,
     template: `
         <app-docsectiontext>
-            <p>Sample DataTable implementation using different Skeleton components and PrimeFlex CSS utilities.</p>
+            <p>Sample DataTable implementation using different Skeleton components and Tailwind CSS utilities.</p>
         </app-docsectiontext>
         <div class="card">
             <p-table [value]="products" [tableStyle]="{ 'min-width': '50rem' }">

diff --git a/apps/showcase/doc/skeleton/listdoc.ts b/apps/showcase/doc/skeleton/listdoc.ts
@@ -6,7 +6,7 @@ import { Component } from '@angular/core';
     standalone: false,
     template: `
         <app-docsectiontext>
-            <p>Sample List implementation using different Skeleton components and PrimeFlex CSS utilities.</p>
+            <p>Sample List implementation using different Skeleton components and Tailwind CSS utilities.</p>
         </app-docsectiontext>
         <div class="card">
             <div class="rounded border border-surface-200 dark:border-surface-700 p-6 bg-surface-0 dark:bg-surface-900">

diff --git a/apps/showcase/pages/guides/primeflex/primeflexdemo.component.ts b/apps/showcase/pages/guides/primeflex/primeflexdemo.component.ts
@@ -1,3 +1,4 @@
+import { CompatibilityDoc } from '@/doc/guides/primeflex/compatibilitydoc';
 import { MigrationDoc } from '@/doc/guides/primeflex/migrationdoc';
 import { OverviewDoc } from '@/doc/guides/primeflex/overviewdoc';
 import { TailwindCSSDoc } from '@/doc/guides/primeflex/tailwindcssdoc';
@@ -15,6 +16,11 @@ export class PrimeFlexDemoComponent {
             label: 'Overview',
             component: OverviewDoc
         },
+        {
+            id: 'compatibility',
+            label: 'Compatibility',
+            component: CompatibilityDoc
+        },
         {
             id: 'tailwindcss',
             label: 'Tailwind CSS',