From ff33b310e2199dbddf929715530eadc3162266eb Mon Sep 17 00:00:00 2001 From: MohamedBassem Date: Wed, 20 Aug 2025 18:14:49 +0300 Subject: Revert "deps: Upgrade nextjs to 15.5" This reverts commit be420c9aebb0f2d343a0c94327fddc089f56d402. --- apps/browser-extension/package.json | 8 ++++---- apps/landing/package.json | 8 ++++---- apps/mobile/package.json | 4 ++-- apps/web/app/manifest.json | 25 ------------------------- apps/web/next.config.mjs | 30 ++++++++++++++++++++---------- apps/web/package.json | 13 +++++++------ apps/web/public/manifest.json | 25 +++++++++++++++++++++++++ 7 files changed, 62 insertions(+), 51 deletions(-) delete mode 100644 apps/web/app/manifest.json create mode 100644 apps/web/public/manifest.json (limited to 'apps') diff --git a/apps/browser-extension/package.json b/apps/browser-extension/package.json index 435c07da..88e55285 100644 --- a/apps/browser-extension/package.json +++ b/apps/browser-extension/package.json @@ -30,8 +30,8 @@ "clsx": "^2.1.0", "cmdk": "^1.1.1", "lucide-react": "^0.501.0", - "react": "19.1.1", - "react-dom": "19.1.1", + "react": "^19.1.0", + "react-dom": "^19.1.0", "react-router-dom": "^6.22.0", "superjson": "^2.2.1", "tailwind-merge": "^2.2.1", @@ -44,8 +44,8 @@ "@karakeep/tailwind-config": "workspace:^0.1.0", "@karakeep/tsconfig": "workspace:^0.1.0", "@types/chrome": "^0.0.260", - "@types/react": "19.1.10", - "@types/react-dom": "19.1.7", + "@types/react": "^19.1.6", + "@types/react-dom": "^19.1.6", "@vitejs/plugin-react-swc": "^3.11.0", "autoprefixer": "^10.4.17", "postcss": "^8.4.35", diff --git a/apps/landing/package.json b/apps/landing/package.json index aa063b9d..b8329356 100644 --- a/apps/landing/package.json +++ b/apps/landing/package.json @@ -20,8 +20,8 @@ "class-variance-authority": "^0.7.0", "clsx": "^2.1.0", "lucide-react": "^0.501.0", - "react": "19.1.1", - "react-dom": "19.1.1", + "react": "^19.1.0", + "react-dom": "^19.1.0", "react-router": "^7.7.1", "sharp": "^0.33.3", "tailwind-merge": "^2.2.1", @@ -32,8 +32,8 @@ "@karakeep/tailwind-config": "workspace:^0.1.0", "@karakeep/tsconfig": "workspace:^0.1.0", "@tailwindcss/typography": "^0.5.10", - "@types/react": "19.1.10", - "@types/react-dom": "19.1.7", + "@types/react": "^19.1.6", + "@types/react-dom": "^19.1.6", "@vitejs/plugin-react": "^4.7.0", "autoprefixer": "^10.4.17", "postcss": "^8.4.35", diff --git a/apps/mobile/package.json b/apps/mobile/package.json index 6b0ed3d9..0ed5668c 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -44,7 +44,7 @@ "expo-web-browser": "^14.1.6", "lucide-react-native": "^0.513.0", "nativewind": "^4.1.23", - "react": "19.1.1", + "react": "^19.1.0", "react-native": "0.79.3", "react-native-awesome-slider": "^2.5.3", "react-native-blob-util": "^0.21.2", @@ -67,7 +67,7 @@ "@karakeep/prettier-config": "workspace:^0.1.0", "@karakeep/tailwind-config": "workspace:^0.1.0", "@karakeep/tsconfig": "workspace:^0.1.0", - "@types/react": "19.1.10", + "@types/react": "^19.1.6", "ajv": "latest", "prettier": "^3.4.2", "tailwindcss": "^3.4.1", diff --git a/apps/web/app/manifest.json b/apps/web/app/manifest.json deleted file mode 100644 index e0c1bbe9..00000000 --- a/apps/web/app/manifest.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "Karakeep", - "short_name": "Karakeep", - "icons": [ - { - "src": "/icons/logo-16.png", - "sizes": "16x16", - "type": "image/png", - "purpose": "any maskable" - }, - { - "src": "/icons/logo-48.png", - "sizes": "48x48", - "type": "image/png" - }, - { - "src": "/icons/logo-128.png", - "sizes": "128x128", - "type": "image/png" - } - ], - "start_url": "/", - "display": "standalone", - "orientation": "portrait" -} diff --git a/apps/web/next.config.mjs b/apps/web/next.config.mjs index adbb209d..df864f22 100644 --- a/apps/web/next.config.mjs +++ b/apps/web/next.config.mjs @@ -1,6 +1,24 @@ +import pwa from "next-pwa"; + +const withPWA = pwa({ + dest: "public", + disable: process.env.NODE_ENV != "production", +}); + /** @type {import('next').NextConfig} */ -const nextConfig = { +const nextConfig = withPWA({ output: "standalone", + webpack: (config) => { + config.module.rules.push({ + test: /\.svg$/, + use: ["@svgr/webpack"], + }); + return config; + }, + devIndicators: { + buildActivity: true, + buildActivityPosition: "bottom-left", + }, async headers() { return [ { @@ -31,20 +49,12 @@ const nextConfig = { }, ]; }, - turbopack: { - rules: { - "*.svg": { - loaders: ["@svgr/webpack"], - as: "*.js", - }, - }, - }, // transpilePackages: ["@karakeep/shared", "@karakeep/db", "@karakeep/trpc"], /** We already do linting and typechecking as separate tasks in CI */ eslint: { ignoreDuringBuilds: true }, typescript: { ignoreBuildErrors: true }, -}; +}); export default nextConfig; diff --git a/apps/web/package.json b/apps/web/package.json index e31972ee..719dcab7 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -5,7 +5,7 @@ "private": true, "type": "module", "scripts": { - "dev": "next dev --turbopack", + "dev": "next dev", "clean": "git clean -xdf .next .turbo node_modules", "build": "next build --experimental-build-mode compile", "start": "next start", @@ -67,15 +67,16 @@ "i18next-resources-to-backend": "^1.2.1", "lexical": "^0.20.2", "lucide-react": "^0.501.0", - "next": "15.5.0", + "next": "15.3.3", "next-auth": "^4.24.11", "next-i18next": "^15.3.1", + "next-pwa": "^5.6.0", "next-themes": "^0.4.0", "nuqs": "^2.4.3", "prettier": "^3.4.2", - "react": "19.1.1", + "react": "^19.1.0", "react-day-picker": "^9.7.0", - "react-dom": "19.1.1", + "react-dom": "^19.1.0", "react-draggable": "^4.4.6", "react-dropzone": "^14.2.3", "react-error-boundary": "^5.0.0", @@ -102,8 +103,8 @@ "@karakeep/tsconfig": "workspace:^0.1.0", "@types/csv-parse": "^1.2.5", "@types/emoji-mart": "^3.0.14", - "@types/react": "19.1.10", - "@types/react-dom": "19.1.7", + "@types/react": "^19.1.6", + "@types/react-dom": "^19.1.6", "@types/react-syntax-highlighter": "^15.5.13", "@types/request-ip": "^0.0.41", "autoprefixer": "^10.4.17", diff --git a/apps/web/public/manifest.json b/apps/web/public/manifest.json new file mode 100644 index 00000000..e0c1bbe9 --- /dev/null +++ b/apps/web/public/manifest.json @@ -0,0 +1,25 @@ +{ + "name": "Karakeep", + "short_name": "Karakeep", + "icons": [ + { + "src": "/icons/logo-16.png", + "sizes": "16x16", + "type": "image/png", + "purpose": "any maskable" + }, + { + "src": "/icons/logo-48.png", + "sizes": "48x48", + "type": "image/png" + }, + { + "src": "/icons/logo-128.png", + "sizes": "128x128", + "type": "image/png" + } + ], + "start_url": "/", + "display": "standalone", + "orientation": "portrait" +} -- cgit v1.2.3-70-g09d2