fix(chore): update to remix v2 (#328)

package.json

@@ -5,9 +5,6 @@
   "private": true,
   "type": "module",
   "sideEffect": false,
-  "workspaces": [
-    "packages/*"
-  ],
   "scripts": {
     "format:write": "prettier --write .",
     "format:check": "prettier --check .",

packages/app-builder/package.json

@@ -18,7 +18,7 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@marble/eslint-config": "workspace:^",
+    "@marble/eslint-config": "workspace:*",
     "@remix-run/dev": "^2.4.1",
     "@segment/analytics-next": "^1.62.0",
     "@sentry/cli": "^2.23.2",
@@ -41,19 +41,27 @@
     "@conform-to/zod": "^0.9.1",
     "@hookform/devtools": "^4.3.1",
     "@hookform/resolvers": "^3.3.3",
+    "@radix-ui/react-accordion": "^1.1.2",
+    "@radix-ui/react-avatar": "^1.0.4",
+    "@radix-ui/react-checkbox": "^1.0.4",
+    "@radix-ui/react-collapsible": "^1.0.3",
     "@radix-ui/react-dialog": "^1.0.5",
     "@radix-ui/react-dropdown-menu": "^2.0.6",
     "@radix-ui/react-label": "^2.0.2",
     "@radix-ui/react-popover": "^1.0.7",
+    "@radix-ui/react-scroll-area": "^1.0.5",
     "@radix-ui/react-select": "^1.2.2",
+    "@radix-ui/react-separator": "^1.0.3",
     "@radix-ui/react-slot": "^1.0.2",
+    "@radix-ui/react-switch": "^1.0.3",
     "@radix-ui/react-tooltip": "^1.0.7",
     "@remix-run/node": "^2.4.1",
     "@remix-run/react": "^2.4.1",
     "@remix-run/serve": "^2.4.1",
     "@segment/snippet": "^5.2.0",
     "@sentry/remix": "^7.91.0",
     "@tanstack/react-table": "^8.11.2",
+    "@tanstack/react-virtual": "3.0.1",
     "autosuggest-highlight": "^3.3.4",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.0",
@@ -73,6 +81,7 @@
     "oazapfts": "^4.12.0",
     "qs": "^6.11.2",
     "react": "^18.2.0",
+    "react-day-picker": "^8.10.0",
     "react-dom": "^18.2.0",
     "react-dropzone": "^14.2.3",
     "react-hook-form": "^7.48.2",

packages/app-builder/remix.config.js

@@ -7,7 +7,11 @@ const appDirectory = 'src';
  */
 export default {
   serverModuleFormat: 'esm',
-  serverDependenciesToBundle: ['remix-i18next', 'react-dropzone'],
+  serverDependenciesToBundle: [
+    'remix-i18next',
+    'accept-language-parser',
+    'intl-parse-accept-language',
+  ],
   serverPlatform: 'node',
   appDirectory,
   browserNodeBuiltinsPolyfill: { modules: { process: true } },

packages/app-builder/src/routes/_builder+/upload+/$objectType.tsx

@@ -12,7 +12,8 @@ import clsx from 'clsx';
 import { type Namespace, type ParseKeys } from 'i18next';
 import { type UploadLog } from 'marble-api';
 import { useCallback, useMemo, useState } from 'react';
-import { useDropzone } from 'react-dropzone';
+import * as reactDropzone from 'react-dropzone';
+const { useDropzone } = reactDropzone;
 import { useTranslation } from 'react-i18next';
 import { ClientOnly } from 'remix-utils/client-only';
 import { Button, Modal, Table, useVirtualTable } from 'ui-design-system';

packages/app-builder/src/routes/ressources+/cases+/upload-file.tsx

@@ -7,7 +7,8 @@ import * as Sentry from '@sentry/remix';
 import clsx from 'clsx';
 import { type Namespace } from 'i18next';
 import { useEffect, useState } from 'react';
-import { useDropzone } from 'react-dropzone';
+import * as reactDropzone from 'react-dropzone';
+const { useDropzone } = reactDropzone;
 import { toast } from 'react-hot-toast';
 import { useTranslation } from 'react-i18next';
 import { Button, Modal } from 'ui-design-system';

packages/marble-api/package.json

@@ -11,7 +11,7 @@
     "operator-regex": "tsx scripts/operator-regexp.ts"
   },
   "devDependencies": {
-    "@marble/eslint-config": "workspace:^",
+    "@marble/eslint-config": "workspace:*",
     "@types/node": "20.10.6",
     "ora": "^8.0.1",
     "tailwind-preset": "^1.0.8",

packages/tailwind-preset/package.json

@@ -9,7 +9,7 @@
     "type-check": "npx tsc --noEmit"
   },
   "devDependencies": {
-    "@marble/eslint-config": "workspace:^",
+    "@marble/eslint-config": "workspace:*",
     "tailwindcss": "3.4.0",
     "tailwindcss-radix": "^2.8.0"
   },

packages/typescript-utils/package.json

@@ -5,7 +5,7 @@
   "sideEffect": false,
   "type": "module",
   "devDependencies": {
-    "@marble/eslint-config": "workspace:^",
+    "@marble/eslint-config": "workspace:*",
     "@types/node": "20.10.6"
   },
   "scripts": {

packages/ui-design-system/package.json

@@ -15,7 +15,8 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@marble/eslint-config": "workspace:^",
+    "@faker-js/faker": "^8.3.1",
+    "@marble/eslint-config": "workspace:*",
     "@storybook/addon-essentials": "^7.6.7",
     "@storybook/addon-interactions": "^7.6.7",
     "@storybook/addon-links": "^7.6.7",
@@ -33,11 +34,11 @@
     "jsdom-testing-mocks": "^1.11.0",
     "postcss": "^8.4.32",
     "storybook": "^7.6.7",
-    "tailwindcss": "3.4.0"
+    "tailwindcss": "3.4.0",
+    "vite": "^5.0.10"
   },
   "dependencies": {
     "@ariakit/react": "^0.3.12",
-    "@faker-js/faker": "^8.3.1",
     "@radix-ui/react-accordion": "^1.1.2",
     "@radix-ui/react-avatar": "^1.0.4",
     "@radix-ui/react-checkbox": "^1.0.4",
@@ -55,10 +56,11 @@
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.0",
     "date-fns": "^3.0.6",
-    "react": "^18.2.0",
     "react-day-picker": "^8.10.0",
-    "react-dom": "^18.2.0",
-    "ui-icons": "workspace:^",
-    "vite": "^5.0.10"
+    "ui-icons": "workspace:*"
+  },
+  "peerDependencies": {
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   }
 }

packages/ui-icons/package.json

@@ -10,7 +10,7 @@
     "generate-icons": "tsx scripts/generate.ts"
   },
   "devDependencies": {
-    "@marble/eslint-config": "workspace:^",
+    "@marble/eslint-config": "workspace:*",
     "@types/node": "20.10.6",
     "@types/react": "18.2.46",
     "@types/svg-sprite": "^0.0.38",