Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for 0.18 and debugger #33

Merged
merged 1 commit into from
Nov 15, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions elm-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
],
"exposed-modules": [],
"dependencies": {
"elm-lang/core": "4.0.0 <= v < 5.0.0",
"elm-lang/html": "1.0.0 <= v < 2.0.0",
"evancz/elm-http": "3.0.1 <= v < 4.0.0",
"evancz/elm-markdown": "3.0.0 <= v < 4.0.0"
"elm-lang/core": "5.0.0 <= v < 6.0.0",
"elm-lang/html": "2.0.0 <= v < 3.0.0",
"elm-lang/http": "1.0.0 <= v < 2.0.0",
"evancz/elm-markdown": "3.0.1 <= v < 4.0.0"
},
"elm-version": "0.17.0 <= v < 0.18.0"
"elm-version": "0.18.0 <= v < 0.19.0"
}
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "elm-webpack-starter",
"description": "Webpack setup for writing Elm apps",
"version": "0.7.1",
"version": "0.7.2",
"license": "MIT",
"author": "Peter Morawiec",
"repository": {
Expand All @@ -18,9 +18,9 @@
"bootstrap-sass": "^3.3.6",
"copy-webpack-plugin": "^3.0.1",
"css-loader": "^0.23.1",
"elm": "^0.17.0",
"elm-hot-loader": "^0.3.2",
"elm-webpack-loader": "^3.0.3",
"elm": "^0.18.0",
"elm-hot-loader": "^0.4.0",
"elm-webpack-loader": "^3.0.6",
"extract-text-webpack-plugin": "^1.0.1",
"file-loader": "^0.9.0",
"html-webpack-plugin": "^2.17.0",
Expand Down
5 changes: 2 additions & 3 deletions src/elm/Main.elm
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import Html exposing (..)
import Html.Attributes exposing (..)
import Html.App as Html
import Html.Events exposing ( onClick )

-- component import example
import Components.Hello exposing ( hello )


-- APP
main : Program Never
main : Program Never Int Msg
main =
Html.beginnerProgram { model = model, view = view, update = update }

Expand Down Expand Up @@ -44,7 +43,7 @@ view model =
, p [] [ text ( "Elm Webpack Starter" ) ]
, button [ class "btn btn-primary btn-lg", onClick Increment ] [ -- click handler
span[ class "glyphicon glyphicon-star" ][] -- glyphicon
, span[][ text "FTW!" ]
, span[][ text "FTWWWWWWWWW!" ]
]
]
]
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ if ( TARGET_ENV === 'development' ) {
{
test: /\.elm$/,
exclude: [/elm-stuff/, /node_modules/],
loader: 'elm-hot!elm-webpack?verbose=true&warn=true'
loader: 'elm-hot!elm-webpack?verbose=true&warn=true&debug=true'
},
{
test: /\.(css|scss)$/,
Expand Down