From 5cb58711caa0bd26253ecf05bed9712fdd0d4681 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Thu, 31 Mar 2022 00:26:24 -0700 Subject: [PATCH 1/4] run the linter on scripts --- .eslintrc.js | 11 +---------- packages/angular/package.json | 4 ++-- packages/browser/package.json | 4 ++-- packages/core/package.json | 4 ++-- packages/gatsby/package.json | 4 ++-- packages/hub/package.json | 4 ++-- packages/integrations/package.json | 4 ++-- packages/minimal/package.json | 4 ++-- packages/nextjs/package.json | 4 ++-- packages/node/package.json | 4 ++-- packages/react/package.json | 4 ++-- packages/serverless/package.json | 4 ++-- packages/tracing/package.json | 4 ++-- packages/types/package.json | 4 ++-- packages/utils/package.json | 4 ++-- packages/vue/package.json | 4 ++-- packages/wasm/package.json | 4 ++-- 17 files changed, 33 insertions(+), 42 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 659559818215..a081c38c7ade 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -10,16 +10,7 @@ module.exports = { ecmaVersion: 2018, }, extends: ['@sentry-internal/sdk'], - ignorePatterns: [ - 'coverage/**', - 'build/**', - 'dist/**', - 'esm/**', - 'examples/**', - 'scripts/**', - 'test/manual/**', - 'types/**', - ], + ignorePatterns: ['coverage/**', 'build/**', 'dist/**', 'esm/**', 'examples/**', 'test/manual/**', 'types/**'], overrides: [ { files: ['*.ts', '*.tsx', '*.d.ts'], diff --git a/packages/angular/package.json b/packages/angular/package.json index d36eff8610c5..6b6782b31bed 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -50,11 +50,11 @@ "clean": "rimraf dist esm build coverage", "fix": "run-s fix:eslint fix:prettier", "fix:eslint": "eslint . --format stylish --fix", - "fix:prettier": "prettier --write \"{src,test}/**/*.ts\"", + "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"", "link:yarn": "yarn link", "lint": "run-s lint:prettier lint:eslint", "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish", - "lint:prettier": "prettier --check \"{src,test}/**/*.ts\"" + "lint:prettier": "prettier --check \"{src,test,scripts}/**/*.ts\"" }, "volta": { "extends": "../../package.json" diff --git a/packages/browser/package.json b/packages/browser/package.json index da5acad0ed2c..606ef47efc2b 100644 --- a/packages/browser/package.json +++ b/packages/browser/package.json @@ -63,11 +63,11 @@ "clean": "rimraf build coverage .rpt2_cache", "fix": "run-s fix:eslint fix:prettier", "fix:eslint": "eslint . --format stylish --fix", - "fix:prettier": "prettier --write \"{src,test}/**/*.ts\"", + "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"", "link:yarn": "yarn link", "lint": "run-s lint:prettier lint:eslint", "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish", - "lint:prettier": "prettier --check \"{src,test}/**/*.ts\"", + "lint:prettier": "prettier --check \"{src,test,scripts}/**/*.ts\"", "size:check": "run-p size:check:es5 size:check:es6", "size:check:es5": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES5: \",$1,\"kB\";}'", "size:check:es6": "cat build/bundles/bundle.es6.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES6: \",$1,\"kB\";}'", diff --git a/packages/core/package.json b/packages/core/package.json index afa9ab667193..ffe4b6b206bf 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -40,11 +40,11 @@ "clean": "rimraf dist esm coverage", "fix": "run-s fix:eslint fix:prettier", "fix:eslint": "eslint . --format stylish --fix", - "fix:prettier": "prettier --write \"{src,test}/**/*.ts\"", + "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"", "link:yarn": "yarn link", "lint": "run-s lint:prettier lint:eslint", "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish", - "lint:prettier": "prettier --check \"{src,test}/**/*.ts\"", + "lint:prettier": "prettier --check \"{src,test,scripts}/**/*.ts\"", "test": "jest", "test:watch": "jest --watch", "version": "node ../../scripts/versionbump.js src/version.ts" diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index e74249c15c47..a653d3abd496 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -51,11 +51,11 @@ "clean": "rimraf dist esm build coverage", "fix": "run-s fix:eslint fix:prettier", "fix:eslint": "eslint . --format stylish --fix", - "fix:prettier": "prettier --write \"{src,test}/**/*.ts\"", + "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"", "link:yarn": "yarn link", "lint": "run-s lint:prettier lint:eslint", "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish", - "lint:prettier": "prettier --check \"{src,test}/**/*.ts\"", + "lint:prettier": "prettier --check \"{src,test,scripts}/**/*.ts\"", "test": "jest", "test:watch": "jest --watch" }, diff --git a/packages/hub/package.json b/packages/hub/package.json index d11b85a79a71..48d182beb1dc 100644 --- a/packages/hub/package.json +++ b/packages/hub/package.json @@ -37,11 +37,11 @@ "clean": "rimraf dist esm coverage", "fix": "run-s fix:eslint fix:prettier", "fix:eslint": "eslint . --format stylish --fix", - "fix:prettier": "prettier --write \"{src,test}/**/*.ts\"", + "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"", "link:yarn": "yarn link", "lint": "run-s lint:prettier lint:eslint", "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish", - "lint:prettier": "prettier --check \"{src,test}/**/*.ts\"", + "lint:prettier": "prettier --check \"{src,test,scripts}/**/*.ts\"", "build:npm": "npm pack", "test": "jest", "test:watch": "jest --watch" diff --git a/packages/integrations/package.json b/packages/integrations/package.json index bbce751d9390..50816364e461 100644 --- a/packages/integrations/package.json +++ b/packages/integrations/package.json @@ -43,11 +43,11 @@ "clean": "rimraf dist esm build coverage .rpt2_cache", "fix": "run-s fix:eslint fix:prettier", "fix:eslint": "eslint . --format stylish --fix", - "fix:prettier": "prettier --write \"{src,test}/**/*.ts\"", + "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"", "link:yarn": "yarn link", "lint": "run-s lint:prettier lint:eslint", "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish", - "lint:prettier": "prettier --check \"{src,test}/**/*.ts\"", + "lint:prettier": "prettier --check \"{src,test,scripts}/**/*.ts\"", "test": "jest", "test:watch": "jest --watch" }, diff --git a/packages/minimal/package.json b/packages/minimal/package.json index 5ccc6666fb84..b76a6fab86e5 100644 --- a/packages/minimal/package.json +++ b/packages/minimal/package.json @@ -37,11 +37,11 @@ "clean": "rimraf dist esm coverage", "fix": "run-s fix:eslint fix:prettier", "fix:eslint": "eslint . --format stylish --fix", - "fix:prettier": "prettier --write \"{src,test}/**/*.ts\"", + "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"", "link:yarn": "yarn link", "lint": "run-s lint:prettier lint:eslint", "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish", - "lint:prettier": "prettier --check \"{src,test}/**/*.ts\"", + "lint:prettier": "prettier --check \"{src,test,scripts}/**/*.ts\"", "build:npm": "npm pack", "test": "jest", "test:watch": "jest --watch" diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json index 6af08d22f246..c3dbb80d99a3 100644 --- a/packages/nextjs/package.json +++ b/packages/nextjs/package.json @@ -60,11 +60,11 @@ "clean": "rimraf dist esm coverage *.js *.js.map *.d.ts", "fix": "run-s fix:eslint fix:prettier", "fix:eslint": "eslint . --format stylish --fix", - "fix:prettier": "prettier --write \"{src,test}/**/*.ts\"", + "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"", "link:yarn": "yarn link", "lint": "run-s lint:prettier lint:eslint", "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish", - "lint:prettier": "prettier --check \"{src,test}/**/*.ts\"", + "lint:prettier": "prettier --check \"{src,test,scripts}/**/*.ts\"", "test": "run-s test:unit", "test:all": "run-s test:unit test:integration", "test:unit": "jest", diff --git a/packages/node/package.json b/packages/node/package.json index 7f3330f6b35f..ea47f5d387b4 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -51,11 +51,11 @@ "clean": "rimraf dist esm coverage", "fix": "run-s fix:eslint fix:prettier", "fix:eslint": "eslint . --format stylish --fix", - "fix:prettier": "prettier --write \"{src,test}/**/*.ts\"", + "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"", "link:yarn": "yarn link", "lint": "run-s lint:prettier lint:eslint", "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish", - "lint:prettier": "prettier --check \"{src,test}/**/*.ts\"", + "lint:prettier": "prettier --check \"{src,test,scripts}/**/*.ts\"", "test": "run-s test:jest test:express test:webpack test:release-health", "test:express": "node test/manual/express-scope-separation/start.js", "test:jest": "jest", diff --git a/packages/react/package.json b/packages/react/package.json index e8854bd61f62..57324261d5ba 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -66,11 +66,11 @@ "clean": "rimraf dist esm build coverage", "fix": "run-s fix:eslint fix:prettier", "fix:eslint": "eslint . --format stylish --fix", - "fix:prettier": "prettier --write \"{src,test}/**/*.ts\"", + "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"", "link:yarn": "yarn link", "lint": "run-s lint:prettier lint:eslint", "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish", - "lint:prettier": "prettier --check \"{src,test}/**/*.ts\"", + "lint:prettier": "prettier --check \"{src,test,scripts}/**/*.ts\"", "test": "jest", "test:watch": "jest --watch" }, diff --git a/packages/serverless/package.json b/packages/serverless/package.json index e25b9082732e..01c4a1ebf628 100644 --- a/packages/serverless/package.json +++ b/packages/serverless/package.json @@ -57,11 +57,11 @@ "clean": "rimraf dist esm build dist-awslambda-layer coverage", "fix": "run-s fix:eslint fix:prettier", "fix:eslint": "eslint . --format stylish --fix", - "fix:prettier": "prettier --write \"{src,test}/**/*.ts\"", + "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"", "link:yarn": "yarn link", "lint": "run-s lint:prettier lint:eslint", "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish", - "lint:prettier": "prettier --check \"{src,test}/**/*.ts\"", + "lint:prettier": "prettier --check \"{src,test,scripts}/**/*.ts\"", "test": "jest", "test:watch": "jest --watch" }, diff --git a/packages/tracing/package.json b/packages/tracing/package.json index 118cffd2be07..6279f18bccb4 100644 --- a/packages/tracing/package.json +++ b/packages/tracing/package.json @@ -48,11 +48,11 @@ "circularDepCheck": "madge --circular src/index.ts", "fix": "run-s fix:eslint fix:prettier", "fix:eslint": "eslint . --format stylish --fix", - "fix:prettier": "prettier --write \"{src,test}/**/*.ts\"", + "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"", "link:yarn": "yarn link", "lint": "run-s lint:prettier lint:eslint", "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish", - "lint:prettier": "prettier --check \"{src,test}/**/*.ts\"", + "lint:prettier": "prettier --check \"{src,test,scripts}/**/*.ts\"", "test": "jest", "test:watch": "jest --watch" }, diff --git a/packages/types/package.json b/packages/types/package.json index 9a8e3601f0c7..324ef08799d6 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -32,10 +32,10 @@ "link:yarn": "yarn link", "lint": "run-s lint:prettier lint:eslint", "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish", - "lint:prettier": "prettier --check \"{src,test}/**/*.ts\"", + "lint:prettier": "prettier --check \"{src,test,scripts}/**/*.ts\"", "fix": "run-s fix:eslint fix:prettier", "fix:eslint": "eslint . --format stylish --fix", - "fix:prettier": "prettier --write \"{src,test}/**/*.ts\"" + "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"" }, "volta": { "extends": "../../package.json" diff --git a/packages/utils/package.json b/packages/utils/package.json index c4401979fa12..1949cd8c9729 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -41,11 +41,11 @@ "clean": "rimraf dist esm coverage *.js *.js.map *.d.ts", "fix": "run-s fix:eslint fix:prettier", "fix:eslint": "eslint . --format stylish --fix", - "fix:prettier": "prettier --write \"{src,test}/**/*.ts\"", + "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"", "link:yarn": "yarn link", "lint": "run-s lint:prettier lint:eslint", "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish", - "lint:prettier": "prettier --check \"{src,test}/**/*.ts\"", + "lint:prettier": "prettier --check \"{src,test,scripts}/**/*.ts\"", "test": "jest", "test:watch": "jest --watch", "test:package": "node test/types/index.js" diff --git a/packages/vue/package.json b/packages/vue/package.json index 9a21e351c52b..1884271b55f6 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -49,11 +49,11 @@ "clean": "rimraf dist esm build coverage", "fix": "run-s fix:eslint fix:prettier", "fix:eslint": "eslint . --format stylish --fix", - "fix:prettier": "prettier --write \"{src,test}/**/*.ts\"", + "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"", "link:yarn": "yarn link", "lint": "run-s lint:prettier lint:eslint", "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish", - "lint:prettier": "prettier --check \"{src,test}/**/*.ts\"", + "lint:prettier": "prettier --check \"{src,test,scripts}/**/*.ts\"", "test": "jest", "test:watch": "jest --watch" }, diff --git a/packages/wasm/package.json b/packages/wasm/package.json index 645c29987a67..ebfe83fbdf4a 100644 --- a/packages/wasm/package.json +++ b/packages/wasm/package.json @@ -48,11 +48,11 @@ "clean": "rimraf dist esm coverage *.js.map *.d.ts", "fix": "run-s fix:eslint fix:prettier", "fix:eslint": "eslint . --format stylish --fix", - "fix:prettier": "prettier --write \"{src,test}/**/*.ts\"", + "fix:prettier": "prettier --write \"{src,test,scripts}/**/*.ts\"", "link:yarn": "yarn link", "lint": "run-s lint:prettier lint:eslint", "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish", - "lint:prettier": "prettier --check \"{src,test}/**/*.ts\"", + "lint:prettier": "prettier --check \"{src,test,scripts}/**/*.ts\"", "test": "node test/scripts/ensure-browser-bundle.js && cross-env PORT=1337 jest", "test:watch": "jest --watch" }, From f47fc96f0fe375380eb861bc5526c767324e389b Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Thu, 31 Mar 2022 00:37:30 -0700 Subject: [PATCH 2/4] fix typescript errors in testing script --- scripts/test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/test.ts b/scripts/test.ts index 36d6490cbd5f..6c2efd8a1b68 100644 --- a/scripts/test.ts +++ b/scripts/test.ts @@ -1,11 +1,11 @@ -const { spawnSync } = require('child_process'); -const { join } = require('path'); +import { spawnSync } from 'child_process'; +import { join } from 'path'; -function run(cmd: string, cwd = '') { +function run(cmd: string, cwd: string = '') { const result = spawnSync(cmd, { shell: true, stdio: 'inherit', cwd: join(__dirname, '..', cwd || '') }); if (result.status !== 0) { - process.exit(result.status); + process.exit(result.status || undefined); } } From fe6c2ee9221678d04f9212c687efa80daa16256f Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Thu, 31 Mar 2022 12:52:15 -0700 Subject: [PATCH 3/4] remove unnecessary backticks from string in serverless build script --- packages/serverless/scripts/build-awslambda-layer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/serverless/scripts/build-awslambda-layer.js b/packages/serverless/scripts/build-awslambda-layer.js index 2c2a3834fffc..bc01ac2606d2 100644 --- a/packages/serverless/scripts/build-awslambda-layer.js +++ b/packages/serverless/scripts/build-awslambda-layer.js @@ -11,7 +11,7 @@ const readPkg = require('read-pkg'); const serverlessPackage = require('../package.json'); if (!process.env.GITHUB_ACTIONS) { - console.log(`Skipping build-awslambda-layer script in local environment.`); + console.log('Skipping build-awslambda-layer script in local environment.'); process.exit(0); } From 9a58868d889a12698b6e76ee06ac6adc1e8f9035 Mon Sep 17 00:00:00 2001 From: Katie Byers Date: Thu, 31 Mar 2022 14:16:16 -0700 Subject: [PATCH 4/4] fix linting errors in browser-checking script --- packages/browser/scripts/checkbrowsers.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/browser/scripts/checkbrowsers.js b/packages/browser/scripts/checkbrowsers.js index a32dcd4fff8b..edc61dba0a15 100644 --- a/packages/browser/scripts/checkbrowsers.js +++ b/packages/browser/scripts/checkbrowsers.js @@ -1,8 +1,10 @@ +/* eslint-disable no-console */ // Script which checks all browsers in test/integration/browser.js against supported BrowserStack browsers // Meant to be run manually, by running `yarn test:integration:checkbrowsers` from the command line const btoa = require('btoa'); const fetch = require('node-fetch'); + const localConfigs = require('../test/integration/browsers.js'); const browserstackUsername = process.env.BROWSERSTACK_USERNAME; @@ -78,6 +80,7 @@ const checkLocalConfigsVsBrowserStack = (localConfigs, bsConfigs) => { const realMobileUpdates = []; // check each local config against the entire collection of BS configs + // eslint-disable-next-line guard-for-in for (const configName in localConfigs) { const localConfig = localConfigs[configName];