@@ -19,7 +19,6 @@ import qualified Data.Set as Set
1919import qualified AST.Optimized as Opt
2020import qualified AST.Module.Name as ModuleName
2121import qualified Elm.Name as N
22−import qualified Elm.Package as Pkg
2322import qualified Generate.JavaScript.Builder as JS
2423import qualified Generate.JavaScript.Expression as Expr
2524import qualified Generate.JavaScript.Name as Name
@@ -130,9 +129,9 @@ addGlobalHelp mode graph global state =
130129 Opt.Manager effectsType ->
131130 generateManager mode graph global effectsType state
132131
133− Opt.Kernel clientChunks clientDeps maybeServer ->
132+ Opt.Kernel (Opt.KContent clientChunks clientDeps) maybeServer ->
134133 case maybeServer of
135− Just (serverChunks, serverDeps) | Name.isServer mode ->
134+ Just (Opt.KContent serverChunks serverDeps) | Name.isServer mode ->
136135 addBuilder (addDeps serverDeps state) (generateKernel mode serverChunks)
137136
138137 _ ->
@@ -212,8 +211,11 @@ addChunk mode builder chunk =
212211 Opt.JS javascript ->
213212 B.byteString javascript <> builder
214213
215− Opt.Var home name ->
216− Name.toBuilder (Name.fromGlobal (ModuleName.Canonical Pkg.core home) name) <> builder
214+ Opt.ElmVar home name ->
215+ Name.toBuilder (Name.fromGlobal home name) <> builder
216+
217+ Opt.JsVar home name ->
218+ Name.toBuilder (Name.fromKernel home name) <> builder
217219
218220 Opt.ElmField name ->
219221 Name.toBuilder (Name.fromField mode name) <> builder