Skip to content

Commit 4526589

Browse files
update everything to get it to run almost everything.
removed fantomas for now
1 parent 1e9805d commit 4526589

28 files changed

+146
-141
lines changed

.config/dotnet-tools.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"paket": {
6-
"version": "7.2.0",
6+
"version": "8.0.0",
77
"commands": [
88
"paket"
99
]
@@ -15,13 +15,13 @@
1515
]
1616
},
1717
"fantomas": {
18-
"version": "6.0.0-alpha-005",
18+
"version": "6.2.3",
1919
"commands": [
2020
"fantomas"
2121
]
2222
},
2323
"fable": {
24-
"version": "4.0.0-theta-018",
24+
"version": "4.6.0",
2525
"commands": [
2626
"fable"
2727
]

build.fsx

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#load "./tools/FSharpLint.fs"
77
#load "./tools/Web.fs"
88
#load "./.fake/build.fsx/intellisense.fsx"
9-
109
open Fake.Core
1110
open Fake.Core.TargetOperators
1211
open Fake.DotNet
@@ -15,8 +14,6 @@ open Fake.IO
1514
open Fake.IO.FileSystemOperators
1615
open Fake.IO.Globbing.Operators
1716
open Fake.Tools
18-
open Fantomas.FakeHelpers
19-
open Fantomas.FormatConfig
2017
open Tools.Linting
2118
open Tools.Web
2219
open System
@@ -144,7 +141,7 @@ Target.create "AssemblyInfo" <| fun _ ->
144141
AssemblyInfo.Configuration <| configuration()
145142
AssemblyInfo.InternalsVisibleTo (sprintf "%s.Tests" projectName) ]
146143

147-
let getProjectDetails projectPath =
144+
let getProjectDetails (projectPath: string) =
148145
let projectName = Path.GetFileNameWithoutExtension(projectPath)
149146
( projectPath,
150147
projectName,
@@ -327,17 +324,20 @@ Target.create "PublishDotNet" <| fun _ ->
327324
// Lint and format source code to ensure consistency
328325

329326
Target.create "Format" <| fun _ ->
330-
let config =
331-
{ FormatConfig.Default with
332-
PageWidth = 120
333-
SpaceBeforeColon = false }
334-
335-
fsSrcAndTest
336-
|> (fun src -> List.fold foldExcludeGlobs src excludeFantomas)
337-
|> List.ofSeq
338-
|> formatCode config
339-
|> Async.RunSynchronously
340-
|> printfn "Formatted files: %A"
327+
// see https://github.com/fsprojects/fantomas/issues/2269
328+
()
329+
//let config =
330+
// { FormatConfig.Default with
331+
// PageWidth = 120
332+
// SpaceBeforeColon = false }
333+
//
334+
//fsSrcAndTest
335+
//|> (fun src -> List.fold foldExcludeGlobs src excludeFantomas)
336+
//|> List.ofSeq
337+
//|> formatCode config
338+
//|> Async.RunSynchronously
339+
//|> printfn "Formatted files: %A"
340+
341341

342342
Target.create "Lint" <| fun _ ->
343343
fsSrcAndTest

global.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"sdk": {
3+
"version": "6.0.302",
4+
"rollForward": "feature"
5+
}
6+
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@
5656
"webpack-dev-server": "^4.11.1"
5757
},
5858
"private": true
59-
}
59+
}

paket.dependencies

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ group Generator
1919
nuget FSharp.Core ~> 7.0
2020
nuget FSharp.Data ~> 6.0.1-beta002
2121

22-
github plotly/plotly.js:7427f14 dist/plot-schema.json
22+
github plotly/plotly.js:c80644edd923500883e57597cddfb695d5815440 dist/plot-schema.json
2323

2424
group Docs
2525
source https://nuget.org/api/v2
@@ -45,13 +45,12 @@ group Tooling
4545
nuget Fake.IO.FileSystem ~> 6.0
4646
nuget FSharp.Core ~> 7.0
4747
nuget FSharp.Json ~> 0.4
48-
nuget FSharpLint.Core ~> 0.21 copy_local: false
48+
nuget FSharpLint.Core
4949
nuget Yarnpkg.Yarn ~> 1.22
5050

5151
group FakeBuild
5252
source https://api.nuget.org/v3/index.json
5353

54-
nuget Fantomas ~> 5.2
5554
nuget Fake.Core.Target ~> 6.0
5655
nuget Fake.Core.ReleaseNotes ~> 6.0
5756
nuget Fake.DotNet.AssemblyInfoFile ~> 6.0
@@ -65,5 +64,5 @@ group FakeBuild
6564
nuget Fake.Tools.Git ~> 6.0
6665
nuget FSharp.Core ~> 7.0
6766
nuget FSharp.Json ~> 0.4
68-
nuget FSharpLint.Core ~> 0.21 copy_local: false
67+
nuget FSharpLint.Core
6968
nuget NuGet.Packaging ~> 6.5

paket.lock

Lines changed: 94 additions & 95 deletions
Large diffs are not rendered by default.

src/Feliz.Generator.Plotly/AssemblyInfo.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ open System.Runtime.CompilerServices
88
[<assembly: AssemblyDescriptionAttribute("Fable bindings written in the Feliz-style for plotly.js")>]
99
[<assembly: AssemblyVersionAttribute("2.1.0")>]
1010
[<assembly: AssemblyFileVersionAttribute("2.1.0")>]
11-
[<assembly: AssemblyConfigurationAttribute("Release")>]
11+
[<assembly: AssemblyConfigurationAttribute("Debug")>]
1212
[<assembly: InternalsVisibleToAttribute("Feliz.Generator.Plotly.Tests")>]
1313
do ()
1414

@@ -18,5 +18,5 @@ module internal AssemblyVersionInformation =
1818
let [<Literal>] AssemblyDescription = "Fable bindings written in the Feliz-style for plotly.js"
1919
let [<Literal>] AssemblyVersion = "2.1.0"
2020
let [<Literal>] AssemblyFileVersion = "2.1.0"
21-
let [<Literal>] AssemblyConfiguration = "Release"
21+
let [<Literal>] AssemblyConfiguration = "Debug"
2222
let [<Literal>] InternalsVisibleTo = "Feliz.Generator.Plotly.Tests"

src/Feliz.Plotly/AssemblyInfo.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ open System.Runtime.CompilerServices
88
[<assembly: AssemblyDescriptionAttribute("Fable bindings written in the Feliz-style for plotly.js")>]
99
[<assembly: AssemblyVersionAttribute("2.1.0")>]
1010
[<assembly: AssemblyFileVersionAttribute("2.1.0")>]
11-
[<assembly: AssemblyConfigurationAttribute("Release")>]
11+
[<assembly: AssemblyConfigurationAttribute("Debug")>]
1212
[<assembly: InternalsVisibleToAttribute("Feliz.Plotly.Tests")>]
1313
do ()
1414

@@ -18,5 +18,5 @@ module internal AssemblyVersionInformation =
1818
let [<Literal>] AssemblyDescription = "Fable bindings written in the Feliz-style for plotly.js"
1919
let [<Literal>] AssemblyVersion = "2.1.0"
2020
let [<Literal>] AssemblyFileVersion = "2.1.0"
21-
let [<Literal>] AssemblyConfiguration = "Release"
21+
let [<Literal>] AssemblyConfiguration = "Debug"
2222
let [<Literal>] InternalsVisibleTo = "Feliz.Plotly.Tests"

src/Feliz.Plotly/Locales.fs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ type Locales =
6767
static member rm : ILocalesProperty = (import "locale" "./Locales/plotly-locale-rm.js")()
6868
static member ro : ILocalesProperty = (import "locale" "./Locales/plotly-locale-ro.js")()
6969
static member ru : ILocalesProperty = (import "locale" "./Locales/plotly-locale-ru.js")()
70+
static member si : ILocalesProperty = (import "locale" "./Locales/plotly-locale-si.js")()
7071
static member sk : ILocalesProperty = (import "locale" "./Locales/plotly-locale-sk.js")()
7172
static member sl : ILocalesProperty = (import "locale" "./Locales/plotly-locale-sl.js")()
7273
static member sq : ILocalesProperty = (import "locale" "./Locales/plotly-locale-sq.js")()

src/Feliz.Plotly/Locales/plotly-locale-cs.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)