Remove loader-utils, schema-utils dependencies

ogonkov · Oct 30, 2020 · fb8d19d · fb8d19d
1 parent 4009457
commit fb8d19d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -3,10 +3,7 @@
   "version": "2.3.0",
   "description": "Webpack loader for fest",
   "main": "es/loader.js",
-  "dependencies": {
-    "loader-utils": "^2.0.0",
-    "schema-utils": "^3.0.0"
-  },
+  "dependencies": {},
   "devDependencies": {
     "@babel/cli": "^7.11.5",
     "@babel/core": "^7.11.5",

diff --git a/src/loader.js b/src/loader.js
@@ -1,10 +1,9 @@
-import {getOptions} from 'loader-utils';
-import {validate as validateOptions} from 'schema-utils';
 import fest from 'fest';
 
 import {getDependencies} from './get-dependencies';
 
 const schema = {
+    title: 'Fest Loader options',
     type: 'object',
     properties: {
         beautify: {
@@ -64,11 +63,7 @@ export default function festLoader(source) {
 
     let options;
     try {
-        options = getOptions(this);
-        validateOptions(schema, options, {
-            name: 'Fest Loader',
-            baseDataPath: 'options'
-        });
+        options = this.getOptions(schema);
     } catch (e) {
         callback(e);
 

diff --git a/test/get-loader-context.js b/test/get-loader-context.js
@@ -1,14 +1,11 @@
 export function getLoaderContext(resourcePath, options = {}) {
     const callback = jest.fn().mockName('loaderContext.callback');
-    const query = Object.entries(options).map(([key, value]) => {
-        return `${key}=${value}`;
-    }, '').join('&');
     const context = {
-        query: `?${query}`,
         resourcePath,
         async: jest.fn().mockReturnValue(callback),
         addDependency: jest.fn().mockName('loaderContext.addDependency'),
-        emitWarning: jest.fn().mockName('loaderContext.emitWarning')
+        emitWarning: jest.fn().mockName('loaderContext.emitWarning'),
+        getOptions: jest.fn().mockName('loaderContext.getOptions').mockReturnValue(options)
     };
     const result = new Promise(function(resolve, reject) {
         callback.mockImplementation(function(error, result) {