Skip to content

Commit b505e70

Browse files
committed
add plugins for import
1 parent 7153fa0 commit b505e70

File tree

15 files changed

+151
-21
lines changed

15 files changed

+151
-21
lines changed

.eslintrc.js

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module.exports = {
33
env: {
44
node: true,
55
},
6-
extends: ['prettier', 'eslint:recommended'],
7-
plugins: ['sentry-sdk', 'jsdoc', 'deprecation'],
6+
extends: ['prettier', 'eslint:recommended', 'plugin:import/errors', 'plugin:import/warnings'],
7+
plugins: ['sentry-sdk', 'simple-import-sort'],
88
ignorePatterns: ['eslint-plugin-sentry-sdk'],
99
overrides: [
1010
{
@@ -17,8 +17,8 @@ module.exports = {
1717
{
1818
// Configuration for typescript files
1919
files: ['*.ts', '*.tsx', '*.d.ts'],
20-
extends: ['plugin:@typescript-eslint/recommended', 'prettier/@typescript-eslint'],
21-
plugins: ['@typescript-eslint'],
20+
extends: ['plugin:@typescript-eslint/recommended', 'prettier/@typescript-eslint', 'plugin:import/typescript'],
21+
plugins: ['@typescript-eslint', 'jsdoc', 'deprecation'],
2222
parser: '@typescript-eslint/parser',
2323
parserOptions: {
2424
project: './tsconfig.json',
@@ -82,6 +82,11 @@ module.exports = {
8282

8383
// Do not use deprecated methods
8484
'deprecation/deprecation': 'error',
85+
86+
// sort imports
87+
'simple-import-sort/sort': 'error',
88+
'sort-imports': 'off',
89+
'import/order': 'off',
8590
},
8691
},
8792
{
@@ -153,5 +158,11 @@ module.exports = {
153158

154159
// Make sure all expressions are used. Turn off on tests.
155160
'no-unused-expressions': 'error',
161+
162+
// We shouldn't make assumptions about imports/exports being dereferenced.
163+
'import/namespace': 'off',
164+
165+
// imports should be ordered.
166+
'import/order': ['error', { 'newlines-between': 'always' }],
156167
},
157168
};

dangerfile.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { exec } from 'child_process';
2-
import { danger, fail, message, schedule, warn } from 'danger';
32
import { promisify } from 'util';
43
import { resolve } from 'path';
4+
5+
import { danger, fail, message, schedule, warn } from 'danger';
56
import tslint from 'danger-plugin-tslint';
67
import { prettyResults } from 'danger-plugin-tslint/dist/prettyResults';
78
import { CLIEngine } from 'eslint';

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,10 @@
5454
"eslint": "^7.5.0",
5555
"eslint-config-prettier": "^6.11.0",
5656
"eslint-plugin-deprecation": "^1.1.0",
57+
"eslint-plugin-import": "^2.22.0",
5758
"eslint-plugin-jsdoc": "^30.0.3",
5859
"eslint-plugin-sentry-sdk": "file:./eslint-plugin-sentry-sdk",
60+
"eslint-plugin-simple-import-sort": "^5.0.3",
5961
"jest": "^24.7.1",
6062
"karma-browserstack-launcher": "^1.5.1",
6163
"karma-firefox-launcher": "^1.1.0",

packages/angular/src/tracing.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// tslint:disable:max-classes-per-file
2-
31
import { AfterViewInit, Directive, Injectable, Input, OnInit } from '@angular/core';
42
import { Event, NavigationEnd, NavigationStart, Router } from '@angular/router';
53
import { getCurrentHub } from '@sentry/browser';

packages/apm/src/integrations/tracing.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import {
1515
import { Span as SpanClass } from '../span';
1616
import { SpanStatus } from '../spanstatus';
1717
import { Transaction } from '../transaction';
18-
1918
import { Location } from './types';
2019

2120
/**

packages/apm/src/spanstatus.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/** The status of an Span. */
2+
// eslint-disable-next-line import/export
23
export enum SpanStatus {
34
/** The operation completed successfully. */
45
Ok = 'ok',
@@ -36,7 +37,7 @@ export enum SpanStatus {
3637
DataLoss = 'data_loss',
3738
}
3839

39-
// eslint-disable-next-line @typescript-eslint/no-namespace
40+
// eslint-disable-next-line @typescript-eslint/no-namespace, import/export
4041
export namespace SpanStatus {
4142
/**
4243
* Converts a HTTP status code into a {@link SpanStatus}.

packages/browser/test/integration/run.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/usr/bin/env node
22

33
const fs = require("fs");
4+
const path = require("path");
5+
46
const rimraf = require("rimraf");
57
const karma = require("karma");
6-
const path = require("path");
78
const chokidar = require("chokidar");
89

910
const isDebugMode = process.argv.some(x => x === "--debug");

packages/browser/test/package/npm-build.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const fs = require('fs');
22
const path = require('path');
3+
34
const webpack = require('webpack');
45
const { JSDOM } = require('jsdom');
56

packages/browser/test/unit/index.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import {
1616
Scope,
1717
wrap,
1818
} from '../../src';
19-
2019
import { SimpleTransport } from './mocks/simpletransport';
2120

2221
const dsn = 'https://[email protected]/4291';

packages/browser/test/unit/tracekit/original.test.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { expect } from 'chai';
22

33
import { computeStackTrace } from '../../../src/tracekit';
4-
54
import {
65
ANDROID_REACT_NATIVE,
76
ANDROID_REACT_NATIVE_HERMES,
@@ -11,13 +10,13 @@ import {
1110
CHROME_48_BLOB,
1211
CHROME_48_EVAL,
1312
CHROME_XX_WEBPACK,
14-
FIREFOX_14,
1513
FIREFOX_3,
14+
FIREFOX_7,
15+
FIREFOX_14,
1616
FIREFOX_31,
1717
FIREFOX_43_EVAL,
1818
FIREFOX_44_NS_EXCEPTION,
1919
FIREFOX_50_RESOURCE_URL,
20-
FIREFOX_7,
2120
IE_10,
2221
IE_11,
2322
IE_11_EVAL,

packages/core/test/lib/sdk.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Integration, Client } from '@sentry/types';
1+
import { Client, Integration } from '@sentry/types';
22

33
import { installedIntegrations } from '../../src/integration';
44
import { initAndBind } from '../../src/sdk';

packages/core/test/mocks/client.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { BaseClient } from '../../src/baseclient';
22
import { initAndBind } from '../../src/sdk';
3-
43
import { TestBackend, TestOptions } from './backend';
54

65
export class TestClient extends BaseClient<TestBackend, TestOptions> {

packages/types/src/severity.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/** JSDoc */
2+
// eslint-disable-next-line import/export
23
export enum Severity {
34
/** JSDoc */
45
Fatal = 'fatal',
@@ -16,7 +17,7 @@ export enum Severity {
1617
Critical = 'critical',
1718
}
1819

19-
// eslint-disable-next-line @typescript-eslint/no-namespace
20+
// eslint-disable-next-line @typescript-eslint/no-namespace, import/export
2021
export namespace Severity {
2122
/**
2223
* Converts a string-based level into a {@link Severity}.

packages/types/src/status.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/** The status of an event. */
2+
// eslint-disable-next-line import/export
23
export enum Status {
34
/** The status could not be determined. */
45
Unknown = 'unknown',
@@ -14,7 +15,7 @@ export enum Status {
1415
Failed = 'failed',
1516
}
1617

17-
// eslint-disable-next-line @typescript-eslint/no-namespace
18+
// eslint-disable-next-line @typescript-eslint/no-namespace, import/export
1819
export namespace Status {
1920
/**
2021
* Converts a HTTP status code into a {@link Status}.

0 commit comments

Comments
 (0)