fix: work with importModule

.cspell.json

@@ -18,9 +18,9 @@
     "opencollective",
     "Koppers",
     "sokra",
-    "lifecycles"
+    "lifecycles",
+    "absolutify"
   ],
-
   "ignorePaths": [
     "CHANGELOG.md",
     "package.json",

.eslintignore

@@ -1,4 +1,8 @@
 /coverage
 /dist
 /node_modules
-/test/fixtures
+/test/fixtures
+/test/basic-loader-test/mod.js
+/test/basic-loader-test/mod1.js
+/test/basic-loader-test/mod2.js
+

src/WorkerPool.js

@@ -234,6 +234,37 @@ class PoolWorker {
         finalCallback();
         break;
       }
+      case 'importModule': {
+        const { request, options, questionId } = message;
+        const { data } = this.jobs[id];
+
+        data
+          .importModule(request, options)
+          .then((result) => {
+            this.writeJson({
+              type: 'result',
+              id: questionId,
+              error: null,
+              result,
+            });
+          })
+          .catch((error) => {
+            this.writeJson({
+              type: 'result',
+              id: questionId,
+              error: error
+                ? {
+                    message: error.message,
+                    details: error.details,
+                    missing: error.missing,
+                  }
+                : null,
+            });
+          });
+
+        finalCallback();
+        break;
+      }
       case 'resolve': {
         const { context, request, options, questionId } = message;
         const { data } = this.jobs[id];

src/index.js

@@ -38,19 +38,25 @@ function pitch() {
         },
       },
       resourcePath: this.resourcePath,
-      resource: this.resourcePath + (this.resourceQuery || ''),
+      resourceQuery: this.resourceQuery,
+      resourceFragment: this.resourceFragment,
+      environment: this.environment,
+      resource:
+        this.resourcePath +
+        (this.resourceQuery || '') +
+        (this.resourceFragment || ''),
       sourceMap: this.sourceMap,
       emitError: this.emitError,
       emitWarning: this.emitWarning,
       getLogger: this.getLogger,
       loggers: {},
       loadModule: this.loadModule,
+      importModule: this.importModule,
       resolve: this.resolve,
       getResolve: this.getResolve,
       target: this.target,
       mode: this.mode,
       minimize: this.minimize,
-      resourceQuery: this.resourceQuery,
       optionsContext: this.rootContext || this.options.context,
       rootContext: this.rootContext,
     },

src/worker.js

@@ -119,6 +119,17 @@ const queue = asyncQueue(({ id, data }, taskCallback) => {
       });
       nextQuestionId += 1;
     };
+    const importModule = (request, options, callback) => {
+      callbackMap[nextQuestionId] = callback;
+      writeJson({
+        type: 'importModule',
+        id,
+        questionId: nextQuestionId,
+        request,
+        options,
+      });
+      nextQuestionId += 1;
+    };
 
     const buildDependencies = [];
 
@@ -141,6 +152,22 @@ const queue = asyncQueue(({ id, data }, taskCallback) => {
             });
             nextQuestionId += 1;
           },
+          // eslint-disable-next-line consistent-return
+          importModule: (request, options, callback) => {
+            if (callback) {
+              importModule(request, options, callback);
+            } else {
+              return new Promise((resolve, reject) => {
+                importModule(request, options, (err, result) => {
+                  if (err) {
+                    reject(err);
+                  } else {
+                    resolve(result);
+                  }
+                });
+              });
+            }
+          },
           resolve: (context, request, callback) => {
             resolveWithOptions(context, request, callback);
           },
@@ -343,6 +370,8 @@ const queue = asyncQueue(({ id, data }, taskCallback) => {
           target: data.target,
           minimize: data.minimize,
           resourceQuery: data.resourceQuery,
+          resourceFragment: data.resourceFragment,
+          environment: data.environment,
           rootContext: data.rootContext,
           // eslint-disable-next-line no-underscore-dangle
           _compilation: data._compilation,

test/__snapshots__/webpack.test.js.snap

@@ -0,0 +1,115 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Works with test-loader: errors 1`] = `
+[
+  [ModuleError: Module Error (from ../../dist/index.js):
+Test Message Error],
+]
+`;
+
+exports[`Works with test-loader: result 1`] = `
+{
+  "addBuildDependency": "function",
+  "addContextDependency": "function",
+  "addDependency": "function",
+  "addMissingDependency": "function",
+  "async": "function",
+  "cacheable": "function",
+  "callback": "function",
+  "clearDependencies": "function",
+  "context": "<cwd>/test/basic-loader-test",
+  "currentRequest": "<cwd>/test/basic-loader-test/test-loader.js??ruleSet[1].rules[0].use[1]!<cwd>/test/basic-loader-test/file.js?q=1#hash",
+  "data": null,
+  "dependency": "function",
+  "emitError": "function",
+  "emitFile": "undefined",
+  "emitWarning": "function",
+  "environment": {
+    "arrowFunction": true,
+    "asyncFunction": true,
+    "const": true,
+    "destructuring": true,
+    "forOf": true,
+    "optionalChaining": true,
+    "templateLiteral": true,
+  },
+  "getContextDependencies": "function",
+  "getContextDependenciesResult": [
+    "<cwd>/test/basic-loader-test/directory",
+  ],
+  "getDependencies": "function",
+  "getDependenciesResult": [
+    "<cwd>/test/basic-loader-test/file.js",
+    "<cwd>/test/basic-loader-test/dep1.js",
+    "<cwd>/test/basic-loader-test/dep.js",
+  ],
+  "getLogger": "function",
+  "getMissingDependencies": "function",
+  "getMissingDependenciesResult": [],
+  "getOptions": "function",
+  "getResolve": "function",
+  "importModule": "function",
+  "importModuleResult1": {
+    "default": "http://test.com/first/777312cffc01c1457868.less",
+  },
+  "importModuleResult2": {
+    "default": "http://test.com/first/777312cffc01c1457868.less",
+  },
+  "loadModule": "function",
+  "loadModuleResult": {
+    "map": null,
+    "source": "const test = require('./mod1');
+
+module.exports = new URL('./style.less', import.meta.url);
+",
+  },
+  "loaderIndex": 0,
+  "loaders": [
+    {
+      "data": null,
+      "fragment": "",
+      "ident": "ruleSet[1].rules[0].use[1]",
+      "normalExecuted": true,
+      "options": {
+        "test": {},
+      },
+      "path": "<cwd>/test/basic-loader-test/test-loader.js",
+      "pitchExecuted": true,
+      "query": "??ruleSet[1].rules[0].use[1]",
+      "request": "<cwd>/test/basic-loader-test/test-loader.js??ruleSet[1].rules[0].use[1]",
+    },
+  ],
+  "mode": "none",
+  "options": {
+    "test": {},
+  },
+  "previousRequest": "",
+  "query": {
+    "test": {},
+  },
+  "remainingRequest": "<cwd>/test/basic-loader-test/file.js?q=1#hash",
+  "request": "<cwd>/test/basic-loader-test/test-loader.js??ruleSet[1].rules[0].use[1]!<cwd>/test/basic-loader-test/file.js?q=1#hash",
+  "resolve": "function",
+  "resource": "<cwd>/test/basic-loader-test/file.js?q=1#hash",
+  "resourceFragment": "#hash",
+  "resourcePath": "<cwd>/test/basic-loader-test/file.js",
+  "resourceQuery": "?q=1",
+  "rootContext": "<cwd>/test/basic-loader-test",
+  "sourceMap": false,
+  "target": "web",
+  "utils": {
+    "absolutify": "undefined",
+    "contextify": "undefined",
+    "createHash": "undefined",
+  },
+  "version": 2,
+  "webpack": true,
+}
+`;
+
+exports[`Works with test-loader: warnings 1`] = `
+[
+  [ModuleWarning: Module Warning (from ../../dist/index.js):
+Test Message Warning],
+]
+`;

test/basic-loader-test/file.js

@@ -0,0 +1 @@
+console.log('test');

test/basic-loader-test/index.js

@@ -0,0 +1,4 @@
+/* eslint-disable import/no-unresolved */
+// some file
+// eslint-disable-next-line import/extensions
+import './file.js?q=1#hash';

test/basic-loader-test/mod.js

@@ -0,0 +1 @@
+export default new URL('./style.less', import.meta.url);

test/basic-loader-test/mod1.js

@@ -0,0 +1 @@
+export default new URL('./style.less', import.meta.url);

test/basic-loader-test/mod2.js

@@ -0,0 +1,3 @@
+const test = require('./mod1');
+
+module.exports = new URL('./style.less', import.meta.url);

test/basic-loader-test/style.less

@@ -0,0 +1,3 @@
+body {
+  background: red;
+}

test/basic-loader-test/test-loader.js

@@ -0,0 +1,102 @@
+const path = require('path');
+
+module.exports = async function testLoader() {
+  const options = this.getOptions();
+  const callback = this.async();
+
+  this.emitWarning(new Error('Test Message Warning'));
+  this.emitError(new Error('Test Message Error'));
+  this.dependency(require.resolve('./dep1.js'));
+  this.addDependency(require.resolve('./dep.js'));
+  this.addBuildDependency(require.resolve('./build-dep.js'));
+  this.addContextDependency(path.resolve(__dirname, './directory'));
+  // Todo fix me
+  // this.addMissingDependency(require.resolve("./missing-dep.js"));
+
+  callback(
+    null,
+    `module.exports = ${JSON.stringify({
+      options,
+      getOptions: typeof this.getOptions,
+      async: typeof this.async,
+      version: this.version,
+      mode: this.mode,
+      webpack: this.webpack,
+      sourceMap: this.sourceMap,
+      target: this.target,
+      rootContext: this.rootContext,
+      context: this.context,
+      environment: this.environment,
+      loaderIndex: this.loaderIndex,
+      loaders: this.loaders,
+      resourcePath: this.resourcePath,
+      resourceQuery: this.resourceQuery,
+      resourceFragment: this.resourceFragment,
+      resource: this.resource,
+      request: this.request,
+      remainingRequest: this.remainingRequest,
+      currentRequest: this.currentRequest,
+      previousRequest: this.previousRequest,
+      query: this.query,
+      data: this.data,
+      hot: this.hot,
+      cacheable: typeof this.cacheable,
+      emitWarning: typeof this.emitWarning,
+      emitError: typeof this.emitError,
+      resolve: typeof this.resolve,
+      getResolve: typeof this.getResolve,
+      getLogger: typeof this.getLogger,
+      // Todo fix me
+      emitFile: typeof this.emitFile,
+      addBuildDependency: typeof this.addBuildDependency,
+      utils: {
+        absolutify: typeof this.absolutify,
+        contextify: typeof this.contextify,
+        createHash: typeof this.createHash,
+      },
+      loadModule: typeof this.loadModule,
+      loadModuleResult: await new Promise((resolve, reject) =>
+        this.loadModule('./mod2.js', (err, source, map, mod) => {
+          if (err) {
+            reject(err);
+            return;
+          }
+
+          resolve({ source, map, mod });
+        })
+      ),
+      importModule: typeof this.importModule,
+      importModuleResult1: await this.importModule('./mod.js', {
+        publicPath: 'http://test.com/first/',
+      }),
+      importModuleResult2: await new Promise((resolve, reject) =>
+        this.importModule(
+          './mod1.js',
+          {
+            publicPath: 'http://test.com/first/',
+          },
+          (err, result) => {
+            if (err) {
+              reject(err);
+              return;
+            }
+
+            resolve(result);
+          }
+        )
+      ),
+      callback: typeof this.callback,
+      addDependency: typeof this.addDependency,
+      dependency: typeof this.addDependency,
+      addContextDependency: typeof this.addContextDependency,
+      addMissingDependency: typeof this.addMissingDependency,
+      getDependencies: typeof this.getDependencies,
+      getDependenciesResult: this.getDependencies(),
+      getContextDependencies: typeof this.getContextDependencies,
+      getContextDependenciesResult: this.getContextDependencies(),
+      getMissingDependencies: typeof this.getMissingDependencies,
+      getMissingDependenciesResult: this.getMissingDependencies(),
+      clearDependencies: typeof this.clearDependencies,
+    }).replace(new RegExp(process.cwd(), 'g'), '<cwd>')};`
+  );
+};