From 8183cdad481e7591ddb9e67b0303d470cba188b2 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Mon, 28 Jun 2021 14:59:51 -0400 Subject: [PATCH 1/3] ref(gatsby): Default release to empty string To make gatsby work better out of the box, we set the default for the release value to be undefined instead of an empty string. --- packages/gatsby/gatsby-node.js | 2 +- packages/gatsby/test/gatsby-node.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gatsby/gatsby-node.js b/packages/gatsby/gatsby-node.js index f2c7c4c49577..f8a6a74ad885 100644 --- a/packages/gatsby/gatsby-node.js +++ b/packages/gatsby/gatsby-node.js @@ -11,7 +11,7 @@ const sentryRelease = JSON.stringify( process.env.ZEIT_GITHUB_COMMIT_SHA || process.env.ZEIT_GITLAB_COMMIT_SHA || process.env.ZEIT_BITBUCKET_COMMIT_SHA || - '', + undefined, ); const sentryDsn = JSON.stringify(process.env.SENTRY_DSN || ''); diff --git a/packages/gatsby/test/gatsby-node.test.ts b/packages/gatsby/test/gatsby-node.test.ts index df03d29817dc..bf0988b123c5 100644 --- a/packages/gatsby/test/gatsby-node.test.ts +++ b/packages/gatsby/test/gatsby-node.test.ts @@ -18,7 +18,7 @@ describe('onCreateWebpackConfig', () => { expect(plugins.define).toHaveBeenCalledTimes(1); expect(plugins.define).toHaveBeenLastCalledWith({ __SENTRY_DSN__: expect.any(String), - __SENTRY_RELEASE__: expect.any(String), + __SENTRY_RELEASE__: undefined, }); expect(actions.setWebpackConfig).toHaveBeenCalledTimes(1); From 476246bbe69659caea295640ad36e9e03d668642 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Mon, 28 Jun 2021 15:36:15 -0400 Subject: [PATCH 2/3] fix tests --- packages/gatsby/package.json | 5 ++++- packages/gatsby/test/gatsby-node.test.ts | 3 +-- packages/gatsby/test/setEnvVars.ts | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 packages/gatsby/test/setEnvVars.ts diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index 271c1f2d8adf..32782ff1b1a6 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -86,7 +86,10 @@ "tsConfig": "./tsconfig.json", "diagnostics": false } - } + }, + "setupFiles": [ + "/test/setEnvVars.ts" + ] }, "sideEffects": false } diff --git a/packages/gatsby/test/gatsby-node.test.ts b/packages/gatsby/test/gatsby-node.test.ts index bf0988b123c5..f09f8e5be781 100644 --- a/packages/gatsby/test/gatsby-node.test.ts +++ b/packages/gatsby/test/gatsby-node.test.ts @@ -1,6 +1,5 @@ /* eslint-disable @typescript-eslint/no-var-requires */ /* eslint-disable @typescript-eslint/no-explicit-any */ - const { onCreateWebpackConfig } = require('../gatsby-node'); describe('onCreateWebpackConfig', () => { @@ -18,7 +17,7 @@ describe('onCreateWebpackConfig', () => { expect(plugins.define).toHaveBeenCalledTimes(1); expect(plugins.define).toHaveBeenLastCalledWith({ __SENTRY_DSN__: expect.any(String), - __SENTRY_RELEASE__: undefined, + __SENTRY_RELEASE__: expect.any(String), }); expect(actions.setWebpackConfig).toHaveBeenCalledTimes(1); diff --git a/packages/gatsby/test/setEnvVars.ts b/packages/gatsby/test/setEnvVars.ts new file mode 100644 index 000000000000..9e9c7898cbfd --- /dev/null +++ b/packages/gatsby/test/setEnvVars.ts @@ -0,0 +1,2 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ +process.env.SENTRY_RELEASE = '14abbb1678a2eb59d1a171ea33d630dd6c6eee70'; From cf05740fbdb2aa96c2e60e136a21ace24be7b83a Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Tue, 29 Jun 2021 09:51:12 -0400 Subject: [PATCH 3/3] fix lint --- packages/gatsby/test/setEnvVars.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gatsby/test/setEnvVars.ts b/packages/gatsby/test/setEnvVars.ts index 9e9c7898cbfd..c97579e924e7 100644 --- a/packages/gatsby/test/setEnvVars.ts +++ b/packages/gatsby/test/setEnvVars.ts @@ -1,2 +1,2 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ +// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access process.env.SENTRY_RELEASE = '14abbb1678a2eb59d1a171ea33d630dd6c6eee70';