webpack4 support

Author: theKashey

.gitignore

@@ -1,6 +1,7 @@
 node_modules/
 /lib/
 /es/
+/dist/
 .DS_Store
 .idea
 npm-debug.log

_tests/automocking.spec.js

@@ -6,6 +6,11 @@ import {_clearPlugins} from '../src/plugins';
 import nodePlugin from '../src/plugins/nodejs';
 
 describe('scope ', () => {
+
+    const webpackDefault = exports => {
+      return typeof __webpack_require__ !== 'undefined' ? exports.default: exports;
+    };
+
     it('scope test: ', () => {
         addPlugin(nodePlugin);
         const unmockedBaz = require('./lib/a/test.js');
@@ -57,7 +62,7 @@ describe('scope ', () => {
                 mock('./lib/a/../b/baz').with(() => 'cc');
             })
             .then((mockedBaz) => {
-                expect(mockedBaz()).to.be.equal('aabbcc');
+                expect(webpackDefault(mockedBaz)()).to.be.equal('aabbcc');
             });
     });
 
@@ -75,7 +80,7 @@ describe('scope ', () => {
                     mock('./lib/a/../b/baz').with(() => 'cc');
                 }))
             .then((mockedBaz) => {
-                expect(mockedBaz()).to.be.equal('aabbcc');
+                expect(webpackDefault(mockedBaz)()).to.be.equal('aabbcc');
             });
     });
 
@@ -87,7 +92,7 @@ describe('scope ', () => {
             () =>
                 import('./lib/a/test.js')
                     .then((mockedBaz) => {
-                        expect(mockedBaz()).to.be.equal('aabbcc');
+                        expect(webpackDefault(mockedBaz)()).to.be.equal('aabbcc');
                     }),
             (mock) => {
                 addPlugin(nodePlugin);
@@ -111,7 +116,7 @@ describe('scope ', () => {
                 mock('./lib/a/../b/baz').with(() => 'cc');
             })
             .then((mockedBaz) => {
-                expect(mockedBaz()).to.be.equal('aabarcc');
+                expect(webpackDefault(mockedBaz)()).to.be.equal('aabarcc');
             });
     });
 
@@ -121,7 +126,7 @@ describe('scope ', () => {
 
         return rewiremock.around(() => import('./lib/a/test.js'))
             .then((mockedBaz) => {
-                expect(mockedBaz()).to.be.equal('foobarbaz');
+                expect(webpackDefault(mockedBaz)()).to.be.equal('foobarbaz');
             });
     });
 
@@ -169,7 +174,7 @@ describe('scope ', () => {
       }));
 
       return mockedBazLoad.then(mockedBaz => {
-        expect(mockedBaz()).to.be.equal('aabarcc')
+        expect(webpackDefault(mockedBaz)()).to.be.equal('aabarcc')
       })
     });
 

_tests/scope.spec.js

@@ -11,6 +11,7 @@ describe('simples case ', () => {
 
     rewiremock.enable();
     const mocked = require('./lib/use-node_module.js');
+
     expect(mocked.test()).to.be.equal('mocked');
     rewiremock.disable();
   });

_tests/simple-case.spec.js

@@ -17,7 +17,7 @@
     "build5": "BABEL_ENV=cjs babel src -d lib && cp src/index.js.flow lib/index.js.flow",
     "build6": "BABEL_ENV=ejs babel src -d es && cp src/index.js.flow es/index.js.flow",
     "prepublish": "npm run build",
-    "lint": "eslint src tests",
+    "lint": "eslint src",
     "lint:fix": "eslint src tests --fix"
   },
   "repository": {
@@ -50,7 +50,7 @@
     "mock",
     "mockery",
     "proxyquire"
-  ],view-source:https://upload.wikimedia.org/wikipedia/commons/0/05/Sierpinski_triangle_evolution.svgview-source:https://upload.wikimedia.org/wikipedia/commons/0/05/Sierpinski_triangle_evolution.svgff
+  ],
   "jest": {
     "testMatch": [
       "**/?(*.)(jest).js?(x)"
@@ -69,9 +69,10 @@
     "compare-module-exports": "^2.0.0",
     "lodash.some": "^4.6.0",
     "lodash.template": "^4.4.0",
+    "node-libs-browser": "^2.1.0",
     "path-parse": "^1.0.5",
     "wipe-node-cache": "^1.1.0",
-    "wipe-webpack-cache": "^1.0.0"
+    "wipe-webpack-cache": "^1.0.2"
   },
   "devDependencies": {
     "babel-cli": "^6.18.0",
@@ -84,7 +85,7 @@
     "babel-preset-env": "1.6.1",
     "babel-register": "6.18.0",
     "chai": "^3.5.0",
-    "eslint": "^3.19.0",
+    "eslint": "^4.19.1",
     "eslint-plugin-mocha": "^4.9.0",
     "flow-bin": "^0.59.0",
     "jest-cli": "^21.2.1",
@@ -98,7 +99,8 @@
     "phantomjs-polyfill": "0.0.2",
     "phantomjs-polyfill-object-assign": "0.0.2",
     "sinon": "^4.4.2",
-    "webpack": "^3.5.5",
-    "webpack-dev-server": "^2.7.1"
+    "webpack": "^4.2.0",
+    "webpack-cli": "^2.0.13",
+    "webpack-dev-server": "^3.1.1"
   }
 }

package.json

@@ -145,6 +145,8 @@ function mockLoader(request, parent, isMain) {
     mockedModules[baseRequest] = true;
   }
 
+  //autoMock(baseRequest);
+
   const mock = getMock(baseRequest) || getMock(request) || getMock(shortRequest);
 
   if (mock) {

src/executor.js

@@ -39,6 +39,10 @@ const removePlugin = API.removePlugin;
 addPlugin(plugins.toBeUsed);
 addPlugin(plugins.directChild);
 
+if(typeof __webpack_require__ !== "undefined"){
+  addPlugin(plugins.nodeLibBrowser);
+}
+
 export {
     addPlugin,
     removePlugin,

src/index.js

@@ -258,7 +258,7 @@ const swapCache = () => {
     Object
       .keys(newCache)
       .filter(key => !oldCache[key])
-      .filter(key => key.indexOf('\.node') < 0)
+      .filter(key => key.indexOf('.node') < 0)
       .forEach(key => delete newCache[key]);
 
     Object

src/mockModule.js

@@ -139,12 +139,14 @@ function processFile(filePath, {aliasConf, extensionsConf}) {
     if (aliasConf.hasOwnProperty(aliasFrom)) {
 
       let aliasTo = aliasConf[aliasFrom];
-      const regex = new RegExp(`^${aliasFrom}(\/|$)`);
+      const regex = new RegExp(`^${aliasFrom}(/|$)`);
 
       // If the regex matches, replace by the right config
       if (regex.test(filePath)) {
 
         // notModuleRegExp from https://github.com/webpack/enhanced-resolve/blob/master/lib/Resolver.js
+
+        /* eslint-disable no-useless-escape */
         const notModuleRegExp = /^\.$|^\.[\\\/]|^\.\.$|^\.\.[\/\\]|^\/|^[A-Z]:[\\\/]/i;
         const isModule = !notModuleRegExp.test(aliasTo);
 

src/plugins/common/aliases.js

@@ -11,6 +11,8 @@ import mockThoughByDefault from './mockThoughByDefault';
 import usedByDefault from './usedByDefault';
 import alwaysMatchOrigin from './toMatchOrigin';
 
+import nodeLibBrowser from './node-lib-browser';
+
 const exports = {
     childOnly,
     nodejs,
@@ -23,7 +25,9 @@ const exports = {
     mockThoughByDefault,
     alwaysMatchOrigin,
     usedByDefault,
-    directChild
+    directChild,
+
+    nodeLibBrowser
 };
 
 export default exports;

src/plugins/index.js

@@ -0,0 +1,15 @@
+import mapping from 'node-libs-browser';
+
+import createPlugin from './_common';
+
+const fileNameTransformer = (fileName/*, module*/) => mapping[fileName] || fileName;
+
+const plugin = createPlugin({
+  fileNameTransformer,
+  //wipeCheck,
+  //shouldMock,
+
+  name: 'node-libs-browser'
+});
+
+export default plugin;

src/plugins/node-lib-browser.js

@@ -12,7 +12,7 @@ const primaryResolver = (stubs, moduleName) =>
 
 const resolver = (stubs, moduleName) => {
   // never wipe .node(native) module
-  if (moduleName.indexOf('\.node') > -1) {
+  if (moduleName.indexOf('.node') > -1) {
     return false;
   }
   return shouldWipe(stubs, moduleName) || primaryResolver(stubs, moduleName) || relativeWipeCheck(stubs, moduleName);

src/wipeCache.js

@@ -2,6 +2,7 @@ const webpack = require('webpack');
 const mockPlugin = require("./webpack/plugin");
 
 module.exports = {
+  mode: "development",
   // webpack configuration
   plugins: [
     new webpack.NamedModulesPlugin(),

webpack.config.js

@@ -12,6 +12,7 @@ const Module = {
 
     const asFile = keys.find(name => name.indexOf(targetFile) > 0);
     const asIndex = keys.find(name => name.indexOf(targetFileIndex) > 0);
+
     if (asFile && asIndex && asFile.substr(targetFile.length+1).indexOf('/') >= 0) {
         return asIndex;
     }

webpack/module.js

@@ -11,7 +11,9 @@ class RewiremockPlugin {
 
       compilation.moduleTemplate.plugin('render', function (moduleSource) {
         const source = new ConcatSource();
-        source.add(injectString);
+        if (moduleSource.source().indexOf('require') > 0) {
+          source.add(injectString);
+        }
         source.add(moduleSource);
         return source;
       });