Skip to content

Commit 1dffc8b

Browse files
committed
Merge branch 'main' into fix/add-transaction-locks
2 parents 7f6e1ed + f09395a commit 1dffc8b

Some content is hidden

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

48 files changed

+3649
-256
lines changed

.clang-format-ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package/cpp/sqlite/*

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
*.pbxproj -text
22
# specific for windows script files
33
*.bat text eol=crlf
4-
.lockb binary diff=lockb

.github/workflows/lint-typescript.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,38 +36,38 @@ jobs:
3636
name: Compile TypeScript (tsc)
3737
runs-on: ubuntu-latest
3838
steps:
39-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@v5
4040
- uses: oven-sh/setup-bun@v2
4141
- uses: reviewdog/action-setup@v1
4242

4343
- name: Install npm dependencies (bun)
4444
run: bun install
4545

46-
- name: Run TypeScript (tsc)
46+
- name: Run TypeScript (tsc) in example
47+
working-directory: example
48+
run: |
49+
bun typecheck | reviewdog -name="tsc" -efm="%f(%l,%c): error TS%n: %m" -reporter="github-pr-review" -filter-mode="nofilter" -fail-level=any -tee
50+
env:
51+
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
52+
53+
- name: Run TypeScript (tsc) in react-native-nitro-sqlite
54+
working-directory: package
4755
run: |
48-
bun typescript | reviewdog -name="tsc" -efm="%f(%l,%c): error TS%n: %m" -reporter="github-pr-review" -filter-mode="nofilter" -fail-on-error -tee
56+
bun typecheck | reviewdog -name="tsc" -efm="%f(%l,%c): error TS%n: %m" -reporter="github-pr-review" -filter-mode="nofilter" -fail-level=any -tee
4957
env:
5058
REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5159

5260
lint:
5361
name: Lint TypeScript (eslint, prettier)
5462
runs-on: ubuntu-latest
5563
steps:
56-
- uses: actions/checkout@v4
64+
- uses: actions/checkout@v5
5765
- uses: oven-sh/setup-bun@v2
58-
- uses: reviewdog/action-setup@v1
5966

6067
- name: Install npm dependencies (bun)
6168
run: bun install
6269

63-
- name: Run ESLint CI in example/
64-
working-directory: example
65-
run: bun lint-ci
66-
- name: Run ESLint CI in react-native-nitro-sqlite
67-
working-directory: package
68-
run: bun lint-ci
69-
70-
- name: Run ESLint with auto-fix in example/
70+
- name: Run ESLint with auto-fix in example
7171
working-directory: example
7272
run: bun lint
7373
- name: Run ESLint with auto-fix in react-native-nitro-sqlite

.prettierignore

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
*.html
2+
*.yml
3+
*.yaml
4+
*.css
5+
*.scss
6+
*.md
7+
*.markdown
8+
9+
package/lib
10+
11+
.well-known
12+
android
13+
ios
14+
vendor
15+
package.json
16+
package-lock.json
17+
18+
# The GH actions don't seem to compile and verify themselves well when Prettier is applied to them
19+
.github/actions/javascript/**/index.js
20+

.prettierrc.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
module.exports = {
2+
quoteProps: 'consistent',
3+
singleQuote: true,
4+
tabWidth: 2,
5+
trailingComma: 'all',
6+
useTabs: false,
7+
singleAttributePerLine: true,
8+
semi: false,
9+
}

.vscode/settings.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"[javascript]": {
3-
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
3+
"editor.defaultFormatter": "esbenp.prettier-vscode"
44
},
55
"[javascriptreact]": {
6-
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
6+
"editor.defaultFormatter": "esbenp.prettier-vscode"
77
},
88
"[typescript]": {
9-
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
9+
"editor.defaultFormatter": "esbenp.prettier-vscode"
1010
},
1111
"[typescriptreact]": {
12-
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
12+
"editor.defaultFormatter": "esbenp.prettier-vscode"
1313
}
1414
}

.watchmanconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{}
1+
{}

bun.lock

Lines changed: 3362 additions & 0 deletions
Large diffs are not rendered by default.

bun.lockb

-537 KB
Binary file not shown.

bunfig.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[install]
2+
# Opt out from isolated installs
3+
linker = "hoisted"
4+
linkWorkspacePackages = true

0 commit comments

Comments
 (0)