Merge branch 'master' into next

backend/Compile.hs

@@ -40,7 +40,7 @@ getName filePath sourceCode =
     Left errors ->
         let
           toString err =
-            Compiler.errorToString Compiler.dummyDealiaser filePath sourceCode err
+            Compiler.errorToString Compiler.dummyLocalizer filePath sourceCode err
         in
           Left (concatMap toString errors)
 

backend/Main.hs

@@ -9,9 +9,6 @@ import Control.Monad.Trans (MonadIO(liftIO))
 import qualified Data.List as List
 import Data.Maybe (isJust)
 import qualified Data.ByteString.Char8 as BSC
-import qualified Elm.Compiler as Compiler
-import qualified Elm.Package as Pkg
-import Elm.Utils ((|>))
 import qualified Network.WebSockets.Snap as WSS
 import System.Console.CmdArgs
 import System.Directory
@@ -22,11 +19,14 @@ import Snap.Util.FileServe
 import qualified Text.Blaze.Html5 as H
 import qualified Text.Blaze.Html.Renderer.Utf8 as Blaze
 
+import qualified StaticFiles
 import qualified Compile
 import qualified Generate.Index as Index
 import qualified Generate.NotFound as NotFound
 import qualified Socket
-import qualified StaticFiles
+import qualified Elm.Compiler as Compiler
+import qualified Elm.Package as Pkg
+import Elm.Utils ((|>))
 
 
 data Flags = Flags

elm-package.json

@@ -12,7 +12,7 @@
     "exposed-modules": [],
     "native-modules": true,
     "dependencies": {
-        "elm-lang/core": "3.0.0 <= v < 4.0.0",
+        "elm-lang/core": "4.0.0 <= v < 5.0.0",
         "evancz/start-app": "2.0.0 <= v < 3.0.0",
         "evancz/elm-effects": "2.0.0 <= v < 3.0.0",
         "evancz/elm-html": "4.0.0 <= v < 5.0.0",

elm-reactor.cabal

@@ -1,7 +1,6 @@
 Name: elm-reactor
 Version: 0.16
 
-
 Synopsis:
   Interactive development tool for Elm programs
 
@@ -15,32 +14,46 @@ Description:
 Homepage:
   http://elm-lang.org
 
-
 License: BSD3
 License-file: LICENSE
 
-
 Author:     Evan Czaplicki
 Maintainer: [email protected]
 Copyright:  Copyright: (c) 2011-2015 Evan Czaplicki
 
-
 Category:
   Compiler, Language
 
-Build-type: Simple
+Build-type:
+  Custom
+
+Data-dir:
+  assets
+
+Data-files:
+  favicon.ico
+  _reactor/debug.js
+  _reactor/wrench.png
+  _reactor/debugger/pause-button-up.png
+  _reactor/debugger/pause-button-down.png
+  _reactor/debugger/pause-button-hover.png
+  _reactor/debugger/play-button-up.png
+  _reactor/debugger/play-button-down.png
+  _reactor/debugger/play-button-hover.png
+  _reactor/debugger/restart-button-up.png
+  _reactor/debugger/restart-button-down.png
+  _reactor/debugger/restart-button-hover.png
+
 Extra-source-files:  README.md
 Cabal-version:       >=1.8
 
-
 source-repository head
   type:     git
   location: git://github.com/elm-lang/elm-reactor.git
 
-
 Executable elm-reactor
   ghc-options:
-    -threaded -O2 -W -Werror
+    -threaded -O2 -W
 
   hs-source-dirs:
     backend
@@ -50,32 +63,23 @@ Executable elm-reactor
 
   other-modules:
     Compile,
-    Generate.Help,
-    Generate.Index,
-    Generate.NotFound,
+    Index,
     Socket,
-    StaticFiles,
-    StaticFiles.Build
+    Utils
 
   Build-depends:
-    aeson >= 0.7,
     base >=4.2 && <5,
     blaze-html,
     blaze-markup,
     bytestring,
     cmdargs,
-    containers,
     directory >= 1.2,
     elm-compiler >= 0.16 && < 0.17,
-    elm-package,
-    file-embed,
     filepath,
     fsnotify >= 0.2,
     mtl,
-    process,
     snap-core,
     snap-server,
-    template-haskell,
     text,
     time,
     transformers,