From 691cb4245f8f5af84280ce1b49a22d673d1efa28 Mon Sep 17 00:00:00 2001
From: Andrey Sitnik <andrey@sitnik.ru>
Date: Thu, 30 Nov 2023 06:23:51 +0100
Subject: [PATCH] Clean up code

---
 src/index.js     |  4 ++--
 test/js.test.js  |  6 +++---
 test/pkg.test.js |  4 ++--
 test/rc.test.js  |  4 ++--
 test/ts.test.js  |  6 +++---
 test/utils.js    | 14 ++++++--------
 6 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/index.js b/src/index.js
index 25f3b00..b514565 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,5 +1,5 @@
 const { resolve } = require('node:path')
-const url = require('node:url')
+const { pathToFileURL } = require('node:url')
 
 const config = require('lilconfig')
 const yaml = require('yaml')
@@ -77,7 +77,7 @@ let jiti = null
 
 async function loader(filepath) {
   try {
-    let module = await import(url.pathToFileURL(filepath).href)
+    let module = await import(pathToFileURL(filepath).href)
     return module.default
   } catch (err) {
     /* c8 ignore start */
diff --git a/test/js.test.js b/test/js.test.js
index 70309ee..016ff80 100644
--- a/test/js.test.js
+++ b/test/js.test.js
@@ -1,4 +1,4 @@
-const path = require('node:path')
+const { resolve } = require('node:path')
 const { describe, test } = require('node:test')
 const { deepStrictEqual, equal } = require('node:assert')
 
@@ -77,7 +77,7 @@ describe('Object', () => {
     equal(typeof config.plugins[0], 'function')
     equal(typeof config.plugins[1], 'function')
 
-    equal(config.file, path.resolve(expectedConfigPath))
+    equal(config.file, resolve(expectedConfigPath))
   }
 })
 
@@ -147,6 +147,6 @@ describe('Array', () => {
     equal(typeof config.plugins[0], 'object')
     equal(typeof config.plugins[1], 'object')
 
-    equal(config.file, path.resolve(expectedPath))
+    equal(config.file, resolve(expectedPath))
   }
 })
diff --git a/test/pkg.test.js b/test/pkg.test.js
index b7cbe3c..b59be2d 100644
--- a/test/pkg.test.js
+++ b/test/pkg.test.js
@@ -1,4 +1,4 @@
-const path = require('node:path')
+const { resolve } = require('node:path')
 const { describe, test } = require('node:test')
 const { equal } = require('node:assert')
 
@@ -20,7 +20,7 @@ describe('package.json - {Object} - Load Config', () => {
       equal(typeof config.plugins[0], 'function')
       equal(typeof config.plugins[1], 'function')
 
-      equal(config.file, path.resolve('test/pkg', 'package.json'))
+      equal(config.file, resolve('test/pkg', 'package.json'))
     })
   })
 })
diff --git a/test/rc.test.js b/test/rc.test.js
index 643e3f5..558e306 100644
--- a/test/rc.test.js
+++ b/test/rc.test.js
@@ -1,4 +1,4 @@
-const path = require('node:path')
+const { resolve } = require('node:path')
 const { describe, test } = require('node:test')
 const { equal } = require('node:assert')
 
@@ -20,7 +20,7 @@ describe('.postcssrc - {Object} - Load Config', () => {
       equal(typeof config.plugins[0], 'function')
       equal(typeof config.plugins[1], 'function')
 
-      equal(config.file, path.resolve('test/rc', '.postcssrc'))
+      equal(config.file, resolve('test/rc', '.postcssrc'))
     })
   })
 })
diff --git a/test/ts.test.js b/test/ts.test.js
index 0aa72df..0d8bceb 100644
--- a/test/ts.test.js
+++ b/test/ts.test.js
@@ -1,4 +1,4 @@
-const path = require('node:path')
+const { resolve } = require('node:path')
 const { describe, test } = require('node:test')
 const { deepStrictEqual, equal } = require('node:assert')
 
@@ -77,7 +77,7 @@ describe('Object', () => {
     equal(typeof config.plugins[0], 'function')
     equal(typeof config.plugins[1], 'function')
 
-    equal(config.file, path.resolve(expectedConfigPath))
+    equal(config.file, resolve(expectedConfigPath))
   }
 })
 
@@ -147,6 +147,6 @@ describe('Array', () => {
     equal(typeof config.plugins[0], 'object')
     equal(typeof config.plugins[1], 'object')
 
-    equal(config.file, path.resolve(expectedPath))
+    equal(config.file, resolve(expectedPath))
   }
 })
diff --git a/test/utils.js b/test/utils.js
index ec2bf98..6a47536 100644
--- a/test/utils.js
+++ b/test/utils.js
@@ -1,14 +1,12 @@
-'use strict'
+const { readFileSync } = require('node:fs')
+const { resolve } = require('node:path')
 
-const fs = require('node:fs')
-const path = require('node:path')
-
-const fixture = (dir, file) => {
-  return fs.readFileSync(path.resolve('test', dir, 'fixtures', file), 'utf8')
+function fixture(dir, file) {
+  return readFileSync(resolve('test', dir, 'fixtures', file), 'utf8')
 }
 
-const expected = (dir, file) => {
-  return fs.readFileSync(path.resolve('test', dir, 'expect', file), 'utf8')
+function expected(dir, file) {
+  return readFileSync(resolve('test', dir, 'expect', file), 'utf8')
 }
 
 module.exports = {