Fix ESLint for VSCode (#9055)

Co-authored-by: Chris Thoburn <runspired@gmail.com>
emberjs · Oct 25, 2023 · fb5b968 · fb5b968
1 parent 2ca4a57
commit fb5b968
Show file tree

Hide file tree

Showing 21 changed files with 151 additions and 150 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,6 @@
 {
   "files.associations": {
     "turbo.json": "jsonc"
-  }
-}
+  },
+  "eslint.workingDirectories": ["packages/*", "tests/*"]
+}
diff --git a/config/eslint/base.cjs b/config/eslint/base.cjs
@@ -1,5 +1,17 @@
 const path = require('path');
-const prettierPath = path.join(process.cwd(), '../../.prettierrc.js');
+
+let isRoot = false;
+try {
+  const dir = process.cwd();
+  const pkg = require(path.join(dir, './package.json'));
+  if (pkg.name === 'root') {
+    isRoot = true;
+  }
+} catch (e) {
+  console.log(e);
+}
+
+const prettierPath = path.join(process.cwd(), isRoot ? './.prettierrc.js' : '../../.prettierrc.js');
 const prettierConfig = require(prettierPath);
 
 function rules() {
@@ -20,13 +32,13 @@ function rules() {
     'prefer-rest-params': 'off',
     'prefer-const': 'error',
 
-    "prettier/prettier": [
-      "error",
+    'prettier/prettier': [
+      'error',
       prettierConfig,
       {
-        "usePrettierrc": false
-      }
-    ]
+        usePrettierrc: false,
+      },
+    ],
   };
 }
 
@@ -46,7 +58,7 @@ function settings() {
       node: false,
       es2022: true,
     },
-  }
+  };
 }
 
 module.exports = {

diff --git a/config/package.json b/config/package.json
@@ -13,7 +13,6 @@
     "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-simple-import-sort": "^10.0.0",
-    "pnpm-sync-dependencies-meta-injected": "0.0.10",
     "prettier": "^3.0.3",
     "typescript": "~5.2.2"
   },

diff --git a/packages/active-record/package.json b/packages/active-record/package.json
@@ -39,9 +39,6 @@
     "@ember/string": {
       "injected": true
     },
-    "@warp-drive/internal-config": {
-      "injected": true
-    },
     "@warp-drive/core-types": {
       "injected": true
     },

diff --git a/packages/adapter/package.json b/packages/adapter/package.json
@@ -59,9 +59,6 @@
     "@ember/string": {
       "injected": true
     },
-    "@warp-drive/internal-config": {
-      "injected": true
-    },
     "@warp-drive/core-types": {
       "injected": true
     },

diff --git a/packages/core-types/package.json b/packages/core-types/package.json
@@ -47,9 +47,6 @@
   "dependenciesMeta": {
     "@ember-data/private-build-infra": {
       "injected": true
-    },
-    "@warp-drive/internal-config": {
-      "injected": true
     }
   },
   "devDependencies": {

diff --git a/packages/debug/package.json b/packages/debug/package.json
@@ -31,9 +31,6 @@
     "@ember-data/store": {
       "injected": true
     },
-    "@warp-drive/internal-config": {
-      "injected": true
-    },
     "@ember-data/request": {
       "injected": true
     },

diff --git a/packages/diagnostic/package.json b/packages/diagnostic/package.json
@@ -126,9 +126,5 @@
   "ember": {
     "edition": "octane"
   },
-  "dependenciesMeta": {
-    "@warp-drive/internal-config": {
-      "injected": true
-    }
-  }
+  "dependenciesMeta": {}
 }
diff --git a/packages/graph/package.json b/packages/graph/package.json
@@ -53,9 +53,6 @@
     "@warp-drive/core-types": {
       "injected": true
     },
-    "@warp-drive/internal-config": {
-      "injected": true
-    },
     "@ember-data/request": {
       "injected": true
     },

diff --git a/packages/holodeck/package.json b/packages/holodeck/package.json
@@ -90,9 +90,6 @@
     "@ember-data/request": {
       "injected": true
     },
-    "@warp-drive/internal-config": {
-      "injected": true
-    },
     "@warp-drive/core-types": {
       "injected": true
     }

diff --git a/packages/json-api/package.json b/packages/json-api/package.json
@@ -67,9 +67,6 @@
     "@ember-data/private-build-infra": {
       "injected": true
     },
-    "@warp-drive/internal-config": {
-      "injected": true
-    },
     "@warp-drive/core-types": {
       "injected": true
     },

diff --git a/packages/legacy-compat/package.json b/packages/legacy-compat/package.json
@@ -71,9 +71,6 @@
     "@ember-data/json-api": {
       "injected": true
     },
-    "@warp-drive/internal-config": {
-      "injected": true
-    },
     "@ember-data/store": {
       "injected": true
     },

diff --git a/packages/model/package.json b/packages/model/package.json
@@ -73,9 +73,6 @@
     "@ember-data/private-build-infra": {
       "injected": true
     },
-    "@warp-drive/internal-config": {
-      "injected": true
-    },
     "@ember-data/store": {
       "injected": true
     },

diff --git a/packages/request-utils/package.json b/packages/request-utils/package.json
@@ -83,9 +83,6 @@
   "dependenciesMeta": {
     "@warp-drive/core-types": {
       "injected": true
-    },
-    "@warp-drive/internal-config": {
-      "injected": true
     }
   }
 }
diff --git a/packages/request/package.json b/packages/request/package.json
@@ -57,9 +57,6 @@
     },
     "@warp-drive/core-types": {
       "injected": true
-    },
-    "@warp-drive/internal-config": {
-      "injected": true
     }
   },
   "devDependencies": {

diff --git a/packages/rest/package.json b/packages/rest/package.json
@@ -91,9 +91,6 @@
     "edition": "octane"
   },
   "dependenciesMeta": {
-    "@warp-drive/internal-config": {
-      "injected": true
-    },
     "@warp-drive/core-types": {
       "injected": true
     },

diff --git a/packages/serializer/package.json b/packages/serializer/package.json
@@ -55,9 +55,6 @@
     "@ember-data/private-build-infra": {
       "injected": true
     },
-    "@warp-drive/internal-config": {
-      "injected": true
-    },
     "@warp-drive/core-types": {
       "injected": true
     },

diff --git a/packages/store/package.json b/packages/store/package.json
@@ -58,9 +58,6 @@
     "@warp-drive/core-types": {
       "injected": true
     },
-    "@warp-drive/internal-config": {
-      "injected": true
-    },
     "@ember/string": {
       "injected": true
     }

diff --git a/packages/tracking/package.json b/packages/tracking/package.json
@@ -24,9 +24,6 @@
   "dependenciesMeta": {
     "@ember-data/private-build-infra": {
       "injected": true
-    },
-    "@warp-drive/internal-config": {
-      "injected": true
     }
   },
   "dependencies": {