Merge pull request #30 from noflo/noflo_component_loader

Build using noflo-component-loader

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-- '4.2'
+- '6'
 before_script:
 - npm install -g grunt-cli
 script: grunt test

appveyor.yml

@@ -6,7 +6,7 @@ init:
 
 environment:
   matrix:
-    - nodejs_version: 4.2
+    - nodejs_version: 6
 
 install:
   - ps: Install-Product node $env:nodejs_version

package.json

@@ -28,7 +28,7 @@
     "coffee-loader": "^0.7.2",
     "coffee-script": "^1.10.0",
     "fbp-loader": "^0.1.1",
-    "fbp-manifest": "^0.1.13",
+    "noflo-component-loader": "^0.1.1",
     "webpack": "^3.0.0"
   },
   "devDependencies": {
@@ -39,7 +39,6 @@
     "grunt-contrib-jshint": "^1.1.0",
     "grunt-exec": "^1.0.0",
     "grunt-mocha-phantomjs": "^4.0.0",
-    "grunt-noflo-manifest": "^0.1.12",
     "mocha": "^4.0.0"
   },
   "peerDependencies": {

spec/fixtures/package.json

@@ -14,11 +14,11 @@
   },
   "dependencies": {
     "noflo": "0.x >= 0.8",
-    "noflo-math": "^0.0.8",
-    "noflo-core": "^0.2.3",
-    "noflo-objects": "^0.1.14",
-    "noflo-dom": "^0.1.1",
-    "noflo-css": "^0.0.2"
+    "noflo-math": "^0.2.0",
+    "noflo-core": "^0.4.0",
+    "noflo-objects": "^0.3.0",
+    "noflo-dom": "^0.2.0",
+    "noflo-css": "^0.1.0"
   },
   "devDependencies": {
     "noflo-runtime-postmessage": "^0.8.0"

src/webpack.js

@@ -22,19 +22,28 @@ exports.configure = function (options) {
     config.plugins = [];
   }
 
-  // Custom component loader for this build
-  config.plugins.push(
-    new webpack.NormalModuleReplacementPlugin(
-      /\.\/loader\/register/,
-      require.resolve(options.loaderPath)
-    )
-  );
-
   // Configurable ignores
   options.ignores.forEach(function (ignore) {
     config.plugins.push(new webpack.IgnorePlugin(ignore));
   });
 
+  // Inject noflo-component-loader
+  config.module.rules.push({
+    test: /noflo([\\]+|\/)lib([\\]+|\/)loader([\\]+|\/)register.js$/,
+    use: [
+      {
+        loader: 'noflo-component-loader',
+        options: {
+          graph: options.graph,
+          debug: options.debug,
+          baseDir: options.baseDir,
+          manifest: options.manifest,
+          runtimes: options.runtimes,
+        }
+      }
+    ]
+  });
+
   config.output = {
     path: options.destDir,
     filename: options.destName + '.js'

tasks/noflo_browser.js

@@ -11,7 +11,6 @@
 var path = require('path');
 var webpack = require('../src/webpack');
 var createDemos = require('../src/create_demos');
-var buildLoader = require('../src/build_loader');
 var bluebird = require('bluebird');
 var clone = require('clone');
 
@@ -130,19 +129,13 @@ module.exports = function(grunt) {
             fileOptions.runtimes.push('noflo-browser');
           }
 
-          var discover = bluebird.promisify(buildLoader.discover);
-          return discover(fileOptions);
-        }).then(function (components) {
-          fileOptions.loaderPath = buildLoader.save(components, grunt, fileOptions);
-
           var config = webpack.configure(fileOptions);
 
           grunt.log.debug('Generated webpack configuration:');
           grunt.log.debug(JSON.stringify(config, null, 2));
 
           return bluebird.promisify(webpack.run)(config);
         }).then(function () {
-          grunt.file.delete(fileOptions.loaderPath);
           if (fileOptions.generatedEntry) {
             grunt.file.delete(fileOptions.webpack.entry);
           }