diff --git a/packages/manager-tools/manager-pm/src/playbook/catalog/pnpm-catalog.json b/packages/manager-tools/manager-pm/src/playbook/catalog/pnpm-catalog.json index e98df39b365c..f52ee2134a24 100644 --- a/packages/manager-tools/manager-pm/src/playbook/catalog/pnpm-catalog.json +++ b/packages/manager-tools/manager-pm/src/playbook/catalog/pnpm-catalog.json @@ -1,5 +1,6 @@ [ "packages/manager/apps/web-office", "packages/manager/apps/zimbra", - "packages/manager/apps/pci-instances" + "packages/manager/apps/pci-instances", + "packages/manager/apps/web-hosting" ] diff --git a/packages/manager-tools/manager-pm/src/playbook/catalog/yarn-catalog.json b/packages/manager-tools/manager-pm/src/playbook/catalog/yarn-catalog.json index 8e1eea6a404f..a3a12daad768 100644 --- a/packages/manager-tools/manager-pm/src/playbook/catalog/yarn-catalog.json +++ b/packages/manager-tools/manager-pm/src/playbook/catalog/yarn-catalog.json @@ -72,7 +72,6 @@ "packages/manager/apps/vrack-services", "packages/manager/apps/web", "packages/manager/apps/web-domains", - "packages/manager/apps/web-hosting", "packages/manager/apps/web-ongoing-operations", "packages/manager/core/api", "packages/manager/core/application", diff --git a/packages/manager/apps/web-hosting/package.json b/packages/manager/apps/web-hosting/package.json index e45b23a25168..6652f6107e03 100644 --- a/packages/manager/apps/web-hosting/package.json +++ b/packages/manager/apps/web-hosting/package.json @@ -20,34 +20,34 @@ "test:coverage": "manager-test run --coverage" }, "dependencies": { - "@hookform/resolvers": "^5.0.1", + "@hookform/resolvers": "5.0.1", "@ovh-ux/manager-common-translations": "^0.21.0", "@ovh-ux/manager-config": "^8.6.7", - "@ovh-ux/manager-core-api": "^0.11.1", + "@ovh-ux/manager-core-api": "^0.19.0", "@ovh-ux/manager-core-utils": "^0.4.6", - "@ovh-ux/manager-react-components": "^2.43.1", + "@ovh-ux/manager-react-components": "2.43.1", "@ovh-ux/manager-react-core-application": "^0.12.10", "@ovh-ux/manager-react-shell-client": "^0.11.1", "@ovh-ux/manager-tailwind-config": "^0.5.6", "@ovh-ux/request-tagger": "^0.5.6", "@ovh-ux/shell": "^4.7.12", - "@ovhcloud/ods-components": "^18.6.2", - "@ovhcloud/ods-themes": "^18.6.2", - "@tanstack/react-query": "^5.51.21", - "@tanstack/react-table": "^8.20.1", + "@ovhcloud/ods-components": "18.6.2", + "@ovhcloud/ods-themes": "18.6.2", + "@tanstack/react-query": "5.51.21", + "@tanstack/react-table": "8.20.1", "clsx": "2.1.1", "export-to-csv": "^1.4.0", - "i18next": "^23.8.2", - "i18next-http-backend": "^2.5.0", + "i18next": "23.8.2", + "i18next-http-backend": "2.7.3", "ipaddr.js": "^1.9.1", "p-limit": "^6.2.0", "punycode": "^2.3.1", - "react": "^18.2.0", - "react-dom": "^18.2.0", - "react-hook-form": "^7.55.0", - "react-i18next": "^14.0.5", - "react-router-dom": "^6.3.0", - "react-use": "^17.5.0", + "react": "18.2.0", + "react-dom": "18.2.0", + "react-hook-form": "7.56.0", + "react-i18next": "14.1.0", + "react-router-dom": "6.16.0", + "react-use": "17.5.0", "tailwindcss": "^3.4.4", "zod": "^3.24.2" }, @@ -55,10 +55,10 @@ "@ovh-ux/manager-static-analysis-kit": "^0.11.2", "@ovh-ux/manager-tests-setup": "latest", "@ovh-ux/manager-vite-config": "^0.14.0", - "@tanstack/react-query-devtools": "^5.51.21", - "@types/jest": "^29.5.12", - "@types/react": "^18.2.55", - "@types/react-dom": "^18.2.19" + "@tanstack/react-query-devtools": "5.51.21", + "@types/jest": "29.5.12", + "@types/react": "18.2.55", + "@types/react-dom": "18.3.0" }, "regions": [ "EU", diff --git a/packages/manager/apps/web-hosting/src/pages/dashboard/ssl/manage/disableSsl.page.spec.tsx b/packages/manager/apps/web-hosting/src/pages/dashboard/ssl/manage/disableSsl.page.spec.tsx index a871f36f8137..266f5e573cd2 100644 --- a/packages/manager/apps/web-hosting/src/pages/dashboard/ssl/manage/disableSsl.page.spec.tsx +++ b/packages/manager/apps/web-hosting/src/pages/dashboard/ssl/manage/disableSsl.page.spec.tsx @@ -9,11 +9,18 @@ import DisableSslModal from './disableSsl.page'; const { mockDelete } = vi.hoisted(() => ({ mockDelete: vi.fn(), })); -vi.mock('@ovh-ux/manager-core-api', () => ({ - v6: { - delete: mockDelete, +vi.mock( + '@ovh-ux/manager-core-api', + async (importOriginal: () => Promise) => { + const actual = await importOriginal(); + return { + ...actual, + v6: { + delete: mockDelete, + }, + }; }, -})); +); const queryClient = new QueryClient(); diff --git a/packages/manager/apps/web-hosting/vitest.config.js b/packages/manager/apps/web-hosting/vitest.config.js index 9776b9ff9577..795bda35b51c 100644 --- a/packages/manager/apps/web-hosting/vitest.config.js +++ b/packages/manager/apps/web-hosting/vitest.config.js @@ -2,6 +2,7 @@ import path from 'path'; import { createConfig, + defaultDedupedDependencies, defaultExcludedFiles, mergeConfig, sharedConfig, @@ -33,6 +34,7 @@ export default mergeConfig( mergeConfig, sharedConfig, resolve: { + dedupe: [...defaultDedupedDependencies], alias: { '@/public': path.resolve(__dirname, 'public'), '@': path.resolve(__dirname, 'src'), diff --git a/yarn.lock b/yarn.lock index b0f4cb73a477..77da63ec1dea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7436,15 +7436,6 @@ resolved "https://registry.npmjs.org/@ovh-ux/manager-common-translations/-/manager-common-translations-0.9.1.tgz#9e79e284f461fa5396d70cd7641f0e4c694bd115" integrity sha512-UJ/8hLplbB9qi+Nh4NoJO62PG0ZMBx9gZLJOsT83m1uL7trknY8ZOEuH5p3YWJwSbRc6G4mEHEwwsoG5w/zwiw== -"@ovh-ux/manager-core-api@^0.11.1": - version "0.11.1" - resolved "https://registry.yarnpkg.com/@ovh-ux/manager-core-api/-/manager-core-api-0.11.1.tgz#182cc03bd8532dcc08c09f1df7d34bb7ed349efe" - integrity sha512-RUXMD5Yp80ek7IjuKBTc3Qn/eJMVdbhsLJ/C4xOltHm2YcU5dy7FBDSUP6JCMrPV9J03w6aWIHPKsKs8fVRSuQ== - dependencies: - "@ovh-ux/manager-core-sso" "^0.3.1" - "@ovh-ux/request-tagger" "^0.4.1" - axios "^1.1.2" - "@ovh-ux/manager-core-api@^0.16.0": version "0.16.0" resolved "https://registry.yarnpkg.com/@ovh-ux/manager-core-api/-/manager-core-api-0.16.0.tgz#a59f178b52b96af26b60c8a20f7c734c0b140160" @@ -7454,7 +7445,7 @@ "@ovh-ux/request-tagger" "^0.4.1" axios "^1.1.2" -"@ovh-ux/manager-core-sso@^0.3.1", "@ovh-ux/manager-core-sso@^0.3.2": +"@ovh-ux/manager-core-sso@^0.3.2": version "0.3.3" resolved "https://registry.yarnpkg.com/@ovh-ux/manager-core-sso/-/manager-core-sso-0.3.3.tgz#138b5c1592c437c689ec4c523ddf0cc7aa26812e" integrity sha512-22M6BY5AkjzOFMATSg+EpoFXkxYKVbqI2hev7eD2EsfNRCnBINjXMWy9FDD0cXMuwkP7RwxbLuf8dAC4x+JZtA== @@ -20580,11 +20571,6 @@ exponential-backoff@^3.1.1: resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6" integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw== -export-to-csv@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/export-to-csv/-/export-to-csv-1.4.0.tgz#03fb42a4a4262cd03bde57a7b9bcad115149cf4b" - integrity sha512-6CX17Cu+rC2Fi2CyZ4CkgVG3hLl6BFsdAxfXiZkmDFIDY4mRx2y2spdeH6dqPHI9rP+AsHEfGeKz84Uuw7+Pmg== - express@^4.17.1, express@^4.17.3: version "4.20.0" resolved "https://registry.yarnpkg.com/express/-/express-4.20.0.tgz#f1d08e591fcec770c07be4767af8eb9bcfd67c48" @@ -22521,13 +22507,6 @@ i18next-http-backend@^2.4.2, i18next-http-backend@^2.4.3: dependencies: cross-fetch "4.0.0" -i18next-http-backend@^2.5.0: - version "2.7.3" - resolved "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-2.7.3.tgz#335e5884b4c5446cdb4817cb35e81ee4ac7be9f4" - integrity sha512-FgZxrXdRA5u44xfYsJlEBL4/KH3f2IluBpgV/7riW0YW2VEyM8FzVt2XHAOi6id0Ppj7vZvCZVpp5LrGXnc8Ig== - dependencies: - cross-fetch "4.0.0" - i18next-http-backend@^2.5.2: version "2.5.2" resolved "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-2.5.2.tgz#3d846cc239987fe7700d1cf0f17975807bfd25d3" @@ -27133,13 +27112,6 @@ p-limit@^5.0.0: dependencies: yocto-queue "^1.0.0" -p-limit@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-6.2.0.tgz#c254d22ba6aeef441a3564c5e6c2f2da59268a0f" - integrity sha512-kuUqqHNUqoIWp/c467RI4X6mmyuojY5jGutNU0wVTmEOOfcuwLqyMVoAi9MKi2Ak+5i9+nhmrK4ufZE8069kHA== - dependencies: - yocto-queue "^1.1.1" - p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" @@ -35137,11 +35109,6 @@ yocto-queue@^1.0.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251" integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g== -yocto-queue@^1.1.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.2.1.tgz#36d7c4739f775b3cbc28e6136e21aa057adec418" - integrity sha512-AyeEbWOu/TAXdxlV9wmGcR0+yh2j3vYPGOECcIj2S7MkrLyC7ne+oye2BKTItt0ii2PHk4cDy+95+LshzbXnGg== - yoctocolors-cjs@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz#f4b905a840a37506813a7acaa28febe97767a242"