Refactor playground-cli to maintain consistency across the different clis

Author: mho22

.github/workflows/ci.yml

@@ -321,7 +321,7 @@ jobs:
               with:
                   submodules: true
             - uses: ./.github/actions/prepare-playground
-            - run: packages/playground/cli/tests/test-running-unbuilt-cli.sh
+            - run: packages/playground/cli/src/tests/test-running-unbuilt-cli.sh
 
     build:
         runs-on: ubuntu-latest

packages/playground/cli/project.json

@@ -136,7 +136,6 @@
 			"executor": "@nx/vite:test",
 			"outputs": ["{workspaceRoot}/coverage/packages/playground/cli"],
 			"options": {
-				"passWithNoTests": true,
 				"reportsDirectory": "../../../coverage/packages/playground/cli"
 			}
 		},

packages/playground/cli/src/cli.ts

@@ -1,4 +1,4 @@
-import { parseOptionsAndRunCLI } from './run-cli';
+import { parseOptionsAndRunCLI } from './lib/run-cli';
 
 // Do not await this as top-level await is not supported in all environments.
 parseOptionsAndRunCLI();

packages/playground/cli/src/index.ts

@@ -1 +1 @@
-export * from './run-cli';
+export * from './lib/run-cli';

packages/playground/cli/src/blueprints-v1/blueprints-v1-handler.ts renamed to packages/playground/cli/src/lib/blueprints-v1/blueprints-v1-handler.ts

@@ -59,6 +59,7 @@ export class BlueprintsV1Handler {
 				import.meta.dirname,
 				'..',
 				'..',
+				'..',
 				importedWorkerV1UrlString
 			);
 		}

packages/playground/cli/src/blueprints-v1/download.ts renamed to packages/playground/cli/src/lib/blueprints-v1/download.ts

@@ -47,6 +47,7 @@ export class BlueprintsV2Handler {
 				import.meta.dirname,
 				'..',
 				'..',
+				'..',
 				importedWorkerV2UrlString
 			);
 		}

packages/playground/cli/src/blueprints-v1/worker-thread-v1.ts renamed to packages/playground/cli/src/lib/blueprints-v1/worker-thread-v1.ts

@@ -10,7 +10,7 @@ export async function getV2Runner(): Promise<File> {
 	 * for the new .phar file.
 	 */
 	// @ts-ignore
-	const v2_runner_url = (await import('../../public/blueprints.phar?url'))
+	const v2_runner_url = (await import('../../../public/blueprints.phar?url'))
 		.default;
 
 	/**