Upgrade to Nagareyama

.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "fable": {
+      "version": "3.0.0-nagareyama-alpha-007",
+      "commands": [
+        "fable"
+      ]
+    }
+  }
+}

.gitignore

@@ -1,3 +1,4 @@
+*.fs.js
 public/bundle.js*
 
 # Node

.vscode/launch.json

@@ -0,0 +1,26 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "args": [
+                "-r",
+                "esm",
+                "--timeout",
+                "999999",
+                "--colors",
+                "${workspaceFolder}/dist/tests"
+            ],
+            "internalConsoleOptions": "openOnSessionStart",
+            "name": "Mocha Tests",
+            "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "pwa-node"
+        },
+    ]
+}

package.json

@@ -3,19 +3,17 @@
     "scripts": {
         "build": "webpack-cli --mode production",
         "start": "webpack-dev-server",
-        "pretest": "fable-splitter test -o dist/tests --commonjs",
-        "test": "mocha dist/tests",
-        "headless-tests": "webpack-cli --mode production && dotnet run --project ./headless/Headless.fsproj"
+        "pretest": "dotnet fable test --outDir dist/tests",
+        "test": "mocha dist/tests -r esm",
+        "headless-tests": "dotnet fable test && webpack-cli --mode production && dotnet run --project ./headless/Headless.fsproj"
     },
     "devDependencies": {
         "@babel/core": "^7.0.0",
         "@babel/polyfill": "^7.0.0",
         "@babel/preset-env": "^7.0.0",
         "babel-loader": "^8.0.0",
-        "fable-compiler": "^2.10.1",
-        "fable-loader": "^2.1.9",
-        "fable-splitter": "^2.1.13",
-        "mocha": "^6.2.0",
+        "esm": "^3.2.25",
+        "mocha": "^8.1.3",
         "webpack": "^4.27.1",
         "webpack-cli": "^3.3.12",
         "webpack-dev-server": "^3.11.0"

src/Json.Converter.fs

@@ -251,8 +251,8 @@ module Convert =
                         failwithf "Union of records of type '%s' cannot be deserialized with the value of the discriminator key is not a string to match against a specific union case" unionType.Name
             | otherwise ->
                 // TODO!!! Better error messages here
-                let unexpectedJson = JS.JSON.stringify otherwise
-                let expectedType = JS.JSON.stringify cases
+                let unexpectedJson = string otherwise
+                let expectedType = string cases
                 failwithf "Expected JSON:\n%s\nto match the type\n%s" unexpectedJson expectedType
         | JNull, TypeInfo.Option _ -> unbox None
         | jsonValue, TypeInfo.Option optionalTypeDelayed when jsonValue <> JNull ->
@@ -337,8 +337,8 @@ module Convert =
                         FSharpValue.MakeUnion(caseInfo, parsedValues)
                         |> unbox
             | otherwise ->
-                let unexpectedJson = JS.JSON.stringify otherwise
-                let expectedType = JS.JSON.stringify cases
+                let unexpectedJson = string otherwise
+                let expectedType = string cases
                 failwithf "Expected JSON:\n%s\nto match the type\n%s" unexpectedJson expectedType
         // Arrays
         | JArray values, TypeInfo.Array elementTypeDelayed ->
@@ -533,7 +533,7 @@ module Convert =
             let unknownType = getType()
             failwithf "Cannot convert %s to %s" (SimpleJson.toString input) unknownType.FullName
         | _ ->
-            failwithf "Cannot convert %s to %s" (SimpleJson.toString input) (JS.JSON.stringify typeInfo)
+            failwithf "Cannot convert %s to %s" (SimpleJson.toString input) (string typeInfo)
 
     let fromJson<'t> json typeInfo =
         unbox<'t> (fromJsonAs json typeInfo)

src/SimpleJson.fs

@@ -66,11 +66,11 @@ module SimpleJson =
         if isNullOrUndefined value
         then JS.JSON.stringify(null)
         else JS.JSON.stringify(value, (fun key v ->
-            if isDateOffset (get key jsThis) then
-                let dateOffset : DateTimeOffset = get key jsThis
+            if isDateOffset v then
+                let dateOffset : DateTimeOffset = !!v
                 box (dateOffset.ToString("O"))
-            elif isBigInt (get key jsThis) then
-                let bigInt : bigint = get key jsThis
+            elif isBigInt v then
+                let bigInt : bigint = !!v
                 box (string (decimal bigInt))
             else
             match v with

webpack.config.js

@@ -18,7 +18,7 @@ module.exports = function (evn, argv) {
   mode: mode,
   devtool: isProduction ? false : "eval-source-map",
   entry: {
-    app: ["@babel/polyfill", "./test/Tests.fsproj"]
+    app: ["@babel/polyfill", "./test/Tests.fs.js"]
   },
   output: {
     filename: 'bundle.js',
@@ -30,10 +30,6 @@ module.exports = function (evn, argv) {
   },
   module: {
     rules: [
-      {
-        test: /\.fs(x|proj)?$/,
-        use: "fable-loader"
-      },
       {
         test: /\.js$/,
         exclude: /node_modules/,