fix typescript errors and silly conflict resolution mistakes
MODIFY
packages/@romejs/core/master/testing/TestRunner.ts
packages/@romejs/core/master/testing/TestRunner.ts
@@ -21,6 +21,7 @@ import {
sourceMapManager,
urlToFilename,
ErrorFrame,
+ StructuredError,
} from '@romejs/v8';
import fork from '../../common/utils/fork';
import {ManifestDefinition} from '@romejs/codec-js-manifest';

MODIFY
packages/@romejs/diagnostics/categories.ts
packages/@romejs/diagnostics/categories.ts
@@ -25,6 +25,7 @@ export type DiagnosticCategory =
| 'internalError/request'
| 'internalError/httpServer'
| 'lint/disabled'
+ | 'lint/duplicateImportSource'
| 'lint/pendingFixes'
| 'lint/defaultExportSameBasename'
| 'lint/noMultipleSpacesInRegularExpressionLiterals'

fix typescript errors and silly conflict resolution mistakes