prettier, eslint-import-resolver-typescript (#347)

Author: mbostock

.eslintrc.json

@@ -3,15 +3,20 @@
     "eslint:recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:import/recommended",
-    "plugin:prettier/recommended"
+    "plugin:import/typescript",
+    "prettier"
   ],
+  "settings": {
+    "import/parsers": {
+      "@typescript-eslint/parser": [".ts"]
+    },
+    "import/resolver": {
+      "typescript": true,
+      "node": true
+    }
+  },
   "plugins": ["@typescript-eslint", "import"],
   "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "ecmaVersion": 2020,
-    "project": "./tsconfig.json",
-    "sourceType": "module"
-  },
   "env": {
     "es2020": true,
     "node": true
@@ -27,7 +32,6 @@
     "import/no-duplicates": "off",
     "import/no-import-module-exports": "warn",
     "import/no-relative-packages": "warn",
-    "import/no-unresolved": "off",
     "import/no-unused-modules": "error",
     "import/order": [
       "warn",
@@ -44,19 +48,8 @@
     "no-sparse-arrays": 0,
     "no-unexpected-multiline": 0,
     "object-shorthand": ["warn", "always"],
-    "prettier/prettier": ["warn", {"embeddedLanguageFormatting": "off"}],
     "sort-imports": ["warn", {"ignoreDeclarationSort": true}],
     "quotes": ["warn", "double", {"avoidEscape": true}]
   },
-  "overrides": [
-    {
-      "files": ["public/**"],
-      "env": {
-        "es2020": true,
-        "node": false,
-        "browser": true
-      }
-    }
-  ],
   "root": true
 }

.github/workflows/test.yml

@@ -21,6 +21,7 @@ jobs:
       - run: |
           echo ::add-matcher::.github/eslint.json
           yarn run eslint src test --format=compact
+      - run: yarn test:prettier
       - uses: actions/upload-artifact@v3
         if: failure()
         with:

package.json

@@ -25,10 +25,11 @@
     "dev": "tsx watch ./bin/observable.ts preview",
     "build": "rm -rf dist && ./bin/observable.ts build",
     "deploy": "./bin/observable.ts deploy",
-    "test": "yarn test:mocha && yarn test:tsc && yarn test:lint",
+    "test": "yarn test:mocha && yarn test:tsc && yarn test:lint && yarn test:prettier",
     "test:coverage": "c8 yarn test:mocha",
     "test:mocha": "rm -rf test/.observablehq/cache test/input/build/*/.observablehq/cache && tsx --no-warnings=ExperimentalWarning ./node_modules/.bin/mocha 'test/**/*-test.*'",
     "test:lint": "eslint src test",
+    "test:prettier": "prettier --check src test",
     "test:tsc": "tsc --noEmit",
     "observable": "tsx ./bin/observable.ts"
   },
@@ -83,9 +84,9 @@
     "d3-array": "^3.2.4",
     "d3-dsv": "^3.0.1",
     "eslint": "^8.50.0",
-    "eslint-config-prettier": "^9.0.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-prettier": "^5.0.0",
     "mocha": "^10.2.0",
     "prettier": "^3.0.3 <3.1",
     "typescript": "^5.2.2",

src/client/.eslintrc.json

@@ -1,5 +1,8 @@
 {
   "env": {
     "browser": true
+  },
+  "rules": {
+    "import/no-unresolved": [2, {"ignore": ["^npm:", "^observablehq:"]}]
   }
 }

src/html.ts

@@ -1,3 +1,4 @@
+/* eslint-disable import/no-named-as-default-member */
 import he from "he";
 
 /**

src/info.ts

@@ -1,3 +1,4 @@
+/* eslint-disable import/no-named-as-default-member */
 import he from "he";
 
 const //

test/preview/dashboard/404.md

@@ -1 +1 @@
-# 404 page
+# 404 page

test/preview/dashboard/code/code.md

@@ -7,11 +7,10 @@
   This text is not visible by default.
 </details>
 
-
 # Graphviz
 
 ```dot echo
-  strict graph { 
+  strict graph {
     a -- b
     a -- b
     b -- a [color=blue]
@@ -23,4 +22,3 @@
 ```tex
 E = mc^2
 ```
-

test/preview/dashboard/index.md

@@ -1,6 +1,7 @@
 # Index
 
 ```js
-import formatTitle from "./format.js"
-display(formatTitle('index'));
-```
+import formatTitle from "./format.js";
+
+display(formatTitle("index"));
+```

tsconfig.json

@@ -1,17 +1,12 @@
 {
-  "$schema": "https://json.schemastore.org/tsconfig",
-  "display": "Node LTS",
-  "_version": "18.1.0",
   "compilerOptions": {
     "noImplicitAny": false,
-    "lib": ["es2023", "DOM.Iterable"],
-    "module": "node16",
-    "target": "es2022",
+    "lib": ["ES2023", "DOM.Iterable"],
+    "module": "Node16",
+    "target": "ES2022",
     "strict": true,
     "esModuleInterop": true,
     "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "moduleResolution": "node16",
     "resolveJsonModule": true
   }
 }