chore: setup the eslint to support both ts and js

AllJointTW · May 3, 2020 · f237efb · f237efb
1 parent df3992f
commit f237efb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1 +1,7 @@
-{ "extends": "@alljoint-next/eslint-config-typescript" }
+{
+  "extends": "@alljoint-next/eslint-config",
+  "overrides": [{
+    "files": ["*.ts"],
+    "extends": "@alljoint-next/eslint-config-typescript"
+  }]
+}
diff --git a/package.json b/package.json
@@ -16,6 +16,7 @@
     "build": "yarn workspaces run build"
   },
   "devDependencies": {
+    "@alljoint-next/eslint-config": "^0.3.2",
     "@alljoint-next/eslint-config-typescript": "^0.3.0",
     "@alljoint-next/ts-config": "^0.1.2",
     "@commitlint/cli": "^8.3.5",

diff --git a/yarn.lock b/yarn.lock
@@ -11,7 +11,7 @@
     "@typescript-eslint/eslint-plugin" "^2.19.2"
     "@typescript-eslint/parser" "^2.19.2"
 
-"@alljoint-next/[email protected]":
+"@alljoint-next/[email protected]", "@alljoint-next/eslint-config@^0.3.2":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@alljoint-next/eslint-config/-/eslint-config-0.3.2.tgz#f90887b38d340164c6fb84251eabbc2d36d74ad5"
   integrity sha512-3fjdAcuM23M5JcdznUuhvrRzn5NCLyphEnnYaV3GKP+zkPrGcyEHmbpOYyFC/P3PK1PpXnaDWJRIy83IgL6xlg==