From eef0cf46c150cd12e783aa8dc62f825a59757855 Mon Sep 17 00:00:00 2001
From: Joris
Date: Fri, 13 Nov 2015 20:12:21 +0100
Subject: Upgrade to elm 0.15.1 and use npm to build
---
.gitignore | 3 ++-
README.md | 12 +++++++-----
elm-package.json | 9 ++++-----
index.html | 2 +-
package.json | 15 +++++++++++++++
5 files changed, 29 insertions(+), 12 deletions(-)
create mode 100644 package.json
diff --git a/.gitignore b/.gitignore
index 3bd52a1..c60650d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
elm-stuff
-elm.js
+node_modules
+client.js
diff --git a/README.md b/README.md
index a14e231..57c8b8f 100644
--- a/README.md
+++ b/README.md
@@ -10,10 +10,12 @@ You can play at [http://guyonvarch.github.io/catchvoid](http://guyonvarch.github
Usage
-----
-Install the elm platform:
-http://elm-lang.org/Install.elm
+Install the elm platform: http://elm-lang.org/Install.elm
-Launch the following command:
-```
-./gen
+Launch the following commands:
+
+```bash
+elm package install
+npm install
+npm start
```
diff --git a/elm-package.json b/elm-package.json
index a537c6d..593ca68 100644
--- a/elm-package.json
+++ b/elm-package.json
@@ -1,14 +1,13 @@
{
"version": "2.2.1",
- "summary": "",
- "description": "",
+ "summary": "cAtchVoid",
"repository": "https://github.com/guyonvarch/catchvoid.git",
"license": "BSD3",
"source-directories": ["src"],
"exposed-modules": [],
- "elm-version": "0.15.0 <= v < 0.16.0",
+ "elm-version": "0.15.1 <= v < 0.16.0",
"dependencies": {
- "elm-lang/core": "2.0.1 <= v < 3.0.0",
- "evancz/elm-html": "3.0.0 <= v < 4.0.0"
+ "elm-lang/core": "2.1.0 <= v < 3.0.0",
+ "evancz/elm-html": "4.0.1 <= v < 5.0.0"
}
}
diff --git a/index.html b/index.html
index 8187317..6155f3c 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
cAtchVoid
-
+
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..afa017c
--- /dev/null
+++ b/package.json
@@ -0,0 +1,15 @@
+{
+ "devDependencies": {
+ "watch": "0.16.0",
+ "http-server": "0.8.5"
+ },
+ "scripts": {
+ "start": "npm run watch",
+
+ "watch": "npm run launch-server && watch 'npm run build-client --silent' src",
+ "build": "elm make src/Main.elm --output client.js",
+
+ "launch-server": "npm run kill-server && http-server ./ -p 8080",
+ "kill-server": "fuser -k 8080/tcp || true"
+ }
+}
--
cgit v1.2.3