@travetto/eslint 7.0.0-rc.4 → 7.0.0

package/README.md

@@ -24,7 +24,7 @@ In a new project, the first thing that will need to be done, post installation,
 ```bash
 $ trv eslint:register
 
-Wrote eslint config to <workspace-root>/eslint.config.cjs
+Wrote eslint config to <workspace-root>/eslint.config.js
 ```
 
 This is the file the linter will use, and any other tooling (e.g. IDEs).
@@ -33,17 +33,17 @@ This is the file the linter will use, and any other tooling (e.g. IDEs).
 ```javascript
 process.env.TRV_MANIFEST = './.trv/output/node_modules/@travetto/mono-repo';
 
-const { buildConfig } = require('./.trv/output/node_modules/@travetto/eslint/support/bin/eslint-config.js');
-const { RuntimeIndex } = require('./.trv/output/node_modules/@travetto/runtime/__index__.js');
+const { buildConfig } = await import('./.trv/output/node_modules/@travetto/eslint/support/bin/eslint-config.js');
+const { RuntimeIndex } = await import('./.trv/output/node_modules/@travetto/runtime/__index__.js');
 
 const pluginFiles = RuntimeIndex.find({
   folder: folder => folder === 'support',
   file: file => /support\/eslint[.]/.test(file.relativeFile)
 });
-const plugins = pluginFiles.map(plugin => require(plugin.outputFile));
+const plugins = await Promise.all(pluginFiles.map(plugin => import(plugin.outputFile)))
 const config = buildConfig(plugins);
 
-module.exports = config;
+export default config;
 ```
 
 The output is tied to whether or not you are using the [CommonJS](https://nodejs.org/api/modules.html) or [Ecmascript Module](https://nodejs.org/api/esm.html) format.
@@ -131,15 +131,6 @@ export const ImportOrder: TrvEslintPlugin = {
               } else if (initType === 'TSAsExpression') { // tslint support
                 call = declaration.init.expression;
               }
-              if (
-                call?.type === 'CallExpression' && call.callee.type === 'Identifier' &&
-                call.callee.name === 'require' && call.arguments[0].type === 'Literal'
-              ) {
-                const arg1 = call.arguments[0];
-                if (arg1.value && typeof arg1.value === 'string') {
-                  from = arg1.value;
-                }
-              }
             }
 
             if (!from) {

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@travetto/eslint",
-  "version": "7.0.0-rc.4",
+  "version": "7.0.0",
+  "type": "module",
   "description": "ES Linting Rules",
   "keywords": [
     "eslint",
@@ -24,17 +25,17 @@
     "directory": "module/eslint"
   },
   "dependencies": {
-    "@eslint/js": "^9.35.0",
+    "@eslint/js": "^9.39.2",
     "@stylistic/eslint-plugin": "^5.6.1",
-    "@travetto/runtime": "^7.0.0-rc.4",
+    "@travetto/runtime": "^7.0.0",
     "@types/eslint": "^9.6.1",
-    "@typescript-eslint/eslint-plugin": "^8.48.0",
-    "@typescript-eslint/parser": "^8.48.0",
-    "eslint": "^9.39.1",
+    "@typescript-eslint/eslint-plugin": "^8.50.1",
+    "@typescript-eslint/parser": "^8.50.1",
+    "eslint": "^9.39.2",
     "eslint-plugin-unused-imports": "^4.3.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.0.0-rc.4"
+    "@travetto/cli": "^7.0.0"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/bin/eslint-config-file.ts

@@ -5,8 +5,7 @@ import { Runtime, RuntimeIndex } from '@travetto/runtime';
 
 export async function buildEslintConfig(): Promise<string> {
   const root = RuntimeIndex.getModule('@travetto/eslint')!.sourcePath;
-  const ext = Runtime.workspace.type === 'commonjs' ? '.cjs' : '.mjs';
-  const tpl = await fs.readFile(path.resolve(root, 'resources', `eslint-config-file${ext}`), 'utf8');
+  const tpl = await fs.readFile(path.resolve(root, 'resources', 'eslint-config-file.js'), 'utf8');
 
   // Get path to repo-root output
   const outputPath = path.join(

package/support/cli.eslint_register.ts

@@ -13,8 +13,7 @@ export class ESLintConfigureCommand implements CliCommandShape {
 
   async main(): Promise<void> {
     const content = await buildEslintConfig();
-    const ext = Runtime.workspace.type === 'commonjs' ? '.cjs' : '.mjs';
-    const output = Runtime.workspaceRelative(`eslint.config${ext}`);
+    const output = Runtime.workspaceRelative('eslint.config.js');
     await fs.writeFile(output, content.replaceAll(Runtime.workspace.path, '.').trim());
     console.log(`Wrote eslint config to ${output}`);
   }

package/resources/eslint-config-file.cjs

@@ -1,13 +0,0 @@
-process.env.TRV_MANIFEST = '%MANIFEST_FILE%';
-
-const { buildConfig } = require('@travetto/eslint/support/bin/eslint-config');
-const { RuntimeIndex } = require('@travetto/runtime/__index__');
-
-const pluginFiles = RuntimeIndex.find({
-  folder: folder => folder === 'support',
-  file: file => /support\/eslint[.]/.test(file.relativeFile)
-});
-const plugins = pluginFiles.map(plugin => require(plugin.outputFile));
-const config = buildConfig(plugins);
-
-module.exports = config;