Browse Source

fix path to @joystream/tsconfig

Mokhtar Naamani 4 years ago
parent
commit
c313ecadd3

+ 3 - 1
cli/.eslintrc.js

@@ -3,7 +3,9 @@ module.exports = {
     // The oclif rules have some code-style/formatting rules which may conflict with
     // our prettier global settings. Disabling for now
     // I suggest to only add essential rules absolutely required to make the cli work with oclif
-    // at the end of this file, to override @joystream/eslint-config
+    // at the end of this file,
+    // The rule will be overridden by the rules in the root .eslintrc.js so we may have to
+    // change them there or remove them if necessary.
     // "oclif",
     // "oclif-typescript",
 

+ 2 - 0
devops/eslint-config/index.js

@@ -1,3 +1,5 @@
+// This config is used globally at the root of the repo, so it should be as thin
+// as possible with rules that we absolutely require across all projects.
 module.exports = {
   env: {
     es6: true

+ 1 - 0
devops/tsconfig/index.js

@@ -0,0 +1 @@
+module.exports = require('./tsconfig')

+ 1 - 1
devops/tsconfig/package.json

@@ -2,7 +2,7 @@
   "name": "@joystream/tsconfig",
   "version": "1.0.0",
   "description": "joystream shared tsconfig",
-  "main": "index.json",
+  "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },

+ 2 - 2
devops/tsconfig/index.json → devops/tsconfig/tsconfig.json

@@ -6,8 +6,8 @@
     "strict": true,
     "target": "esnext",
     "esModuleInterop": true,
-    "types" : [ "node" ],
+    "types": ["node"],
     "resolveJsonModule": true,
     "forceConsistentCasingInFileNames": true
   }
-}
+}

+ 0 - 10
pioneer/.editorconfig

@@ -1,10 +0,0 @@
-root = true
-[*]
-indent_style=space
-indent_size=2
-tab_width=2
-end_of_line=lf
-charset=utf-8
-trim_trailing_whitespace=true
-max_line_length=120
-insert_final_newline=true

+ 1 - 1
pioneer/.eslintrc.js

@@ -1,5 +1,5 @@
 const base = require('@polkadot/dev-react/config/eslint');
-console.log('Using eslintrc from pioneer folder')
+
 // add override for any (a metric ton of them, initial conversion)
 module.exports = {
   ...base,

+ 1 - 1
tsconfig.json

@@ -1,3 +1,3 @@
 {
-    "extends": "./node_modules/@joystream/tsconfig",
+    "extends": "./node_modules/@joystream/tsconfig/tsconfig",
 }