From 4a9bde379202a2c6b13ff8156e046c25043ea3bc Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Tue, 11 Oct 2022 19:36:12 -0700 Subject: [PATCH] revert name change from last commit --- packages/adapter-netlify/index.js | 2 +- packages/adapter-vercel/index.js | 2 +- packages/kit/src/core/adapt/builder.js | 2 +- packages/kit/types/index.d.ts | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/adapter-netlify/index.js b/packages/adapter-netlify/index.js index f09ba0418d3b..4c4bfac3be17 100644 --- a/packages/adapter-netlify/index.js +++ b/packages/adapter-netlify/index.js @@ -63,7 +63,7 @@ export default function ({ split = false, edge = edge_set_in_env_var } = {}) { builder.copy('_headers', headers_file); appendFileSync( headers_file, - `\n\n/${builder.getAppDirectory()}/immutable/*\n cache-control: public\n cache-control: immutable\n cache-control: max-age=31536000\n` + `\n\n/${builder.getAppPath()}/immutable/*\n cache-control: public\n cache-control: immutable\n cache-control: max-age=31536000\n` ); if (edge) { diff --git a/packages/adapter-vercel/index.js b/packages/adapter-vercel/index.js index b674b30145ca..d18d4342071e 100644 --- a/packages/adapter-vercel/index.js +++ b/packages/adapter-vercel/index.js @@ -118,7 +118,7 @@ export default function ({ external = [], edge, split } = {}) { ...redirects[builder.config.kit.trailingSlash], ...prerendered_redirects, { - src: `/${builder.getAppDirectory()}/.+`, + src: `/${builder.getAppPath()}/.+`, headers: { 'cache-control': 'public, immutable, max-age=31536000' } diff --git a/packages/kit/src/core/adapt/builder.js b/packages/kit/src/core/adapt/builder.js index 71c83ca860b9..c2a989b4fa77 100644 --- a/packages/kit/src/core/adapt/builder.js +++ b/packages/kit/src/core/adapt/builder.js @@ -128,7 +128,7 @@ export function create_builder({ config, build_data, routes, prerendered, log }) return config.kit.files.assets; }, - getAppDirectory() { + getAppPath() { return build_data.app_dir; }, diff --git a/packages/kit/types/index.d.ts b/packages/kit/types/index.d.ts index ad271307517f..f34854ca2e81 100644 --- a/packages/kit/types/index.d.ts +++ b/packages/kit/types/index.d.ts @@ -85,8 +85,8 @@ export interface Builder { getClientDirectory(): string; getServerDirectory(): string; getStaticDirectory(): string; - /** The application directory including any configured base path */ - getAppDirectory(): string; + /** The application path including any configured base path */ + getAppPath(): string; /** * @param dest the destination folder to which files should be copied