Fix: Absolute paths being used when expose-loader exposes more than one global for a library

.gitignore

@@ -63,9 +63,10 @@ typings/
 /local
 /reports
 /node_modules
+/test/outputs
 .DS_Store
 Thumbs.db
 .idea
 .vscode
 *.sublime-project
-*.sublime-workspace
+*.sublime-workspace

README.md

@@ -91,10 +91,9 @@ module: {
     test: require.resolve('jquery'),
     use: [{
       loader: 'expose-loader',
-      options: 'jQuery'
-    },{
-      loader: 'expose-loader',
-      options: '$'
+      options: {
+        expose: ['jQuery', '$']
+      }
     }]
   }]
 }
@@ -133,4 +132,4 @@ Please take a moment to read our contributing guidelines if you haven't yet done
 [cover-url]: https://codecov.io/gh/webpack-contrib/expose-loader
 
 [chat]: https://img.shields.io/badge/gitter-webpack%2Fwebpack-brightgreen.svg
-[chat-url]: https://gitter.im/webpack/webpack
+[chat-url]: https://gitter.im/webpack/webpack

lib/index.js

@@ -5,46 +5,76 @@
 
 const path = require('path');
 
-function accesorString(value) {
+const exposeLoaderPathRegex = new RegExp(
+  `^(.*)${path.sep}expose-loader${path.sep}index.js`
+);
+
+function buildAccessorAndInitializersFor(value) {
   const childProperties = value.split('.');
   const { length } = childProperties;
   let propertyString = 'global';
-  let result = '';
+  const initializers = [];
 
   for (let i = 0; i < length; i++) {
-    if (i > 0) result += `if(!${propertyString}) ${propertyString} = {};\n`;
+    if (i > 0)
+      initializers.push(`if(!${propertyString}) ${propertyString} = {};`);
     propertyString += `[${JSON.stringify(childProperties[i])}]`;
   }
 
-  result += `module.exports = ${propertyString}`;
-  return result;
+  return [propertyString, initializers];
 }
 
 module.exports = function loader() {};
 module.exports.pitch = function pitch(remainingRequest) {
   // Change the request from an /abolute/path.js to a relative ./path.js
   // This prevents [chunkhash] values from changing when running webpack
   // builds in different directories.
-  const newRequestPath = remainingRequest.replace(
+  let newRequestPath = remainingRequest.replace(
     this.resourcePath,
     `.${path.sep}${path.relative(this.context, this.resourcePath)}`
   );
+  const exposeLoaderMatch = remainingRequest.match(exposeLoaderPathRegex);
+  if (exposeLoaderMatch) {
+    const exposeLoaderPath = exposeLoaderMatch[0];
+    newRequestPath = newRequestPath.replace(
+      exposeLoaderPath,
+      `.${path.sep}${path.relative(this.context, exposeLoaderPath)}`
+    );
+  }
 
   if (this.cacheable) {
     this.cacheable();
   }
 
   if (!this.query) throw new Error('query parameter is missing');
+
+  let exposed;
+  if (typeof this.query === 'string') {
+    exposed = [this.query.substr(1)];
+  } else if (this.query.expose) {
+    exposed = this.query.expose;
+  }
+
   /*
-     * Workaround until module.libIdent() in webpack/webpack handles this correctly.
-     *
-     * fixes:
-     * - https://github.com/webpack-contrib/expose-loader/issues/55
-     * - https://github.com/webpack-contrib/expose-loader/issues/49
-     */
+   * Workaround until module.libIdent() in webpack/webpack handles this correctly.
+   *
+   * fixes:
+   * - https://github.com/webpack-contrib/expose-loader/issues/55
+   * - https://github.com/webpack-contrib/expose-loader/issues/49
+   */
   this._module.userRequest = `${this._module.userRequest}-exposed`;
+
+  let initializers = [];
+  const accessors = [];
+  exposed.forEach((value) => {
+    const [accessor, valueInitializers] = buildAccessorAndInitializersFor(
+      value
+    );
+    accessors.push(accessor);
+    initializers = initializers.concat(valueInitializers);
+  });
   return (
-    `${accesorString(this.query.substr(1))} = ` +
+    `${initializers.join('\n')}\nmodule.exports = ${accessors.join(' = ')} =` +
     `require(${JSON.stringify(`-!${newRequestPath}`)});`
   );
 };

package.json

@@ -60,6 +60,7 @@
     "eslint-plugin-prettier": "^2.6.0",
     "husky": "^0.14.3",
     "jest": "^22.4.3",
+    "jsdom": "^11.11.0",
     "lint-staged": "^7.0.4",
     "memory-fs": "^0.4.1",
     "nsp": "^3.2.1",