@slicemachine/init 2.6.4-dev-next-hotfix.1 → 2.6.4-dev-next-hotfix.3

package/dist/packages/init/package.json.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const name = "@slicemachine/init";
-const version = "2.6.4-dev-next-hotfix.1";
+const version = "2.6.4-dev-next-hotfix.3";
 const description = "Init Prismic Slice Machine in your project";
 const keywords = [
   "typescript",
@@ -55,7 +55,7 @@ const dependencies = {
   "@antfu/ni": "^0.20.0",
   "@lihbr/listr-update-renderer": "^0.5.3",
   "@sentry/node": "^7.70.0",
-  "@slicemachine/manager": "^0.11.3-dev-next-hotfix.1",
+  "@slicemachine/manager": "^0.11.3-dev-next-hotfix.3",
   chalk: "^4.1.2",
   giget: "^1.1.2",
   globby: "^13.1.3",
@@ -68,7 +68,7 @@ const dependencies = {
 };
 const devDependencies = {
   "@size-limit/preset-small-lib": "8.2.4",
-  "@slicemachine/plugin-kit": "0.4.17-dev-next-hotfix.1",
+  "@slicemachine/plugin-kit": "0.4.17-dev-next-hotfix.3",
   "@types/listr": "0.14.4",
   "@types/prompts": "2.4.3",
   "@types/semver": "7.3.13",
@@ -94,7 +94,7 @@ const devDependencies = {
   "vite-plugin-sdk": "0.1.1",
   vitest: "0.32.0"
 };
-const gitHead = "798fa094325092bf4497633a6e124896b8d1d90e";
+const gitHead = "aff2adcfa5539fb8cd3c566b009ab2cfa98bb29c";
 const pkg = {
   name,
   version,

package/dist/packages/init/package.json.js

@@ -1,5 +1,5 @@
 const name = "@slicemachine/init";
-const version = "2.6.4-dev-next-hotfix.1";
+const version = "2.6.4-dev-next-hotfix.3";
 const description = "Init Prismic Slice Machine in your project";
 const keywords = [
   "typescript",
@@ -53,7 +53,7 @@ const dependencies = {
   "@antfu/ni": "^0.20.0",
   "@lihbr/listr-update-renderer": "^0.5.3",
   "@sentry/node": "^7.70.0",
-  "@slicemachine/manager": "^0.11.3-dev-next-hotfix.1",
+  "@slicemachine/manager": "^0.11.3-dev-next-hotfix.3",
   chalk: "^4.1.2",
   giget: "^1.1.2",
   globby: "^13.1.3",
@@ -66,7 +66,7 @@ const dependencies = {
 };
 const devDependencies = {
   "@size-limit/preset-small-lib": "8.2.4",
-  "@slicemachine/plugin-kit": "0.4.17-dev-next-hotfix.1",
+  "@slicemachine/plugin-kit": "0.4.17-dev-next-hotfix.3",
   "@types/listr": "0.14.4",
   "@types/prompts": "2.4.3",
   "@types/semver": "7.3.13",
@@ -92,7 +92,7 @@ const devDependencies = {
   "vite-plugin-sdk": "0.1.1",
   vitest: "0.32.0"
 };
-const gitHead = "798fa094325092bf4497633a6e124896b8d1d90e";
+const gitHead = "aff2adcfa5539fb8cd3c566b009ab2cfa98bb29c";
 const pkg = {
   name,
   version,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/init",
-	"version": "2.6.4-dev-next-hotfix.1",
+	"version": "2.6.4-dev-next-hotfix.3",
 	"description": "Init Prismic Slice Machine in your project",
 	"keywords": [
 		"typescript",
@@ -54,7 +54,7 @@
 		"@antfu/ni": "^0.20.0",
 		"@lihbr/listr-update-renderer": "^0.5.3",
 		"@sentry/node": "^7.70.0",
-		"@slicemachine/manager": "^0.11.3-dev-next-hotfix.1",
+		"@slicemachine/manager": "^0.11.3-dev-next-hotfix.3",
 		"chalk": "^4.1.2",
 		"giget": "^1.1.2",
 		"globby": "^13.1.3",
@@ -67,7 +67,7 @@
 	},
 	"devDependencies": {
 		"@size-limit/preset-small-lib": "8.2.4",
-		"@slicemachine/plugin-kit": "0.4.17-dev-next-hotfix.1",
+		"@slicemachine/plugin-kit": "0.4.17-dev-next-hotfix.3",
 		"@types/listr": "0.14.4",
 		"@types/prompts": "2.4.3",
 		"@types/semver": "7.3.13",
@@ -93,5 +93,5 @@
 		"vite-plugin-sdk": "0.1.1",
 		"vitest": "0.32.0"
 	},
-	"gitHead": "798fa094325092bf4497633a6e124896b8d1d90e"
+	"gitHead": "aff2adcfa5539fb8cd3c566b009ab2cfa98bb29c"
 }

package/src/SliceMachineInitProcess.ts

@@ -43,6 +43,7 @@ import {
 import { detectStarterId } from "./lib/starters";
 import { setupSentry } from "./lib/setupSentry";
 import { trackSentryError } from "./lib/sentryErrorHandlers";
+import { updateSentryContext } from "./lib/updateSentryContext";
 
 export type SliceMachineInitProcessOptions = {
 	repository?: string;
@@ -134,6 +135,7 @@ export class SliceMachineInitProcess {
 				appName: pkg.name,
 				appVersion: pkg.version,
 			});
+			await setupSentry();
 			await this.manager.telemetry.track({
 				event: "command:init:start",
 				repository: this.options.repository,
@@ -302,7 +304,8 @@ export class SliceMachineInitProcess {
 				}
 			}
 		} catch (error) {
-			await this.trackError(error);
+			// Only track this error with Sentry, it's only the final convenience message
+			await this.trackSentryError(error);
 		}
 	}
 
@@ -332,13 +335,11 @@ export class SliceMachineInitProcess {
 	}
 
 	protected trackError = async (error: unknown): Promise<void> => {
-		const repositoryName = this.context.repository?.domain || "";
-		const framework =
-			this.context.framework?.sliceMachineTelemetryID ?? "unknown";
-
-		await setupSentry({ manager: this.manager, repositoryName, framework });
-		trackSentryError(error);
+		await this.trackSentryError(error);
+		await this.trackTelemetryError(error);
+	};
 
+	protected trackTelemetryError = async (error: unknown): Promise<void> => {
 		// Transform error to string and prevent hitting Segment 500kb API limit or sending ridiculously long trace
 		const safeError = (
 			error instanceof Error ? error.message : `${error}`
@@ -346,12 +347,21 @@ export class SliceMachineInitProcess {
 		await this.manager.telemetry.track({
 			event: "command:init:end",
 			framework: this.context.framework?.sliceMachineTelemetryID ?? "unknown",
-			repository: repositoryName,
+			repository: this.context.repository?.domain || "",
 			success: false,
 			error: safeError,
 		});
 	};
 
+	protected trackSentryError = async (error: unknown): Promise<void> => {
+		await updateSentryContext({
+			manager: this.manager,
+			repositoryName: this.context.repository?.domain || "",
+			framework: this.context.framework?.sliceMachineTelemetryID ?? "unknown",
+		});
+		trackSentryError(error);
+	};
+
 	protected async copyStarter(): Promise<void> {
 		const dir = await this.getStarterDirectoryName();
 

package/src/lib/sentryErrorHandlers.ts

@@ -2,26 +2,12 @@ import * as Sentry from "@sentry/node";
 
 import { checkIsSentryEnabled } from "./checkIsSentryEnabled";
 
-type ErrorWithCause = Error & {
-	cause?: unknown;
-};
-
-function hasCause(error: unknown): error is ErrorWithCause {
-	return error instanceof Error && "cause" in error;
-}
-
 export function trackSentryError(error: unknown): void {
-	if (checkIsSentryEnabled()) {
-		Sentry.withScope(function (scope) {
-			scope.setTransactionName("init");
-			Sentry.captureException(error, {
-				extra: {
-					cause:
-						hasCause(error) && error.cause !== undefined
-							? (error.cause as string)
-							: "",
-				},
-			});
-		});
+	if (!checkIsSentryEnabled()) {
+		return;
 	}
+
+	Sentry.captureException(error, {
+		...(error instanceof Error ? { extra: { cause: error.cause } } : {}),
+	});
 }

package/src/lib/setupSentry.ts

@@ -1,33 +1,15 @@
 import * as Sentry from "@sentry/node";
 import semver from "semver";
 
-import { PrismicUserProfile, SliceMachineManager } from "@slicemachine/manager";
 import { SENTRY_EXPRESS_DSN } from "../constants";
 import { checkIsSentryEnabled } from "./checkIsSentryEnabled";
 import { version } from "../../package.json";
 
-type SetupSentryArgs = {
-	manager: SliceMachineManager;
-	repositoryName: string;
-	framework: string;
-};
-
-export const setupSentry = async ({
-	manager,
-	repositoryName,
-	framework,
-}: SetupSentryArgs): Promise<void> => {
+export function setupSentry(): void {
 	if (!checkIsSentryEnabled()) {
 		return;
 	}
 
-	let userProfile: PrismicUserProfile | undefined;
-	try {
-		userProfile = await manager.user.getProfile();
-	} catch {
-		// User is not logged in, it doesn't matter
-	}
-
 	const isStableVersion =
 		semver.prerelease(version) === null && semver.lte("0.1.0", version);
 
@@ -38,19 +20,4 @@ export const setupSentry = async ({
 			? import.meta.env.MODE || "production"
 			: "alpha",
 	});
-
-	if (userProfile) {
-		Sentry.setUser({ id: userProfile.shortId });
-	}
-
-	if (repositoryName) {
-		Sentry.setTag("repository", repositoryName);
-		Sentry.setContext("Repository Data", {
-			name: repositoryName,
-		});
-	}
-
-	if (framework) {
-		Sentry.setTag("framework", framework);
-	}
-};
+}

package/src/lib/updateSentryContext.ts

@@ -0,0 +1,42 @@
+import * as Sentry from "@sentry/node";
+
+import { PrismicUserProfile, SliceMachineManager } from "@slicemachine/manager";
+import { checkIsSentryEnabled } from "./checkIsSentryEnabled";
+
+type UpdateSentryContextArgs = {
+	manager: SliceMachineManager;
+	repositoryName: string;
+	framework: string;
+};
+
+export async function updateSentryContext({
+	manager,
+	repositoryName,
+	framework,
+}: UpdateSentryContextArgs): Promise<void> {
+	if (!checkIsSentryEnabled()) {
+		return;
+	}
+
+	let userProfile: PrismicUserProfile | undefined;
+	try {
+		userProfile = await manager.user.getProfile();
+	} catch {
+		// User is not logged in, it doesn't matter
+	}
+
+	if (userProfile) {
+		Sentry.setUser({ id: userProfile.shortId });
+	}
+
+	if (repositoryName) {
+		Sentry.setTag("repository", repositoryName);
+		Sentry.setContext("Repository Data", {
+			name: repositoryName,
+		});
+	}
+
+	if (framework) {
+		Sentry.setTag("framework", framework);
+	}
+}