Merge pull request #16 from ethul/topic/issue-11-and-14

Topic/issue 11 and 14

8 files changed, 32 insertions, 10 deletions

diff --git a/example/README.md b/example/README.md
index 87b9bc7..bac4f6c 100644
--- a/example/README.md
+++ b/example/README.md
@@ -1,6 +1,6 @@
 ```bash
 bower install
 npm install
-npm run-script webpack
+npm run-script build
 npm run-script run
 ```
diff --git a/example/bower.json b/example/bower.json
index b4a1c78..c83e735 100644
--- a/example/bower.json
+++ b/example/bower.json
@@ -2,6 +2,6 @@
   "name": "example",
   "private": true,
   "devDependencies": {
-    "purescript-maybe": "~0.2.1"
+    "purescript-prelude": "~0.1.0"
   }
 }
diff --git a/example/package.json b/example/package.json
index 915eb27..df3e74f 100644
--- a/example/package.json
+++ b/example/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "scripts": {
-    "webpack": "./node_modules/.bin/webpack",
+    "build": "mkdir -p output && ./node_modules/.bin/webpack",
     "run": "node bundle.js",
     "clean": "rm -rf bower_components && rm -rf bundle.js && rm -rf node_modules && rm -rf output"
   },
diff --git a/example/src/Foo.purs b/example/src/Foo.purs
index 3e3a04c..b234e0d 100644
--- a/example/src/Foo.purs
+++ b/example/src/Foo.purs
@@ -1,6 +1,9 @@
 module Foo (foo) where
 
-import Data.Maybe
+import Prelude
+
 import qualified Foo.Bar as B
 
 foo = "b"
+
+foo' = "c"
diff --git a/example/src/Foo/Bar.purs b/example/src/Foo/Bar.purs
index 4ae100d..6932902 100644
--- a/example/src/Foo/Bar.purs
+++ b/example/src/Foo/Bar.purs
@@ -1,3 +1,5 @@
 module Foo.Bar (bar) where
 
 bar = "c"
+
+bar' = "d"
diff --git a/example/src/Test.purs b/example/src/Test.purs
index 8a5cb88..d9f1b96 100644
--- a/example/src/Test.purs
+++ b/example/src/Test.purs
@@ -1,5 +1,5 @@
 module Test (test) where
 
-import Data.Maybe
+import Prelude
 
 test = "a"
diff --git a/example/src/entry.js b/example/src/entry.js
index cc09034..344d4c6 100644
--- a/example/src/entry.js
+++ b/example/src/entry.js
@@ -1,7 +1,11 @@
+var Prelude = require('Prelude');
+
 var test = require('./Test');
 
 var foo = require('./Foo');
 
 var baz = require('./Foo/Baz');
 
-console.log(test, foo, baz);
+var bar = require('./Foo/Bar');
+
+console.log(Prelude, test, foo, baz, bar);
diff --git a/example/webpack.config.js b/example/webpack.config.js
index f67e83a..9294904 100644
--- a/example/webpack.config.js
+++ b/example/webpack.config.js
@@ -1,14 +1,27 @@
 var path = require('path');
 
+var srcs = ['src[]=bower_components/purescript-*/src/**/*.purs', 'src[]=src/**/*.purs'];
+
+var ffis = ['ffi[]=bower_components/purescript-*/src/**/*.js'];
+
+var output = 'output';
+
+var modulesDirectories = [
+  'node_modules',
+  'bower_components/purescript-prelude/src',
+  output
+];
+
 var config
   = { entry: './src/entry'
     , output: { path: __dirname
+              , pathinfo: true
               , filename: 'bundle.js'
               }
-    , module: { loaders: [ { test: /\.purs$/, loader: 'purs-loader?src[]=src' } ] }
-    , resolve: { modulesDirectories: [ 'node_modules',
-                                       'output'
-                                     ]
+    , module: { loaders: [ { test: /\.purs$/
+                           , loader: 'purs-loader?output=' + output + '&' + srcs.concat(ffis).join('&')
+                           } ] }
+    , resolve: { modulesDirectories: modulesDirectories
                , extensions: ['', '.js', '.purs']
                }
     , resolveLoader: { root: path.join(__dirname, 'node_modules') }