fix: Small appyaml fixes (#57)

HalfdanJ · Oct 14, 2022 · d19cdfc · d19cdfc
2 parents 1f81546 + 83a792d
commit d19cdfc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/index.js b/index.js
@@ -20,8 +20,8 @@ export default function entrypoint(options = {}) {
       builder.rimraf(temporary);
 
       builder.log.minor('Copying assets');
-      builder.writeClient(`${out}/storage`);
-      builder.writePrerendered(`${out}/storage`);
+      builder.writeClient(`${out}/storage${builder.config.kit.paths.base}`);
+      builder.writePrerendered(`${out}/storage${builder.config.kit.paths.base}`);
 
       const relativePath = posix.relative(temporary, builder.getServerDirectory());
 
@@ -56,6 +56,7 @@ export default function entrypoint(options = {}) {
         // eslint-disable-next-line camelcase
         static_files: 'storage/' + page.file,
         upload: 'storage/' + page.file,
+        secure: 'always',
       }));
 
       const prerenderedRedirects = Array.from(builder.prerendered.redirects, ([src, _]) => ({
@@ -80,11 +81,13 @@ export default function entrypoint(options = {}) {
           // eslint-disable-next-line camelcase
           static_dir: `storage/${builder.config.kit.appDir}/immutable`,
           expiration: '30d 0h',
+          secure: 'always',
         },
         {
           url: `/${builder.config.kit.appDir}/`,
           // eslint-disable-next-line camelcase
           static_dir: `storage/${builder.config.kit.appDir}`,
+          secure: 'always',
         },
         {
           url: '/.*',
@@ -103,6 +106,8 @@ export default function entrypoint(options = {}) {
           ...yaml,
           runtime: 'nodejs16',
           entrypoint: 'node index.js',
+          // eslint-disable-next-line camelcase
+          default_expiration: '0h',
           handlers: serverRoutes,
         }),
       );

diff --git a/tests/expected_app.yaml b/tests/expected_app.yaml
@@ -8,19 +8,25 @@ handlers:
   - url: //?$
     static_files: storage/index.html
     upload: storage/index.html
+    secure: always
   - url: /about/?$
     static_files: storage/about.html
     upload: storage/about.html
+    secure: always
   - url: /sverdle/how-to-play/?$
     static_files: storage/sverdle/how-to-play.html
     upload: storage/sverdle/how-to-play.html
+    secure: always
   - url: /_app/immutable/
     static_dir: storage/_app/immutable
     expiration: 30d 0h
+    secure: always
   - url: /_app/
     static_dir: storage/_app
+    secure: always
   - url: /.*
     secure: always
     script: auto
 runtime: nodejs16
 entrypoint: node index.js
+default_expiration: 0h