From a30fa5508a601faeed6c2c3df23a4950d8fdf222 Mon Sep 17 00:00:00 2001
From: Mert Sincan <sincan.mert@gmail.com>
Date: Thu, 31 Oct 2024 13:43:37 +0000
Subject: [PATCH] Rename `@primevue/form` with `@primevue/forms`

---
 .../components/doc/codeeditor/templates.js    |  2 +-
 apps/showcase/doc/autocomplete/FormsDoc.vue   |  6 +--
 apps/showcase/doc/cascadeselect/FormsDoc.vue  |  4 +-
 apps/showcase/doc/checkbox/FormsDoc.vue       |  6 +--
 apps/showcase/doc/colorpicker/FormsDoc.vue    |  6 +--
 apps/showcase/doc/datepicker/FormsDoc.vue     |  6 +--
 apps/showcase/doc/editor/FormsDoc.vue         |  6 +--
 apps/showcase/doc/forms/RegisterDoc.vue       |  6 +--
 apps/showcase/doc/forms/ResolversDoc.vue      |  8 ++--
 apps/showcase/doc/forms/SubmitDoc.vue         |  6 +--
 .../doc/forms/dynamic/DynamicForm.vue         |  2 +-
 apps/showcase/doc/forms/pt/PTViewer.vue       |  2 +-
 apps/showcase/doc/inputmask/FormsDoc.vue      |  6 +--
 apps/showcase/doc/inputnumber/FormsDoc.vue    |  6 +--
 apps/showcase/doc/inputotp/FormsDoc.vue       |  6 +--
 apps/showcase/doc/inputtext/FormsDoc.vue      |  6 +--
 apps/showcase/doc/knob/FormsDoc.vue           |  6 +--
 apps/showcase/doc/listbox/FormsDoc.vue        |  6 +--
 apps/showcase/doc/multiselect/FormsDoc.vue    |  6 +--
 apps/showcase/doc/password/FormsDoc.vue       |  6 +--
 apps/showcase/doc/radiobutton/FormsDoc.vue    |  6 +--
 apps/showcase/doc/rating/FormsDoc.vue         |  6 +--
 apps/showcase/doc/select/FormsDoc.vue         |  6 +--
 apps/showcase/doc/selectbutton/FormsDoc.vue   |  6 +--
 apps/showcase/doc/slider/FormsDoc.vue         |  6 +--
 apps/showcase/doc/textarea/FormsDoc.vue       |  6 +--
 apps/showcase/doc/togglebutton/FormsDoc.vue   |  6 +--
 apps/showcase/doc/toggleswitch/FormsDoc.vue   |  6 +--
 apps/showcase/doc/treeselect/FormsDoc.vue     |  6 +--
 apps/showcase/package.json                    |  4 +-
 package.json                                  |  4 +-
 packages/form/README.md                       |  1 -
 packages/forms/README.md                      |  1 +
 packages/{form => forms}/package.json         | 44 ++++++++-----------
 packages/{form => forms}/rollup.config.mjs    |  6 +--
 .../{form => forms}/scripts/postbuild.mjs     |  0
 packages/{form => forms}/scripts/prebuild.mjs |  0
 .../{form => forms}/src/form/BaseForm.vue     |  2 +-
 packages/{form => forms}/src/form/Form.d.ts   |  0
 packages/{form => forms}/src/form/Form.vue    |  2 +-
 .../{form => forms}/src/form/package.json     |  0
 .../src/form/style/FormStyle.d.ts             |  0
 .../src/form/style/FormStyle.js               |  0
 .../src/form/style/package.json               |  0
 .../src/formfield/BaseFormField.vue           |  2 +-
 .../src/formfield/FormField.d.ts              |  0
 .../src/formfield/FormField.vue               |  0
 .../src/formfield/package.json                |  0
 .../src/formfield/style/FormFieldStyle.d.ts   |  0
 .../src/formfield/style/FormFieldStyle.js     |  0
 .../src/formfield/style/package.json          |  0
 packages/forms/src/index.d.ts                 |  5 +++
 packages/forms/src/index.js                   |  5 +++
 .../{form => forms}/src/resolvers/index.d.ts  |  0
 .../{form => forms}/src/resolvers/index.js    |  0
 .../src/resolvers/package.json                |  0
 .../{form => forms}/src/useform/index.d.ts    |  0
 packages/{form => forms}/src/useform/index.js |  0
 .../{form => forms}/src/useform/package.json  |  0
 packages/{form => forms}/tsconfig.json        |  2 +-
 packages/metadata/src/components/index.ts     |  4 +-
 packages/primevue/package.json                |  2 +-
 pnpm-lock.yaml                                |  6 +--
 63 files changed, 127 insertions(+), 125 deletions(-)
 delete mode 100644 packages/form/README.md
 create mode 100644 packages/forms/README.md
 rename packages/{form => forms}/package.json (54%)
 rename packages/{form => forms}/rollup.config.mjs (96%)
 rename packages/{form => forms}/scripts/postbuild.mjs (100%)
 rename packages/{form => forms}/scripts/prebuild.mjs (100%)
 rename packages/{form => forms}/src/form/BaseForm.vue (94%)
 rename packages/{form => forms}/src/form/Form.d.ts (100%)
 rename packages/{form => forms}/src/form/Form.vue (94%)
 rename packages/{form => forms}/src/form/package.json (100%)
 rename packages/{form => forms}/src/form/style/FormStyle.d.ts (100%)
 rename packages/{form => forms}/src/form/style/FormStyle.js (100%)
 rename packages/{form => forms}/src/form/style/package.json (100%)
 rename packages/{form => forms}/src/formfield/BaseFormField.vue (95%)
 rename packages/{form => forms}/src/formfield/FormField.d.ts (100%)
 rename packages/{form => forms}/src/formfield/FormField.vue (100%)
 rename packages/{form => forms}/src/formfield/package.json (100%)
 rename packages/{form => forms}/src/formfield/style/FormFieldStyle.d.ts (100%)
 rename packages/{form => forms}/src/formfield/style/FormFieldStyle.js (100%)
 rename packages/{form => forms}/src/formfield/style/package.json (100%)
 create mode 100644 packages/forms/src/index.d.ts
 create mode 100644 packages/forms/src/index.js
 rename packages/{form => forms}/src/resolvers/index.d.ts (100%)
 rename packages/{form => forms}/src/resolvers/index.js (100%)
 rename packages/{form => forms}/src/resolvers/package.json (100%)
 rename packages/{form => forms}/src/useform/index.d.ts (100%)
 rename packages/{form => forms}/src/useform/index.js (100%)
 rename packages/{form => forms}/src/useform/package.json (100%)
 rename packages/{form => forms}/tsconfig.json (93%)

diff --git a/apps/showcase/components/doc/codeeditor/templates.js b/apps/showcase/components/doc/codeeditor/templates.js
index b45b8897d..ee093288f 100644
--- a/apps/showcase/components/doc/codeeditor/templates.js
+++ b/apps/showcase/components/doc/codeeditor/templates.js
@@ -16,7 +16,7 @@ const core_dependencies = {
     primevue: pkg.version || PrimeVue.version || 'latest',
     '@primevue/themes': pkg.version || PrimeVue.version || 'latest',
     '@primevue/auto-import-resolver': pkg.version || PrimeVue.version || 'latest',
-    '@primevue/form': pkg.version || PrimeVue.version || 'latest',
+    '@primevue/forms': pkg.version || PrimeVue.version || 'latest',
     primeicons: app_dependencies['primeicons'] || 'latest',
     tailwindcss: app_dependencies['tailwindcss'] || 'latest',
     autoprefixer: app_dependencies['autoprefixer'] || 'latest',
diff --git a/apps/showcase/doc/autocomplete/FormsDoc.vue b/apps/showcase/doc/autocomplete/FormsDoc.vue
index 2ebf50de0..dcf30adcc 100644
--- a/apps/showcase/doc/autocomplete/FormsDoc.vue
+++ b/apps/showcase/doc/autocomplete/FormsDoc.vue
@@ -16,7 +16,7 @@
 
 <script>
 import { CountryService } from '@/service/CountryService';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -63,7 +63,7 @@ export default {
 
 <script>
 import { CountryService } from '@/service/CountryService';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -127,7 +127,7 @@ export default {
 
 <script setup>
 import { ref, onMounted } from "vue";
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 import { CountryService } from "@/service/CountryService";
diff --git a/apps/showcase/doc/cascadeselect/FormsDoc.vue b/apps/showcase/doc/cascadeselect/FormsDoc.vue
index 72e373504..b4179dbd7 100644
--- a/apps/showcase/doc/cascadeselect/FormsDoc.vue
+++ b/apps/showcase/doc/cascadeselect/FormsDoc.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -251,7 +251,7 @@ export default {
 
 <script setup>
 import { ref } from "vue";
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/checkbox/FormsDoc.vue b/apps/showcase/doc/checkbox/FormsDoc.vue
index 1c89f95a2..5599318fe 100644
--- a/apps/showcase/doc/checkbox/FormsDoc.vue
+++ b/apps/showcase/doc/checkbox/FormsDoc.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -105,7 +105,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -165,7 +165,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/colorpicker/FormsDoc.vue b/apps/showcase/doc/colorpicker/FormsDoc.vue
index cfd82cc23..34691536c 100644
--- a/apps/showcase/doc/colorpicker/FormsDoc.vue
+++ b/apps/showcase/doc/colorpicker/FormsDoc.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -53,7 +53,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -95,7 +95,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/datepicker/FormsDoc.vue b/apps/showcase/doc/datepicker/FormsDoc.vue
index 541dae93e..03cf882e4 100644
--- a/apps/showcase/doc/datepicker/FormsDoc.vue
+++ b/apps/showcase/doc/datepicker/FormsDoc.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -59,7 +59,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -107,7 +107,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/editor/FormsDoc.vue b/apps/showcase/doc/editor/FormsDoc.vue
index 2c47fe720..e908fceea 100644
--- a/apps/showcase/doc/editor/FormsDoc.vue
+++ b/apps/showcase/doc/editor/FormsDoc.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -53,7 +53,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -95,7 +95,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/forms/RegisterDoc.vue b/apps/showcase/doc/forms/RegisterDoc.vue
index 9838a8bbf..9aa6c0b5c 100644
--- a/apps/showcase/doc/forms/RegisterDoc.vue
+++ b/apps/showcase/doc/forms/RegisterDoc.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -57,7 +57,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -106,7 +106,7 @@ input {
 
 <script setup>
 import { reactive } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 import { useToast } from 'primevue/usetoast';
 
diff --git a/apps/showcase/doc/forms/ResolversDoc.vue b/apps/showcase/doc/forms/ResolversDoc.vue
index 135739196..34a41024f 100644
--- a/apps/showcase/doc/forms/ResolversDoc.vue
+++ b/apps/showcase/doc/forms/ResolversDoc.vue
@@ -4,7 +4,7 @@
             Validations are implemented the with <i>resolver</i> property. A custom resolver is responsible for handling the validation and returning an <i>errors</i> object with key-value pairs where key is the form field name and value is an array
             of error object data. For productivity, we recommend using a schema validation library instead of building your own custom validation logic. The forms library provide built-in resolvers for popular options including
             <a href="https://zod.dev/">Zod</a>, <a href="https://github.com/jquense/yup">Yup</a>, <a href="https://joi.dev/">Joi</a>, <a href="https://valibot.dev/">Valibot</a>, and <a href="https://docs.superstructjs.org/">Superstruct</a> that can
-            be be imported from <i>@primevue/form/resolvers</i> path.
+            be be imported from <i>@primevue/forms/resolvers</i> path.
         </p>
     </DocSectionText>
     <div class="card flex flex-col items-center gap-5">
@@ -45,7 +45,7 @@
 </template>
 
 <script>
-import { superStructResolver, valibotResolver, yupResolver, zodResolver } from '@primevue/form/resolvers';
+import { superStructResolver, valibotResolver, yupResolver, zodResolver } from '@primevue/forms/resolvers';
 import * as s from 'superstruct';
 import * as v from 'valibot';
 import * as yup from 'yup';
@@ -114,7 +114,7 @@ export default {
 </template>
 
 <script>
-import { superStructResolver, valibotResolver, yupResolver, zodResolver } from '@primevue/form/resolvers';
+import { superStructResolver, valibotResolver, yupResolver, zodResolver } from '@primevue/forms/resolvers';
 import * as s from 'superstruct';
 import * as v from 'valibot';
 import * as yup from 'yup';
@@ -225,7 +225,7 @@ export default {
 
 <script setup>
 import { ref, watch } from 'vue';
-import { superStructResolver, valibotResolver, yupResolver, zodResolver } from '@primevue/form/resolvers';
+import { superStructResolver, valibotResolver, yupResolver, zodResolver } from '@primevue/forms/resolvers';
 import * as s from 'superstruct';
 import * as v from 'valibot';
 import * as yup from 'yup';
diff --git a/apps/showcase/doc/forms/SubmitDoc.vue b/apps/showcase/doc/forms/SubmitDoc.vue
index 4b60bb8a5..c385599b4 100644
--- a/apps/showcase/doc/forms/SubmitDoc.vue
+++ b/apps/showcase/doc/forms/SubmitDoc.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -96,7 +96,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -168,7 +168,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 import { useToast } from 'primevue/usetoast';
 
diff --git a/apps/showcase/doc/forms/dynamic/DynamicForm.vue b/apps/showcase/doc/forms/dynamic/DynamicForm.vue
index 37325b71c..9ea4e02fe 100644
--- a/apps/showcase/doc/forms/dynamic/DynamicForm.vue
+++ b/apps/showcase/doc/forms/dynamic/DynamicForm.vue
@@ -15,7 +15,7 @@
 
 <script setup>
 import { isNotEmpty } from '@primeuix/utils';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 import DynamicFormControl from './DynamicFormControl.vue';
 import DynamicFormField from './DynamicFormField.vue';
diff --git a/apps/showcase/doc/forms/pt/PTViewer.vue b/apps/showcase/doc/forms/pt/PTViewer.vue
index ab78888fe..375195bf9 100644
--- a/apps/showcase/doc/forms/pt/PTViewer.vue
+++ b/apps/showcase/doc/forms/pt/PTViewer.vue
@@ -12,7 +12,7 @@
 
 <script>
 import { getPTOptions } from '@/components/doc/helpers';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
diff --git a/apps/showcase/doc/inputmask/FormsDoc.vue b/apps/showcase/doc/inputmask/FormsDoc.vue
index c7a319cdd..e28f5856e 100644
--- a/apps/showcase/doc/inputmask/FormsDoc.vue
+++ b/apps/showcase/doc/inputmask/FormsDoc.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -53,7 +53,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -95,7 +95,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/inputnumber/FormsDoc.vue b/apps/showcase/doc/inputnumber/FormsDoc.vue
index 211d7b08c..bdf4c16b7 100644
--- a/apps/showcase/doc/inputnumber/FormsDoc.vue
+++ b/apps/showcase/doc/inputnumber/FormsDoc.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -53,7 +53,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -95,7 +95,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/inputotp/FormsDoc.vue b/apps/showcase/doc/inputotp/FormsDoc.vue
index 9eedb9166..92714ad5b 100644
--- a/apps/showcase/doc/inputotp/FormsDoc.vue
+++ b/apps/showcase/doc/inputotp/FormsDoc.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -53,7 +53,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -95,7 +95,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/inputtext/FormsDoc.vue b/apps/showcase/doc/inputtext/FormsDoc.vue
index 888470f92..f0eecc937 100644
--- a/apps/showcase/doc/inputtext/FormsDoc.vue
+++ b/apps/showcase/doc/inputtext/FormsDoc.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -67,7 +67,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -115,7 +115,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/knob/FormsDoc.vue b/apps/showcase/doc/knob/FormsDoc.vue
index 3eff564a3..5854c9f90 100644
--- a/apps/showcase/doc/knob/FormsDoc.vue
+++ b/apps/showcase/doc/knob/FormsDoc.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -54,7 +54,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -97,7 +97,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/listbox/FormsDoc.vue b/apps/showcase/doc/listbox/FormsDoc.vue
index 36969e106..300c77206 100644
--- a/apps/showcase/doc/listbox/FormsDoc.vue
+++ b/apps/showcase/doc/listbox/FormsDoc.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -65,7 +65,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -119,7 +119,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/multiselect/FormsDoc.vue b/apps/showcase/doc/multiselect/FormsDoc.vue
index 4405084a7..936806cea 100644
--- a/apps/showcase/doc/multiselect/FormsDoc.vue
+++ b/apps/showcase/doc/multiselect/FormsDoc.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -64,7 +64,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -119,7 +119,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/password/FormsDoc.vue b/apps/showcase/doc/password/FormsDoc.vue
index 0b5f2c86c..380a35621 100644
--- a/apps/showcase/doc/password/FormsDoc.vue
+++ b/apps/showcase/doc/password/FormsDoc.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -71,7 +71,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -127,7 +127,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/radiobutton/FormsDoc.vue b/apps/showcase/doc/radiobutton/FormsDoc.vue
index 9e24d5c04..65f4bbbf6 100644
--- a/apps/showcase/doc/radiobutton/FormsDoc.vue
+++ b/apps/showcase/doc/radiobutton/FormsDoc.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -104,7 +104,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -163,7 +163,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/rating/FormsDoc.vue b/apps/showcase/doc/rating/FormsDoc.vue
index b1330ee11..3a8bac26e 100644
--- a/apps/showcase/doc/rating/FormsDoc.vue
+++ b/apps/showcase/doc/rating/FormsDoc.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -53,7 +53,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -95,7 +95,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/select/FormsDoc.vue b/apps/showcase/doc/select/FormsDoc.vue
index 337f4a948..1b3f0de28 100644
--- a/apps/showcase/doc/select/FormsDoc.vue
+++ b/apps/showcase/doc/select/FormsDoc.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -63,7 +63,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -116,7 +116,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/selectbutton/FormsDoc.vue b/apps/showcase/doc/selectbutton/FormsDoc.vue
index 5452dc34a..da88e33c5 100644
--- a/apps/showcase/doc/selectbutton/FormsDoc.vue
+++ b/apps/showcase/doc/selectbutton/FormsDoc.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -54,7 +54,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -97,7 +97,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/slider/FormsDoc.vue b/apps/showcase/doc/slider/FormsDoc.vue
index e5f4a4ef2..208b58004 100644
--- a/apps/showcase/doc/slider/FormsDoc.vue
+++ b/apps/showcase/doc/slider/FormsDoc.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -53,7 +53,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -95,7 +95,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/textarea/FormsDoc.vue b/apps/showcase/doc/textarea/FormsDoc.vue
index 4e1c65cc5..5a61fbe4b 100644
--- a/apps/showcase/doc/textarea/FormsDoc.vue
+++ b/apps/showcase/doc/textarea/FormsDoc.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -53,7 +53,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -95,7 +95,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/togglebutton/FormsDoc.vue b/apps/showcase/doc/togglebutton/FormsDoc.vue
index 7fcde275c..d7850c12a 100644
--- a/apps/showcase/doc/togglebutton/FormsDoc.vue
+++ b/apps/showcase/doc/togglebutton/FormsDoc.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -53,7 +53,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -95,7 +95,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/toggleswitch/FormsDoc.vue b/apps/showcase/doc/toggleswitch/FormsDoc.vue
index 92e3f62b8..64d651e35 100644
--- a/apps/showcase/doc/toggleswitch/FormsDoc.vue
+++ b/apps/showcase/doc/toggleswitch/FormsDoc.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -53,7 +53,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 
 export default {
@@ -95,7 +95,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 
diff --git a/apps/showcase/doc/treeselect/FormsDoc.vue b/apps/showcase/doc/treeselect/FormsDoc.vue
index 6a9c28158..e5c93c5f3 100644
--- a/apps/showcase/doc/treeselect/FormsDoc.vue
+++ b/apps/showcase/doc/treeselect/FormsDoc.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 import { NodeService } from '/service/NodeService';
 
@@ -55,7 +55,7 @@ export default {
 </template>
 
 <script>
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { z } from 'zod';
 import { NodeService } from '/service/NodeService';
 
@@ -99,7 +99,7 @@ export default {
 
 <script setup>
 import { ref } from 'vue';
-import { zodResolver } from '@primevue/form/resolvers';
+import { zodResolver } from '@primevue/forms/resolvers';
 import { useToast } from "primevue/usetoast";
 import { z } from 'zod';
 import { NodeService } from '/service/NodeService';
diff --git a/apps/showcase/package.json b/apps/showcase/package.json
index db7d54352..13ffb3259 100644
--- a/apps/showcase/package.json
+++ b/apps/showcase/package.json
@@ -56,7 +56,7 @@
         "@primevue/core": "workspace:*",
         "@primevue/nuxt-module": "workspace:*",
         "@primevue/themes": "workspace:*",
-        "@primevue/form": "workspace:*",
+        "@primevue/forms": "workspace:*",
         "yup": "1.4.0",
         "zod": "3.23.8",
         "valibot": "^0.42.1",
@@ -69,4 +69,4 @@
     "engines": {
         "node": ">=12.11.0"
     }
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 1fbedf2fe..1565de380 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
         "release:rc": "pnpm run build && pnpm recursive publish --filter './packages/*' --no-git-checks --report-summary --tag rc",
         "build": "NODE_ENV=production pnpm run build:check && pnpm run build:packages",
         "build:check": "pnpm run format:check && pnpm run security:check",
-        "build:packages": "pnpm run build:metadata && pnpm run build:resolver && pnpm run build:core && pnpm run build:lib && pnpm run build:module && pnpm run build:themes && pnpm run build:icons && pnpm run build:form && pnpm run build:showcase",
+        "build:packages": "pnpm run build:metadata && pnpm run build:resolver && pnpm run build:core && pnpm run build:lib && pnpm run build:module && pnpm run build:themes && pnpm run build:icons && pnpm run build:forms && pnpm run build:showcase",
         "build:resolver": "pnpm --filter auto-import-resolver build",
         "build:core": "pnpm --filter core build",
         "build:metadata": "pnpm --filter metadata build",
@@ -27,7 +27,7 @@
         "build:lib": "pnpm --filter primevue build",
         "build:themes": "pnpm --filter themes build",
         "build:icons": "pnpm --filter icons build",
-        "build:form": "pnpm --filter form build",
+        "build:forms": "pnpm --filter forms build",
         "build:showcase": "pnpm --filter showcase build",
         "build:apidoc": "pnpm --filter themes build:tokens && pnpm --filter showcase build:apidoc",
         "dev": "pnpm --filter showcase dev",
diff --git a/packages/form/README.md b/packages/form/README.md
deleted file mode 100644
index 3848b9012..000000000
--- a/packages/form/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# PrimeVue Form
diff --git a/packages/forms/README.md b/packages/forms/README.md
new file mode 100644
index 000000000..4bd0e9b37
--- /dev/null
+++ b/packages/forms/README.md
@@ -0,0 +1 @@
+# PrimeVue Forms
diff --git a/packages/form/package.json b/packages/forms/package.json
similarity index 54%
rename from packages/form/package.json
rename to packages/forms/package.json
index 29a79a5c7..68472ab3a 100644
--- a/packages/form/package.json
+++ b/packages/forms/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "@primevue/form",
+    "name": "@primevue/forms",
     "version": "4.1.1",
     "author": "PrimeTek Informatics",
     "description": "",
@@ -8,44 +8,36 @@
     "repository": {
         "type": "git",
         "url": "https://github.com/primefaces/primevue.git",
-        "directory": "packages/form"
+        "directory": "packages/forms"
     },
     "bugs": {
         "url": "https://github.com/primefaces/primevue/issues"
     },
-    "main": "./src/form/Form.vue",
-    "types": "./src/form/Form.d.ts",
+    "main": "./src/index.js",
+    "module": "./src/index.js",
+    "types": "./src/index.d.ts",
     "exports": {
-        ".": "./src/form/Form.vue",
-        "./style": "./src/form/style/FormStyle.js",
-        "./field": "./src/formfield/FormField.vue",
-        "./field/style": "./src/formfield/style/FormFieldStyle.js",
+        ".": "./src/index.js",
+        "./form": "./src/form/Form.vue",
+        "./form/style": "./src/form/style/FormStyle.js",
+        "./formfield": "./src/formfield/FormField.vue",
+        "./formfield/style": "./src/formfield/style/FormFieldStyle.js",
         "./*": "./src/*/index.js"
     },
     "publishConfig": {
-        "main": "./form/index.mjs",
-        "module": "./form/index.mjs",
-        "types": "./form/index.d.ts",
+        "main": "./index.mjs",
+        "module": "./index.mjs",
+        "types": "./index.d.ts",
         "exports": {
             ".": {
-                "types": "./form/index.d.ts",
-                "import": "./form/index.mjs"
-            },
-            "./style": {
-                "types": "./form/style/index.d.ts",
-                "import": "./form/style/index.mjs"
-            },
-            "./field": {
-                "types": "./formfield/index.d.ts",
-                "import": "./formfield/index.mjs"
-            },
-            "./field/style": {
-                "types": "./formfield/style/index.d.ts",
-                "import": "./formfield/style/index.mjs"
+                "types": "./index.d.ts",
+                "import": "./index.mjs",
+                "default": "./index.mjs"
             },
             "./*": {
                 "types": "./*/index.d.ts",
-                "import": "./*/index.mjs"
+                "import": "./*/index.mjs",
+                "default": "./*/index.mjs"
             }
         },
         "directory": "dist",
diff --git a/packages/form/rollup.config.mjs b/packages/forms/rollup.config.mjs
similarity index 96%
rename from packages/form/rollup.config.mjs
rename to packages/forms/rollup.config.mjs
index 1823777af..acac2d975 100644
--- a/packages/form/rollup.config.mjs
+++ b/packages/forms/rollup.config.mjs
@@ -25,7 +25,7 @@ const EXTERNALS = [...GLOBAL_EXTERNALS, ...INLINE_EXTERNALS];
 // alias
 const ALIAS_ENTRIES = [
     {
-        find: /^@primevue\/form\/(.*)$/,
+        find: /^@primevue\/forms\/(.*)$/,
         replacement: path.resolve(__dirname, './src/$1'),
         customResolver(source, importer) {
             const basedir = path.dirname(importer);
@@ -43,8 +43,8 @@ const ALIAS_ENTRIES = [
             return targetFile ? path.join(folderPath, targetFile) : null;
         }
     },
-    { find: '@primevue/form/resolvers', replacement: path.resolve(__dirname, './src/resolvers/index.js') },
-    { find: '@primevue/form/useform', replacement: path.resolve(__dirname, './src/useform/index.js') }
+    { find: '@primevue/forms/resolvers', replacement: path.resolve(__dirname, './src/resolvers/index.js') },
+    { find: '@primevue/forms/useform', replacement: path.resolve(__dirname, './src/useform/index.js') }
 ];
 
 // plugins
diff --git a/packages/form/scripts/postbuild.mjs b/packages/forms/scripts/postbuild.mjs
similarity index 100%
rename from packages/form/scripts/postbuild.mjs
rename to packages/forms/scripts/postbuild.mjs
diff --git a/packages/form/scripts/prebuild.mjs b/packages/forms/scripts/prebuild.mjs
similarity index 100%
rename from packages/form/scripts/prebuild.mjs
rename to packages/forms/scripts/prebuild.mjs
diff --git a/packages/form/src/form/BaseForm.vue b/packages/forms/src/form/BaseForm.vue
similarity index 94%
rename from packages/form/src/form/BaseForm.vue
rename to packages/forms/src/form/BaseForm.vue
index b976af2d6..01f205a4e 100644
--- a/packages/form/src/form/BaseForm.vue
+++ b/packages/forms/src/form/BaseForm.vue
@@ -1,6 +1,6 @@
 <script>
 import BaseComponent from '@primevue/core/basecomponent';
-import FormStyle from '@primevue/form/style';
+import FormStyle from '@primevue/forms/form/style';
 
 export default {
     name: 'BaseForm',
diff --git a/packages/form/src/form/Form.d.ts b/packages/forms/src/form/Form.d.ts
similarity index 100%
rename from packages/form/src/form/Form.d.ts
rename to packages/forms/src/form/Form.d.ts
diff --git a/packages/form/src/form/Form.vue b/packages/forms/src/form/Form.vue
similarity index 94%
rename from packages/form/src/form/Form.vue
rename to packages/forms/src/form/Form.vue
index b9c57c750..88af0f38f 100644
--- a/packages/form/src/form/Form.vue
+++ b/packages/forms/src/form/Form.vue
@@ -6,7 +6,7 @@
 
 <script>
 import { omit } from '@primeuix/utils';
-import { useForm } from '@primevue/form/useform';
+import { useForm } from '@primevue/forms/useform';
 import BaseForm from './BaseForm.vue';
 
 export default {
diff --git a/packages/form/src/form/package.json b/packages/forms/src/form/package.json
similarity index 100%
rename from packages/form/src/form/package.json
rename to packages/forms/src/form/package.json
diff --git a/packages/form/src/form/style/FormStyle.d.ts b/packages/forms/src/form/style/FormStyle.d.ts
similarity index 100%
rename from packages/form/src/form/style/FormStyle.d.ts
rename to packages/forms/src/form/style/FormStyle.d.ts
diff --git a/packages/form/src/form/style/FormStyle.js b/packages/forms/src/form/style/FormStyle.js
similarity index 100%
rename from packages/form/src/form/style/FormStyle.js
rename to packages/forms/src/form/style/FormStyle.js
diff --git a/packages/form/src/form/style/package.json b/packages/forms/src/form/style/package.json
similarity index 100%
rename from packages/form/src/form/style/package.json
rename to packages/forms/src/form/style/package.json
diff --git a/packages/form/src/formfield/BaseFormField.vue b/packages/forms/src/formfield/BaseFormField.vue
similarity index 95%
rename from packages/form/src/formfield/BaseFormField.vue
rename to packages/forms/src/formfield/BaseFormField.vue
index 97868d47b..02fa17c7e 100644
--- a/packages/form/src/formfield/BaseFormField.vue
+++ b/packages/forms/src/formfield/BaseFormField.vue
@@ -1,6 +1,6 @@
 <script>
 import BaseComponent from '@primevue/core/basecomponent';
-import FormFieldStyle from '@primevue/form/field/style';
+import FormFieldStyle from '@primevue/forms/field/style';
 
 export default {
     name: 'BaseFormField',
diff --git a/packages/form/src/formfield/FormField.d.ts b/packages/forms/src/formfield/FormField.d.ts
similarity index 100%
rename from packages/form/src/formfield/FormField.d.ts
rename to packages/forms/src/formfield/FormField.d.ts
diff --git a/packages/form/src/formfield/FormField.vue b/packages/forms/src/formfield/FormField.vue
similarity index 100%
rename from packages/form/src/formfield/FormField.vue
rename to packages/forms/src/formfield/FormField.vue
diff --git a/packages/form/src/formfield/package.json b/packages/forms/src/formfield/package.json
similarity index 100%
rename from packages/form/src/formfield/package.json
rename to packages/forms/src/formfield/package.json
diff --git a/packages/form/src/formfield/style/FormFieldStyle.d.ts b/packages/forms/src/formfield/style/FormFieldStyle.d.ts
similarity index 100%
rename from packages/form/src/formfield/style/FormFieldStyle.d.ts
rename to packages/forms/src/formfield/style/FormFieldStyle.d.ts
diff --git a/packages/form/src/formfield/style/FormFieldStyle.js b/packages/forms/src/formfield/style/FormFieldStyle.js
similarity index 100%
rename from packages/form/src/formfield/style/FormFieldStyle.js
rename to packages/forms/src/formfield/style/FormFieldStyle.js
diff --git a/packages/form/src/formfield/style/package.json b/packages/forms/src/formfield/style/package.json
similarity index 100%
rename from packages/form/src/formfield/style/package.json
rename to packages/forms/src/formfield/style/package.json
diff --git a/packages/forms/src/index.d.ts b/packages/forms/src/index.d.ts
new file mode 100644
index 000000000..27d157d20
--- /dev/null
+++ b/packages/forms/src/index.d.ts
@@ -0,0 +1,5 @@
+export { default as Form } from '@primevue/forms/form';
+export { default as FormStyle } from '@primevue/forms/form/style';
+
+export { default as FormField } from '@primevue/forms/formfield';
+export { default as FormFieldStyle } from '@primevue/forms/formfield/style';
diff --git a/packages/forms/src/index.js b/packages/forms/src/index.js
new file mode 100644
index 000000000..27d157d20
--- /dev/null
+++ b/packages/forms/src/index.js
@@ -0,0 +1,5 @@
+export { default as Form } from '@primevue/forms/form';
+export { default as FormStyle } from '@primevue/forms/form/style';
+
+export { default as FormField } from '@primevue/forms/formfield';
+export { default as FormFieldStyle } from '@primevue/forms/formfield/style';
diff --git a/packages/form/src/resolvers/index.d.ts b/packages/forms/src/resolvers/index.d.ts
similarity index 100%
rename from packages/form/src/resolvers/index.d.ts
rename to packages/forms/src/resolvers/index.d.ts
diff --git a/packages/form/src/resolvers/index.js b/packages/forms/src/resolvers/index.js
similarity index 100%
rename from packages/form/src/resolvers/index.js
rename to packages/forms/src/resolvers/index.js
diff --git a/packages/form/src/resolvers/package.json b/packages/forms/src/resolvers/package.json
similarity index 100%
rename from packages/form/src/resolvers/package.json
rename to packages/forms/src/resolvers/package.json
diff --git a/packages/form/src/useform/index.d.ts b/packages/forms/src/useform/index.d.ts
similarity index 100%
rename from packages/form/src/useform/index.d.ts
rename to packages/forms/src/useform/index.d.ts
diff --git a/packages/form/src/useform/index.js b/packages/forms/src/useform/index.js
similarity index 100%
rename from packages/form/src/useform/index.js
rename to packages/forms/src/useform/index.js
diff --git a/packages/form/src/useform/package.json b/packages/forms/src/useform/package.json
similarity index 100%
rename from packages/form/src/useform/package.json
rename to packages/forms/src/useform/package.json
diff --git a/packages/form/tsconfig.json b/packages/forms/tsconfig.json
similarity index 93%
rename from packages/form/tsconfig.json
rename to packages/forms/tsconfig.json
index 8a364744c..7057f72c6 100644
--- a/packages/form/tsconfig.json
+++ b/packages/forms/tsconfig.json
@@ -16,7 +16,7 @@
         "incremental": true,
         "baseUrl": ".",
         "paths": {
-            "@primevue/form/*": ["./src/*"],
+            "@primevue/forms/*": ["./src/*"],
             "@primevue/core/*": ["../../packages/core/src/*"]
         }
     },
diff --git a/packages/metadata/src/components/index.ts b/packages/metadata/src/components/index.ts
index 1fdaa7d63..ab021a40d 100644
--- a/packages/metadata/src/components/index.ts
+++ b/packages/metadata/src/components/index.ts
@@ -97,8 +97,8 @@ export const media: MetaType[] = toMeta(['Carousel', 'Galleria', 'Image', 'Image
 export const misc: MetaType[] = toMeta(['Avatar', 'AvatarGroup', 'Badge', 'BlockUI', 'Chip', 'Inplace', 'MeterGroup', 'OverlayBadge', 'ScrollTop', 'Skeleton', 'ProgressBar', 'ProgressSpinner', 'Tag', 'Terminal']);
 
 export const extensions: MetaType[] = toMeta([
-    { name: 'Form', from: '@primevue/form' },
-    { name: 'FormField', from: '@primevue/form/field' }
+    { name: 'Form', from: '@primevue/forms/form' },
+    { name: 'FormField', from: '@primevue/forms/formfield' }
 ]);
 
 // All PrimeVue Components
diff --git a/packages/primevue/package.json b/packages/primevue/package.json
index 2ca4b64a1..a89c3c682 100644
--- a/packages/primevue/package.json
+++ b/packages/primevue/package.json
@@ -347,4 +347,4 @@
     "engines": {
         "node": ">=12.11.0"
     }
-}
\ No newline at end of file
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8cbd02b5f..e6aa7b178 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -81,9 +81,9 @@ importers:
       '@primevue/core':
         specifier: workspace:*
         version: link:../../packages/core
-      '@primevue/form':
+      '@primevue/forms':
         specifier: workspace:*
-        version: link:../../packages/form
+        version: link:../../packages/forms
       '@primevue/nuxt-module':
         specifier: workspace:*
         version: link:../../packages/nuxt-module
@@ -175,7 +175,7 @@ importers:
         version: 3.5.12(typescript@5.6.3)
     publishDirectory: dist
 
-  packages/form:
+  packages/forms:
     dependencies:
       '@primeuix/form':
         specifier: 'catalog:'