a44fcf1 · elk · git.iko.soy

builder/src/Deps/Cache.hs+2−2

compare with master

unifiedsplit

@@ -167,7 +167,7 @@ authorDistance bad possibility =

167

168projectDistance :: String -> Text.Text -> Int

169projectDistance bad possibility =

170− if possibility == "elm-lang" || possibility == "elm-explorations" then

170+ if possibility == "elm" || possibility == "elm-explorations" then

171 0

172 else

173 abs (Suggest.distance bad (Text.unpack possibility))

@@ -246,7 +246,7 @@ errorToDocs err =

246 details

247 ++

248 ["This","should","not","happen","in","general,","so","please","report","this","at"

249− ,"<https://github.com/elm-lang/package.elm-lang.org/issues>"

249+ ,"<https://github.com/elm/package.elm-lang.org/issues>"

250 ,"if","you","think","it","is","on","the","Elm","side!"

251 ]

252

builder/src/Elm/Project/Json.hs+1−1

@@ -123,7 +123,7 @@ isPlatformPackage project =

123 (Pkg.Name user _) =

124 _pkg_name info

125 in

126− user == "elm-lang" || user == "elm-explorations"

126+ user == "elm" || user == "elm-explorations"

127

128

129get :: (AppInfo -> a) -> (PkgInfo -> a) -> Project -> a

builder/src/Generate/Nitpick.hs+1−1

@@ -96,4 +96,4 @@ deciderHasDebug decider =

96

97

98-- TODO: FIND GLOBALLY UNUSED DEFINITIONS?

99−-- TODO: FIND PACKAGE USAGE STATS? (e.g. elm-lang/core = 142, author/project = 2, etc.)

99+-- TODO: FIND PACKAGE USAGE STATS? (e.g. elm/core = 142, author/project = 2, etc.)

builder/src/Reporting/Exit/Assets.hs+6−7

@@ -109,22 +109,22 @@ elmJsonProblemToReport problem =

109

110 NoPkgCore ->

111 Help.report "MISSING DEPENDENCY" (Just "elm.json")

112− "A package must have \"elm-lang/core\" as a dependency. Try running:"

112+ "A package must have \"elm/core\" as a dependency. Try running:"

113− [ D.indent 4 $ D.green $ "elm install elm-lang/core"

113+ [ D.indent 4 $ D.green $ "elm install elm/core"

114 , D.reflow "I need it for the default imports that make `List` and `Maybe` available."

115 ]

116

117 NoAppCore ->

118 Help.report "MISSING DEPENDENCY" (Just "elm.json")

119− "An application must have \"elm-lang/core\" as a dependency. Try running:"

119+ "An application must have \"elm/core\" as a dependency. Try running:"

120− [ D.indent 4 $ D.green $ "elm install elm-lang/core"

120+ [ D.indent 4 $ D.green $ "elm install elm/core"

121 , D.reflow "It has some supporting code that is needed by every Elm application!"

122 ]

123

124 NoAppJson ->

125 Help.report "MISSING DEPENDENCY" (Just "elm.json")

126− "An application must have \"elm-lang/json\" as a dependency. Try running:"

126+ "An application must have \"elm/json\" as a dependency. Try running:"

127− [ D.indent 4 $ D.green $ "elm install elm-lang/json"

127+ [ D.indent 4 $ D.green $ "elm install elm/json"

128 , D.reflow "It helps me handle flags and ports."

129 ]

130

@@ -154,7 +154,6 @@ elmJsonProblemToReport problem =

154 "The " ++ packagesAre ++ " available in \"" ++ field1

155 ++ "\", so it is redundant to list it again in \"" ++ field2

156 ++ "\". It is already available! " ++ advice

157− , D.reflow "More help at <https://github.com/elm-lang/elm-package/blob/master/TODO>"

158 ]

157 ]

159

158

160

159

builder/src/Reporting/Exit/Crawl.hs+2−2

@@ -149,8 +149,8 @@ problemToReport problem =

149 EffectsUnexpected path name ->

150 badTagToDoc path name "effect" "effect-modules" $

151 "Creating `effect` modules is relatively experimental. There are a\

152− \ couple in @elm-lang repos right now, but we have decided to be\

152+ \ couple in @elm repos right now, but we have decided to be very\

153− \ very cautious in expanding its usage."

153+ \ cautious in expanding its usage."

154

155

156badTagToDoc :: FilePath -> Module.Raw -> String -> String -> String -> Help.Report

builder/src/Reporting/Exit/Deps.hs+1−1

@@ -104,7 +104,7 @@ toReport exit =

104 [ D.reflow $

105 "Did you change them by hand? Try to change it back! It is much\

106 \ better to add dependencies with commands like this:"

107− , D.indent 4 $ D.dullyellow "elm install elm-lang/http"

107+ , D.indent 4 $ D.dullyellow "elm install elm/http"

108 , D.reflow $

109 "Please ask for help on the Elm slack <http://elmlang.herokuapp.com/> if\

110 \ you are running into something that seems trickier than this."

builder/src/Reporting/Exit/Diff.hs+1−1

@@ -34,7 +34,7 @@ toReport exit =

34 Help.report "CANNOT DIFF APPLICATIONS" Nothing

35 "I cannot perform diffs on applications, only packages! If you are\

36 \ just curious to see a diff, try running this command:"

37− [ D.indent 4 $ D.green $ "elm diff elm-lang/html 5.1.1 6.0.0"

37+ [ D.indent 4 $ D.green $ "elm diff elm/html 5.1.1 6.0.0"

38 ]

39

40 UnknownPackage pkg suggestions ->

builder/src/Reporting/Exit/Http.hs+1−1

@@ -85,7 +85,7 @@ badJsonToDocs badJson =

85 BadNewPkg txt ->

86 ["I","ran","into",D.red (D.fromString (show txt)) <> ","

87 ,"but","I","need","entries","like"

88− ,D.green "\"elm-lang/core@6.0.0\"" <> "."

88+ ,D.green "\"elm/core@6.0.0\"" <> "."

89 ]

90

91 BadAllPkg txt suggestion ->

builder/src/Reporting/Exit/Install.hs+3−3

@@ -32,9 +32,9 @@ toReport exit =

32 Help.report "INSTALL WHAT?" Nothing

33 "I am expecting commands like:"

34 [ D.green $ D.indent 4 $ D.vcat $

35− [ "elm install elm-lang/http"

35+ [ "elm install elm/http"

36− , "elm install elm-lang/json"

36+ , "elm install elm/json"

37− , "elm install elm-lang/random"

37+ , "elm install elm/random"

38 ]

39 , D.toFancyHint

40 ["In","JavaScript","folks","run","`npm install`","to","start","projects."

compiler/src/AST/Canonical.hs+1−1

@@ -33,7 +33,7 @@ module AST.Canonical

33 where

34

35{- Creating a canonical AST means finding the home module for all variables.

36−So if you have L.map, you need to figure out that it is from the elm-lang/core

36+So if you have L.map, you need to figure out that it is from the elm/core

37package in the List module.

38

39In later phases (e.g. type inference, exhaustiveness checking, optimization)

compiler/src/Elm/Package.hs+9−9

@@ -71,7 +71,7 @@ data Package =

71

72isKernel :: Name -> Bool

73isKernel (Name author _) =

74− author == "elm-lang" || author == "elm-explorations"

74+ author == "elm" || author == "elm-explorations"

75

76

77toString :: Name -> String

@@ -179,49 +179,49 @@ dummyName =

179{-# NOINLINE kernel #-}

180kernel :: Name

181kernel =

182− Name "elm-lang" "kernel"

182+ Name "elm" "kernel"

183

184

185{-# NOINLINE core #-}

186core :: Name

187core =

188− Name "elm-lang" "core"

188+ Name "elm" "core"

189

190

191{-# NOINLINE browser #-}

192browser :: Name

193browser =

194− Name "elm-lang" "browser"

194+ Name "elm" "browser"

195

196

197{-# NOINLINE virtualDom #-}

198virtualDom :: Name

199virtualDom =

200− Name "elm-lang" "virtual-dom"

200+ Name "elm" "virtual-dom"

201

202

203{-# NOINLINE html #-}

204html :: Name

205html =

206− Name "elm-lang" "html"

206+ Name "elm" "html"

207

208

209{-# NOINLINE json #-}

210json :: Name

211json =

212− Name "elm-lang" "json"

212+ Name "elm" "json"

213

214

215{-# NOINLINE http #-}

216http :: Name

217http =

218− Name "elm-lang" "http"

218+ Name "elm" "http"

219

220

221{-# NOINLINE url #-}

222url :: Name

223url =

224− Name "elm-lang" "url"

224+ Name "elm" "url"

225

226

227{-# NOINLINE webgl #-}

compiler/src/Json/Decode/Error.hs+1−1

@@ -47,7 +47,7 @@ toDoc rootName source userErrorToDocs err =

47 [] ->

48 D.reflow

49 "I am not sure what is wrong with this JSON. Please create an <http://sscce.org>\

50− \ and share it at <https://github.com/elm-lang/elm-compiler/issues> so I can\

50+ \ and share it at <https://github.com/elm/compiler/issues> so I can\

51 \ provide a helpful hint here!"

52

53 [flatError] ->

compiler/src/Reporting/Error/Canonicalize.hs+4−4

@@ -478,10 +478,10 @@ toReport source err =

478 D.stack

479 [ D.reflow $

480 "If you want the behavior of (%) like in JavaScript, switch to:\

481− \ <https://package.elm-lang.org/packages/elm-lang/core/latest/Basics#remainderBy>"

481+ \ <https://package.elm-lang.org/packages/elm/core/latest/Basics#remainderBy>"

482 , D.reflow $

483 "If you want modular arithmetic like in math, switch to:\

484− \ <https://package.elm-lang.org/packages/elm-lang/core/latest/Basics#modBy>"

484+ \ <https://package.elm-lang.org/packages/elm/core/latest/Basics#modBy>"

485 , D.reflow $

486 "The difference is how things work when negative numbers are involved."

487 ]

@@ -683,7 +683,7 @@ toReport source err =

683 error

684 "There is some compiler bug in reporting cyclic definitions.\n\

685 \Please get a <http://sscce.org/> and share the details at\n\

686− \<https://github.com/elm-lang/elm-compiler/issues>"

686+ \<https://github.com/elm/compiler/issues>"

687

688 A.At region name : otherNames ->

689 Report.Report "CYCLIC DEFINITION" region [] $

@@ -1189,7 +1189,7 @@ modHint =

1189 [ "Rather", "than", "a", D.dullyellow "(%)", "operator,"

1190 , "Elm", "has", "a", D.green "modBy", "function."

1191 , "Learn", "more", "here:"

1192− , "<https://package.elm-lang.org/packages/elm-lang/core/latest/Basics#modBy>"

1192+ , "<https://package.elm-lang.org/packages/elm/core/latest/Basics#modBy>"

1193 ]

1194

1195

compiler/src/Reporting/Error/Syntax.hs+1−1

@@ -504,7 +504,7 @@ problemToDocs problem =

504 "I do not have any suggestions though!"

505 , D.reflow $

506 "Can you get it down to a <http://sscce.org> and share it at\

507− \ <https://github.com/elm-lang/error-message-catalog/issues>?\

507+ \ <https://github.com/elm/error-message-catalog/issues>?\

508 \ That way we can figure out how to give better advice!"

509 ]

510

compiler/src/Reporting/Error/Type.hs+1−1

@@ -875,7 +875,7 @@ toExprReport source localizer exprRegion category tipe expected =

875 , "But this update needs it to be compatable with:"

876 , [ D.reflow

877 "Do you mind creating an <http://sscce.org/> that produces this error message and\

878− \ sharing it at <https://github.com/elm-lang/error-message-catalog/issues> so we\

878+ \ sharing it at <https://github.com/elm/error-message-catalog/issues> so we\

879 \ can try to give better advice here?"

880 ]

881 )

compiler/src/Type/Solve.hs+1−1

@@ -207,7 +207,7 @@ isGeneric var =

207 ++ " " ++ show (ET.toDoc L.empty RT.None tipe) ++ " [rank = " ++ show rank ++ "]\n\n"

208 ++

209 "Please create an <http://sscce.org/> and then report it\n\

210− \at <https://github.com/elm-lang/elm-compiler/issues>\n\n"

210+ \at <https://github.com/elm/compiler/issues>\n\n"

211

212

213

ui/browser/elm.json+11−11

@@ -5,21 +5,21 @@

5 ],

6 "elm-version": "0.19.0",

7 "dependencies": {

8− "elm-explorations/markdown": "1.0.0",

9− "elm-lang/browser": "1.0.0",

8+ "elm/browser": "1.0.0",

10− "elm-lang/core": "6.0.0",

9+ "elm/core": "1.0.0",

11− "elm-lang/html": "3.0.0",

10+ "elm/html": "1.0.0",

12− "elm-lang/http": "2.0.0",

11+ "elm/http": "1.0.0",

13− "elm-lang/json": "1.0.0",

12+ "elm/json": "1.0.0",

14− "elm-lang/project-metadata-utils": "1.0.0",

13+ "elm/project-metadata-utils": "1.0.0",

15− "elm-lang/svg": "3.0.0"

14+ "elm/svg": "1.0.0",

15+ "elm-explorations/markdown": "1.0.0"

16 },

17 "test-dependencies": {},

18 "do-not-edit-this-by-hand": {

19 "transitive-dependencies": {

20− "elm-lang/parser": "1.0.0",

20+ "elm/parser": "1.0.0",

21− "elm-lang/url": "1.0.0",

21+ "elm/url": "1.0.0",

22− "elm-lang/virtual-dom": "3.0.0"

22+ "elm/virtual-dom": "1.0.0"

23 }

24 }

25}

ui/terminal/src/Main.hs+3−3

@@ -226,8 +226,8 @@ install =

226 [ reflow

227 "For example, if you want to get packages for HTTP and JSON, you would say:"

228 , P.indent 4 $ P.green $ P.vcat $

229− [ "elm install elm-lang/http"

229+ [ "elm install elm/http"

230− , "elm install elm-lang/json"

230+ , "elm install elm/json"

231 ]

232 , reflow

233 "Notice that you must say the AUTHOR name and PROJECT name! After running those\

@@ -318,7 +318,7 @@ diff =

318 [ reflow

319 "For example, to see what changed in the HTML package between\

320 \ versions 1.0.0 and 2.0.0, you can say:"

321− , P.indent 4 $ P.green $ "elm diff elm-lang/html 1.0.0 2.0.0"

321+ , P.indent 4 $ P.green $ "elm diff elm/html 1.0.0 2.0.0"

322 , reflow

323 "Sometimes a MAJOR change is not actually very big, so\

324 \ this can help you plan your upgrade timelines."

ui/terminal/src/Repl.hs+2−2

@@ -328,7 +328,7 @@ printWelcomeMessage =

328 D.toAnsi IO.stdout $

329 D.vcat

330 [ D.black "----" <+> D.dullcyan title <+> D.black (D.fromString dashes)

331− , D.black " :help for help, :exit to exit, more at <https://github.com/elm-lang/elm-repl>"

331+ , D.black $ D.fromString $ "Read " <> D.makeLink "repl" <> " to learn more: exit, help, imports, etc."

332 , D.black "--------------------------------------------------------------------------------"

333 , D.empty

334 ]

@@ -361,7 +361,7 @@ genericHelpMessage =

361 \ :help Show this information\n\

362 \ :reset Clear all previous imports and definitions\n\

363 \\n\

364− \More info at <https://github.com/elm-lang/elm/blob/" ++ elmVersion ++ "/help/repl.md>\n"

364+ \More info at " ++ D.makeLink "repl" ++ "\n"

365

366

367

ui/terminal/src/Terminal/Args/Helpers.hs+2−2

@@ -119,7 +119,7 @@ examplePackages string =

119

120 _ ->

121 return

122− [ "elm-lang/http"

122+ [ "elm/http"

123− , "elm-lang/json"

123+ , "elm/json"

124 , "elm-community/random-extra"

125 ]