Merge pull request #163 from fable-compiler/repl4

Update to Fable 4 (multi-lang selection)

Author: alfonsogarciacaro

.config/dotnet-tools.json

@@ -15,7 +15,7 @@
       ]
     },
     "fable": {
-      "version": "3.2.11",
+      "version": "4.0.0-snake-island-alpha-024",
       "commands": [
         "fable"
       ]

CHANGELOG.md

@@ -6,6 +6,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## 4.0.0-alpha-022
+
+* Fable 4 alpha-22
+* Fix JS compilation
+
+## 4.0.0-alpha-016
+
+* Fable 4 -alpha-016
+* Save language selection and selected output tab
+
+## 4.0.0-alpha-001
+
+* Fable 4 alpha
+* Target language selection
+
 ## 3.7.10
 
 * Update Fable and fix typo

build.fsx

@@ -37,7 +37,10 @@ let METADATA_LIB, STANDALONE_DIST, STANDALONE_SRC =
     | Some _ ->
         printfn "Using local packages..."
         "../Fable/src/fable-metadata/lib", "../Fable/src/fable-standalone/dist", "../Fable/src/fable-standalone/src"
-    | None -> "node_modules/fable-metadata/lib", "node_modules/fable-standalone/dist", "node_modules/fable-standalone/src"
+    | None ->
+        printfn "Using fable-metadata/fable-standalone packages from node_modules..."
+        printfn "To use local pacakges, set LOCAL_PKG env var and run `./build.sh standalone` in sibling Fable repository\n"
+        "node_modules/fable-metadata/lib", "node_modules/fable-standalone/dist", "node_modules/fable-standalone/src"
 
 module Util =
 
@@ -128,7 +131,10 @@ let copyModules = BuildTask.create "CopyModules" [ npmInstall ] {
         Shell.rename (filename + ".txt") filename
     )
 
+    printfn "Copy files from %s to %s" STANDALONE_DIST REPL_OUTPUT
     Shell.copyDir REPL_OUTPUT STANDALONE_DIST (fun _ -> true)
+
+    printfn "Copy files from %s to %s" STANDALONE_SRC "src/Standalone"
     Shell.copyDir "src/Standalone" STANDALONE_SRC (fun f -> f.EndsWith(".fs"))
 }
 
@@ -168,11 +174,11 @@ let buildLib = BuildTask.create "BuildLib" [ copyModules ] {
     )
 }
 
-let buildApp = BuildTask.create "BuildApp" [ updatePreludeREPLVersion.IfNeeded; buildLib ] {
+let buildApp = BuildTask.create "BuildApp" [ updatePreludeREPLVersion.IfNeeded ] {
     Npm.run "build" id
 }
 
-let watchApp = BuildTask.create "WatchApp" [ ] {
+let watchApp = BuildTask.create "WatchApp" [ copyModules ] {
     Npm.run "start" id
 }
 

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.300",
+    "version": "6.0.100",
     "rollForward": "minor"
   }
 }

package-lock.json

@@ -13,7 +13,7 @@ nuget Thoth.Json
 nuget Thoth.Elmish.Toast ~> 2
 nuget Fable.Fetch
 nuget Fable.FontAwesome.Free
-nuget Feliz
+nuget Feliz prerelease
 nuget Feliz.Bulma
 nuget Feliz.Bulma.Tooltip
 nuget Fable.Browser.Css

paket.dependencies

@@ -2,7 +2,7 @@ STORAGE: NONE
 RESTRICTION: == netstandard2.0
 NUGET
   remote: https://www.nuget.org/api/v2
-    Fable.AST (3.1.1)
+    Fable.AST (4.0)
     Fable.Browser.Blob (1.1.4)
       Fable.Core (>= 3.0)
       FSharp.Core (>= 4.7.2)
@@ -76,10 +76,10 @@ NUGET
       Fable.Browser.Dom (>= 2.4.4)
       Fable.Core (>= 3.2.7)
       FSharp.Core (>= 4.7.2)
-    Feliz (1.51)
+    Feliz (2.0.0-prerelease-002)
       Fable.Core (>= 3.1.5)
       Fable.React (>= 7.4)
-      Feliz.CompilerPlugins (>= 1.6)
+      Feliz.CompilerPlugins (>= 2.0.0-prerelease-002)
       FSharp.Core (>= 4.7.2)
     Feliz.Bulma (2.17)
       Feliz (>= 1.32)
@@ -88,8 +88,8 @@ NUGET
       Feliz (>= 1.32)
       Feliz.Bulma (>= 2.8.1)
       FSharp.Core (>= 5.0)
-    Feliz.CompilerPlugins (1.6)
-      Fable.AST (>= 3.0)
+    Feliz.CompilerPlugins (2.0.0-prerelease-002)
+      Fable.AST (>= 4.0)
       FSharp.Core (>= 4.7.2)
     FsCheck (2.16)
       FSharp.Core (>= 4.2.3)
@@ -129,15 +129,15 @@ GITHUB
       SourceLink.Create.CommandLine
       Unquote
   remote: fable-compiler/fable-promise
-    FULLPROJECT (703b555263cafc86f90ce82a1405864443a041cc)
+    FULLPROJECT (14eca483d664dce5aebbe50fb92a536a7c1ffe53)
   remote: alfonsogarciacaro/Feliz.Engine
-    FULLPROJECT (f08a3bd19ea854ace8b308c4eb2290c0c001e916)
+    FULLPROJECT (61152aebd6c0b7878bfc4db05e2e10724b434a3e)
   remote: alfonsogarciacaro/Feliz.Snabbdom
     FULLPROJECT (7b28ccbceebcc9b66a8cb67aab89b7ae9576dbfb)
   remote: davedawkins/Feliz.Engine.Bulma
-    FULLPROJECT (e960f99e842b362f6cc54524d857d12557da520b)
+    FULLPROJECT (0df54855ac3464a432cd207412ab66e650a87d77)
   remote: davedawkins/Sutil
-    FULLPROJECT (98be5f8441787929b14ba460a253f5b33b1c4d5f)
+    FULLPROJECT (343bc31867127638a79afede0dcaa97ca56fa264)
 GROUP netcorebuild
 NUGET
   remote: https://www.nuget.org/api/v2

paket.lock

@@ -15,14 +15,14 @@ module Keyboard =
 
     /// Update the state of the set for given key event
     let update (e : KeyboardEvent, pressed) =
-        let keyCode = int e.keyCode
+        let key = e.key
         let op =  if pressed then Set.add else Set.remove
-        keysPressed <- op keyCode keysPressed
+        keysPressed <- op key keysPressed
 
     /// Returns pair with -1 for left or down and +1
     /// for right or up (0 if no or both keys are pressed)
     let arrows () =
-        (code 39 - code 37, code 38 - code 40)
+        (code "ArrowRight" - code "ArrowLeft", code "ArrowUp" - code "ArrowDown")
 
     let initKeyboard () =
         document.addEventListener("keydown", fun e -> update(e :?> _, true))

public/samples/games/mario.fs

@@ -15,27 +15,31 @@ module Keyboard =
 
     let code x = if keysPressed.Contains(x) then 1 else 0
 
-    let arrows () = (code 39 - code 37, code 38 - code 40)
+    let arrows () =
+        (code "ArrowRight" - code "ArrowLeft", code "ArrowUp" - code "ArrowDown")
 
     let update (e : KeyboardEvent, pressed) =
-        let keyCode = int e.keyCode
+        let key = e.key
         let op = if pressed then Set.add else Set.remove
-        keysPressed <- op keyCode keysPressed
+        keysPressed <- op key keysPressed
 
     let init () =
         window.addEventListener("keydown", fun e -> update(e :?> _, true))
         window.addEventListener("keyup", fun e -> update(e :?> _, false))
 
 // Main
 
+/// Scale to make it fit in a 1920*1080 screen
+let scale = 0.8
+
 /// The width of the canvas
-let width = 900.
+let width = 900. * scale
 /// The height of the canvas
-let height = 668.
+let height = 668. * scale
 /// Height of the floor - the bottom black part
-let floorHeight = 100.
+let floorHeight = 100. * scale
 /// Height of the atmosphere - the yellow gradient
-let atmosHeight = 300.
+let atmosHeight = 300. * scale
 
 Keyboard.init()
 
@@ -44,7 +48,6 @@ let ctx = canvas.getContext_2d()
 canvas.width <- width
 canvas.height <- height
 
-
 /// Draw gradient between two Y offsets and two colours
 let drawGrd (ctx:CanvasRenderingContext2D)
     (canvas:HTMLCanvasElement) (y0,y1) (c0,c1) =