From b986c4cabe870baf2523cf8fc1f8908da06b3751 Mon Sep 17 00:00:00 2001 From: Tom Milewski Date: Tue, 14 Nov 2023 03:17:18 -0500 Subject: [PATCH] chore(repo): Handle publint/attw errors [SDK-908] (#2124) --- .github/workflows/ci.yml | 24 +++++------ .gitignore | 8 +++- package-lock.json | 92 ++++++++++++++++++++++++++++++++++------ package.json | 2 +- turbo.json | 21 --------- 5 files changed, 99 insertions(+), 48 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d532867a4..6ad9932f0d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,6 @@ on: branches: - main - release/v4 - - ci-updates concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -41,15 +40,6 @@ jobs: turbo-team: ${{ vars.TURBO_TEAM }} turbo-token: ${{ secrets.TURBO_TOKEN }} - - name: Test Envs - run: | - echo "TURBO_ARGS: $TURBO_ARGS" - echo "TURBO_TEAM: $TURBO_TEAM" - echo "TURBO_TOKEN: $TURBO_TOKEN" - echo "TURBO_REMOTE_ONLY: $TURBO_REMOTE_ONLY" - echo "TURBO_REMOTE_CACHE_SIGNATURE_KEY: $TURBO_REMOTE_CACHE_SIGNATURE_KEY" - echo "FORCE_COLOR: $FORCE_COLOR" - - name: Require Changeset timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_SHORT) }} if: ${{ !(github.event_name == 'merge_group') }} @@ -61,17 +51,25 @@ jobs: - name: Lint packages using publint timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_SHORT) }} - run: npm run lint:publint -- $TURBO_ARGS + run: npx turbo lint:publint $TURBO_ARGS --filter=!@clerk/clerk-js + + - name: Lint packages using publint [Errors Allowed] + timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_SHORT) }} + run: npx turbo lint:publint $TURBO_ARGS --filter=@clerk/clerk-js --continue continue-on-error: true # TODO: Remove this when all related errors are fixed - name: Lint types using attw timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_SHORT) }} - run: npm run lint:attw -- $TURBO_ARGS + run: npx turbo lint:attw --filter=!@clerk/clerk-sdk-node --filter=!@clerk/nextjs --filter=!@clerk/clerk-react --filter=!@clerk/shared + + - name: Lint types using attw [Errors Allowed] + timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_SHORT) }} + run: npx turbo lint:attw --filter=@clerk/clerk-sdk-node --filter=@clerk/nextjs --filter=@clerk/clerk-react --filter=@clerk/shared --continue continue-on-error: true # TODO: Remove this when all related errors are fixed - name: Run lint timeout-minutes: ${{ fromJSON(vars.TIMEOUT_MINUTES_SHORT) }} - run: npm run lint -- $TURBO_ARGS -- --quiet + run: npx turbo lint $TURBO_ARGS -- --quiet - name: Upload Turbo Summary uses: actions/upload-artifact@v3 diff --git a/.gitignore b/.gitignore index e10cb30432..926923fa76 100644 --- a/.gitignore +++ b/.gitignore @@ -82,8 +82,14 @@ playground/*/yarn.lock playwright-report test-results -# verdaccio +# Verdaccio .verdaccio +# Workflow Outputs +/packages/*/*.tgz + +# Scripts scripts/.env !scripts/.env.example + + diff --git a/package-lock.json b/package-lock.json index 22c23d2728..705b4d84a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -56,7 +56,7 @@ "tree-kill": "^1.2.2", "ts-jest": "^29.0.3", "tsup": "^7.2.0", - "turbo": "^1.10.15", + "turbo": "^1.10.16", "typescript": "^5.2.2", "verdaccio": "^5.26.3", "zx": "^7.2.3" @@ -30966,33 +30966,100 @@ } }, "node_modules/turbo": { - "version": "1.10.15", + "version": "1.10.16", + "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.10.16.tgz", + "integrity": "sha512-2CEaK4FIuSZiP83iFa9GqMTQhroW2QryckVqUydmg4tx78baftTOS0O+oDAhvo9r9Nit4xUEtC1RAHoqs6ZEtg==", "dev": true, - "license": "MPL-2.0", "bin": { "turbo": "bin/turbo" }, "optionalDependencies": { - "turbo-darwin-64": "1.10.15", - "turbo-darwin-arm64": "1.10.15", - "turbo-linux-64": "1.10.15", - "turbo-linux-arm64": "1.10.15", - "turbo-windows-64": "1.10.15", - "turbo-windows-arm64": "1.10.15" - } + "turbo-darwin-64": "1.10.16", + "turbo-darwin-arm64": "1.10.16", + "turbo-linux-64": "1.10.16", + "turbo-linux-arm64": "1.10.16", + "turbo-windows-64": "1.10.16", + "turbo-windows-arm64": "1.10.16" + } + }, + "node_modules/turbo-darwin-64": { + "version": "1.10.16", + "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.10.16.tgz", + "integrity": "sha512-+Jk91FNcp9e9NCLYlvDDlp2HwEDp14F9N42IoW3dmHI5ZkGSXzalbhVcrx3DOox3QfiNUHxzWg4d7CnVNCuuMg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] }, "node_modules/turbo-darwin-arm64": { - "version": "1.10.15", + "version": "1.10.16", + "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.10.16.tgz", + "integrity": "sha512-jqGpFZipIivkRp/i+jnL8npX0VssE6IAVNKtu573LXtssZdV/S+fRGYA16tI46xJGxSAivrZ/IcgZrV6Jk80bw==", "cpu": [ "arm64" ], "dev": true, - "license": "MPL-2.0", "optional": true, "os": [ "darwin" ] }, + "node_modules/turbo-linux-64": { + "version": "1.10.16", + "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.10.16.tgz", + "integrity": "sha512-PpqEZHwLoizQ6sTUvmImcRmACyRk9EWLXGlqceogPZsJ1jTRK3sfcF9fC2W56zkSIzuLEP07k5kl+ZxJd8JMcg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/turbo-linux-arm64": { + "version": "1.10.16", + "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.10.16.tgz", + "integrity": "sha512-TMjFYz8to1QE0fKVXCIvG/4giyfnmqcQIwjdNfJvKjBxn22PpbjeuFuQ5kNXshUTRaTJihFbuuCcb5OYFNx4uw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/turbo-windows-64": { + "version": "1.10.16", + "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.10.16.tgz", + "integrity": "sha512-+jsf68krs0N66FfC4/zZvioUap/Tq3sPFumnMV+EBo8jFdqs4yehd6+MxIwYTjSQLIcpH8KoNMB0gQYhJRLZzw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/turbo-windows-arm64": { + "version": "1.10.16", + "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.10.16.tgz", + "integrity": "sha512-sKm3hcMM1bl0B3PLG4ifidicOGfoJmOEacM5JtgBkYM48ncMHjkHfFY7HrJHZHUnXM4l05RQTpLFoOl/uIo2HQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/tweetnacl": { "version": "0.14.5", "dev": true, @@ -33787,6 +33854,7 @@ "devDependencies": { "@types/node": "^18.18.0", "eslint-config-custom": "*", + "tsup": "*", "typescript": "*" }, "engines": { diff --git a/package.json b/package.json index 599694a43a..f9ab9af4b4 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "tree-kill": "^1.2.2", "ts-jest": "^29.0.3", "tsup": "^7.2.0", - "turbo": "^1.10.15", + "turbo": "^1.10.16", "typescript": "^5.2.2", "verdaccio": "^5.26.3", "zx": "^7.2.3" diff --git a/turbo.json b/turbo.json index 468f92c395..693905a1cc 100644 --- a/turbo.json +++ b/turbo.json @@ -78,27 +78,6 @@ "test:cache:clear": { "cache": false }, - "test:ci": { - "dependsOn": ["build"], - "inputs": [ - "*.d.ts", - "**/package.json", - "bundlewatch.config.json", - "jest.*", - "src/**", - "tests/**", - "tsconfig.json", - "tsconfig.*.json", - "tsup.config.ts", - - "!**/__snapshots__/**", - "!coverage/**", - "!examples/**", - "!node_modules/**" - ], - "outputMode": "new-only", - "outputs": [] - }, "lint": { "dependsOn": ["^build"], "outputs": []