Skip to content

Commit

Permalink
Merge branch 'main' into emmercm/enforce-await
Browse files Browse the repository at this point in the history
  • Loading branch information
emmercm committed Sep 7, 2022
2 parents 0a3678f + e797a10 commit bdb41ff
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 12 deletions.
6 changes: 6 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
},

"rules": {
"@typescript-eslint/no-restricted-imports": ["error", {
"patterns": [{
"group": ["node:*"],
"message": "Don't use prefixes with Node.js built-ins."
}]
}],
"@typescript-eslint/explicit-function-return-type": "error",
"@typescript-eslint/no-floating-promises": ["error"],
"@typescript-eslint/prefer-readonly": "error",
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"eslint-config-airbnb-base": "15.0.0",
"eslint-config-airbnb-typescript": "17.0.0",
"eslint-plugin-jest": "^27.0.1",
"eslint-plugin-simple-import-sort": "7.0.0",
"eslint-plugin-simple-import-sort": "8.0.0",
"husky": "8.0.1",
"jest": "28.1.3",
"release-it": "15.4.1",
Expand Down
3 changes: 1 addition & 2 deletions src/polyfill/fsPoly.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import fs, { promises as fsPromises } from 'fs';
import fs, { PathLike, promises as fsPromises, RmOptions } from 'fs';
import { isNotJunk } from 'junk';
import { PathLike, RmOptions } from 'node:fs';
import os from 'os';
import path from 'path';
import semver from 'semver';
Expand Down
3 changes: 1 addition & 2 deletions src/types/file.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import _7z from '7zip-min';
import AdmZip, { IZipEntry } from 'adm-zip';
import crc32 from 'crc/crc32';
import fs, { promises as fsPromises } from 'fs';
import { PathLike } from 'node:fs';
import fs, { PathLike, promises as fsPromises } from 'fs';
import unrar from 'node-unrar-js';
import path from 'path';

Expand Down

0 comments on commit bdb41ff

Please sign in to comment.