fix: export firebaseJsonDir from config parser func (#48)

jthegedus · May 10, 2021 · 5ec2e18 · nhe23 · May 10, 2021 · jthegedus
1 parent dca704b
commit 5ec2e18
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/utils.js b/src/utils.js
@@ -20,6 +20,7 @@ function isString(parameter) {
  * @returns {{
  * 	functions: false | { name: string, source: string };
  * 	cloudRun: false | { serviceId: string, region: string };
+ * 	firebaseJsonDir: string;
  * 	publicDir: string
  * }}
  */
@@ -106,7 +107,8 @@ function parseFirebaseConfiguration({hostingSite, sourceRewriteMatch, firebaseJs
 			serviceId: rewriteConfig.run.serviceId,
 			region: rewriteConfig.run?.region || 'us-central1'
 		} : false,
-		publicDir: path.join(path.dirname(firebaseJson), hostingConfig.public)
+		publicDir: path.join(path.dirname(firebaseJson), hostingConfig.public),
+		firebaseJsonDir: firebaseJson
 	};
 }
 

diff --git a/tests/index.test.js b/tests/index.test.js
@@ -9,7 +9,7 @@ test(
 	t => {
 		const config = {hostingSite: undefined, sourceRewriteMatch: '**', firebaseJson: fileURLToPath(new URL('./fixtures/successes/cf_site.json', import.meta.url))};
 		const result = parseFirebaseConfiguration(config);
-		const expectedResult = {functions: {name: 'some_func', source: path.join(path.dirname(config.firebaseJson), 'functions')}, cloudRun: false, publicDir: path.join(path.dirname(config.firebaseJson), 'app')};
+		const expectedResult = {functions: {name: 'some_func', source: path.join(path.dirname(config.firebaseJson), 'functions')}, cloudRun: false, publicDir: path.join(path.dirname(config.firebaseJson), 'app'), firebaseJsonDir: config.firebaseJson};
 
 		t.deepEqual(result, expectedResult);
 	}
@@ -20,7 +20,7 @@ test(
 	t => {
 		const config = {hostingSite: 'app', sourceRewriteMatch: '**', firebaseJson: fileURLToPath(new URL('./fixtures/successes/cf_sites.json', import.meta.url))};
 		const result = parseFirebaseConfiguration(config);
-		const expectedResult = {functions: {name: 'some_func', source: path.join(path.dirname(config.firebaseJson), 'functions')}, cloudRun: false, publicDir: path.join(path.dirname(config.firebaseJson), 'app')};
+		const expectedResult = {functions: {name: 'some_func', source: path.join(path.dirname(config.firebaseJson), 'functions')}, cloudRun: false, publicDir: path.join(path.dirname(config.firebaseJson), 'app'), firebaseJsonDir: config.firebaseJson};
 
 		t.deepEqual(result, expectedResult);
 	}
@@ -31,7 +31,7 @@ test(
 	t => {
 		const config = {hostingSite: undefined, sourceRewriteMatch: '**', firebaseJson: fileURLToPath(new URL('./fixtures/successes/cr_site.json', import.meta.url))};
 		const result = parseFirebaseConfiguration(config);
-		const expectedResult = {functions: false, cloudRun: {serviceId: 'some-service', region: 'us-central1'}, publicDir: path.join(path.dirname(config.firebaseJson), 'app')};
+		const expectedResult = {functions: false, cloudRun: {serviceId: 'some-service', region: 'us-central1'}, publicDir: path.join(path.dirname(config.firebaseJson), 'app'), firebaseJsonDir: config.firebaseJson};
 
 		t.deepEqual(result, expectedResult);
 	}
@@ -42,7 +42,7 @@ test(
 	t => {
 		const config = {hostingSite: 'app', sourceRewriteMatch: '**', firebaseJson: fileURLToPath(new URL('./fixtures/successes/cr_sites.json', import.meta.url))};
 		const result = parseFirebaseConfiguration(config);
-		const expectedResult = {functions: false, cloudRun: {serviceId: 'some-service', region: 'us-central1'}, publicDir: path.join(path.dirname(config.firebaseJson), 'app')};
+		const expectedResult = {functions: false, cloudRun: {serviceId: 'some-service', region: 'us-central1'}, publicDir: path.join(path.dirname(config.firebaseJson), 'app'), firebaseJsonDir: config.firebaseJson};
 
 		t.deepEqual(result, expectedResult);
 	}