From f4679d52e5d1f8fb817c59fe5d21fa45650f13e3 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Thu, 28 Oct 2021 14:13:58 -0400 Subject: [PATCH 1/8] ref(eslint): Consolidate packages to minimum Certain packages (browser, react, nextjs, serverless, node) skipped as they are more involved. --- .eslintrc.js | 28 ++++++++++++++++++++++++ packages/angular/.eslintrc.js | 15 +------------ packages/core/.eslintrc.js | 22 +------------------ packages/eslint-config-sdk/src/index.js | 2 ++ packages/gatsby/.eslintrc.js | 14 ++---------- packages/hub/.eslintrc.js | 23 ++------------------ packages/integrations/.eslintrc.js | 26 ++-------------------- packages/minimal/.eslintrc.js | 23 ++------------------ packages/tracing/.eslintrc.js | 22 +------------------ packages/types/.eslintrc.js | 22 ++----------------- packages/utils/.eslintrc.js | 29 ++----------------------- packages/vue/.eslintrc.js | 21 +----------------- packages/wasm/.eslintrc.js | 25 +-------------------- 13 files changed, 47 insertions(+), 225 deletions(-) create mode 100644 .eslintrc.js diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 000000000000..3fdf88750e55 --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,28 @@ +module.exports = { + root: true, + env: { + es6: true, + }, + parserOptions: { + ecmaVersion: 2018, + }, + extends: ['@sentry-internal/sdk'], + ignorePatterns: [ + 'coverage/**', + 'build/**', + 'dist/**', + 'esm/**', + 'cjs/**', + 'examples/**', + 'scripts/**', + 'test/manual/**', + ], + overrides: [ + { + files: ['*.ts', '*.tsx', '*.d.ts'], + parserOptions: { + project: './tsconfig.json', + }, + } + ], +}; diff --git a/packages/angular/.eslintrc.js b/packages/angular/.eslintrc.js index 71de3957c95f..cff5fdb6edce 100644 --- a/packages/angular/.eslintrc.js +++ b/packages/angular/.eslintrc.js @@ -1,20 +1,7 @@ module.exports = { - root: true, env: { es6: true, browser: true, }, - parserOptions: { - ecmaVersion: 2018, - }, - extends: ['@sentry-internal/sdk'], - ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'], - overrides: [ - { - files: ['*.ts', '*.tsx', '*.d.ts'], - parserOptions: { - project: './tsconfig.json', - }, - }, - ], + extends: ['../../.eslintrc.js'], }; diff --git a/packages/core/.eslintrc.js b/packages/core/.eslintrc.js index f8288f682567..4065a5de488f 100644 --- a/packages/core/.eslintrc.js +++ b/packages/core/.eslintrc.js @@ -1,26 +1,6 @@ module.exports = { - root: true, env: { es6: true, }, - parserOptions: { - ecmaVersion: 2018, - }, - extends: ['@sentry-internal/sdk'], - ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'], - overrides: [ - { - files: ['*.ts', '*.tsx', '*.d.ts'], - parserOptions: { - project: './tsconfig.json', - }, - }, - { - files: ['test/**'], - rules: { - '@typescript-eslint/no-explicit-any': 'off', - '@typescript-eslint/no-non-null-assertion': 'off', - }, - }, - ], + extends: ['../../.eslintrc.js'], }; diff --git a/packages/eslint-config-sdk/src/index.js b/packages/eslint-config-sdk/src/index.js index 2ad423603166..16e5886082ae 100644 --- a/packages/eslint-config-sdk/src/index.js +++ b/packages/eslint-config-sdk/src/index.js @@ -172,6 +172,8 @@ module.exports = { '@typescript-eslint/no-unused-expressions': 'off', '@typescript-eslint/no-unsafe-member-access': 'off', '@typescript-eslint/explicit-member-accessibility': 'off', + '@typescript-eslint/no-explicit-any': 'off', + '@typescript-eslint/no-non-null-assertion': 'off', }, }, { diff --git a/packages/gatsby/.eslintrc.js b/packages/gatsby/.eslintrc.js index 931b94d9d1df..e5506aa362c4 100644 --- a/packages/gatsby/.eslintrc.js +++ b/packages/gatsby/.eslintrc.js @@ -1,22 +1,12 @@ module.exports = { - root: true, env: { es6: true, browser: true, node: true, }, parserOptions: { - ecmaVersion: 2018, jsx: true, }, - extends: ['@sentry-internal/sdk'], - ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'], - overrides: [ - { - files: ['*.ts', '*.tsx', '*.d.ts'], - parserOptions: { - project: './tsconfig.json', - }, - }, - ], + extends: ['../../.eslintrc.js'], }; + diff --git a/packages/hub/.eslintrc.js b/packages/hub/.eslintrc.js index f8288f682567..782dd20f44bf 100644 --- a/packages/hub/.eslintrc.js +++ b/packages/hub/.eslintrc.js @@ -1,26 +1,7 @@ module.exports = { - root: true, env: { es6: true, }, - parserOptions: { - ecmaVersion: 2018, - }, - extends: ['@sentry-internal/sdk'], - ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'], - overrides: [ - { - files: ['*.ts', '*.tsx', '*.d.ts'], - parserOptions: { - project: './tsconfig.json', - }, - }, - { - files: ['test/**'], - rules: { - '@typescript-eslint/no-explicit-any': 'off', - '@typescript-eslint/no-non-null-assertion': 'off', - }, - }, - ], + extends: ['../../.eslintrc.js'], }; + diff --git a/packages/integrations/.eslintrc.js b/packages/integrations/.eslintrc.js index 9e694ad10620..782dd20f44bf 100644 --- a/packages/integrations/.eslintrc.js +++ b/packages/integrations/.eslintrc.js @@ -1,29 +1,7 @@ module.exports = { - root: true, env: { es6: true, }, - parserOptions: { - ecmaVersion: 2018, - }, - extends: ['@sentry-internal/sdk'], - ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'], - overrides: [ - { - files: ['*.ts', '*.tsx', '*.d.ts'], - parserOptions: { - project: './tsconfig.json', - }, - }, - { - files: ['test/**'], - env: { - mocha: true, - }, - rules: { - '@typescript-eslint/no-explicit-any': 'off', - '@typescript-eslint/no-non-null-assertion': 'off', - }, - }, - ], + extends: ['../../.eslintrc.js'], }; + diff --git a/packages/minimal/.eslintrc.js b/packages/minimal/.eslintrc.js index f8288f682567..782dd20f44bf 100644 --- a/packages/minimal/.eslintrc.js +++ b/packages/minimal/.eslintrc.js @@ -1,26 +1,7 @@ module.exports = { - root: true, env: { es6: true, }, - parserOptions: { - ecmaVersion: 2018, - }, - extends: ['@sentry-internal/sdk'], - ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'], - overrides: [ - { - files: ['*.ts', '*.tsx', '*.d.ts'], - parserOptions: { - project: './tsconfig.json', - }, - }, - { - files: ['test/**'], - rules: { - '@typescript-eslint/no-explicit-any': 'off', - '@typescript-eslint/no-non-null-assertion': 'off', - }, - }, - ], + extends: ['../../.eslintrc.js'], }; + diff --git a/packages/tracing/.eslintrc.js b/packages/tracing/.eslintrc.js index f8288f682567..4065a5de488f 100644 --- a/packages/tracing/.eslintrc.js +++ b/packages/tracing/.eslintrc.js @@ -1,26 +1,6 @@ module.exports = { - root: true, env: { es6: true, }, - parserOptions: { - ecmaVersion: 2018, - }, - extends: ['@sentry-internal/sdk'], - ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'], - overrides: [ - { - files: ['*.ts', '*.tsx', '*.d.ts'], - parserOptions: { - project: './tsconfig.json', - }, - }, - { - files: ['test/**'], - rules: { - '@typescript-eslint/no-explicit-any': 'off', - '@typescript-eslint/no-non-null-assertion': 'off', - }, - }, - ], + extends: ['../../.eslintrc.js'], }; diff --git a/packages/types/.eslintrc.js b/packages/types/.eslintrc.js index 4838e6934399..d0337d1acf9f 100644 --- a/packages/types/.eslintrc.js +++ b/packages/types/.eslintrc.js @@ -1,22 +1,4 @@ module.exports = { - root: true, - env: { - es6: true, - }, - parserOptions: { - ecmaVersion: 2018, - }, - extends: ['@sentry-internal/sdk'], - ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'], - overrides: [ - { - files: ['*.ts', '*.tsx', '*.d.ts'], - parserOptions: { - project: './tsconfig.json', - }, - }, - ], - rules: { - '@typescript-eslint/no-explicit-any': 'off', - }, + extends: ['../../.eslintrc.js'], }; + diff --git a/packages/utils/.eslintrc.js b/packages/utils/.eslintrc.js index c9bf4cbd9038..d0337d1acf9f 100644 --- a/packages/utils/.eslintrc.js +++ b/packages/utils/.eslintrc.js @@ -1,29 +1,4 @@ module.exports = { - root: true, - env: { - es6: true, - }, - parserOptions: { - ecmaVersion: 2018, - }, - extends: ['@sentry-internal/sdk'], - ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'], - overrides: [ - { - files: ['*.ts', '*.tsx', '*.d.ts'], - parserOptions: { - project: './tsconfig.json', - }, - }, - { - files: ['test/**'], - rules: { - '@typescript-eslint/no-explicit-any': 'off', - '@typescript-eslint/no-non-null-assertion': 'off', - }, - }, - ], - rules: { - 'max-lines': 'off', - }, + extends: ['../../.eslintrc.js'], }; + diff --git a/packages/vue/.eslintrc.js b/packages/vue/.eslintrc.js index 1dedee22b623..cff5fdb6edce 100644 --- a/packages/vue/.eslintrc.js +++ b/packages/vue/.eslintrc.js @@ -1,26 +1,7 @@ module.exports = { - root: true, env: { es6: true, browser: true, }, - parserOptions: { - ecmaVersion: 2018, - jsx: true, - }, - extends: ['@sentry-internal/sdk'], - ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'], - overrides: [ - { - files: ['*.ts', '*.d.ts'], - parserOptions: { - project: './tsconfig.json', - }, - }, - ], - rules: { - 'react/prop-types': 'off', - '@typescript-eslint/no-unsafe-member-access': 'off', - '@typescript-eslint/no-explicit-any': 'off', - }, + extends: ['../../.eslintrc.js'], }; diff --git a/packages/wasm/.eslintrc.js b/packages/wasm/.eslintrc.js index c9bf4cbd9038..4065a5de488f 100644 --- a/packages/wasm/.eslintrc.js +++ b/packages/wasm/.eslintrc.js @@ -1,29 +1,6 @@ module.exports = { - root: true, env: { es6: true, }, - parserOptions: { - ecmaVersion: 2018, - }, - extends: ['@sentry-internal/sdk'], - ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'], - overrides: [ - { - files: ['*.ts', '*.tsx', '*.d.ts'], - parserOptions: { - project: './tsconfig.json', - }, - }, - { - files: ['test/**'], - rules: { - '@typescript-eslint/no-explicit-any': 'off', - '@typescript-eslint/no-non-null-assertion': 'off', - }, - }, - ], - rules: { - 'max-lines': 'off', - }, + extends: ['../../.eslintrc.js'], }; From d78fe79bf41ea89d74bb98db893eb038c99d7f45 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Thu, 28 Oct 2021 14:29:06 -0400 Subject: [PATCH 2/8] make necessary fixes --- packages/eslint-config-sdk/src/index.js | 2 +- packages/react/test/errorboundary.test.tsx | 1 - packages/types/.eslintrc.js | 3 +++ packages/utils/src/instrument.ts | 1 + packages/utils/src/object.ts | 1 + packages/vue/src/components.ts | 2 ++ packages/vue/src/errorhandler.ts | 6 ++++-- packages/vue/src/router.ts | 2 ++ packages/vue/src/types.ts | 5 +++-- 9 files changed, 17 insertions(+), 6 deletions(-) diff --git a/packages/eslint-config-sdk/src/index.js b/packages/eslint-config-sdk/src/index.js index 16e5886082ae..bacabc61764b 100644 --- a/packages/eslint-config-sdk/src/index.js +++ b/packages/eslint-config-sdk/src/index.js @@ -163,7 +163,7 @@ module.exports = { env: { jest: true, }, - files: ['*.test.ts', '*.test.tsx', '*.test.js', '*.test.jsx'], + files: ['*.test.ts', '*.test.tsx', '*.test.js', '*.test.jsx', 'test/**/*.ts', 'test/**/*.js'], rules: { 'max-lines': 'off', diff --git a/packages/react/test/errorboundary.test.tsx b/packages/react/test/errorboundary.test.tsx index ac6318be053c..f311b0d96154 100644 --- a/packages/react/test/errorboundary.test.tsx +++ b/packages/react/test/errorboundary.test.tsx @@ -1,5 +1,4 @@ import { Scope } from '@sentry/browser'; -import { Event, Severity } from '@sentry/types'; import { fireEvent, render, screen } from '@testing-library/react'; import * as React from 'react'; import { useState } from 'react'; diff --git a/packages/types/.eslintrc.js b/packages/types/.eslintrc.js index d0337d1acf9f..082f7d275d10 100644 --- a/packages/types/.eslintrc.js +++ b/packages/types/.eslintrc.js @@ -1,4 +1,7 @@ module.exports = { extends: ['../../.eslintrc.js'], + rules: { + '@typescript-eslint/no-explicit-any': 'off', + } }; diff --git a/packages/utils/src/instrument.ts b/packages/utils/src/instrument.ts index f357fd212230..18dce47726f9 100644 --- a/packages/utils/src/instrument.ts +++ b/packages/utils/src/instrument.ts @@ -1,3 +1,4 @@ +/* eslint-disable max-lines */ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/ban-types */ import { WrappedFunction } from '@sentry/types'; diff --git a/packages/utils/src/object.ts b/packages/utils/src/object.ts index 9f5161ea9764..b44575ca92cd 100644 --- a/packages/utils/src/object.ts +++ b/packages/utils/src/object.ts @@ -1,3 +1,4 @@ +/* eslint-disable max-lines */ /* eslint-disable @typescript-eslint/no-explicit-any */ import { ExtendedError, WrappedFunction } from '@sentry/types'; diff --git a/packages/vue/src/components.ts b/packages/vue/src/components.ts index 542999f53f9e..3138930daf0c 100644 --- a/packages/vue/src/components.ts +++ b/packages/vue/src/components.ts @@ -52,7 +52,9 @@ export const generateComponentTrace = (vm?: ViewModel): string => { let currentRecursiveSequence = 0; while (vm) { if (tree.length > 0) { + // eslint-disable-next-line @typescript-eslint/no-explicit-any const last = tree[tree.length - 1] as any; + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access if (last.constructor === vm.constructor) { currentRecursiveSequence += 1; vm = vm.$parent; // eslint-disable-line no-param-reassign diff --git a/packages/vue/src/errorhandler.ts b/packages/vue/src/errorhandler.ts index b8c5a2406eb5..2343e351cd72 100644 --- a/packages/vue/src/errorhandler.ts +++ b/packages/vue/src/errorhandler.ts @@ -3,6 +3,8 @@ import { getCurrentHub } from '@sentry/browser'; import { formatComponentName, generateComponentTrace } from './components'; import { Options, ViewModel, Vue } from './types'; +type UnknownFunc = (...args: unknown[]) => void; + export const attachErrorHandler = (app: Vue, options: Options): void => { const { errorHandler, warnHandler, silent } = app.config; @@ -30,7 +32,7 @@ export const attachErrorHandler = (app: Vue, options: Options): void => { }); if (typeof errorHandler === 'function') { - errorHandler.call(app, error, vm, lifecycleHook); + (errorHandler as UnknownFunc).call(app, error, vm, lifecycleHook); } if (options.logErrors) { @@ -38,7 +40,7 @@ export const attachErrorHandler = (app: Vue, options: Options): void => { const message = `Error in ${lifecycleHook}: "${error && error.toString()}"`; if (warnHandler) { - warnHandler.call(null, message, vm, trace); + (warnHandler as UnknownFunc).call(null, message, vm, trace); } else if (hasConsole && !silent) { // eslint-disable-next-line no-console console.error(`[Vue warn]: ${message}${trace}`); diff --git a/packages/vue/src/router.ts b/packages/vue/src/router.ts index 0ab49f497865..68be9841ffc1 100644 --- a/packages/vue/src/router.ts +++ b/packages/vue/src/router.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ import { captureException } from '@sentry/browser'; import { Transaction, TransactionContext } from '@sentry/types'; @@ -61,6 +62,7 @@ export function vueRouterInstrumentation(router: VueRouter): VueRouterInstrument if (startTransactionOnLocationChange && !isPageLoadNavigation) { startTransaction({ + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access name: to.name || (to.matched[0] && to.matched[0].path) || to.path, op: 'navigation', tags, diff --git a/packages/vue/src/types.ts b/packages/vue/src/types.ts index 08798edf4a87..5e29cb5a65f1 100644 --- a/packages/vue/src/types.ts +++ b/packages/vue/src/types.ts @@ -1,13 +1,14 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ import { BrowserOptions } from '@sentry/browser'; -// This is not great, but kinda nacessary to make it woth with Vue@2 and Vue@3 at the same time. +// This is not great, but kinda necessary to make it woth with Vue@2 and Vue@3 at the same time. export interface Vue { config: { errorHandler?: any; warnHandler?: any; silent?: boolean; }; - mixin: (mixins: any) => void; + mixin: (mixins: Partial>) => void; } export type ViewModel = { From b79dbd711f3002b2a9dca032a9e18309ee2d998b Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Thu, 28 Oct 2021 14:30:50 -0400 Subject: [PATCH 3/8] remove redundant env declarations --- packages/core/.eslintrc.js | 3 --- packages/hub/.eslintrc.js | 3 --- packages/integrations/.eslintrc.js | 3 --- packages/minimal/.eslintrc.js | 3 --- packages/tracing/.eslintrc.js | 3 --- packages/wasm/.eslintrc.js | 3 --- 6 files changed, 18 deletions(-) diff --git a/packages/core/.eslintrc.js b/packages/core/.eslintrc.js index 4065a5de488f..5a2cc7f1ec08 100644 --- a/packages/core/.eslintrc.js +++ b/packages/core/.eslintrc.js @@ -1,6 +1,3 @@ module.exports = { - env: { - es6: true, - }, extends: ['../../.eslintrc.js'], }; diff --git a/packages/hub/.eslintrc.js b/packages/hub/.eslintrc.js index 782dd20f44bf..d0337d1acf9f 100644 --- a/packages/hub/.eslintrc.js +++ b/packages/hub/.eslintrc.js @@ -1,7 +1,4 @@ module.exports = { - env: { - es6: true, - }, extends: ['../../.eslintrc.js'], }; diff --git a/packages/integrations/.eslintrc.js b/packages/integrations/.eslintrc.js index 782dd20f44bf..d0337d1acf9f 100644 --- a/packages/integrations/.eslintrc.js +++ b/packages/integrations/.eslintrc.js @@ -1,7 +1,4 @@ module.exports = { - env: { - es6: true, - }, extends: ['../../.eslintrc.js'], }; diff --git a/packages/minimal/.eslintrc.js b/packages/minimal/.eslintrc.js index 782dd20f44bf..d0337d1acf9f 100644 --- a/packages/minimal/.eslintrc.js +++ b/packages/minimal/.eslintrc.js @@ -1,7 +1,4 @@ module.exports = { - env: { - es6: true, - }, extends: ['../../.eslintrc.js'], }; diff --git a/packages/tracing/.eslintrc.js b/packages/tracing/.eslintrc.js index 4065a5de488f..5a2cc7f1ec08 100644 --- a/packages/tracing/.eslintrc.js +++ b/packages/tracing/.eslintrc.js @@ -1,6 +1,3 @@ module.exports = { - env: { - es6: true, - }, extends: ['../../.eslintrc.js'], }; diff --git a/packages/wasm/.eslintrc.js b/packages/wasm/.eslintrc.js index 4065a5de488f..5a2cc7f1ec08 100644 --- a/packages/wasm/.eslintrc.js +++ b/packages/wasm/.eslintrc.js @@ -1,6 +1,3 @@ module.exports = { - env: { - es6: true, - }, extends: ['../../.eslintrc.js'], }; From f691ad209e0c35b11b9053104b4a320f4e4ad4ad Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Thu, 28 Oct 2021 14:32:43 -0400 Subject: [PATCH 4/8] remove new line --- packages/gatsby/.eslintrc.js | 1 - packages/hub/.eslintrc.js | 1 - packages/integrations/.eslintrc.js | 1 - packages/minimal/.eslintrc.js | 1 - packages/types/.eslintrc.js | 1 - packages/utils/.eslintrc.js | 1 - 6 files changed, 6 deletions(-) diff --git a/packages/gatsby/.eslintrc.js b/packages/gatsby/.eslintrc.js index e5506aa362c4..1d253f322a31 100644 --- a/packages/gatsby/.eslintrc.js +++ b/packages/gatsby/.eslintrc.js @@ -9,4 +9,3 @@ module.exports = { }, extends: ['../../.eslintrc.js'], }; - diff --git a/packages/hub/.eslintrc.js b/packages/hub/.eslintrc.js index d0337d1acf9f..5a2cc7f1ec08 100644 --- a/packages/hub/.eslintrc.js +++ b/packages/hub/.eslintrc.js @@ -1,4 +1,3 @@ module.exports = { extends: ['../../.eslintrc.js'], }; - diff --git a/packages/integrations/.eslintrc.js b/packages/integrations/.eslintrc.js index d0337d1acf9f..5a2cc7f1ec08 100644 --- a/packages/integrations/.eslintrc.js +++ b/packages/integrations/.eslintrc.js @@ -1,4 +1,3 @@ module.exports = { extends: ['../../.eslintrc.js'], }; - diff --git a/packages/minimal/.eslintrc.js b/packages/minimal/.eslintrc.js index d0337d1acf9f..5a2cc7f1ec08 100644 --- a/packages/minimal/.eslintrc.js +++ b/packages/minimal/.eslintrc.js @@ -1,4 +1,3 @@ module.exports = { extends: ['../../.eslintrc.js'], }; - diff --git a/packages/types/.eslintrc.js b/packages/types/.eslintrc.js index 082f7d275d10..4aa0b7074fb2 100644 --- a/packages/types/.eslintrc.js +++ b/packages/types/.eslintrc.js @@ -4,4 +4,3 @@ module.exports = { '@typescript-eslint/no-explicit-any': 'off', } }; - diff --git a/packages/utils/.eslintrc.js b/packages/utils/.eslintrc.js index d0337d1acf9f..5a2cc7f1ec08 100644 --- a/packages/utils/.eslintrc.js +++ b/packages/utils/.eslintrc.js @@ -1,4 +1,3 @@ module.exports = { extends: ['../../.eslintrc.js'], }; - From 0a7eb08c50eeb5e814f82990f926764a6eae8b6f Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Thu, 28 Oct 2021 14:44:02 -0400 Subject: [PATCH 5/8] remove from package.json --- packages/angular/package.json | 1 - packages/core/package.json | 1 - packages/gatsby/package.json | 1 - packages/hub/package.json | 1 - packages/integrations/package.json | 1 - packages/minimal/package.json | 1 - packages/tracing/package.json | 1 - packages/types/package.json | 1 - packages/vue/package.json | 1 - 9 files changed, 9 deletions(-) diff --git a/packages/angular/package.json b/packages/angular/package.json index a9b14dd01028..c9277e286c47 100644 --- a/packages/angular/package.json +++ b/packages/angular/package.json @@ -31,7 +31,6 @@ "@angular/common": "^10.0.3", "@angular/core": "^10.0.3", "@angular/router": "^10.0.3", - "@sentry-internal/eslint-config-sdk": "6.13.3", "npm-run-all": "^4.1.2", "prettier": "1.19.0", "rimraf": "^2.6.3", diff --git a/packages/core/package.json b/packages/core/package.json index 8869759e7a91..d86c872d7260 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -23,7 +23,6 @@ "tslib": "^1.9.3" }, "devDependencies": { - "@sentry-internal/eslint-config-sdk": "6.13.3", "jest": "^24.7.1", "npm-run-all": "^4.1.2", "prettier": "1.19.0", diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json index 0a2699f71e60..0cf97380887c 100644 --- a/packages/gatsby/package.json +++ b/packages/gatsby/package.json @@ -33,7 +33,6 @@ "gatsby": "^2.0.0 || ^3.0.0" }, "devDependencies": { - "@sentry-internal/eslint-config-sdk": "6.13.3", "@sentry/types": "6.13.3", "@testing-library/react": "^10.4.9", "jest": "^24.7.1", diff --git a/packages/hub/package.json b/packages/hub/package.json index 84b85af21dcc..c3177d01abd7 100644 --- a/packages/hub/package.json +++ b/packages/hub/package.json @@ -21,7 +21,6 @@ "tslib": "^1.9.3" }, "devDependencies": { - "@sentry-internal/eslint-config-sdk": "6.13.3", "jest": "^24.7.1", "npm-run-all": "^4.1.2", "prettier": "1.19.0", diff --git a/packages/integrations/package.json b/packages/integrations/package.json index 45a4217d5a58..f74920fc7c3e 100644 --- a/packages/integrations/package.json +++ b/packages/integrations/package.json @@ -22,7 +22,6 @@ "tslib": "^1.9.3" }, "devDependencies": { - "@sentry-internal/eslint-config-sdk": "6.13.3", "chai": "^4.1.2", "jest": "^24.7.1", "npm-run-all": "^4.1.2", diff --git a/packages/minimal/package.json b/packages/minimal/package.json index 22e3bc67f37e..6b7ffc636adb 100644 --- a/packages/minimal/package.json +++ b/packages/minimal/package.json @@ -21,7 +21,6 @@ "tslib": "^1.9.3" }, "devDependencies": { - "@sentry-internal/eslint-config-sdk": "6.13.3", "jest": "^24.7.1", "npm-run-all": "^4.1.2", "prettier": "1.19.0", diff --git a/packages/tracing/package.json b/packages/tracing/package.json index db2459424e1d..56b866a69659 100644 --- a/packages/tracing/package.json +++ b/packages/tracing/package.json @@ -23,7 +23,6 @@ "tslib": "^1.9.3" }, "devDependencies": { - "@sentry-internal/eslint-config-sdk": "6.13.3", "@sentry/browser": "6.13.3", "@types/express": "^4.17.1", "@types/jsdom": "^16.2.3", diff --git a/packages/types/package.json b/packages/types/package.json index 98996569bf5b..43716a4c6e8b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -16,7 +16,6 @@ "access": "public" }, "devDependencies": { - "@sentry-internal/eslint-config-sdk": "6.13.3", "npm-run-all": "^4.1.2", "prettier": "1.19.0", "typescript": "3.7.5" diff --git a/packages/vue/package.json b/packages/vue/package.json index b3d194bdcbc3..922c5a8834cf 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -28,7 +28,6 @@ "vue-router": "3.x || 4.x" }, "devDependencies": { - "@sentry-internal/eslint-config-sdk": "6.13.3", "jest": "^24.7.1", "jsdom": "^16.2.2", "npm-run-all": "^4.1.2", From bfd209e7f8366e476d95cc357fb39b95c37ec4a8 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Fri, 29 Oct 2021 13:10:03 -0400 Subject: [PATCH 6/8] Update packages/eslint-config-sdk/src/index.js Co-authored-by: iker barriocanal <32816711+iker-barriocanal@users.noreply.github.com> --- packages/eslint-config-sdk/src/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/eslint-config-sdk/src/index.js b/packages/eslint-config-sdk/src/index.js index bacabc61764b..e6ff6c030729 100644 --- a/packages/eslint-config-sdk/src/index.js +++ b/packages/eslint-config-sdk/src/index.js @@ -166,7 +166,6 @@ module.exports = { files: ['*.test.ts', '*.test.tsx', '*.test.js', '*.test.jsx', 'test/**/*.ts', 'test/**/*.js'], rules: { 'max-lines': 'off', - '@typescript-eslint/explicit-function-return-type': 'off', 'no-unused-expressions': 'off', '@typescript-eslint/no-unused-expressions': 'off', From ca60ec4c0d16a38988c7d26d914280b0de75ed94 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Fri, 29 Oct 2021 13:10:33 -0400 Subject: [PATCH 7/8] remove uneeded es6 declares --- packages/angular/.eslintrc.js | 1 - packages/gatsby/.eslintrc.js | 1 - packages/node/.eslintrc.js | 1 - packages/vue/.eslintrc.js | 1 - 4 files changed, 4 deletions(-) diff --git a/packages/angular/.eslintrc.js b/packages/angular/.eslintrc.js index cff5fdb6edce..46d8d10cc538 100644 --- a/packages/angular/.eslintrc.js +++ b/packages/angular/.eslintrc.js @@ -1,6 +1,5 @@ module.exports = { env: { - es6: true, browser: true, }, extends: ['../../.eslintrc.js'], diff --git a/packages/gatsby/.eslintrc.js b/packages/gatsby/.eslintrc.js index 1d253f322a31..54e8382b22a8 100644 --- a/packages/gatsby/.eslintrc.js +++ b/packages/gatsby/.eslintrc.js @@ -1,6 +1,5 @@ module.exports = { env: { - es6: true, browser: true, node: true, }, diff --git a/packages/node/.eslintrc.js b/packages/node/.eslintrc.js index 32492ebb18b4..ede6c0bea98e 100644 --- a/packages/node/.eslintrc.js +++ b/packages/node/.eslintrc.js @@ -1,7 +1,6 @@ module.exports = { root: true, env: { - es6: true, node: true, }, parserOptions: { diff --git a/packages/vue/.eslintrc.js b/packages/vue/.eslintrc.js index cff5fdb6edce..46d8d10cc538 100644 --- a/packages/vue/.eslintrc.js +++ b/packages/vue/.eslintrc.js @@ -1,6 +1,5 @@ module.exports = { env: { - es6: true, browser: true, }, extends: ['../../.eslintrc.js'], From cf6b60dda3ab091ce3251959d29f3ec517a28717 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Tue, 2 Nov 2021 07:46:54 -0400 Subject: [PATCH 8/8] align eslint ignore with current setup --- .eslintrc.js | 1 - 1 file changed, 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index 3fdf88750e55..e44255b7646f 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -12,7 +12,6 @@ module.exports = { 'build/**', 'dist/**', 'esm/**', - 'cjs/**', 'examples/**', 'scripts/**', 'test/manual/**',