aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--example/index.html18
-rw-r--r--example/package.json3
-rw-r--r--example/src/Foo.purs1
-rw-r--r--example/src/Foo/Bar.purs3
-rw-r--r--example/src/Foo/Baz.purs3
-rw-r--r--example/src/entry.js4
-rw-r--r--index.js4
8 files changed, 16 insertions, 21 deletions
diff --git a/.gitignore b/.gitignore
index 8476a21..8cde684 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
1npm-debug.log
1node_modules/ 2node_modules/
2example/node_modules/ 3example/node_modules/
3example/bower_components/ 4example/bower_components/
diff --git a/example/index.html b/example/index.html
deleted file mode 100644
index 8db646e..0000000
--- a/example/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
1<!doctype html>
2<html class="no-js" lang="">
3 <head>
4 <meta charset="utf-8">
5 <meta http-equiv="X-UA-Compatible" content="IE=edge">
6 <title></title>
7 <meta name="description" content="">
8 <meta name="viewport" content="width=device-width, initial-scale=1">
9 </head>
10 <body>
11 <!--[if lt IE 8]>
12 <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
13 <![endif]-->
14 <!-- Add your site or application content here -->
15 <p>Hello world! This is HTML5 Boilerplate.</p>
16 <script src="dist/app.js"></script>
17 </body>
18</html>
diff --git a/example/package.json b/example/package.json
index 482563f..6b0c04c 100644
--- a/example/package.json
+++ b/example/package.json
@@ -4,7 +4,8 @@
4 "private": true, 4 "private": true,
5 "scripts": { 5 "scripts": {
6 "webpack": "./node_modules/.bin/webpack", 6 "webpack": "./node_modules/.bin/webpack",
7 "run": "node dist/app.js" 7 "run": "node dist/app.js",
8 "clean": "rm -rf bower_components && rm -rf dist && rm -rf node_modules && rm -rf output"
8 }, 9 },
9 "license": "MIT", 10 "license": "MIT",
10 "devDependencies": { 11 "devDependencies": {
diff --git a/example/src/Foo.purs b/example/src/Foo.purs
index 2d35d3f..3e3a04c 100644
--- a/example/src/Foo.purs
+++ b/example/src/Foo.purs
@@ -1,5 +1,6 @@
1module Foo (foo) where 1module Foo (foo) where
2 2
3import Data.Maybe 3import Data.Maybe
4import qualified Foo.Bar as B
4 5
5foo = "b" 6foo = "b"
diff --git a/example/src/Foo/Bar.purs b/example/src/Foo/Bar.purs
new file mode 100644
index 0000000..4ae100d
--- /dev/null
+++ b/example/src/Foo/Bar.purs
@@ -0,0 +1,3 @@
1module Foo.Bar (bar) where
2
3bar = "c"
diff --git a/example/src/Foo/Baz.purs b/example/src/Foo/Baz.purs
new file mode 100644
index 0000000..7b0451e
--- /dev/null
+++ b/example/src/Foo/Baz.purs
@@ -0,0 +1,3 @@
1module Foo.Baz (baz) where
2
3baz = "d"
diff --git a/example/src/entry.js b/example/src/entry.js
index 4c15475..160bee4 100644
--- a/example/src/entry.js
+++ b/example/src/entry.js
@@ -2,4 +2,6 @@ var test = require('purs?output=output!./Test.purs');
2 2
3var foo = require('purs?output=output!./Foo.purs'); 3var foo = require('purs?output=output!./Foo.purs');
4 4
5console.log(test, foo); 5var baz = require('purs?output=output!./Foo/Baz.purs');
6
7console.log(test, foo, baz);
diff --git a/index.js b/index.js
index ff2936f..4a74d15 100644
--- a/index.js
+++ b/index.js
@@ -6,6 +6,7 @@ var cp = require('child_process')
6 , chalk = require('chalk') 6 , chalk = require('chalk')
7 , lu = require('loader-utils') 7 , lu = require('loader-utils')
8 , cwd = process.cwd() 8 , cwd = process.cwd()
9 , MODULE_RE = /^module\s+([\w\.]+)\s+/i
9 , BOWER_PATTERN = path.join('bower_components', 'purescript-*', 'src') 10 , BOWER_PATTERN = path.join('bower_components', 'purescript-*', 'src')
10 , PSC_MAKE = 'psc-make' 11 , PSC_MAKE = 'psc-make'
11 , OUTPUT = 'output' 12 , OUTPUT = 'output'
@@ -42,7 +43,8 @@ module.exports = function(source){
42 cmd.on('close', function(e){ 43 cmd.on('close', function(e){
43 if (e) callback(e); 44 if (e) callback(e);
44 else { 45 else {
45 var module = path.basename(request, '.purs'); 46 var result = MODULE_RE.exec(source);
47 var module = result.length > 1 ? result[1] : '';
46 fs.readFile(path.join(query[OUTPUT] || OUTPUT, module, 'index.js'), 'utf-8', function(e, output){ 48 fs.readFile(path.join(query[OUTPUT] || OUTPUT, module, 'index.js'), 'utf-8', function(e, output){
47 if (e) callback(e); 49 if (e) callback(e);
48 else callback(e, output); 50 else callback(e, output);