From 0856c02c27b63797f0d424deae37c2aa657b12b7 Mon Sep 17 00:00:00 2001 From: Loren Burton Date: Mon, 15 Apr 2024 22:17:07 -0700 Subject: [PATCH 1/3] Update lodash reference in vite optimizeDeps config --- demos/example-vite/vite.config.ts | 2 +- demos/react-supabase-todolist/vite.config.mts | 2 +- demos/yjs-react-supabase-text-collab/vite.config.mts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/demos/example-vite/vite.config.ts b/demos/example-vite/vite.config.ts index a98189010..6975c52cb 100644 --- a/demos/example-vite/vite.config.ts +++ b/demos/example-vite/vite.config.ts @@ -18,7 +18,7 @@ export default defineConfig({ // Don't optimize these packages as they contain web workers and WASM files. // https://github.com/vitejs/vite/issues/11672#issuecomment-1415820673 exclude: ['@journeyapps/wa-sqlite', '@journeyapps/powersync-sdk-web'], - include: ['object-hash', 'uuid', 'event-iterator', 'js-logger', 'lodash', 'can-ndjson-stream'] + include: ['object-hash', 'uuid', 'event-iterator', 'js-logger', 'lodash/throttle', 'can-ndjson-stream'] }, plugins: [wasm(), topLevelAwait()], worker: { diff --git a/demos/react-supabase-todolist/vite.config.mts b/demos/react-supabase-todolist/vite.config.mts index e5d223f5c..b21fa7740 100644 --- a/demos/react-supabase-todolist/vite.config.mts +++ b/demos/react-supabase-todolist/vite.config.mts @@ -25,7 +25,7 @@ export default defineConfig({ // Don't optimize these packages as they contain web workers and WASM files. // https://github.com/vitejs/vite/issues/11672#issuecomment-1415820673 exclude: ['@journeyapps/wa-sqlite', '@journeyapps/powersync-sdk-web'], - include: ['object-hash', 'uuid', 'event-iterator', 'js-logger', 'lodash', 'can-ndjson-stream'] + include: ['object-hash', 'uuid', 'event-iterator', 'js-logger', 'lodash/throttle', 'can-ndjson-stream'] }, plugins: [ wasm(), diff --git a/demos/yjs-react-supabase-text-collab/vite.config.mts b/demos/yjs-react-supabase-text-collab/vite.config.mts index cdd4219ee..461861ea8 100644 --- a/demos/yjs-react-supabase-text-collab/vite.config.mts +++ b/demos/yjs-react-supabase-text-collab/vite.config.mts @@ -26,7 +26,7 @@ export default defineConfig({ // Don't optimize these packages as they contain web workers and WASM files. // https://github.com/vitejs/vite/issues/11672#issuecomment-1415820673 exclude: ['@journeyapps/wa-sqlite', '@journeyapps/powersync-sdk-web'], - include: ['object-hash', 'uuid', 'event-iterator', 'js-logger', 'lodash', 'can-ndjson-stream'] + include: ['object-hash', 'uuid', 'event-iterator', 'js-logger', 'lodash/throttle', 'can-ndjson-stream'] }, plugins: [ wasm(), From 8f358030a8bf34ee87dc633df97f58a41cdb9f2f Mon Sep 17 00:00:00 2001 From: Christiaan Landman Date: Tue, 16 Apr 2024 16:15:16 +0200 Subject: [PATCH 2/3] fix: using nested include entries for demo apps --- demos/example-vite/vite.config.ts | 8 +++++++- demos/react-supabase-todolist/vite.config.mts | 8 +++++++- demos/vue-supabase-todolist/vite.config.ts | 8 +++++++- demos/yjs-react-supabase-text-collab/vite.config.mts | 8 +++++++- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/demos/example-vite/vite.config.ts b/demos/example-vite/vite.config.ts index 6975c52cb..531d3f92d 100644 --- a/demos/example-vite/vite.config.ts +++ b/demos/example-vite/vite.config.ts @@ -18,7 +18,13 @@ export default defineConfig({ // Don't optimize these packages as they contain web workers and WASM files. // https://github.com/vitejs/vite/issues/11672#issuecomment-1415820673 exclude: ['@journeyapps/wa-sqlite', '@journeyapps/powersync-sdk-web'], - include: ['object-hash', 'uuid', 'event-iterator', 'js-logger', 'lodash/throttle', 'can-ndjson-stream'] + include: [ + '@journeyapps/powersync-sdk-common > uuid', + '@journeyapps/powersync-sdk-web > event-iterator', + '@journeyapps/powersync-sdk-web > js-logger', + '@journeyapps/powersync-sdk-web > lodash/throttle', + '@journeyapps/powersync-sdk-web > can-ndjson-stream' + ] }, plugins: [wasm(), topLevelAwait()], worker: { diff --git a/demos/react-supabase-todolist/vite.config.mts b/demos/react-supabase-todolist/vite.config.mts index b21fa7740..a25ba3760 100644 --- a/demos/react-supabase-todolist/vite.config.mts +++ b/demos/react-supabase-todolist/vite.config.mts @@ -25,7 +25,13 @@ export default defineConfig({ // Don't optimize these packages as they contain web workers and WASM files. // https://github.com/vitejs/vite/issues/11672#issuecomment-1415820673 exclude: ['@journeyapps/wa-sqlite', '@journeyapps/powersync-sdk-web'], - include: ['object-hash', 'uuid', 'event-iterator', 'js-logger', 'lodash/throttle', 'can-ndjson-stream'] + include: [ + '@journeyapps/powersync-sdk-common > uuid', + '@journeyapps/powersync-sdk-web > event-iterator', + '@journeyapps/powersync-sdk-web > js-logger', + '@journeyapps/powersync-sdk-web > lodash/throttle', + '@journeyapps/powersync-sdk-web > can-ndjson-stream' + ] }, plugins: [ wasm(), diff --git a/demos/vue-supabase-todolist/vite.config.ts b/demos/vue-supabase-todolist/vite.config.ts index 3a2a6c632..81c1b422c 100644 --- a/demos/vue-supabase-todolist/vite.config.ts +++ b/demos/vue-supabase-todolist/vite.config.ts @@ -38,6 +38,12 @@ export default defineConfig({ // Don't optimize these packages as they contain web workers and WASM files. // https://github.com/vitejs/vite/issues/11672#issuecomment-1415820673 exclude: ['@journeyapps/wa-sqlite', '@journeyapps/powersync-sdk-web'], - include: ['object-hash', 'uuid', 'event-iterator', 'js-logger', 'lodash', 'can-ndjson-stream'] + include: [ + '@journeyapps/powersync-sdk-common > uuid', + '@journeyapps/powersync-sdk-web > event-iterator', + '@journeyapps/powersync-sdk-web > js-logger', + '@journeyapps/powersync-sdk-web > lodash/throttle', + '@journeyapps/powersync-sdk-web > can-ndjson-stream' + ] } }); diff --git a/demos/yjs-react-supabase-text-collab/vite.config.mts b/demos/yjs-react-supabase-text-collab/vite.config.mts index 461861ea8..3337e08fc 100644 --- a/demos/yjs-react-supabase-text-collab/vite.config.mts +++ b/demos/yjs-react-supabase-text-collab/vite.config.mts @@ -26,7 +26,13 @@ export default defineConfig({ // Don't optimize these packages as they contain web workers and WASM files. // https://github.com/vitejs/vite/issues/11672#issuecomment-1415820673 exclude: ['@journeyapps/wa-sqlite', '@journeyapps/powersync-sdk-web'], - include: ['object-hash', 'uuid', 'event-iterator', 'js-logger', 'lodash/throttle', 'can-ndjson-stream'] + include: [ + '@journeyapps/powersync-sdk-common > uuid', + '@journeyapps/powersync-sdk-web > event-iterator', + '@journeyapps/powersync-sdk-web > js-logger', + '@journeyapps/powersync-sdk-web > lodash/throttle', + '@journeyapps/powersync-sdk-web > can-ndjson-stream' + ] }, plugins: [ wasm(), From efbfee262aa8a63f2ee3d132e2f2624845782fd9 Mon Sep 17 00:00:00 2001 From: Christiaan Landman Date: Tue, 16 Apr 2024 16:24:46 +0200 Subject: [PATCH 3/3] chore: added changeset entries --- .changeset/clever-kiwis-lay.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .changeset/clever-kiwis-lay.md diff --git a/.changeset/clever-kiwis-lay.md b/.changeset/clever-kiwis-lay.md new file mode 100644 index 000000000..0b8a7b5b6 --- /dev/null +++ b/.changeset/clever-kiwis-lay.md @@ -0,0 +1,8 @@ +--- +"example-vite": patch +"@journeyapps/powersync-react-supabase-todolist": patch +"@journeyapps/powersync-yjs-text-collab-demo": patch +"@journeyapps/powersync-vue": patch +--- + +Updated Vite Demo apps' `include` entries to use nested dependency syntax, fixes issue with CJS nested dependencies.