From 9d0a77a627360f9d25b94dcdf31b4a5c36488620 Mon Sep 17 00:00:00 2001 From: Lenz Weber-Tronic Date: Tue, 17 Dec 2024 18:15:15 +0100 Subject: [PATCH] Adjustments to Changeset build (#407) Co-authored-by: github-actions[bot] Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .changeset/pre.json | 2 +- .github/workflows/publish.yml | 18 ++-- packages/client-react-streaming/CHANGELOG.md | 0 packages/client-react-streaming/package.json | 5 +- .../CHANGELOG.md | 0 .../package.json | 11 ++- yarn.lock | 98 ++++++++++++++++++- 7 files changed, 117 insertions(+), 17 deletions(-) create mode 100644 packages/client-react-streaming/CHANGELOG.md create mode 100644 packages/experimental-nextjs-app-support/CHANGELOG.md diff --git a/.changeset/pre.json b/.changeset/pre.json index ffe4b2fa..c69bd071 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -9,5 +9,5 @@ "@apollo/experimental-nextjs-app-support": "0.11.7", "@internal/test-utils": "0.0.0" }, - "changesets": [] + "changesets": ["nine-maps-exist"] } diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f482c9d8..5c2436cd 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -46,16 +46,18 @@ jobs: # prerelease mode, enter prerelease mode with tag alpha if: github.ref_name == 'next' && !contains(github.event.head_commit.message, 'Exit prerelease') run: | - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - git config user.name "github-actions[bot]" - npx changeset pre enter alpha - git add -A - git commit -m 'Enter prerelease mode' - git push + if ! test -f ".changeset/pre.json"; then + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + git config user.name "github-actions[bot]" + npx changeset pre enter alpha + git add -A + git commit -m 'Enter prerelease mode' + git push + fi - name: Append NPM token to .npmrc run: | - cat << EOF > "$HOME/.npmrc" + cat << EOF > "$NPM_CONFIG_USERCONFIG" provenance=true //registry.npmjs.org/:_authToken=$NPM_TOKEN EOF @@ -69,5 +71,5 @@ jobs: version: yarn changeset version publish: yarn changeset publish env: - GITHUB_TOKEN: ${{ steps.github-actions-bot-app-token.outputs.token }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/packages/client-react-streaming/CHANGELOG.md b/packages/client-react-streaming/CHANGELOG.md new file mode 100644 index 00000000..e69de29b diff --git a/packages/client-react-streaming/package.json b/packages/client-react-streaming/package.json index 645f272f..dc51d1f4 100644 --- a/packages/client-react-streaming/package.json +++ b/packages/client-react-streaming/package.json @@ -1,8 +1,8 @@ { "name": "@apollo/client-react-streaming", - "version": "0.11.7", + "version": "0.11.8-alpha.1", "repository": { - "url": "git+https://github.com/apollographql/apollo-client-nextjs" + "url": "git+https://github.com/apollographql/apollo-client-nextjs.git" }, "keywords": [ "apollo", @@ -122,6 +122,7 @@ "test:rsc": "NODE_OPTIONS=\"${NODE_OPTIONS:-} --conditions=react-server\" yarn run test:base", "prepack": "yarn build", "prepublishOnly": "yarn pack -o attw.tgz && attw attw.tgz && rm attw.tgz && yarn run test", + "postpublish": "touch .published", "test-bundle": "yarn test-bundle:attw && yarn test-bundle:package && yarn test-bundle:publint && yarn test-bundle:shape", "test-bundle:attw": "attw --pack .", "test-bundle:package": "yarn workspace monorepo verify-package-json $PWD/package.json", diff --git a/packages/experimental-nextjs-app-support/CHANGELOG.md b/packages/experimental-nextjs-app-support/CHANGELOG.md new file mode 100644 index 00000000..e69de29b diff --git a/packages/experimental-nextjs-app-support/package.json b/packages/experimental-nextjs-app-support/package.json index b24d43e6..0f949fe0 100644 --- a/packages/experimental-nextjs-app-support/package.json +++ b/packages/experimental-nextjs-app-support/package.json @@ -1,8 +1,8 @@ { "name": "@apollo/experimental-nextjs-app-support", - "version": "0.11.7", + "version": "0.11.8-alpha.1", "repository": { - "url": "git+https://github.com/apollographql/apollo-client-nextjs" + "url": "git+https://github.com/apollographql/apollo-client-nextjs.git" }, "keywords": [ "apollo", @@ -105,7 +105,7 @@ "test:browser": "NODE_OPTIONS=\"${NODE_OPTIONS:-} --conditions=browser\" yarn run test:base", "test:rsc": "NODE_OPTIONS=\"${NODE_OPTIONS:-} --conditions=react-server\" yarn run test:base", "prepack": "yarn build", - "prepublishOnly": "yarn pack -o attw.tgz && attw attw.tgz && rm attw.tgz && yarn run test", + "prepublishOnly": "wait-on ../client-react-streaming/.published --delay 3000 --timeout 30000 && yarn pack -o attw.tgz && attw attw.tgz && rm attw.tgz && yarn run test", "test-bundle": "yarn test-bundle:attw && yarn test-bundle:package && yarn test-bundle:publint && yarn test-bundle:shape", "test-bundle:attw": "attw --pack .", "test-bundle:package": "yarn workspace monorepo verify-package-json $PWD/package.json", @@ -145,7 +145,8 @@ "tsup": "8.0.2", "tsx": "4.7.1", "typescript": "5.4.5", - "vitest": "1.6.0" + "vitest": "1.6.0", + "wait-on": "^8.0.1" }, "peerDependencies": { "@apollo/client": "^3.10.4", @@ -153,6 +154,6 @@ "react": "^18 || >=19.0.0-rc" }, "dependencies": { - "@apollo/client-react-streaming": "0.11.7" + "@apollo/client-react-streaming": "0.11.8-alpha.1" } } diff --git a/yarn.lock b/yarn.lock index 4c178d77..4e4f7254 100644 --- a/yarn.lock +++ b/yarn.lock @@ -159,6 +159,7 @@ __metadata: tsx: "npm:4.7.1" typescript: "npm:5.4.5" vitest: "npm:1.6.0" + wait-on: "npm:^8.0.1" peerDependencies: "@apollo/client": ^3.10.4 next: ^13.4.1 || ^14.0.0 || ^15.0.0-rc.0 @@ -3854,6 +3855,22 @@ __metadata: languageName: node linkType: hard +"@hapi/hoek@npm:^9.0.0, @hapi/hoek@npm:^9.3.0": + version: 9.3.0 + resolution: "@hapi/hoek@npm:9.3.0" + checksum: 10/ad83a223787749f3873bce42bd32a9a19673765bf3edece0a427e138859ff729469e68d5fdf9ff6bbee6fb0c8e21bab61415afa4584f527cfc40b59ea1957e70 + languageName: node + linkType: hard + +"@hapi/topo@npm:^5.1.0": + version: 5.1.0 + resolution: "@hapi/topo@npm:5.1.0" + dependencies: + "@hapi/hoek": "npm:^9.0.0" + checksum: 10/084bfa647015f4fd3fdd51fadb2747d09ef2f5e1443d6cbada2988b0c88494f85edf257ec606c790db146ac4e34ff57f3fcb22e3299b8e06ed5c87ba7583495c + languageName: node + linkType: hard + "@humanwhocodes/config-array@npm:^0.11.14": version: 0.11.14 resolution: "@humanwhocodes/config-array@npm:0.11.14" @@ -5062,6 +5079,29 @@ __metadata: languageName: node linkType: hard +"@sideway/address@npm:^4.1.5": + version: 4.1.5 + resolution: "@sideway/address@npm:4.1.5" + dependencies: + "@hapi/hoek": "npm:^9.0.0" + checksum: 10/c4c73ac0339504f34e016d3a687118e7ddf197c1c968579572123b67b230be84caa705f0f634efdfdde7f2e07a6e0224b3c70665dc420d8bc95bf400cfc4c998 + languageName: node + linkType: hard + +"@sideway/formula@npm:^3.0.1": + version: 3.0.1 + resolution: "@sideway/formula@npm:3.0.1" + checksum: 10/8d3ee7f80df4e5204b2cbe92a2a711ca89684965a5c9eb3b316b7051212d3522e332a65a0bb2a07cc708fcd1d0b27fcb30f43ff0bcd5089d7006c7160a89eefe + languageName: node + linkType: hard + +"@sideway/pinpoint@npm:^2.0.0": + version: 2.0.0 + resolution: "@sideway/pinpoint@npm:2.0.0" + checksum: 10/1ed21800128b2b23280ba4c9db26c8ff6142b97a8683f17639fd7f2128aa09046461574800b30fb407afc5b663c2331795ccf3b654d4b38fa096e41a5c786bf8 + languageName: node + linkType: hard + "@sinclair/typebox@npm:^0.27.8": version: 0.27.8 resolution: "@sinclair/typebox@npm:0.27.8" @@ -6939,6 +6979,17 @@ __metadata: languageName: node linkType: hard +"axios@npm:^1.7.7": + version: 1.7.9 + resolution: "axios@npm:1.7.9" + dependencies: + follow-redirects: "npm:^1.15.6" + form-data: "npm:^4.0.0" + proxy-from-env: "npm:^1.1.0" + checksum: 10/b7a5f660ea53ba9c2a745bf5ad77ad8bf4f1338e13ccc3f9f09f810267d6c638c03dac88b55dae8dc98b79c57d2d6835be651d58d2af97c174f43d289a9fd007 + languageName: node + linkType: hard + "axobject-query@npm:^3.1.1": version: 3.1.1 resolution: "axobject-query@npm:3.1.1" @@ -9838,6 +9889,16 @@ __metadata: languageName: node linkType: hard +"follow-redirects@npm:^1.15.6": + version: 1.15.9 + resolution: "follow-redirects@npm:1.15.9" + peerDependenciesMeta: + debug: + optional: true + checksum: 10/e3ab42d1097e90d28b913903841e6779eb969b62a64706a3eb983e894a5db000fbd89296f45f08885a0e54cd558ef62e81be1165da9be25a6c44920da10f424c + languageName: node + linkType: hard + "for-each@npm:^0.3.3": version: 0.3.3 resolution: "for-each@npm:0.3.3" @@ -11530,6 +11591,19 @@ __metadata: languageName: node linkType: hard +"joi@npm:^17.13.3": + version: 17.13.3 + resolution: "joi@npm:17.13.3" + dependencies: + "@hapi/hoek": "npm:^9.3.0" + "@hapi/topo": "npm:^5.1.0" + "@sideway/address": "npm:^4.1.5" + "@sideway/formula": "npm:^3.0.1" + "@sideway/pinpoint": "npm:^2.0.0" + checksum: 10/4c150db0c820c3a52f4a55c82c1fc5e144a5b5f4da9ffebc7339a15469d1a447ebb427ced446efcb9709ab56bd71a06c4c67c9381bc1b9f9ae63fc7c89209bdf + languageName: node + linkType: hard + "jora@npm:1.0.0-beta.8": version: 1.0.0-beta.8 resolution: "jora@npm:1.0.0-beta.8" @@ -12300,7 +12374,7 @@ __metadata: languageName: node linkType: hard -"minimist@npm:^1.2.0, minimist@npm:^1.2.6": +"minimist@npm:^1.2.0, minimist@npm:^1.2.6, minimist@npm:^1.2.8": version: 1.2.8 resolution: "minimist@npm:1.2.8" checksum: 10/908491b6cc15a6c440ba5b22780a0ba89b9810e1aea684e253e43c4e3b8d56ec1dcdd7ea96dde119c29df59c936cde16062159eae4225c691e19c70b432b6e6f @@ -13642,6 +13716,13 @@ __metadata: languageName: node linkType: hard +"proxy-from-env@npm:^1.1.0": + version: 1.1.0 + resolution: "proxy-from-env@npm:1.1.0" + checksum: 10/f0bb4a87cfd18f77bc2fba23ae49c3b378fb35143af16cc478171c623eebe181678f09439707ad80081d340d1593cd54a33a0113f3ccb3f4bc9451488780ee23 + languageName: node + linkType: hard + "psl@npm:^1.1.33": version: 1.9.0 resolution: "psl@npm:1.9.0" @@ -16635,6 +16716,21 @@ __metadata: languageName: node linkType: hard +"wait-on@npm:^8.0.1": + version: 8.0.1 + resolution: "wait-on@npm:8.0.1" + dependencies: + axios: "npm:^1.7.7" + joi: "npm:^17.13.3" + lodash: "npm:^4.17.21" + minimist: "npm:^1.2.8" + rxjs: "npm:^7.8.1" + bin: + wait-on: bin/wait-on + checksum: 10/41f933031b994718dfb50af35bb843f7f7017d601ef22927e92c211736fadd21808fdbf7ae367e998bcaf995cb9c05cf6160552dc655db9082aeecc346bc926d + languageName: node + linkType: hard + "watchpack@npm:^2.4.0, watchpack@npm:^2.4.1": version: 2.4.1 resolution: "watchpack@npm:2.4.1"