Skip to content
This repository has been archived by the owner on Oct 28, 2019. It is now read-only.

Commit

Permalink
Merge pull request #2 from driebit/upgrade-to-0.19
Browse files Browse the repository at this point in the history
Upgrade to 0.19
  • Loading branch information
rl-king authored Aug 30, 2018
2 parents 7c136d3 + 04d04e7 commit 37dd834
Show file tree
Hide file tree
Showing 7 changed files with 432 additions and 2,002 deletions.
17 changes: 9 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,21 @@ ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
export PATH := $(NPM_PATH):$(PATH)

all: $(ELM_FILES)
@elm-make --warn --yes src/Main.elm --output dist/main.js
@elm make src/Main.elm --output dist/main.js

analyse: deps
@elm-analyse --elm-format-path=./node_modules/elm-format/bin/elm-format src
# TODO:
# analyse: deps
# @elm-analyse --elm-format-path=./node_modules/elm-format/bin/elm-format src

clean:
@rm -Rf dist/*

cover:
elm-coverage src --elm-test ${NPM_PATH}/elm-test --open -- --compiler ${ROOT_DIR}/node_modules/.bin/elm-make
# TODO:
# cover:
# elm-coverage src --elm-test ${NPM_PATH}/elm-test --open -- --compiler ${ROOT_DIR}/node_modules/.bin/elm-make

deps:
@npm install
@elm-package install --yes

distclean: clean
@rm -Rf elm-stuff
Expand All @@ -42,9 +43,9 @@ format-validate:
help:
@echo "Run: make <target> where <target> is one of the following:"
@echo " all Compile all Elm files"
@echo " analyse Run Elm analyse"
# @echo " analyse Run Elm analyse"
@echo " clean Remove 'dist' folder"
@echo " cover Run Elm coverage"
# @echo " cover Run Elm coverage"
@echo " deps Install build dependencies"
@echo " distclean Remove build dependencies"
@echo " format Run Elm format"
Expand Down
19 changes: 0 additions & 19 deletions elm-package.json

This file was deleted.

26 changes: 26 additions & 0 deletions elm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"type": "application",
"source-directories": [
"src"
],
"elm-version": "0.19.0",
"dependencies": {
"direct": {
"NoRedInk/elm-json-decode-pipeline": "1.0.0",
"elm/browser": "1.0.0",
"elm/core": "1.0.0",
"elm/html": "1.0.0",
"elm/http": "1.0.0",
"elm/json": "1.0.0",
"elm/url": "1.0.0"
},
"indirect": {
"elm/time": "1.0.0",
"elm/virtual-dom": "1.0.0"
}
},
"test-dependencies": {
"direct": {},
"indirect": {}
}
}
Loading

0 comments on commit 37dd834

Please sign in to comment.