From 9764d2a7d5e6d9cf081dcbc162dac01f95d452b3 Mon Sep 17 00:00:00 2001 From: eric thul Date: Fri, 25 Dec 2015 19:16:21 -0500 Subject: Updating example --- example/package.json | 7 ++++--- example/src/Foo.purs | 6 +++--- example/src/Test.purs | 6 +++--- example/src/entry.js | 2 +- example/webpack.config.js | 18 ++++++++---------- 5 files changed, 19 insertions(+), 20 deletions(-) (limited to 'example') diff --git a/example/package.json b/example/package.json index d1319b1..5f7ee63 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.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 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..be0a475 100644 --- 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 f1456d5..7f468c8 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 } + , plugins: [ new PurescriptWebpackPlugin({src: src, ffi: ffi}) ] } ; -- cgit v1.2.3 From c9ffb38360a93d51f047a184ae13462cb90edb71 Mon Sep 17 00:00:00 2001 From: eric thul Date: Sun, 27 Dec 2015 10:17:21 -0500 Subject: More example files --- example/src/Bar.purs | 3 +++ example/src/bar.js | 5 +++++ example/src/entry.js | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 example/src/Bar.purs create mode 100644 example/src/bar.js (limited to 'example') 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/bar.js b/example/src/bar.js new file mode 100644 index 0000000..8c3bb91 --- /dev/null +++ b/example/src/bar.js @@ -0,0 +1,5 @@ +var x = 'a'; + +var abcde = require('./Bar.purs'); + +module.exports = abcde; diff --git a/example/src/entry.js b/example/src/entry.js index be0a475..57808c2 100644 --- a/example/src/entry.js +++ b/example/src/entry.js @@ -6,4 +6,6 @@ var foo = require('./Foo.purs'); var baz = require('./Foo/Baz.purs'); -console.log(Prelude, test, foo, baz); +var bar = require('./bar'); + +console.log(Prelude, test, foo, baz, bar); -- cgit v1.2.3 From c01553307e6fcd0abada0b9b2f9ca8d6bb82b863 Mon Sep 17 00:00:00 2001 From: eric thul Date: Tue, 29 Dec 2015 08:24:06 -0500 Subject: Updating example for .purs extension Showing usage of specifying .purs and not specifying an extension for require statements. --- example/package.json | 2 +- example/src/bar.js | 5 ----- example/src/entry.js | 10 +++++----- example/src/jam.js | 5 +++++ example/webpack.config.js | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 example/src/bar.js create mode 100644 example/src/jam.js (limited to 'example') diff --git a/example/package.json b/example/package.json index 5f7ee63..e256de8 100644 --- a/example/package.json +++ b/example/package.json @@ -11,7 +11,7 @@ "license": "MIT", "devDependencies": { "node-libs-browser": "^0.5.2", - "purescript-webpack-plugin": "^0.1.0", + "purescript-webpack-plugin": "^0.1.1", "purs-loader": "file:../", "webpack": "^1.12.9" } diff --git a/example/src/bar.js b/example/src/bar.js deleted file mode 100644 index 8c3bb91..0000000 --- a/example/src/bar.js +++ /dev/null @@ -1,5 +0,0 @@ -var x = 'a'; - -var abcde = require('./Bar.purs'); - -module.exports = abcde; diff --git a/example/src/entry.js b/example/src/entry.js index 57808c2..a1e2a99 100644 --- a/example/src/entry.js +++ b/example/src/entry.js @@ -1,11 +1,11 @@ -var Prelude = require('purescript-prelude/src/Prelude.purs'); +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'); -var bar = require('./bar'); +var jam = require('./jam'); -console.log(Prelude, test, foo, baz, bar); +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 7f468c8..602de84 100644 --- a/example/webpack.config.js +++ b/example/webpack.config.js @@ -20,7 +20,7 @@ var config , module: { loaders: [ { test: /\.purs$/ , loader: 'purs-loader' } ] } - , resolve: { modulesDirectories: modulesDirectories } + , resolve: { modulesDirectories: modulesDirectories, extensions: [ '', '.js', '.purs'] } , plugins: [ new PurescriptWebpackPlugin({src: src, ffi: ffi}) ] } ; -- cgit v1.2.3