@@ -19,7 +19,6 @@ import qualified Data.Set as Set
19import qualified AST.Optimized as Opt
19import qualified AST.Optimized as Opt
20import qualified AST.Module.Name as ModuleName
20import qualified AST.Module.Name as ModuleName
21import qualified Elm.Name as N
21import qualified Elm.Name as N
22−import qualified Elm.Package as Pkg
23import qualified Generate.JavaScript.Builder as JS
22import qualified Generate.JavaScript.Builder as JS
24import qualified Generate.JavaScript.Expression as Expr
23import qualified Generate.JavaScript.Expression as Expr
25import qualified Generate.JavaScript.Name as Name
24import qualified Generate.JavaScript.Name as Name
@@ -130,9 +129,9 @@ addGlobalHelp mode graph global state =
130 Opt.Manager effectsType ->
129 Opt.Manager effectsType ->
131 generateManager mode graph global effectsType state
130 generateManager mode graph global effectsType state
133− Opt.Kernel clientChunks clientDeps maybeServer ->
132+ Opt.Kernel (Opt.KContent clientChunks clientDeps) maybeServer ->
134 case maybeServer of
133 case maybeServer of
135− Just (serverChunks, serverDeps) | Name.isServer mode ->
134+ Just (Opt.KContent serverChunks serverDeps) | Name.isServer mode ->
136 addBuilder (addDeps serverDeps state) (generateKernel mode serverChunks)
135 addBuilder (addDeps serverDeps state) (generateKernel mode serverChunks)
@@ -212,8 +211,11 @@ addChunk mode builder chunk =
212 Opt.JS javascript ->
211 Opt.JS javascript ->
213 B.byteString javascript <> builder
212 B.byteString javascript <> builder
215− Opt.Var home name ->
214+ Opt.ElmVar home name ->
216− Name.toBuilder (Name.fromGlobal (ModuleName.Canonical Pkg.core home) name) <> builder
215+ Name.toBuilder (Name.fromGlobal home name) <> builder
217+ Opt.JsVar home name ->
218+ Name.toBuilder (Name.fromKernel home name) <> builder
218 Opt.ElmField name ->
220 Opt.ElmField name ->
219 Name.toBuilder (Name.fromField mode name) <> builder
221 Name.toBuilder (Name.fromField mode name) <> builder