Skip to content

Commit 28093f9

Browse files
committed
updated installation process to be verbose
1 parent a8d0b83 commit 28093f9

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed

src/commands/add/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export const addPackage = async (options?: InitOptions) => {
128128
const promptResponse = await promptUser(options);
129129
const start = Date.now();
130130
spinner.start();
131-
spinner.text = "Beginning Installation Process";
131+
spinner.text = "Beginning Configuration Process";
132132

133133
if (config.componentLib === undefined) {
134134
if (promptResponse.componentLib === "shadcn-ui") {
@@ -235,13 +235,13 @@ export const addPackage = async (options?: InitOptions) => {
235235
if (config.t3 && config.auth === "next-auth") {
236236
checkAndAddAuthUtils();
237237
}
238+
spinner.succeed("Configuration complete");
238239

239240
await installPackagesFromList();
240241
await installShadcnComponentList();
241242

242243
const end = Date.now();
243244
const duration = end - start;
244-
spinner.succeed();
245245

246246
printNextSteps(promptResponse, duration);
247247
} else {

src/commands/add/utils.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ export const addToShadcnComponentList = (components: string[]) =>
190190
export const installShadcnComponentList = async () => {
191191
// consola.start("Installing shadcn components:", shadCnComponentList);
192192
if (shadCnComponentList.length === 0) return;
193-
spinner.text = "Installing ShadcnUI Components";
194193
await installShadcnUIComponents(shadCnComponentList);
195194
// consola.ready("Successfully installed components.");
196195
};

src/commands/generate/generators/views-with-server-actions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ ${
228228
export const revalidate = 0;
229229
230230
export default async function ${tableNameCapitalised}Page() {
231-
${schema.belongsToUser ? "await checkAuth();\n" : ""}
232231
return (
233232
<main>
234233
<div className="relative">
@@ -242,6 +241,7 @@ export default async function ${tableNameCapitalised}Page() {
242241
}
243242
244243
const ${tableNameCapitalised} = async () => {
244+
${schema.belongsToUser ? "await checkAuth();\n" : ""}
245245
const { ${tableNameCamelCase} } = await get${tableNameCapitalised}();
246246
${
247247
relationsFormatted

src/utils.ts

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ export function createFolder(relativePath: string, log = false) {
5454
export const runCommand = async (command: string, args: string[]) => {
5555
const formattedArgs = args.filter((a) => a !== "");
5656
try {
57-
await execa(command, formattedArgs, { stdio: "ignore" });
57+
await execa(command, formattedArgs, {
58+
stdio: "inherit",
59+
});
5860
} catch (error) {
5961
throw new Error(
6062
`command "${command} ${formattedArgs
@@ -74,20 +76,21 @@ export async function installPackages(
7476
const installCommand = pmType === "npm" ? "install" : "add";
7577

7678
try {
77-
if (packages.dev) {
79+
spinner.stop();
80+
console.log("\n");
81+
consola.info("Installing Dependencies");
82+
if (packages.regular) {
7883
await runCommand(
7984
pmType,
80-
[installCommand, "-D"].concat(packages.dev.split(" "))
85+
[installCommand].concat(packages.regular.split(" "))
8186
);
8287
}
83-
84-
if (packages.regular) {
88+
if (packages.dev) {
8589
await runCommand(
8690
pmType,
87-
[installCommand].concat(packages.regular.split(" "))
91+
[installCommand, "-D"].concat(packages.dev.split(" "))
8892
);
8993
}
90-
9194
// consola.success(
9295
// `Regular dependencies installed: \n${packages.regular
9396
// .split(" ")
@@ -174,8 +177,11 @@ export async function installShadcnUIComponents(
174177
// `Installing shadcn-ui components: ${componentsToInstall.join(", ")}`
175178
// );
176179
try {
180+
spinner.stop();
181+
console.log("\n");
182+
consola.info("Installing ShadcnUI Components");
177183
await execa(pmInstallCommand[preferredPackageManager], installArgs, {
178-
stdio: "ignore",
184+
stdio: "inherit",
179185
});
180186
// consola.success(
181187
// `Installed components: ${componentsToInstall.join(", ")}`

0 commit comments

Comments
 (0)