Skip to content
This repository was archived by the owner on Nov 18, 2024. It is now read-only.

Commit 1e60710

Browse files
committed
Disable amo/only-tsx-files for server code
1 parent a5f9690 commit 1e60710

File tree

5 files changed

+25
-19
lines changed

5 files changed

+25
-19
lines changed

.eslintrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
"operator-linebreak": "off",
3030
"react/jsx-one-expression-per-line": "off",
3131
// Report an error when a variable is not used.
32-
// TODO: uncomment when we can upgrade https://github.com/typescript-eslint/typescript-eslint
33-
//"@typescript-eslint/no-unused-vars": "error",
32+
"@typescript-eslint/no-unused-vars": "error",
3433
},
3534
"settings": {
3635
"import/resolver": {

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"@types/enzyme-adapter-react-16": "^1.0.3",
3737
"@types/storybook__react": "^4.0.0",
3838
"@types/supertest": "^2.0.7",
39-
"@typescript-eslint/eslint-plugin": "^1.1.1",
40-
"@typescript-eslint/parser": "^1.1.1",
39+
"@typescript-eslint/eslint-plugin": "^1.1.2-alpha.3",
40+
"@typescript-eslint/parser": "^1.1.2-alpha.3",
4141
"babel-loader": "8.0.4",
4242
"chalk": "^2.4.2",
4343
"codecov": "^3.1.0",

src/server/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
/* eslint @typescript-eslint/no-var-requires: 0, no-console: 0, global-require: 0 */
1+
/* eslint @typescript-eslint/no-var-requires: 0, no-console: 0,
2+
global-require: 0, amo/only-tsx-files: 0 */
23
// @ts-ignore
34
const fs = require('fs');
45
const path = require('path');

src/server/index.spec.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint amo/only-tsx-files: 0 */
12
import path from 'path';
23

34
import request from 'supertest';

yarn.lock

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1676,27 +1676,27 @@
16761676
resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.6.tgz#128d1685a7c34d31ed17010fc87d6a12c1de6976"
16771677
integrity sha512-5Th3OsZ4gTRdr9Mho83BQ23cex4sRhOR4XTG+m+cJc0FhtUBK9Vn62hBJ+pnQYnSxoPOsKoAPOx6FcphxBC8ng==
16781678

1679-
"@typescript-eslint/eslint-plugin@^1.1.1":
1680-
version "1.1.1"
1681-
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.1.1.tgz#6176df695feb2cca303b6cb50b386b112b86f462"
1682-
integrity sha512-7uLG6yevcS3YNMnizbZjC1xCDD2RNwqbUAPFkjz80x3NeytlIExvPR40+meGwiJ+LilgJVlqqlDMFu7PHJ6Kzw==
1679+
"@typescript-eslint/eslint-plugin@^1.1.2-alpha.3":
1680+
version "1.1.2-alpha.4"
1681+
resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.1.2-alpha.4.tgz#eaecea2a289e4e9159390e2d9a281b1dd6a446f0"
1682+
integrity sha512-iNYjNUqklZM2ZUC43OTShpfz59/npwW034Ljsu6tQwoDA7jpwxsizqkIRQr7zNUAmlFrnfijtPVIf+Hsj6/J9Q==
16831683
dependencies:
1684-
"@typescript-eslint/parser" "1.1.1"
1684+
"@typescript-eslint/parser" "1.1.2-alpha.4+417c7fb"
16851685
requireindex "^1.2.0"
16861686

1687-
"@typescript-eslint/[email protected].1", "@typescript-eslint/parser@^1.1.1":
1688-
version "1.1.1"
1689-
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-1.1.1.tgz#a979c5dc543ae4ae9b44df9def70e2a5892e7185"
1690-
integrity sha512-P6v+iYkI+ywp6MaFyAJ6NqU5W6fiAvMXWjCV63xTJbkQdtAngdjSCajlEEweqJqL4RNsgFCHBe5HbYyT6TmW4g==
1687+
"@typescript-eslint/[email protected].2-alpha.4+417c7fb", "@typescript-eslint/parser@^1.1.2-alpha.3":
1688+
version "1.1.2-alpha.4"
1689+
resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-1.1.2-alpha.4.tgz#0ab4a7d82c6b2d97a38f248ce351a7d499479e94"
1690+
integrity sha512-Jm70YjB1r9lq9kX8EMWbt4iy1Cox3300oiClROfpFm9l9B8j+aVDQ59dVYXXGwB/MSUUX2OdrFURm0jjnG+iMw==
16911691
dependencies:
1692-
"@typescript-eslint/typescript-estree" "1.1.1"
1692+
"@typescript-eslint/typescript-estree" "1.1.2-alpha.4+417c7fb"
16931693
eslint-scope "^4.0.0"
16941694
eslint-visitor-keys "^1.0.0"
16951695

1696-
"@typescript-eslint/[email protected].1":
1697-
version "1.1.1"
1698-
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-1.1.1.tgz#d5cccc227d2c8948799d127b6cc51ccb5378bf51"
1699-
integrity sha512-rERZSjNWb4WC425daCUktfh+0fFLy4WWlnu9bESdJv5l+t0ww0yUprRUbgzehag/dGd56Me+3uyXGV2O12qxrQ==
1696+
"@typescript-eslint/[email protected].2-alpha.4+417c7fb":
1697+
version "1.1.2-alpha.4"
1698+
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-1.1.2-alpha.4.tgz#b643c83076785ec3093d8170394579bdc94f3d86"
1699+
integrity sha512-EWLhyB4S8hyrEAGfhkAQnR9xlFPwMmIwKylUWk8USeYgZd+mu7jkyySKA4m7tASzFyhW46q/e1XPJsX8jg0v0w==
17001700
dependencies:
17011701
lodash.unescape "4.0.1"
17021702
semver "5.5.0"
@@ -11292,6 +11292,11 @@ resolve-from@^3.0.0:
1129211292
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
1129311293
integrity sha1-six699nWiBvItuZTM17rywoYh0g=
1129411294

11295+
resolve-from@^4.0.0:
11296+
version "4.0.0"
11297+
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
11298+
integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
11299+
1129511300
resolve-pathname@^2.2.0:
1129611301
version "2.2.0"
1129711302
resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879"

0 commit comments

Comments
 (0)