From 41e9c6c4b8427c82cb5d8dab1dd5583afa796d5c Mon Sep 17 00:00:00 2001
From: JYC <jycouet@gmail.com>
Date: Tue, 10 Oct 2023 03:12:12 +0200
Subject: [PATCH] Fix template erors in create-houdini (#1214)

---
 packages/create-houdini/bin.js                | 19 +++++++++++++------
 .../{.gitignore => .meta.gitignore}           |  0
 .../react-typescript/src/routes/+page.tsx     |  5 ++---
 .../react/{.gitignore => .meta.gitignore}     |  0
 .../templates/react/src/routes/+page.jsx      |  3 ---
 .../{.gitignore => .meta.gitignore}           |  0
 6 files changed, 15 insertions(+), 12 deletions(-)
 rename packages/create-houdini/templates/react-typescript/{.gitignore => .meta.gitignore} (100%)
 rename packages/create-houdini/templates/react/{.gitignore => .meta.gitignore} (100%)
 rename packages/create-houdini/templates/sveltekit-demo/{.gitignore => .meta.gitignore} (100%)

diff --git a/packages/create-houdini/bin.js b/packages/create-houdini/bin.js
index ea3b56d6e..f300aa1fe 100755
--- a/packages/create-houdini/bin.js
+++ b/packages/create-houdini/bin.js
@@ -62,7 +62,7 @@ if (!projectDir) {
 
 	if (dir) {
 		projectDir = dir
-		projectName = 'hello-houdini'
+		projectName = dir
 	} else {
 		projectDir = '.'
 	}
@@ -175,6 +175,7 @@ copy(
 		["'CLIENT_CONFIG'"]: clientConfig,
 		["'CONFIG_FILE'"]: configFile,
 	},
+	{ '.meta.gitignore': '.gitignore' },
 	['.meta.json']
 )
 
@@ -213,6 +214,7 @@ function copy(
 	/** @type {string} */ sourceDir,
 	/** @type {string} */ destDir = projectDir,
 	/** @type {Record<string, string>} */ transformMap = {},
+	/** @type {Record<string, string>} */ transformFileMap = {},
 	/** @type {string[]} */ ignoreList = []
 ) {
 	if (!fs.existsSync(destDir)) {
@@ -220,12 +222,16 @@ function copy(
 	}
 
 	const files = fs.readdirSync(sourceDir)
-	for (const file of files) {
-		const sourceFilePath = path.join(sourceDir, file)
+	for (const fileSource of files) {
+		const fileDest = Object.entries(transformFileMap).reduce((acc, [key, value]) => {
+			return acc.replace(key, value)
+		}, fileSource)
+		// const file = fileSource.replace(".meta.gitignore", ".gitignore")
+		const sourceFilePath = path.join(sourceDir, fileSource)
 		const sourceRelative = path.relative(templateDir, sourceFilePath)
 		// skip the ignore list
 		if (!ignoreList.includes(sourceRelative)) {
-			const destFilePath = path.join(destDir, file)
+			const destFilePath = path.join(destDir, fileDest)
 
 			const stats = fs.statSync(sourceFilePath)
 
@@ -247,7 +253,7 @@ function copy(
 			}
 			// if we run into a directory then we should keep going
 			else if (stats.isDirectory()) {
-				copy(sourceFilePath, destFilePath, transformMap, ignoreList)
+				copy(sourceFilePath, destFilePath, transformMap, transformFileMap, ignoreList)
 			}
 		}
 	}
@@ -295,7 +301,8 @@ async function pullSchemaCli() {
 
 		url_and_headers = answer.url_and_headers
 		const value_splited = url_and_headers.split(' ')
-		const apiUrl = value_splited[0]
+
+		apiUrl = value_splited[0]
 
 		const local_headers =
 			value_splited.length > 1
diff --git a/packages/create-houdini/templates/react-typescript/.gitignore b/packages/create-houdini/templates/react-typescript/.meta.gitignore
similarity index 100%
rename from packages/create-houdini/templates/react-typescript/.gitignore
rename to packages/create-houdini/templates/react-typescript/.meta.gitignore
diff --git a/packages/create-houdini/templates/react-typescript/src/routes/+page.tsx b/packages/create-houdini/templates/react-typescript/src/routes/+page.tsx
index 90f01f8c5..a623b4730 100644
--- a/packages/create-houdini/templates/react-typescript/src/routes/+page.tsx
+++ b/packages/create-houdini/templates/react-typescript/src/routes/+page.tsx
@@ -1,7 +1,6 @@
-// import type { PageProps } from "./$types";
+import type { PageProps } from './$types'
 
-// export default function ({}: PageProps) {
-export default function () {
+export default function ({}: PageProps) {
 	return (
 		<div>
 			<h2>Home</h2>
diff --git a/packages/create-houdini/templates/react/.gitignore b/packages/create-houdini/templates/react/.meta.gitignore
similarity index 100%
rename from packages/create-houdini/templates/react/.gitignore
rename to packages/create-houdini/templates/react/.meta.gitignore
diff --git a/packages/create-houdini/templates/react/src/routes/+page.jsx b/packages/create-houdini/templates/react/src/routes/+page.jsx
index 90f01f8c5..27cfdb654 100644
--- a/packages/create-houdini/templates/react/src/routes/+page.jsx
+++ b/packages/create-houdini/templates/react/src/routes/+page.jsx
@@ -1,6 +1,3 @@
-// import type { PageProps } from "./$types";
-
-// export default function ({}: PageProps) {
 export default function () {
 	return (
 		<div>
diff --git a/packages/create-houdini/templates/sveltekit-demo/.gitignore b/packages/create-houdini/templates/sveltekit-demo/.meta.gitignore
similarity index 100%
rename from packages/create-houdini/templates/sveltekit-demo/.gitignore
rename to packages/create-houdini/templates/sveltekit-demo/.meta.gitignore