From 8f4fd6def9fb79dafc28686d1a2c8a14698848c9 Mon Sep 17 00:00:00 2001 From: DominicGBauer Date: Thu, 16 May 2024 14:57:54 +0200 Subject: [PATCH 1/3] chore: add common as peer dependency to packages --- .changeset/tasty-teachers-switch.md | 10 ++++++++++ packages/attachments/package.json | 4 +++- packages/kysely-driver/package.json | 3 +++ packages/react-native/package.json | 3 ++- packages/react/package.json | 3 ++- packages/vue/package.json | 3 ++- packages/web/package.json | 3 ++- 7 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 .changeset/tasty-teachers-switch.md diff --git a/.changeset/tasty-teachers-switch.md b/.changeset/tasty-teachers-switch.md new file mode 100644 index 000000000..3e818b3c3 --- /dev/null +++ b/.changeset/tasty-teachers-switch.md @@ -0,0 +1,10 @@ +--- +"@powersync/kysely-driver": patch +"@powersync/react-native": patch +"@powersync/attachments": patch +"@powersync/react": patch +"@powersync/vue": patch +"@powersync/web": patch +--- + +Add @powersync/common as peer dependency diff --git a/packages/attachments/package.json b/packages/attachments/package.json index 1ba315ea4..12ba71e97 100644 --- a/packages/attachments/package.json +++ b/packages/attachments/package.json @@ -26,7 +26,9 @@ "clean": "rm -rf lib tsconfig.tsbuildinfo", "watch": "tsc -b -w" }, - "devDependencies": {}, + "peerDependencies": { + "@powersync/common": "1.x" + }, "dependencies": { "@powersync/common": "workspace:*" } diff --git a/packages/kysely-driver/package.json b/packages/kysely-driver/package.json index f93be7806..91626dab1 100644 --- a/packages/kysely-driver/package.json +++ b/packages/kysely-driver/package.json @@ -24,6 +24,9 @@ "watch": "tsc --build -w", "test": "pnpm build && vitest" }, + "peerDependencies": { + "@powersync/common": "1.x" + }, "dependencies": { "@powersync/common": "workspace:*", "kysely": "^0.27.2" diff --git a/packages/react-native/package.json b/packages/react-native/package.json index 43774e198..fb6efbd4f 100644 --- a/packages/react-native/package.json +++ b/packages/react-native/package.json @@ -30,7 +30,8 @@ "@journeyapps/react-native-quick-sqlite": "^1.1.6", "react": "*", "react-native": "*", - "react-native-polyfill-globals": "^3.1.0" + "react-native-polyfill-globals": "^3.1.0", + "@powersync/common": "1.x" }, "dependencies": { "@powersync/react": "workspace:*", diff --git a/packages/react/package.json b/packages/react/package.json index de40aa8de..5f4cae577 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -31,7 +31,8 @@ "@powersync/common": "workspace:*" }, "peerDependencies": { - "react": "*" + "react": "*", + "@powersync/common": "1.x" }, "devDependencies": { "@testing-library/react": "^15.0.2", diff --git a/packages/vue/package.json b/packages/vue/package.json index 610de902e..530949f11 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -31,7 +31,8 @@ "@powersync/common": "workspace:*" }, "peerDependencies": { - "vue": "*" + "vue": "*", + "@powersync/common": "1.x" }, "devDependencies": { "flush-promises": "^1.0.2", diff --git a/packages/web/package.json b/packages/web/package.json index 7c30cd537..1302f39e1 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -46,7 +46,8 @@ "uuid": "^9.0.1" }, "peerDependencies": { - "@journeyapps/wa-sqlite": "~0.2.0" + "@journeyapps/wa-sqlite": "~0.2.0", + "@powersync/common": "1.x" }, "dependencies": { "@powersync/common": "workspace:*", From 05c81056b994c91f6ad537004bcf943b004ed755 Mon Sep 17 00:00:00 2001 From: DominicGBauer Date: Fri, 17 May 2024 10:40:42 +0200 Subject: [PATCH 2/3] chore: pr reverts --- packages/attachments/package.json | 5 +---- packages/kysely-driver/package.json | 3 +-- packages/react-native/package.json | 3 +-- packages/react/package.json | 5 +---- packages/vue/package.json | 5 +---- packages/web/package.json | 23 +++++++++++------------ 6 files changed, 16 insertions(+), 28 deletions(-) diff --git a/packages/attachments/package.json b/packages/attachments/package.json index 12ba71e97..cb52936f9 100644 --- a/packages/attachments/package.json +++ b/packages/attachments/package.json @@ -27,9 +27,6 @@ "watch": "tsc -b -w" }, "peerDependencies": { - "@powersync/common": "1.x" - }, - "dependencies": { - "@powersync/common": "workspace:*" + "@powersync/common": "workspace:1.x" } } diff --git a/packages/kysely-driver/package.json b/packages/kysely-driver/package.json index 91626dab1..036206f22 100644 --- a/packages/kysely-driver/package.json +++ b/packages/kysely-driver/package.json @@ -25,10 +25,9 @@ "test": "pnpm build && vitest" }, "peerDependencies": { - "@powersync/common": "1.x" + "@powersync/common": "workspace:1.x" }, "dependencies": { - "@powersync/common": "workspace:*", "kysely": "^0.27.2" }, "devDependencies": { diff --git a/packages/react-native/package.json b/packages/react-native/package.json index fb6efbd4f..f513d9a26 100644 --- a/packages/react-native/package.json +++ b/packages/react-native/package.json @@ -31,11 +31,10 @@ "react": "*", "react-native": "*", "react-native-polyfill-globals": "^3.1.0", - "@powersync/common": "1.x" + "@powersync/common": "workspace:1.x" }, "dependencies": { "@powersync/react": "workspace:*", - "@powersync/common": "workspace:*", "async-lock": "^1.4.0" }, "devDependencies": { diff --git a/packages/react/package.json b/packages/react/package.json index 5f4cae577..d6af81d82 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -27,12 +27,9 @@ "url": "https://github.com/powersync-ja/powersync-js/issues" }, "homepage": "https://docs.powersync.com/resources/api-reference", - "dependencies": { - "@powersync/common": "workspace:*" - }, "peerDependencies": { "react": "*", - "@powersync/common": "1.x" + "@powersync/common": "workspace:1.x" }, "devDependencies": { "@testing-library/react": "^15.0.2", diff --git a/packages/vue/package.json b/packages/vue/package.json index 530949f11..912c4bb2c 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -27,12 +27,9 @@ "url": "https://github.com/powersync-ja/powersync-js/issues" }, "homepage": "https://docs.powersync.com/resources/api-reference", - "dependencies": { - "@powersync/common": "workspace:*" - }, "peerDependencies": { "vue": "*", - "@powersync/common": "1.x" + "@powersync/common": "workspace:1.x" }, "devDependencies": { "flush-promises": "^1.0.2", diff --git a/packages/web/package.json b/packages/web/package.json index 1302f39e1..d0423d112 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -32,6 +32,17 @@ ], "author": "JOURNEYAPPS", "license": "Apache-2.0", + "peerDependencies": { + "@journeyapps/wa-sqlite": "~0.2.0", + "@powersync/common": "workspace:1.x" + }, + "dependencies": { + "async-mutex": "^0.4.0", + "buffer": "^6.0.3", + "comlink": "^4.4.1", + "js-logger": "^1.6.1", + "lodash": "^4.17.21" + }, "devDependencies": { "@journeyapps/wa-sqlite": "~0.2.0", "@types/lodash": "^4.14.200", @@ -44,17 +55,5 @@ "vitest": "^1.3.1", "webdriverio": "^8.32.3", "uuid": "^9.0.1" - }, - "peerDependencies": { - "@journeyapps/wa-sqlite": "~0.2.0", - "@powersync/common": "1.x" - }, - "dependencies": { - "@powersync/common": "workspace:*", - "async-mutex": "^0.4.0", - "buffer": "^6.0.3", - "comlink": "^4.4.1", - "js-logger": "^1.6.1", - "lodash": "^4.17.21" } } From 1caa29e360c67a222fcb18d81c657941e6e7c067 Mon Sep 17 00:00:00 2001 From: DominicGBauer Date: Fri, 17 May 2024 10:46:37 +0200 Subject: [PATCH 3/3] chore: pr reverts --- pnpm-lock.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 03c565aad..7a840113e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1197,7 +1197,7 @@ importers: packages/attachments: dependencies: '@powersync/common': - specifier: workspace:* + specifier: workspace:1.x version: link:../common packages/common: @@ -1252,7 +1252,7 @@ importers: packages/kysely-driver: dependencies: '@powersync/common': - specifier: workspace:* + specifier: workspace:1.x version: link:../common kysely: specifier: ^0.27.2 @@ -1298,7 +1298,7 @@ importers: packages/react: dependencies: '@powersync/common': - specifier: workspace:* + specifier: workspace:1.x version: link:../common devDependencies: '@testing-library/react': @@ -1320,7 +1320,7 @@ importers: packages/react-native: dependencies: '@powersync/common': - specifier: workspace:* + specifier: workspace:1.x version: link:../common '@powersync/react': specifier: workspace:* @@ -1351,7 +1351,7 @@ importers: packages/vue: dependencies: '@powersync/common': - specifier: workspace:* + specifier: workspace:1.x version: link:../common devDependencies: flush-promises: @@ -1373,7 +1373,7 @@ importers: packages/web: dependencies: '@powersync/common': - specifier: workspace:* + specifier: workspace:1.x version: link:../common async-mutex: specifier: ^0.4.0 @@ -8978,7 +8978,7 @@ packages: '@babel/helper-plugin-utils': 7.24.0 '@babel/helper-validator-option': 7.23.5 '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.9) - '@babel/plugin-transform-modules-commonjs': 7.24.1(@babel/core@7.23.9) + '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.9) '@babel/plugin-transform-typescript': 7.23.6(@babel/core@7.23.9) dev: false @@ -8992,7 +8992,7 @@ packages: '@babel/helper-plugin-utils': 7.24.0 '@babel/helper-validator-option': 7.23.5 '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.24.0) - '@babel/plugin-transform-modules-commonjs': 7.24.1(@babel/core@7.24.0) + '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.24.0) '@babel/plugin-transform-typescript': 7.23.6(@babel/core@7.24.0) /@babel/register@7.23.7(@babel/core@7.24.0):