Revert "feat: use new --yes flag on nwui"

This reverts commit d5fe3d3.

cli/__tests__/cli-integration.test.ts

@@ -141,14 +141,17 @@ for (const packageManager of packageManagers) {
 
       expect(fileList).toMatchSnapshot(`${finalFlags.join(', ')}-file-list`);
 
-      const { stderr, stdout, exitCode } = await Bun.$`cd ${projectName} && bun run tsc --noEmit`;
+      // once nwui cli examples are fixed we can remove this
+      if (!finalFlags.includes('--nativewindui')) {
+        const { stderr, stdout, exitCode } = await Bun.$`cd ${projectName} && bun run tsc --noEmit`;
 
-      if (exitCode !== 0) {
-        console.warn('stdout', stdout.toString());
-        console.warn('stderr', stderr.toString());
-      }
+        if (exitCode !== 0) {
+          console.warn('stdout', stdout.toString());
+          console.warn('stderr', stderr.toString());
+        }
 
-      expect(exitCode).toBe(0);
+        expect(exitCode).toBe(0);
+      }
     });
   }
 }

cli/src/utilities/printOutput.ts

@@ -1,8 +1,8 @@
 import { outro, spinner } from '@clack/prompts';
 import { Toolbox } from 'gluegun/build/types/domain/toolbox';
+import { nativeWindUIOptions } from '../constants';
 import { AvailablePackages, CliResults } from '../types';
 import { copyBaseAssets } from './copyBaseAssets';
-import { generateNWUI } from './generateNWUI';
 import { getPackageManager, getPackageManagerRunnerX } from './getPackageManager';
 import { easConfigure } from './runEasConfigure';
 import { ONLY_ERRORS, runSystemCommand } from './systemCommand';
@@ -78,8 +78,6 @@ export async function printOutput(
 
     s.stop('Packages updated!');
 
-    await generateNWUI(cliResults, toolbox);
-
     s.start(`Cleaning up your project...`);
 
     // format the files with prettier and eslint using installed packages.
@@ -92,11 +90,10 @@ export async function printOutput(
 
     s.stop('Project files formatted!');
   } else {
-    await generateNWUI(cliResults, toolbox);
-
-    s.start(`formatting your project using ${runnerType} prettier...`);
+    s.start(`No installation found.\nCleaning up your project using ${runnerType}...`);
 
     // Running prettier using global runners against the template.
+    // Use --no-config to prevent using project's config (that may have plugins/dependencies)
     await runSystemCommand({
       toolbox,
       command: `${runnerType} prettier "${projectName}/**/*.{json,js,jsx,ts,tsx}" --no-config --write`,
@@ -107,6 +104,41 @@ export async function printOutput(
     s.stop('Project files formatted!');
   }
 
+  const isNativeWindUISelected = cliResults.packages.some((p) => p.name === 'nativewindui');
+
+  if (isNativeWindUISelected) {
+    const nativeWindUIComponents =
+      cliResults.packages.find((p) => p.name === 'nativewindui').options.selectedComponents ?? [];
+
+    // we do this to account for older stored config e.g that has selectable text in it
+    const onlySupportedComponents = nativeWindUIComponents.filter((component) =>
+      nativeWindUIOptions.includes(component)
+    );
+
+    const finalComponents = Array.from(new Set([...onlySupportedComponents, 'text']));
+
+    s.start(`Adding nativewindui components...`);
+
+    await runSystemCommand({
+      command: `${runnerType} --yes nwui-cli@latest add --overwrite -d ${cliResults.projectName} ${finalComponents.join(' ')}`,
+      errorMessage: 'Error adding nativewindui components',
+      toolbox,
+      stdio: ONLY_ERRORS,
+
+      // for some reason running as shell breaks nwui when running in ci
+      shell: false,
+
+      // this is how we pass env variables to the child process when not running as shell
+      env: {
+        ...process.env,
+        EXPO_NO_GIT_STATUS: '1',
+        ...(process.env.NODE_ENV === 'development' ? { API_BASE_URL: 'https://nativewindui.com' } : {})
+      }
+    });
+
+    s.stop('Nativewindui components added!');
+  }
+
   if (!options.noGit && !flags.noGit && process.env.NODE_ENV !== 'test') {
     s.start(`Initializing git...`);
     // initialize git repo and add first commit