From 8e7902aa7f38bb47b950b84a071ed5bfdbd9268e Mon Sep 17 00:00:00 2001
From: Tobias Berger <tobi.berger13@gmail.com>
Date: Thu, 14 Oct 2021 12:44:51 +0200
Subject: [PATCH 1/8] Create CI build script

---
 .drone.yml | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 .drone.yml

diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..c7fa611
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,37 @@
+kind: pipeline
+type: docker
+
+# Check if the game builds
+# If yes, test if everything is nice
+# If yes, deploy to vercel
+
+steps:
+- name: build-game
+  image: node
+  commands:
+  - yarn build:game
+- name: build-pwa
+  image: node
+  commands:
+  - yarn build:pwa
+- name: test
+  image: node
+  commands:
+  - yarn test
+  depends_on:
+  - build-game
+  - build-pwa
+- name: deploy (production)
+  image: dockette/vercel
+  commands:
+  - vercel -t $VERCEL_TOKEN --scope $VERCEL_SCOPE -c
+  when:
+    branch:
+    - main
+- name: deploy (preview)
+  image: dockette/vercel
+  commands:
+  - vercel -t $VERCEL_TOKEN --scope $VERCEL_SCOPE -c
+  when:
+    branch:
+    - "!main"

From 57afaba0f74858cc8b3115cd77829db9e90dea0f Mon Sep 17 00:00:00 2001
From: Tobias Berger <tobi.berger13@gmail.com>
Date: Thu, 14 Oct 2021 12:46:07 +0200
Subject: [PATCH 2/8] Update '.drone.yml'

---
 .drone.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index c7fa611..ffcba00 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,14 +6,22 @@ type: docker
 # If yes, deploy to vercel
 
 steps:
+- name: install
+  image: node
+  commands:
+  - yarn
 - name: build-game
   image: node
   commands:
   - yarn build:game
+  depends_on:
+  - install
 - name: build-pwa
   image: node
   commands:
   - yarn build:pwa
+  depends_on:
+  - install
 - name: test
   image: node
   commands:

From 645bf7367bc48cc214e09fff4b7509ca8b6e46ef Mon Sep 17 00:00:00 2001
From: Tobias Berger <tobi.berger13@gmail.com>
Date: Thu, 14 Oct 2021 12:54:04 +0200
Subject: [PATCH 3/8] Parallelize build script some more

Lint
Add .vercel to gitignore
---
 .drone.yml                                    | 96 ++++++++++++-------
 .gitignore                                    |  1 +
 public/manifest.json                          |  2 +-
 .../ResourceTable/ResourceGroup.svelte        |  2 -
 4 files changed, 61 insertions(+), 40 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index ffcba00..df93a7b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,40 +6,62 @@ type: docker
 # If yes, deploy to vercel
 
 steps:
-- name: install
-  image: node
-  commands:
-  - yarn
-- name: build-game
-  image: node
-  commands:
-  - yarn build:game
-  depends_on:
-  - install
-- name: build-pwa
-  image: node
-  commands:
-  - yarn build:pwa
-  depends_on:
-  - install
-- name: test
-  image: node
-  commands:
-  - yarn test
-  depends_on:
-  - build-game
-  - build-pwa
-- name: deploy (production)
-  image: dockette/vercel
-  commands:
-  - vercel -t $VERCEL_TOKEN --scope $VERCEL_SCOPE -c
-  when:
-    branch:
-    - main
-- name: deploy (preview)
-  image: dockette/vercel
-  commands:
-  - vercel -t $VERCEL_TOKEN --scope $VERCEL_SCOPE -c
-  when:
-    branch:
-    - "!main"
+  - name: install
+    image: node
+    commands:
+      - yarn
+  - name: build-game
+    image: node
+    commands:
+      - yarn build:game
+    depends_on:
+      - install
+  - name: build-pwa
+    image: node
+    commands:
+      - yarn build:pwa
+    depends_on:
+      - install
+  - name: prettier
+    image: node
+    commands:
+      - yarn lint:prettier:all
+    depends_on:
+      - build-game
+      - build-pwa
+  - name: eslint
+    image: node
+    commands:
+      - yarn lint:eslint --max-warnings=0
+    depends_on:
+      - build-game
+      - build-pwa
+  - name: check
+    image: node
+    commands:
+      - yarn check
+    depends_on:
+      - build-game
+      - build-pwa
+  - name: deploy (production)
+    image: dockette/vercel
+    commands:
+      - vercel -t $VERCEL_TOKEN --scope $VERCEL_SCOPE -c
+    when:
+      branch:
+        - main
+    depends_on:
+      - prettier
+      - eslint
+      - check
+  - name: deploy (preview)
+    image: dockette/vercel
+    commands:
+      - vercel -t $VERCEL_TOKEN --scope $VERCEL_SCOPE -c
+    when:
+      branch:
+        - "!main"
+    depends_on:
+      - prettier
+      - eslint
+      - check
diff --git a/.gitignore b/.gitignore
index affbdc8..6264d31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /node_modules/
 /public/build/
 /public/service-worker.js
+.vercel
diff --git a/public/manifest.json b/public/manifest.json
index c7828ed..48f6f72 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -53,4 +53,4 @@
   "display": "standalone",
   "background_color": "#536892",
   "theme_color": "#2e4372"
-}
\ No newline at end of file
+}
diff --git a/src/components/ResourceTable/ResourceGroup.svelte b/src/components/ResourceTable/ResourceGroup.svelte
index d886e73..ca2a6c2 100644
--- a/src/components/ResourceTable/ResourceGroup.svelte
+++ b/src/components/ResourceTable/ResourceGroup.svelte
@@ -1,8 +1,6 @@
 <svelte:options immutable />
 
 <script lang="ts">
-  import { fade } from "svelte/transition";
-
   import type { Resource } from "../../shark/data/Resources";
 
   export let categoryName: string;

From 146aee4e44573e179e292f1ad53e7ceb751da54f Mon Sep 17 00:00:00 2001
From: Tobias Berger <tobi.berger13@gmail.com>
Date: Thu, 14 Oct 2021 12:58:26 +0200
Subject: [PATCH 4/8] Fix preview builds

---
 .drone.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index df93a7b..37f0429 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -60,7 +60,8 @@ steps:
       - vercel -t $VERCEL_TOKEN --scope $VERCEL_SCOPE -c
     when:
       branch:
-        - "!main"
+        exclude:
+          - main
     depends_on:
       - prettier
       - eslint

From c6baf9b9686fc37ce7d9516547af8298af8a298a Mon Sep 17 00:00:00 2001
From: Tobias Berger <tobi.berger13@gmail.com>
Date: Thu, 14 Oct 2021 13:09:57 +0200
Subject: [PATCH 5/8] rename check script to type-check (yarn check is already
 a command)

fix tsconfig.json
fix pwa/service-worker.ts (svelte-check doesn't type `self` correctly)
---
 .drone.yml                |  8 ++++----
 package.json              |  8 ++++----
 src/pwa/service-worker.ts | 15 +++++++--------
 tsconfig.json             |  5 +++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 37f0429..96efd7d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -36,10 +36,10 @@ steps:
     depends_on:
       - build-game
       - build-pwa
-  - name: check
+  - name: type-check
     image: node
     commands:
-      - yarn check
+      - yarn type-check
     depends_on:
       - build-game
       - build-pwa
@@ -53,7 +53,7 @@ steps:
     depends_on:
       - prettier
       - eslint
-      - check
+      - type-check
   - name: deploy (preview)
     image: dockette/vercel
     commands:
@@ -65,4 +65,4 @@ steps:
     depends_on:
       - prettier
       - eslint
-      - check
+      - type-check
diff --git a/package.json b/package.json
index 2f74e74..4555ec6 100644
--- a/package.json
+++ b/package.json
@@ -13,9 +13,9 @@
     "dev:pwa": "yarn build:pwa -w",
     "start": "sirv public --no-clear",
     "preview": "yarn build && yarn start",
-    "check": "yarn check:game && yarn check:pwa",
-    "check:game": "svelte-check --tsconfig ./tsconfig.json",
-    "check:pwa": "svelte-check --tsconfig ./src/pwa/tsconfig.json",
+    "type-check": "yarn type-check:game && yarn type-check:pwa",
+    "type-check:game": "svelte-check --tsconfig ./tsconfig.json",
+    "type-check:pwa": "svelte-check --tsconfig ./src/pwa/tsconfig.json",
     "lint": "yarn lint:prettier && yarn lint:eslint",
     "lint:prettier": "pretty-quick --ignore-path .gitignore --check --plugin-search-dir=. .",
     "lint:prettier:all": "prettier --ignore-path .gitignore --check --plugin-search-dir=. .",
@@ -24,7 +24,7 @@
     "fix:prettier": "pretty-quick --ignore-path .gitignore --write --plugin-search-dir=. .",
     "fix:prettier:all": "prettier --ignore-path .gitignore --write --plugin-search-dir=. .",
     "fix:eslint": "eslint --fix --ignore-path .gitignore ./src/",
-    "test": "yarn lint:prettier:all && yarn lint:eslint --max-warnings=0 && yarn check"
+    "test": "yarn lint:prettier:all && yarn lint:eslint --max-warnings=0 && yarn type-check"
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^13.0.5",
diff --git a/src/pwa/service-worker.ts b/src/pwa/service-worker.ts
index 2703c97..cfc4f6d 100644
--- a/src/pwa/service-worker.ts
+++ b/src/pwa/service-worker.ts
@@ -5,7 +5,7 @@ const STATIC_CACHE_NAME = CACHE_NAME + "-" + CACHE_VERSION;
 const INITIAL_FILES_TO_CACHE = ["/", "/index.html", "/build/bundle.js", "/build/bundle.css", "/favicon.png"];
 const CACHE_DENYLIST = ["/manifest.json", "/service-worker.js", "livereload.js"];
 
-const globalScope = self as WorkerGlobalScope as ServiceWorkerGlobalScope;
+const globalScope = self as unknown /* as WorkerGlobalScope */ as ServiceWorkerGlobalScope;
 
 globalScope.addEventListener("install", (event) => {
   console.debug("[ServiceWorker] Install");
@@ -41,13 +41,12 @@ globalScope.addEventListener("fetch", (event) => {
   const path = new URL(event.request.url).pathname;
   console.debug("[ServiceWorker] Fetch", event.request.url, "==", path);
 
-  function getFromFetch(cache: Cache) {
-    return fetch(event.request).then((response) => {
-      if (!CACHE_DENYLIST.includes(path)) {
-        cache.put(path, response.clone());
-      }
-      return response;
-    });
+  async function getFromFetch(cache: Cache) {
+    const response = await fetch(event.request);
+    if (!CACHE_DENYLIST.includes(path)) {
+      cache.put(path, response.clone());
+    }
+    return response;
   }
 
   async function getFromCache() {
diff --git a/tsconfig.json b/tsconfig.json
index 4e10601..af7da68 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,9 +2,10 @@
   "extends": "@tsconfig/svelte/tsconfig.json",
   "target": "es2021",
   "include": ["src/**/*"],
-  "exclude": ["src/service-worker.ts"],
+  "exclude": ["src/pwa/**"],
   "compilerOptions": {
     "strict": true,
-    "isolatedModules": false
+    "isolatedModules": false,
+    "useDefineForClassFields": true
   }
 }

From 59457a6bce96768d4764ee9bf3388e7c2ee788c9 Mon Sep 17 00:00:00 2001
From: Tobias Berger <tobi.berger13@gmail.com>
Date: Thu, 14 Oct 2021 13:22:00 +0200
Subject: [PATCH 6/8] Fix pwa build config

---
 pwa.rollup.config.mjs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pwa.rollup.config.mjs b/pwa.rollup.config.mjs
index 27ba2a0..cabae7b 100644
--- a/pwa.rollup.config.mjs
+++ b/pwa.rollup.config.mjs
@@ -10,10 +10,7 @@ export default {
     preferConst: true,
     strict: true,
   },
-  plugins: [
-    typescript({ sourceMap: false, include: "**/service-worker.ts", lib: ["WebWorker"] }),
-    production && terser({ output: { comments: false } }),
-  ],
+  plugins: [typescript({ tsconfig: "src/pwa/tsconfig.json" }), production && terser({ output: { comments: false } })],
   watch: {
     clearScreen: false,
   },

From 674aa3726ce8e7a677e2bf6783453df512de86c2 Mon Sep 17 00:00:00 2001
From: Tobias Berger <tobi.berger13@gmail.com>
Date: Thu, 14 Oct 2021 13:24:57 +0200
Subject: [PATCH 7/8] Set environment variables for publish

---
 .drone.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index 96efd7d..873e8d2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -45,6 +45,11 @@ steps:
       - build-pwa
   - name: deploy (production)
     image: dockette/vercel
+    environment:
+      VERCEL_TOKEN:
+        from_secret: VERCEL_TOKEN
+      VERCEL_SCOPE:
+        from_secret: VERCEL_SCOPE
     commands:
       - vercel -t $VERCEL_TOKEN --scope $VERCEL_SCOPE -c
     when:
@@ -56,6 +61,11 @@ steps:
       - type-check
   - name: deploy (preview)
     image: dockette/vercel
+    environment:
+      VERCEL_TOKEN:
+        from_secret: VERCEL_TOKEN
+      VERCEL_SCOPE:
+        from_secret: VERCEL_SCOPE
     commands:
       - vercel -t $VERCEL_TOKEN --scope $VERCEL_SCOPE -c
     when:

From ff2414a319d7142b8c644b99d6617464056b5016 Mon Sep 17 00:00:00 2001
From: Tobias Berger <tobi.berger13@gmail.com>
Date: Thu, 14 Oct 2021 13:29:44 +0200
Subject: [PATCH 8/8] rename workspace

---
 .drone.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index 873e8d2..708a691 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,6 +1,9 @@
 kind: pipeline
 type: docker
 
+workspace:
+  path: /drone/svelte-sharg
+
 # Check if the game builds
 # If yes, test if everything is nice
 # If yes, deploy to vercel