git.iko.soy/elk
on master help sign in
Make (main : Html msg) work without browser for real
aacbe2cEvan Czaplicki
builder/src/Elm/Project.hs+2−1
compare with master
unifiedsplit
@@ -25,6 +25,7 @@ import qualified File.Crawl as Crawl
25import qualified File.Plan as Plan
25import qualified File.Plan as Plan
26import qualified Generate.Output as Output
26import qualified Generate.Output as Output
27import qualified Reporting.Task as Task
27import qualified Reporting.Task as Task
28+import qualified Stuff.Paths as Path
28
29
29
30
30
31
@@ -76,7 +77,7 @@ compileForRepl source maybeName =
76
77
77generateDocs :: Summary.Summary -> Task.Task Docs.Documentation
78generateDocs :: Summary.Summary -> Task.Task Docs.Documentation
78generateDocs summary@(Summary.Summary root project _ _ _) =
79generateDocs summary@(Summary.Summary root project _ _ _) =
79− do let docsPath = root </> "docs.json"
80+ do let docsPath = root </> Path.docs
80 args <- Args.fromSummary summary
81 args <- Args.fromSummary summary
81 graph <- Crawl.crawl summary args
82 graph <- Crawl.crawl summary args
82 (dirty, ifaces) <- Plan.plan (Just docsPath) summary graph
83 (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"
111
111
112{-# NOINLINE virtualDom #-}
112{-# NOINLINE virtualDom #-}
113virtualDom :: Canonical
113virtualDom :: Canonical
114−virtualDom = Canonical Pkg.virtualDom "VirtualDom"
114+virtualDom = Canonical Pkg.virtualDom N.virtualDom
115
115
116
116
117{-# NOINLINE debug #-}
117{-# NOINLINE debug #-}
compiler/src/Elm/Name.hs+6−1
@@ -26,7 +26,7 @@ module Elm.Name
26 -- interned
26 -- interned
27 , int, float, bool, char, string
27 , int, float, bool, char, string
28 , maybe, result, list, array, tuple, jsArray
28 , maybe, result, list, array, tuple, jsArray
29− , task, router, cmd, sub, platform, browser
29+ , task, router, cmd, sub, platform, browser, virtualDom
30 , shader, debug, bitwise, basics
30 , shader, debug, bitwise, basics
31 , utils, negate, value
31 , utils, negate, value
32 , node, program, main, dollar, identity
32 , node, program, main, dollar, identity
@@ -256,6 +256,11 @@ browser :: Name
256browser = "Browser"
256browser = "Browser"
257
257
258
258
259+{-# NOINLINE virtualDom #-}
260+virtualDom :: Name
261+virtualDom = "VirtualDom"
262+
263+
259{-# NOINLINE shader #-}
264{-# NOINLINE shader #-}
260shader :: Name
265shader :: Name
261shader = "Shader"
266shader = "Shader"
compiler/src/Generate/JavaScript/Expression.hs+1−1
@@ -1008,7 +1008,7 @@ generateMain :: Mode -> I.Interfaces -> ModuleName.Canonical -> Opt.Main -> JS.E
1008generateMain mode interfaces home main =
1008generateMain mode interfaces home main =
1009 case main of
1009 case main of
1010 Opt.Static ->
1010 Opt.Static ->
1011− JS.Ref (Name.fromKernel "VirtualDom" "init")
1011+ JS.Ref (Name.fromKernel N.virtualDom "init")
1012 # JS.Ref (Name.fromGlobal home "main")
1012 # JS.Ref (Name.fromGlobal home "main")
1013 # JS.Int 0
1013 # JS.Int 0
1014 # JS.Int 0
1014 # 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
266 case Type.deepDealias tipe of
266 case Type.deepDealias tipe of
267 Can.TType hm nm [_] | hm == ModuleName.virtualDom && nm == N.node ->
267 Can.TType hm nm [_] | hm == ModuleName.virtualDom && nm == N.node ->
268 Result.ok $ addMain $ Names.run $
268 Result.ok $ addMain $ Names.run $
269− Names.registerKernel N.browser Opt.Static
269+ Names.registerKernel N.virtualDom Opt.Static
270
270
271 Can.TType hm nm [flags, message, _] | hm == ModuleName.platform && nm == N.program ->
271 Can.TType hm nm [flags, message, _] | hm == ModuleName.platform && nm == N.program ->
272 case Effects.checkPayload flags of
272 case Effects.checkPayload flags of