Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

- ref(nextjs): Adjust dev server command in verification message (#665)
- feat(remix): Add feature selection (#646)
- feat: Try running Prettier on exit (#644)
- fix(remix): Don't create `.sentrclirc` if project uses Vite (#667)

## 3.28.0
Expand Down
7 changes: 4 additions & 3 deletions src/nextjs/nextjs-wizard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
installPackage,
isUsingTypeScript,
printWelcome,
runPrettierIfInstalled,
showCopyPasteInstructions,
} from '../utils/clack-utils';
import type { SentryProjectData, WizardOptions } from '../utils/types';
Expand Down Expand Up @@ -330,10 +331,10 @@ export async function runNextjsWizardWithTelemetry(
}

const pacMan = await getPackageManager();
await runPrettierIfInstalled();

clack.outro(`${chalk.green(
'Successfully installed the Sentry Next.js SDK!',
)}${
clack.outro(`
${chalk.green('Successfully installed the Sentry Next.js SDK!')} ${
shouldCreateExamplePage
? `\n\nYou can validate your setup by (re)starting your dev environment (e.g. ${chalk.cyan(
`${pacMan.runScriptCommand} dev`,
Expand Down
4 changes: 4 additions & 0 deletions src/react-native/react-native-wizard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
installPackage,
printWelcome,
propertiesCliSetupConfig,
runPrettierIfInstalled,
} from '../utils/clack-utils';
import { getPackageVersion, hasPackageInstalled } from '../utils/package-json';
import { podInstall } from '../apple/cocoapod';
Expand Down Expand Up @@ -212,11 +213,14 @@ Or setup using ${chalk.cyan(
await traceStep('patch-android-files', () => patchAndroidFiles(cliConfig));
}

await runPrettierIfInstalled();

const confirmedFirstException = await confirmFirstSentryException(
sentryUrl,
orgSlug,
projectId,
);

Sentry.setTag('user-confirmed-first-error', confirmedFirstException);

if (confirmedFirstException) {
Expand Down
3 changes: 3 additions & 0 deletions src/remix/remix-wizard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
isUsingTypeScript,
printWelcome,
rcCliSetupConfig,
runPrettierIfInstalled,
} from '../utils/clack-utils';
import { hasPackageInstalled } from '../utils/package-json';
import type { WizardOptions } from '../utils/types';
Expand Down Expand Up @@ -239,6 +240,8 @@ async function runRemixWizardWithTelemetry(
});
}

await runPrettierIfInstalled();

clack.outro(`
${chalk.green(
'Sentry has been successfully configured for your Remix project.',
Expand Down
3 changes: 3 additions & 0 deletions src/sveltekit/sveltekit-wizard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
getPackageDotJson,
installPackage,
printWelcome,
runPrettierIfInstalled,
} from '../utils/clack-utils';
import { getPackageVersion, hasPackageInstalled } from '../utils/package-json';
import type { WizardOptions } from '../utils/types';
Expand Down Expand Up @@ -163,6 +164,8 @@ export async function runSvelteKitWizardWithTelemetry(
}
}

await runPrettierIfInstalled();

clack.outro(buildOutroMessage(shouldCreateExamplePage));
}

Expand Down
46 changes: 46 additions & 0 deletions src/utils/clack-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,52 @@ async function addCliConfigFileToGitIgnore(filename: string): Promise<void> {
}
}

export async function runPrettierIfInstalled(): Promise<void> {
return traceStep('run-prettier', async () => {
const packageJson = await getPackageDotJson();
const prettierInstalled = hasPackageInstalled('prettier', packageJson);

if (prettierInstalled) {
// prompt the user if they want to run prettier
const shouldRunPrettier = await abortIfCancelled(
clack.confirm({
message:
'Looks like you have Prettier in your project. Do you want to run it on your files?',
}),
);

if (!shouldRunPrettier) {
return;
}
} else {
return;
}

const prettierSpinner = clack.spinner();
prettierSpinner.start('Running Prettier on your files.');

try {
await new Promise<void>((resolve, reject) => {
childProcess.exec('npx prettier --write .', (err) => {
if (err) {
reject(err);
} else {
resolve();
}
});
});
} catch {
prettierSpinner.stop('Prettier failed to run.');
clack.log.error(
'Prettier failed to run. There may be formatting issues in your updated files.',
);
return;
}

prettierSpinner.stop('Prettier has formatted your files.');
});
}

/**
* Checks if @param packageId is listed as a dependency in @param packageJson.
* If not, it will ask users if they want to continue without the package.
Expand Down
Loading