Add eslint interop

FoSuCloud · Jul 2, 2018 · 9acddc1 · 9acddc1
1 parent f823342
commit 9acddc1
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 72 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -2,6 +2,21 @@ node_modules
 **/node_modules
 **/lib
 **/build
+**/static
+jupyterlab/schemas
+jupyterlab/themes
+jupyterlab/geckodriver
 jupyterlab/staging/yarn.js
-jupyterlab/static
 jupyterlab/chrome-test.js
+jupyterlab/staging/index.js
+dev_mode/index.js
+dev_mode/schemas
+dev_mode/static
+dev_mode/themes
+dev_mode/workspaces
+examples/app/build
+examples/app/themes
+examples/app/schemas
+tests/**/coverage
+docs/_build
+docs/api
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,24 @@
+{
+  "env": {
+    "browser": true,
+    "node": true,
+    "commonjs": true
+  },
+  "extends": ["eslint:recommended", "prettier"],
+  "plugins": ["prettier"],
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "modules": true,
+      "jsx": true
+    }
+  },
+  "rules": {
+    "prettier/prettier": ["error", { "singleQuote": true }],
+    "indent": ["error", 2],
+    "linebreak-style": ["error", "unix"],
+    "quotes": ["error", "single"],
+    "no-console": ["error", { "allow": ["warn", "error"] }]
+  }
+}
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,22 @@
+node_modules
+**/node_modules
+**/lib
+**/build
+**/static
+jupyterlab/schemas
+jupyterlab/themes
+jupyterlab/geckodriver
+jupyterlab/staging/yarn.js
+jupyterlab/staging/index.js
+dev_mode/index.js
+dev_mode/schemas
+dev_mode/static
+dev_mode/themes
+dev_mode/workspaces
+examples/app/build
+examples/app/themes
+examples/app/schemas
+tests/**/coverage
+docs/_build
+docs/api
+**/package.json
diff --git a/.prettierrc b/.prettierrc
@@ -1,4 +1,3 @@
 {
-  "singleQuote": true,
-  "parser": "typescript"
+  "singleQuote": true
 }
diff --git a/dev_mode/index.js b/dev_mode/index.js
@@ -9,7 +9,6 @@ import {
   PageConfig
 } from '@jupyterlab/coreutils';
 
-// eslint-disable-next-line
 __webpack_public_path__ = PageConfig.getOption('publicUrl');
 
 // This needs to come after __webpack_public_path__ is set.
@@ -68,7 +67,6 @@ function main() {
 
   // Handle the registered mime extensions.
   var mimeExtensions = [];
-  // eslint-disable-next-line semi
   {{#each jupyterlab_mime_extensions}}
   try {
     if (isDeferred('{{key}}')) {
@@ -105,11 +103,9 @@ function main() {
   } catch (e) {
     console.error(e);
   }
-  // eslint-disable-next-line semi
   {{/each}}
 
   // Handled the registered standard extensions.
-  // eslint-disable-next-line semi
   {{#each jupyterlab_extensions}}
   try {
     if (isDeferred('{{key}}')) {
@@ -146,7 +142,6 @@ function main() {
   } catch (e) {
     console.error(e);
   }
-  // eslint-disable-next-line semi
   {{/each}}
 
   var lab = new JupyterLab({

diff --git a/jupyterlab/staging/index.js b/jupyterlab/staging/index.js
@@ -9,7 +9,6 @@ import {
   PageConfig
 } from '@jupyterlab/coreutils';
 
-// eslint-disable-next-line
 __webpack_public_path__ = PageConfig.getOption('publicUrl');
 
 // This needs to come after __webpack_public_path__ is set.
@@ -68,7 +67,6 @@ function main() {
 
   // Handle the registered mime extensions.
   var mimeExtensions = [];
-  // eslint-disable-next-line semi
   {{#each jupyterlab_mime_extensions}}
   try {
     if (isDeferred('{{key}}')) {
@@ -105,11 +103,9 @@ function main() {
   } catch (e) {
     console.error(e);
   }
-  // eslint-disable-next-line semi
   {{/each}}
 
   // Handled the registered standard extensions.
-  // eslint-disable-next-line semi
   {{#each jupyterlab_extensions}}
   try {
     if (isDeferred('{{key}}')) {
@@ -146,7 +142,6 @@ function main() {
   } catch (e) {
     console.error(e);
   }
-  // eslint-disable-next-line semi
   {{/each}}
 
   var lab = new JupyterLab({

diff --git a/package.json b/package.json
@@ -49,8 +49,9 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@jupyterlab/eslint-plugin-jinja": "^0.2.0",
     "eslint": "^4.12.1",
+    "eslint-config-prettier": "^2.9.0",
+    "eslint-plugin-prettier": "^2.6.0",
     "lerna": "^2.4.0",
     "npm-run-all": "~4.1.1",
     "prettier": "^1.11.1",    

diff --git a/yarn.lock b/yarn.lock
@@ -2,10 +2,6 @@
 # yarn lockfile v1
 
 
-"@jupyterlab/eslint-plugin-jinja@^0.2.0":
-  version "0.2.0"
-  resolved "https://registry.npmjs.org/@jupyterlab/eslint-plugin-jinja/-/eslint-plugin-jinja-0.2.0.tgz#8c97adf17735dad782f89e22709a01fa5cd11440"
-
 "@nteract/transform-vdom@^1.1.1":
   version "1.1.1"
   resolved "https://registry.npmjs.org/@nteract/transform-vdom/-/transform-vdom-1.1.1.tgz#49258c58a3704c89b20cc42b5be463d7802406fa"
@@ -2952,7 +2948,13 @@ escodegen@1.x.x:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-plugin-prettier@^2.2.0:
+eslint-config-prettier@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-2.9.0.tgz#5ecd65174d486c22dff389fe036febf502d468a3"
+  dependencies:
+    get-stdin "^5.0.1"
+
+eslint-plugin-prettier@^2.2.0, eslint-plugin-prettier@^2.6.0:
   version "2.6.0"
   resolved "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-2.6.0.tgz#33e4e228bdb06142d03c560ce04ec23f6c767dd7"
   dependencies:
@@ -3613,6 +3615,10 @@ get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
 
+get-stdin@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
+
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -6769,7 +6775,7 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@^1.11.1:
+prettier@^1.10.2, prettier@^1.11.1:
   version "1.11.1"
   resolved "https://registry.npmjs.org/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75"
 
@@ -8463,17 +8469,25 @@ trim-right@^1.0.1:
 ts-loader@^4.4.0:
   version "4.4.0"
   resolved "https://registry.npmjs.org/ts-loader/-/ts-loader-4.4.0.tgz#a9ecb11f8e4ee1b003325f40c519813fc4df541a"
+
+tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.2:
+  version "1.9.2"
+  resolved "https://registry.npmjs.org/tslib/-/tslib-1.9.2.tgz#8be0cc9a1f6dc7727c38deb16c2ebd1a2892988e"
+
+tslint-config-prettier@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.npmjs.org/tslint-config-prettier/-/tslint-config-prettier-1.9.0.tgz#391887644b66de4623f745a6c85672405cbcdcee"
+
+tslint-plugin-prettier@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/tslint-plugin-prettier/-/tslint-plugin-prettier-1.3.0.tgz#7eb65d19ea786a859501a42491b78c5de2031a3f"
   dependencies:
     chalk "^2.3.0"
     enhanced-resolve "^4.0.0"
     loader-utils "^1.0.2"
     micromatch "^3.1.4"
     semver "^5.0.1"
 
-tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.2:
-  version "1.9.2"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-1.9.2.tgz#8be0cc9a1f6dc7727c38deb16c2ebd1a2892988e"
-
 tslint@~5.10.0:
   version "5.10.0"
   resolved "https://registry.npmjs.org/tslint/-/tslint-5.10.0.tgz#11e26bccb88afa02dd0d9956cae3d4540b5f54c3"
@@ -8518,12 +8532,6 @@ tsutils@^2.12.1:
   dependencies:
     tslib "^1.8.1"
 
-tsutils@^2.13.1:
-  version "2.22.0"
-  resolved "https://registry.npmjs.org/tsutils/-/tsutils-2.22.0.tgz#26694814556a09bb5afd4802462931ad5294e3fa"
-  dependencies:
-    tslib "^1.8.1"
-
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"