Skip to content

Commit

Permalink
chore(node): drop Node 14 support
Browse files Browse the repository at this point in the history
  • Loading branch information
wKovacs64 committed Jan 30, 2023
1 parent 81a2fb1 commit 3fe2524
Show file tree
Hide file tree
Showing 30 changed files with 104 additions and 124 deletions.
3 changes: 1 addition & 2 deletions .babelrc.cjs
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
module.exports = {
plugins: ['babel-plugin-add-import-extension'],
presets: [
'@babel/preset-typescript',
[
'@babel/preset-env',
{
modules: false,
targets: {
node: '14.13.1',
node: '16.0.0',
},
},
],
Expand Down
5 changes: 5 additions & 0 deletions .changeset/silent-lemons-provide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'pwned': major
---

Drop support for Node.js 14 as it is nearing [end-of-life](https://nodejs.org/en/about/releases/), making the new minimum Node.js runtime v16.0.0. Please upgrade your Node.js environment if necessary, or continue using a previous release if you are unable to upgrade your environment.
24 changes: 1 addition & 23 deletions package-lock.json

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

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
},
"homepage": "https://wkovacs64.github.io/pwned",
"engines": {
"node": "^14.13.1 || >=16.0.0"
"node": ">=16.0.0"
},
"dependencies": {
"common-tags": "^1.8.2",
Expand Down Expand Up @@ -86,7 +86,6 @@
"@types/yargs": "17.0.20",
"@vitest/coverage-c8": "0.28.3",
"@wkovacs64/prettier-config": "3.0.3",
"babel-plugin-add-import-extension": "1.6.0",
"c8": "7.12.0",
"codecov": "3.8.3",
"cross-env": "7.0.3",
Expand Down
16 changes: 7 additions & 9 deletions src/commands/__tests__/ba.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { vi, type SpyInstance } from 'vitest';
import { server, rest } from '../../../test/server';
import { server, rest } from '../../../test/server.js';
import {
spinnerFns,
loggerFns,
Expand All @@ -8,15 +8,13 @@ import {
ERROR,
ERROR_MSG,
NONE,
} from '../../../test/fixtures';
import {
logger as mockLogger,
spinner as mockSpinner,
type Logger,
} from '../../utils';
import { handler as ba } from '../ba';
} from '../../../test/fixtures.js';
import { logger as mockLogger, type Logger } from '../../utils/logger.js';
import { spinner as mockSpinner } from '../../utils/spinner.js';
import { handler as ba } from '../ba.js';

vi.mock('../../utils');
vi.mock('../../utils/logger');
vi.mock('../../utils/spinner');

const logger = mockLogger as Logger & {
[key: string]: SpyInstance;
Expand Down
16 changes: 7 additions & 9 deletions src/commands/__tests__/breach.test.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
import { vi, type SpyInstance } from 'vitest';
import { server, rest } from '../../../test/server';
import { server, rest } from '../../../test/server.js';
import {
spinnerFns,
loggerFns,
FOUND,
NOT_FOUND,
ERROR,
ERROR_MSG,
} from '../../../test/fixtures';
import {
logger as mockLogger,
spinner as mockSpinner,
type Logger,
} from '../../utils';
import { handler as breach } from '../breach';
} from '../../../test/fixtures.js';
import { logger as mockLogger, type Logger } from '../../utils/logger.js';
import { spinner as mockSpinner } from '../../utils/spinner.js';
import { handler as breach } from '../breach.js';

vi.mock('../../utils');
vi.mock('../../utils/logger');
vi.mock('../../utils/spinner');

const logger = mockLogger as Logger & {
[key: string]: SpyInstance;
Expand Down
16 changes: 7 additions & 9 deletions src/commands/__tests__/breaches.test.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
import { vi, type SpyInstance } from 'vitest';
import { server, rest } from '../../../test/server';
import { server, rest } from '../../../test/server.js';
import {
spinnerFns,
loggerFns,
FOUND,
NOT_FOUND,
ERROR,
ERROR_MSG,
} from '../../../test/fixtures';
import {
logger as mockLogger,
spinner as mockSpinner,
type Logger,
} from '../../utils';
import { handler as breaches } from '../breaches';
} from '../../../test/fixtures.js';
import { logger as mockLogger, type Logger } from '../../utils/logger.js';
import { spinner as mockSpinner } from '../../utils/spinner.js';
import { handler as breaches } from '../breaches.js';

vi.mock('../../utils');
vi.mock('../../utils/logger');
vi.mock('../../utils/spinner');

const logger = mockLogger as Logger & {
[key: string]: SpyInstance;
Expand Down
16 changes: 7 additions & 9 deletions src/commands/__tests__/dc.test.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
import { vi, type SpyInstance } from 'vitest';
import { server, rest } from '../../../test/server';
import { server, rest } from '../../../test/server.js';
import {
spinnerFns,
loggerFns,
EMPTY_ARRAY,
ERROR_MSG,
} from '../../../test/fixtures';
import {
logger as mockLogger,
spinner as mockSpinner,
type Logger,
} from '../../utils';
import { handler as dc } from '../dc';
} from '../../../test/fixtures.js';
import { logger as mockLogger, type Logger } from '../../utils/logger.js';
import { spinner as mockSpinner } from '../../utils/spinner.js';
import { handler as dc } from '../dc.js';

vi.mock('../../utils');
vi.mock('../../utils/logger');
vi.mock('../../utils/spinner');

const logger = mockLogger as Logger & {
[key: string]: SpyInstance;
Expand Down
16 changes: 7 additions & 9 deletions src/commands/__tests__/pa.test.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
import { vi, type SpyInstance } from 'vitest';
import { server, rest } from '../../../test/server';
import { server, rest } from '../../../test/server.js';
import {
spinnerFns,
loggerFns,
FOUND,
NOT_FOUND,
ERROR,
ERROR_MSG,
} from '../../../test/fixtures';
import {
logger as mockLogger,
spinner as mockSpinner,
type Logger,
} from '../../utils';
import { handler as pa } from '../pa';
} from '../../../test/fixtures.js';
import { logger as mockLogger, type Logger } from '../../utils/logger.js';
import { spinner as mockSpinner } from '../../utils/spinner.js';
import { handler as pa } from '../pa.js';

vi.mock('../../utils');
vi.mock('../../utils/logger');
vi.mock('../../utils/spinner');

const logger = mockLogger as Logger & {
[key: string]: SpyInstance;
Expand Down
16 changes: 7 additions & 9 deletions src/commands/__tests__/pw.test.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
import { vi, type SpyInstance } from 'vitest';
import { server, rest } from '../../../test/server';
import { server, rest } from '../../../test/server.js';
import {
spinnerFns,
loggerFns,
FOUND_PW,
NOT_FOUND_PW,
ERROR,
ERROR_MSG,
} from '../../../test/fixtures';
import {
logger as mockLogger,
spinner as mockSpinner,
type Logger,
} from '../../utils';
import { handler as pw } from '../pw';
} from '../../../test/fixtures.js';
import { logger as mockLogger, type Logger } from '../../utils/logger.js';
import { spinner as mockSpinner } from '../../utils/spinner.js';
import { handler as pw } from '../pw.js';

vi.mock('../../utils');
vi.mock('../../utils/logger');
vi.mock('../../utils/spinner');

const logger = mockLogger as Logger & {
[key: string]: SpyInstance;
Expand Down
16 changes: 7 additions & 9 deletions src/commands/__tests__/search.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { vi, type SpyInstance } from 'vitest';
import { server, rest } from '../../../test/server';
import { server, rest } from '../../../test/server.js';
import {
spinnerFns,
loggerFns,
Expand All @@ -8,15 +8,13 @@ import {
ERROR,
ERROR_MSG,
NONE,
} from '../../../test/fixtures';
import {
logger as mockLogger,
spinner as mockSpinner,
type Logger,
} from '../../utils';
import { handler as search } from '../search';
} from '../../../test/fixtures.js';
import { logger as mockLogger, type Logger } from '../../utils/logger.js';
import { spinner as mockSpinner } from '../../utils/spinner.js';
import { handler as search } from '../search.js';

vi.mock('../../utils');
vi.mock('../../utils/logger');
vi.mock('../../utils/spinner');

const logger = mockLogger as Logger & {
[key: string]: SpyInstance;
Expand Down
4 changes: 2 additions & 2 deletions src/commands/apiKey.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Argv } from 'yargs';
import { oneLine } from 'common-tags';
import { config } from '../config';
import { logger } from '../utils';
import { config } from '../config.js';
import { logger } from '../utils/logger.js';

export const command = 'apiKey <key>';
export const describe = 'set the API key to be used for authenticated requests';
Expand Down
7 changes: 5 additions & 2 deletions src/commands/ba.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ import type { Argv } from 'yargs';
import { breachedAccount } from 'hibp';
import prettyjson from 'prettyjson';
import { oneLine } from 'common-tags';
import { config } from '../config';
import { logger, spinner, translateApiError, userAgent } from '../utils';
import { config } from '../config.js';
import { logger } from '../utils/logger.js';
import { spinner } from '../utils/spinner.js';
import { translateApiError } from '../utils/translate-api-error.js';
import { userAgent } from '../utils/user-agent.js';

export const command = 'ba <account|email>';
export const describe =
Expand Down
4 changes: 3 additions & 1 deletion src/commands/breach.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import type { Argv } from 'yargs';
import { breach } from 'hibp';
import prettyjson from 'prettyjson';
import { logger, spinner, userAgent } from '../utils';
import { logger } from '../utils/logger.js';
import { spinner } from '../utils/spinner.js';
import { userAgent } from '../utils/user-agent.js';

export const command = 'breach <name>';
export const describe = 'get a single breached site by breach name';
Expand Down
4 changes: 3 additions & 1 deletion src/commands/breaches.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import type { Argv } from 'yargs';
import { breaches } from 'hibp';
import prettyjson from 'prettyjson';
import { logger, spinner, userAgent } from '../utils';
import { logger } from '../utils/logger.js';
import { spinner } from '../utils/spinner.js';
import { userAgent } from '../utils/user-agent.js';

export const command = 'breaches';
export const describe = 'get all breaches in the system';
Expand Down
4 changes: 3 additions & 1 deletion src/commands/dc.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import type { Argv } from 'yargs';
import { dataClasses } from 'hibp';
import prettyjson from 'prettyjson';
import { logger, spinner, userAgent } from '../utils';
import { logger } from '../utils/logger.js';
import { spinner } from '../utils/spinner.js';
import { userAgent } from '../utils/user-agent.js';

export const command = 'dc';
export const describe = 'get all data classes in the system';
Expand Down
7 changes: 5 additions & 2 deletions src/commands/pa.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ import type { Argv } from 'yargs';
import { pasteAccount } from 'hibp';
import prettyjson from 'prettyjson';
import { oneLine } from 'common-tags';
import { config } from '../config';
import { logger, spinner, translateApiError, userAgent } from '../utils';
import { config } from '../config.js';
import { logger } from '../utils/logger.js';
import { spinner } from '../utils/spinner.js';
import { translateApiError } from '../utils/translate-api-error.js';
import { userAgent } from '../utils/user-agent.js';

export const command = 'pa <email>';
export const describe = 'get all pastes for an account (email address)';
Expand Down
4 changes: 3 additions & 1 deletion src/commands/pw.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import type { Argv } from 'yargs';
import { pwnedPassword } from 'hibp';
import { logger, spinner, userAgent } from '../utils';
import { logger } from '../utils/logger.js';
import { spinner } from '../utils/spinner.js';
import { userAgent } from '../utils/user-agent.js';

export const command = 'pw <password>';
export const describe = 'securely check a password for public exposure';
Expand Down
7 changes: 5 additions & 2 deletions src/commands/search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ import type { Argv } from 'yargs';
import { search } from 'hibp';
import prettyjson from 'prettyjson';
import { oneLine } from 'common-tags';
import { config } from '../config';
import { logger, spinner, translateApiError, userAgent } from '../utils';
import { config } from '../config.js';
import { logger } from '../utils/logger.js';
import { spinner } from '../utils/spinner.js';
import { translateApiError } from '../utils/translate-api-error.js';
import { userAgent } from '../utils/user-agent.js';

export const command = 'search <account|email>';
export const describe =
Expand Down
2 changes: 1 addition & 1 deletion src/config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Conf from 'conf';
import { pkg } from './utils';
import { pkg } from './utils/pkg.js';

export const config = new Conf<{ apiKey: string }>({
projectName: pkg.name,
Expand Down
Loading

0 comments on commit 3fe2524

Please sign in to comment.