Skip to content

Commit 75e679c

Browse files
baronfelbaronfel
committed
Client 8.0
This reverts commit 734a5fe. add doc for why odd thing was done replace cli invocation with build script update fantomas and format files remove webpack language from build script binding updates fix binding versions fix filters
1 parent bdd2a38 commit 75e679c

33 files changed

+506
-441
lines changed

‎.config/dotnet-tools.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
]
1010
},
1111
"fable": {
12-
"version": "3.7.8",
12+
"version": "3.7.11",
1313
"commands": [
1414
"fable"
1515
]
1616
},
17-
"fantomas-tool": {
18-
"version": "4.7.0",
17+
"fantomas": {
18+
"version": "5.0.0-alpha-007",
1919
"commands": [
2020
"fantomas"
2121
]

‎.github/workflows/pr.yml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
# need to add linux commands first
1515
os: [windows-latest, macos-latest]
1616
dotnet: [6.0.101]
17+
fail-fast: false # we have timing issues on some OS, so we want them all to run
1718
runs-on: ${{ matrix.os }}
1819

1920
steps:

‎build/Program.fs

+14-41
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.WithWebpack None })
275+
Debug = true })
303276

304277
Target.create "InstallVSCE" (fun _ ->
305278
Process.killAllByName "npm"
@@ -313,15 +286,15 @@ let initTargets () =
313286
Fable.run
314287
{ Fable.DefaultArgs with
315288
Command = Fable.Build
316-
Debug = false
317-
Webpack = Fable.WithWebpack None })
289+
Debug = false })
290+
291+
Target.create "Bundle" (fun _ -> Yarn.exec "run bundle" id)
318292

319293
Target.create "RunDevScript" (fun _ ->
320294
Fable.run
321295
{ Fable.DefaultArgs with
322296
Command = Fable.Build
323-
Debug = true
324-
Webpack = Fable.WithWebpack None })
297+
Debug = true })
325298

326299

327300
Target.create "CopyFSACNetcore" (fun _ ->
@@ -397,14 +370,14 @@ let initTargets () =
397370
let buildTargetTree () =
398371
let (==>!) x y = x ==> y |> ignore
399372

400-
"YarnInstall" ==>! "RunScript"
401-
"DotNetRestore" ==>! "RunScript"
402-
403-
"Clean" ==> "Format" ==> "RunScript"
404-
==>! "Default"
373+
"YarnInstall" ==>! "Bundle"
374+
"DotNetRestore" ==>! "Bundle"
375+
"RunScript" ==>! "Bundle"
376+
"Clean" ==> "Format" ==> "Bundle" ==>! "Default"
405377

406378
"Clean"
407379
==> "RunScript"
380+
==> "Bundle"
408381
==> "CopyDocs"
409382
==> "CopyFSACNetcore"
410383
==> "CopyGrammar"

‎bundle.js

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
///esbuild ./out/fsharp.js --bundle --outfile=release/fsharp.js --external:vscode --format=cjs --platform=node --sourcemap
2+
require('esbuild').build({
3+
entryPoints: ['./out/fsharp.js'],
4+
bundle: true,
5+
outfile: 'release/fsharp.js',
6+
external: ['vscode'],
7+
format: 'cjs',
8+
platform: 'node',
9+
sourcemap: true,
10+
logLevel: 'debug'
11+
}).catch((e) => process.exit(1));

‎package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"scripts": {
3-
"gen:semver": "ts2fable node_modules/@types/semver/{classes,functions,internals,ranges}/*.d.ts node_modules/@types/semver/index.d.ts src/Imports/Semver.fs"
3+
"gen:semver": "ts2fable node_modules/@types/semver/{classes,functions,internals,ranges}/*.d.ts node_modules/@types/semver/index.d.ts src/Imports/Semver.fs",
4+
"bundle" : "node bundle.js"
45
},
56
"dependencies": {
67
"htmlparser2": "^4.1.0",
@@ -16,12 +17,13 @@
1617
"@types/ws": "^7.2.6",
1718
"axios": "^0.20.0",
1819
"babel-loader": "^8.1.0",
20+
"esbuild": "^0.14.39",
1921
"mocha": "^8.1.3",
2022
"showdown": "^1.9.1",
2123
"toml": "^3.0.0",
2224
"ts2fable": "^0.8.0-build.618",
2325
"vscode-debugadapter": "^1.44.0",
24-
"vscode-languageclient": "^7.0.0",
26+
"vscode-languageclient": "^8.0.0",
2527
"webpack": "^4.44.1",
2628
"webpack-cli": "^3.3.12",
2729
"ws": "^7.3.1",

‎paket.lock

+33-35
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ NUGET
2222
Fable.Browser.Event (>= 1.5)
2323
Fable.Core (>= 3.0)
2424
FSharp.Core (>= 4.7.2)
25-
Fable.Core (3.6.2)
25+
Fable.Core (3.7.1)
2626
Fable.HtmlConverter (2.1)
2727
Fable.Core (>= 3.1.5)
2828
Thoth.Json (>= 4.1)
@@ -32,19 +32,19 @@ NUGET
3232
Fable.Promise (3.1.3)
3333
Fable.Core (>= 3.1.5)
3434
FSharp.Core (>= 4.7.2)
35-
FSharp.Core (6.0.3)
35+
FSharp.Core (6.0.4)
3636
Thoth.Json (7.0)
3737
Fable.Core (>= 3.1.6)
3838
FSharp.Core (>= 4.7.2)
3939
GIT
4040
remote: https://github.com/ionide/ionide-fsgrammar.git
41-
(8825a76681cdc14801b5d9490372ff67ec6b9711)
41+
(33c42ce4b0960c86837a978fa06c45bc3dec0521)
4242
GITHUB
4343
remote: ionide/ionide-vscode-helpers
44-
src/Fable.Import.Showdown.fs (6ed5341be68452af4f93f7c6e462cdfb58dd0464)
45-
src/Fable.Import.VSCode.fs (6ed5341be68452af4f93f7c6e462cdfb58dd0464)
46-
src/Fable.Import.VSCode.LanguageServer.fs (6ed5341be68452af4f93f7c6e462cdfb58dd0464)
47-
src/Helpers.fs (6ed5341be68452af4f93f7c6e462cdfb58dd0464)
44+
src/Fable.Import.Showdown.fs (8d2fca6c1d49172bdd50b3fcdd6a5d66019dffd0)
45+
src/Fable.Import.VSCode.fs (8d2fca6c1d49172bdd50b3fcdd6a5d66019dffd0)
46+
src/Fable.Import.VSCode.LanguageServer.fs (8d2fca6c1d49172bdd50b3fcdd6a5d66019dffd0)
47+
src/Helpers.fs (8d2fca6c1d49172bdd50b3fcdd6a5d66019dffd0)
4848
GROUP build
4949
STORAGE: NONE
5050
RESTRICTION: == net6.0
@@ -174,12 +174,12 @@ NUGET
174174
FSharp.Core (>= 6.0)
175175
FParsec (1.1.1)
176176
FSharp.Core (>= 4.3.4)
177-
FSharp.Control.Reactive (5.0.2)
177+
FSharp.Control.Reactive (5.0.5)
178178
FSharp.Core (>= 4.7.2)
179-
System.Reactive (>= 5.0)
180-
FSharp.Core (6.0.3)
181-
Microsoft.Build (17.1)
182-
Microsoft.Build.Framework (>= 17.1)
179+
System.Reactive (>= 5.0 < 6.0)
180+
FSharp.Core (6.0.4)
181+
Microsoft.Build (17.2)
182+
Microsoft.Build.Framework (>= 17.2)
183183
Microsoft.NET.StringTools (>= 1.0)
184184
Microsoft.Win32.Registry (>= 4.3)
185185
System.Collections.Immutable (>= 5.0)
@@ -189,12 +189,12 @@ NUGET
189189
System.Text.Encoding.CodePages (>= 4.0.1)
190190
System.Text.Json (>= 6.0)
191191
System.Threading.Tasks.Dataflow (>= 6.0)
192-
Microsoft.Build.Framework (17.1)
192+
Microsoft.Build.Framework (17.2)
193193
Microsoft.Win32.Registry (>= 4.3)
194194
System.Security.Permissions (>= 4.7)
195-
Microsoft.Build.Tasks.Core (17.1)
196-
Microsoft.Build.Framework (>= 17.1)
197-
Microsoft.Build.Utilities.Core (>= 17.1)
195+
Microsoft.Build.Tasks.Core (17.2)
196+
Microsoft.Build.Framework (>= 17.2)
197+
Microsoft.Build.Utilities.Core (>= 17.2)
198198
Microsoft.NET.StringTools (>= 1.0)
199199
Microsoft.Win32.Registry (>= 4.3)
200200
System.CodeDom (>= 4.4)
@@ -205,14 +205,12 @@ NUGET
205205
System.Security.Cryptography.Xml (>= 4.7)
206206
System.Security.Permissions (>= 4.7)
207207
System.Threading.Tasks.Dataflow (>= 6.0)
208-
Microsoft.Build.Utilities.Core (17.1)
209-
Microsoft.Build.Framework (>= 17.1)
208+
Microsoft.Build.Utilities.Core (17.2)
209+
Microsoft.Build.Framework (>= 17.2)
210210
Microsoft.NET.StringTools (>= 1.0)
211211
Microsoft.Win32.Registry (>= 4.3)
212212
System.Collections.Immutable (>= 5.0)
213213
System.Configuration.ConfigurationManager (>= 4.7)
214-
System.Security.Permissions (>= 4.7)
215-
System.Text.Encoding.CodePages (>= 4.0.1)
216214
Microsoft.NET.StringTools (1.0)
217215
System.Memory (>= 4.5.4)
218216
System.Runtime.CompilerServices.Unsafe (>= 5.0)
@@ -221,27 +219,27 @@ NUGET
221219
System.Security.Principal.Windows (>= 5.0)
222220
Microsoft.Win32.SystemEvents (6.0.1)
223221
Mono.Posix.NETStandard (1.0)
224-
MSBuild.StructuredLogger (2.1.630)
222+
MSBuild.StructuredLogger (2.1.669)
225223
Microsoft.Build (>= 16.10)
226224
Microsoft.Build.Framework (>= 16.10)
227225
Microsoft.Build.Tasks.Core (>= 16.10)
228226
Microsoft.Build.Utilities.Core (>= 16.10)
229227
Newtonsoft.Json (13.0.1)
230-
NuGet.Common (6.1)
231-
NuGet.Frameworks (>= 6.1)
232-
NuGet.Configuration (6.1)
233-
NuGet.Common (>= 6.1)
228+
NuGet.Common (6.2)
229+
NuGet.Frameworks (>= 6.2)
230+
NuGet.Configuration (6.2)
231+
NuGet.Common (>= 6.2)
234232
System.Security.Cryptography.ProtectedData (>= 4.4)
235-
NuGet.Frameworks (6.1)
236-
NuGet.Packaging (6.1)
233+
NuGet.Frameworks (6.2)
234+
NuGet.Packaging (6.2)
237235
Newtonsoft.Json (>= 13.0.1)
238-
NuGet.Configuration (>= 6.1)
239-
NuGet.Versioning (>= 6.1)
236+
NuGet.Configuration (>= 6.2)
237+
NuGet.Versioning (>= 6.2)
240238
System.Security.Cryptography.Cng (>= 5.0)
241239
System.Security.Cryptography.Pkcs (>= 5.0)
242-
NuGet.Protocol (6.1)
243-
NuGet.Packaging (>= 6.1)
244-
NuGet.Versioning (6.1)
240+
NuGet.Protocol (6.2)
241+
NuGet.Packaging (>= 6.2)
242+
NuGet.Versioning (6.2)
245243
Octokit (0.49)
246244
System.CodeDom (6.0)
247245
System.Collections.Immutable (6.0)
@@ -252,7 +250,7 @@ NUGET
252250
System.Drawing.Common (6.0)
253251
Microsoft.Win32.SystemEvents (>= 6.0)
254252
System.Formats.Asn1 (6.0)
255-
System.Memory (4.5.4)
253+
System.Memory (4.5.5)
256254
System.Reactive (5.0)
257255
System.Reflection.Metadata (6.0.1)
258256
System.Collections.Immutable (>= 6.0)
@@ -261,7 +259,7 @@ NUGET
261259
System.Security.AccessControl (6.0)
262260
System.Security.Cryptography.Cng (5.0)
263261
System.Formats.Asn1 (>= 5.0)
264-
System.Security.Cryptography.Pkcs (6.0)
262+
System.Security.Cryptography.Pkcs (6.0.1)
265263
System.Formats.Asn1 (>= 6.0)
266264
System.Security.Cryptography.ProtectedData (6.0)
267265
System.Security.Cryptography.Xml (6.0)
@@ -275,7 +273,7 @@ NUGET
275273
System.Runtime.CompilerServices.Unsafe (>= 6.0)
276274
System.Text.Encodings.Web (6.0)
277275
System.Runtime.CompilerServices.Unsafe (>= 6.0)
278-
System.Text.Json (6.0.3)
276+
System.Text.Json (6.0.4)
279277
System.Runtime.CompilerServices.Unsafe (>= 6.0)
280278
System.Text.Encodings.Web (>= 6.0)
281279
System.Threading.Tasks.Dataflow (6.0)

‎src/Components/CodeLensHelpers.fs

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@ open System
44
open Fable.Core.JsInterop
55
open Fable.Import.VSCode
66
open Fable.Import.VSCode.Vscode
7-
open global.Node
8-
9-
module node = Node.Api
107

118
module CodeLensHelpers =
129

13-
let showReferences (args: string) (args2: obj) (args3: obj []) =
10+
let showReferences (args: string) (args2: obj) (args3: obj[]) =
1411
let uri = vscode.Uri.parse args
1512
let pos = vscode.Position.Create(!!args2?Line, !!args2?Character)
1613

0 commit comments

Comments
 (0)