Skip to content

Commit 1ecf641

Browse files
committed
Merge remote-tracking branch 'origin/main' into reduce-bundling
2 parents eb3a81d + 58cf447 commit 1ecf641

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+2395
-58
lines changed

.changeset/breezy-carrots-fold.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@powersync/capacitor': patch
3+
---
4+
5+
[Android] Fixed missing CMakeLists file error.

.github/workflows/test-isolated.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,16 @@ jobs:
1717
- name: Setup NodeJS
1818
uses: actions/setup-node@v4
1919
with:
20-
node-version-file: '.nvmrc'
20+
node-version-file: ".nvmrc"
21+
22+
- name: Set up JDK 17
23+
uses: actions/setup-java@v4
24+
with:
25+
java-version: "21"
26+
distribution: "temurin"
27+
28+
- name: Set up Gradle
29+
uses: gradle/actions/setup-gradle@v4
2130

2231
- uses: pnpm/action-setup@v2
2332
name: Install pnpm

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ _[PowerSync](https://www.powersync.com) is a sync engine for building local-firs
3636

3737
- [packages/attachments](./packages/attachments/README.md)
3838

39-
- Attachments helper package for React Native and JavaScript/TypeScript projects.
39+
- Attachments helper package for React Native and JavaScript/TypeScript projects.
4040

4141
- [packages/kysely-driver](./packages/kysely-driver/README.md)
4242

@@ -67,6 +67,7 @@ Demo applications are located in the [`demos/`](./demos/) directory. Also see ou
6767
### Web
6868

6969
- [demos/react-supabase-todolist](./demos/react-supabase-todolist/README.md): A React to-do list example app using the PowerSync Web SDK and a Supabase backend.
70+
- [demos/react-supabase-todolist-tanstackdb](./demos/react-supabase-todolist-tanstackdb/README.md): A React to-do list example app using the PowerSync Web SDK and a Supabase backend + [TanStackDB](https://tanstack.com/db/latest) collections.
7071
- [demos/react-multi-client](./demos/react-multi-client/README.md): A React widget that illustrates how data flows from one PowerSync client to another.
7172
- [demos/yjs-react-supabase-text-collab](./demos/yjs-react-supabase-text-collab/README.md): A React real-time text editing collaboration example app powered by [Yjs](https://github.com/yjs/yjs) CRDTs and [Tiptap](https://tiptap.dev/), using the PowerSync Web SDK and a Supabase backend.
7273
- [demos/vue-supabase-todolist](./demos/vue-supabase-todolist/README.md): A Vue to-do list example app using the PowerSync Web SDK and a Supabase backend.

demos/example-capacitor/android/app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ android {
2020
release {
2121
minifyEnabled false
2222
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
23-
signingConfig signingConfigs.debug
2423
}
2524
}
2625
}
2.6 KB
Binary file not shown.

demos/example-capacitor/capacitor.config.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,14 @@
99
}
1010
},
1111
"android": {
12-
"loggingBehavior": "production"
12+
"loggingBehavior": "production",
13+
"buildOptions": {
14+
"releaseType": "APK",
15+
"keystorePath": "debug-isolated.keystore",
16+
"keystorePassword": "android",
17+
"keystoreAlias": "androiddebugkey",
18+
"keystoreAliasPassword": "android"
19+
}
1320
},
1421
"ios": {
1522
"loggingBehavior": "production"

demos/example-capacitor/ios/App/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ PODS:
99
- CapacitorSplashScreen (7.0.3):
1010
- Capacitor
1111
- powersync-sqlite-core (0.4.8)
12-
- PowersyncCapacitor (0.0.1):
12+
- PowersyncCapacitor (0.1.0):
1313
- Capacitor
1414
- powersync-sqlite-core (~> 0.4.6)
1515
- SQLCipher (~> 4.0)
@@ -51,7 +51,7 @@ SPEC CHECKSUMS:
5151
CapacitorCordova: 435121e81a2df4d0034f0fb11fcefab5104cfdb5
5252
CapacitorSplashScreen: d06ae8804808e9f649a08e7bb7f283c77b688084
5353
powersync-sqlite-core: f48d06a7a9e6f73fee5bbc74da542466be2bb06f
54-
PowersyncCapacitor: d7dcf7f15e24b512571dc87f545855f936ef9537
54+
PowersyncCapacitor: 9c39e1aec5125bdea55fa61e8277e4a3b16853d2
5555
SQLCipher: eb79c64049cb002b4e9fcb30edb7979bf4706dfc
5656
ZIPFoundation: dfd3d681c4053ff7e2f7350bc4e53b5dba3f5351
5757

demos/example-capacitor/package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"sync": "npx cap sync",
1515
"ios": "pnpm build && pnpm sync && npx cap run ios",
1616
"android": "pnpm build && pnpm sync && npx cap run android",
17+
"test:build": "pnpm build && npx cap sync && npx cap build android",
1718
"start": "vite",
1819
"build": "vite build",
1920
"preview": "vite preview"
@@ -35,6 +36,9 @@
3536
"devDependencies": {
3637
"@capacitor/cli": "^7.4.3",
3738
"@swc/core": "~1.6.0",
39+
"@mui/material": "^5.15.12",
40+
"@emotion/react": "11.11.4",
41+
"@emotion/styled": "11.11.5",
3842
"@types/node": "^20.12.12",
3943
"@types/react": "^18.3.2",
4044
"@types/react-dom": "^18.3.0",

demos/example-capacitor/tsconfig.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,5 @@
1313
"resolveJsonModule": true,
1414
"jsx": "preserve"
1515
},
16-
"references": [
17-
{
18-
"path": "../../packages/web"
19-
}
20-
]
16+
"references": []
2117
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Copy this template: `cp .env.local.template .env.local`
2+
# Edit .env.local and enter your Supabase and PowerSync project details.
3+
VITE_SUPABASE_URL=https://foo.supabase.co
4+
VITE_SUPABASE_ANON_KEY=foo
5+
VITE_POWERSYNC_URL=https://foo.powersync.journeyapps.com

0 commit comments

Comments
 (0)