Merge pull request #9 from noflo/webpack

Webpack

.gitignore

@@ -3,3 +3,6 @@ gh-pages/
 node_modules/
 components/
 bower_components/
+/spec/*.js
+/spec/*.xml
+/spec/*.html

.travis.yml

@@ -1,7 +1,37 @@
 language: node_js
 node_js:
-- '0.10'
+- '6'
+before_install:
+- wget https://s3-us-west-2.amazonaws.com/cdn.thegrid.io/caliper/libvips/libccv-0.1.1.tar.gz
+- mkdir $HOME/libccv
+- echo $HOME/libccv
+- tar -xvzf libccv-0.1.1.tar.gz -C $HOME/libccv
 before_script:
 - npm install -g grunt-cli
-after_success:
-- grunt gh-pages
+deploy:
+  provider: script
+  skip_cleanup: true
+  script: grunt gh-pages
+  on:
+    tags: true
+    repo: noflo/noflo-browser
+env:
+  matrix:
+  - CXX=g++-4.8
+  global:
+    secure: mXwYeFfEjRsB31W5sorAjBXNPc2ZqV1IabgGv4fx8nmLGJ2KVCg7FRtJxPkshCxUMbn69S5JR12HcKWsFNY4uF0un7On70ggcq1+TpRFh8VkDr2KuRTsxW0NuZE3SO/xx7fxMQ98woHnW1FqLrQMhlZLDdW+OSVrx8/sJ4Xql3oZgt/n3VGaIQuJ6D9cvx/TT8WqxF+cEunm1T0eHpjtVTEKQHFDsOtztWJR/tHDrxpP0J8OrpEXtdFGXXbS8od4wCSJ0qmZXPfuD7cQgwwMLa3FnHxC5B4SOcjOagr8cr269BTSdV8CN5udVb8g2vuvF33T/Q7KFZKd/G9ue1w+7unyAG6MZT6cN3uzL5JwsAsU9C8fRF94yD7Q3dfkI+UMssf0kt3zfBU/XgvJJQ4mzoaouGcgdB2/jn0PbQrECUfILhG4/c7Y/6hQUjxJelc2hunXkY7QwOuRi4xNGsTgEZwBT7pZmPXRwOABZwdo/4WU6y4vTKINyX4f4di/bIOtewoTT+tYwab9A7xqka8SUTyc1FHuQyzAww9BK4TGjaWxKP7dYPmLdKWzGPUhEKwzsNBIKvB6g5vIULb6T7x4/UXOlI7hKnM1rUOpiYLto4RV4LJlIksUKpaC8z/dtmKko3qThXWNJc9tF6trCEUjV03xXfgAh1ohsV0/euVwYLk=
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - libpng-dev
+    - libatlas-base-dev
+    - libblas-dev
+    - libcairo2-dev
+    - libjpeg8-dev
+    - libpango1.0-dev
+    - libgif-dev
+    - graphicsmagick
+    - build-essential
+    - g++-4.8

Gruntfile.coffee

@@ -6,25 +6,48 @@ module.exports = ->
   @initConfig
     pkg: @file.readJSON 'package.json'
 
-    # Updating the package manifest files
-    noflo_manifest:
-      update:
-        files:
-          'component.json': ['graphs/*', 'components/*']
-          'package.json': ['graphs/*', 'components/*']
-
-    # Browser build of NoFlo
-    'bower-install-simple':
-      deps:
-        options:
-          interactive: false
-          forceLatest: false
-          directory: 'browser/bower_components'
-
     noflo_browser:
       everything:
         options:
+          exposed_modules:
+            'noflo': 'noflo'
+            'noflo-runtime-iframe': 'noflo-runtime-iframe'
+            'noflo-runtime-webrtc': 'noflo-runtime-webrtc'
+            'fbp-protocol-client': 'fbp-protocol-client'
+            'noflo-runtime': 'noflo-runtime'
+          manifest:
+            runtimes: [
+              'noflo'
+            ]
+            discover: true
+            recursive: true
+            subdirs: false
           debug: true
+          webpack:
+            externals:
+              'repl': 'commonjs repl' # somewhere inside coffee-script
+              'module': 'commonjs module' # somewhere inside coffee-script
+              'child_process': 'commonjs child_process' # somewhere inside coffee-script
+              'jison': 'commonjs jison'
+              'canvas': 'commonjs canvas'
+              'mimetype': 'commonjs mimetype'
+              'should': 'commonjs should' # used by tests in octo
+              'express': 'commonjs express' # used by tests in octo
+              'highlight': 'commonjs highlight' # used by octo?
+              'microflo-emscripten': 'commonjs microflo-emscripten' # optional?
+              'acorn': 'commonjs acorn' # optional?
+            module:
+              loaders: [
+                { test: /\.coffee$/, loader: "coffee-loader" }
+                { test: /\.json$/, loader: "json-loader" }
+                { test: /\.fbp$/, loader: "fbp-loader" }
+              ]
+            resolve:
+              extensions: ["", ".coffee", ".js"]
+              alias:
+                URIjs: 'urijs'
+            node:
+              fs: "empty"
           heads: [
             """<style>
             body {
@@ -34,26 +57,40 @@ module.exports = ->
             }
             </style>"""
           ,
-            """<script src="./bower_components/coffee-script/extras/coffee-script.js"></script>"""
-          ,
-            """<script src="../node_modules/babel-core/browser.js"></script>"""
+            """<script src="https://cdnjs.cloudflare.com/ajax/libs/coffee-script/1.7.1/coffee-script.min.js"></script>"""
           ,
             """
-            <script src="./bower_components/requirejs/require.js"></script>
+            <script src="vendor/requirejs/require.js"></script>
             <script>
             requirejs.config({
               packages: [
                 {
                   name: 'React',
-                  location: './bower_components/react',
+                  location: 'vendor/react',
                   main: 'react'
                 }
               ]
             });
             </script>"""
           ]
         files:
-          "browser/everything.js": ['component.json']
+          "browser/everything.js": ['package.json']
+
+    copy:
+      vendor:
+        files: [
+          expand: true
+          cwd: 'node_modules/react/dist'
+          src: '*.js'
+          dest: 'browser/vendor/react'
+          filter: 'isFile'
+        ,
+          expand: true
+          cwd: 'node_modules/requirejs'
+          src: '*.js'
+          dest: 'browser/vendor/requirejs'
+          filter: 'isFile'
+        ]
 
     manifest:
       cache:
@@ -64,7 +101,7 @@ module.exports = ->
         dest: 'browser/manifest.appcache'
         src: [
           'everything.*'
-          'bower_components/*/*'
+          'vendor/*/**.js'
         ]
 
     'string-replace':
@@ -74,14 +111,43 @@ module.exports = ->
         options:
           replacements: [
             pattern: '<html>'
-            replacement: '<html manifest="/noflo-browser/manifest.appcache">'
+            replacement: '<html manifest="manifest.appcache">'
           ]
 
+    # CoffeeScript compilation
+    coffee:
+      spec:
+        options:
+          bare: true
+        expand: true
+        cwd: 'spec'
+        src: ['**.coffee']
+        dest: 'spec'
+        ext: '.js'
+    # Web server for the browser tests
+    connect:
+      server:
+        options:
+          port: 8000
+    # BDD tests on browser
+    noflo_browser_mocha:
+      all:
+        options:
+          scripts: ["../browser/everything.js"]
+        files:
+          'spec/runner.html': ['spec/*.js']
+    mocha_phantomjs:
+      all:
+        options:
+          output: 'spec/result.xml'
+          reporter: 'spec'
+          urls: ['http://localhost:8000/spec/runner.html']
+          failWithOutput: true
     'gh-pages':
       options:
         base: 'browser'
         clone: 'gh-pages'
-        message: 'Updating'
+        message: "Release #{pkg.name} #{process.env.TRAVIS_TAG}"
         repo: repo
         user:
           name: 'NoFlo bot'
@@ -90,26 +156,31 @@ module.exports = ->
       src: '**/*'
 
   # Grunt plugins used for building
-  @loadNpmTasks 'grunt-bower-install-simple'
-  @loadNpmTasks 'grunt-noflo-manifest'
   @loadNpmTasks 'grunt-noflo-browser'
+  @loadNpmTasks 'grunt-contrib-copy'
   @loadNpmTasks 'grunt-manifest'
   @loadNpmTasks 'grunt-string-replace'
 
   # Grunt plugins used for testing
+  @loadNpmTasks 'grunt-contrib-coffee'
+  @loadNpmTasks 'grunt-contrib-connect'
+  @loadNpmTasks 'grunt-mocha-phantomjs'
 
   # Grunt plugins used for deploying
   @loadNpmTasks 'grunt-gh-pages'
 
   # Our local tasks
   @registerTask 'build', 'Build NoFlo for the chosen target platform', (target = 'all') =>
-    @task.run 'bower-install-simple'
-    @task.run 'noflo_manifest'
     @task.run 'noflo_browser'
+    @task.run 'copy'
     @task.run 'manifest'
     @task.run 'string-replace:manifest'
 
   @registerTask 'test', 'Build NoFlo and run automated tests', (target = 'all') =>
     @task.run 'build'
+    @task.run 'coffee'
+    @task.run 'connect'
+    @task.run 'noflo_browser_mocha'
+    @task.run 'mocha_phantomjs'
 
   @registerTask 'default', ['test']