upgrade to vite

esphas · Jun 23, 2022 · 1ca793a · 1ca793a
1 parent 0734700
commit 1ca793a
Show file tree

Hide file tree

Showing 24 changed files with 2,954 additions and 2,540 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 /node_modules/
-/public/build/
+dist
+dev-dist
 
 .DS_Store
 _test/
diff --git a/.prettierignore b/.prettierignore
@@ -1,4 +1,5 @@
 /_test/
-/public/build/
+/dist/
+/dev-dist/
 /generate-color-css.js
 /public/global.css
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -1,4 +1,4 @@
 {
-  "svelteBracketNewLine": false,
+  "bracketSameLine": true,
   "svelteIndentScriptAndStyle": false
 }
diff --git a/fetch-fixtures.js b/fetch-fixtures.js
@@ -1,11 +1,15 @@
-const fs = require("fs/promises");
-const { createWriteStream, createReadStream } = require("fs");
-const crypto = require("crypto");
-const { buildNum, sha } = require("./_test/all.meta.json");
+import * as fs from "fs/promises";
+import { createWriteStream, createReadStream, readFileSync } from "fs";
+import * as crypto from "crypto";
+import * as url from "url";
+const { buildNum, sha } = JSON.parse(
+  readFileSync("./_test/all.meta.json", "utf8")
+);
 const update = process.argv[2] === "latest";
 const dataUrl = `https://raw.githubusercontent.com/nornagon/cdda-data/main/data/${
   update ? "latest" : buildNum
 }/all.json`;
+const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 
 function computeSha(file) {
   return new Promise((resolve) => {

diff --git a/public/index.html → index.html b/public/index.html → index.html
@@ -5,18 +5,15 @@
     <meta name="viewport" content="width=device-width,initial-scale=1" />
     <meta
       property="og:title"
-      content="The Hitchhiker's Guide to the Cataclysm"
-    />
+      content="The Hitchhiker's Guide to the Cataclysm" />
 
     <title>The Hitchhiker's Guide to the Cataclysm</title>
 
-    <link rel="icon" type="image/png" href="favicon.png" />
-    <link rel="stylesheet" href="global.css" />
-    <link rel="stylesheet" href="build/bundle.css" />
-    <link rel="manifest" href="manifest.json" />
+    <link rel="icon" type="image/png" href="/favicon.png" />
+    <link rel="stylesheet" href="/global.css" />
     <link rel="apple-touch-icon" href="icon-192.png" />
 
-    <script defer src="build/bundle.js"></script>
+    <script type="module" defer src="/src/main.ts"></script>
   </head>
 
   <body></body>

diff --git a/package.json b/package.json
@@ -1,10 +1,12 @@
 {
   "name": "svelte-app",
   "version": "1.0.0",
+  "private": true,
+  "type": "module",
   "scripts": {
-    "build": "rollup -c",
-    "dev": "rollup -c -w",
-    "start": "sirv public",
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview",
     "validate": "svelte-check",
     "test": "node fetch-fixtures.js && npm run lint && npm run validate && jest src",
     "test:latest": "node fetch-fixtures.js latest && npm run validate && jest src",
@@ -14,50 +16,39 @@
     "lint": "prettier -c .",
     "lint:fix": "prettier -w .",
     "precommit": "lint-staged",
-    "prepare": "husky install"
+    "prepare": "husky install",
+    "check": "svelte-check --tsconfig ./tsconfig.json"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^17.0.0",
-    "@rollup/plugin-node-resolve": "^11.0.0",
-    "@rollup/plugin-typescript": "^8.0.0",
-    "@sentry/browser": "^6.2.1",
-    "@sentry/tracing": "^6.2.1",
+    "@fontsource/unifont": "^4.5.5",
+    "@sentry/browser": "^7.2.0",
+    "@sentry/tracing": "^7.2.0",
+    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.30",
     "@testing-library/jest-dom": "^5.11.9",
     "@testing-library/svelte": "^3.0.3",
-    "@tsconfig/svelte": "^1.0.0",
+    "@tsconfig/svelte": "^2.0.1",
     "@types/jest": "^26.0.20",
     "@types/node": "^14.14.31",
     "@types/node-fetch": "^2.5.8",
     "ajv": "^8",
     "babel-jest": "^26.6.3",
-    "fuzzysort": "^1.1.4",
+    "fuzzysort": "^2.0.1",
     "gh-pages": "^3.1.0",
     "husky": "^7.0.4",
     "jest": "^26.6.3",
     "lint-staged": "^12.3.2",
     "node-fetch": "^2.6.1",
-    "postcss": "^8.3.6",
-    "postcss-url": "^10.1.3",
     "prettier": "^2.3.2",
     "prettier-plugin-svelte": "^2.4.0",
-    "rollup": "^2.3.4",
-    "rollup-plugin-css-only": "^3.1.0",
-    "rollup-plugin-livereload": "^2.0.0",
-    "rollup-plugin-postcss": "^4.0.1",
-    "rollup-plugin-svelte": "^7.0.0",
-    "rollup-plugin-terser": "^7.0.0",
-    "svelte": "^3.0.0",
-    "svelte-check": "^1.0.0",
+    "svelte": "^3.44.0",
+    "svelte-check": "^2.2.7",
     "svelte-jester": "^1.3.0",
-    "svelte-preprocess": "^4.6.9",
-    "ts-jest": "^26.5.3",
-    "tslib": "^2.0.0",
-    "typescript": "^4.0.0",
-    "typescript-json-schema": "^0.50.0"
-  },
-  "dependencies": {
-    "@fontsource/unifont": "^4.5.1",
-    "sirv-cli": "^1.0.0"
+    "svelte-preprocess": "^4.9.8",
+    "tslib": "^2.3.1",
+    "typescript": "^4.5.4",
+    "typescript-json-schema": "^0.50.0",
+    "vite": "^2.9.9",
+    "vite-plugin-pwa": "^0.12.0"
   },
   "jest": {
     "transform": {

diff --git a/public/manifest.json b/public/manifest.json
diff --git a/public/service-worker.js b/public/service-worker.js
diff --git a/rollup.config.js b/rollup.config.js