Merge pull request #8 from ethul/topic/purescript-rewrite

Topic/purescript rewrite

4 files changed, 22 insertions, 28 deletions

diff --git a/example/bower.json b/example/bower.json
index 8d71688..b4a1c78 100644
--- a/example/bower.json
+++ b/example/bower.json
@@ -1,14 +1,6 @@
 {
   "name": "example",
-  "license": "MIT",
   "private": true,
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
   "devDependencies": {
     "purescript-maybe": "~0.2.1"
   }
diff --git a/example/package.json b/example/package.json
index 6b0c04c..915eb27 100644
--- a/example/package.json
+++ b/example/package.json
@@ -4,12 +4,12 @@
   "private": true,
   "scripts": {
     "webpack": "./node_modules/.bin/webpack",
-    "run": "node dist/app.js",
-    "clean": "rm -rf bower_components && rm -rf dist && rm -rf node_modules && rm -rf output"
+    "run": "node bundle.js",
+    "clean": "rm -rf bower_components && rm -rf bundle.js && rm -rf node_modules && rm -rf output"
   },
   "license": "MIT",
   "devDependencies": {
     "purs-loader": "file:../",
-    "webpack": "^1.4.15"
+    "webpack": "^1.8.4"
   }
 }
diff --git a/example/src/entry.js b/example/src/entry.js
index 160bee4..cc09034 100644
--- a/example/src/entry.js
+++ b/example/src/entry.js
@@ -1,7 +1,7 @@
-var test = require('purs?output=output!./Test.purs');
+var test = require('./Test');
 
-var foo = require('purs?output=output!./Foo.purs');
+var foo = require('./Foo');
 
-var baz = require('purs?output=output!./Foo/Baz.purs');
+var baz = require('./Foo/Baz');
 
 console.log(test, foo, baz);
diff --git a/example/webpack.config.js b/example/webpack.config.js
index 629138a..19997f3 100644
--- a/example/webpack.config.js
+++ b/example/webpack.config.js
@@ -1,16 +1,18 @@
 var path = require('path');
 
-module.exports = {
-  entry: './src/entry',
-  output: {
-    path: path.join(__dirname, 'dist'),
-    filename: 'app.js'
-  },
-  resolve: {
-    modulesDirectories: [
-      'node_modules',
-      'web_modules',
-      'output'
-    ]
-  }
-};
+var config
+  = { entry: './src/entry'
+    , output: { path: __dirname
+              , filename: 'bundle.js'
+              }
+    , module: { loaders: [ { test: /\.purs$/, loader: 'purs-loader' } ] }
+    , resolve: { modulesDirectories: [ 'node_modules',
+                                       'output'
+                                     ]
+               , extensions: ['', '.js', '.purs']
+               }
+    , resolveLoader: { root: path.join(__dirname, 'node_modules') }
+    }
+    ;
+
+module.exports = config;