switch to netlify adapter (#32)

* update deps

* update server const

* add router/hydrate consts

* try to set up netlify adapter

* remove adapter-static

* try prerendering pieces

* add netlify.toml

* try fixing func issue

sveltejs/kit#2687 (comment)

* Revert "try fixing func issue"

This reverts commit 47346d9.

nvm, going to do this sveltejs/kit#2687 (comment)

* add netlify local dev command

* methinks this will work, just manually copy over stuff

* try including files in functions

* don't need to copy anymore

* use old node compatible replaceAll

* disable client side router globally

why isn't this working?

.github/workflows/main.yml

@@ -23,15 +23,15 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: "16"
 
       # Runs a single command using the runners shell
       - name: cypress
         uses: cypress-io/github-action@v2
         with:
           record: true
-          build: yarn export
-          start: yarn serve -l 3000 build/
+          build: yarn build
+          start: yarn preview
           browser: electron
         env:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}

netlify.toml

@@ -0,0 +1,6 @@
+[build]
+  command = "yarn build"
+  publish = "build"
+
+[functions]
+  included_files = ["pieces/**"]

package.json

@@ -1,51 +1,53 @@
 {
-  "name": "writing",
-  "description": "zach's writing",
-  "version": "0.0.1",
-  "type": "module",
-  "scripts": {
-    "dev": "svelte-kit dev",
-    "export": "svelte-kit build",
-    "start": "node build",
-    "validate": "svelte-check",
-    "new": "node scripts/newPiece.js"
-  },
-  "cypress-cucumber-preprocessor": {
-    "nonGlobalStepDefinitions": true
-  },
-  "dependencies": {
-    "directory-tree": "^2.2.5",
-    "yaml": "^1.10.0"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.0.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
-    "@babel/plugin-transform-runtime": "^7.0.0",
-    "@babel/preset-env": "^7.0.0",
-    "@babel/runtime": "^7.0.0",
-    "@rollup/plugin-babel": "^5.0.0",
-    "@rollup/plugin-commonjs": "^14.0.0",
-    "@rollup/plugin-node-resolve": "^8.0.0",
-    "@rollup/plugin-replace": "^2.2.0",
-    "@rollup/plugin-typescript": "^6.0.0",
-    "@sveltejs/adapter-static": "^1.0.0-next.21",
-    "@sveltejs/kit": "^1.0.0-next.196",
-    "@tsconfig/svelte": "^2.0.1",
-    "@types/compression": "^1.7.0",
-    "@types/node": "^14.11.1",
-    "@types/polka": "^0.5.1",
-    "cypress": "^9.0.0",
-    "cypress-cucumber-preprocessor": "^4.3.0",
-    "node-fetch": "^3.1.0",
-    "rollup": "^2.3.4",
-    "rollup-plugin-svelte": "^6.0.0",
-    "rollup-plugin-terser": "^7.0.0",
-    "serve": "^13.0.2",
-    "svelte": "^3.44.2",
-    "svelte-check": "^2.2.4",
-    "svelte-preprocess": "^4.7.4",
-    "tslib": "^2.0.1",
-    "typescript": "^4.0.3",
-    "vite": "^2.3.7"
-  }
-}
+    "name": "writing",
+    "description": "zach's writing",
+    "version": "0.0.1",
+    "type": "module",
+    "scripts": {
+        "dev": "svelte-kit dev",
+        "build": "svelte-kit build",
+        "preview": "svelte-kit preview",
+        "netlify": "netlify dev -d build/ -f ./netlify/functions-internal",
+        "start": "node build",
+        "validate": "svelte-check",
+        "new": "node scripts/newPiece.js"
+    },
+    "cypress-cucumber-preprocessor": {
+        "nonGlobalStepDefinitions": true
+    },
+    "dependencies": {
+        "@sveltejs/adapter-netlify": "^1.0.0-next.35",
+        "directory-tree": "^2.2.5",
+        "yaml": "^1.10.0"
+    },
+    "devDependencies": {
+        "@babel/core": "^7.0.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.0.0",
+        "@babel/plugin-transform-runtime": "^7.0.0",
+        "@babel/preset-env": "^7.0.0",
+        "@babel/runtime": "^7.0.0",
+        "@rollup/plugin-babel": "^5.0.0",
+        "@rollup/plugin-commonjs": "^14.0.0",
+        "@rollup/plugin-node-resolve": "^8.0.0",
+        "@rollup/plugin-replace": "^2.2.0",
+        "@rollup/plugin-typescript": "^6.0.0",
+        "@sveltejs/kit": "^1.0.0-next.201",
+        "@tsconfig/svelte": "^2.0.1",
+        "@types/compression": "^1.7.0",
+        "@types/node": "^14.11.1",
+        "@types/polka": "^0.5.1",
+        "cypress": "^9.0.0",
+        "cypress-cucumber-preprocessor": "^4.3.0",
+        "node-fetch": "^3.1.0",
+        "rollup": "^2.61.1",
+        "rollup-plugin-svelte": "^7.1.0",
+        "rollup-plugin-terser": "^7.0.0",
+        "serve": "^13.0.2",
+        "svelte": "^3.44.2",
+        "svelte-check": "^2.2.10",
+        "svelte-preprocess": "^4.9.8",
+        "tslib": "^2.0.1",
+        "typescript": "^4.0.3",
+        "vite": "^2.7.1"
+    }
+}

src/components/Directory.svelte

@@ -1,4 +1,7 @@
 <script context="module" lang="ts">
+  export const router = false;
+  export const hydrate = false;
+
   // query params from apache index directory
   type Sort = {
     column:
@@ -141,7 +144,7 @@
     </tbody>
   </table>
   <address>
-    {directory.meta.description || "SvelteKit/1.0.0-next.196 Server"}
+    {directory.meta.description || "SvelteKit/1.0.0-next.201 Server"}
   </address>
 </div>
 

src/components/Piece.svelte

@@ -1,3 +1,8 @@
+<script context="module" lange="ts">
+  export const router = false;
+  export const prerender = true;
+</script>
+
 <script lang="ts">
   import BookPlaylist from "../plugins/BookPlaylist.svelte";
   import {

src/routes/_pieces.ts

@@ -274,6 +274,19 @@ export function find(
   return find(found, slug.slice(1));
 }
 
+// a very bad replacement for node 16 string.replaceAll
+function replaceAll(str: string, regex: RegExp, replacer: (substring: string, ...args: any[]) => string): string {
+  let prev = str;
+  for (let i = 0; i < 1000; i++) {
+    let curr = prev.replace(regex, replacer);
+    if (prev === curr) {
+      return curr;
+    }
+    prev = curr;
+  }
+  throw new Error("we may be recurring")
+}
+
 // ideally this would go in the svelte code, i guess? but i want this preprocessing
 // to always happen on the backend, or, more specifically, i don't want it to happen
 // on the browser.
@@ -284,15 +297,16 @@ export function processScene(scene: Scene): ProcessedScene {
 
   scene.sections.forEach((section) => {
     let index = 0;
-    let content = section.content.replaceAll(
+    let content = replaceAll(
+      section.content,
       footnoteRegex,
       (_, group): string => {
         index++;
         footnotes.push(group);
         return `<sup class="footnote-ref">${index}</sup>`;
       }
     );
-    content = content.replaceAll(/\*([^=*]+?)\*/g, "<i>$1</i>")
+    content = content.replace(/\*([^=*]+?)\*/g, "<i>$1</i>")
 
     processedSections.push({
       ...section,

svelte.config.js

@@ -1,11 +1,12 @@
-import adapter from '@sveltejs/adapter-static';
+import adapter from '@sveltejs/adapter-netlify';
 import preprocess from 'svelte-preprocess';
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
     kit: {
         adapter: adapter(),
-        target: '#svelte'
+        target: '#svelte',
+        router: false,
     },
     preprocess: preprocess(),
 };