Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(nuxt): Add import-in-the-middle install step when using pnpm #727

Merged
merged 4 commits into from
Dec 6, 2024
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 @@ -2,6 +2,7 @@

## Unreleased

- feat(nuxt): Add `import-in-the-middle` install step when using pnpm ([#727](https://github.com/getsentry/sentry-wizard/pull/727))
- fix(nuxt): Remove unused parameter in sentry-example-api template ([#734](https://github.com/getsentry/sentry-wizard/pull/734))

## 3.36.0
Expand Down
2 changes: 1 addition & 1 deletion src/nuxt/nuxt-wizard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export async function runNuxtWizardWithTelemetry(

const packageManager = await getPackageManager();

await addNuxtOverrides(packageManager, minVer);
await addNuxtOverrides(packageJson, packageManager, minVer);

const sdkAlreadyInstalled = hasPackageInstalled('@sentry/nuxt', packageJson);
Sentry.setTag('sdk-already-installed', sdkAlreadyInstalled);
Expand Down
42 changes: 39 additions & 3 deletions src/nuxt/sdk-setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@ import {
abort,
abortIfCancelled,
askShouldAddPackageOverride,
askShouldInstallPackage,
featureSelectionPrompt,
installPackage,
isUsingTypeScript,
} from '../utils/clack-utils';
import { traceStep } from '../telemetry';
import { lt, SemVer } from 'semver';
import { PackageManager } from '../utils/package-manager';
import { PackageManager, PNPM } from '../utils/package-manager';
import { hasPackageInstalled, PackageDotJson } from '../utils/package-json';

const possibleNuxtConfig = [
'nuxt.config.js',
Expand Down Expand Up @@ -212,9 +215,12 @@ export async function createConfigFiles(dsn: string) {
}

export async function addNuxtOverrides(
packageJson: PackageDotJson,
packageManager: PackageManager,
nuxtMinVer: SemVer | null,
) {
const isPNPM = PNPM.detect();

const overrides = [
{
pkgName: 'nitropack',
Expand All @@ -230,9 +236,17 @@ export async function addNuxtOverrides(
];

clack.log.warn(
`To ensure Sentry can properly instrument your code it needs to add version overrides for some Nuxt dependencies.\n\nFor more info see: ${chalk.cyan(
`To ensure Sentry can properly instrument your code it needs to add version overrides for some Nuxt dependencies${
isPNPM ? ` and install ${chalk.cyan('import-in-the-middle')}.` : '.'
}\n\nFor more info see: ${chalk.cyan(
'https://github.com/getsentry/sentry-javascript/issues/14514',
)}`,
)}${
isPNPM
? `\n\nand ${chalk.cyan(
'https://docs.sentry.io/platforms/javascript/guides/nuxt/troubleshooting/#pnpm-dev-cannot-find-package-import-in-the-middle',
)}`
: ''
}`,
);

for (const { pkgName, pkgVersion } of overrides) {
Expand All @@ -245,4 +259,26 @@ export async function addNuxtOverrides(
await packageManager.addOverride(pkgName, pkgVersion);
}
}

if (PNPM.detect()) {
// For pnpm, we want to install iitm
// See: https://docs.sentry.io/platforms/javascript/guides/nuxt/troubleshooting/#pnpm-dev-cannot-find-package-import-in-the-middle
const iitmAlreadyInstalled = hasPackageInstalled(
'import-in-the-middle',
packageJson,
);
Sentry.setTag('iitm-already-installed', iitmAlreadyInstalled);

const shouldInstallIitm = await askShouldInstallPackage(
'import-in-the-middle',
);

if (shouldInstallIitm) {
await installPackage({
packageName: 'import-in-the-middle',
alreadyInstalled: iitmAlreadyInstalled,
packageManager,
});
}
}
}
12 changes: 12 additions & 0 deletions src/utils/clack-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1492,6 +1492,18 @@ export async function featureSelectionPrompt<F extends ReadonlyArray<Feature>>(
});
}

export async function askShouldInstallPackage(
pkgName: string,
): Promise<boolean> {
return traceStep(`ask-install-package`, () =>
abortIfCancelled(
clack.confirm({
message: `Do you want to install ${chalk.cyan(pkgName)}?`,
}),
),
);
}

export async function askShouldAddPackageOverride(
pkgName: string,
pkgVersion: string,
Expand Down
Loading