fix: honor forced framework for Remix and Hydrogen

netlify · Sep 18, 2024 · 7e19e12 · 7e19e12
1 parent e71068a
commit 7e19e12
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/packages/build-info/src/frameworks/hydrogen.ts b/packages/build-info/src/frameworks/hydrogen.ts
@@ -1,4 +1,4 @@
-import { BaseFramework, Category, DetectedFramework, Framework } from './framework.js'
+import { Accuracy, BaseFramework, Category, DetectedFramework, Framework } from './framework.js'
 
 const CLASSIC_COMPILER_CONFIG_FILES = ['remix.config.js']
 const CLASSIC_COMPILER_DEV = {
@@ -58,7 +58,17 @@ export class Hydrogen extends BaseFramework implements Framework {
         this.build = CLASSIC_COMPILER_BUILD
         return this as DetectedFramework
       }
+
       // If neither config file exists, it can't be a valid Hydrogen site for Netlify anyway.
+
+      // We still honor the forced framework and use defaults we had before adding support
+      // for Vite variant to preserve previous behavior for this case.
+      if (this.detected.accuracy === Accuracy.Forced) {
+        this.dev = CLASSIC_COMPILER_DEV
+        this.build = CLASSIC_COMPILER_BUILD
+        return this as DetectedFramework
+      }
+
       return
     }
   }

diff --git a/packages/build-info/src/frameworks/remix.ts b/packages/build-info/src/frameworks/remix.ts
@@ -1,4 +1,4 @@
-import { BaseFramework, Category, DetectedFramework, Framework } from './framework.js'
+import { Accuracy, BaseFramework, Category, DetectedFramework, Framework } from './framework.js'
 
 const CLASSIC_COMPILER_CONFIG_FILES = ['remix.config.js']
 const CLASSIC_COMPILER_DEV = {
@@ -69,7 +69,17 @@ export class Remix extends BaseFramework implements Framework {
         this.build = CLASSIC_COMPILER_BUILD
         return this as DetectedFramework
       }
+
       // If neither config file exists, it can't be a valid Remix site for Netlify anyway.
+
+      // We still honor the forced framework and use defaults we had before adding support
+      // for Vite variant to preserve previous behavior for this case.
+      if (this.detected.accuracy === Accuracy.Forced) {
+        this.dev = CLASSIC_COMPILER_DEV
+        this.build = CLASSIC_COMPILER_BUILD
+        return this as DetectedFramework
+      }
+
       return
     }
   }