diff --git a/lib/configs/recommended.js b/lib/configs/recommended.js index 2c37001b..3e75d471 100644 --- a/lib/configs/recommended.js +++ b/lib/configs/recommended.js @@ -1,6 +1,6 @@ "use strict"; -const plugin = require("../../index.js"); +const plugin = require("../index.js"); module.exports = { plugins: { qunit: plugin }, diff --git a/index.js b/lib/index.js similarity index 81% rename from index.js rename to lib/index.js index 0d0ee761..ec8d8bce 100644 --- a/index.js +++ b/lib/index.js @@ -8,15 +8,9 @@ "use strict"; const requireIndex = require("requireindex"); -const path = require("node:path"); -const pathParts = __dirname.split(path.sep); -const pkg = - pathParts[pathParts.length - 1] === "dist" - ? // @ts-expect-error -- TODO: ESM/TypeScript conversion should fix this. - require("../package.json") // eslint-disable-line n/no-missing-require -- this is the path when this file is compiled to dist/ - : // @ts-expect-error -- TODO: ESM/TypeScript conversion should fix this. - require("./package.json"); +// @ts-expect-error -- TODO: ESM/TypeScript conversion should fix this. +const pkg = require("../package.json"); module.exports = { meta: { @@ -24,7 +18,7 @@ module.exports = { version: pkg.version, }, - rules: requireIndex(`${__dirname}/lib/rules`), + rules: requireIndex(`${__dirname}/rules`), // eslint-disable-next-line sort-keys configs: { diff --git a/package.json b/package.json index f383be9a..bff97995 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "ESLint plugin containing rules useful for QUnit tests.", "exports": { ".": "./dist/index.js", - "./configs/*": "./dist/lib/configs/*.js" + "./configs/*": "./dist/configs/*.js" }, "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/tests/index.js b/tests/index.js index a5883e37..78a53388 100644 --- a/tests/index.js +++ b/tests/index.js @@ -9,11 +9,11 @@ //------------------------------------------------------------------------------ const assert = require("chai").assert, - { rules, configs } = require("../index"), + { rules, configs } = require("../lib/index"), fs = require("node:fs"), path = require("node:path"), requireIndex = require("requireindex"), - plugin = require("../index.js"), + plugin = require("../lib/index.js"), recommendedFlatConfig = require("../lib/configs/recommended.js"); //------------------------------------------------------------------------------ diff --git a/tsconfig.json b/tsconfig.json index 89d25a2e..cd187784 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -28,7 +28,7 @@ /* Modules */ "module": "nodenext", /* Specify what module code is generated. */ - // "rootDir": "./", /* Specify the root folder within your source files. */ + "rootDir": "lib/", /* Specify the root folder within your source files. */ // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */