From dbaf0f5692f4f0f277b501deda1aa1172569b43b Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Mon, 20 May 2024 18:05:18 +0200 Subject: [PATCH] fix: Try to make git work on android by enabling fetch polyfill in capacitor Signed-off-by: Marcel Klehr --- .../app/src/main/assets/capacitor.config.json | 3 + capacitor.config.json | 3 + ios/App/App/capacitor.config.json | 3 + manifest.chrome.json | 2 +- manifest.firefox.json | 2 +- manifest.json | 2 +- package-lock.json | 60 +++++++++---------- package.json | 2 +- 8 files changed, 43 insertions(+), 34 deletions(-) diff --git a/android/app/src/main/assets/capacitor.config.json b/android/app/src/main/assets/capacitor.config.json index 1183dd9397..1df0b893a9 100644 --- a/android/app/src/main/assets/capacitor.config.json +++ b/android/app/src/main/assets/capacitor.config.json @@ -10,6 +10,9 @@ "launchAutoHide": false, "androidScaleType": "CENTER_INSIDE", "backgroundColor": "#ffffff" + }, + "CapacitorHttp": { + "enabled": true } }, "cordova": {} diff --git a/capacitor.config.json b/capacitor.config.json index e463945c88..fb7c372f20 100644 --- a/capacitor.config.json +++ b/capacitor.config.json @@ -10,6 +10,9 @@ "launchAutoHide": false, "androidScaleType": "CENTER_INSIDE", "backgroundColor": "#ffffff" + }, + "CapacitorHttp": { + "enabled": true } }, "cordova": {} diff --git a/ios/App/App/capacitor.config.json b/ios/App/App/capacitor.config.json index 1183dd9397..1df0b893a9 100644 --- a/ios/App/App/capacitor.config.json +++ b/ios/App/App/capacitor.config.json @@ -10,6 +10,9 @@ "launchAutoHide": false, "androidScaleType": "CENTER_INSIDE", "backgroundColor": "#ffffff" + }, + "CapacitorHttp": { + "enabled": true } }, "cordova": {} diff --git a/manifest.chrome.json b/manifest.chrome.json index 53c349f024..16ff29ae12 100644 --- a/manifest.chrome.json +++ b/manifest.chrome.json @@ -2,7 +2,7 @@ "manifest_version": 3, "name": "floccus bookmarks sync", "short_name": "floccus", - "version": "5.1.3.1", + "version": "5.1.4.1", "description": "__MSG_DescriptionExtension__", "icons": { "48": "icons/logo.png", diff --git a/manifest.firefox.json b/manifest.firefox.json index 0ad1c2d95e..2707e5ac20 100644 --- a/manifest.firefox.json +++ b/manifest.firefox.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "floccus bookmarks sync", "short_name": "floccus", - "version": "5.1.3.1", + "version": "5.1.4.1", "description": "__MSG_DescriptionExtension__", "icons": { "48": "icons/logo.png", diff --git a/manifest.json b/manifest.json index 0ad1c2d95e..2707e5ac20 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "floccus bookmarks sync", "short_name": "floccus", - "version": "5.1.3.1", + "version": "5.1.4.1", "description": "__MSG_DescriptionExtension__", "icons": { "48": "icons/logo.png", diff --git a/package-lock.json b/package-lock.json index 8d4a004095..1f0dd1742e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "floccus", - "version": "5.1.3", + "version": "5.1.4-alpha.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "floccus", - "version": "5.1.3", + "version": "5.1.4-alpha.2", "license": "MPL-2.0", "dependencies": { "@byteowls/capacitor-oauth2": "5.x", @@ -1768,25 +1768,25 @@ } }, "node_modules/@capacitor/android": { - "version": "5.5.1", - "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-5.5.1.tgz", - "integrity": "sha512-WTnPnpaEvTtaEtTNRbh06Y1afF7A4plY/4uajAL0WW8tdR1FxieadF357yKGiAT6CudI/B+eOu6rxn6qWuphKg==", + "version": "5.7.5", + "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-5.7.5.tgz", + "integrity": "sha512-VKb9VarGA2hJ8PuLk4EhSq4jvgM+V8JOoNw00WdD6Q4rbgDKSa7WIKTw75sFrNRGiwHSZ99FPvmisJfr1Spk+Q==", "peerDependencies": { - "@capacitor/core": "^5.5.0" + "@capacitor/core": "^5.7.0" } }, "node_modules/@capacitor/app": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/@capacitor/app/-/app-5.0.6.tgz", - "integrity": "sha512-6ZXVdnNmaYILasC/RjQw+yfTmq2ZO7Q3v5lFcDVfq3PFGnybyYQh+RstBrYri+376OmXOXxBD7E6UxBhrMzXGA==", + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/@capacitor/app/-/app-5.0.7.tgz", + "integrity": "sha512-oad0jwQu+vgQDukeS9UV56yG10dlxkAGGl26IQpZlTmg3dTI9qSJtvhmlLfkF0nEtoj5IsVQUPE+NLH1oZkgGQ==", "peerDependencies": { "@capacitor/core": "^5.0.0" } }, "node_modules/@capacitor/cli": { - "version": "5.5.1", - "resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-5.5.1.tgz", - "integrity": "sha512-/oGd2IIc+k1H/fc7tUzP7vqMtZi0gNcJ4/4wUE2kzAnETxxxHXMM/2V62KfjCby/OOAzJbtI7n5OPlnWE9un1A==", + "version": "5.7.5", + "resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-5.7.5.tgz", + "integrity": "sha512-CEgCXq3NNacS+9EptJXM+Cm915oB8eNPhiTP7ylKsQchrY0CGbeyO5y4A/oYnB/h4f+UiaX3ShlIOljx3+agqw==", "dependencies": { "@ionic/cli-framework-output": "^2.2.5", "@ionic/utils-fs": "^3.1.6", @@ -1796,7 +1796,7 @@ "debug": "^4.3.4", "env-paths": "^2.2.0", "kleur": "^4.1.4", - "native-run": "^1.7.3", + "native-run": "^2.0.0", "open": "^8.4.0", "plist": "^3.0.5", "prompts": "^2.4.2", @@ -1845,9 +1845,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/@capacitor/core": { - "version": "5.5.1", - "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-5.5.1.tgz", - "integrity": "sha512-VG6Iv8Q7ZAbvjodxpvjcSe0jfxUwZXnvjbi93ehuJ6eYP8U926qLSXyrT/DToZq+F6v/HyGyVgn3mrE/9jW2Tg==", + "version": "5.7.5", + "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-5.7.5.tgz", + "integrity": "sha512-babBo26lgIyKkAOr/AbPq5wwi9I4uHDP0lBteJq7p4xZElA6tAA8mD3xRH1/4EKmZ4+acYpKmmyegX3zsVh37A==", "dependencies": { "tslib": "^2.1.0" } @@ -9348,11 +9348,11 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/ini": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ini/-/ini-3.0.1.tgz", - "integrity": "sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.2.tgz", + "integrity": "sha512-AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw==", "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/inquirer": { @@ -11627,27 +11627,27 @@ } }, "node_modules/native-run": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/native-run/-/native-run-1.7.4.tgz", - "integrity": "sha512-yDEwTp66vmXpqFiSQzz4sVQgyq5U58gGRovglY4GHh12ITyWa6mh6Lbpm2gViVOVD1JYFtYnwcgr7GTFBinXNA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/native-run/-/native-run-2.0.1.tgz", + "integrity": "sha512-XfG1FBZLM50J10xH9361whJRC9SHZ0Bub4iNRhhI61C8Jv0e1ud19muex6sNKB51ibQNUJNuYn25MuYET/rE6w==", "dependencies": { - "@ionic/utils-fs": "^3.1.6", - "@ionic/utils-terminal": "^2.3.3", + "@ionic/utils-fs": "^3.1.7", + "@ionic/utils-terminal": "^2.3.4", "bplist-parser": "^0.3.2", "debug": "^4.3.4", "elementtree": "^0.1.7", - "ini": "^3.0.1", - "plist": "^3.0.6", - "split2": "^4.1.0", + "ini": "^4.1.1", + "plist": "^3.1.0", + "split2": "^4.2.0", "through2": "^4.0.2", - "tslib": "^2.4.0", + "tslib": "^2.6.2", "yauzl": "^2.10.0" }, "bin": { "native-run": "bin/native-run" }, "engines": { - "node": ">=12.13.0" + "node": ">=16.0.0" } }, "node_modules/native-run/node_modules/readable-stream": { diff --git a/package.json b/package.json index d9e8417c22..c6cdc731e9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "floccus", - "version": "5.1.3", + "version": "5.1.4-alpha.2", "description": "Sync your bookmarks privately across browsers and devices", "scripts": { "build": "gulp",