Merge pull request #21 from Hugos68/dev

Fixed job ordering
Hugos68 · Sep 23, 2023 · 6e8e727 · 6e8e727
2 parents b6fe8b0 + bc0e345
commit 6e8e727
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 30 deletions.
diff --git a/.changeset/dirty-grapes-change.md b/.changeset/dirty-grapes-change.md
@@ -0,0 +1,5 @@
+---
+'capkit': patch
+---
+
+Reordered jobs to make ios and android additions succeed
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,10 @@
-.DS_Store
-node_modules
-/build
-/.svelte-kit
-/package
-.env
-.env.*
-!.env.example
-vite.config.js.timestamp-*
+.DS_Store
+node_modules
+/build
+/.svelte-kit
+/package
+.env
+.env.*
+!.env.example
+vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/index.js b/src/index.js
@@ -169,6 +169,26 @@ async function initializeProject({
 		}
 	});
 
+	if (configExtension) {
+		jobs.push({
+			start: `Removing existing config: "${kleur.cyan(`capacitor.config.${configExtension}`)}"`,
+			stop: `Successfully removed existing config: "${kleur.cyan(
+				`capacitor.config.${configExtension}`
+			)}"`,
+			task: async () => fs.unlink(`capacitor.config.${configExtension}`)
+		});
+	}
+
+	jobs.push({
+		start: `Creating: "${kleur.cyan('capacitor.config.json')}"`,
+		stop: `Successfully created: "${kleur.cyan('capacitor.config.json')}"`,
+		task: async () =>
+			fs.writeFile(
+				'capacitor.config.json',
+				JSON.stringify({ appId, appName, webDir: 'build' }, null, 2)
+			)
+	});
+
 	if (selectedPlatforms) {
 		jobs.push({
 			start: 'Adding additional platforms.',
@@ -198,26 +218,6 @@ async function initializeProject({
 		});
 	}
 
-	if (configExtension) {
-		jobs.push({
-			start: `Removing existing config: "${kleur.cyan(`capacitor.config.${configExtension}`)}"`,
-			stop: `Successfully removed existing config: "${kleur.cyan(
-				`capacitor.config.${configExtension}`
-			)}"`,
-			task: async () => fs.unlink(`capacitor.config.${configExtension}`)
-		});
-	}
-
-	jobs.push({
-		start: `Creating: "${kleur.cyan('capacitor.config.json')}"`,
-		stop: `Successfully created: "${kleur.cyan('capacitor.config.json')}"`,
-		task: async () =>
-			fs.writeFile(
-				'capacitor.config.json',
-				JSON.stringify({ appId, appName, webDir: 'build' }, null, 2)
-			)
-	});
-
 	jobs.push({
 		start: 'Importing custom scripts',
 		stop: 'Successfully imported custom scripts',