From 62e632083c143eaff071075c8a3c16566307eada Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Mon, 4 Apr 2022 13:37:56 -0400 Subject: [PATCH 1/4] feat(build): Drop support for Node 6 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b68c117ec4b1..598e8b18de19 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -217,7 +217,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: [6, 8, 10, 12, 14, 16] + node: [8, 10, 12, 14, 16] steps: - name: Check out current commit (${{ env.HEAD_COMMIT }}) uses: actions/checkout@v2 From d3bf4330ac3eff3f466031724c5d54c053c9999c Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Mon, 4 Apr 2022 13:38:17 -0400 Subject: [PATCH 2/4] test(node): Remove Node 6 conditional --- packages/node/test/integrations/http.test.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/node/test/integrations/http.test.ts b/packages/node/test/integrations/http.test.ts index c7a9c3e0a621..bc71b994c7a5 100644 --- a/packages/node/test/integrations/http.test.ts +++ b/packages/node/test/integrations/http.test.ts @@ -44,9 +44,7 @@ describe('tracing', () => { http.get('http://dogs.are.great/'); - // TODO: For some reason in node 6 two request spans are appearing. Once we stop testing against it, this can go - // back to being `toEqual()`. - expect(spans.length).toBeGreaterThanOrEqual(2); + expect(spans.length).toEqual(2); // our span is at index 1 because the transaction itself is at index 0 expect(spans[1].description).toEqual('GET http://dogs.are.great/'); From 1045a1c5e1af4b6e35c4d30beb626989bc194b4e Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Mon, 4 Apr 2022 13:38:30 -0400 Subject: [PATCH 3/4] ref(build): Remove Node 6 condition --- scripts/test.ts | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/scripts/test.ts b/scripts/test.ts index 6c2efd8a1b68..51a1dc06245e 100644 --- a/scripts/test.ts +++ b/scripts/test.ts @@ -11,21 +11,7 @@ function run(cmd: string, cwd: string = '') { const nodeMajorVersion = parseInt(process.version.split('.')[0].replace('v', ''), 10); -// control which packages we test on each version of node -if (nodeMajorVersion <= 6) { - // install legacy versions of packages whose current versions don't support node 6 - // ignoring engines and scripts lets us get away with having incompatible things installed for packages we're not testing - run('yarn add --dev --ignore-engines --ignore-scripts nock@10.x', 'packages/node'); - run('yarn add --dev --ignore-engines --ignore-scripts jsdom@11.x', 'packages/tracing'); - run('yarn add --dev --ignore-engines --ignore-scripts jsdom@11.x', 'packages/utils'); - - // only test against @sentry/node and its dependencies - node 6 is too old for anything else to work - const scope = ['@sentry/core', '@sentry/hub', '@sentry/minimal', '@sentry/node', '@sentry/utils', '@sentry/tracing'] - .map(dep => `--scope="${dep}"`) - .join(' '); - - run(`yarn test ${scope}`); -} else if (nodeMajorVersion <= 8) { +if (nodeMajorVersion <= 8) { // install legacy versions of packages whose current versions don't support node 8 // ignoring engines and scripts lets us get away with having incompatible things installed for packages we're not testing run('yarn add --dev --ignore-engines --ignore-scripts jsdom@15.x', 'packages/tracing'); From ca0c4562a24adf9c1f0bfabf6caf142a3016d4bb Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Tue, 5 Apr 2022 08:47:25 -0400 Subject: [PATCH 4/4] feat: Upgrade package.json engine to Node 8 --- packages/angular/package.json | 2 +- packages/browser/package.json | 2 +- packages/core/package.json | 2 +- packages/eslint-config-sdk/package.json | 2 +- packages/eslint-plugin-sdk/package.json | 2 +- packages/gatsby/package.json | 2 +- packages/hub/package.json | 2 +- packages/integrations/package.json | 2 +- packages/minimal/package.json | 2 +- packages/nextjs/package.json | 2 +- packages/node/package.json | 2 +- packages/react/package.json | 2 +- packages/tracing/package.json | 2 +- packages/types/package.json | 2 +- packages/utils/package.json | 2 +- packages/vue/package.json | 2 +- packages/wasm/package.json | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/angular/package.json b/packages/angular/package.json index 6b6782b31bed..c98ef7a7a45a 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -7,7 +7,7 @@ "author": "Sentry", "license": "MIT", "engines": { - "node": ">=6" + "node": ">=8" }, "main": "dist/index.js", "module": "esm/index.js", diff --git a/packages/browser/package.json b/packages/browser/package.json index 606ef47efc2b..bbed3869580c 100644 --- a/packages/browser/package.json +++ b/packages/browser/package.json @@ -7,7 +7,7 @@ "author": "Sentry", "license": "BSD-3-Clause", "engines": { - "node": ">=6" + "node": ">=8" }, "main": "build/dist/index.js", "module": "build/esm/index.js", diff --git a/packages/core/package.json b/packages/core/package.json index ffe4b6b206bf..e93b88be85df 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -7,7 +7,7 @@ "author": "Sentry", "license": "BSD-3-Clause", "engines": { - "node": ">=6" + "node": ">=8" }, "main": "dist/index.js", "module": "esm/index.js", diff --git a/packages/eslint-config-sdk/package.json b/packages/eslint-config-sdk/package.json index b43d93ab4f2d..59aaf6015fce 100644 --- a/packages/eslint-config-sdk/package.json +++ b/packages/eslint-config-sdk/package.json @@ -12,7 +12,7 @@ "sentry" ], "engines": { - "node": ">=6" + "node": ">=8" }, "main": "src/index.js", "publishConfig": { diff --git a/packages/eslint-plugin-sdk/package.json b/packages/eslint-plugin-sdk/package.json index 40e17395526e..22e0d8999949 100644 --- a/packages/eslint-plugin-sdk/package.json +++ b/packages/eslint-plugin-sdk/package.json @@ -12,7 +12,7 @@ "sentry" ], "engines": { - "node": ">=6" + "node": ">=8" }, "main": "src/index.js", "publishConfig": { diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index a653d3abd496..2ffa15864212 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -11,7 +11,7 @@ "gatsby-plugin" ], "engines": { - "node": ">=6" + "node": ">=8" }, "main": "dist/index.js", "module": "esm/index.js", diff --git a/packages/hub/package.json b/packages/hub/package.json index 48d182beb1dc..66a2a60a178d 100644 --- a/packages/hub/package.json +++ b/packages/hub/package.json @@ -7,7 +7,7 @@ "author": "Sentry", "license": "BSD-3-Clause", "engines": { - "node": ">=6" + "node": ">=8" }, "main": "dist/index.js", "module": "esm/index.js", diff --git a/packages/integrations/package.json b/packages/integrations/package.json index 50816364e461..b758fa96406b 100644 --- a/packages/integrations/package.json +++ b/packages/integrations/package.json @@ -7,7 +7,7 @@ "author": "Sentry", "license": "BSD-3-Clause", "engines": { - "node": ">=6" + "node": ">=8" }, "publishConfig": { "access": "public" diff --git a/packages/minimal/package.json b/packages/minimal/package.json index b76a6fab86e5..7426148c1a4b 100644 --- a/packages/minimal/package.json +++ b/packages/minimal/package.json @@ -7,7 +7,7 @@ "author": "Sentry", "license": "BSD-3-Clause", "engines": { - "node": ">=6" + "node": ">=8" }, "main": "dist/index.js", "module": "esm/index.js", diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json index c3a9d138f2bc..101d08872644 100644 --- a/packages/nextjs/package.json +++ b/packages/nextjs/package.json @@ -7,7 +7,7 @@ "author": "Sentry", "license": "MIT", "engines": { - "node": ">=6" + "node": ">=8" }, "main": "./dist/index.server.js", "module": "./esm/index.server.js", diff --git a/packages/node/package.json b/packages/node/package.json index ea47f5d387b4..48b192ebcc5a 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -7,7 +7,7 @@ "author": "Sentry", "license": "BSD-3-Clause", "engines": { - "node": ">=6" + "node": ">=8" }, "main": "dist/index.js", "module": "esm/index.js", diff --git a/packages/react/package.json b/packages/react/package.json index 57324261d5ba..a5514e1b119c 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -7,7 +7,7 @@ "author": "Sentry", "license": "BSD-3-Clause", "engines": { - "node": ">=6" + "node": ">=8" }, "main": "dist/index.js", "module": "esm/index.js", diff --git a/packages/tracing/package.json b/packages/tracing/package.json index 6279f18bccb4..92ae2012e7f8 100644 --- a/packages/tracing/package.json +++ b/packages/tracing/package.json @@ -7,7 +7,7 @@ "author": "Sentry", "license": "MIT", "engines": { - "node": ">=6" + "node": ">=8" }, "main": "dist/index.js", "module": "esm/index.js", diff --git a/packages/types/package.json b/packages/types/package.json index 324ef08799d6..eeb9c604d8bf 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -7,7 +7,7 @@ "author": "Sentry", "license": "BSD-3-Clause", "engines": { - "node": ">=6" + "node": ">=8" }, "main": "dist/index.js", "module": "esm/index.js", diff --git a/packages/utils/package.json b/packages/utils/package.json index 1949cd8c9729..9ee34c4bfa2a 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -7,7 +7,7 @@ "author": "Sentry", "license": "BSD-3-Clause", "engines": { - "node": ">=6" + "node": ">=8" }, "main": "dist/index.js", "module": "esm/index.js", diff --git a/packages/vue/package.json b/packages/vue/package.json index 9e8a88b44b33..c45ab247a94d 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -7,7 +7,7 @@ "author": "Sentry", "license": "MIT", "engines": { - "node": ">=6" + "node": ">=8" }, "main": "dist/index.js", "module": "esm/index.js", diff --git a/packages/wasm/package.json b/packages/wasm/package.json index ebfe83fbdf4a..422da215f3a4 100644 --- a/packages/wasm/package.json +++ b/packages/wasm/package.json @@ -7,7 +7,7 @@ "author": "Sentry", "license": "MIT", "engines": { - "node": ">=6" + "node": ">=8" }, "main": "dist/index.js", "module": "esm/index.js",