chore: remove old importer hack

cucumber · Oct 7, 2023 · 2c21af5 · 2c21af5
1 parent 895b3f7
commit 2c21af5
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 31 deletions.
diff --git a/dependency-lint.yml b/dependency-lint.yml
@@ -48,7 +48,6 @@ requiredModules:
       - 'dist/**/*'
       - 'lib/**/*'
       - 'node_modules/**/*'
-      - 'src/importer.js'
       - 'tmp/**/*'
     root: '**/*.{js,ts}'
   stripLoaders: false

diff --git a/package.json b/package.json
@@ -311,7 +311,7 @@
     "ansi-regex": "^5.0.1"
   },
   "scripts": {
-    "build-local": "genversion --es6 src/version.ts && tsc --build tsconfig.node.json && shx cp src/importer.js lib/ && shx cp src/wrapper.mjs lib/ && shx cp src/api/wrapper.mjs lib/api/",
+    "build-local": "genversion --es6 src/version.ts && tsc --build tsconfig.node.json && shx cp src/wrapper.mjs lib/ && shx cp src/api/wrapper.mjs lib/api/",
     "cck-test": "mocha 'compatibility/**/*_spec.ts'",
     "docs:ci": "api-extractor run --verbose",
     "docs:local": "api-extractor run --verbose --local && api-documenter markdown --input-folder ./tmp/api-extractor --output-folder ./docs/api",

diff --git a/src/api/support.ts b/src/api/support.ts
@@ -4,9 +4,6 @@ import supportCodeLibraryBuilder from '../support_code_library_builder'
 import { pathToFileURL } from 'url'
 import tryRequire from '../try_require'
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const { importer } = require('../importer')
-
 export async function getSupportCodeLibrary({
   cwd,
   newId,
@@ -30,7 +27,7 @@ export async function getSupportCodeLibrary({
   requirePaths.map((path) => tryRequire(path))
 
   for (const path of importPaths) {
-    await importer(pathToFileURL(path))
+    await import(pathToFileURL(path).toString())
   }
 
   return supportCodeLibraryBuilder.finalize()

diff --git a/src/configuration/from_file.ts b/src/configuration/from_file.ts
@@ -11,9 +11,6 @@ import ArgvParser from './argv_parser'
 import { checkSchema } from './check_schema'
 import { ILogger } from '../logger'
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const { importer } = require('../importer')
-
 export async function fromFile(
   logger: ILogger,
   cwd: string,
@@ -74,7 +71,7 @@ async function loadFile(
       logger.debug(
         `Loading configuration file "${file}" as ESM based on extension`
       )
-      definitions = await importer(pathToFileURL(filePath))
+      definitions = await import(pathToFileURL(filePath).toString())
       break
     case '.js':
       {
@@ -89,7 +86,7 @@ async function loadFile(
           logger.debug(
             `Loading configuration file "${file}" as ESM based on "${parentPackage.name}" package type`
           )
-          definitions = await importer(pathToFileURL(filePath))
+          definitions = await import(pathToFileURL(filePath).toString())
         } else {
           logger.debug(
             `Loading configuration file "${file}" as CommonJS based on "${parentPackage.name}" package type`

diff --git a/src/formatter/builder.ts b/src/formatter/builder.ts
@@ -15,8 +15,6 @@ import { Writable as WritableStream } from 'stream'
 import { SnippetInterface } from './step_definition_snippet_builder/snippet_syntax'
 import { pathToFileURL } from 'url'
 import Formatters from './helpers/formatters'
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const { importer } = require('../importer')
 
 interface IGetStepDefinitionSnippetBuilderOptions {
   cwd: string
@@ -120,7 +118,7 @@ const FormatterBuilder = {
   },
 
   async loadFile(urlOrName: URL | string) {
-    return await importer(urlOrName)
+    return await import(urlOrName.toString())
   },
 
   resolveConstructor(ImportedCode: any) {

diff --git a/src/importer.js b/src/importer.js
diff --git a/src/runtime/parallel/worker.ts b/src/runtime/parallel/worker.ts
@@ -16,8 +16,6 @@ import {
 } from './command_types'
 import tryRequire from '../../try_require'
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const { importer } = require('../../importer')
 const { uuid } = IdGenerator
 
 type IExitFunction = (exitCode: number, error?: Error, message?: string) => void
@@ -78,7 +76,7 @@ export default class Worker {
     requireModules.map((module) => tryRequire(module))
     requirePaths.map((module) => tryRequire(module))
     for (const path of importPaths) {
-      await importer(pathToFileURL(path))
+      await import(pathToFileURL(path).toString())
     }
     this.supportCodeLibrary = supportCodeLibraryBuilder.finalize(supportCodeIds)
 

diff --git a/test-d/api.ts → test-d/api.mts b/test-d/api.ts → test-d/api.mts
diff --git a/tsconfig.json b/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "esModuleInterop": true,
     "lib": ["es2022"],
-    "module": "commonjs",
+    "module": "node16",
     "noImplicitAny": true,
     "noImplicitReturns": true,
     "noImplicitThis": true,