Skip to content

Commit

Permalink
Merge branch 'main' into poc-bundle-christiaan-steven
Browse files Browse the repository at this point in the history
# Conflicts:
#	packages/common/package.json
#	packages/react-native/package.json
#	packages/web/package.json
#	pnpm-lock.yaml
  • Loading branch information
Chriztiaan committed Jul 19, 2024
2 parents 9440b7b + ceb8941 commit 0bc04e0
Show file tree
Hide file tree
Showing 31 changed files with 2,532 additions and 1,733 deletions.
5 changes: 0 additions & 5 deletions .changeset/happy-gifts-sort.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/real-bottles-mate.md

This file was deleted.

8 changes: 8 additions & 0 deletions demos/angular-supabase-todolist/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# PowerSync Angular Demo

## 0.0.23

### Patch Changes

- a567998: Upgrade to Angular 18 and fix build issues
- Updated dependencies [a1b52be]
- @powersync/web@1.2.2

## 0.0.22

### Patch Changes
Expand Down
11 changes: 10 additions & 1 deletion demos/angular-supabase-todolist/extra-webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,19 @@ module.exports = (config, options, targetOptions) => {
path: config.path,
clean: true
},
experiments: {
...config.experiments,
topLevelAwait: true
},
externals: {
// BSON includes imports to these, but does not have a hard requirement for them to be present.
crypto: 'Crypto',
stream: 'Stream',
vm: 'VM'
},
resolveLoader: { symlinks: true },
cache: config.cache,
target: config.target,
experiments: config.experiments,
stats: config.stats,
devtool: 'source-map',
mode: 'development'
Expand Down
39 changes: 19 additions & 20 deletions 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.22",
"version": "0.0.23",
"scripts": {
"ng": "ng",
"serve": "ng serve",
Expand All @@ -11,29 +11,28 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^17.0.4",
"@angular/common": "^17.0.4",
"@angular/compiler": "^17.0.4",
"@angular/core": "^17.0.4",
"@angular/forms": "^17.0.4",
"@angular/platform-browser": "^17.0.4",
"@angular/platform-browser-dynamic": "^17.0.4",
"@angular/router": "^17.0.4",
"@angular/service-worker": "^17.0.4",
"@angular/animations": "^18.1.1",
"@angular/common": "^18.1.1",
"@angular/compiler": "^18.1.1",
"@angular/core": "^18.1.1",
"@angular/forms": "^18.1.1",
"@angular/platform-browser": "^18.1.1",
"@angular/platform-browser-dynamic": "^18.1.1",
"@angular/router": "^18.1.1",
"@angular/service-worker": "^18.1.1",
"@powersync/web": "workspace:*",
"@journeyapps/wa-sqlite": "^0.0.2",
"@supabase/supabase-js": "^2.38.5",
"@journeyapps/wa-sqlite": "^0.2.0",
"@supabase/supabase-js": "^2.44.4",
"rxjs": "~7.8.1",
"tslib": "^2.6.2",
"zone.js": "~0.14.2"
"tslib": "^2.6.3",
"zone.js": "~0.14.8"
},
"devDependencies": {
"@angular-builders/custom-webpack": "^17.0.0",
"@angular-devkit/build-angular": "^17.0.3",
"@angular/cli": "^17.0.3",
"@angular/compiler-cli": "^17.0.4",
"@angular-builders/custom-webpack": "^18.0.0",
"@angular-devkit/build-angular": "^18.1.1",
"@angular/cli": "^18.1.1",
"@angular/compiler-cli": "^18.1.1",
"http-server": "^14.1.1",
"prettier": "^3.1.0",
"typescript": "~5.2.2"
"typescript": "~5.5.3"
}
}
8 changes: 8 additions & 0 deletions demos/example-capacitor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# example-capacitor

## 0.0.9

### Patch Changes

- cfd54e3: Locking `swc/core` dependency to `~1.6.0` to fix builds of demos using vite.
- Updated dependencies [a1b52be]
- @powersync/web@1.2.2

## 0.0.8

### Patch Changes
Expand Down
3 changes: 2 additions & 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.8",
"version": "0.0.9",
"description": "Example of using Capacitor with PowerSync",
"main": "index.js",
"private": true,
Expand Down Expand Up @@ -33,6 +33,7 @@
},
"devDependencies": {
"@capacitor/cli": "^6.0.0",
"@swc/core": "~1.6.0",
"@types/node": "^20.12.12",
"@types/react": "^18.3.2",
"@types/react-dom": "^18.3.0",
Expand Down
8 changes: 8 additions & 0 deletions demos/example-electron/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# example-electron

## 1.0.14

### Patch Changes

- cfd54e3: Locking `swc/core` dependency to `~1.6.0` to fix builds of demos using vite.
- Updated dependencies [a1b52be]
- @powersync/web@1.2.2

## 1.0.13

### Patch Changes
Expand Down
3 changes: 2 additions & 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.13",
"version": "1.0.14",
"description": "Example of using Electron with PowerSync",
"main": ".vite/build/main.js",
"type": "module",
Expand Down Expand Up @@ -41,6 +41,7 @@
"@electron-forge/plugin-fuses": "^7.4.0",
"@electron-forge/plugin-vite": "^7.4.0",
"@electron/fuses": "^1.8.0",
"@swc/core": "~1.6.0",
"@types/node": "^20.12.8",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.0",
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.13

### Patch Changes

- Updated dependencies [a1b52be]
- @powersync/web@1.2.2

## 0.1.12

### 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.12",
"version": "0.1.13",
"private": true,
"scripts": {
"build": "next build",
Expand Down
8 changes: 8 additions & 0 deletions demos/example-vite/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# example-vite

## 0.0.31

### Patch Changes

- cfd54e3: Locking `swc/core` dependency to `~1.6.0` to fix builds of demos using vite.
- Updated dependencies [a1b52be]
- @powersync/web@1.2.2

## 0.0.30

### Patch Changes
Expand Down
3 changes: 2 additions & 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.30",
"version": "0.0.31",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -13,6 +13,7 @@
"@powersync/web": "workspace:*"
},
"devDependencies": {
"@swc/core": "~1.6.0",
"vite": "^5.0.12",
"vite-plugin-top-level-await": "^1.4.1",
"vite-plugin-wasm": "^3.3.0"
Expand Down
8 changes: 8 additions & 0 deletions demos/react-multi-client/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# react-multi-client

## 0.0.5

### Patch Changes

- cfd54e3: Locking `swc/core` dependency to `~1.6.0` to fix builds of demos using vite.
- Updated dependencies [a1b52be]
- @powersync/web@1.2.2

## 0.0.4

### Patch Changes
Expand Down
3 changes: 2 additions & 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.4",
"version": "0.0.5",
"private": true,
"scripts": {
"dev": "vite",
Expand All @@ -24,6 +24,7 @@
"react-dom": "^18.2.0"
},
"devDependencies": {
"@swc/core": "~1.6.0",
"@types/cors": "~2.8.17",
"@types/lodash": "^4.14.202",
"@types/node": "^20.10.0",
Expand Down
8 changes: 8 additions & 0 deletions demos/react-supabase-todolist/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# react-supabase-todolist

## 0.3.14

### Patch Changes

- cfd54e3: Locking `swc/core` dependency to `~1.6.0` to fix builds of demos using vite.
- Updated dependencies [a1b52be]
- @powersync/web@1.2.2

## 0.3.13

### Patch Changes
Expand Down
3 changes: 2 additions & 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.13",
"version": "0.3.14",
"private": true,
"scripts": {
"dev": "vite",
Expand All @@ -26,6 +26,7 @@
"react-router-dom": "^6.22.3"
},
"devDependencies": {
"@swc/core": "~1.6.0",
"@types/lodash": "^4.14.202",
"@types/node": "^20.11.25",
"@types/react": "^18.2.64",
Expand Down
8 changes: 8 additions & 0 deletions demos/vue-supabase-todolist/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# vue-supabase-todolist

## 0.0.20

### Patch Changes

- cfd54e3: Locking `swc/core` dependency to `~1.6.0` to fix builds of demos using vite.
- Updated dependencies [a1b52be]
- @powersync/web@1.2.2

## 0.0.19

### Patch Changes
Expand Down
5 changes: 3 additions & 2 deletions 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.19",
"version": "0.0.20",
"type": "module",
"scripts": {
"dev": "vue-tsc --noEmit --watch & vite dev",
Expand All @@ -22,10 +22,11 @@
"vuetify": "3.6.8"
},
"devDependencies": {
"@swc/core": "~1.6.0",
"@types/vuelidate": "^0.7.21",
"@vitejs/plugin-vue": "^5.0.4",
"sass": "^1.71.1",
"typescript": "^5.2.2",
"typescript": "^5.5.3",
"unplugin-fonts": "^1.1.1",
"unplugin-vue-components": "^0.26.0",
"vite": "^5.2.0",
Expand Down
8 changes: 8 additions & 0 deletions demos/yjs-react-supabase-text-collab/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# yjs-react-supabase-text-collab

## 0.1.14

### Patch Changes

- cfd54e3: Locking `swc/core` dependency to `~1.6.0` to fix builds of demos using vite.
- Updated dependencies [a1b52be]
- @powersync/web@1.2.2

## 0.1.13

### Patch Changes
Expand Down
3 changes: 2 additions & 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.13",
"version": "0.1.14",
"private": true,
"scripts": {
"dev": "vite",
Expand Down Expand Up @@ -50,6 +50,7 @@
"yjs": "^13.6.14"
},
"devDependencies": {
"@swc/core": "~1.6.0",
"@types/lodash": "^4.17.0",
"@types/node": "^20.11.26",
"@types/react": "^18.2.65",
Expand Down
4 changes: 2 additions & 2 deletions packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
"rollup": "4.14.3",
"rsocket-core": "1.0.0-alpha.3",
"rsocket-websocket-client": "1.0.0-alpha.3",
"text-encoding": "^0.7.0",
"typescript": "^5.1.3",
"text-encoding": "^0.7.0",
"typescript": "^5.5.3",
"vitest": "^1.5.2",
"web-streams-polyfill": "3.2.1"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/kysely-driver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@vitest/browser": "^1.3.1",
"ts-loader": "^9.5.1",
"ts-node": "^10.9.2",
"typescript": "^5.3.3",
"typescript": "^5.5.3",
"vite": "^5.1.1",
"vite-plugin-top-level-await": "^1.4.1",
"vite-plugin-wasm": "^3.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"react-native": "0.72.4",
"rollup": "4.14.3",
"text-encoding": "^0.7.0",
"typescript": "^5.1.3",
"typescript": "^5.5.3",
"web-streams-polyfill": "3.2.1"
},
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@
"@types/react": "^18.2.34",
"jsdom": "^24.0.0",
"react": "18.2.0",
"typescript": "^5.1.3"
"typescript": "^5.5.3"
}
}
2 changes: 1 addition & 1 deletion packages/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"devDependencies": {
"flush-promises": "^1.0.2",
"jsdom": "^24.0.0",
"typescript": "^5.1.3",
"typescript": "^5.5.3",
"vitest": "^1.5.1",
"vue": "3.4.21"
}
Expand Down
6 changes: 6 additions & 0 deletions packages/web/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @powersync/web

## 1.2.2

### Patch Changes

- a1b52be: Fix read statements not using the transaction lock

## 1.2.1

### Patch Changes
Expand Down
Loading

0 comments on commit 0bc04e0

Please sign in to comment.