Skip to content

Commit

Permalink
Merge branch 'main' into prebundling
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/react-native/package.json
#	pnpm-lock.yaml
  • Loading branch information
Chriztiaan committed Jul 29, 2024
2 parents 5e03971 + b0b31ac commit 5642b97
Show file tree
Hide file tree
Showing 54 changed files with 422 additions and 47 deletions.
6 changes: 5 additions & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,13 @@
"access": "restricted",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": [],
"ignore": ["!@powersync/*"],
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
"onlyUpdatePeerDependentsWhenOutOfRange": true,
"updateInternalDependents": "out-of-range"
},
"privatePackages": {
"tag": true,
"version": true
}
}
5 changes: 5 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.git
.idea

**/node_modules
**/dist
25 changes: 25 additions & 0 deletions .github/workflows/diagnostics-image-build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Diagnostics Image Build

on:
push:

concurrency: ${{ github.workflow }}-${{ github.ref }}

jobs:
build-docker-image:
name: Build diagnostics-app Docker Image
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Build Image
uses: docker/build-push-action@v5
with:
platforms: linux/amd64
cache-from: type=registry,ref=${{vars.DIAGNOSTICS_DOCKER_REGISTRY}}:latest
context: .
file: ./tools/diagnostics-app/Dockerfile
56 changes: 56 additions & 0 deletions .github/workflows/diagnostics-image-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# Publishes the Diagnostics App Docker image to DockerHub
# This is triggered whenever the `diagnostics-app` package is versioned and tagged
name: Diagnostics Image Release

on:
workflow_dispatch:
push:
tags:
- '@powersync/diagnostics-app*'

concurrency: ${{ github.workflow }}-${{ github.ref }}

jobs:
release-docker-image:
name: Build and Release diagnostics-app Docker Image
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/main'
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

# This uses the service's package.json version for the Docker Image tag
- name: Get Image Version from package.json
id: get_version
run: echo "IMAGE_VERSION=$(node -p "require('./tools/diagnostics-app/package.json').version")" >> $GITHUB_OUTPUT

- name: Build Image and Push
uses: docker/build-push-action@v5
with:
platforms: linux/amd64
cache-from: type=registry,ref=${{vars.DIAGNOSTICS_DOCKER_REGISTRY}}:latest
context: .
tags: ${{vars.DIAGNOSTICS_DOCKER_REGISTRY}}:latest,${{vars.DIAGNOSTICS_DOCKER_REGISTRY}}:${{steps.get_version.outputs.IMAGE_VERSION}}
push: true
file: ./tools/diagnostics-app/Dockerfile

# Updates the README section on the DockerHub page
- name: Update repo description
# Note that this 3rd party extention is recommended in the DockerHub docs:
# https://docs.docker.com/build/ci/github-actions/update-dockerhub-desc/
uses: peter-evans/dockerhub-description@e98e4d1628a5f3be2be7c231e50981aee98723ae # v4.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
repository: ${{vars.DIAGNOSTICS_DOCKER_REGISTRY}}
# This is the contents of what will be shown on DockerHub
readme-filepath: ./tools/diagnostics-app/README.md
4 changes: 3 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ jobs:
- uses: pnpm/action-setup@v2
name: Install pnpm
with:
version: 9
# Pnpm 9.4 introduces this https://github.com/pnpm/pnpm/pull/7633
# which causes workspace:^1.2.0 to be converted to 1.2.0^1.2.0
version: 9.3
run_install: false
- name: Get pnpm store directory
shell: bash
Expand Down
6 changes: 6 additions & 0 deletions demos/angular-supabase-todolist/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# PowerSync Angular Demo

## 0.0.25

### Patch Changes

- @powersync/web@1.2.4

## 0.0.24

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion demos/angular-supabase-todolist/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-supabase-todolist",
"version": "0.0.24",
"version": "0.0.25",
"scripts": {
"ng": "ng",
"serve": "ng serve",
Expand Down
9 changes: 9 additions & 0 deletions demos/django-react-native-todolist/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# django-react-native-todolist

## 1.2.2

### Patch Changes

- Updated dependencies [44c568b]
- @powersync/common@1.13.1
- @powersync/react@1.3.7
- @powersync/react-native@1.8.3

## 1.2.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion demos/django-react-native-todolist/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "django-react-native-todolist",
"version": "1.2.1",
"version": "1.2.2",
"main": "./index.js",
"scripts": {
"android": "expo run:android",
Expand Down
7 changes: 7 additions & 0 deletions demos/example-capacitor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# example-capacitor

## 0.0.11

### Patch Changes

- @powersync/react@1.3.7
- @powersync/web@1.2.4

## 0.0.10

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion demos/example-capacitor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "example-capacitor",
"version": "0.0.10",
"version": "0.0.11",
"description": "Example of using Capacitor with PowerSync",
"main": "index.js",
"private": true,
Expand Down
7 changes: 7 additions & 0 deletions demos/example-electron/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# example-electron

## 1.0.16

### Patch Changes

- @powersync/react@1.3.7
- @powersync/web@1.2.4

## 1.0.15

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion demos/example-electron/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "example-electron",
"productName": "example-electron",
"version": "1.0.15",
"version": "1.0.16",
"description": "Example of using Electron with PowerSync",
"main": ".vite/build/main.js",
"type": "module",
Expand Down
7 changes: 7 additions & 0 deletions demos/example-nextjs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# example-nextjs

## 0.1.15

### Patch Changes

- @powersync/react@1.3.7
- @powersync/web@1.2.4

## 0.1.14

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion demos/example-nextjs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "example-nextjs",
"version": "0.1.14",
"version": "0.1.15",
"private": true,
"scripts": {
"build": "next build",
Expand Down
Binary file modified demos/example-nextjs/src/app/favicon.ico
Binary file not shown.
6 changes: 6 additions & 0 deletions demos/example-vite/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# example-vite

## 0.0.33

### Patch Changes

- @powersync/web@1.2.4

## 0.0.32

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion demos/example-vite/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "example-vite",
"private": true,
"version": "0.0.32",
"version": "0.0.33",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
7 changes: 7 additions & 0 deletions demos/react-multi-client/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# react-multi-client

## 0.0.7

### Patch Changes

- @powersync/react@1.3.7
- @powersync/web@1.2.4

## 0.0.6

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion demos/react-multi-client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-multi-client",
"version": "0.0.6",
"version": "0.0.7",
"private": true,
"scripts": {
"dev": "vite",
Expand Down
9 changes: 9 additions & 0 deletions demos/react-native-supabase-group-chat/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# react-native-supabase-group-chat

## 1.1.13

### Patch Changes

- Updated dependencies [44c568b]
- @powersync/common@1.13.1
- @powersync/react@1.3.7
- @powersync/react-native@1.8.3

## 1.1.12

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion demos/react-native-supabase-group-chat/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-supabase-group-chat",
"version": "1.1.12",
"version": "1.1.13",
"main": "expo-router/entry",
"scripts": {
"clear": "find ./ -type d -and \\( -name node_modules -or -name build -or -name dist \\) -exec rm -rf '{}' +",
Expand Down
10 changes: 10 additions & 0 deletions demos/react-native-supabase-todolist/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# react-native-supabase-todolist

## 1.3.8

### Patch Changes

- Updated dependencies [44c568b]
- @powersync/common@1.13.1
- @powersync/attachments@2.0.12
- @powersync/react@1.3.7
- @powersync/react-native@1.8.3

## 1.3.7

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion demos/react-native-supabase-todolist/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-supabase-todolist",
"version": "1.3.7",
"version": "1.3.8",
"main": "./index.js",
"scripts": {
"android": "expo run:android",
Expand Down
7 changes: 7 additions & 0 deletions demos/react-supabase-todolist/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# react-supabase-todolist

## 0.3.16

### Patch Changes

- @powersync/react@1.3.7
- @powersync/web@1.2.4

## 0.3.15

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion demos/react-supabase-todolist/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-supabase-todolist",
"version": "0.3.15",
"version": "0.3.16",
"private": true,
"scripts": {
"dev": "vite",
Expand Down
7 changes: 7 additions & 0 deletions demos/vue-supabase-todolist/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# vue-supabase-todolist

## 0.0.22

### Patch Changes

- @powersync/vue@0.1.9
- @powersync/web@1.2.4

## 0.0.21

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion demos/vue-supabase-todolist/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "vue-supabase-todolist",
"private": true,
"version": "0.0.21",
"version": "0.0.22",
"type": "module",
"scripts": {
"dev": "vue-tsc --noEmit --watch & vite dev",
Expand Down
7 changes: 7 additions & 0 deletions demos/yjs-react-supabase-text-collab/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# yjs-react-supabase-text-collab

## 0.1.16

### Patch Changes

- @powersync/react@1.3.7
- @powersync/web@1.2.4

## 0.1.15

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion demos/yjs-react-supabase-text-collab/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "yjs-react-supabase-text-collab",
"version": "0.1.15",
"version": "0.1.16",
"private": true,
"scripts": {
"dev": "vite",
Expand Down
15 changes: 15 additions & 0 deletions packages/attachments/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# @powersync/attachments

## 2.0.13

### Patch Changes

- 843cfec: revert peer dep change
- Updated dependencies [05f3dbd]
- @powersync/common@1.14.0

## 2.0.12

### Patch Changes

- Updated dependencies [44c568b]
- @powersync/common@1.13.1

## 2.0.11

### Patch Changes
Expand Down
Loading

0 comments on commit 5642b97

Please sign in to comment.