migrated from yarn lockfile to npm lockfile (+ added it to git index); upgraded dependencies and node versiob; improved and reorganized some code; added automatic code formatting

Author: Va1

.gitignore

@@ -4,5 +4,4 @@
 *.swp
 node_modules/*
 !node_modules/__this-loader/
-package-lock.json
-test/build/
+test_subj/build/

.npmignore

@@ -4,5 +4,5 @@
 *.swp
 node_modules/
 package-lock.json
-yarn.lock
 test/
+test_subj/

index.js

@@ -1,3 +1,3 @@
-const processChuck = require('./lib/processChunk')
+const loader = require('./lib/loader.js')
 
-module.exports = processChuck
+module.exports = loader

lib/getOptionsArray.js lib/getOptionsArr.jslib/getOptionsArray.js renamed to lib/getOptionsArr.js

@@ -1,8 +1,5 @@
-const { getOptions } = require('loader-utils')
 const { validate } = require('schema-utils')
 
-const loaderName = 'string-replace-loader'
-
 const optionsSchema = {
   type: 'object',
   properties: {
@@ -27,7 +24,7 @@ const optionsSchema = {
       ]
     },
     flags: {
-      type: 'string',
+      type: 'string'
     },
     strict: {
       type: 'boolean'
@@ -43,22 +40,24 @@ const defaultOptions = {
   strict: false
 }
 
-function getOptionsArray (config) {
-  const rawOptions = getOptions(config)
-  const rawOptionsArray = (
+function getOptionsArr (loaderName, context) {
+  const rawOptions = context.getOptions()
+  const rawOptionsArr = (
     typeof rawOptions.multiple !== 'undefined'
       ? rawOptions.multiple
       : [rawOptions]
   )
-  const optionsArray = []
+  const optionsArr = []
+
+  for (const rawOptionsIdx in rawOptionsArr) {
+    const rawOptions = rawOptionsArr[rawOptionsIdx]
 
-  for (const optionsIndex in rawOptionsArray) {
-    validate(optionsSchema, rawOptionsArray[optionsIndex], { name: loaderName })
+    validate(optionsSchema, rawOptions, { name: loaderName })
 
-    optionsArray[optionsIndex] = Object.assign({}, defaultOptions, rawOptionsArray[optionsIndex])
+    optionsArr[rawOptionsIdx] = Object.assign({}, defaultOptions, rawOptions)
   }
 
-  return optionsArray
+  return optionsArr
 }
 
-module.exports = getOptionsArray
+module.exports = getOptionsArr

lib/loader.js

@@ -0,0 +1,19 @@
+const getOptionsArr = require('./getOptionsArr')
+const replace = require('./replace')
+
+const loaderName = 'string-replace-loader'
+
+function loader (source, map) {
+  this.cacheable()
+
+  const optionsArr = getOptionsArr(loaderName, this)
+
+  let newSource = source
+  for (const options of optionsArr) {
+    newSource = replace(newSource, options, this)
+  }
+
+  this.callback(null, newSource, map)
+}
+
+module.exports = loader

lib/processChunk.js

@@ -1,4 +1,3 @@
-
 function replace (source, options, context) {
   const { flags, strict } = options