tachyon integration wip

beyond-all-reason · Jan 9, 2024 · 38cea43 · 38cea43
1 parent 6b9d370
commit 38cea43
Show file tree

Hide file tree

Showing 19 changed files with 1,343 additions and 1,016 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,6 +4,9 @@ module.exports = {
         node: true,
         browser: true,
     },
+    globals: {
+        "NodeJS": true
+    },
     ignorePatterns: ["typed-router.d.ts"],
     rules: {
         // Rules should only be added here for testing temporarily and should eventually be moved into jaz-ts-utils to ensure consistency across projects

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,13 +1,10 @@
 {
     "recommendations": [
-        "vue.volar",
+        "Vue.volar",
+        "Vue.vscode-typescript-vue-plugin",
         "dbaeumer.vscode-eslint",
         "drknoxy.eslint-disable-snippets",
         "esbenp.prettier-vscode",
         "mrmlnc.vscode-scss"
-    ],
-    "unwantedRecommendations": [
-        "octref.vetur",
-        "vscode.typescript-language-features" // https://github.com/johnsoncodehk/volar/discussions/471
     ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,12 +1,9 @@
 {
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
+        "source.fixAll.eslint": "explicit"
     },
-    "eslint.validate": [
-        "typescript",
-        "vue"
-    ],
+    "eslint.validate": ["typescript", "vue"],
     "[typescript]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
@@ -15,5 +12,7 @@
     },
     "[vue]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
-    }
-}
+    },
+    "typescript.tsdk": "node_modules/typescript/lib",
+    "typescript.preferences.importModuleSpecifier": "non-relative"
+}
diff --git a/electron.vite.config.ts b/electron.vite.config.ts
@@ -63,22 +63,19 @@ export default defineConfig({
             }),
             vue(),
             renderer({
-                nodeIntegration: true,
-                optimizeDeps: {
-                    include: [
-                        { name: "path", type: "commonjs" },
-                        { name: "fs", type: "commonjs" },
-                        { name: "child_process", type: "commonjs" },
-                        { name: "stream", type: "commonjs" },
-                        { name: "os", type: "commonjs" },
-                        { name: "node-fetch", type: "module" },
-                        { name: "spring-map-parser", type: "commonjs" },
-                        { name: "better-sqlite3", type: "commonjs" },
-                        { name: "tachyon-client", type: "commonjs" },
-                        { name: "octokit", type: "commonjs" },
-                        { name: "axios", type: "commonjs" },
-                        { name: "glob-promise", type: "commonjs" },
-                    ],
+                resolve: {
+                    "better-sqlite3": {
+                        type: "esm",
+                    },
+                    "tachyon-client": {
+                        type: "cjs",
+                    },
+                    "tachyon-protocol": {
+                        type: "cjs",
+                    },
+                    ws: {
+                        type: "esm",
+                    },
                 },
             }),
         ],