Skip to content

Commit 9c57907

Browse files
committed
remove webpack language from build script
1 parent 71bebb2 commit 9c57907

File tree

1 file changed

+7
-36
lines changed

1 file changed

+7
-36
lines changed

build/Program.fs

+7-36
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ module Fable =
6464
| Watch
6565
| Clean
6666

67-
type Webpack =
68-
| WithoutWebpack
69-
| WithWebpack of args: string option
70-
7167
type Args =
7268
{ Command: Command
7369
Debug: bool
@@ -76,8 +72,7 @@ module Fable =
7672
OutDir: string option
7773
Defines: string list
7874
SourceMaps: bool
79-
AdditionalFableArgs: string option
80-
Webpack: Webpack }
75+
AdditionalFableArgs: string option }
8176

8277
let DefaultArgs =
8378
{ Command = Build
@@ -87,8 +82,7 @@ module Fable =
8782
OutDir = Some "./out"
8883
Defines = []
8984
AdditionalFableArgs = None
90-
SourceMaps = true
91-
Webpack = WithoutWebpack }
85+
SourceMaps = true }
9286

9387
let private mkArgs args =
9488
let fableCmd =
@@ -123,30 +117,11 @@ module Fable =
123117

124118
let fableAdditionalArgs = args.AdditionalFableArgs |> Option.defaultValue ""
125119

126-
let webpackCmd =
127-
match args.Webpack with
128-
| WithoutWebpack -> ""
129-
| WithWebpack webpackArgs ->
130-
sprintf
131-
"--%s webpack %s %s %s"
132-
(match args.Command with
133-
| Watch -> "runWatch"
134-
| _ -> "run")
135-
(if args.Debug then
136-
"--mode=development"
137-
else
138-
"--mode=production")
139-
(if args.Experimental then
140-
"--env.ionideExperimental"
141-
else
142-
"")
143-
(webpackArgs |> Option.defaultValue "")
144-
145120
let sourceMaps = if args.SourceMaps then "-s" else ""
146121

147-
// $"{fableCmd} {fableProjPath} {sourcemaps} {fableOutDir} {fableDebug} {fableExperimental} {fableDefines} {fableAdditionalArgs} {webpackCmd}"
122+
// $"{fableCmd} {fableProjPath} {sourcemaps} {fableOutDir} {fableDebug} {fableExperimental} {fableDefines} {fableAdditionalArgs}"
148123
sprintf
149-
"%s %s %s %s %s %s %s %s %s"
124+
"%s %s %s %s %s %s %s %s"
150125
fableCmd
151126
fableProjPath
152127
sourceMaps
@@ -155,7 +130,6 @@ module Fable =
155130
fableExperimental
156131
fableDefines
157132
fableAdditionalArgs
158-
webpackCmd
159133

160134
let run args =
161135
let cmd = mkArgs args
@@ -298,8 +272,7 @@ let initTargets () =
298272
Fable.run
299273
{ Fable.DefaultArgs with
300274
Command = Fable.Watch
301-
Debug = true
302-
Webpack = Fable.WithoutWebpack })
275+
Debug = true })
303276

304277
Target.create "InstallVSCE" (fun _ ->
305278
Process.killAllByName "npm"
@@ -313,17 +286,15 @@ let initTargets () =
313286
Fable.run
314287
{ Fable.DefaultArgs with
315288
Command = Fable.Build
316-
Debug = false
317-
Webpack = Fable.WithoutWebpack })
289+
Debug = false })
318290

319291
Target.create "Bundle" (fun _ -> Yarn.exec "run bundle" id)
320292

321293
Target.create "RunDevScript" (fun _ ->
322294
Fable.run
323295
{ Fable.DefaultArgs with
324296
Command = Fable.Build
325-
Debug = true
326-
Webpack = Fable.WithoutWebpack })
297+
Debug = true })
327298

328299

329300
Target.create "CopyFSACNetcore" (fun _ ->

0 commit comments

Comments
 (0)