Skip to content

Commit 4771185

Browse files
AbhiPrasadAbhiPrasad
committed
all packages use eslint
1 parent 4d1dda9 commit 4771185

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+153
-183
lines changed

‎.prettierrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"printWidth": 120,
33
"proseWrap": "always",
44
"singleQuote": true,
5-
"trailingComma": "all"
5+
"trailingComma": "all",
6+
"arrowParens": "avoid"
67
}

‎package.json

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
"packages/browser",
2424
"packages/core",
2525
"packages/ember",
26+
"packages/eslint-config",
27+
"packages/eslint-plugin",
2628
"packages/gatsby",
2729
"packages/hub",
2830
"packages/integrations",
@@ -43,26 +45,16 @@
4345
"@types/mocha": "^5.2.0",
4446
"@types/node": "^11.13.7",
4547
"@types/sinon": "^7.0.11",
46-
"@typescript-eslint/eslint-plugin": "^3.9.0",
47-
"@typescript-eslint/parser": "^3.9.0",
4848
"chai": "^4.1.2",
4949
"codecov": "^3.6.5",
5050
"danger": "^7.1.3",
51-
"eslint": "^7.5.0",
52-
"eslint-config-prettier": "^6.11.0",
53-
"eslint-plugin-deprecation": "^1.1.0",
54-
"eslint-plugin-import": "^2.22.0",
55-
"eslint-plugin-jsdoc": "^30.0.3",
56-
"eslint-plugin-sentry-sdks": "file:./eslint-plugin-sentry-sdks",
57-
"eslint-plugin-simple-import-sort": "^5.0.3",
5851
"jest": "^24.7.1",
5952
"karma-browserstack-launcher": "^1.5.1",
6053
"karma-firefox-launcher": "^1.1.0",
6154
"lerna": "3.13.4",
6255
"mocha": "^6.1.4",
6356
"npm-run-all": "^4.1.2",
64-
"prettier": "^1.17.0",
65-
"prettier-check": "^2.0.0",
57+
"prettier": "1.17.0",
6658
"replace-in-file": "^4.0.0",
6759
"rimraf": "^2.6.3",
6860
"sinon": "^7.3.2",

‎packages/angular/.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module.exports = {
77
parserOptions: {
88
ecmaVersion: 2018,
99
},
10-
extends: ['../../.eslintrc.js'],
10+
extends: ['@sentry'],
1111
ignorePatterns: ['build/**/*', 'dist/**/*', 'esm/**/*', 'examples/**/*', 'scripts/**/*'],
1212
overrides: [
1313
{

‎packages/angular/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@
2626
"tslib": "^1.9.3"
2727
},
2828
"devDependencies": {
29+
"@sentry/eslint-plugin": "5.20.1",
30+
"eslint": "^7.6.0",
2931
"npm-run-all": "^4.1.2",
30-
"prettier": "^1.17.0",
31-
"prettier-check": "^2.0.0",
32+
"prettier": "1.17.0",
3233
"rimraf": "^2.6.3",
3334
"typescript": "^3.5.1"
3435
},
@@ -42,7 +43,7 @@
4243
"clean": "rimraf dist coverage build esm",
4344
"link:yarn": "yarn link",
4445
"lint": "run-s lint:prettier lint:eslint",
45-
"lint:prettier": "prettier-check \"{src,test}/**/*.ts\"",
46+
"lint:prettier": "prettier --check \"{src,test}/**/*.ts\"",
4647
"lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish",
4748
"fix": "run-s fix:eslint fix:prettier",
4849
"fix:prettier": "prettier --write \"{src,test}/**/*.ts\"",

‎packages/apm/.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = {
66
parserOptions: {
77
ecmaVersion: 2018,
88
},
9-
extends: ['../../.eslintrc.js'],
9+
extends: ['@sentry'],
1010
ignorePatterns: ['build/**/*', 'dist/**/*', 'esm/**/*', 'examples/**/*', 'scripts/**/*'],
1111
overrides: [
1212
{

‎packages/apm/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@
2424
"tslib": "^1.9.3"
2525
},
2626
"devDependencies": {
27+
"@sentry/eslint-plugin": "5.20.1",
2728
"@types/express": "^4.17.1",
29+
"eslint": "^7.6.0",
2830
"jest": "^24.7.1",
2931
"npm-run-all": "^4.1.2",
30-
"prettier": "^1.17.0",
31-
"prettier-check": "^2.0.0",
32+
"prettier": "1.17.0",
3233
"rimraf": "^2.6.3",
3334
"rollup": "^1.10.1",
3435
"rollup-plugin-commonjs": "^9.3.4",
@@ -50,7 +51,7 @@
5051
"clean": "rimraf dist coverage build esm",
5152
"link:yarn": "yarn link",
5253
"lint": "run-s lint:prettier lint:eslint",
53-
"lint:prettier": "prettier-check \"{src,test}/**/*.ts\"",
54+
"lint:prettier": "prettier --check \"{src,test}/**/*.ts\"",
5455
"lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish",
5556
"fix": "run-s fix:eslint fix:prettier",
5657
"fix:prettier": "prettier --write \"{src,test}/**/*.ts\"",

‎packages/apm/src/integrations/tracing.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,9 @@ export class Tracing implements Integration {
506506
if (Tracing._heartbeatCounter >= 3) {
507507
if (Tracing._activeTransaction) {
508508
Tracing._log(
509-
`[Tracing] Transaction: ${SpanStatus.Cancelled} -> Heartbeat safeguard kicked in since content hasn't changed for 3 beats`,
509+
`[Tracing] Transaction: ${
510+
SpanStatus.Cancelled
511+
} -> Heartbeat safeguard kicked in since content hasn't changed for 3 beats`,
510512
);
511513
Tracing._activeTransaction.setStatus(SpanStatus.DeadlineExceeded);
512514
Tracing._activeTransaction.setTag('heartbeat', 'failed');

‎packages/browser/.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module.exports = {
77
parserOptions: {
88
ecmaVersion: 2018,
99
},
10-
extends: ['../../.eslintrc.js'],
10+
extends: ['@sentry'],
1111
ignorePatterns: ['build/**/*', 'dist/**/*', 'esm/**/*', 'examples/**/*', 'scripts/**/*', 'src/loader.js'],
1212
overrides: [
1313
{

‎packages/browser/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
"devDependencies": {
2525
"@types/eslint": "^7.2.0",
2626
"@types/md5": "2.1.33",
27+
"@sentry/eslint-plugin": "5.20.1",
28+
"eslint": "^7.6.0",
2729
"btoa": "^1.2.1",
2830
"chai": "^4.1.2",
2931
"chokidar": "^3.0.2",
@@ -40,8 +42,7 @@
4042
"karma-typescript-es6-transform": "^4.0.0",
4143
"node-fetch": "^2.6.0",
4244
"npm-run-all": "^4.1.2",
43-
"prettier": "^1.17.0",
44-
"prettier-check": "^2.0.0",
45+
"prettier": "1.17.0",
4546
"rimraf": "^2.6.3",
4647
"rollup": "^1.10.1",
4748
"rollup-plugin-commonjs": "^9.3.4",
@@ -65,7 +66,7 @@
6566
"clean": "rimraf dist coverage .rpt2_cache build esm",
6667
"link:yarn": "yarn link",
6768
"lint": "run-s lint:prettier lint:eslint",
68-
"lint:prettier": "prettier-check \"{src,test}/**/*.ts\"",
69+
"lint:prettier": "prettier --check \"{src,test}/**/*.ts\"",
6970
"lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish",
7071
"fix": "run-s fix:eslint fix:prettier",
7172
"fix:prettier": "prettier --write \"{src,test}/**/*.ts\"",

‎packages/core/.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = {
66
parserOptions: {
77
ecmaVersion: 2018,
88
},
9-
extends: ['../../.eslintrc.js'],
9+
extends: ['@sentry'],
1010
ignorePatterns: ['build/**/*', 'dist/**/*', 'esm/**/*', 'examples/**/*', 'scripts/**/*'],
1111
overrides: [
1212
{

‎packages/core/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@
2323
"tslib": "^1.9.3"
2424
},
2525
"devDependencies": {
26+
"@sentry/eslint-plugin": "5.20.1",
27+
"eslint": "^7.6.0",
2628
"jest": "^24.7.1",
2729
"npm-run-all": "^4.1.2",
28-
"prettier": "^1.17.0",
29-
"prettier-check": "^2.0.0",
30+
"prettier": "1.17.0",
3031
"rimraf": "^2.6.3",
3132
"typescript": "3.4.5"
3233
},
@@ -40,7 +41,7 @@
4041
"clean": "rimraf dist coverage",
4142
"link:yarn": "yarn link",
4243
"lint": "run-s lint:prettier lint:eslint",
43-
"lint:prettier": "prettier-check \"{src,test}/**/*.ts\"",
44+
"lint:prettier": "prettier --check \"{src,test}/**/*.ts\"",
4445
"lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish",
4546
"fix": "run-s fix:eslint fix:prettier",
4647
"fix:prettier": "prettier --write \"{src,test}/**/*.ts\"",

‎packages/ember/.eslintrc.js

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,23 @@ module.exports = {
77
ecmaVersion: 2018,
88
sourceType: 'module',
99
ecmaFeatures: {
10-
legacyDecorators: true
11-
}
10+
legacyDecorators: true,
11+
},
1212
},
13-
plugins: [
14-
'ember'
15-
],
16-
extends: [
17-
'eslint:recommended',
18-
'plugin:ember/recommended'
19-
],
13+
plugins: ['ember'],
14+
extends: ['eslint:recommended', 'plugin:ember/recommended'],
2015
env: {
21-
browser: true
16+
browser: true,
2217
},
2318
globals: {
24-
"QUnit": true
19+
QUnit: true,
2520
},
2621
rules: {},
2722
overrides: [
23+
{
24+
files: ['addon/**/*'],
25+
plugins: ['@sentry'],
26+
},
2827
// node files
2928
{
3029
files: [
@@ -35,23 +34,18 @@ module.exports = {
3534
'testem.js',
3635
'blueprints/*/index.js',
3736
'config/**/*.js',
38-
'tests/dummy/config/**/*.js'
39-
],
40-
excludedFiles: [
41-
'addon/**',
42-
'addon-test-support/**',
43-
'app/**',
44-
'tests/dummy/app/**'
37+
'tests/dummy/config/**/*.js',
4538
],
39+
excludedFiles: ['addon/**', 'addon-test-support/**', 'app/**', 'tests/dummy/app/**'],
4640
parserOptions: {
47-
sourceType: 'script'
41+
sourceType: 'script',
4842
},
4943
env: {
5044
browser: false,
51-
node: true
45+
node: true,
5246
},
5347
plugins: ['node'],
54-
extends: ['plugin:node/recommended']
55-
}
56-
]
48+
extends: ['plugin:node/recommended'],
49+
},
50+
],
5751
};

‎packages/ember/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
"@ember/optional-features": "^1.3.0",
4040
"@glimmer/component": "^1.0.0",
4141
"@glimmer/tracking": "^1.0.0",
42+
"@sentry/eslint-plugin": "5.20.1",
4243
"@types/ember": "^3.16.0",
4344
"@types/ember-qunit": "^3.4.9",
4445
"@types/ember__test-helpers": "^1.7.0",
@@ -64,7 +65,7 @@
6465
"ember-template-lint": "^2.9.1",
6566
"ember-test-selectors": "^4.1.0",
6667
"ember-try": "^1.4.0",
67-
"eslint": "^7.5.0",
68+
"eslint": "^7.6.0",
6869
"eslint-plugin-ember": "^8.6.0",
6970
"eslint-plugin-node": "^11.1.0",
7071
"loader.js": "^4.7.0",

‎packages/eslint-config/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ correctly use the typescript rules. This configuration comes with
2828

2929
```json
3030
{
31-
"extends": ["sentry-sdks"],
31+
"extends": ["@sentry"],
3232
"overrides": [
3333
{
3434
"files": ["*.ts", "*.tsx", "*.d.ts"],

‎packages/eslint-config/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
},
3939
"scripts": {
4040
"link:yarn": "yarn link",
41-
"lint": "prettier-check \"{src,test}/**/*.ts\"",
42-
"fix": "prettier --write \"{src,test}/**/*.ts\""
41+
"lint": "prettier --check \"**/*.js\"",
42+
"fix": "prettier --write \"**/*.js\""
4343
}
4444
}

‎packages/eslint-plugin/.npmignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
*
2-
!/lib/**/*
2+
!/src/**/*

‎packages/eslint-plugin/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@
1414
"engines": {
1515
"node": ">=6"
1616
},
17-
"main": "lib/index.js",
17+
"main": "src/index.js",
1818
"publishConfig": {
1919
"access": "public"
2020
},
2121
"dependencies": {
2222
"requireindex": "~1.1.0"
2323
},
2424
"devDependencies": {
25-
"prettier": "^1.17.0",
25+
"prettier": "1.17.0",
2626
"typescript": "3.4.5",
2727
"mocha": "^6.2.0"
2828
},
2929
"scripts": {
3030
"link:yarn": "yarn link",
31-
"lint": "prettier --check \"{src,test}/**/*.ts\"",
32-
"fix": "prettier --write \"{src,test}/**/*.ts\"",
33-
"test": "mocha tests --recursive"
31+
"lint": "prettier --check \"{src,test}/**/*.js\"",
32+
"fix": "prettier --write \"{src,test}/**/*.js\"",
33+
"test": "mocha test --recursive"
3434
}
3535
}

‎packages/eslint-plugin/lib/index.js renamed to ‎packages/eslint-plugin/src/index.js

File renamed without changes.

‎packages/eslint-plugin/lib/rules/no-async-await.js renamed to ‎packages/eslint-plugin/src/rules/no-async-await.js

File renamed without changes.

‎packages/eslint-plugin/tests/lib/rules/no-async-await.js renamed to ‎packages/eslint-plugin/test/lib/rules/no-async-await.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// Requirements
99
//------------------------------------------------------------------------------
1010

11-
var rule = require('../../../lib/rules/no-async-await'),
11+
var rule = require('../../../src/rules/no-async-await'),
1212
path = require('path'),
1313
RuleTester = require('eslint').RuleTester;
1414

‎packages/gatsby/.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = {
88
parserOptions: {
99
ecmaVersion: 2018,
1010
},
11-
extends: ['../../.eslintrc.js'],
11+
extends: ['@sentry'],
1212
ignorePatterns: ['build/**/*', 'dist/**/*', 'esm/**/*', 'examples/**/*', 'scripts/**/*'],
1313
overrides: [
1414
{

‎packages/gatsby/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@
3333
"gatsby": "*"
3434
},
3535
"devDependencies": {
36+
"@sentry/eslint-plugin": "5.20.1",
37+
"eslint": "^7.6.0",
3638
"jest": "^24.7.1",
3739
"npm-run-all": "^4.1.2",
38-
"prettier": "^1.17.0",
39-
"prettier-check": "^2.0.0",
40+
"prettier": "1.17.0",
4041
"rimraf": "^2.6.3",
4142
"typescript": "3.4.5"
4243
},
@@ -50,7 +51,7 @@
5051
"clean": "rimraf dist coverage build esm",
5152
"link:yarn": "yarn link",
5253
"lint": "run-s lint:prettier lint:eslint",
53-
"lint:prettier": "prettier-check \"{src,test}/**/*.ts\"",
54+
"lint:prettier": "prettier --check \"{src,test}/**/*.ts\"",
5455
"lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish",
5556
"fix": "run-s fix:eslint fix:prettier",
5657
"fix:prettier": "prettier --write \"{src,test}/**/*.ts\"",

‎packages/hub/.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = {
66
parserOptions: {
77
ecmaVersion: 2018,
88
},
9-
extends: ['../../.eslintrc.js'],
9+
extends: ['@sentry'],
1010
ignorePatterns: ['build/**/*', 'dist/**/*', 'esm/**/*', 'examples/**/*', 'scripts/**/*'],
1111
overrides: [
1212
{

‎packages/hub/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
"tslib": "^1.9.3"
2222
},
2323
"devDependencies": {
24+
"@sentry/eslint-plugin": "5.20.1",
25+
"eslint": "^7.6.0",
2426
"jest": "^24.7.1",
2527
"npm-run-all": "^4.1.2",
26-
"prettier": "^1.17.0",
27-
"prettier-check": "^2.0.0",
28+
"prettier": "1.17.0",
2829
"rimraf": "^2.6.3",
2930
"typescript": "3.4.5"
3031
},
@@ -38,7 +39,7 @@
3839
"clean": "rimraf dist coverage",
3940
"link:yarn": "yarn link",
4041
"lint": "run-s lint:prettier lint:eslint",
41-
"lint:prettier": "prettier-check \"{src,test}/**/*.ts\"",
42+
"lint:prettier": "prettier --check \"{src,test}/**/*.ts\"",
4243
"lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish",
4344
"fix": "run-s fix:eslint fix:prettier",
4445
"fix:prettier": "prettier --write \"{src,test}/**/*.ts\"",

0 commit comments

Comments
 (0)