Remove loader-utils dependency (#6)

Demivan · web-flow · commit 71d4b64153e6 · 2021-10-31T09:38:22.000+02:00
diff --git a/package.json b/package.json
@@ -76,8 +76,5 @@
     "vue": "3.2.20",
     "vue-loader": "16.8.2",
     "webpack": "5.61.0"
-  },
-  "dependencies": {
-    "loader-utils": "^2.0.0"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/index.ts b/src/index.ts
@@ -1,12 +1,11 @@
 import type { LoaderDefinitionFunction } from 'webpack/types'
 
-import { parseQuery, OptionObject } from 'loader-utils'
-
-function generateCode (rawData: string, query: OptionObject, hot = false): string {
+function generateCode (rawData: string, query: URLSearchParams, hot = false): string {
   // vue-loader pads SFC file sections with newlines - trim those
   const data = rawData.replace(/^(\n|\r\n)+|(\n|\r\n)+$/g, '')
 
-  if (typeof query.locale !== 'string') {
+  const locale = query.get('locale')
+  if (typeof locale !== 'string') {
     throw new Error('Custom block does not have locale attribute')
   }
 
@@ -33,14 +32,15 @@ import { FluentResource } from '@fluent/bundle'
 export default function (Component) {
   const target = Component.options || Component
   target.fluent = target.fluent || {}
-  target.fluent['${query.locale}'] = new FluentResource(\`${data}\`)
+  target.fluent['${locale}'] = new FluentResource(\`${data}\`)
   ${hotCode}
 }\n`
 }
 
 const loader: LoaderDefinitionFunction = function (this, source, sourceMap) {
   try {
-    this.callback(null, generateCode(source, parseQuery(this.resourceQuery), this.hot), sourceMap)
+    const options = new URLSearchParams(this.resourceQuery.slice(1))
+    this.callback(null, generateCode(source, options, this.hot), sourceMap)
   } catch (err) {
     this.emitError(err as Error)
     this.callback(err as Error)

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,5 @@`
`76`	`76`	`"vue": "3.2.20",`
`77`	`77`	`"vue-loader": "16.8.2",`
`78`	`78`	`"webpack": "5.61.0"`
`79`		`- },`
`80`		`- "dependencies": {`
`81`		`- "loader-utils": "^2.0.0"`
`82`	`79`	`}`
`83`	`80`	`}`