Merge pull request #3 from toddbc/webpack4

Support newer webpack versions

Author: nadavspi

README.md

@@ -10,6 +10,8 @@ The config file is executed to find all calls to `require.config()`.
 
 ## Usage
 
+In webpack.config.js:
+
     const RequireJsResolverPlugin = require('@sdinteractive/requirejs-resolver');
 
     module.exports = {
@@ -21,3 +23,6 @@ The config file is executed to find all calls to `require.config()`.
         ],
       },
     };
+
+Normally for Magento 2, this should be the requirejs-config.js (or requirejs-config.min.js) generated by
+the static content process.  This will map aliases in the requirejs-config when imported.

index.js

@@ -7,13 +7,13 @@ function RequireJsResolverPlugin(options) {
     this.sandbox = options.sandbox || {};
 }
 
-RequireJsResolverPlugin.prototype.getConfig = function(fs) {
+RequireJsResolverPlugin.prototype.getConfig = function (fs) {
     return new Promise((resolve, reject) => {
         if (this.configData) {
             return resolve(this.configData);
         }
 
-        fs.readFile(this.configPath, function(err, buffer) {
+        fs.readFile(this.configPath, (err, buffer) => {
             if (err) {
                 reject(err);
             } else {
@@ -27,15 +27,15 @@ RequireJsResolverPlugin.prototype.getConfig = function(fs) {
 
         let sandbox = Object.assign({
             paths: {},
-            require: function() {
+            require: () => {
             },
         }, this.sandbox);
-        sandbox.require.addPaths = function(paths) {
-            for (var path in paths) {
+        sandbox.require.addPaths = function (paths) {
+            for (let path in paths) {
                 sandbox.paths[path] = paths[path];
             }
         };
-        sandbox.require.config = function(config) {
+        sandbox.require.config = function (config) {
             if (config.paths) {
                 this.addPaths(config.paths);
             }
@@ -55,14 +55,24 @@ RequireJsResolverPlugin.prototype.getConfig = function(fs) {
     });
 };
 
-RequireJsResolverPlugin.prototype.apply = function(resolver) {
-    resolver.plugin('module', (request, callback) => {
+function registerHook(object, oldName, newName, cb) {
+    if (object.hooks) {
+        object.hooks[newName].tapAsync('RequireJsResolverPlugin', cb);
+    } else {
+        object.plugin(oldName, cb);
+    }
+}
+
+RequireJsResolverPlugin.prototype.apply = function (resolver) {
+    const target = resolver.ensureHook('resolve');
+    registerHook(resolver, 'module', 'module', (request, resolveContext, callback) => {
+        if (!callback) {
+            callback = resolveContext;
+        }
         this.getConfig(resolver.fileSystem).then(config => {
             if (config[request.request]) {
-                var nextRequest = Object.assign({}, request, { request: config[request.request] });
-                return resolver.doResolve('resolve', nextRequest, 'mapping via requirejs-config', function(err, result) {
-                    callback(err, result);
-                });
+                const nextRequest = Object.assign({}, request, { request: config[request.request] });
+                return resolver.doResolve(target, nextRequest, 'mapping via requirejs-config', callback);
             } else {
                 callback();
             }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdinteractive/requirejs-resolver",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "description": "webpack resolver to find requirejs modules via requirejs config.",
   "main": "index.js",
   "scripts": {