From f0589c2f33a81516474f607b0c6266f6f29b01f6 Mon Sep 17 00:00:00 2001 From: Mo Tarbin Date: Sun, 22 Jun 2025 17:28:20 -0400 Subject: [PATCH 1/9] chore: remove unnecessary rollup dependency for darwin arm64 --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 18c8a16..53e21ac 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,6 @@ "@mui/joy": "^5.0.0-beta.20", "@mui/material": "^5.15.2", "@openreplay/tracker": "^14.0.4", - "@rollup/rollup-darwin-arm64": "^4.44.0", "@swc/core": "^1.12.5", "@tanstack/react-query": "^5.17.0", "aos": "^2.3.4", From a8388db1c3778aed50934ab13014b2e3c23f2b73 Mon Sep 17 00:00:00 2001 From: Mo Tarbin Date: Sun, 22 Jun 2025 17:30:55 -0400 Subject: [PATCH 2/9] add rollup as a dependency in package.json --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 53e21ac..1281ec9 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,8 @@ "reactjs-social-login": "^2.6.3", "recharts": "^2.15.0", "reusify": "^1.0.4", - "vite-plugin-pwa": "^0.20.0" + "vite-plugin-pwa": "^0.20.0", + "rollup": "^3.0.0" }, "devDependencies": { "@capacitor/assets": "^3.0.5", From c1321203c14e42e0a1ce434c62247448c9f0321f Mon Sep 17 00:00:00 2001 From: Mo Tarbin Date: Sun, 22 Jun 2025 21:45:33 -0400 Subject: [PATCH 3/9] fix: update rollup and swc dependencies for darwin arm64 support --- package-lock.json | 255 ++++++++++++++++++++++++---------------------- package.json | 9 +- 2 files changed, 143 insertions(+), 121 deletions(-) diff --git a/package-lock.json b/package-lock.json index 67a0f6a..f2e53f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,6 +31,7 @@ "@openreplay/tracker": "^14.0.4", "@rollup/rollup-darwin-arm64": "^4.44.0", "@swc/core": "^1.12.5", + "@swc/core-darwin-arm64": "^1.12.5", "@tanstack/react-query": "^5.17.0", "aos": "^2.3.4", "browser-image-compression": "^2.0.2", @@ -57,6 +58,7 @@ "reactjs-social-login": "^2.6.3", "recharts": "^2.15.0", "reusify": "^1.0.4", + "rollup": "^3.0.0", "vite-plugin-pwa": "^0.20.0" }, "devDependencies": { @@ -4104,7 +4106,6 @@ "arm64" ], "license": "Apache-2.0 AND MIT", - "optional": true, "os": [ "darwin" ], @@ -12678,135 +12679,21 @@ } }, "node_modules/rollup": { - "version": "4.44.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.44.0.tgz", - "integrity": "sha512-qHcdEzLCiktQIfwBq420pn2dP+30uzqYxv9ETm91wdt2R9AFcWfjNAmje4NWlnCIQ5RMTzVf0ZyisOKqHR6RwA==", + "version": "3.29.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz", + "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==", "license": "MIT", - "dependencies": { - "@types/estree": "1.0.8" - }, "bin": { "rollup": "dist/bin/rollup" }, "engines": { - "node": ">=18.0.0", + "node": ">=14.18.0", "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.44.0", - "@rollup/rollup-android-arm64": "4.44.0", - "@rollup/rollup-darwin-arm64": "4.44.0", - "@rollup/rollup-darwin-x64": "4.44.0", - "@rollup/rollup-freebsd-arm64": "4.44.0", - "@rollup/rollup-freebsd-x64": "4.44.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.44.0", - "@rollup/rollup-linux-arm-musleabihf": "4.44.0", - "@rollup/rollup-linux-arm64-gnu": "4.44.0", - "@rollup/rollup-linux-arm64-musl": "4.44.0", - "@rollup/rollup-linux-loongarch64-gnu": "4.44.0", - "@rollup/rollup-linux-powerpc64le-gnu": "4.44.0", - "@rollup/rollup-linux-riscv64-gnu": "4.44.0", - "@rollup/rollup-linux-riscv64-musl": "4.44.0", - "@rollup/rollup-linux-s390x-gnu": "4.44.0", - "@rollup/rollup-linux-x64-gnu": "4.44.0", - "@rollup/rollup-linux-x64-musl": "4.44.0", - "@rollup/rollup-win32-arm64-msvc": "4.44.0", - "@rollup/rollup-win32-ia32-msvc": "4.44.0", - "@rollup/rollup-win32-x64-msvc": "4.44.0", "fsevents": "~2.3.2" } }, - "node_modules/rollup/node_modules/@rollup/rollup-darwin-x64": { - "version": "4.44.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.44.0.tgz", - "integrity": "sha512-fBkyrDhwquRvrTxSGH/qqt3/T0w5Rg0L7ZIDypvBPc1/gzjJle6acCpZ36blwuwcKD/u6oCE/sRWlUAcxLWQbQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/rollup/node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.44.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.44.0.tgz", - "integrity": "sha512-ZTR2mxBHb4tK4wGf9b8SYg0Y6KQPjGpR4UWwTFdnmjB4qRtoATZ5dWn3KsDwGa5Z2ZBOE7K52L36J9LueKBdOQ==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/rollup/node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.44.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.44.0.tgz", - "integrity": "sha512-GFWfAhVhWGd4r6UxmnKRTBwP1qmModHtd5gkraeW2G490BpFOZkFtem8yuX2NyafIP/mGpRJgTJ2PwohQkUY/Q==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/rollup/node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.44.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.44.0.tgz", - "integrity": "sha512-iUVJc3c0o8l9Sa/qlDL2Z9UP92UZZW1+EmQ4xfjTc1akr0iUFZNfxrXJ/R1T90h/ILm9iXEY6+iPrmYB3pXKjw==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/rollup/node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.44.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.44.0.tgz", - "integrity": "sha512-PQUobbhLTQT5yz/SPg116VJBgz+XOtXt8D1ck+sfJJhuEsMj2jSej5yTdp8CvWBSceu+WW+ibVL6dm0ptG5fcA==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/rollup/node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.44.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.44.0.tgz", - "integrity": "sha512-M0CpcHf8TWn+4oTxJfh7LQuTuaYeXGbk0eageVjQCKzYLsajWS/lFC94qlRqOlyC2KvRT90ZrfXULYmukeIy7w==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/rollup/node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.44.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.44.0.tgz", - "integrity": "sha512-Q2Mgwt+D8hd5FIPUuPDsvPR7Bguza6yTkJxspDGkZj7tBRn2y4KSWYuIXpftFSjBra76TbKerCV7rgFPQrn+wQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -14760,6 +14647,136 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, + "node_modules/vite/node_modules/@rollup/rollup-darwin-x64": { + "version": "4.44.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.44.0.tgz", + "integrity": "sha512-fBkyrDhwquRvrTxSGH/qqt3/T0w5Rg0L7ZIDypvBPc1/gzjJle6acCpZ36blwuwcKD/u6oCE/sRWlUAcxLWQbQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.44.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.44.0.tgz", + "integrity": "sha512-ZTR2mxBHb4tK4wGf9b8SYg0Y6KQPjGpR4UWwTFdnmjB4qRtoATZ5dWn3KsDwGa5Z2ZBOE7K52L36J9LueKBdOQ==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/vite/node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.44.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.44.0.tgz", + "integrity": "sha512-GFWfAhVhWGd4r6UxmnKRTBwP1qmModHtd5gkraeW2G490BpFOZkFtem8yuX2NyafIP/mGpRJgTJ2PwohQkUY/Q==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/vite/node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.44.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.44.0.tgz", + "integrity": "sha512-iUVJc3c0o8l9Sa/qlDL2Z9UP92UZZW1+EmQ4xfjTc1akr0iUFZNfxrXJ/R1T90h/ILm9iXEY6+iPrmYB3pXKjw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/vite/node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.44.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.44.0.tgz", + "integrity": "sha512-PQUobbhLTQT5yz/SPg116VJBgz+XOtXt8D1ck+sfJJhuEsMj2jSej5yTdp8CvWBSceu+WW+ibVL6dm0ptG5fcA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/vite/node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.44.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.44.0.tgz", + "integrity": "sha512-M0CpcHf8TWn+4oTxJfh7LQuTuaYeXGbk0eageVjQCKzYLsajWS/lFC94qlRqOlyC2KvRT90ZrfXULYmukeIy7w==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/vite/node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.44.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.44.0.tgz", + "integrity": "sha512-Q2Mgwt+D8hd5FIPUuPDsvPR7Bguza6yTkJxspDGkZj7tBRn2y4KSWYuIXpftFSjBra76TbKerCV7rgFPQrn+wQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/vite/node_modules/rollup": { + "version": "4.44.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.44.0.tgz", + "integrity": "sha512-qHcdEzLCiktQIfwBq420pn2dP+30uzqYxv9ETm91wdt2R9AFcWfjNAmje4NWlnCIQ5RMTzVf0ZyisOKqHR6RwA==", + "license": "MIT", + "dependencies": { + "@types/estree": "1.0.8" + }, + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=18.0.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "@rollup/rollup-android-arm-eabi": "4.44.0", + "@rollup/rollup-android-arm64": "4.44.0", + "@rollup/rollup-darwin-arm64": "4.44.0", + "@rollup/rollup-darwin-x64": "4.44.0", + "@rollup/rollup-freebsd-arm64": "4.44.0", + "@rollup/rollup-freebsd-x64": "4.44.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.44.0", + "@rollup/rollup-linux-arm-musleabihf": "4.44.0", + "@rollup/rollup-linux-arm64-gnu": "4.44.0", + "@rollup/rollup-linux-arm64-musl": "4.44.0", + "@rollup/rollup-linux-loongarch64-gnu": "4.44.0", + "@rollup/rollup-linux-powerpc64le-gnu": "4.44.0", + "@rollup/rollup-linux-riscv64-gnu": "4.44.0", + "@rollup/rollup-linux-riscv64-musl": "4.44.0", + "@rollup/rollup-linux-s390x-gnu": "4.44.0", + "@rollup/rollup-linux-x64-gnu": "4.44.0", + "@rollup/rollup-linux-x64-musl": "4.44.0", + "@rollup/rollup-win32-arm64-msvc": "4.44.0", + "@rollup/rollup-win32-ia32-msvc": "4.44.0", + "@rollup/rollup-win32-x64-msvc": "4.44.0", + "fsevents": "~2.3.2" + } + }, "node_modules/warning": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", diff --git a/package.json b/package.json index 1281ec9..5c0ae65 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "build-selfhosted": "vite build --mode selfhosted", "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0", "preview": "vite preview", + "setup-m1": "rm -rf node_modules package-lock.json && npm install && npm install --force @rollup/rollup-darwin-arm64 @swc/core-darwin-arm64", "release": "npm version patch && npm run build && git push origin develop --tags", "merge": "git checkout main && git merge develop && git push origin main && git checkout develop", "ionic:build": "npm run build", @@ -48,7 +49,9 @@ "@mui/joy": "^5.0.0-beta.20", "@mui/material": "^5.15.2", "@openreplay/tracker": "^14.0.4", + "@rollup/rollup-darwin-arm64": "^4.44.0", "@swc/core": "^1.12.5", + "@swc/core-darwin-arm64": "^1.12.5", "@tanstack/react-query": "^5.17.0", "aos": "^2.3.4", "browser-image-compression": "^2.0.2", @@ -75,12 +78,14 @@ "reactjs-social-login": "^2.6.3", "recharts": "^2.15.0", "reusify": "^1.0.4", - "vite-plugin-pwa": "^0.20.0", - "rollup": "^3.0.0" + "rollup": "^3.0.0", + "vite-plugin-pwa": "^0.20.0" }, "devDependencies": { "@capacitor/assets": "^3.0.5", "@capacitor/cli": "^7.0.0", + "@rollup/rollup-darwin-arm64": "^4.9.0", + "@swc/core-darwin-arm64": "^1.12.5", "@tanstack/eslint-plugin-query": "^5.14.6", "@types/react": "^18.2.43", "@types/react-dom": "^18.2.17", From 76ea0c4978082c710725f39f3db316c9dbfca72a Mon Sep 17 00:00:00 2001 From: Mo Tarbin Date: Sun, 22 Jun 2025 21:51:20 -0400 Subject: [PATCH 4/9] fix: update package.json and package-lock.json to include optional rollup and swc dependencies for darwin arm64 --- package-lock.json | 8 ++++++-- package.json | 11 ++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index f2e53f1..01c8525 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,9 +29,7 @@ "@mui/joy": "^5.0.0-beta.20", "@mui/material": "^5.15.2", "@openreplay/tracker": "^14.0.4", - "@rollup/rollup-darwin-arm64": "^4.44.0", "@swc/core": "^1.12.5", - "@swc/core-darwin-arm64": "^1.12.5", "@tanstack/react-query": "^5.17.0", "aos": "^2.3.4", "browser-image-compression": "^2.0.2", @@ -90,6 +88,10 @@ "engines": { "node": ">=20.0.0", "npm": ">=9.0.0" + }, + "optionalDependencies": { + "@rollup/rollup-darwin-arm64": "^4.9.0", + "@swc/core-darwin-arm64": "^1.12.5" } }, "node_modules/@alloc/quick-lru": { @@ -3787,6 +3789,7 @@ "arm64" ], "license": "MIT", + "optional": true, "os": [ "darwin" ] @@ -4106,6 +4109,7 @@ "arm64" ], "license": "Apache-2.0 AND MIT", + "optional": true, "os": [ "darwin" ], diff --git a/package.json b/package.json index 5c0ae65..ee29927 100644 --- a/package.json +++ b/package.json @@ -17,11 +17,12 @@ "start": "vite --host", "dev": "vite", "build": "vite build", - "build-cf": "rm -rf node_modules package-lock.json && npm install && vite build", + "build-cf": "rm -rf node_modules package-lock.json && npm install --omit=optional && vite build", "build-selfhosted": "vite build --mode selfhosted", "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0", "preview": "vite preview", "setup-m1": "rm -rf node_modules package-lock.json && npm install && npm install --force @rollup/rollup-darwin-arm64 @swc/core-darwin-arm64", + "setup-apple-silicon": "npm install --force @rollup/rollup-darwin-arm64 @swc/core-darwin-arm64", "release": "npm version patch && npm run build && git push origin develop --tags", "merge": "git checkout main && git merge develop && git push origin main && git checkout develop", "ionic:build": "npm run build", @@ -49,9 +50,7 @@ "@mui/joy": "^5.0.0-beta.20", "@mui/material": "^5.15.2", "@openreplay/tracker": "^14.0.4", - "@rollup/rollup-darwin-arm64": "^4.44.0", "@swc/core": "^1.12.5", - "@swc/core-darwin-arm64": "^1.12.5", "@tanstack/react-query": "^5.17.0", "aos": "^2.3.4", "browser-image-compression": "^2.0.2", @@ -84,8 +83,6 @@ "devDependencies": { "@capacitor/assets": "^3.0.5", "@capacitor/cli": "^7.0.0", - "@rollup/rollup-darwin-arm64": "^4.9.0", - "@swc/core-darwin-arm64": "^1.12.5", "@tanstack/eslint-plugin-query": "^5.14.6", "@types/react": "^18.2.43", "@types/react-dom": "^18.2.17", @@ -108,5 +105,9 @@ "prettier-plugin-tailwindcss": "^0.5.10", "tailwindcss": "^3.4.0", "vite": "^5.2.13" + }, + "optionalDependencies": { + "@rollup/rollup-darwin-arm64": "^4.44.0", + "@swc/core-darwin-arm64": "^1.12.5" } } From cadfa5e03406cfbc983b6fdd749a4af554f84e00 Mon Sep 17 00:00:00 2001 From: Mo Tarbin Date: Sun, 22 Jun 2025 22:00:40 -0400 Subject: [PATCH 5/9] fix: update build commands and add optional dependencies for cross-platform support --- package.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index ee29927..9a71792 100644 --- a/package.json +++ b/package.json @@ -17,12 +17,13 @@ "start": "vite --host", "dev": "vite", "build": "vite build", - "build-cf": "rm -rf node_modules package-lock.json && npm install --omit=optional && vite build", + "build-cf": "rm -rf node_modules package-lock.json && npm install && vite build", "build-selfhosted": "vite build --mode selfhosted", "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0", "preview": "vite preview", "setup-m1": "rm -rf node_modules package-lock.json && npm install && npm install --force @rollup/rollup-darwin-arm64 @swc/core-darwin-arm64", - "setup-apple-silicon": "npm install --force @rollup/rollup-darwin-arm64 @swc/core-darwin-arm64", + "setup-apple-silicon": "npm install --no-optional && npm install --force @rollup/rollup-darwin-arm64 @swc/core-darwin-arm64", + "test-cloudflare-build": "rm -rf node_modules package-lock.json && npm install && npm install --force @rollup/rollup-linux-x64-gnu @swc/core-linux-x64-gnu && vite build", "release": "npm version patch && npm run build && git push origin develop --tags", "merge": "git checkout main && git merge develop && git push origin main && git checkout develop", "ionic:build": "npm run build", @@ -108,6 +109,8 @@ }, "optionalDependencies": { "@rollup/rollup-darwin-arm64": "^4.44.0", - "@swc/core-darwin-arm64": "^1.12.5" + "@rollup/rollup-linux-x64-gnu": "^4.44.0", + "@swc/core-darwin-arm64": "^1.12.5", + "@swc/core-linux-x64-gnu": "^1.12.5" } } From dcd8bbbd01e726c30c5b9e55e8605710a62ec0fc Mon Sep 17 00:00:00 2001 From: Mo Tarbin Date: Sun, 22 Jun 2025 22:04:09 -0400 Subject: [PATCH 6/9] fix: update build-cf script to remove unnecessary node_modules cleanup --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 9a71792..76b7718 100644 --- a/package.json +++ b/package.json @@ -17,13 +17,13 @@ "start": "vite --host", "dev": "vite", "build": "vite build", - "build-cf": "rm -rf node_modules package-lock.json && npm install && vite build", + "build-cf": "rm -rf package-lock.json && npm install && npm install --force @rollup/rollup-linux-x64-gnu@4.34.9 @swc/core-linux-x64-gnu && vite build", "build-selfhosted": "vite build --mode selfhosted", "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0", "preview": "vite preview", "setup-m1": "rm -rf node_modules package-lock.json && npm install && npm install --force @rollup/rollup-darwin-arm64 @swc/core-darwin-arm64", "setup-apple-silicon": "npm install --no-optional && npm install --force @rollup/rollup-darwin-arm64 @swc/core-darwin-arm64", - "test-cloudflare-build": "rm -rf node_modules package-lock.json && npm install && npm install --force @rollup/rollup-linux-x64-gnu @swc/core-linux-x64-gnu && vite build", + "test-cloudflare-build": "rm -rf node_modules package-lock.json && npm install && npm install --force @rollup/rollup-linux-x64-gnu@4.34.9 @swc/core-linux-x64-gnu && vite build", "release": "npm version patch && npm run build && git push origin develop --tags", "merge": "git checkout main && git merge develop && git push origin main && git checkout develop", "ionic:build": "npm run build", @@ -109,7 +109,7 @@ }, "optionalDependencies": { "@rollup/rollup-darwin-arm64": "^4.44.0", - "@rollup/rollup-linux-x64-gnu": "^4.44.0", + "@rollup/rollup-linux-x64-gnu": "^4.34.9", "@swc/core-darwin-arm64": "^1.12.5", "@swc/core-linux-x64-gnu": "^1.12.5" } From 9f4bfe75d1e9acc19950e54095c7731422f74f76 Mon Sep 17 00:00:00 2001 From: Mo Tarbin Date: Sun, 22 Jun 2025 22:08:33 -0400 Subject: [PATCH 7/9] fix: remove rollup from dependencies and optionalDependencies in package.json --- package.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/package.json b/package.json index 76b7718..8501900 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,6 @@ "reactjs-social-login": "^2.6.3", "recharts": "^2.15.0", "reusify": "^1.0.4", - "rollup": "^3.0.0", "vite-plugin-pwa": "^0.20.0" }, "devDependencies": { @@ -106,11 +105,5 @@ "prettier-plugin-tailwindcss": "^0.5.10", "tailwindcss": "^3.4.0", "vite": "^5.2.13" - }, - "optionalDependencies": { - "@rollup/rollup-darwin-arm64": "^4.44.0", - "@rollup/rollup-linux-x64-gnu": "^4.34.9", - "@swc/core-darwin-arm64": "^1.12.5", - "@swc/core-linux-x64-gnu": "^1.12.5" } } From 981513086bc30190e47c2fbdd0447660cd58b65d Mon Sep 17 00:00:00 2001 From: Mo Tarbin Date: Mon, 23 Jun 2025 00:50:14 -0400 Subject: [PATCH 8/9] fix: update version to 0.1.104 in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8501900..c642c60 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "donetick", "private": true, - "version": "0.1.103", + "version": "0.1.104", "type": "module", "engines": { "node": ">=20.0.0", From e9f1b2a9b49ae980b34a165d6d305c579f22c978 Mon Sep 17 00:00:00 2001 From: Mo Tarbin Date: Mon, 23 Jun 2025 00:54:05 -0400 Subject: [PATCH 9/9] fix: refactor getDefaultNotification to retrieve from localStorage and update notificationMetadata initialization --- src/views/components/AddTaskModal.jsx | 32 ++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/src/views/components/AddTaskModal.jsx b/src/views/components/AddTaskModal.jsx index 0c6d20c..1408401 100644 --- a/src/views/components/AddTaskModal.jsx +++ b/src/views/components/AddTaskModal.jsx @@ -31,6 +31,23 @@ import NotificationTemplate from '../../components/NotificationTemplate' import LearnMoreButton from './LearnMore' import RichTextEditor from './RichTextEditor' import SubTasks from './SubTask' +const getDefaultNotification = () => { + const storedDefault = localStorage.getItem('defaultNotificationTemplate') + if (storedDefault) { + return JSON.parse(storedDefault) + } + const defaultNotification = [ + { value: 1, unit: 'days', type: 'before' }, + { value: 0, unit: 'minutes', type: 'ondue' }, + { value: 1, unit: 'days', type: 'after' }, + ] + + localStorage.setItem( + 'defaultNotification', + JSON.stringify(defaultNotification), + ) + return defaultNotification +} const TaskInput = ({ autoFocus, onChoreUpdate, isModalOpen, onClose }) => { const { data: userLabels, isLoading: userLabelsLoading } = useLabels() @@ -53,7 +70,7 @@ const TaskInput = ({ autoFocus, onChoreUpdate, isModalOpen, onClose }) => { const [labelsV2, setLabelsV2] = useState([]) const [frequency, setFrequency] = useState(null) const [notificationMetadata, setNotificationMetadata] = useState({ - templates: [], + templates: getDefaultNotification(), }) const [frequencyHumanReadable, setFrequencyHumanReadable] = useState(null) const [subTasks, setSubTasks] = useState(null) @@ -635,11 +652,16 @@ const TaskInput = ({ autoFocus, onChoreUpdate, isModalOpen, onClose }) => { { - const newNotificaitonMetadata = { - ...notificationMetadata, - templates: metadata.notifications, + if ( + metadata.notifications !== + notificationMetadata.templates + ) { + const newNotificaitonMetadata = { + ...notificationMetadata, + templates: metadata.notifications, + } + setNotificationMetadata(newNotificaitonMetadata) } - setNotificationMetadata(newNotificaitonMetadata) }} value={notificationMetadata} showTimeline={false}