git.iko.soy/elk
on master help sign in
Make (main : Html msg) work without browser for real
commitaacbe2c5e677bc6832b5262a857d93f1d635d305 authorEvan Czaplicki <evancz@users.noreply.github.com> dateThu 29 Mar 2018, 15:12 (9 years ago) parentfdf2d75
5 files changed+11−5
compare with master
unifiedsplit
builder/src/Elm/Project.hs+2−1 compiler/src/AST/Module/Name.hs+1−1 compiler/src/Elm/Name.hs+6−1 compiler/src/Generate/JavaScript/Expression.hs+1−1 compiler/src/Optimize/Module.hs+1−1
builder/src/Elm/Project.hs+2−1
@@ -25,6 +25,7 @@ import qualified File.Crawl as Crawl
2525import qualified File.Plan as Plan
2626import qualified Generate.Output as Output
2727import qualified Reporting.Task as Task
28+import qualified Stuff.Paths as Path
2829
2930
3031
@@ -76,7 +77,7 @@ compileForRepl source maybeName =
7677
7778generateDocs :: Summary.Summary -> Task.Task Docs.Documentation
7879generateDocs summary@(Summary.Summary root project _ _ _) =
79− do let docsPath = root </> "docs.json"
80+ do let docsPath = root </> Path.docs
8081 args <- Args.fromSummary summary
8182 graph <- Crawl.crawl summary args
8283 (dirty, ifaces) <- Plan.plan (Just docsPath) summary graph
compiler/src/AST/Module/Name.hs+1−1
@@ -111,7 +111,7 @@ sub = Canonical Pkg.core "Platform.Sub"
111111
112112{-# NOINLINE virtualDom #-}
113113virtualDom :: Canonical
114−virtualDom = Canonical Pkg.virtualDom "VirtualDom"
114+virtualDom = Canonical Pkg.virtualDom N.virtualDom
115115
116116
117117{-# NOINLINE debug #-}
compiler/src/Elm/Name.hs+6−1
@@ -26,7 +26,7 @@ module Elm.Name
2626 -- interned
2727 , int, float, bool, char, string
2828 , maybe, result, list, array, tuple, jsArray
29− , task, router, cmd, sub, platform, browser
29+ , task, router, cmd, sub, platform, browser, virtualDom
3030 , shader, debug, bitwise, basics
3131 , utils, negate, value
3232 , node, program, main, dollar, identity
@@ -256,6 +256,11 @@ browser :: Name
256256browser = "Browser"
257257
258258
259+{-# NOINLINE virtualDom #-}
260+virtualDom :: Name
261+virtualDom = "VirtualDom"
262+
263+
259264{-# NOINLINE shader #-}
260265shader :: Name
261266shader = "Shader"
compiler/src/Generate/JavaScript/Expression.hs+1−1
@@ -1008,7 +1008,7 @@ generateMain :: Mode -> I.Interfaces -> ModuleName.Canonical -> Opt.Main -> JS.E
10081008generateMain mode interfaces home main =
10091009 case main of
10101010 Opt.Static ->
1011− JS.Ref (Name.fromKernel "VirtualDom" "init")
1011+ JS.Ref (Name.fromKernel N.virtualDom "init")
10121012 # JS.Ref (Name.fromGlobal home "main")
10131013 # JS.Int 0
10141014 # JS.Int 0
compiler/src/Optimize/Module.hs+1−1
@@ -266,7 +266,7 @@ addDefHelp region annotations home name args body graph@(Opt.Graph mains nodes f
266266 case Type.deepDealias tipe of
267267 Can.TType hm nm [_] | hm == ModuleName.virtualDom && nm == N.node ->
268268 Result.ok $ addMain $ Names.run $
269− Names.registerKernel N.browser Opt.Static
269+ Names.registerKernel N.virtualDom Opt.Static
270270
271271 Can.TType hm nm [flags, message, _] | hm == ModuleName.platform && nm == N.program ->
272272 case Effects.checkPayload flags of