Skip to content

Commit ebbf7f7

Browse files
committed
Merge branch 'main' into example-enable-newarch
2 parents e2a463f + d1269a7 commit ebbf7f7

File tree

7 files changed

+1029
-31
lines changed

7 files changed

+1029
-31
lines changed

bun.lockb

-1.6 KB
Binary file not shown.

example/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"babel-plugin-module-resolver": "^4.1.0",
4949
"babel-plugin-transform-typescript-metadata": "^0.3.2",
5050
"mocha": "^10.1.0",
51-
"patch-package": "^6.5.0",
51+
"patch-package": "^8.0.0",
5252
"postinstall-postinstall": "^2.1.0",
5353
"react-test-renderer": "18.3.1"
5454
}

package.json

Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "react-native-quick-sqlite-workspace",
33
"packageManager": "[email protected]",
44
"private": "true",
5-
"version": "8.1.0",
5+
"version": "8.2.0",
66
"workspaces": [
77
"package",
88
"example"
@@ -14,10 +14,11 @@
1414
"scripts": {
1515
"package": "bun --cwd package",
1616
"example": "bun --cwd example",
17+
"postinstall": "patch-package",
1718
"format-cpp": "./scripts/clang-format.sh",
1819
"typescript": "bun --filter=\"**\" typescript",
1920
"lint": "bun --filter=\"**\" lint",
20-
"bootstrap": "bun package && bun example && bun example pods",
21+
"bootstrap": "bun --filter=\"**\" install && bun typescript && bun example pods",
2122
"release": "release-it",
2223
"clean": "rm -rf **/tsconfig.tsbuildinfo node_modules package/node_module package/lib"
2324
},
@@ -32,7 +33,7 @@
3233
"@jamesacarr/eslint-formatter-github-actions": "^0.2.0",
3334
"@react-native/eslint-config": "0.75.2",
3435
"@release-it/bumper": "^6.0.1",
35-
"@release-it/conventional-changelog": "^8.0.1",
36+
"@release-it/conventional-changelog": "^8.0.2",
3637
"@tsconfig/react-native": "^2.0.2",
3738
"@types/eslint__js": "^8.42.3",
3839
"@types/jest": "^29.5.13",
@@ -54,6 +55,46 @@
5455
"github": {
5556
"release": true
5657
},
57-
"plugins": {}
58-
}
58+
"plugins": {
59+
"@release-it/conventional-changelog": {
60+
"preset": {
61+
"name": "conventionalcommits",
62+
"types": [
63+
{
64+
"type": "feat",
65+
"section": "✨ Features"
66+
},
67+
{
68+
"type": "perf",
69+
"section": "💨 Performance Improvements"
70+
},
71+
{
72+
"type": "fix",
73+
"section": "🐛 Bug Fixes"
74+
},
75+
{
76+
"type": "chore(deps)",
77+
"section": "🛠️ Dependency Upgrades"
78+
},
79+
{
80+
"type": "docs",
81+
"section": "📚 Documentation"
82+
}
83+
]
84+
}
85+
},
86+
"@release-it/bumper": {
87+
"out": {
88+
"file": "package.json",
89+
"path": [
90+
"package"
91+
]
92+
}
93+
}
94+
}
95+
},
96+
"dependencies": {
97+
"patch-package": "^8.0.0"
98+
},
99+
"package": "8.2.0"
59100
}

package/bump-version.sh

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

package/ios/QuickSQLite.mm

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
@implementation RNQuickSQLiteInit
1111

12-
RCT_EXPORT_MODULE()
12+
@synthesize bridge = _bridge;
1313

1414
- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
1515
(const facebook::react::ObjCTurboModule::InitParams &)params
@@ -20,8 +20,7 @@ @implementation RNQuickSQLiteInit
2020
- (NSNumber *) install {
2121
NSLog(@"Installing QuickSQLite module...");
2222

23-
RCTBridge *bridge = [RCTBridge currentBridge];
24-
RCTCxxBridge *cxxBridge = (RCTCxxBridge *)bridge;
23+
RCTCxxBridge *cxxBridge = (RCTCxxBridge *)self.bridge;
2524
if (cxxBridge == nil) {
2625
return @false;
2726
}
@@ -31,7 +30,7 @@ - (NSNumber *) install {
3130
return @false;
3231
}
3332
auto &runtime = *jsiRuntime;
34-
auto callInvoker = bridge.jsCallInvoker;
33+
auto callInvoker = cxxBridge.jsCallInvoker;
3534

3635
// Get appGroupID value from Info.plist using key "AppGroup"
3736
NSString *appGroupID = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"ReactNativeQuickSQLite_AppGroup"];

package/package.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-quick-sqlite",
3-
"version": "8.1.0",
3+
"version": "8.2.0",
44
"description": "Fast SQLite for react-native",
55
"main": "lib/commonjs/index",
66
"module": "lib/module/index",
@@ -25,9 +25,8 @@
2525
"scripts": {
2626
"typescript": "tsc --noEmit",
2727
"lint": "eslint \"**/*.{js,ts,tsx}\" --fix",
28-
"prepare": "bob build",
29-
"bootstrap": "bun --filter=\"**\" install && bun tsc && bun --filter=\"example\" pods",
30-
"bump": "./bump-version.sh"
28+
"prepare": "rm -rf lib && bun typescript && bob build",
29+
"release": "bun prepare && release-it"
3130
},
3231
"keywords": [
3332
"react-native",
@@ -82,5 +81,15 @@
8281
}
8382
]
8483
]
84+
},
85+
"release-it": {
86+
"npm": {
87+
"publish": true
88+
},
89+
"git": false,
90+
"github": {
91+
"release": false
92+
},
93+
"plugins": {}
8594
}
8695
}

0 commit comments

Comments
 (0)