Merge pull request #88 from scalafiddle/version-update

Version update

Author: ochrons

.scalafmt.conf

@@ -1,3 +1,4 @@
+version = 2.3.2
 style = default
 align = more
 maxColumn = 125

.travis.yml

@@ -1,9 +1,9 @@
 language: scala
 scala:
-- 2.12.4
+- 2.12.10
 sudo: false
 jdk:
-- oraclejdk8
+- openjdk8
 script:
 - sbt ++$TRAVIS_SCALA_VERSION server/test client/test
 # Tricks to avoid unnecessary cache updates, from

CONTRIBUTING.md

@@ -23,6 +23,12 @@ You can now start the editor with
 which will launch the Play framework, waiting for a connection on 0.0.0.0:9000. At this point you can already navigate to http://localhost:9000 and use the
 editor.
 
+If you get errors like `Cannot run program "node": Malformed argument has embedded quote`, you may need to add a 
+JVM configuration option and restart `sbt`.
+```
+export JAVA_TOOL_OPTIONS=-Djdk.lang.Process.allowAmbiguousCommands=true
+```
+
 Before you can compile anything, you must also start the `router` and `compilerServer` in the other `sbt` session. These are built on Akka-HTTP instead of Play,
 so you can run them in the background with
 

build.sbt

@@ -1,13 +1,15 @@
 import sbt.Keys._
 import sbt.Project.projectToRef
+import org.scalajs.sbtplugin.ScalaJSPlugin
+import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
+import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
 
-scalafmtOnCompile in ThisBuild := true
-scalafmtVersion in ThisBuild := "1.3.0"
+ThisBuild / scalafmtOnCompile := true
 
 resolvers in ThisBuild += Resolver.jcenterRepo
 
 // a special crossProject for configuring a JS/JVM/shared structure
-lazy val shared = (crossProject.crossType(CrossType.Pure) in file("shared"))
+lazy val shared = (crossProject(JSPlatform, JVMPlatform).crossType(CrossType.Pure) in file("shared"))
   .settings(
     version := Settings.version,
     scalaVersion := Settings.versions.scala,

client/src/main/scala/scalafiddle/client/AppCircuit.scala

@@ -19,8 +19,10 @@ object AppCircuit extends Circuit[AppModel] with ReactConnector[AppModel] {
     AppModel(Home, None, fiddleData, ScalaFiddleHelp(ScalaFiddleConfig.helpURL), LoginData(Empty, Empty))
 
   override protected def actionHandler = composeHandlers(
-    new FiddleHandler(zoomRW(_.fiddleData)((m, v) => m.copy(fiddleData = v)),
-                      zoomRW(_.fiddleId)((m, v) => m.copy(fiddleId = v))),
+    new FiddleHandler(
+      zoomRW(_.fiddleData)((m, v) => m.copy(fiddleData = v)),
+      zoomRW(_.fiddleId)((m, v) => m.copy(fiddleId = v))
+    ),
     new CompilerHandler(zoomRW(_.outputData)((m, v) => m.copy(outputData = v))),
     new LoginHandler(zoomRW(_.loginData)((m, v) => m.copy(loginData = v))),
     navigationHandler
@@ -43,5 +45,5 @@ object AppCircuit extends Circuit[AppModel] with ReactConnector[AppModel] {
         Some(ModelUpdateSilent(model.copy(navLocation = page)))
       case _ =>
         None
-  }
+    }
 }

client/src/main/scala/scalafiddle/client/AppRouter.scala

@@ -24,7 +24,8 @@ object AppRouter {
       import japgolly.scalajs.react.vdom.Implicits._
 
       (staticRoute(root, Home) ~> render(
-        fiddleData(d => FiddleEditor(d, None, AppCircuit.zoom(_.outputData), AppCircuit.zoom(_.loginData))))
+        fiddleData(d => FiddleEditor(d, None, AppCircuit.zoom(_.outputData), AppCircuit.zoom(_.loginData)))
+      )
         | dynamicRouteF(("sf" / string("\\w+") / string(".+")).pmap[EditorPage] { path =>
           Some(EditorPage(path._1, Try(path._2.takeWhile(_.isDigit).toInt).getOrElse(0)))
         }(page => (page.id, page.version.toString)))(p => Some(p.asInstanceOf[EditorPage])) ~> dynRender((p: EditorPage) => {

client/src/main/scala/scalafiddle/client/Utils.scala

@@ -87,9 +87,11 @@ object Mousetrap extends js.Object {
   def bind(key: String | js.Array[String], f: js.Function1[dom.KeyboardEvent, Boolean], event: String = js.native): Unit =
     js.native
 
-  def bindGlobal(key: String | js.Array[String],
-                 f: js.Function1[dom.KeyboardEvent, Boolean],
-                 event: String = js.native): Unit = js.native
+  def bindGlobal(
+      key: String | js.Array[String],
+      f: js.Function1[dom.KeyboardEvent, Boolean],
+      event: String = js.native
+  ): Unit = js.native
 
   def unbind(key: String): Unit = js.native
 

client/src/main/scala/scalafiddle/client/component/EmbedEditor.scala

@@ -71,17 +71,21 @@ object EmbedEditor {
                 label(`for` := "layout")("Direction"),
                 div(cls := "field")(
                   div(cls := "ui radio checkbox")(
-                    input.radio(name := "layout",
-                                checked := state.layout.isInstanceOf[Horizontal],
-                                onChange --> layoutChanged(Horizontal(state.layout.split))),
+                    input.radio(
+                      name := "layout",
+                      checked := state.layout.isInstanceOf[Horizontal],
+                      onChange --> layoutChanged(Horizontal(state.layout.split))
+                    ),
                     label("Horizontal")
                   )
                 ),
                 div(cls := "field")(
                   div(cls := "ui radio checkbox")(
-                    input.radio(name := "layout",
-                                checked := state.layout.isInstanceOf[Vertical],
-                                onChange --> layoutChanged(Vertical(state.layout.split))),
+                    input.radio(
+                      name := "layout",
+                      checked := state.layout.isInstanceOf[Vertical],
+                      onChange --> layoutChanged(Vertical(state.layout.split))
+                    ),
                     label("Vertical")
                   )
                 )

client/src/main/scala/scalafiddle/client/component/FiddleEditor.scala

@@ -26,10 +26,12 @@ object FiddleEditor {
 
   case class EditorBinding(name: String, keys: String, action: () => Any)
 
-  case class Props(data: ModelProxy[FiddleData],
-                   fiddleId: Option[FiddleId],
-                   outputData: ModelR[AppModel, OutputData],
-                   loginData: ModelR[AppModel, LoginData]) {
+  case class Props(
+      data: ModelProxy[FiddleData],
+      fiddleId: Option[FiddleId],
+      outputData: ModelR[AppModel, OutputData],
+      loginData: ModelR[AppModel, LoginData]
+  ) {
     def dispatch(a: Action) = data.dispatchCB(a)
   }
 
@@ -96,15 +98,19 @@ object FiddleEditor {
             ),
             div(cls := "ui basic button", onClick --> props.dispatch(SaveFiddle(reconstructSource(state))))(
               Icon.pencil,
-              "Save").when(showSave),
+              "Save"
+            ).when(showSave),
             div(cls := "ui basic button", onClick --> props.dispatch(UpdateFiddle(reconstructSource(state))))(
               Icon.pencil,
-              "Update").when(showUpdate),
+              "Update"
+            ).when(showUpdate),
             div(cls := "ui basic button", onClick --> props.dispatch(ForkFiddle(reconstructSource(state))))(
               Icon.codeFork,
-              "Fork").when(fiddleHasId),
+              "Fork"
+            ).when(fiddleHasId),
             Dropdown("top basic button embed-options", span("Embed", Icon.caretDown))(_ =>
-              div(cls := "menu", display.block)(EmbedEditor(props.fiddleId.get))).when(fiddleHasId)
+              div(cls := "menu", display.block)(EmbedEditor(props.fiddleId.get))
+            ).when(fiddleHasId)
           ),
           div(cls := "right")(
             div(cls := "ui basic button", onClick --> props.dispatch(ShowHelp(ScalaFiddleConfig.helpURL)))(
@@ -128,7 +134,8 @@ object FiddleEditor {
                         label("Show template")
                       )
                     )
-                ))
+                  )
+                )
               ),
               div.ref(editorRef = _)(id := "editor")
             ),
@@ -143,7 +150,7 @@ object FiddleEditor {
                     width := "100%",
                     height := "100%",
                     frameBorder := "0",
-                    sandbox := "allow-scripts allow-popups allow-popups-to-escape-sandbox",
+                    sandbox := "allow-scripts allow-popups allow-popups-to-escape-sandbox allow-forms",
                     src := s"/resultframe?theme=light"
                   )
                 )
@@ -195,7 +202,7 @@ object FiddleEditor {
                     width := "0%",
                     height := "0%",
                     frameBorder := "0",
-                    sandbox := "allow-scripts allow-popups allow-popups-to-escape-sandbox",
+                    sandbox := "allow-scripts allow-popups allow-popups-to-escape-sandbox allow-forms",
                     src := s"/resultframe?theme=light"
                   )
                 )
@@ -345,26 +352,30 @@ object FiddleEditor {
         editor.updateDynamic("$blockScrolling")(Double.PositiveInfinity)
 
         val globalBindings = Seq(
-          EditorBinding("Compile",
-                        "enter",
-                        () =>
-                          beginCompilation().foreach(_ => {
-                            buildFullSource
-                              .flatMap { source =>
-                                props.dispatch(compile(source, FastOpt))
-                              }
-                              .runNow()
-                          })),
-          EditorBinding("FullOptimize",
-                        "shift+enter",
-                        () =>
-                          beginCompilation().foreach(_ => {
-                            buildFullSource
-                              .flatMap { source =>
-                                props.dispatch(compile(source, FullOpt))
-                              }
-                              .runNow()
-                          })),
+          EditorBinding(
+            "Compile",
+            "enter",
+            () =>
+              beginCompilation().foreach(_ => {
+                buildFullSource
+                  .flatMap { source =>
+                    props.dispatch(compile(source, FastOpt))
+                  }
+                  .runNow()
+              })
+          ),
+          EditorBinding(
+            "FullOptimize",
+            "shift+enter",
+            () =>
+              beginCompilation().foreach(_ => {
+                buildFullSource
+                  .flatMap { source =>
+                    props.dispatch(compile(source, FullOpt))
+                  }
+                  .runNow()
+              })
+          ),
           EditorBinding("Show JavaScript", "j", () => $.state.map(state => showJSCode(state)).runNow()),
           EditorBinding(
             "Save",
@@ -407,7 +418,8 @@ object FiddleEditor {
                 "sender" -> "editor|cli"
               ),
               "exec" -> func
-            ))
+            )
+          )
         }
 
         // register auto complete
@@ -439,7 +451,8 @@ object FiddleEditor {
                 }
               }
             )
-            .value)
+            .value
+        )
 
         // focus to the editor
         editor.focus()
@@ -460,8 +473,9 @@ object FiddleEditor {
         props.dispatch(UpdateLoginInfo) >>
         updateFiddle(props.data()) >>
         Callback.when(props.fiddleId.isDefined)(
-          props.dispatch(
-            compile(addDeps(props.data().sourceCode, props.data().libraries, props.data().scalaVersion), FastOpt)))
+          props
+            .dispatch(compile(addDeps(props.data().sourceCode, props.data().libraries, props.data().scalaVersion), FastOpt))
+        )
     }
 
     val fiddleStart = """\s*// \$FiddleStart\s*$""".r
@@ -497,7 +511,8 @@ object FiddleEditor {
           val indent = main.filter(_.nonEmpty).map(_.takeWhile(_ == ' ').length).min
           editor.getSession().setValue(main.map(_.drop(indent)).mkString("\n"))
           $.setState(
-            state.copy(preCode = pre, mainCode = main, postCode = post, indent = indent, lastModified = fiddle.modified))
+            state.copy(preCode = pre, mainCode = main, postCode = post, indent = indent, lastModified = fiddle.modified)
+          )
         }
       }
     }
@@ -590,9 +605,11 @@ object FiddleEditor {
             // start running the code after a short delay, to allow DOM to update in case the code is slow to complete
             js.timers.setTimeout(30) {
               // pass compiled data to the iframe
-              val data = js.Dynamic.literal(code = jsCode,
-                                            jsDeps = compilerData.jsDeps.toJSArray,
-                                            cssDeps = compilerData.cssDeps.toJSArray)
+              val data = js.Dynamic.literal(
+                code = jsCode,
+                jsDeps = compilerData.jsDeps.toJSArray,
+                cssDeps = compilerData.cssDeps.toJSArray
+              )
               sendFrameCmd("code", data)
             }
           }
@@ -617,9 +634,11 @@ object FiddleEditor {
     .componentWillReceiveProps(scope => scope.backend.updateProps(scope.nextProps, scope.state))
     .build
 
-  def apply(data: ModelProxy[FiddleData],
-            fiddleId: Option[FiddleId],
-            compilerData: ModelR[AppModel, OutputData],
-            loginData: ModelR[AppModel, LoginData]) =
+  def apply(
+      data: ModelProxy[FiddleData],
+      fiddleId: Option[FiddleId],
+      compilerData: ModelR[AppModel, OutputData],
+      loginData: ModelR[AppModel, LoginData]
+  ) =
     component(Props(data, fiddleId, compilerData, loginData))
 }

client/src/main/scala/scalafiddle/client/component/Sidebar.scala

@@ -86,18 +86,23 @@ object Sidebar {
           ),
           div(cls := "title", "Libraries", i(cls := "icon dropdown")),
           div(cls := "content")(
-            div(cls := "ui horizontal divider header",
-                (style := js.Dynamic.literal(display = "none")).when(fd.libraries.isEmpty),
-                "Selected"),
+            div(
+              cls := "ui horizontal divider header",
+              (style := js.Dynamic.literal(display = "none")).when(fd.libraries.isEmpty),
+              "Selected"
+            ),
             div(cls := "liblist", (style := js.Dynamic.literal(display = "none")).when(fd.libraries.isEmpty))(
               div(cls := "ui middle aligned divided list")(
-                fd.libraries.toTagMod(renderLibrary(_, SelectedLib, fd.scalaVersion, props.dispatch)))
+                fd.libraries.toTagMod(renderLibrary(_, SelectedLib, fd.scalaVersion, props.dispatch))
+              )
             ),
             div(cls := "ui horizontal divider header", "Available"),
             div(cls := "ui checkbox")(
-              input.checkbox(name := "all-versions",
-                             checked := state.showAllVersions,
-                             onChange --> $.modState(s => s.copy(showAllVersions = !s.showAllVersions))),
+              input.checkbox(
+                name := "all-versions",
+                checked := state.showAllVersions,
+                onChange --> $.modState(s => s.copy(showAllVersions = !s.showAllVersions))
+              ),
               label("Show all versions")
             ),
             div(cls := "liblist")(
@@ -159,11 +164,13 @@ object Sidebar {
       div(cls := "item")(
         div(cls := "right floated")(
           lib.exampleUrl
-            .map(
-              url =>
-                button(cls := s"mini ui icon basic button",
-                       title := s"Load example fiddle for ${lib.name}",
-                       onClick --> dispatch(LoadFiddle(url)))(i(cls := "file code outline icon codeicon")))
+            .map(url =>
+              button(
+                cls := s"mini ui icon basic button",
+                title := s"Load a sample fiddle for ${lib.name}",
+                onClick --> dispatch(LoadFiddle(url))
+              )(i(cls := "file code outline icon codeicon"))
+            )
             .whenDefined
             .when(mode == SelectedLib),
           button(cls := s"mini ui icon basic button", onClick --> dispatch(action))(icon)
@@ -172,7 +179,8 @@ object Sidebar {
           div(cls := "content left floated")(
             b(lib.name),
             " ",
-            span(cls := (if (lib.scalaVersions.contains(scalaVersion)) "text grey" else "text red"), lib.version))
+            span(cls := (if (lib.scalaVersions.contains(scalaVersion)) "text grey" else "text red"), lib.version)
+          )
         )
       )
     }
@@ -185,7 +193,8 @@ object Sidebar {
     .componentDidMount(_ =>
       Callback {
         JQueryStatic(accordionRef).accordion(js.Dynamic.literal(exclusive = true, animateChildren = false))
-    })
+      }
+    )
     .build
 
   def apply(data: ModelProxy[FiddleData]) = component(Props(data))