From 34c7bfcffb7612240821c4a457f68089e613e7a6 Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Thu, 15 May 2025 15:52:17 -0700 Subject: [PATCH] Get rid of overries, bump welshman to lockstep versioning --- .husky/pre-commit | 6 ++++ android/app/capacitor.build.gradle | 1 + android/capacitor.settings.gradle | 3 ++ build-in-production.sh | 7 ++--- ios/App/Podfile | 1 + package.json | 43 +++++++++++------------------ pnpm-lock.yaml | Bin 305640 -> 336095 bytes remove-pnpm-overrides.js | 25 ----------------- 8 files changed, 29 insertions(+), 57 deletions(-) delete mode 100644 remove-pnpm-overrides.js diff --git a/.husky/pre-commit b/.husky/pre-commit index aacd883b..7083da50 100644 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,2 +1,8 @@ pnpm run lint pnpm run check + +if [[ ! -z $(cat package.json | grep 'link:') ]]; then + echo "Some packages are linked to local files!" + exit 1 +fi + diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle index c3f32ccf..60f2508d 100644 --- a/android/app/capacitor.build.gradle +++ b/android/app/capacitor.build.gradle @@ -9,6 +9,7 @@ android { apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle" dependencies { + implementation project(':capacitor-community-safe-area') implementation project(':capacitor-app') implementation project(':capacitor-keyboard') implementation project(':nostr-signer-capacitor-plugin') diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle index 40d983ab..89572353 100644 --- a/android/capacitor.settings.gradle +++ b/android/capacitor.settings.gradle @@ -2,6 +2,9 @@ include ':capacitor-android' project(':capacitor-android').projectDir = new File('../node_modules/.pnpm/@capacitor+android@7.2.0_@capacitor+core@7.2.0/node_modules/@capacitor/android/capacitor') +include ':capacitor-community-safe-area' +project(':capacitor-community-safe-area').projectDir = new File('../node_modules/.pnpm/@capacitor-community+safe-area@7.0.0-alpha.1_@capacitor+core@7.2.0/node_modules/@capacitor-community/safe-area/android') + include ':capacitor-app' project(':capacitor-app').projectDir = new File('../node_modules/.pnpm/@capacitor+app@7.0.1_@capacitor+core@7.2.0/node_modules/@capacitor/app/android') diff --git a/build-in-production.sh b/build-in-production.sh index 0d3c9e96..b0700b2d 100755 --- a/build-in-production.sh +++ b/build-in-production.sh @@ -6,11 +6,8 @@ git describe --tags --abbrev=0 export VITE_BUILD_VERSION=$RENDER_GIT_COMMIT export VITE_BUILD_HASH=$RENDER_GIT_COMMIT -# Remove link overrides -node remove-pnpm-overrides.js package.json - -# When CI=true as it is on render.com, removing link overrides breaks the lockfile -pnpm i --no-frozen-lockfile +# Install dependencies +pnpm i # Rebuild sharp pnpm rebuild diff --git a/ios/App/Podfile b/ios/App/Podfile index ded1dc90..397e79d9 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -11,6 +11,7 @@ install! 'cocoapods', :disable_input_output_paths => true def capacitor_pods pod 'Capacitor', :path => '../../node_modules/.pnpm/@capacitor+ios@7.2.0_@capacitor+core@7.2.0/node_modules/@capacitor/ios' pod 'CapacitorCordova', :path => '../../node_modules/.pnpm/@capacitor+ios@7.2.0_@capacitor+core@7.2.0/node_modules/@capacitor/ios' + pod 'CapacitorCommunitySafeArea', :path => '../../node_modules/.pnpm/@capacitor-community+safe-area@7.0.0-alpha.1_@capacitor+core@7.2.0/node_modules/@capacitor-community/safe-area' pod 'CapacitorApp', :path => '../../node_modules/.pnpm/@capacitor+app@7.0.1_@capacitor+core@7.2.0/node_modules/@capacitor/app' pod 'CapacitorKeyboard', :path => '../../node_modules/.pnpm/@capacitor+keyboard@7.0.1_@capacitor+core@7.2.0/node_modules/@capacitor/keyboard' pod 'NostrSignerCapacitorPlugin', :path => '../../node_modules/.pnpm/nostr-signer-capacitor-plugin@0.0.4_@capacitor+core@7.2.0/node_modules/nostr-signer-capacitor-plugin' diff --git a/package.json b/package.json index 268a8547..3c04d233 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ }, "devDependencies": { "@capacitor/assets": "^3.0.5", + "@eslint/js": "^9.26.0", "@sentry/cli": "^2.40.0", "@sveltejs/kit": "^2.5.27", "@sveltejs/vite-plugin-svelte": "^4.0.0", @@ -49,21 +50,22 @@ "@poppanator/sveltekit-svg": "^4.2.1", "@sentry/browser": "^8.35.0", "@sveltejs/adapter-static": "^3.0.4", + "@tiptap/core": "^2.12.0", "@types/qrcode": "^1.5.5", "@vite-pwa/assets-generator": "^0.2.6", "@vite-pwa/sveltekit": "^0.6.6", - "@welshman/app": "^0.2.5", - "@welshman/content": "^0.2.2", - "@welshman/dvm": "^0.2.0", - "@welshman/editor": "^0.2.4", - "@welshman/feeds": "^0.2.2", - "@welshman/lib": "^0.2.2", - "@welshman/net": "^0.2.3", - "@welshman/relay": "^0.2.0", - "@welshman/router": "^0.2.0", - "@welshman/signer": "^0.2.3", - "@welshman/store": "^0.2.0", - "@welshman/util": "^0.2.3", + "@welshman/app": "^0.3.0", + "@welshman/content": "^0.3.0", + "@welshman/dvm": "^0.3.0", + "@welshman/editor": "^0.3.0", + "@welshman/feeds": "^0.3.0", + "@welshman/lib": "^0.3.0", + "@welshman/net": "^0.3.0", + "@welshman/relay": "^0.3.0", + "@welshman/router": "^0.3.0", + "@welshman/signer": "^0.3.0", + "@welshman/store": "^0.3.0", + "@welshman/util": "^0.3.0", "daisyui": "^4.12.10", "date-picker-svelte": "^2.13.0", "dotenv": "^16.4.5", @@ -74,23 +76,10 @@ "nostr-signer-capacitor-plugin": "^0.0.4", "nostr-tools": "^2.7.2", "prettier-plugin-tailwindcss": "^0.6.5", - "qrcode": "^1.5.4" + "qrcode": "^1.5.4", + "tippy.js": "^6.3.7" }, "pnpm": { - "overrides": { - "@welshman/lib": "link:../welshman/packages/lib", - "@welshman/util": "link:../welshman/packages/util", - "@welshman/app": "link:../welshman/packages/app", - "@welshman/content": "link:../welshman/packages/content", - "@welshman/dvm": "link:../welshman/packages/dvm", - "@welshman/feeds": "link:../welshman/packages/feeds", - "@welshman/net": "link:../welshman/packages/net", - "@welshman/relay": "link:../welshman/packages/relay", - "@welshman/router": "link:../welshman/packages/router", - "@welshman/signer": "link:../welshman/packages/signer", - "@welshman/store": "link:../welshman/packages/store", - "@welshman/editor": "link:../welshman/packages/editor" - }, "ignoredBuiltDependencies": [ "@sentry/cli", "esbuild" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 98dac42c22109de0fa8c744c5cf4cdc0817c2d50..9e08b8b5e0915f397d843dc1dab5c80b1243e16a 100644 GIT binary patch delta 24100 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 delta 2285 zcmb7^ZD?C%6vug9Qrny5{ia#lrOoU{I;Tmu;?z2&!>QHIIYk)0b!mW(n)=ukU+a#Je-b4l)}hv)hK z{~UhjocrUn{M(#+w0C=IK*?m{QAO*N0)b%Hppw*{JrGgD$@uGK#sYpeQvd(YUz$AD1({It)e4;M<2BH|z`XkA;g;N6OO${;&z!mY|JK>q^W+$w zBIGVBYBJezJMMgl>}|ld80qT*{{;CM51l0MKY??czC)4J(ryR-;-kM4{IikHS>cP< zxeT~KHeh!fJx)-&iSBHIuf#mV?qya3V_jq;)^^j@TG;jh_u#jC=p_f<8=;GSJaL2u z2_Alx-ntI&IZ4-Ufl~|I1{23<06Q+y9TMJrneL-_d4Yb)aPK00*pAzlsnZRblesbP zV0Ibi8!aw4`z38beIq-RMgiv)mjMPZeaN=U1u_ZzZi-2g-gChPUw^{t!9T;=;l#V# z56{i8`-~IL&afdT3SifG0hWq_k)H@YGQ_ShI|xYY@rNsH)B%E2GrmyIr+pxB`A`b; z@iicrdEuiWE@S>q{&vt>Xr( L+J%DZUzUFWd#EBw diff --git a/remove-pnpm-overrides.js b/remove-pnpm-overrides.js deleted file mode 100644 index 4df007d7..00000000 --- a/remove-pnpm-overrides.js +++ /dev/null @@ -1,25 +0,0 @@ -// This script is necessary for installing stuff on a host, since our links don't exist there. - -import fs from "fs" - -const pkgName = process.argv[2] - -if (!pkgName?.endsWith("package.json")) { - console.log("File passed was not a package.json file") - process.exit(1) -} - -const pkg = JSON.parse(fs.readFileSync(pkgName, "utf8")) - -if (pkg.pnpm && pkg.pnpm.overrides) { - // Use $package notation to make sure we only get one copy of each welshman dependency - // TODO: move welshman to a single package to straighten all this out. - for (const k of Object.keys(pkg.pnpm.overrides)) { - pkg.pnpm.overrides[k] = '$' + k - } - - fs.writeFileSync(pkgName, JSON.stringify(pkg, null, 2) + "\n") - console.log("Removed pnpm.overrides from package.json") -} else { - console.log("No pnpm.overrides found in package.json") -}