@travetto/eslint 5.0.0-rc.1 → 5.0.0-rc.2

package/README.md

@@ -34,7 +34,7 @@ This is the file the linter will use, and any other tooling (e.g. IDEs).
 process.env.TRV_MANIFEST = './.trv/output/node_modules/@travetto/eslint';
 
 const { buildConfig } = require('./.trv/output/node_modules/@travetto/eslint/support/bin/eslint-config.js');
-const { RuntimeIndex } = require('./.trv/output/node_modules/@travetto/manifest/__index__.js');
+const { RuntimeIndex } = require('./.trv/output/node_modules/@travetto/runtime/__index__.js');
 
 const pluginFiles = RuntimeIndex.find({ folder: f => f === 'support', file: f => /support\/eslint[.]/.test(f) });
 const plugins = pluginFiles.map(x => require(x.outputFile));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/eslint",
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.2",
   "description": "ES Linting Rules",
   "keywords": [
     "eslint",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@eslint/js": "^8.56.0",
-    "@travetto/base": "^5.0.0-rc.1",
+    "@travetto/runtime": "^5.0.0-rc.2",
     "@types/eslint": "^8.56.10",
     "@types/eslint__js": "^8.42.3",
     "@typescript-eslint/eslint-plugin": "^7.15.0",
@@ -34,7 +34,7 @@
     "eslint-plugin-unused-imports": "^3.2.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^5.0.0-rc.1"
+    "@travetto/cli": "^5.0.0-rc.2"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/resources/eslint-config-file.cjs

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

package/resources/eslint-config-file.mjs

@@ -1,7 +1,7 @@
 process.env.TRV_MANIFEST = '%MANIFEST_FILE%';
 
 const { buildConfig } = await import('@travetto/eslint/support/bin/eslint-config');
-const { RuntimeIndex } = await import('@travetto/manifest/__index__');
+const { RuntimeIndex } = await import('@travetto/runtime/__index__');
 
 const pluginFiles = RuntimeIndex.find({ folder: f => f === 'support', file: f => /support\/eslint[.]/.test(f) });
 const plugins = await Promise.all(pluginFiles.map(x => import(x.outputFile)))

package/support/bin/eslint-common.ts

@@ -1,11 +1,11 @@
 import * as parser from '@typescript-eslint/parser';
 
-import { RuntimeContext } from '@travetto/base';
+import { Runtime } from '@travetto/runtime';
 
 export const RULE_COMMON = {
   languageOptions: {
     ecmaVersion: 'latest',
-    sourceType: RuntimeContext.workspace.type,
+    sourceType: Runtime.workspace.type,
     globals: {
       AbortController: false,
       AbortSignal: false,

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

@@ -1,12 +1,11 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-import { RuntimeContext } from '@travetto/base';
-import { RuntimeIndex } from '@travetto/manifest';
+import { Runtime, RuntimeIndex } from '@travetto/runtime';
 
 export async function buildEslintConfig(): Promise<string> {
   const root = RuntimeIndex.getModule('@travetto/eslint')!.sourcePath;
-  const ext = RuntimeContext.workspace.type === 'commonjs' ? '.cjs' : '.mjs';
+  const ext = Runtime.workspace.type === 'commonjs' ? '.cjs' : '.mjs';
   const tpl = await fs.readFile(path.resolve(root, 'resources', `eslint-config-file${ext}`), 'utf8');
 
   return tpl

package/support/bin/eslint-config.ts

@@ -5,7 +5,7 @@ import unused from 'eslint-plugin-unused-imports';
 import { configs } from '@eslint/js';
 import tsEslintPlugin from '@typescript-eslint/eslint-plugin';
 
-import { RuntimeContext } from '@travetto/base';
+import { Runtime } from '@travetto/runtime';
 
 import { IGNORES, RULE_COMMON } from './eslint-common';
 import { STD_RULES } from './eslint-std-rules';
@@ -20,7 +20,7 @@ export function buildConfig(pluginMaps: Record<string, TrvEslintPlugin>[]): read
     }
   }
 
-  const overrides = RuntimeContext.workspaceRelative('eslint-overrides.json');
+  const overrides = Runtime.workspaceRelative('eslint-overrides.json');
 
   const extra: (typeof STD_RULES)[] = existsSync(overrides) ? JSON.parse(readFileSync(overrides, 'utf8')) : [];
 

package/support/cli.lint.ts

@@ -1,6 +1,6 @@
 import { spawn } from 'node:child_process';
 
-import { Env, ExecUtil, RuntimeContext } from '@travetto/base';
+import { Env, ExecUtil, Runtime } from '@travetto/runtime';
 import { CliCommandShape, CliCommand, CliModuleUtil, CliScmUtil } from '@travetto/cli';
 
 /**
@@ -27,23 +27,30 @@ export class LintCommand implements CliCommandShape {
 
   async main(): Promise<void> {
     let files: string[];
-    if (this.since) {
-      files = (await CliScmUtil.findChangedFiles(this.since, 'HEAD', true))
-        .filter(x => !x.endsWith('package.json') && !x.endsWith('package-lock.json'));
-    } else {
-      const mods = await CliModuleUtil.findModules(this.changed ? 'changed' : 'all', undefined, 'HEAD', true);
-      files = mods.filter(x => x.workspace).map(x => x.sourcePath);
+    try {
+      if (this.since) {
+        files = (await CliScmUtil.findChangedFiles(this.since, 'HEAD'))
+          .filter(x => !x.endsWith('package.json') && !x.endsWith('package-lock.json'));
+      } else {
+        const mods = await CliModuleUtil.findModules(this.changed ? 'changed' : 'all', undefined, 'HEAD');
+        files = mods.filter(x => x.workspace).map(x => x.sourcePath);
+      }
+    } catch (err) {
+      if (err instanceof Error) {
+        console.error(err.message);
+      }
+      files = [];
     }
 
     const res = await ExecUtil.getResult(spawn('npx', [
       'eslint',
       '--cache',
-      '--cache-location', RuntimeContext.toolPath('.eslintcache'),
+      '--cache-location', Runtime.toolPath('.eslintcache'),
       ...(this.format ? ['--format', this.format] : []),
       ...(this.fix ? ['--fix'] : []),
       ...files
     ], {
-      cwd: RuntimeContext.workspace.path,
+      cwd: Runtime.workspace.path,
       stdio: 'inherit',
       shell: false
     }), { catch: true });

package/support/cli.lint_register.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs/promises';
 
 import { CliCommandShape, CliCommand } from '@travetto/cli';
-import { RuntimeContext } from '@travetto/base';
+import { Runtime } from '@travetto/runtime';
 
 import { buildEslintConfig } from './bin/eslint-config-file';
 
@@ -13,8 +13,8 @@ export class LintConfigureCommand implements CliCommandShape {
 
   async main(): Promise<void> {
     const content = await buildEslintConfig();
-    const output = RuntimeContext.workspaceRelative('eslint.config.js');
-    await fs.writeFile(output, content.replaceAll(RuntimeContext.workspace.path, '.').trim());
+    const output = Runtime.workspaceRelative('eslint.config.js');
+    await fs.writeFile(output, content.replaceAll(Runtime.workspace.path, '.').trim());
 
     console.log(`Wrote eslint config to ${output}`);
   }