From b6c514a2fffc4e08841a9d0d9a53f1973d9c403b Mon Sep 17 00:00:00 2001 From: LekoArts Date: Mon, 16 Oct 2023 13:44:51 +0200 Subject: [PATCH 01/11] chore(repo): Add provenance to .npmrc --- .npmrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.npmrc b/.npmrc index b6f27f13595..e163dd742dc 100644 --- a/.npmrc +++ b/.npmrc @@ -1 +1,2 @@ engine-strict=true +provenance=true From 3ed134ebcbfaa3c07b5bb3b2d1f3be20dbbde36d Mon Sep 17 00:00:00 2001 From: LekoArts Date: Mon, 16 Oct 2023 13:46:12 +0200 Subject: [PATCH 02/11] chore(*): Add directory to "repository" key --- .changeset/fast-planes-talk.md | 18 ++++++++++++++++++ commitlint.config.js | 2 +- packages/backend/package.json | 3 ++- packages/chrome-extension/package.json | 3 ++- packages/clerk-js/package.json | 3 ++- packages/expo/package.json | 3 ++- packages/fastify/package.json | 3 ++- packages/gatsby-plugin-clerk/package.json | 3 ++- packages/localizations/package.json | 3 ++- packages/nextjs/package.json | 3 ++- packages/react/package.json | 3 ++- packages/remix/package.json | 3 ++- packages/sdk-node/package.json | 5 +++-- packages/shared/package.json | 5 +++++ packages/themes/package.json | 3 ++- packages/types/package.json | 3 ++- 16 files changed, 51 insertions(+), 15 deletions(-) create mode 100644 .changeset/fast-planes-talk.md diff --git a/.changeset/fast-planes-talk.md b/.changeset/fast-planes-talk.md new file mode 100644 index 00000000000..3dc767d1269 --- /dev/null +++ b/.changeset/fast-planes-talk.md @@ -0,0 +1,18 @@ +--- +'gatsby-plugin-clerk': patch +'@clerk/chrome-extension': patch +'@clerk/localizations': patch +'@clerk/clerk-js': patch +'@clerk/clerk-sdk-node': patch +'@clerk/backend': patch +'@clerk/fastify': patch +'@clerk/nextjs': patch +'@clerk/shared': patch +'@clerk/themes': patch +'@clerk/clerk-react': patch +'@clerk/remix': patch +'@clerk/types': patch +'@clerk/clerk-expo': patch +--- + +Update "repository" key in package.json to add "directory" value diff --git a/commitlint.config.js b/commitlint.config.js index 0552543592c..067e1be1cf2 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -17,6 +17,6 @@ module.exports = { 'subject-case': [2, 'always', ['sentence-case']], 'body-max-line-length': [1, 'always', '150'], 'scope-empty': [2, 'never'], - 'scope-enum': [2, 'always', [...getPackageNames(), 'repo', 'release']], + 'scope-enum': [2, 'always', [...getPackageNames(), 'repo', 'release', '*']], }, }; diff --git a/packages/backend/package.json b/packages/backend/package.json index e5121263534..88c4fa45db0 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -80,7 +80,8 @@ "homepage": "https://clerk.com/", "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git" + "url": "https://github.com/clerkinc/javascript.git", + "directory": "packages/backend" }, "bugs": { "url": "https://github.com/clerkinc/javascript/issues" diff --git a/packages/chrome-extension/package.json b/packages/chrome-extension/package.json index 5a574d3e08d..6ce6e4453ff 100644 --- a/packages/chrome-extension/package.json +++ b/packages/chrome-extension/package.json @@ -53,7 +53,8 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git" + "url": "https://github.com/clerkinc/javascript.git", + "directory": "packages/chrome-extension" }, "bugs": { "url": "https://github.com/clerkinc/javascript/issues" diff --git a/packages/clerk-js/package.json b/packages/clerk-js/package.json index 4c455a03212..1797d75d420 100644 --- a/packages/clerk-js/package.json +++ b/packages/clerk-js/package.json @@ -93,7 +93,8 @@ "browserslist": "last 2 versions, ios_saf > 12, Safari > 12, > 1%, not dead, not ie > 0", "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git" + "url": "https://github.com/clerkinc/javascript.git", + "directory": "packages/clerk-js" }, "homepage": "https://clerk.com/", "bugs": { diff --git a/packages/expo/package.json b/packages/expo/package.json index 43120053b66..f5e95b4d896 100644 --- a/packages/expo/package.json +++ b/packages/expo/package.json @@ -60,7 +60,8 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git" + "url": "https://github.com/clerkinc/javascript.git", + "directory": "packages/expo" }, "bugs": { "url": "https://github.com/clerkinc/javascript/issues" diff --git a/packages/fastify/package.json b/packages/fastify/package.json index 5a348ae1637..1290a302539 100644 --- a/packages/fastify/package.json +++ b/packages/fastify/package.json @@ -50,7 +50,8 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git" + "url": "https://github.com/clerkinc/javascript.git", + "directory": "packages/fastify" }, "bugs": { "url": "https://github.com/clerkinc/javascript/issues" diff --git a/packages/gatsby-plugin-clerk/package.json b/packages/gatsby-plugin-clerk/package.json index efb92871bcd..2d8252222da 100644 --- a/packages/gatsby-plugin-clerk/package.json +++ b/packages/gatsby-plugin-clerk/package.json @@ -59,7 +59,8 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git" + "url": "https://github.com/clerkinc/javascript.git", + "directory": "packages/gatsby-plugin-clerk" }, "bugs": { "url": "https://github.com/clerkinc/javascript/issues" diff --git a/packages/localizations/package.json b/packages/localizations/package.json index c18b7f32118..4387a3edfd9 100644 --- a/packages/localizations/package.json +++ b/packages/localizations/package.json @@ -45,7 +45,8 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git" + "url": "https://github.com/clerkinc/javascript.git", + "directory": "packages/localizations" }, "bugs": { "url": "https://github.com/clerkinc/javascript/issues" diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json index 8fd742b8106..6b586a3e10e 100644 --- a/packages/nextjs/package.json +++ b/packages/nextjs/package.json @@ -106,7 +106,8 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git" + "url": "https://github.com/clerkinc/javascript.git", + "directory": "packages/nextjs" }, "bugs": { "url": "https://github.com/clerkinc/javascript/issues" diff --git a/packages/react/package.json b/packages/react/package.json index e138d50ae24..5fe14887220 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -67,7 +67,8 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git" + "url": "https://github.com/clerkinc/javascript.git", + "directory": "packages/react" }, "homepage": "https://clerk.com/", "bugs": { diff --git a/packages/remix/package.json b/packages/remix/package.json index 95d24b89c77..5b374dde621 100644 --- a/packages/remix/package.json +++ b/packages/remix/package.json @@ -90,7 +90,8 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git" + "url": "https://github.com/clerkinc/javascript.git", + "directory": "packages/remix" }, "bugs": { "url": "https://github.com/clerkinc/javascript/issues" diff --git a/packages/sdk-node/package.json b/packages/sdk-node/package.json index 4a84b2db14d..683b5d026f0 100644 --- a/packages/sdk-node/package.json +++ b/packages/sdk-node/package.json @@ -50,7 +50,7 @@ "author": { "name": "Clerk, Inc.", "email": "support@clerk.com", - "url": "https://github.com/clerkinc/clerk-sdk-node" + "url": "https://github.com/clerkinc/javascript.git" }, "devDependencies": { "nock": "^13.0.7", @@ -73,7 +73,8 @@ "description": "Clerk server SDK for usage with node", "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git" + "url": "https://github.com/clerkinc/javascript.git", + "directory": "packages/sdk-node" }, "keywords": [ "clerk", diff --git a/packages/shared/package.json b/packages/shared/package.json index 6b3fb515e56..bcee87b8ce2 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -54,5 +54,10 @@ "license": "MIT", "publishConfig": { "access": "public" + }, + "repository": { + "type": "git", + "url": "https://github.com/clerkinc/javascript.git", + "directory": "packages/shared" } } diff --git a/packages/themes/package.json b/packages/themes/package.json index 2fb74bcf4d6..36c7a3084fc 100644 --- a/packages/themes/package.json +++ b/packages/themes/package.json @@ -42,7 +42,8 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git" + "url": "https://github.com/clerkinc/javascript.git", + "directory": "packages/themes" }, "bugs": { "url": "https://github.com/clerkinc/javascript/issues" diff --git a/packages/types/package.json b/packages/types/package.json index 91b8b8436dd..f48488dcc30 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -39,7 +39,8 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git" + "url": "https://github.com/clerkinc/javascript.git", + "directory": "packages/types" }, "homepage": "https://clerk.com/", "bugs": { From 37759bd65eb916294753fceeecf355a46e8f6469 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Mon, 16 Oct 2023 13:49:59 +0200 Subject: [PATCH 03/11] chore(repo): Typo fix --- .changeset/fast-planes-talk.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/fast-planes-talk.md b/.changeset/fast-planes-talk.md index 3dc767d1269..6d518637529 100644 --- a/.changeset/fast-planes-talk.md +++ b/.changeset/fast-planes-talk.md @@ -15,4 +15,4 @@ '@clerk/clerk-expo': patch --- -Update "repository" key in package.json to add "directory" value +Update "repository" key in package.json to add "directory" value. Also publish packages with [npm provenance](https://docs.npmjs.com/generating-provenance-statements) now. From f3c0ae5cd208a9d049fc5b50c32cdebf7f30fb69 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Mon, 16 Oct 2023 13:56:01 +0200 Subject: [PATCH 04/11] chore(*): Use publishConfig instead --- .changeset/fast-planes-talk.md | 2 +- .npmrc | 1 - packages/backend/package.json | 3 ++- packages/chrome-extension/package.json | 3 ++- packages/clerk-js/package.json | 3 ++- packages/expo/package.json | 3 ++- packages/fastify/package.json | 3 ++- packages/gatsby-plugin-clerk/package.json | 3 ++- packages/localizations/package.json | 3 ++- packages/nextjs/package.json | 3 ++- packages/react/package.json | 3 ++- packages/remix/package.json | 3 ++- packages/sdk-node/package.json | 3 ++- packages/shared/package.json | 3 ++- packages/themes/package.json | 3 ++- packages/types/package.json | 3 ++- 16 files changed, 29 insertions(+), 16 deletions(-) diff --git a/.changeset/fast-planes-talk.md b/.changeset/fast-planes-talk.md index 6d518637529..f9d9e748727 100644 --- a/.changeset/fast-planes-talk.md +++ b/.changeset/fast-planes-talk.md @@ -15,4 +15,4 @@ '@clerk/clerk-expo': patch --- -Update "repository" key in package.json to add "directory" value. Also publish packages with [npm provenance](https://docs.npmjs.com/generating-provenance-statements) now. +Publish packages with [npm provenance](https://docs.npmjs.com/generating-provenance-statements) enabled diff --git a/.npmrc b/.npmrc index e163dd742dc..b6f27f13595 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1 @@ engine-strict=true -provenance=true diff --git a/packages/backend/package.json b/packages/backend/package.json index 88c4fa45db0..7f9178ec741 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -75,7 +75,8 @@ "workerd": "^1.20230518.0" }, "publishConfig": { - "access": "public" + "access": "public", + "provenance": true }, "homepage": "https://clerk.com/", "repository": { diff --git a/packages/chrome-extension/package.json b/packages/chrome-extension/package.json index 6ce6e4453ff..54da026548a 100644 --- a/packages/chrome-extension/package.json +++ b/packages/chrome-extension/package.json @@ -49,7 +49,8 @@ "react": ">=16" }, "publishConfig": { - "access": "public" + "access": "public", + "provenance": true }, "repository": { "type": "git", diff --git a/packages/clerk-js/package.json b/packages/clerk-js/package.json index 1797d75d420..682d06b9c2c 100644 --- a/packages/clerk-js/package.json +++ b/packages/clerk-js/package.json @@ -21,7 +21,8 @@ "headless" ], "publishConfig": { - "access": "public" + "access": "public", + "provenance": true }, "scripts": { "build": "npm run build:bundle && npm run build:declarations", diff --git a/packages/expo/package.json b/packages/expo/package.json index f5e95b4d896..8e53360f792 100644 --- a/packages/expo/package.json +++ b/packages/expo/package.json @@ -56,7 +56,8 @@ "node": ">=14" }, "publishConfig": { - "access": "public" + "access": "public", + "provenance": true }, "repository": { "type": "git", diff --git a/packages/fastify/package.json b/packages/fastify/package.json index 1290a302539..3501cc00f45 100644 --- a/packages/fastify/package.json +++ b/packages/fastify/package.json @@ -46,7 +46,8 @@ "node": ">=14" }, "publishConfig": { - "access": "public" + "access": "public", + "provenance": true }, "repository": { "type": "git", diff --git a/packages/gatsby-plugin-clerk/package.json b/packages/gatsby-plugin-clerk/package.json index 2d8252222da..30e426c1eda 100644 --- a/packages/gatsby-plugin-clerk/package.json +++ b/packages/gatsby-plugin-clerk/package.json @@ -55,7 +55,8 @@ "node": ">=14" }, "publishConfig": { - "access": "public" + "access": "public", + "provenance": true }, "repository": { "type": "git", diff --git a/packages/localizations/package.json b/packages/localizations/package.json index 4387a3edfd9..b156cfd2a16 100644 --- a/packages/localizations/package.json +++ b/packages/localizations/package.json @@ -41,7 +41,8 @@ "node": ">=14" }, "publishConfig": { - "access": "public" + "access": "public", + "provenance": true }, "repository": { "type": "git", diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json index 6b586a3e10e..e70abc13f5b 100644 --- a/packages/nextjs/package.json +++ b/packages/nextjs/package.json @@ -102,7 +102,8 @@ "node": ">=14" }, "publishConfig": { - "access": "public" + "access": "public", + "provenance": true }, "repository": { "type": "git", diff --git a/packages/react/package.json b/packages/react/package.json index 5fe14887220..4f26208c39c 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -63,7 +63,8 @@ "node": ">=14" }, "publishConfig": { - "access": "public" + "access": "public", + "provenance": true }, "repository": { "type": "git", diff --git a/packages/remix/package.json b/packages/remix/package.json index 5b374dde621..380b4aaa5e6 100644 --- a/packages/remix/package.json +++ b/packages/remix/package.json @@ -86,7 +86,8 @@ "node": ">=18.0.0" }, "publishConfig": { - "access": "public" + "access": "public", + "provenance": true }, "repository": { "type": "git", diff --git a/packages/sdk-node/package.json b/packages/sdk-node/package.json index 683b5d026f0..5a6515187d0 100644 --- a/packages/sdk-node/package.json +++ b/packages/sdk-node/package.json @@ -86,7 +86,8 @@ }, "homepage": "https://clerk.com/", "publishConfig": { - "access": "public" + "access": "public", + "provenance": true }, "gitHead": "1b19a43b61f712756ab4d8c9ccbee6e8bddbe4ce" } diff --git a/packages/shared/package.json b/packages/shared/package.json index bcee87b8ce2..3b36c7945a6 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -53,7 +53,8 @@ "author": "Clerk", "license": "MIT", "publishConfig": { - "access": "public" + "access": "public", + "provenance": true }, "repository": { "type": "git", diff --git a/packages/themes/package.json b/packages/themes/package.json index 36c7a3084fc..d0fd4ed9589 100644 --- a/packages/themes/package.json +++ b/packages/themes/package.json @@ -38,7 +38,8 @@ "node": ">=14" }, "publishConfig": { - "access": "public" + "access": "public", + "provenance": true }, "repository": { "type": "git", diff --git a/packages/types/package.json b/packages/types/package.json index f48488dcc30..27ea35e55c5 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -35,7 +35,8 @@ "node": ">=14" }, "publishConfig": { - "access": "public" + "access": "public", + "provenance": true }, "repository": { "type": "git", From 3545ced3ef0a968329fc9f57426cae1bcb95eb8f Mon Sep 17 00:00:00 2001 From: LekoArts Date: Mon, 16 Oct 2023 15:09:32 +0200 Subject: [PATCH 05/11] chore(repo): Add missing permissions --- .github/workflows/base-build.yml | 3 +++ .github/workflows/base-registry.yml | 3 +++ .github/workflows/release-prod.yml | 3 +++ .github/workflows/release-snapshot.yml | 3 +++ .github/workflows/release-staging.yml | 3 +++ 5 files changed, 15 insertions(+) diff --git a/.github/workflows/base-build.yml b/.github/workflows/base-build.yml index 784db08da14..9e2769a9318 100644 --- a/.github/workflows/base-build.yml +++ b/.github/workflows/base-build.yml @@ -5,6 +5,9 @@ jobs: build: # if: ${{ github.repository == 'clerkinc/javascript' }} runs-on: ${{ vars.RUNNER_LARGE }} + permissions: + contents: read + id-token: write steps: - name: Checkout repo uses: actions/checkout@v3 diff --git a/.github/workflows/base-registry.yml b/.github/workflows/base-registry.yml index 81472fe95ed..8fe3aa77ee2 100644 --- a/.github/workflows/base-registry.yml +++ b/.github/workflows/base-registry.yml @@ -4,6 +4,9 @@ on: jobs: registry: runs-on: ${{ vars.RUNNER_LARGE }} + permissions: + contents: read + id-token: write steps: - uses: actions/checkout@v3 - name: Setup diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml index 3f8999972c8..2ac4a163d01 100644 --- a/.github/workflows/release-prod.yml +++ b/.github/workflows/release-prod.yml @@ -15,6 +15,9 @@ jobs: name: Release if: ${{ github.repository == 'clerkinc/javascript' }} runs-on: ${{ vars.RUNNER_LARGE }} + permissions: + contents: read + id-token: write steps: - name: Echo github context run: echo "$GITHUB_CONTEXT" diff --git a/.github/workflows/release-snapshot.yml b/.github/workflows/release-snapshot.yml index 8a74950cb95..e7c108c4ad2 100644 --- a/.github/workflows/release-snapshot.yml +++ b/.github/workflows/release-snapshot.yml @@ -16,6 +16,9 @@ jobs: env: TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} TURBO_TEAM: ${{ vars.TURBO_TEAM }} + permissions: + contents: read + id-token: write steps: - name: Limit action to Clerk members uses: actions/github-script@v6 diff --git a/.github/workflows/release-staging.yml b/.github/workflows/release-staging.yml index 395002aba01..10a82334fe8 100644 --- a/.github/workflows/release-staging.yml +++ b/.github/workflows/release-staging.yml @@ -18,6 +18,9 @@ jobs: TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} TURBO_TEAM: ${{ vars.TURBO_TEAM }} TURBO_REMOTE_ONLY: true + permissions: + contents: read + id-token: write steps: - name: Checkout repo uses: actions/checkout@v3 From dc77f5530bd17bfe4a39063a15a9a77b26746903 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Mon, 16 Oct 2023 15:53:10 +0200 Subject: [PATCH 06/11] chore(*): Normalize repository.url --- packages/backend/package.json | 2 +- packages/chrome-extension/package.json | 2 +- packages/clerk-js/package.json | 2 +- packages/expo/package.json | 2 +- packages/fastify/package.json | 2 +- packages/gatsby-plugin-clerk/package.json | 2 +- packages/localizations/package.json | 2 +- packages/nextjs/package.json | 2 +- packages/react/package.json | 2 +- packages/remix/package.json | 2 +- packages/sdk-node/package.json | 4 ++-- packages/shared/package.json | 2 +- packages/themes/package.json | 2 +- packages/types/package.json | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/backend/package.json b/packages/backend/package.json index 7f9178ec741..e486f81eb06 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -81,7 +81,7 @@ "homepage": "https://clerk.com/", "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git", + "url": "git+https://github.com/clerkinc/javascript.git", "directory": "packages/backend" }, "bugs": { diff --git a/packages/chrome-extension/package.json b/packages/chrome-extension/package.json index 54da026548a..1526cd0427c 100644 --- a/packages/chrome-extension/package.json +++ b/packages/chrome-extension/package.json @@ -54,7 +54,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git", + "url": "git+https://github.com/clerkinc/javascript.git", "directory": "packages/chrome-extension" }, "bugs": { diff --git a/packages/clerk-js/package.json b/packages/clerk-js/package.json index 4aecc06b9ef..54e067d6047 100644 --- a/packages/clerk-js/package.json +++ b/packages/clerk-js/package.json @@ -94,7 +94,7 @@ "browserslist": "last 2 versions, ios_saf > 12, Safari > 12, > 1%, not dead, not ie > 0", "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git", + "url": "git+https://github.com/clerkinc/javascript.git", "directory": "packages/clerk-js" }, "homepage": "https://clerk.com/", diff --git a/packages/expo/package.json b/packages/expo/package.json index 7df9eb302f4..1933eda5e69 100644 --- a/packages/expo/package.json +++ b/packages/expo/package.json @@ -61,7 +61,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git", + "url": "git+https://github.com/clerkinc/javascript.git", "directory": "packages/expo" }, "bugs": { diff --git a/packages/fastify/package.json b/packages/fastify/package.json index 3501cc00f45..762159f7822 100644 --- a/packages/fastify/package.json +++ b/packages/fastify/package.json @@ -51,7 +51,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git", + "url": "git+https://github.com/clerkinc/javascript.git", "directory": "packages/fastify" }, "bugs": { diff --git a/packages/gatsby-plugin-clerk/package.json b/packages/gatsby-plugin-clerk/package.json index b76cd7af5a7..ddb5a61d4e6 100644 --- a/packages/gatsby-plugin-clerk/package.json +++ b/packages/gatsby-plugin-clerk/package.json @@ -60,7 +60,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git", + "url": "git+https://github.com/clerkinc/javascript.git", "directory": "packages/gatsby-plugin-clerk" }, "bugs": { diff --git a/packages/localizations/package.json b/packages/localizations/package.json index b156cfd2a16..fd0fd1005c6 100644 --- a/packages/localizations/package.json +++ b/packages/localizations/package.json @@ -46,7 +46,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git", + "url": "git+https://github.com/clerkinc/javascript.git", "directory": "packages/localizations" }, "bugs": { diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json index 1af7ab1d3ff..67e7539bf36 100644 --- a/packages/nextjs/package.json +++ b/packages/nextjs/package.json @@ -107,7 +107,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git", + "url": "git+https://github.com/clerkinc/javascript.git", "directory": "packages/nextjs" }, "bugs": { diff --git a/packages/react/package.json b/packages/react/package.json index 29ceb9254db..1290de9f261 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -68,7 +68,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git", + "url": "git+https://github.com/clerkinc/javascript.git", "directory": "packages/react" }, "homepage": "https://clerk.com/", diff --git a/packages/remix/package.json b/packages/remix/package.json index 34438fe28f1..05d572b5be8 100644 --- a/packages/remix/package.json +++ b/packages/remix/package.json @@ -91,7 +91,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git", + "url": "git+https://github.com/clerkinc/javascript.git", "directory": "packages/remix" }, "bugs": { diff --git a/packages/sdk-node/package.json b/packages/sdk-node/package.json index 2a9c81f61fc..aac16f333d8 100644 --- a/packages/sdk-node/package.json +++ b/packages/sdk-node/package.json @@ -50,7 +50,7 @@ "author": { "name": "Clerk, Inc.", "email": "support@clerk.com", - "url": "https://github.com/clerkinc/javascript.git" + "url": "git+https://github.com/clerkinc/javascript.git" }, "devDependencies": { "nock": "^13.0.7", @@ -73,7 +73,7 @@ "description": "Clerk server SDK for usage with node", "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git", + "url": "git+https://github.com/clerkinc/javascript.git", "directory": "packages/sdk-node" }, "keywords": [ diff --git a/packages/shared/package.json b/packages/shared/package.json index 3b36c7945a6..f690ed909bd 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -58,7 +58,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git", + "url": "git+https://github.com/clerkinc/javascript.git", "directory": "packages/shared" } } diff --git a/packages/themes/package.json b/packages/themes/package.json index d0fd4ed9589..64ae2086126 100644 --- a/packages/themes/package.json +++ b/packages/themes/package.json @@ -43,7 +43,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git", + "url": "git+https://github.com/clerkinc/javascript.git", "directory": "packages/themes" }, "bugs": { diff --git a/packages/types/package.json b/packages/types/package.json index 27ea35e55c5..e50cc610bf3 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -40,7 +40,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/clerkinc/javascript.git", + "url": "git+https://github.com/clerkinc/javascript.git", "directory": "packages/types" }, "homepage": "https://clerk.com/", From e4f2b4b3c52c86f6267a79569176ad66b332d1b1 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Mon, 16 Oct 2023 16:03:51 +0200 Subject: [PATCH 07/11] chore(repo): Try not to use provenance in verdaccio --- .github/workflows/base-build.yml | 5 ++--- .github/workflows/base-registry.yml | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/base-build.yml b/.github/workflows/base-build.yml index 9e2769a9318..ed7986b83b3 100644 --- a/.github/workflows/base-build.yml +++ b/.github/workflows/base-build.yml @@ -5,9 +5,6 @@ jobs: build: # if: ${{ github.repository == 'clerkinc/javascript' }} runs-on: ${{ vars.RUNNER_LARGE }} - permissions: - contents: read - id-token: write steps: - name: Checkout repo uses: actions/checkout@v3 @@ -33,6 +30,8 @@ jobs: # and fails early if the default npm registry is used run: | npm run release:verdaccio + env: + NPM_CONFIG_PROVENANCE: false - name: List published packages run: | ls -all .verdaccio/storage/@clerk diff --git a/.github/workflows/base-registry.yml b/.github/workflows/base-registry.yml index 8fe3aa77ee2..312d17d06e9 100644 --- a/.github/workflows/base-registry.yml +++ b/.github/workflows/base-registry.yml @@ -4,9 +4,6 @@ on: jobs: registry: runs-on: ${{ vars.RUNNER_LARGE }} - permissions: - contents: read - id-token: write steps: - uses: actions/checkout@v3 - name: Setup @@ -28,6 +25,8 @@ jobs: # and fails early if the default npm registry is used run: | npm run release:verdaccio + env: + NPM_CONFIG_PROVENANCE: false - name: List published packages run: | ls -all .verdaccio/storage/@clerk From 92256b21dc7bf6002aa092c861a58a416c5a42c6 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Mon, 16 Oct 2023 16:11:33 +0200 Subject: [PATCH 08/11] chore(*): Use env var --- .github/workflows/base-build.yml | 2 -- .github/workflows/base-registry.yml | 2 -- .github/workflows/release-prod.yml | 1 + .github/workflows/release-snapshot.yml | 1 + .github/workflows/release-staging.yml | 1 + packages/backend/package.json | 3 +-- packages/chrome-extension/package.json | 3 +-- packages/clerk-js/package.json | 3 +-- packages/expo/package.json | 3 +-- packages/fastify/package.json | 3 +-- packages/gatsby-plugin-clerk/package.json | 3 +-- packages/localizations/package.json | 3 +-- packages/nextjs/package.json | 3 +-- packages/react/package.json | 3 +-- packages/remix/package.json | 3 +-- packages/sdk-node/package.json | 3 +-- packages/shared/package.json | 3 +-- packages/themes/package.json | 3 +-- packages/types/package.json | 3 +-- 19 files changed, 17 insertions(+), 32 deletions(-) diff --git a/.github/workflows/base-build.yml b/.github/workflows/base-build.yml index ed7986b83b3..784db08da14 100644 --- a/.github/workflows/base-build.yml +++ b/.github/workflows/base-build.yml @@ -30,8 +30,6 @@ jobs: # and fails early if the default npm registry is used run: | npm run release:verdaccio - env: - NPM_CONFIG_PROVENANCE: false - name: List published packages run: | ls -all .verdaccio/storage/@clerk diff --git a/.github/workflows/base-registry.yml b/.github/workflows/base-registry.yml index 312d17d06e9..81472fe95ed 100644 --- a/.github/workflows/base-registry.yml +++ b/.github/workflows/base-registry.yml @@ -25,8 +25,6 @@ jobs: # and fails early if the default npm registry is used run: | npm run release:verdaccio - env: - NPM_CONFIG_PROVENANCE: false - name: List published packages run: | ls -all .verdaccio/storage/@clerk diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml index 2ac4a163d01..421de6fc420 100644 --- a/.github/workflows/release-prod.yml +++ b/.github/workflows/release-prod.yml @@ -41,6 +41,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.CLERK_COOKIE_PAT }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + NPM_CONFIG_PROVENANCE: true - name: Trigger workflows on related repos if: steps.changesets.outputs.published == 'true' diff --git a/.github/workflows/release-snapshot.yml b/.github/workflows/release-snapshot.yml index e7c108c4ad2..ad96885475e 100644 --- a/.github/workflows/release-snapshot.yml +++ b/.github/workflows/release-snapshot.yml @@ -65,6 +65,7 @@ jobs: run: npm run release:snapshot env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + NPM_CONFIG_PROVENANCE: true - name: Package info if: steps.version-packages.outputs.success == '1' diff --git a/.github/workflows/release-staging.yml b/.github/workflows/release-staging.yml index 10a82334fe8..baa5849937d 100644 --- a/.github/workflows/release-staging.yml +++ b/.github/workflows/release-staging.yml @@ -37,6 +37,7 @@ jobs: run: npm run release:staging env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + NPM_CONFIG_PROVENANCE: true - name: Trigger workflows on related repos uses: actions/github-script@v6 diff --git a/packages/backend/package.json b/packages/backend/package.json index e486f81eb06..cc392f8f014 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -75,8 +75,7 @@ "workerd": "^1.20230518.0" }, "publishConfig": { - "access": "public", - "provenance": true + "access": "public" }, "homepage": "https://clerk.com/", "repository": { diff --git a/packages/chrome-extension/package.json b/packages/chrome-extension/package.json index 1526cd0427c..c8a7ecc445c 100644 --- a/packages/chrome-extension/package.json +++ b/packages/chrome-extension/package.json @@ -49,8 +49,7 @@ "react": ">=16" }, "publishConfig": { - "access": "public", - "provenance": true + "access": "public" }, "repository": { "type": "git", diff --git a/packages/clerk-js/package.json b/packages/clerk-js/package.json index 54e067d6047..5659b4ff5f3 100644 --- a/packages/clerk-js/package.json +++ b/packages/clerk-js/package.json @@ -21,8 +21,7 @@ "headless" ], "publishConfig": { - "access": "public", - "provenance": true + "access": "public" }, "scripts": { "build": "npm run build:bundle && npm run build:declarations", diff --git a/packages/expo/package.json b/packages/expo/package.json index 1933eda5e69..dcd8b0faa44 100644 --- a/packages/expo/package.json +++ b/packages/expo/package.json @@ -56,8 +56,7 @@ "node": ">=14" }, "publishConfig": { - "access": "public", - "provenance": true + "access": "public" }, "repository": { "type": "git", diff --git a/packages/fastify/package.json b/packages/fastify/package.json index 762159f7822..302811ae847 100644 --- a/packages/fastify/package.json +++ b/packages/fastify/package.json @@ -46,8 +46,7 @@ "node": ">=14" }, "publishConfig": { - "access": "public", - "provenance": true + "access": "public" }, "repository": { "type": "git", diff --git a/packages/gatsby-plugin-clerk/package.json b/packages/gatsby-plugin-clerk/package.json index ddb5a61d4e6..5b96e9bd462 100644 --- a/packages/gatsby-plugin-clerk/package.json +++ b/packages/gatsby-plugin-clerk/package.json @@ -55,8 +55,7 @@ "node": ">=14" }, "publishConfig": { - "access": "public", - "provenance": true + "access": "public" }, "repository": { "type": "git", diff --git a/packages/localizations/package.json b/packages/localizations/package.json index fd0fd1005c6..4b5e942b929 100644 --- a/packages/localizations/package.json +++ b/packages/localizations/package.json @@ -41,8 +41,7 @@ "node": ">=14" }, "publishConfig": { - "access": "public", - "provenance": true + "access": "public" }, "repository": { "type": "git", diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json index 67e7539bf36..89d7a40236b 100644 --- a/packages/nextjs/package.json +++ b/packages/nextjs/package.json @@ -102,8 +102,7 @@ "node": ">=14" }, "publishConfig": { - "access": "public", - "provenance": true + "access": "public" }, "repository": { "type": "git", diff --git a/packages/react/package.json b/packages/react/package.json index 1290de9f261..6b269d1280e 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -63,8 +63,7 @@ "node": ">=14" }, "publishConfig": { - "access": "public", - "provenance": true + "access": "public" }, "repository": { "type": "git", diff --git a/packages/remix/package.json b/packages/remix/package.json index 05d572b5be8..08de407b985 100644 --- a/packages/remix/package.json +++ b/packages/remix/package.json @@ -86,8 +86,7 @@ "node": ">=18.0.0" }, "publishConfig": { - "access": "public", - "provenance": true + "access": "public" }, "repository": { "type": "git", diff --git a/packages/sdk-node/package.json b/packages/sdk-node/package.json index aac16f333d8..da189a99514 100644 --- a/packages/sdk-node/package.json +++ b/packages/sdk-node/package.json @@ -86,7 +86,6 @@ }, "homepage": "https://clerk.com/", "publishConfig": { - "access": "public", - "provenance": true + "access": "public" } } diff --git a/packages/shared/package.json b/packages/shared/package.json index f690ed909bd..81c909a3fd2 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -53,8 +53,7 @@ "author": "Clerk", "license": "MIT", "publishConfig": { - "access": "public", - "provenance": true + "access": "public" }, "repository": { "type": "git", diff --git a/packages/themes/package.json b/packages/themes/package.json index 64ae2086126..4daf85f139f 100644 --- a/packages/themes/package.json +++ b/packages/themes/package.json @@ -38,8 +38,7 @@ "node": ">=14" }, "publishConfig": { - "access": "public", - "provenance": true + "access": "public" }, "repository": { "type": "git", diff --git a/packages/types/package.json b/packages/types/package.json index e50cc610bf3..daa22af087a 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -35,8 +35,7 @@ "node": ">=14" }, "publishConfig": { - "access": "public", - "provenance": true + "access": "public" }, "repository": { "type": "git", From 9ff9834d2f857a81157bb44456bbe4396e1795e7 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Mon, 16 Oct 2023 17:08:12 +0200 Subject: [PATCH 09/11] chore(repo): Move env var around --- .github/workflows/release-prod.yml | 3 ++- .github/workflows/release-snapshot.yml | 2 +- .github/workflows/release-staging.yml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml index 421de6fc420..825c2fd9f4d 100644 --- a/.github/workflows/release-prod.yml +++ b/.github/workflows/release-prod.yml @@ -15,6 +15,8 @@ jobs: name: Release if: ${{ github.repository == 'clerkinc/javascript' }} runs-on: ${{ vars.RUNNER_LARGE }} + env: + NPM_CONFIG_PROVENANCE: true permissions: contents: read id-token: write @@ -41,7 +43,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.CLERK_COOKIE_PAT }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - NPM_CONFIG_PROVENANCE: true - name: Trigger workflows on related repos if: steps.changesets.outputs.published == 'true' diff --git a/.github/workflows/release-snapshot.yml b/.github/workflows/release-snapshot.yml index ad96885475e..20427aa5265 100644 --- a/.github/workflows/release-snapshot.yml +++ b/.github/workflows/release-snapshot.yml @@ -16,6 +16,7 @@ jobs: env: TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} TURBO_TEAM: ${{ vars.TURBO_TEAM }} + NPM_CONFIG_PROVENANCE: true permissions: contents: read id-token: write @@ -65,7 +66,6 @@ jobs: run: npm run release:snapshot env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - NPM_CONFIG_PROVENANCE: true - name: Package info if: steps.version-packages.outputs.success == '1' diff --git a/.github/workflows/release-staging.yml b/.github/workflows/release-staging.yml index baa5849937d..42db3bd2c48 100644 --- a/.github/workflows/release-staging.yml +++ b/.github/workflows/release-staging.yml @@ -18,6 +18,7 @@ jobs: TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} TURBO_TEAM: ${{ vars.TURBO_TEAM }} TURBO_REMOTE_ONLY: true + NPM_CONFIG_PROVENANCE: true permissions: contents: read id-token: write @@ -37,7 +38,6 @@ jobs: run: npm run release:staging env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} - NPM_CONFIG_PROVENANCE: true - name: Trigger workflows on related repos uses: actions/github-script@v6 From b0c9fe5afe179bc201df037390dc71b0bc0db9a8 Mon Sep 17 00:00:00 2001 From: LekoArts Date: Mon, 16 Oct 2023 17:18:30 +0200 Subject: [PATCH 10/11] Revert "chore(repo): Move env var around" This reverts commit 9ff9834d2f857a81157bb44456bbe4396e1795e7. --- .github/workflows/release-prod.yml | 3 +-- .github/workflows/release-snapshot.yml | 2 +- .github/workflows/release-staging.yml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml index 825c2fd9f4d..421de6fc420 100644 --- a/.github/workflows/release-prod.yml +++ b/.github/workflows/release-prod.yml @@ -15,8 +15,6 @@ jobs: name: Release if: ${{ github.repository == 'clerkinc/javascript' }} runs-on: ${{ vars.RUNNER_LARGE }} - env: - NPM_CONFIG_PROVENANCE: true permissions: contents: read id-token: write @@ -43,6 +41,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.CLERK_COOKIE_PAT }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + NPM_CONFIG_PROVENANCE: true - name: Trigger workflows on related repos if: steps.changesets.outputs.published == 'true' diff --git a/.github/workflows/release-snapshot.yml b/.github/workflows/release-snapshot.yml index 20427aa5265..ad96885475e 100644 --- a/.github/workflows/release-snapshot.yml +++ b/.github/workflows/release-snapshot.yml @@ -16,7 +16,6 @@ jobs: env: TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} TURBO_TEAM: ${{ vars.TURBO_TEAM }} - NPM_CONFIG_PROVENANCE: true permissions: contents: read id-token: write @@ -66,6 +65,7 @@ jobs: run: npm run release:snapshot env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + NPM_CONFIG_PROVENANCE: true - name: Package info if: steps.version-packages.outputs.success == '1' diff --git a/.github/workflows/release-staging.yml b/.github/workflows/release-staging.yml index 42db3bd2c48..baa5849937d 100644 --- a/.github/workflows/release-staging.yml +++ b/.github/workflows/release-staging.yml @@ -18,7 +18,6 @@ jobs: TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} TURBO_TEAM: ${{ vars.TURBO_TEAM }} TURBO_REMOTE_ONLY: true - NPM_CONFIG_PROVENANCE: true permissions: contents: read id-token: write @@ -38,6 +37,7 @@ jobs: run: npm run release:staging env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + NPM_CONFIG_PROVENANCE: true - name: Trigger workflows on related repos uses: actions/github-script@v6 From 6ff1e40b453f7954b4352c77788b82112731593a Mon Sep 17 00:00:00 2001 From: LekoArts Date: Tue, 17 Oct 2023 08:41:10 +0200 Subject: [PATCH 11/11] chore(repo): Adjust npm scripts --- package.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 3d2500ad033..00be2e4d407 100644 --- a/package.json +++ b/package.json @@ -78,20 +78,20 @@ "lint:attw": "FORCE_COLOR=1 turbo lint:attw", "lint:fix": "FORCE_COLOR=1 turbo lint -- --fix", "bundlewatch": "turbo bundlewatch", - "format": "npx prettier --write .", - "format:check": "npx prettier --cache --check .", + "format": "prettier --write .", + "format:check": "prettier --cache --check .", "nuke": "./scripts/nuke.sh", "yalc:all": "for d in packages/*/; do echo $d; cd $d; yalc push --replace --sig; cd '../../'; done", "prepare": "husky install", - "changeset": "npx changeset", + "changeset": "changeset", "changeset:empty": "npm run changeset -- --empty", - "version": "npx changeset version && ./scripts/version-info.sh", + "version": "changeset version && ./scripts/version-info.sh", "version:snapshot": "./scripts/snapshot.mjs", "version:staging": "./scripts/staging.mjs", - "release": "FORCE_COLOR=1 npm run build -- --force && npx changeset publish && git push --follow-tags", - "release:snapshot": "FORCE_COLOR=1 npm run build && npx changeset publish --tag snapshot --no-git-tag", - "release:staging": "FORCE_COLOR=1 npm run build && npx changeset publish --tag staging --no-git-tag", - "release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_CONCURRENCY=4 npm run build && npx changeset publish --no-git-tag; fi", + "release": "FORCE_COLOR=1 npm run build -- --force && changeset publish && git push --follow-tags", + "release:snapshot": "FORCE_COLOR=1 npm run build && changeset publish --tag snapshot --no-git-tag", + "release:staging": "FORCE_COLOR=1 npm run build && changeset publish --tag staging --no-git-tag", + "release:verdaccio": "if [ \"$(npm config get registry)\" = \"https://registry.npmjs.org/\" ]; then echo 'Error: Using default registry' && exit 1; else TURBO_CONCURRENCY=4 npm run build && changeset publish --no-git-tag; fi", "update:lockfile": "npm run nuke && npm install -D --arch=x64 --platform=linux turbo && npm install -D --arch=arm64 --platform=darwin turbo" } }