use webpack loader utils package

dazuaz · Aug 14, 2022 · e025ed8 · e025ed8
1 parent 711a604
commit e025ed8
Show file tree

Hide file tree

Showing 8 changed files with 665 additions and 571 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -55,8 +55,9 @@
     "@types/node": "^17.0.39",
     "find-cache-dir": "^3.3.2",
     "json5": "^2.2.1",
-    "schema-utils": "^4.0.0",
-    "make-dir": "^3.1.0"
+    "loader-utils": "^3.2.0",
+    "make-dir": "^3.1.0",
+    "schema-utils": "^4.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.18.2",

diff --git a/src/index.ts b/src/index.ts
@@ -6,7 +6,7 @@ import { parseOptions, getOutputAndPublicPath, createPlaceholder } from './utils
 import { cache } from './cache'
 import type { LoaderContext } from 'webpack'
 
-import interpolateName from './interpolateName'
+import { interpolateName } from 'loader-utils'
 import { parseQuery } from './parseQuery'
 
 import type {
@@ -70,7 +70,7 @@ export default function loader(this: LoaderContext<Options>, content: string): v
   }
 
   const createFile = ({ data, width, height }: AdapterResizeResponse) => {
-    const fileName = interpolateName(this.resourcePath, this.resourceQuery, name, {
+    const fileName = interpolateName(this, name, {
       context: outputContext,
       content: data.toString(),
     })

diff --git a/src/interpolateName.ts b/src/interpolateName.ts
diff --git a/src/loader-utils.d.ts b/src/loader-utils.d.ts
@@ -0,0 +1,3 @@
+declare module 'loader-utils' {
+  export function interpolateName(LoaderContext: any, name: string, options: any): any
+}