From 94ccdca6f98fd1184e5fd1c3bfc41ca09d327778 Mon Sep 17 00:00:00 2001
From: Aby <aby@scooterinteractive.com>
Date: Fri, 25 Mar 2022 10:35:10 +0800
Subject: [PATCH 1/4] Fixes #22

---
 files/entry.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/entry.js b/files/entry.js
index 480d6d1..fe0657e 100644
--- a/files/entry.js
+++ b/files/entry.js
@@ -1,6 +1,6 @@
 import path from 'node:path';
 // eslint-disable-next-line camelcase
-import {__fetch_polyfill} from '@sveltejs/kit/install-fetch';
+import {installFetch} from '@sveltejs/kit/install-fetch';
 import {getRequest, setResponse} from '@sveltejs/kit/node';
 import compression from 'compression';
 import {manifest} from 'MANIFEST';
@@ -8,7 +8,7 @@ import polka from 'polka';
 import sirv from 'sirv';
 import {Server} from 'SERVER';
 
-__fetch_polyfill();
+installFetch();
 
 const app = new Server(manifest);
 

From d60c5c5d1cd2da5c8ef93cff875f339712ae0dcb Mon Sep 17 00:00:00 2001
From: Jonas Jongejan <jongejan@google.com>
Date: Sat, 26 Mar 2022 11:12:34 -0400
Subject: [PATCH 2/4] chore: Remove unused eslint-disable

---
 files/entry.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/files/entry.js b/files/entry.js
index fe0657e..a8be037 100644
--- a/files/entry.js
+++ b/files/entry.js
@@ -1,5 +1,4 @@
 import path from 'node:path';
-// eslint-disable-next-line camelcase
 import {installFetch} from '@sveltejs/kit/install-fetch';
 import {getRequest, setResponse} from '@sveltejs/kit/node';
 import compression from 'compression';

From f7097eee6d4814ed81ace01bb03fa839c2414a2d Mon Sep 17 00:00:00 2001
From: Jonas Jongejan <jongejan@google.com>
Date: Sat, 26 Mar 2022 11:12:45 -0400
Subject: [PATCH 3/4] chore: fix issue in integration tests

---
 tests/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test.sh b/tests/test.sh
index 11426f2..6252113 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -16,8 +16,8 @@ pushd $TEST_DIR
 
 set -e
 
-npm i
 npm i "${SCRIPT_PATH}/../"
+npm i
 
 # These are peer dependencies that need manual install since we install from folder instead of from npm registry
 npm install polka@1.0.0-next.22 compression@^1.7.4 sirv@^2.0.2

From 885b03d2f97378836b6821161480f0a54c43ecd0 Mon Sep 17 00:00:00 2001
From: Jonas Jongejan <jongejan@google.com>
Date: Sat, 26 Mar 2022 11:17:05 -0400
Subject: [PATCH 4/4] refactor!: Update to support sveltekit >= 292

---
 index.js                | 12 +++++-------
 tests/expected_app.yaml |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/index.js b/index.js
index e224779..1a0cfda 100644
--- a/index.js
+++ b/index.js
@@ -26,9 +26,7 @@ export default function entrypoint() {
       const relativePath = posix.relative(temporary, builder.getServerDirectory());
 
       builder.log.minor('Prerendering static pages');
-      const prerenderedPaths = await builder.prerender({
-        dest: `${dir}/storage`,
-      });
+      builder.writePrerendered(`${dir}/storage`);
 
       // Copy server handler
       builder.copy(files, temporary, {replace: {
@@ -53,14 +51,14 @@ export default function entrypoint() {
 
       writeFileSync(`${dir}/package.json`, JSON.stringify({type: 'commonjs'}));
 
-      const prerenderedPages = Array.from(prerenderedPaths.pages, ([src, page]) => ({
+      const prerenderedPages = Array.from(builder.prerendered.pages, ([src, page]) => ({
         url: src + '/?$',
         // eslint-disable-next-line camelcase
         static_files: 'storage/' + page.file,
         upload: 'storage/' + page.file,
       }));
 
-      const prerenderedRedirects = Array.from(prerenderedPaths.redirects, ([src, _]) => ({
+      const prerenderedRedirects = Array.from(builder.prerendered.redirects, ([src, _]) => ({
         url: src,
         secure: 'always',
         script: 'auto',
@@ -78,9 +76,9 @@ export default function entrypoint() {
         ...prerenderedPages,
         ...prerenderedRedirects,
         {
-          url: `/${builder.appDir}/`,
+          url: `/${builder.config.kit.appDir}/`,
           // eslint-disable-next-line camelcase
-          static_dir: `storage/${builder.appDir}`,
+          static_dir: `storage/${builder.config.kit.appDir}`,
           expiration: '30d 0h',
         },
         {
diff --git a/tests/expected_app.yaml b/tests/expected_app.yaml
index bc77cd2..93900f5 100644
--- a/tests/expected_app.yaml
+++ b/tests/expected_app.yaml
@@ -11,7 +11,7 @@ handlers:
   - url: /about/?$
     static_files: storage/about.html
     upload: storage/about.html
-  - url: /_app/.+
+  - url: /_app/
     static_dir: storage/_app
     expiration: 30d 0h
   - url: /.*