Merge pull request #95 from PSDTools/map-fixes

Add Upstream Infra Updates

Author: lishaduck

.github/workflows/main.yml

@@ -28,25 +28,25 @@ jobs:
         with:
           submodules: true
 
-      - name: Setup Node
-        uses: actions/[email protected]
-        with:
-          node-version: "16"
-          cache: "npm"
+      - name: Install bun
+        uses: oven-sh/setup-bun@v1
 
-      - name: Cache node_modules
-        id: cache-node_modules
-        uses: actions/[email protected]
+      - name: Cache
+        uses: actions/[email protected]
         with:
-          path: node_modules
-          key: node_modules-${{ hashFiles('package.json', 'package-lock.json') }}
+          path: |
+            .turbo
+            node_modules
+            ~/.bun/install/cache
+          key: ${{ runner.os }}-bun-turbo-${{ hashFiles('**/turbo.json') }}
 
-      - name: Install NPM Dependencies
-        if: steps.cache-node_modules.outputs.cache-hit != 'true'
-        run: npm ci
+      - name: Install dependencies
+        run: bun install --frozen-lockfile
 
-      - name: Vite Build
-        run: npm run build
+      - name: Lint & Build
+        # Use --bun once the next release is cut.
+        # Right now, bun is incorrectly parsing dotfiles.
+        run: bun run turbo build
 
       - name: Redirect 404 to Index for SPA
         run: cp dist/index.html dist/404.html

.nvmrc

@@ -4,3 +4,4 @@
 /artifacts/
 /coverage/
 .git/
+turbo.json

.prettierignore

@@ -1,12 +1,22 @@
 {
   "trailingComma": "all",
   "singleQuote": false,
-  "semicolon": true,
+  "semi": true,
+  "tabWidth": 2,
+  "useTabs": false,
   "endOfLine": "lf",
   "overrides": [
     {
-      "files": ".prettierrc",
-      "options": { "parser": "json" }
+      "files": [".prettierrc"],
+      "options": {
+        "parser": "json"
+      }
+    },
+    {
+      "files": ["tsconfig.json"],
+      "options": {
+        "trailingComma": "none"
+      }
     }
   ]
 }

.prettierrc

@@ -5,8 +5,6 @@
     "pwabuilder.pwa-studio",
     "esbenp.prettier-vscode",
     "davidanson.vscode-markdownlint",
-    "runem.lit-plugin",
-    "lit.lit-snippets",
     "swellaby.node-pack"
   ]
 }

.vscode/extensions.json

@@ -11,5 +11,6 @@
     "package.json": "package-lock.json",
     "REAME*": "*.${capture}"
   },
-  "cSpell.enableFiletypes": ["!typescript"]
+  "cSpell.enableFiletypes": ["!typescript"],
+  "prettier.prettierPath": "./node_modules/prettier/index.cjs"
 }

.vscode/settings.json

@@ -1,4 +1,5 @@
-import sheriff from "eslint-config-sheriff";
+// @ts-check
+import { sheriff } from "eslint-config-sheriff";
 import { defineFlatConfig } from "eslint-define-config";
 
 const sheriffOptions = {
@@ -7,32 +8,45 @@ const sheriffOptions = {
   next: false,
   playwright: false,
   jest: false,
-  vitest: true,
+  vitest: false,
+  pathsOveriddes: {
+    tsconfigLocation: [
+      "./tsconfig.json",
+      "./tsconfig.sw.json",
+      "./tsconfig.eslint.json",
+    ],
+    ignores: [
+      "**/node_modules/**",
+      "**/dist/**",
+      "**/dev-dist/**",
+      "**/build/**",
+      "**/.yarn/**",
+      "**/.pnp.*",
+    ],
+  },
 };
 
 export default defineFlatConfig([
   ...sheriff(sheriffOptions),
   {
+    files: ["**/*.ts"],
     rules: {
-      "storybook/default-exports": "off",
-      "storybook/prefer-pascal-case": "off",
       "padding-line-between-statements": "off",
       "@typescript-eslint/naming-convention": "off",
       "prefer-destructuring": "off",
       "unicorn/prefer-query-selector": "off",
       "func-style": ["error", "declaration", { allowArrowFunctions: true }],
       "no-plusplus": ["error", { allowForLoopAfterthoughts: true }],
       "operator-assignment": ["off", "always"],
-      "fp/no-class": "off",
       "@typescript-eslint/no-non-null-assertion": "off",
       "no-console": "warn",
-      "@typescript-eslint/no-unused-vars": [
-        "warn",
-        { argsIgnorePattern: "^_" },
+      "no-negated-condition": "off",
+      "unicorn/no-negated-condition": "error",
+      "@typescript-eslint/ban-ts-comment": [
+        "error",
+        { "ts-expect-error": true, "ts-check": false },
       ],
+      "import/no-unresolved": [2, { ignore: ["^virtual:"] }],
     },
   },
-  {
-    ignores: ["src/sw.ts"],
-  },
 ]);

bun.lockb

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en-us">
   <head>
     <meta charset="utf-8" />
@@ -20,22 +20,33 @@
     <!-- The overlay -->
     <div id="mySidenav" class="overlay">
       <!-- Button to close the overlay navigation -->
-      <a href="javascript:void(0)" class="closebtn"  onclick="toggleNav(false)"
+      <a href="javascript:void(0)" class="closebtn" onclick="toggleNav(false)"
         >&times;</a
       >
 
       <!-- Overlay content -->
       <form class="overlay-content text-white">
         <label>
-          <button type="submit" id="clearDataButton" style="background-color:#00d5ff; color: black;" onclick="clearData()">
+          <button
+            type="submit"
+            id="clearDataButton"
+            style="background-color: #00d5ff; color: black"
+            onclick="clearData()"
+          >
             Clear Grade Data
           </button>
           <p class="text-sm mt-4">Note: This action refreshes the page.</p>
         </label>
 
         <!-- <button id="darkModeButton" onclick="darkMode()">Dark Mode</button> -->
         <p></p>
-        <button type="submit" style="background-color:#00d5ff; color: black;" onclick="clearAll()">Clear All Site Data</button>
+        <button
+          type="submit"
+          style="background-color: #00d5ff; color: black"
+          onclick="clearAll()"
+        >
+          Clear All Site Data
+        </button>
         <p></p>
       </form>
     </div>
@@ -48,7 +59,7 @@
           type="button"
           onclick="toggleNav(true)"
           class="pb-8 text-xl text-white rounded-full w-8 h-8"
-          style="background-color:#00d5ff; color: black;"
+          style="background-color: #00d5ff; color: black"
         >
           ☰
         </button>
@@ -149,8 +160,8 @@ <h5>How to use!</h5>
           />
           <button
             onclick="classAmount()"
-            class=" text-black px-1 rounded-sm"
-            style="background-color:#00d5ff; color: black;"
+            class="text-black px-1 rounded-sm"
+            style="background-color: #00d5ff; color: black"
             type="submit"
           >
             Submit