From 53f4d5d0955a06ccda274938aadb7cc67c1089cd Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Fri, 5 Jul 2024 17:00:54 +1000 Subject: [PATCH 01/13] WIP: Try pkg-pr-new templates --- .github/workflows/preview.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index c802d27d35..7b40817e8f 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -1,8 +1,7 @@ name: preview on: - pull_request_review: - types: [submitted] + pull_request: concurrency: group: ${{ github.workflow }}-${{ github.event.number || github.ref }} @@ -26,4 +25,4 @@ jobs: - name: Build Packages run: pnpm run build:all - name: Publish Previews - run: pnpx pkg-pr-new publish --no-template --compact ./packages/* + run: pnpx pkg-pr-new publish --compact ./packages/* --template ./examples/**/* From 05cf160d142fb87c1cfc4db26dc08f621471b41d Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Fri, 5 Jul 2024 17:13:41 +1000 Subject: [PATCH 02/13] Remove approved --- .github/workflows/preview.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 7b40817e8f..54e8390e1d 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -13,7 +13,6 @@ env: jobs: preview: name: Preview - if: github.event.review.state == 'APPROVED' runs-on: ubuntu-latest steps: - name: Checkout From 1d6986e2d03621a7c7d861c774d17ebda62ddb3f Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Fri, 5 Jul 2024 17:59:13 +1000 Subject: [PATCH 03/13] Try one dir --- .github/workflows/preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 54e8390e1d..da569d1c5c 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -24,4 +24,4 @@ jobs: - name: Build Packages run: pnpm run build:all - name: Publish Previews - run: pnpx pkg-pr-new publish --compact ./packages/* --template ./examples/**/* + run: pnpx pkg-pr-new publish --compact ./packages/* --template ./examples/react/* From 451e2df5e9064a98d6d1e915781e6cd53e250594 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Sat, 6 Jul 2024 11:57:52 +1000 Subject: [PATCH 04/13] Update preview.yml --- .github/workflows/preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index da569d1c5c..273af70307 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -24,4 +24,4 @@ jobs: - name: Build Packages run: pnpm run build:all - name: Publish Previews - run: pnpx pkg-pr-new publish --compact ./packages/* --template ./examples/react/* + run: pnpx pkg-pr-new publish --compact './packages/*' --template './examples/react/*' From 96bc0c607cd46ace4e270edb7e006ec5fbcdaff5 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Sat, 6 Jul 2024 15:56:07 +1000 Subject: [PATCH 05/13] Update preview.yml --- .github/workflows/preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 273af70307..e6e29890b8 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -24,4 +24,4 @@ jobs: - name: Build Packages run: pnpm run build:all - name: Publish Previews - run: pnpx pkg-pr-new publish --compact './packages/*' --template './examples/react/*' + run: pnpx pkg-pr-new publish --compact './packages/*' --template './examples/*/*' From 7394ca8287da9bde87ced74db70cb250c2e94156 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Sat, 6 Jul 2024 16:49:37 +1000 Subject: [PATCH 06/13] Update preview.yml --- .github/workflows/preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index e6e29890b8..eca5262a2c 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -24,4 +24,4 @@ jobs: - name: Build Packages run: pnpm run build:all - name: Publish Previews - run: pnpx pkg-pr-new publish --compact './packages/*' --template './examples/*/*' + run: pnpx pkg-pr-new publish --compact './packages/*' --template './examples/*/basic*' From 832c277f57a27da8286a08771a70a118ea8e57c9 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Sat, 6 Jul 2024 18:14:43 +1000 Subject: [PATCH 07/13] Test moving to dep --- examples/angular/basic/package.json | 2 +- pnpm-lock.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/angular/basic/package.json b/examples/angular/basic/package.json index 07653a59de..dc390b7ca9 100644 --- a/examples/angular/basic/package.json +++ b/examples/angular/basic/package.json @@ -14,6 +14,7 @@ "@angular/core": "^17.3.10", "@angular/platform-browser": "^17.3.10", "@angular/platform-browser-dynamic": "^17.3.10", + "@tanstack/angular-query-devtools-experimental": "^5.50.1", "@tanstack/angular-query-experimental": "^5.50.1", "rxjs": "^7.8.1", "tslib": "^2.6.2", @@ -23,7 +24,6 @@ "@angular-devkit/build-angular": "^17.3.8", "@angular/cli": "^17.3.8", "@angular/compiler-cli": "^17.3.10", - "@tanstack/angular-query-devtools-experimental": "^5.50.1", "typescript": "5.3.3" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 388c4747c4..e8d26a578d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -145,6 +145,9 @@ importers: '@angular/platform-browser-dynamic': specifier: ^17.3.10 version: 17.3.10(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/compiler@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(@angular/platform-browser@17.3.10(@angular/animations@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))) + '@tanstack/angular-query-devtools-experimental': + specifier: ^5.50.1 + version: link:../../../packages/angular-query-devtools-experimental '@tanstack/angular-query-experimental': specifier: ^5.50.1 version: link:../../../packages/angular-query-experimental @@ -167,9 +170,6 @@ importers: '@angular/compiler-cli': specifier: ^17.3.10 version: 17.3.10(@angular/compiler@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(typescript@5.3.3) - '@tanstack/angular-query-devtools-experimental': - specifier: ^5.50.1 - version: link:../../../packages/angular-query-devtools-experimental typescript: specifier: 5.3.3 version: 5.3.3 From fa274c9638a592e942d65e2a454d63d1bcc16002 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Sat, 6 Jul 2024 19:08:53 +1000 Subject: [PATCH 08/13] Use pnpm pack --- .github/workflows/preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index eca5262a2c..063f0651fb 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -24,4 +24,4 @@ jobs: - name: Build Packages run: pnpm run build:all - name: Publish Previews - run: pnpx pkg-pr-new publish --compact './packages/*' --template './examples/*/basic*' + run: pnpx pkg-pr-new publish --pnpm --compact './packages/*' --template './examples/*/basic*' From 92da5b1deaf4abe43416817f8210966ad0b9b452 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Sat, 6 Jul 2024 19:17:48 +1000 Subject: [PATCH 09/13] All examples --- .github/workflows/preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 063f0651fb..a5334ea2ae 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -24,4 +24,4 @@ jobs: - name: Build Packages run: pnpm run build:all - name: Publish Previews - run: pnpx pkg-pr-new publish --pnpm --compact './packages/*' --template './examples/*/basic*' + run: pnpx pkg-pr-new publish --pnpm --compact './packages/*' --template './examples/*/*' From 6bf691c32a534c52e38a767c732f39692373e3f5 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Sat, 6 Jul 2024 18:19:26 +1000 Subject: [PATCH 10/13] Undo angular basic change --- examples/angular/basic/package.json | 2 +- pnpm-lock.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/angular/basic/package.json b/examples/angular/basic/package.json index dc390b7ca9..07653a59de 100644 --- a/examples/angular/basic/package.json +++ b/examples/angular/basic/package.json @@ -14,7 +14,6 @@ "@angular/core": "^17.3.10", "@angular/platform-browser": "^17.3.10", "@angular/platform-browser-dynamic": "^17.3.10", - "@tanstack/angular-query-devtools-experimental": "^5.50.1", "@tanstack/angular-query-experimental": "^5.50.1", "rxjs": "^7.8.1", "tslib": "^2.6.2", @@ -24,6 +23,7 @@ "@angular-devkit/build-angular": "^17.3.8", "@angular/cli": "^17.3.8", "@angular/compiler-cli": "^17.3.10", + "@tanstack/angular-query-devtools-experimental": "^5.50.1", "typescript": "5.3.3" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e8d26a578d..388c4747c4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -145,9 +145,6 @@ importers: '@angular/platform-browser-dynamic': specifier: ^17.3.10 version: 17.3.10(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/compiler@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(@angular/platform-browser@17.3.10(@angular/animations@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(@angular/common@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))(rxjs@7.8.1))(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6))) - '@tanstack/angular-query-devtools-experimental': - specifier: ^5.50.1 - version: link:../../../packages/angular-query-devtools-experimental '@tanstack/angular-query-experimental': specifier: ^5.50.1 version: link:../../../packages/angular-query-experimental @@ -170,6 +167,9 @@ importers: '@angular/compiler-cli': specifier: ^17.3.10 version: 17.3.10(@angular/compiler@17.3.10(@angular/core@17.3.10(rxjs@7.8.1)(zone.js@0.14.6)))(typescript@5.3.3) + '@tanstack/angular-query-devtools-experimental': + specifier: ^5.50.1 + version: link:../../../packages/angular-query-devtools-experimental typescript: specifier: 5.3.3 version: 5.3.3 From c0825731b8efdd980d0d0127cb596507d5c2ad61 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Sat, 6 Jul 2024 18:20:19 +1000 Subject: [PATCH 11/13] Merge with pr.yml --- .github/workflows/pr.yml | 14 ++++++++++++++ .github/workflows/preview.yml | 27 --------------------------- 2 files changed, 14 insertions(+), 27 deletions(-) delete mode 100644 .github/workflows/preview.yml diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 2d54af7083..3d3eea2618 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -40,3 +40,17 @@ jobs: directory: packages env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + preview: + name: Preview + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Setup Tools + uses: tanstack/config/.github/setup@main + - name: Build Packages + run: pnpm run build:all + - name: Publish Previews + run: pnpx pkg-pr-new publish --pnpm --compact './packages/*' --template './examples/*/*' diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml deleted file mode 100644 index a5334ea2ae..0000000000 --- a/.github/workflows/preview.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: preview - -on: - pull_request: - -concurrency: - group: ${{ github.workflow }}-${{ github.event.number || github.ref }} - cancel-in-progress: true - -env: - NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }} - -jobs: - preview: - name: Preview - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Setup Tools - uses: tanstack/config/.github/setup@main - - name: Build Packages - run: pnpm run build:all - - name: Publish Previews - run: pnpx pkg-pr-new publish --pnpm --compact './packages/*' --template './examples/*/*' From 383e114cbe48fe99096c5d7c94061b74b96587e0 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Sat, 6 Jul 2024 18:27:28 +1000 Subject: [PATCH 12/13] Update example names --- examples/react/nextjs-app-prefetching/package.json | 2 +- examples/react/shadow-dom/package.json | 2 +- examples/solid/astro/package.json | 2 +- examples/solid/solid-start-streaming/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/react/nextjs-app-prefetching/package.json b/examples/react/nextjs-app-prefetching/package.json index faf58c1c8c..f3478e4ccb 100644 --- a/examples/react/nextjs-app-prefetching/package.json +++ b/examples/react/nextjs-app-prefetching/package.json @@ -1,5 +1,5 @@ { - "name": "nextjs-app-prefetching", + "name": "@tanstack/query-example-react-nextjs-app-prefetching", "private": true, "type": "module", "scripts": { diff --git a/examples/react/shadow-dom/package.json b/examples/react/shadow-dom/package.json index 253d24e18d..68d284c42a 100644 --- a/examples/react/shadow-dom/package.json +++ b/examples/react/shadow-dom/package.json @@ -1,5 +1,5 @@ { - "name": "shadow-dom", + "name": "@tanstack/query-example-react-shadow-dom", "private": true, "version": "0.0.0", "type": "module", diff --git a/examples/solid/astro/package.json b/examples/solid/astro/package.json index fe5d671bc9..20f2a8ef4c 100644 --- a/examples/solid/astro/package.json +++ b/examples/solid/astro/package.json @@ -1,5 +1,5 @@ { - "name": "solid-query-astro-example", + "name": "@tanstack/query-example-solid-astro", "private": true, "type": "module", "scripts": { diff --git a/examples/solid/solid-start-streaming/package.json b/examples/solid/solid-start-streaming/package.json index 4f3da820fc..575458b550 100644 --- a/examples/solid/solid-start-streaming/package.json +++ b/examples/solid/solid-start-streaming/package.json @@ -1,5 +1,5 @@ { - "name": "solid-start-streaming-example", + "name": "@tanstack/query-example-solid-start-streaming", "private": true, "type": "module", "scripts": { From aecf776d17f3716b409a7b5cc54b86fb3ca3b1f4 Mon Sep 17 00:00:00 2001 From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com> Date: Sun, 7 Jul 2024 07:47:22 +1000 Subject: [PATCH 13/13] Remove .codesandbox/ci.json --- .codesandbox/ci.json | 27 --------------------------- package.json | 5 ++--- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 .codesandbox/ci.json diff --git a/.codesandbox/ci.json b/.codesandbox/ci.json deleted file mode 100644 index 2da6bd16de..0000000000 --- a/.codesandbox/ci.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "buildCommand": "build:csb", - "sandboxes": [ - "/examples/angular/basic", - "/examples/react/basic-typescript", - "/examples/solid/basic-typescript", - "/examples/svelte/basic", - "/examples/vue/basic" - ], - "packages": [ - "packages/angular-query-devtools-experimental", - "packages/angular-query-experimental", - "packages/query-core", - "packages/query-devtools", - "packages/query-sync-storage-persister", - "packages/react-query", - "packages/react-query-devtools", - "packages/react-query-persist-client", - "packages/solid-query", - "packages/solid-query-devtools", - "packages/svelte-query", - "packages/svelte-query-devtools", - "packages/vue-query", - "packages/vue-query-devtools" - ], - "node": "20" -} diff --git a/package.json b/package.json index 74eb2e4cda..3b47732a5f 100644 --- a/package.json +++ b/package.json @@ -22,9 +22,8 @@ "test:build": "nx affected --target=test:build --exclude=examples/**", "test:types": "nx affected --target=test:types --exclude=examples/**", "test:knip": "knip", - "build": "nx affected --target=build --exclude=examples/**", - "build:all": "nx run-many --target=build --exclude=examples/**", - "build:csb": "nx run-many --target=build --exclude=examples/** --exclude=integrations/**", + "build": "nx affected --target=build --exclude=examples/** --exclude=integrations/**", + "build:all": "nx run-many --target=build --exclude=examples/** --exclude=integrations/**", "watch": "pnpm run build:all && nx watch --all -- pnpm run build:all", "dev": "pnpm run watch", "prettier": "prettier --ignore-unknown '**/*'",