From 5c023bd64b7faa9b79f69954a5fadd256027807c Mon Sep 17 00:00:00 2001
From: DD <didinele.dev@gmail.com>
Date: Tue, 18 Jun 2024 12:55:02 +0300
Subject: [PATCH] fix: package gen script (#10352)

* fix: package gen script

* fix: files without extensions didn't have handlebars stripped

* chore: requested change
---
 packages/scripts/turbo/generators/config.ts                  | 5 +++--
 .../templates/{ => default}/.cliff-jumperrc.json.hbs         | 0
 .../templates/{.gitignore.hbs => default/.gitignore}         | 2 +-
 .../generators/templates/{ => default}/.lintstagedrc.js.hbs  | 0
 .../{.prettierignore.hbs => default/.prettierignore}         | 0
 .../generators/templates/{ => default}/.prettierrc.js.hbs    | 0
 .../templates/{ => default}/api-extractor.json.hbs           | 0
 .../turbo/generators/templates/{ => default}/cliff.toml      | 0
 .../generators/templates/{ => default}/package.json.hbs      | 0
 9 files changed, 4 insertions(+), 3 deletions(-)
 rename packages/scripts/turbo/generators/templates/{ => default}/.cliff-jumperrc.json.hbs (100%)
 rename packages/scripts/turbo/generators/templates/{.gitignore.hbs => default/.gitignore} (91%)
 rename packages/scripts/turbo/generators/templates/{ => default}/.lintstagedrc.js.hbs (100%)
 rename packages/scripts/turbo/generators/templates/{.prettierignore.hbs => default/.prettierignore} (100%)
 rename packages/scripts/turbo/generators/templates/{ => default}/.prettierrc.js.hbs (100%)
 rename packages/scripts/turbo/generators/templates/{ => default}/api-extractor.json.hbs (100%)
 rename packages/scripts/turbo/generators/templates/{ => default}/cliff.toml (100%)
 rename packages/scripts/turbo/generators/templates/{ => default}/package.json.hbs (100%)

diff --git a/packages/scripts/turbo/generators/config.ts b/packages/scripts/turbo/generators/config.ts
index 7351edb37..055dfde19 100644
--- a/packages/scripts/turbo/generators/config.ts
+++ b/packages/scripts/turbo/generators/config.ts
@@ -41,14 +41,15 @@ export default function generator(plop: PlopTypes.NodePlopAPI): void {
 			{
 				type: 'addMany',
 				destination: `${plop.getDestBasePath()}/../{{name}}`,
-				templateFiles: ['templates/**'],
+				// plop doesn't like our cliff.toml file since it tries to parse it. we add it manually later
+				templateFiles: ['templates/**', '!templates/default/cliff.toml'],
 				globOptions: { dot: true },
 				base: 'templates/default/',
 				stripExtensions: ['hbs'],
 			},
 			{
 				type: 'modify',
-				path: `${plop.getDestBasePath()}/turbo/generators/templates/cliff.toml`,
+				path: `${plop.getDestBasePath()}/turbo/generators/templates/default/cliff.toml`,
 				async transform(content, answers) {
 					const cliffTOML = content.replace('{{name}}', answers.name);
 					await writeFile(`${plop.getDestBasePath()}/../${answers.name}/cliff.toml`, cliffTOML);
diff --git a/packages/scripts/turbo/generators/templates/.cliff-jumperrc.json.hbs b/packages/scripts/turbo/generators/templates/default/.cliff-jumperrc.json.hbs
similarity index 100%
rename from packages/scripts/turbo/generators/templates/.cliff-jumperrc.json.hbs
rename to packages/scripts/turbo/generators/templates/default/.cliff-jumperrc.json.hbs
diff --git a/packages/scripts/turbo/generators/templates/.gitignore.hbs b/packages/scripts/turbo/generators/templates/default/.gitignore
similarity index 91%
rename from packages/scripts/turbo/generators/templates/.gitignore.hbs
rename to packages/scripts/turbo/generators/templates/default/.gitignore
index 218b2089e..cd74cea28 100644
--- a/packages/scripts/turbo/generators/templates/.gitignore.hbs
+++ b/packages/scripts/turbo/generators/templates/default/.gitignore
@@ -1,2 +1,2 @@
 # Packages node_modules # Log files logs *.log npm-debug.log* # Runtime data pids *.pid *.seed # Env .env # Dist dist
-dist-docs # Docs docs/**/* !docs/README.md # Miscellaneous .turbo .tmp coverage
\ No newline at end of file
+dist-docs # Docs docs/**/* !docs/README.md # Miscellaneous .turbo .tmp coverage
diff --git a/packages/scripts/turbo/generators/templates/.lintstagedrc.js.hbs b/packages/scripts/turbo/generators/templates/default/.lintstagedrc.js.hbs
similarity index 100%
rename from packages/scripts/turbo/generators/templates/.lintstagedrc.js.hbs
rename to packages/scripts/turbo/generators/templates/default/.lintstagedrc.js.hbs
diff --git a/packages/scripts/turbo/generators/templates/.prettierignore.hbs b/packages/scripts/turbo/generators/templates/default/.prettierignore
similarity index 100%
rename from packages/scripts/turbo/generators/templates/.prettierignore.hbs
rename to packages/scripts/turbo/generators/templates/default/.prettierignore
diff --git a/packages/scripts/turbo/generators/templates/.prettierrc.js.hbs b/packages/scripts/turbo/generators/templates/default/.prettierrc.js.hbs
similarity index 100%
rename from packages/scripts/turbo/generators/templates/.prettierrc.js.hbs
rename to packages/scripts/turbo/generators/templates/default/.prettierrc.js.hbs
diff --git a/packages/scripts/turbo/generators/templates/api-extractor.json.hbs b/packages/scripts/turbo/generators/templates/default/api-extractor.json.hbs
similarity index 100%
rename from packages/scripts/turbo/generators/templates/api-extractor.json.hbs
rename to packages/scripts/turbo/generators/templates/default/api-extractor.json.hbs
diff --git a/packages/scripts/turbo/generators/templates/cliff.toml b/packages/scripts/turbo/generators/templates/default/cliff.toml
similarity index 100%
rename from packages/scripts/turbo/generators/templates/cliff.toml
rename to packages/scripts/turbo/generators/templates/default/cliff.toml
diff --git a/packages/scripts/turbo/generators/templates/package.json.hbs b/packages/scripts/turbo/generators/templates/default/package.json.hbs
similarity index 100%
rename from packages/scripts/turbo/generators/templates/package.json.hbs
rename to packages/scripts/turbo/generators/templates/default/package.json.hbs