Refactoring

ehmicky · Jun 5, 2022 · f6835fc · f6835fc
1 parent 8988b9c
commit f6835fc
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 31 deletions.
diff --git a/src/config/normalize/lib/error.js b/src/config/normalize/lib/error.js
@@ -1,15 +1,9 @@
-import { createRequire } from 'module'
-
 import { modernErrors } from '../../../error/modern/main.js'
-
-// TODO: replace with JSON imports after dropping support for Node <16.14.0
-const {
-  bugs: { url: bugsUrl },
-} = createRequire(import.meta.url)('../../../../../package.json')
+import { packageJson } from '../../../utils/package.js'
 
 const { InputError, DefinitionError, KeywordError, onError } = modernErrors(
   ['InputError', 'DefinitionError', 'KeywordError'],
-  { bugsUrl },
+  { bugsUrl: packageJson.bugs.url },
 )
 
 export {

diff --git a/src/config/plugin/lib/error.js b/src/config/plugin/lib/error.js
@@ -1,15 +1,9 @@
-import { createRequire } from 'module'
-
 import { modernErrors } from '../../../error/modern/main.js'
-
-// TODO: replace with JSON imports after dropping support for Node <16.14.0
-const {
-  bugs: { url: bugsUrl },
-} = createRequire(import.meta.url)('../../../../../package.json')
+import { packageJson } from '../../../utils/package.js'
 
 const { UserError, PluginError, ConsumerError, onError } = modernErrors(
   ['UserError', 'PluginError', 'ConsumerError'],
-  { bugsUrl },
+  { bugsUrl: packageJson.bugs.url },
 )
 
 export {

diff --git a/src/error/main.js b/src/error/main.js
@@ -1,12 +1,7 @@
-import { createRequire } from 'module'
+import { packageJson } from '../utils/package.js'
 
 import { modernErrors } from './modern/main.js'
 
-// TODO: replace with JSON imports after dropping support for Node <16.14.0
-const {
-  bugs: { url: bugsUrl },
-} = createRequire(import.meta.url)('../../../package.json')
-
 const {
   PluginError,
   UserCodeError,
@@ -16,7 +11,7 @@ const {
   onError,
 } = modernErrors(
   ['PluginError', 'UserCodeError', 'UserError', 'LimitError', 'StopError'],
-  { bugsUrl },
+  { bugsUrl: packageJson.bugs.url },
 )
 
 export {

diff --git a/src/runners/common/error.js b/src/runners/common/error.js
@@ -1,11 +1,5 @@
-import { createRequire } from 'module'
-
 import { modernErrors } from '../../error/modern/main.js'
-
-// TODO: replace with JSON imports after dropping support for Node <16.14.0
-const {
-  bugs: { url: bugsUrl },
-} = createRequire(import.meta.url)('../../../../package.json')
+import { packageJson } from '../../utils/package.js'
 
 const {
   IpcSerializationError,
@@ -22,7 +16,7 @@ const {
     'TasksRunError',
     'ConfigError',
   ],
-  { bugsUrl },
+  { bugsUrl: packageJson.bugs.url },
 )
 
 export {

diff --git a/src/utils/package.js b/src/utils/package.js
@@ -0,0 +1,6 @@
+import { createRequire } from 'module'
+
+// TODO: replace with a JSON import after dropping support for Node <16.14.0
+export const packageJson = createRequire(import.meta.url)(
+  '../../../package.json',
+)