From 9cd16e5146d67be4dafb7e833087b64783a05bbf Mon Sep 17 00:00:00 2001
From: Onur Temizkan <onur@narval.co.uk>
Date: Tue, 19 Sep 2023 12:06:25 +0100
Subject: [PATCH] fix(remix): Fix Remix version and TS checks (#464)

There was a bug caused by wrong parameter orders of `isV2` and `isTS` on server instrumentation step.

Also improved Remix version checks, making them similar to svelte and next wizards.
---
 CHANGELOG.md              |  4 +++-
 src/remix/remix-wizard.ts |  2 +-
 src/remix/sdk-setup.ts    | 15 ++++++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f47f6e9..d25664e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,11 +4,13 @@
 
 feat(nextjs): Add telemetry collection to NextJS wizard (#458)
 feat(wizard): Ask for confirmation to continue if git repo is not clean (#462)
+fix(remix): Fix Remix version and TS checks (#464)
+
 
 ## 3.13.0
 
 - enh(android): Show link to issues page after setup is complete (#448)
-- feat(remix): Pass `org`, `project`, `url` to `upload-sourcemaps` script (#434) 
+- feat(remix): Pass `org`, `project`, `url` to `upload-sourcemaps` script (#434)
 - feat(sourcemaps): Automatically enable source maps generation in `tsconfig.json` (#449)
 - feat(sveltekit): Add telemetry collection (#455)
 - fix(nextjs): Add selfhosted url in `next.config.js` (#438)
diff --git a/src/remix/remix-wizard.ts b/src/remix/remix-wizard.ts
index 47d7d322..e9464675 100644
--- a/src/remix/remix-wizard.ts
+++ b/src/remix/remix-wizard.ts
@@ -105,7 +105,7 @@ async function runRemixWizardWithTelemetry(
 
   await traceStep('Initialize Sentry on server entry', async () => {
     try {
-      await initializeSentryOnEntryServer(dsn, isTS, isV2);
+      await initializeSentryOnEntryServer(dsn, isV2, isTS);
     } catch (e) {
       clack.log.warn(`Could not initialize Sentry on server entry.
   Please do it manually using instructions from https://docs.sentry.io/platforms/javascript/guides/remix/`);
diff --git a/src/remix/sdk-setup.ts b/src/remix/sdk-setup.ts
index d9c6250d..e8b6fbe0 100644
--- a/src/remix/sdk-setup.ts
+++ b/src/remix/sdk-setup.ts
@@ -12,7 +12,7 @@ import * as url from 'url';
 // @ts-expect-error - clack is ESM and TS complains about that. It works though
 import clack from '@clack/prompts';
 import chalk from 'chalk';
-import { parse } from 'semver';
+import { gte, minVersion } from 'semver';
 
 // @ts-expect-error - magicast is ESM and TS complains about that. It works though
 import { builders, generateCode, loadFile, writeFile } from 'magicast';
@@ -97,8 +97,17 @@ export function isRemixV2(
   packageJson: PackageDotJson,
 ): boolean {
   const remixVersion = getPackageVersion('@remix-run/react', packageJson);
-  const remixVersionMajor = remixVersion && parse(remixVersion)?.major;
-  const isV2Remix = remixVersionMajor && remixVersionMajor >= 2;
+  if (!remixVersion) {
+    return false;
+  }
+
+  const minVer = minVersion(remixVersion);
+
+  if (!minVer) {
+    return false;
+  }
+
+  const isV2Remix = gte(minVer, '2.0.0');
 
   return isV2Remix || remixConfig?.future?.v2_errorBoundary || false;
 }