fix: missed rename of hostingSite to target, bump kit for types (#149)

jthegedus · Oct 10, 2021 · cebf821 · cebf821
1 parent d000b98
commit cebf821
Show file tree

Hide file tree

Showing 7 changed files with 190 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -87,7 +87,8 @@ the Adapter and SvelteKit becoming incompatible. Here is a compatibility table:
 
 | Adapter Version | SvelteKit Version    |
 | --------------- | -------------------- |
-| `0.13.x`        | `1.0.0-next.168`     |
+| `0.13.1`        | `1.0.0-next.180`     |
+| `0.13.0`        | `1.0.0-next.168`     |
 | `0.12.x`        | `1.0.0-next.165`     |
 | `0.11.x`        | `1.0.0-next.155`     |
 | `NA`            | `1.0.0-next.152-154` |

diff --git a/package.json b/package.json
@@ -41,10 +41,10 @@
     "esbuild": "^0.12.28"
   },
   "peerDependencies": {
-    "@sveltejs/kit": "^1.0.0-next.168"
+    "@sveltejs/kit": "^1.0.0-next.180"
   },
   "devDependencies": {
-    "@sveltejs/kit": "^1.0.0-next.168",
+    "@sveltejs/kit": "^1.0.0-next.180",
     "@types/express": "^4.17.13",
     "@types/node": "^14.17.15",
     "ava": "^3.15.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/index.d.ts b/src/index.d.ts
@@ -4,7 +4,7 @@ import {BuildOptions} from 'esbuild';
 type AdapterOptions = {
 	esbuildOptions?: (defaultOptions: BuildOptions) => Promise<BuildOptions> | BuildOptions;
 	firebaseJsonPath?: string;
-	hostingSite?: string;
+	target?: string;
 	sourceRewriteMatch?: string;
 };
 

diff --git a/src/index.js b/src/index.js
@@ -18,12 +18,12 @@ const entrypoint = function (options = {}) {
 			const {
 				esbuildOptions = undefined,
 				firebaseJsonPath = 'firebase.json',
-				hostingSite = undefined,
+				target = undefined,
 				sourceRewriteMatch = '**',
 			} = options;
 
 			utils.log.minor(`Adapter configuration:\n\t${JSON.stringify(options)}`);
-			const {functions, publicDir} = parseFirebaseConfiguration({firebaseJsonPath, hostingSite, sourceRewriteMatch});
+			const {functions, publicDir} = parseFirebaseConfiguration({firebaseJsonPath, target, sourceRewriteMatch});
 			ensureStaticResourceDirsDiffer({source: path.join(process.cwd(), config.kit.files.assets), dest: publicDir});
 
 			const functionsPackageJson = JSON.parse(readFileSync(path.join(functions.source, 'package.json'), 'utf-8'));

diff --git a/tests/end-to-end/scaffold/firebase.json b/tests/end-to-end/scaffold/firebase.json
@@ -1,7 +1,7 @@
 {
   "hosting": {
     "public": "public",
-    "site": "svelte-func-single-site",
+    "target": "svelte-func-single-site",
     "rewrites": [
       {
         "source": "**",

diff --git a/tests/end-to-end/scaffold/svelte.config.js b/tests/end-to-end/scaffold/svelte.config.js
@@ -4,7 +4,10 @@ import firebase from 'svelte-adapter-firebase';
 const config = {
 	kit: {
 		// Hydrate the <div id="svelte"> element in src/app.html
-		adapter: firebase(),
+		adapter: firebase({
+			target: 'svelte-func-single-site',
+			firebaseJsonPath: './firebase.json'
+		}),
 		target: '#svelte'
 	}
 };