Strip fn declarations in addition to calls from source

README.md

@@ -19,6 +19,7 @@ In your client js source files:
 
 ```javascript
 
+// The following two lines of code will be stripped with our webpack loader
 var debug = require('debug')('MyFile');
 
 var makeFoo = function () {
@@ -31,6 +32,25 @@ var makeFoo = function () {
 
 ```
 
+In your client js output files:
+
+```javascript
+
+// The following two lines of code will be stripped with our webpack loader
+
+
+var makeFoo = function () {
+    // The following two lines of code will be stripped with our webpack loader
+
+
+    // This code would remain
+    return 'Foo';
+};
+
+```
+
+
+
 ### Single function
 In your webpack config:
 
@@ -72,20 +92,6 @@ var webpackConfig = {
 };
 ```
 
-### Remove stripped functions from bundle
-
-So far we've removed the calls to the debug function, but webpack will still include the `debug` module in the final bundle. Use the [`IgnorePlugin`](http://webpack.github.io/docs/list-of-plugins.html#ignoreplugin)
-
-```javascript
-{
-    plugins: [
-        new webpack.IgnorePlugin(/debug/)
-    ]
-}
-```
-
-
-
 ## License
 
 This software is free to use under the Yahoo! Inc. BSD license.

lib/index.js

@@ -14,9 +14,14 @@ function StripFnLoader(source) {
 
     var toStrip = query.strip.join('|');
 
-    var regexPattern = new RegExp('\\n[ \\t]*(' + toStrip + ')\\([^\\);]+\\)[ \\t]*[;\\n]', 'g');
+    var fnDeclRegExp = new RegExp('\\n[ \\t]*var \\w+ = require\\(\\\\?[\'"](' + toStrip + ')[^\\)]*\\)[^;]*[;\\n]', 'g');
+    var fnCallRegExp = new RegExp('\\n[ \\t]*(' + toStrip + ')\\([^\\);]+\\)[ \\t]*[;\\n]', 'g');
+
+
+    var transformed = source.replace(fnDeclRegExp, '\n').replace(fnCallRegExp, '\n');
+
+    // var re = /\n[ \t]*var \w+ = require\(\\?['"]debug[^\)]*\)[^;]*[;\n]/g;
 
-    var transformed = source.replace(regexPattern, '\n');
 
     this.callback(null, transformed);
 }

tests/fixtures/app/index.js

@@ -3,6 +3,9 @@
  * Copyrights licensed under the New BSD License. See the accompanying LICENSE file for terms.
  */
 
+// The following line of code will be stripped with our webpack loader
+var debug = require('debug')('Foo');
+
 var makeFoo = function (bar, baz) {
     // The following 2 lines of code will be stripped with our webpack loader
     console.log('some debug info');