refactor: code

Author: evilebottnawi

.eslintrc.js

@@ -1,4 +1,16 @@
 module.exports = {
   root: true,
   extends: ['@webpack-contrib/eslint-config-webpack', 'prettier'],
+  overrides: [
+    {
+      globals: {
+        globalThis: 'readonly',
+      },
+      env: {
+        browser: true,
+        node: true,
+      },
+      files: ['**/runtime/**/*.js'],
+    },
+  ],
 };

src/index.js

@@ -3,9 +3,6 @@
   Author Tobias Koppers @sokra
 */
 
-import path from 'path';
-import url from 'url';
-
 import {
   getOptions,
   stringifyRequest,
@@ -17,7 +14,7 @@ import validateOptions from 'schema-utils';
 
 import schema from './options.json';
 
-import { modifyUserRequest, getExposes } from './utils';
+import { getExposes, contextify, getNewUserRequest } from './utils';
 
 export default function loader() {
   const options = getOptions(this);
@@ -27,31 +24,14 @@ export default function loader() {
     baseDataPath: 'options',
   });
 
-  // 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 = getRemainingRequest(this)
-    .split('!')
-    .map((currentUrl) => {
-      const result = `./${path.relative(
-        this.context,
-        url.parse(currentUrl).pathname
-      )}`;
-
-      return process.platform === 'win32'
-        ? result.split(path.sep).join('/')
-        : result;
-    })
-    .join('!');
-
   /*
    * 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 = modifyUserRequest(this._module.userRequest);
+  this._module.userRequest = getNewUserRequest(this._module.userRequest);
 
   const callback = this.async();
 
@@ -65,21 +45,12 @@ export default function loader() {
     return;
   }
 
-  const isModule = options.type !== 'commonjs';
+  // 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 newRequest = contextify(this.rootContext, getRemainingRequest(this));
+  const stringifiedNewRequest = stringifyRequest(this, `-!${newRequest}`);
 
-  let code = '';
-
-  if (isModule) {
-    code = `import * as ___EXPOSE_LOADER_IMPORT___ from ${stringifyRequest(
-      this,
-      `-!${newRequestPath}`
-    )};\n`;
-  } else {
-    code = `var ___EXPOSE_LOADER_IMPORT___ = require(${stringifyRequest(
-      this,
-      `-!${newRequestPath}`
-    )});\n`;
-  }
+  let code = `var ___EXPOSE_LOADER_IMPORT___ = require(${stringifiedNewRequest});\n`;
 
   code += `var ___EXPOSE_LOADER_GET_GLOBAL_THIS___ = require(${stringifyRequest(
     this,
@@ -89,9 +60,9 @@ export default function loader() {
 
   for (const expose of exposes) {
     const { globalName, moduleLocalName } = expose;
-    const globalNameInterpolated = globalName.map((item) => {
-      return interpolateName(this, item, {});
-    });
+    const globalNameInterpolated = globalName.map((item) =>
+      interpolateName(this, item, {})
+    );
 
     if (typeof moduleLocalName !== 'undefined') {
       code += `var ___EXPOSE_LOADER_IMPORT_MODULE_LOCAL_NAME___ = ___EXPOSE_LOADER_IMPORT___.${moduleLocalName}\n`;
@@ -113,15 +84,7 @@ export default function loader() {
         : `${propertyString} = ___EXPOSE_LOADER_IMPORT___;\n`;
   }
 
-  if (isModule) {
-    code += `export { default } from ${stringifyRequest(
-      this,
-      `-!${newRequestPath}`
-    )};\n`;
-    code += `export * from ${stringifyRequest(this, `-!${newRequestPath}`)};\n`;
-  } else {
-    code += `module.exports = ___EXPOSE_LOADER_IMPORT___;`;
-  }
+  code += `module.exports = ___EXPOSE_LOADER_IMPORT___;\n`;
 
   callback(null, code);
 }

src/options.json

@@ -30,9 +30,6 @@
   },
   "type": "object",
   "properties": {
-    "type": {
-      "enum": ["module", "commonjs"]
-    },
     "exposes": {
       "anyOf": [
         {

src/runtime/getGlobalThis.js

@@ -1,16 +1,13 @@
 module.exports = function getGlobalThis() {
   if (typeof globalThis !== 'undefined') {
-    // eslint-disable-next-line no-undef
     return globalThis;
   }
 
   if (typeof self !== 'undefined') {
-    // eslint-disable-next-line no-undef
     return self;
   }
 
   if (typeof window !== 'undefined') {
-    // eslint-disable-next-line no-undef
     return window;
   }
 

src/utils.js

@@ -1,5 +1,21 @@
 import path from 'path';
 
+function getNewUserRequest(request) {
+  const splittedRequest = request.split('!');
+  const lastPartRequest = splittedRequest.pop().split('?', 2);
+  const pathObject = path.parse(lastPartRequest[0]);
+
+  pathObject.base = `${path.basename(pathObject.base, pathObject.ext)}-exposed${
+    pathObject.ext
+  }`;
+
+  lastPartRequest[0] = path.format(pathObject);
+
+  splittedRequest.push(lastPartRequest.join('?'));
+
+  return splittedRequest.join('!');
+}
+
 function splitCommand(command) {
   const result = command
     .split('|')
@@ -55,20 +71,31 @@ function getExposes(items) {
   return result;
 }
 
-function modifyUserRequest(request) {
-  const splittedRequest = request.split('!');
-  const lastPartRequest = splittedRequest.pop().split('?', 2);
-  const pathObject = path.parse(lastPartRequest[0]);
+function contextify(context, request) {
+  return request
+    .split('!')
+    .map((r) => {
+      const splitPath = r.split('?', 2);
 
-  pathObject.base = `${path.basename(pathObject.base, pathObject.ext)}-exposed${
-    pathObject.ext
-  }`;
+      if (/^[a-zA-Z]:\\/.test(splitPath[0])) {
+        splitPath[0] = path.win32.relative(context, splitPath[0]);
 
-  lastPartRequest[0] = path.format(pathObject);
+        if (!/^[a-zA-Z]:\\/.test(splitPath[0])) {
+          splitPath[0] = splitPath[0].replace(/\\/g, '/');
+        }
+      }
 
-  splittedRequest.push(lastPartRequest.join('?'));
+      if (/^\//.test(splitPath[0])) {
+        splitPath[0] = path.posix.relative(context, splitPath[0]);
+      }
 
-  return splittedRequest.join('!');
+      if (!/^(\.\.\/|\/|[a-zA-Z]:\\)/.test(splitPath[0])) {
+        splitPath[0] = `./${splitPath[0]}`;
+      }
+
+      return splitPath.join('?');
+    })
+    .join('!');
 }
 
-export { getExposes, modifyUserRequest };
+export { getNewUserRequest, getExposes, contextify };