Updating example

diff --git a/example/package.json b/example/package.json
index d1319b135821bb6b7867bf2c35da5580a3ae635e..5f7ee631b49e5122e213b614d62ab6ca431cffb4 100644 (file)
--- 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.0",
     "purs-loader": "file:../",
-    "webpack": "^1.10.1"
+    "webpack": "^1.12.9"
   }
 }

diff --git a/example/src/Foo.purs b/example/src/Foo.purs
index b234e0df06d456436d686fc10da11405b8edb5a6..97b7cec2327e2c47905d2de0ee745396cb4a70f6 100644 (file)
--- 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 133a19204ecd29441a14a33f335f0e7cb8b1cff3..3a92681894da610756b49c9a5973f167b04fe924 100644 (file)
--- 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 cde8507aebe9fa5a446730c7403ad52ea11d46fc..be0a475bef384afd4e4e481bec88ccc885a37c80 100644 (file)
--- a/example/src/entry.js
+++ b/example/src/entry.js
@@ -1,4 +1,4 @@
-var Prelude = require('Prelude');
+var Prelude = require('purescript-prelude/src/Prelude.purs');
 
 var test = require('./Test.purs');
 

diff --git a/example/webpack.config.js b/example/webpack.config.js
index f1456d51783581f082b87fb236a0096a74b2a356..7f468c8323084d854a22b8c98903b72033fe10a2 100644 (file)
--- 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 }
+    , plugins: [ new PurescriptWebpackPlugin({src: src, ffi: ffi}) ]
     }
     ;
 

diff --git a/package.json b/package.json
index 3bcd03ff0db041462b5f3105f25ccd81e9b59d8b..13d4c6c6df9a0ec207c59f4213055340eee122b4 100644 (file)
--- a/package.json
+++ b/package.json
@@ -26,7 +26,6 @@
   "dependencies": {
     "async": "^1.3.0",
     "chalk": "^1.1.0",
-    "glob": "^5.0.3",
     "loader-utils": "^0.2.6"
   }
 }