Skip to content

Commit 7f6f088

Browse files
committed
Merge branch 'main' into react/suspense
# Conflicts: # pnpm-lock.yaml
2 parents 8c286be + f88a162 commit 7f6f088

File tree

95 files changed

+5320
-297
lines changed

Some content is hidden

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

95 files changed

+5320
-297
lines changed

.changeset/smart-jobs-change.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626

2727
- Vue composables for PowerSync.
2828

29+
- [packages/tanstack-query](./packages/tanstack-query/README.md)
30+
31+
- Tanstack Query integration for React.
32+
2933
- [packages/attachments](./packages/attachments/README.md)
3034

3135
- Attachments helper package for React Native and JavaScript/TypeScript projects.
@@ -34,6 +38,10 @@
3438

3539
- Kysely integration (ORM) for React Native and JavaScript/TypeScript projects.
3640

41+
- [packages/powersync-op-sqlite](./packages/powersync-op-sqlite/README.md)
42+
43+
- OP-SQLite integration for React Native projects.
44+
3745
- [packages/common](./packages/common/README.md)
3846
- Shared package: TypeScript implementation of a PowerSync database connector and streaming sync bucket implementation.
3947

demos/angular-supabase-todolist/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@angular/platform-browser-dynamic": "^18.1.1",
2222
"@angular/router": "^18.1.1",
2323
"@angular/service-worker": "^18.1.1",
24-
"@journeyapps/wa-sqlite": "^0.3.0",
24+
"@journeyapps/wa-sqlite": "^0.4.0",
2525
"@powersync/web": "workspace:*",
2626
"@supabase/supabase-js": "^2.44.4",
2727
"rxjs": "~7.8.1",

demos/django-react-native-todolist/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"dependencies": {
1111
"@azure/core-asynciterator-polyfill": "^1.0.2",
1212
"@expo/vector-icons": "^14.0.0",
13-
"@journeyapps/react-native-quick-sqlite": "^1.3.0",
13+
"@journeyapps/react-native-quick-sqlite": "^2.0.0",
1414
"@powersync/common": "workspace:*",
1515
"@powersync/react": "workspace:*",
1616
"@powersync/react-native": "workspace:*",

demos/example-capacitor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@capacitor/core": "latest",
2424
"@capacitor/ios": "^6.0.0",
2525
"@capacitor/splash-screen": "latest",
26-
"@journeyapps/wa-sqlite": "^0.3.0",
26+
"@journeyapps/wa-sqlite": "^0.4.0",
2727
"@powersync/react": "workspace:*",
2828
"@powersync/web": "workspace:*",
2929
"js-logger": "^1.6.1",

demos/example-electron/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"dependencies": {
2222
"@emotion/react": "^11.13.0",
2323
"@emotion/styled": "^11.13.0",
24-
"@journeyapps/wa-sqlite": "^0.3.0",
24+
"@journeyapps/wa-sqlite": "^0.4.0",
2525
"@mui/icons-material": "^5.15.16",
2626
"@mui/material": "^5.15.16",
2727
"@mui/x-data-grid": "^6.19.11",

demos/example-nextjs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@emotion/react": "^11.11.4",
1515
"@emotion/styled": "^11.11.5",
1616
"@fontsource/roboto": "^5.0.13",
17-
"@journeyapps/wa-sqlite": "^0.3.0",
17+
"@journeyapps/wa-sqlite": "^0.4.0",
1818
"@lexical/react": "^0.15.0",
1919
"@mui/icons-material": "^5.15.18",
2020
"@mui/material": "^5.15.18",

demos/react-multi-client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"test:build": "pnpm build"
1111
},
1212
"dependencies": {
13-
"@journeyapps/wa-sqlite": "^0.3.0",
13+
"@journeyapps/wa-sqlite": "^0.4.0",
1414
"@powersync/react": "workspace:*",
1515
"@powersync/web": "workspace:*",
1616
"@supabase/supabase-js": "^2.43.1",

demos/react-native-supabase-group-chat/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"dependencies": {
2222
"@azure/core-asynciterator-polyfill": "^1.0.2",
2323
"@faker-js/faker": "8.3.1",
24-
"@journeyapps/react-native-quick-sqlite": "^1.3.0",
24+
"@journeyapps/react-native-quick-sqlite": "^2.0.0",
2525
"@powersync/common": "workspace:*",
2626
"@powersync/react": "workspace:*",
2727
"@powersync/react-native": "workspace:*",

demos/react-native-supabase-todolist/android/app/build.gradle

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,27 @@ apply plugin: "com.facebook.react"
44

55
def projectRoot = rootDir.getAbsoluteFile().getParentFile().getAbsolutePath()
66

7+
static def versionToNumber(major, minor, patch) {
8+
return patch * 100 + minor * 10000 + major * 1000000
9+
}
10+
11+
def getRNVersion() {
12+
def version = providers.exec {
13+
workingDir(projectDir)
14+
commandLine("node", "-e", "console.log(require('react-native/package.json').version);")
15+
}.standardOutput.asText.get().trim()
16+
17+
def coreVersion = version.split("-")[0]
18+
def (major, minor, patch) = coreVersion.tokenize('.').collect { it.toInteger() }
19+
20+
return versionToNumber(
21+
major,
22+
minor,
23+
patch
24+
)
25+
}
26+
def rnVersion = getRNVersion()
27+
728
/**
829
* This is the configuration block to customize your React Native Android app.
930
* By default you don't need to apply any configuration, just uncomment the lines you need.
@@ -57,6 +78,11 @@ react {
5778
//
5879
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
5980
// hermesFlags = ["-O", "-output-source-map"]
81+
82+
if (rnVersion >= versionToNumber(0, 75, 0)) {
83+
/* Autolinking */
84+
autolinkLibrariesWithApp()
85+
}
6086
}
6187

6288
/**
@@ -169,5 +195,7 @@ dependencies {
169195
}
170196
}
171197

172-
apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim(), "../native_modules.gradle");
173-
applyNativeModulesAppBuildGradle(project)
198+
if (rnVersion < versionToNumber(0, 75, 0)) {
199+
apply from: new File(["node", "--print", "require.resolve('@react-native-community/cli-platform-android/package.json', { paths: [require.resolve('react-native/package.json')] })"].execute(null, rootDir).text.trim(), "../native_modules.gradle");
200+
applyNativeModulesAppBuildGradle(project)
201+
}

0 commit comments

Comments
 (0)