Merge pull request #34 from ethul/topic/psc-webpack-plugin

Topic/psc webpack plugin

7 files changed, 32 insertions, 23 deletions

diff --git a/example/package.json b/example/package.json
index d1319b1..e256de8 100644
--- a/example/package.json
+++ b/example/package.json
@@ -3,15 +3,16 @@
   "version": "0.0.0",
   "private": true,
   "scripts": {
-    "build": "mkdir -p output && ./node_modules/.bin/webpack --progress --colors",
-    "build:watch": "mkdir -p output && ./node_modules/.bin/webpack --progress --colors --watch",
+    "build": "webpack --progress --colors --bail",
+    "build:watch": "webpack --progress --colors --watch",
     "run": "node bundle.js",
     "clean": "rm -rf bower_components && rm -rf bundle.js && rm -rf node_modules && rm -rf output"
   },
   "license": "MIT",
   "devDependencies": {
     "node-libs-browser": "^0.5.2",
+    "purescript-webpack-plugin": "^0.1.1",
     "purs-loader": "file:../",
-    "webpack": "^1.10.1"
+    "webpack": "^1.12.9"
   }
 }
diff --git a/example/src/Bar.purs b/example/src/Bar.purs
new file mode 100644
index 0000000..a37171f
--- /dev/null
+++ b/example/src/Bar.purs
@@ -0,0 +1,3 @@
+module Bar where
+
+test = "b"
diff --git a/example/src/Foo.purs b/example/src/Foo.purs
index b234e0d..97b7cec 100644
--- a/example/src/Foo.purs
+++ b/example/src/Foo.purs
@@ -1,9 +1,9 @@
-module Foo (foo) where
+module Foo where
 
 import Prelude
 
 import qualified Foo.Bar as B
 
-foo = "b"
+foo = "A"
 
-foo' = "c"
+bar = "B"
diff --git a/example/src/Test.purs b/example/src/Test.purs
index 133a192..3a92681 100644
--- a/example/src/Test.purs
+++ b/example/src/Test.purs
@@ -1,7 +1,7 @@
-module Test (test, testing) where
+module Test (testing) where
 
-import Prelude
+bar = "c"
 
-test = "a"
+goo = "a"
 
 foreign import testing :: String
diff --git a/example/src/entry.js b/example/src/entry.js
index cde8507..a1e2a99 100644
--- a/example/src/entry.js
+++ b/example/src/entry.js
@@ -1,9 +1,11 @@
-var Prelude = require('Prelude');
+var Prelude = require('purescript-prelude/src/Prelude');
 
-var test = require('./Test.purs');
+var test = require('./Test');
 
 var foo = require('./Foo.purs');
 
-var baz = require('./Foo/Baz.purs');
+var baz = require('./Foo/Baz');
 
-console.log(Prelude, test, foo, baz);
+var jam = require('./jam');
+
+console.log(Prelude, test, foo, baz, jam);
diff --git a/example/src/jam.js b/example/src/jam.js
new file mode 100644
index 0000000..8889a69
--- /dev/null
+++ b/example/src/jam.js
@@ -0,0 +1,5 @@
+var x = 'a';
+
+var abcde = require('./Bar');
+
+module.exports = abcde;
diff --git a/example/webpack.config.js b/example/webpack.config.js
index f1456d5..602de84 100644
--- a/example/webpack.config.js
+++ b/example/webpack.config.js
@@ -1,14 +1,14 @@
-var path = require('path');
+'use strict';
 
-var srcs = ['src[]=bower_components/purescript-*/src/**/*.purs', 'src[]=src/**/*.purs'];
+var PurescriptWebpackPlugin = require('purescript-webpack-plugin');
 
-var ffis = ['ffi[]=bower_components/purescript-*/src/**/*.js', 'ffi[]=src/**/*FFI.js'];
+var src = ['bower_components/purescript-*/src/**/*.purs', 'src/**/*.purs'];
 
-var output = 'output';
+var ffi = ['bower_components/purescript-*/src/**/*.js', 'src/**/*FFI.js'];
 
 var modulesDirectories = [
   'node_modules',
-  'bower_components/purescript-prelude/src'
+  'bower_components'
 ];
 
 var config
@@ -18,12 +18,10 @@ var config
               , filename: 'bundle.js'
               }
     , module: { loaders: [ { test: /\.purs$/
-                           , loader: 'purs-loader?output=' + output + '&' + srcs.concat(ffis).join('&')
+                           , loader: 'purs-loader'
                            } ] }
-    , resolve: { modulesDirectories: modulesDirectories
-               , extensions: ['', '.js']
-               }
-    , resolveLoader: { root: path.join(__dirname, 'node_modules') }
+    , resolve: { modulesDirectories: modulesDirectories, extensions: [ '', '.js', '.purs'] }
+    , plugins: [ new PurescriptWebpackPlugin({src: src, ffi: ffi}) ]
     }
     ;