Merge pull request #20 from ethul/topic/issue-18

Add FFI JavaScript as a webpack dependency

5 files changed, 20 insertions, 9 deletions

diff --git a/example/package.json b/example/package.json
index df3e74f..d1319b1 100644
--- a/example/package.json
+++ b/example/package.json
@@ -3,13 +3,15 @@
   "version": "0.0.0",
   "private": true,
   "scripts": {
-    "build": "mkdir -p output && ./node_modules/.bin/webpack",
+    "build": "mkdir -p output && ./node_modules/.bin/webpack --progress --colors",
+    "build:watch": "mkdir -p output && ./node_modules/.bin/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",
     "purs-loader": "file:../",
-    "webpack": "^1.8.4"
+    "webpack": "^1.10.1"
   }
 }
diff --git a/example/src/Test.purs b/example/src/Test.purs
index d9f1b96..133a192 100644
--- a/example/src/Test.purs
+++ b/example/src/Test.purs
@@ -1,5 +1,7 @@
-module Test (test) where
+module Test (test, testing) where
 
 import Prelude
 
 test = "a"
+
+foreign import testing :: String
diff --git a/example/src/TestFFI.js b/example/src/TestFFI.js
new file mode 100644
index 0000000..dc2f04f
--- /dev/null
+++ b/example/src/TestFFI.js
@@ -0,0 +1,7 @@
+'use strict';
+
+// module Test
+
+var testing = 'abcde';
+
+exports.testing = testing;
diff --git a/example/src/entry.js b/example/src/entry.js
index 344d4c6..a41536c 100644
--- a/example/src/entry.js
+++ b/example/src/entry.js
@@ -1,11 +1,11 @@
 var Prelude = require('Prelude');
 
-var test = require('./Test');
+var test = require('./Test.purs');
 
-var foo = require('./Foo');
+var foo = require('./Foo.purs');
 
-var baz = require('./Foo/Baz');
+var baz = require('./Foo/Baz.purs');
 
-var bar = require('./Foo/Bar');
+var bar = require('./Foo/Bar.purs');
 
 console.log(Prelude, test, foo, baz, bar);
diff --git a/example/webpack.config.js b/example/webpack.config.js
index 9294904..1a0eef6 100644
--- a/example/webpack.config.js
+++ b/example/webpack.config.js
@@ -2,7 +2,7 @@ var path = require('path');
 
 var srcs = ['src[]=bower_components/purescript-*/src/**/*.purs', 'src[]=src/**/*.purs'];
 
-var ffis = ['ffi[]=bower_components/purescript-*/src/**/*.js'];
+var ffis = ['ffi[]=bower_components/purescript-*/src/**/*.js', 'ffi[]=src/**/*FFI.js'];
 
 var output = 'output';
 
@@ -22,7 +22,7 @@ var config
                            , loader: 'purs-loader?output=' + output + '&' + srcs.concat(ffis).join('&')
                            } ] }
     , resolve: { modulesDirectories: modulesDirectories
-               , extensions: ['', '.js', '.purs']
+               , extensions: ['', '.js']
                }
     , resolveLoader: { root: path.join(__dirname, 'node_modules') }
     }