Skip to content

Commit 5642b97

Browse files
committed
Merge branch 'main' into prebundling
# Conflicts: # packages/react-native/package.json # pnpm-lock.yaml
2 parents 5e03971 + b0b31ac commit 5642b97

File tree

54 files changed

+422
-47
lines changed

Some content is hidden

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

54 files changed

+422
-47
lines changed

.changeset/config.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@
77
"access": "restricted",
88
"baseBranch": "main",
99
"updateInternalDependencies": "patch",
10-
"ignore": [],
10+
"ignore": ["!@powersync/*"],
1111
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
1212
"onlyUpdatePeerDependentsWhenOutOfRange": true,
1313
"updateInternalDependents": "out-of-range"
14+
},
15+
"privatePackages": {
16+
"tag": true,
17+
"version": true
1418
}
1519
}

.dockerignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.git
2+
.idea
3+
4+
**/node_modules
5+
**/dist
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Diagnostics Image Build
2+
3+
on:
4+
push:
5+
6+
concurrency: ${{ github.workflow }}-${{ github.ref }}
7+
8+
jobs:
9+
build-docker-image:
10+
name: Build diagnostics-app Docker Image
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v4
15+
16+
- name: Set up Docker Buildx
17+
uses: docker/setup-buildx-action@v3
18+
19+
- name: Build Image
20+
uses: docker/build-push-action@v5
21+
with:
22+
platforms: linux/amd64
23+
cache-from: type=registry,ref=${{vars.DIAGNOSTICS_DOCKER_REGISTRY}}:latest
24+
context: .
25+
file: ./tools/diagnostics-app/Dockerfile
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# Publishes the Diagnostics App Docker image to DockerHub
2+
# This is triggered whenever the `diagnostics-app` package is versioned and tagged
3+
name: Diagnostics Image Release
4+
5+
on:
6+
workflow_dispatch:
7+
push:
8+
tags:
9+
- '@powersync/diagnostics-app*'
10+
11+
concurrency: ${{ github.workflow }}-${{ github.ref }}
12+
13+
jobs:
14+
release-docker-image:
15+
name: Build and Release diagnostics-app Docker Image
16+
runs-on: ubuntu-latest
17+
if: github.ref == 'refs/heads/main'
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v4
21+
22+
- name: Set up Docker Buildx
23+
uses: docker/setup-buildx-action@v3
24+
25+
- name: Login to Docker Hub
26+
uses: docker/login-action@v3
27+
with:
28+
username: ${{ secrets.DOCKERHUB_USERNAME }}
29+
password: ${{ secrets.DOCKERHUB_TOKEN }}
30+
31+
# This uses the service's package.json version for the Docker Image tag
32+
- name: Get Image Version from package.json
33+
id: get_version
34+
run: echo "IMAGE_VERSION=$(node -p "require('./tools/diagnostics-app/package.json').version")" >> $GITHUB_OUTPUT
35+
36+
- name: Build Image and Push
37+
uses: docker/build-push-action@v5
38+
with:
39+
platforms: linux/amd64
40+
cache-from: type=registry,ref=${{vars.DIAGNOSTICS_DOCKER_REGISTRY}}:latest
41+
context: .
42+
tags: ${{vars.DIAGNOSTICS_DOCKER_REGISTRY}}:latest,${{vars.DIAGNOSTICS_DOCKER_REGISTRY}}:${{steps.get_version.outputs.IMAGE_VERSION}}
43+
push: true
44+
file: ./tools/diagnostics-app/Dockerfile
45+
46+
# Updates the README section on the DockerHub page
47+
- name: Update repo description
48+
# Note that this 3rd party extention is recommended in the DockerHub docs:
49+
# https://docs.docker.com/build/ci/github-actions/update-dockerhub-desc/
50+
uses: peter-evans/dockerhub-description@e98e4d1628a5f3be2be7c231e50981aee98723ae # v4.0.0
51+
with:
52+
username: ${{ secrets.DOCKERHUB_USERNAME }}
53+
password: ${{ secrets.DOCKERHUB_TOKEN }}
54+
repository: ${{vars.DIAGNOSTICS_DOCKER_REGISTRY}}
55+
# This is the contents of what will be shown on DockerHub
56+
readme-filepath: ./tools/diagnostics-app/README.md

.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ jobs:
2121
- uses: pnpm/action-setup@v2
2222
name: Install pnpm
2323
with:
24-
version: 9
24+
# Pnpm 9.4 introduces this https://github.com/pnpm/pnpm/pull/7633
25+
# which causes workspace:^1.2.0 to be converted to 1.2.0^1.2.0
26+
version: 9.3
2527
run_install: false
2628
- name: Get pnpm store directory
2729
shell: bash

demos/angular-supabase-todolist/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# PowerSync Angular Demo
22

3+
## 0.0.25
4+
5+
### Patch Changes
6+
7+
- @powersync/web@1.2.4
8+
39
## 0.0.24
410

511
### Patch Changes

demos/angular-supabase-todolist/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-supabase-todolist",
3-
"version": "0.0.24",
3+
"version": "0.0.25",
44
"scripts": {
55
"ng": "ng",
66
"serve": "ng serve",

demos/django-react-native-todolist/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# django-react-native-todolist
22

3+
## 1.2.2
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [44c568b]
8+
- @powersync/common@1.13.1
9+
- @powersync/react@1.3.7
10+
- @powersync/react-native@1.8.3
11+
312
## 1.2.1
413

514
### Patch Changes

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "django-react-native-todolist",
3-
"version": "1.2.1",
3+
"version": "1.2.2",
44
"main": "./index.js",
55
"scripts": {
66
"android": "expo run:android",

demos/example-capacitor/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# example-capacitor
22

3+
## 0.0.11
4+
5+
### Patch Changes
6+
7+
- @powersync/react@1.3.7
8+
- @powersync/web@1.2.4
9+
310
## 0.0.10
411

512
### Patch Changes

0 commit comments

Comments
 (0)