Ts part 6 (#568)

tclindner · web-flow · commit 9175cb190d18 · 2022-02-26T10:23:57.000-06:00
* ts part 3

* part 5

* Imports
diff --git a/src/rules/description-format.ts b/src/rules/description-format.ts
@@ -1,4 +1,4 @@
-const {isString} = require('../validators/type');
+import {isString} from '../validators/type';
 import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
 import {Severity} from '../types/severity';
diff --git a/src/rules/no-caret-version-dependencies.ts b/src/rules/no-caret-version-dependencies.ts
@@ -1,4 +1,4 @@
-const {doVersContainInvalidRange} = require('../validators/dependency-audit');
+import {doVersContainInvalidRange} from '../validators/dependency-audit';
 import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
 import {Severity} from '../types/severity';
diff --git a/src/rules/no-caret-version-devDependencies.ts b/src/rules/no-caret-version-devDependencies.ts
@@ -1,4 +1,4 @@
-const {doVersContainInvalidRange} = require('../validators/dependency-audit');
+import {doVersContainInvalidRange} from '../validators/dependency-audit';
 import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
 import {Severity} from '../types/severity';
diff --git a/src/rules/no-duplicate-properties.ts b/src/rules/no-duplicate-properties.ts
@@ -1,5 +1,5 @@
-const Parser = require('../Parser');
-const {findDuplicatePropNames} = require('../validators/property');
+import Parser from '../Parser';
+import {findDuplicatePropNames} from '../validators/property';
 import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
 import {Severity} from '../types/severity';
diff --git a/src/rules/no-tilde-version-dependencies.ts b/src/rules/no-tilde-version-dependencies.ts
@@ -1,4 +1,4 @@
-const {doVersContainInvalidRange} = require('../validators/dependency-audit');
+import {doVersContainInvalidRange} from '../validators/dependency-audit';
 import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
 import {Severity} from '../types/severity';
diff --git a/src/rules/no-tilde-version-devDependencies.ts b/src/rules/no-tilde-version-devDependencies.ts
@@ -1,4 +1,4 @@
-const {doVersContainInvalidRange} = require('../validators/dependency-audit');
+import {doVersContainInvalidRange} from '../validators/dependency-audit';
 import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
 import {Severity} from '../types/severity';
diff --git a/src/rules/prefer-alphabetical-bundledDependencies.ts b/src/rules/prefer-alphabetical-bundledDependencies.ts
@@ -1,4 +1,4 @@
-const {isInAlphabeticalOrder} = require('../validators/alphabetical-sort');
+import {isInAlphabeticalOrder} from '../validators/alphabetical-sort';
 import {exists} from '../validators/property';
 import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
diff --git a/src/rules/prefer-alphabetical-dependencies.ts b/src/rules/prefer-alphabetical-dependencies.ts
@@ -1,4 +1,4 @@
-const {isInAlphabeticalOrder} = require('../validators/alphabetical-sort');
+import {isInAlphabeticalOrder} from '../validators/alphabetical-sort';
 import {exists} from '../validators/property';
 import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
diff --git a/src/rules/prefer-alphabetical-devDependencies.ts b/src/rules/prefer-alphabetical-devDependencies.ts
@@ -1,4 +1,4 @@
-const {isInAlphabeticalOrder} = require('../validators/alphabetical-sort');
+import {isInAlphabeticalOrder} from '../validators/alphabetical-sort';
 import {exists} from '../validators/property';
 import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
diff --git a/src/rules/prefer-alphabetical-optionalDependencies.ts b/src/rules/prefer-alphabetical-optionalDependencies.ts
@@ -1,4 +1,4 @@
-const {isInAlphabeticalOrder} = require('../validators/alphabetical-sort');
+import {isInAlphabeticalOrder} from '../validators/alphabetical-sort';
 import {exists} from '../validators/property';
 import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
diff --git a/src/rules/prefer-alphabetical-peerDependencies.ts b/src/rules/prefer-alphabetical-peerDependencies.ts
@@ -1,4 +1,4 @@
-const {isInAlphabeticalOrder} = require('../validators/alphabetical-sort');
+import {isInAlphabeticalOrder} from '../validators/alphabetical-sort';
 import {exists} from '../validators/property';
 import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
diff --git a/src/rules/prefer-alphabetical-scripts.ts b/src/rules/prefer-alphabetical-scripts.ts
@@ -1,4 +1,4 @@
-const {isInAlphabeticalOrder} = require('../validators/alphabetical-sort');
+import {isInAlphabeticalOrder} from '../validators/alphabetical-sort';
 import {exists} from '../validators/property';
 import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
diff --git a/src/rules/scripts-type.ts b/src/rules/scripts-type.ts
@@ -1,6 +1,4 @@
-/* eslint no-restricted-syntax: 'off' */
-
-const {isObject} = require('../validators/type');
+import {isObject} from '../validators/type';
 import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
 import {Severity} from '../types/severity';
diff --git a/src/rules/valid-values-author.ts b/src/rules/valid-values-author.ts
@@ -2,9 +2,9 @@ import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
 import {Severity} from '../types/severity';
 import {PackageJson} from 'type-fest';
-const {isString} = require('../validators/type');
-const {isObject} = require('../validators/type');
-const {isValidValue} = require('../validators/valid-values');
+import {isString} from '../validators/type';
+import {isObject} from '../validators/type';
+import {isValidValue} from '../validators/valid-values';
 
 const lintId = 'valid-values-author';
 const nodeName = 'author';
diff --git a/src/rules/valid-values-engines.ts b/src/rules/valid-values-engines.ts
@@ -1,12 +1,10 @@
-/* eslint max-statements: 'off', no-restricted-syntax: 'off', guard-for-in: 'off' */
-
-const semver = require('semver');
+import semver from 'semver';
 import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
 import {Severity} from '../types/severity';
 import {PackageJson} from 'type-fest';
-const {isObject} = require('../validators/type');
-const {isValidValue} = require('../validators/valid-values');
+import {isObject} from '../validators/type';
+import {isValidValue} from '../validators/valid-values';
 
 const lintId = 'valid-values-engines';
 const nodeName = 'engines';
diff --git a/src/rules/valid-values-license.ts b/src/rules/valid-values-license.ts
@@ -2,7 +2,7 @@ import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
 import {Severity} from '../types/severity';
 import {PackageJson} from 'type-fest';
-const {isValidValue} = require('../validators/valid-values');
+import {isValidValue} from '../validators/valid-values';
 
 const lintId = 'valid-values-license';
 const nodeName = 'license';
diff --git a/src/rules/valid-values-name-scope.ts b/src/rules/valid-values-name-scope.ts
@@ -2,7 +2,7 @@ import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
 import {Severity} from '../types/severity';
 import {PackageJson} from 'type-fest';
-const {matchValidValue} = require('../validators/valid-values');
+import {matchValidValue} from '../validators/valid-values';
 
 const lintId = 'valid-values-name-scope';
 const nodeName = 'name';
diff --git a/src/rules/valid-values-private.ts b/src/rules/valid-values-private.ts
@@ -2,7 +2,7 @@ import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
 import {Severity} from '../types/severity';
 import {PackageJson} from 'type-fest';
-const {isValidValue} = require('../validators/valid-values');
+import {isValidValue} from '../validators/valid-values';
 
 const lintId = 'valid-values-private';
 const nodeName = 'private';
diff --git a/src/rules/valid-values-publishConfig.ts b/src/rules/valid-values-publishConfig.ts
@@ -2,8 +2,8 @@ import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
 import {Severity} from '../types/severity';
 import {PackageJson} from 'type-fest';
-const {isObject} = require('../validators/type');
-const {isValidValue} = require('../validators/valid-values');
+import {isObject} from '../validators/type';
+import {isValidValue} from '../validators/valid-values';
 
 const lintId = 'valid-values-publishConfig';
 const nodeName = 'publishConfig';
diff --git a/src/rules/version-type.ts b/src/rules/version-type.ts
@@ -1,4 +1,4 @@
-const {isString} = require('../validators/type');
+import {isString} from '../validators/type';
 import {LintIssue} from '../lint-issue';
 import {RuleType} from '../types/rule-type';
 import {Severity} from '../types/severity';

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const {isString} = require('../validators/type');`
	`1`	`+import {isString} from '../validators/type';`
`2`	`2`	`import {LintIssue} from '../lint-issue';`
`3`	`3`	`import {RuleType} from '../types/rule-type';`
`4`	`4`	`import {Severity} from '../types/severity';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const {doVersContainInvalidRange} = require('../validators/dependency-audit');`
	`1`	`+import {doVersContainInvalidRange} from '../validators/dependency-audit';`
`2`	`2`	`import {LintIssue} from '../lint-issue';`
`3`	`3`	`import {RuleType} from '../types/rule-type';`
`4`	`4`	`import {Severity} from '../types/severity';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const {isInAlphabeticalOrder} = require('../validators/alphabetical-sort');`
	`1`	`+import {isInAlphabeticalOrder} from '../validators/alphabetical-sort';`
`2`	`2`	`import {exists} from '../validators/property';`
`3`	`3`	`import {LintIssue} from '../lint-issue';`
`4`	`4`	`import {RuleType} from '../types/rule-type';`