Implemented require of browserify in runtime

enb · Aug 31, 2015 · b6ee487 · b6ee487
1 parent cde8622
commit b6ee487
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 6 deletions.
diff --git a/lib/bundle.js b/lib/bundle.js
@@ -1,7 +1,6 @@
 var vowCode = require('./vow-code'),
     vow = require('vow'),
     promisify = require('vow-node').promisify,
-    browserify = require('browserify'),
     EOL = require('os').EOL;
 
 /**
@@ -131,7 +130,8 @@ function compileYModule(name, requires, libs) {
  * @returns {String}
  */
 function compileCommonJSRequire(requires, dirname) {
-    var browserifyOptions = {
+    var browserify = require('browserify'),
+        browserifyOptions = {
             basedir: dirname
         },
         renderer = browserify(browserifyOptions),

diff --git a/package.json b/package.json
@@ -43,10 +43,10 @@
     "jscs": "1.13.1",
     "jshint": "2.8.0",
     "mocha": "2.2.5",
-    "mock-enb": "0.1.0",
     "mocha-phantomjs": "3.5.3",
+    "mock-enb": "0.1.0",
     "mock-fs": "3.0.0",
-    "mock-require": "1.1.0",
+    "mock-require": "^1.1.0",
     "must": "0.12.0",
     "phantomjs": "1.9.18",
     "serve-static": "1.9.3",

diff --git a/test/lib/mocks.js b/test/lib/mocks.js
@@ -1 +1,6 @@
+var mock = require('mock-require'),
+    browserifyPath = require.resolve('browserify');
+
+mock(require.resolve(browserifyPath), require(browserifyPath));
+
 require('./job-queue-stub');
diff --git a/test/techs/bemhtml/bemhtml--browser.test.js b/test/techs/bemhtml/bemhtml--browser.test.js
@@ -101,6 +101,9 @@ function runTest(testContent, options, template, lib) {
             bundle: {},
             // jscs:disable
             node_modules: {
+                browserify: {
+                    'index.js': ''
+                },
                 fake: {
                     'index.js': 'module.exports = { getText: function () { return "Hello world!"; } };'
                 },

diff --git a/test/techs/bemhtml/bemhtml--node.test.js b/test/techs/bemhtml/bemhtml--node.test.js
@@ -133,6 +133,9 @@ function build(templates, options, lib) {
             bundle: {},
             // jscs:disable
             node_modules: {
+                browserify: {
+                    'index.js': ''
+                },
                 fake: {
                     'index.js': 'module.exports = { getText: function () { return "^_^"; } };'
                 },

diff --git a/test/techs/bemhtml/bemhtml--ym.test.js b/test/techs/bemhtml/bemhtml--ym.test.js
@@ -141,6 +141,9 @@ function runTest(testContent, options, template, lib) {
             bundle: {},
             // jscs:disable
             node_modules: {
+                browserify: {
+                    'index.js': ''
+                },
                 fake: {
                     'index.js': 'module.exports = { getText: function () { return "^_^"; } };'
                 },

diff --git a/test/techs/bemhtml/bemhtml.test.js b/test/techs/bemhtml/bemhtml.test.js
@@ -271,7 +271,14 @@ describe('bemhtml', function () {
 function build(templates, options) {
     var scheme = {
             blocks: {},
-            bundle: {}
+            bundle: {},
+            // jscs:disable
+            node_modules: {
+                browserify: {
+                    'index.js': ''
+                }
+            }
+            // jscs:enable
         },
         bundle, fileList;
 

diff --git a/test/techs/bemtree.test.js b/test/techs/bemtree.test.js
@@ -168,7 +168,14 @@ function build(templates, options) {
 
     var scheme = {
             blocks: {},
-            bundle: {}
+            bundle: {},
+            // jscs:disable
+            node_modules: {
+                browserify: {
+                    'index.js': ''
+                }
+            }
+            // jscs:enable
         },
         bundle, fileList;