refactor: use environment to get templateLiteral value (#1591)

webpack-contrib · Apr 12, 2024 · e006f66 · e006f66
1 parent 5c717c9
commit e006f66
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 17 deletions.
diff --git a/src/index.js b/src/index.js
@@ -27,6 +27,7 @@ import {
   stringifyRequest,
   warningFactory,
   syntaxErrorFactory,
+  supportTemplateLiteral,
 } from "./utils";
 
 export default async function loader(content, map, meta) {
@@ -229,23 +230,7 @@ export default async function loader(content, map, meta) {
     }
   }
 
-  let isTemplateLiteralSupported = false;
-
-  if (
-    // eslint-disable-next-line no-underscore-dangle
-    this._compilation &&
-    // eslint-disable-next-line no-underscore-dangle
-    this._compilation.options &&
-    // eslint-disable-next-line no-underscore-dangle
-    this._compilation.options.output &&
-    // eslint-disable-next-line no-underscore-dangle
-    this._compilation.options.output.environment &&
-    // eslint-disable-next-line no-underscore-dangle
-    this._compilation.options.output.environment.templateLiteral
-  ) {
-    isTemplateLiteralSupported = true;
-  }
-
+  const isTemplateLiteralSupported = supportTemplateLiteral(this);
   const importCode = getImportCode(imports, options);
 
   let moduleCode;

diff --git a/src/utils.js b/src/utils.js
@@ -1427,6 +1427,30 @@ function syntaxErrorFactory(error) {
   return obj;
 }
 
+function supportTemplateLiteral(loaderContext) {
+  if (loaderContext.environment && loaderContext.environment.templateLiteral) {
+    return true;
+  }
+
+  // TODO remove in the next major release
+  if (
+    // eslint-disable-next-line no-underscore-dangle
+    loaderContext._compilation &&
+    // eslint-disable-next-line no-underscore-dangle
+    loaderContext._compilation.options &&
+    // eslint-disable-next-line no-underscore-dangle
+    loaderContext._compilation.options.output &&
+    // eslint-disable-next-line no-underscore-dangle
+    loaderContext._compilation.options.output.environment &&
+    // eslint-disable-next-line no-underscore-dangle
+    loaderContext._compilation.options.output.environment.templateLiteral
+  ) {
+    return true;
+  }
+
+  return false;
+}
+
 export {
   normalizeOptions,
   shouldUseModulesPlugins,
@@ -1454,4 +1478,5 @@ export {
   defaultGetLocalIdent,
   warningFactory,
   syntaxErrorFactory,
+  supportTemplateLiteral,
 };