Merge pull request #3561 from nojaf/carve-out

fable-compiler · Dec 12, 2023 · bd08800 · bd08800
2 parents 9276528 + 51b7876
commit bd08800
Show file tree

Hide file tree

Showing 25 changed files with 1,146 additions and 584 deletions.
diff --git a/Fable.sln b/Fable.sln
@@ -62,6 +62,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fable.Tests.Spaces", "tests
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fable.Build", "src\Fable.Build\Fable.Build.fsproj", "{F2E323CE-FDF3-4A1E-AE97-B723D2E63763}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Fable.Compiler", "src\Fable.Compiler\Fable.Compiler.fsproj", "{942DD29B-07C0-4ACF-891E-85C1235A9BE0}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -160,6 +162,10 @@ Global
 		{F2E323CE-FDF3-4A1E-AE97-B723D2E63763}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F2E323CE-FDF3-4A1E-AE97-B723D2E63763}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F2E323CE-FDF3-4A1E-AE97-B723D2E63763}.Release|Any CPU.Build.0 = Release|Any CPU
+		{942DD29B-07C0-4ACF-891E-85C1235A9BE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{942DD29B-07C0-4ACF-891E-85C1235A9BE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{942DD29B-07C0-4ACF-891E-85C1235A9BE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{942DD29B-07C0-4ACF-891E-85C1235A9BE0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -189,6 +195,7 @@ Global
 		{F9134F40-C6CD-4368-A28E-33E5102FD4AB} = {CF0A8EC3-841F-4A54-B9FC-8D174CCD4A90}
 		{C90E23AF-4B5B-44A7-ADCC-3BF89547395B} = {DA29278E-3808-42DE-8333-964F129F295D}
 		{F2E323CE-FDF3-4A1E-AE97-B723D2E63763} = {C8CB96CF-68A8-4083-A0F8-319275CF8097}
+		{942DD29B-07C0-4ACF-891E-85C1235A9BE0} = {C8CB96CF-68A8-4083-A0F8-319275CF8097}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {58DF9285-8523-4EAC-B598-BE5B02A76A00}

diff --git a/src/Fable.Build/Publish.fs b/src/Fable.Build/Publish.fs
@@ -155,6 +155,7 @@ let handle (args: string list) =
 
     publishNuget ProjectDir.fableAst
     publishNuget ProjectDir.fableCore
+    publishNuget ProjectDir.fableCompiler
     publishNuget ProjectDir.fableCli
     publishNuget ProjectDir.fablePublishUtils
 

diff --git a/src/Fable.Build/Workspace.fs b/src/Fable.Build/Workspace.fs
@@ -11,6 +11,7 @@ module ProjectDir =
     let fableCore = Path.Resolve("src", "Fable.Core")
     let fableCli = Path.Resolve("src", "Fable.Cli")
     let fablePublishUtils = Path.Resolve("src", "Fable.PublishUtils")
+    let fableCompiler = Path.Resolve("src", "Fable.Compiler")
     let temp_fable_library = Path.Resolve("temp", "fable-library")
     let fable_library = Path.Resolve("src", "fable-library")
     let fable_metadata = Path.Resolve("src", "fable-metadata")

diff --git a/src/Fable.Cli/Entry.fs b/src/Fable.Cli/Entry.fs
@@ -3,6 +3,7 @@ module Fable.Cli.Entry
 open System
 open Main
 open Fable
+open Fable.Compiler.Util
 
 type CliArgs(args: string list) =
     let argsMap =

diff --git a/src/Fable.Cli/Fable.Cli.fsproj b/src/Fable.Cli/Fable.Cli.fsproj
@@ -50,11 +50,7 @@
     <Content Include="..\fable-library-php\**\*.*" PackagePath="fable-library-php\" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Util.fsi" />
-    <Compile Include="Util.fs" />
     <Compile Include="Contributors.fs" />
-    <Compile Include="Globbing.fs" />
-    <Compile Include="ProjectCracker.fs" />
     <Compile Include="Printers.fs" />
     <Compile Include="FileWatchers.fsi" />
     <Compile Include="FileWatchers.fs" />
@@ -65,6 +61,7 @@
     <Content Include="Properties\launchSettings.json" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Fable.Compiler\Fable.Compiler.fsproj" />
     <ProjectReference Include="..\Fable.Transforms\Fable.Transforms.fsproj" />
     <Reference Include="../../lib/fcs/FSharp.Compiler.Service.dll" />
     <Reference Include="../../lib/fcs/FSharp.DependencyManager.Nuget.dll" />

diff --git a/src/Fable.Cli/FileWatchers.fs b/src/Fable.Cli/FileWatchers.fs
@@ -12,7 +12,7 @@ open System.Threading
 open System.Collections.Generic
 open System.Diagnostics
 open System.Text.RegularExpressions
-open Fable.Cli.Globbing
+open Fable.Compiler.Globbing
 
 type IFileSystemWatcher =
     inherit IDisposable