Revert workaround to filter JavaScriptFFI out on GHC versions where G… (#8979)

* Revert workaround to filter JavaScriptFFI out on GHC versions where GHC issue 11214 is fixed.

* Lint

* Lint

* Update version range to reflect the fix being included in GHC 9.8

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 8c9a71e)

# Conflicts:
#	Cabal/src/Distribution/Simple/GHC.hs

Author: JoshMeredith

Cabal/src/Distribution/Simple/GHC.hs

@@ -185,10 +185,20 @@ configure verbosity hcPath hcPkgPath conf0 = do
 
   ghcInfo <- Internal.getGhcInfo verbosity implInfo ghcProg
   let ghcInfoMap = Map.fromList ghcInfo
+<<<<<<< HEAD
       extensions = -- workaround https://gitlab.haskell.org/ghc/ghc/-/issues/11214
                    filterExt JavaScriptFFI $
                    -- see 'filterExtTH' comment below
                    filterExtTH $ extensions0
+=======
+      filterJS = if ghcVersion < mkVersion [9, 8] then filterExt JavaScriptFFI else id
+      extensions =
+        -- workaround https://gitlab.haskell.org/ghc/ghc/-/issues/11214
+        filterJS $
+          -- see 'filterExtTH' comment below
+          filterExtTH $
+            extensions0
+>>>>>>> 8c9a71e67 (Revert workaround to filter JavaScriptFFI out on GHC versions where G… (#8979))
 
       -- starting with GHC 8.0, `TemplateHaskell` will be omitted from
       -- `--supported-extensions` when it's not available.