diff --git a/.github/workflows/private-release.yml b/.github/workflows/private-release.yml index 53b7065..4dd3931 100644 --- a/.github/workflows/private-release.yml +++ b/.github/workflows/private-release.yml @@ -13,6 +13,11 @@ on: required: false default: false type: boolean + tag: + description: "NPM tag for release (e.g., beta, alpha, rc)" + required: false + default: "beta" + type: string concurrency: ${{ github.workflow }}-${{ github.ref }} @@ -26,6 +31,19 @@ jobs: with: ref: ${{ inputs.branch }} + - name: Check for changes to release + id: check-changes + run: | + CHANGESET_COUNT=$(find .changeset -type f -name '*.md' ! -name 'README.md' | wc -l) + if [ "$CHANGESET_COUNT" -eq 0 ]; then + echo "No changesets found. Nothing to release." + echo "has-changes=false" >> $GITHUB_OUTPUT + exit 1 + else + echo "Found $CHANGESET_COUNT changeset(s) to release." + echo "has-changes=true" >> $GITHUB_OUTPUT + fi + - name: Create beta branch id: create-branch run: | @@ -43,8 +61,9 @@ jobs: - name: Install dependencies run: npm ci - - name: Create beta version - run: npm run version:private + - name: Create snapshot version + if: ${{ steps.check-changes.has-changes == true }} + run: npm run version:private -- ${{ inputs.tag }} - name: Run tests if: ${{ inputs.skip_tests == false }} @@ -53,12 +72,9 @@ jobs: - name: build run: npm run build - - name: Publish - uses: changesets/action@v1 - with: - version: npm run version:private - publish: npm run release:private - createGithubReleases: false + - name: Publish to npm + if: ${{ steps.check-changes.has-changes == true }} + run: npm run publish:private -- ${{ inputs.tag }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/package-lock.json b/package-lock.json index e291768..25009a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14955,7 +14955,7 @@ }, "packages/captcha-nodejs": { "name": "@supertokens-plugins/captcha-nodejs", - "version": "0.2.0", + "version": "0.2.1", "license": "Apache-2.0", "dependencies": { "supertokens-node": "^23.0.0" @@ -15792,7 +15792,7 @@ }, "packages/captcha-react": { "name": "@supertokens-plugins/captcha-react", - "version": "0.3.0", + "version": "0.3.1", "license": "Apache-2.0", "dependencies": { "supertokens-auth-react": "^0.50.0" @@ -17719,7 +17719,7 @@ }, "packages/progressive-profiling-nodejs": { "name": "@supertokens-plugins/progressive-profiling-nodejs", - "version": "0.1.0", + "version": "0.1.1", "devDependencies": { "@shared/eslint": "*", "@shared/nodejs": "*", @@ -17855,7 +17855,7 @@ }, "packages/progressive-profiling-react": { "name": "@supertokens-plugins/progressive-profiling-react", - "version": "0.0.5", + "version": "0.1.2", "dependencies": { "supertokens-js-override": "^0.0.4" }, @@ -18465,7 +18465,7 @@ }, "packages/tenant-discovery-nodejs": { "name": "@supertokens-plugins/tenant-discovery-nodejs", - "version": "0.2.0", + "version": "0.2.1", "devDependencies": { "@shared/eslint": "*", "@shared/nodejs": "*", @@ -19222,7 +19222,7 @@ }, "packages/user-banning-nodejs": { "name": "@supertokens-plugins/user-banning-nodejs", - "version": "0.2.0", + "version": "0.2.1", "devDependencies": { "@shared/eslint": "*", "@shared/nodejs": "*", @@ -19354,7 +19354,7 @@ }, "packages/user-banning-react": { "name": "@supertokens-plugins/user-banning-react", - "version": "0.2.0", + "version": "0.2.1", "dependencies": { "supertokens-js-override": "^0.0.4" }, diff --git a/package.json b/package.json index 06100ad..8879c0f 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,9 @@ "format": "prettier --write \"**/*.{ts,tsx,md}\"", "changeset": "changeset", "version": "changeset version", - "version:private": "changeset version --snapshot beta", + "version:private": "changeset version --snapshot", "release": "changeset publish", - "release:private": "changeset publish --tag beta" + "release:private": "changeset publish --tag" }, "devDependencies": { "@changesets/cli": "^2.27.1", diff --git a/packages/captcha-nodejs/src/errors.ts b/packages/captcha-nodejs/src/errors.ts index ea43562..7ef9907 100644 --- a/packages/captcha-nodejs/src/errors.ts +++ b/packages/captcha-nodejs/src/errors.ts @@ -2,6 +2,6 @@ type CaptchaPluginErrorType = "CAPTCHA_VERIFICATION_ERROR" | "PLUGIN_CONFIG_ERRO export class CaptchaPluginError extends Error { constructor(public type: CaptchaPluginErrorType, message: string) { - super(message) + super(message); } } diff --git a/packages/opentelemetry-nodejs/src/plugin.ts b/packages/opentelemetry-nodejs/src/plugin.ts index 4814f5e..3c644e7 100644 --- a/packages/opentelemetry-nodejs/src/plugin.ts +++ b/packages/opentelemetry-nodejs/src/plugin.ts @@ -1,13 +1,10 @@ -import { HttpRequest, SuperTokensPlugin, UserContext } from "supertokens-node/types"; +import { SuperTokensPlugin } from "supertokens-node/types"; import { PLUGIN_ID, PLUGIN_SDK_VERSION, validatePluginConfig } from "./config"; import { OpenTelemetryLoggerPluginConfig } from "./types"; import { Tracer } from "@opentelemetry/api"; import { createPluginInitFunction } from "@shared/js"; import { PluginImpl } from "./pluginImpl"; -// import { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api'; -// diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG); - export const init = createPluginInitFunction< SuperTokensPlugin, OpenTelemetryLoggerPluginConfig, @@ -243,7 +240,7 @@ export const init = createPluginInitFunction< }; }, (config) => new PluginImpl(config), - (config: OpenTelemetryLoggerPluginConfig | undefined) => config ?? {}, + (config: OpenTelemetryLoggerPluginConfig | undefined) => config ?? {} ); function overrideWithLogger any)>>(logConfig: { @@ -278,7 +275,7 @@ function fnWithLoggerAsync Promise>( pluginConfig: OpenTelemetryLoggerPluginConfig; tracer: Tracer; pluginImpl: PluginImpl; - }, + } ): T { return function (...args: Parameters): Promise> { return logConfig.pluginImpl.startActiveSpan( @@ -300,14 +297,14 @@ function fnWithLoggerAsync Promise>( const resultAttributes = logConfig.pluginImpl.transformResultToAttributes(result); span.setAttributes(resultAttributes); return result; - } catch (error: any) { + } catch (error) { const errorAttributes = logConfig.pluginImpl.transformErrorToAttributes(error); span.setAttributes(errorAttributes); throw error; } finally { span.end(); } - }, + } ); } as T; }