chore: fix next.js import and upgrade eslint, prettier

tolgee · Apr 4, 2024 · aa2f05c · aa2f05c
1 parent c21a4b3
commit aa2f05c
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 60 deletions.
diff --git a/packages/web/package.json b/packages/web/package.json
@@ -9,26 +9,23 @@
   "exports": {
     ".": {
       "production": {
-        "require": "./dist/tolgee-web.production.umd.cjs",
-        "module": "./dist/tolgee-web.production.umd.cjs",
-        "import": "./dist/tolgee-web.production.esm.js"
+        "import": "./dist/tolgee-web.production.esm.js",
+        "require": "./dist/tolgee-web.production.umd.cjs"
       },
-      "require": "./index.cjs",
-      "module": "./dist/tolgee-web.development.umd.cjs",
       "import": "./dist/tolgee-web.development.esm.js",
+      "require": "./index.cjs",
       "types": "./types/index.d.ts"
     },
     "./tools": {
-      "require": "./dist/tolgee-in-context-tools.umd.cjs",
-      "module": "./dist/tolgee-in-context-tools.umd.cjs",
       "import": "./dist/tolgee-in-context-tools.esm.js",
+      "require": "./dist/tolgee-in-context-tools.umd.cjs",
       "types": "./types/tools.d.ts"
     },
     "./package.json": "./package.json"
   },
   "scripts": {
     "dev": "vite",
-    "develop": "concurrently \"tsc --project tsconfig.prod.json --watch\" \"vite build --watch\"",
+    "develop": "concurrently --raw \"tsc --watch --preserveWatchOutput --project tsconfig.prod.json\" \"vite build --watch\"",
     "build": "tsc --project tsconfig.prod.json && vite build && vite build --config vite.config.production.ts && vite build --config vite.config.tools.ts",
     "test": "jest --collect-coverage",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",

diff --git a/packages/web/tools/package.json b/packages/web/tools/package.json
@@ -5,9 +5,8 @@
   "types": "../types/tools.d.ts",
   "exports": {
     ".": {
-      "require": "./../dist/tolgee-in-context-tools.umd.cjs",
-      "module": "./../dist/tolgee-in-context-tools.umd.cjs",
       "import": "./../dist/tolgee-in-context-tools.esm.js",
+      "require": "./../dist/tolgee-in-context-tools.umd.cjs",
       "types": "./../types/tools.d.ts"
     },
     "./package.json": "./package.json"

diff --git a/packages/web/vite.config.ts b/packages/web/vite.config.ts
@@ -13,6 +13,7 @@ type Props = {
 // reused for vite.config.tools & vite.config.production
 export const createConfig = ({ entry, rollupOptions }: Props) =>
   defineConfig({
+    clearScreen: false,
     build: {
       emptyOutDir: false,
       minify: false,

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/testapps/next-app/package.json b/testapps/next-app/package.json
@@ -7,13 +7,14 @@
     "develop": "next dev",
     "build": "next build",
     "build:e2e": "NEXT_BUILD_DIR=dist-e2e next build",
-    "start": "next start"
+    "start": "next start",
+    "clean": "rm -rf .next dist-e2e"
   },
   "dependencies": {
     "@tolgee/format-icu": "5.22.0",
     "@tolgee/react": "5.22.0",
     "@tolgee/web": "5.22.0",
-    "next": "14.0.3",
+    "next": "14.1.4",
     "next-intl": "^3.2.3",
     "react": "18.2.0",
     "react-dom": "18.2.0"

diff --git a/testapps/next-internal/package.json b/testapps/next-internal/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@tolgee/react": "5.22.0",
     "@tolgee/web": "5.22.0",
-    "next": "14.0.3",
+    "next": "14.1.4",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },

diff --git a/testapps/next/package.json b/testapps/next/package.json
@@ -14,7 +14,7 @@
   "dependencies": {
     "@tolgee/format-icu": "5.22.0",
     "@tolgee/react": "5.22.0",
-    "next": "14.0.3",
+    "next": "14.1.4",
     "react": "18.2.0",
     "react-dom": "18.2.0"
   },

diff --git a/testapps/react/package.json b/testapps/react/package.json
@@ -7,7 +7,8 @@
     "develop": "vite",
     "build": "tsc && vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "clean": "rm -rf dist "
   },
   "dependencies": {
     "@tolgee/format-icu": "5.22.0",