From 1fd0641addbdf334bb3fedecccd2ddfa99c6bdf2 Mon Sep 17 00:00:00 2001 From: Rafal Chlodnicki Date: Thu, 16 Nov 2023 23:00:30 +0100 Subject: [PATCH 1/3] fix: bump consola to 3.x to align with other nuxt 2 packages --- package.json | 2 +- src/reporters/basic.ts | 2 +- src/reporters/fancy.ts | 2 +- src/reporters/profile.ts | 2 +- src/reporters/stats.ts | 2 +- src/utils/cli.ts | 2 +- yarn.lock | 5 +++++ 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 729dca8..278b65a 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ }, "dependencies": { "chalk": "^4.1.2", - "consola": "^2.15.3", + "consola": "^3.2.3", "pretty-time": "^1.1.0", "std-env": "^3.3.3" }, diff --git a/src/reporters/basic.ts b/src/reporters/basic.ts index 3fb350a..45397d9 100644 --- a/src/reporters/basic.ts +++ b/src/reporters/basic.ts @@ -1,5 +1,5 @@ import { consola } from '../utils/cli' -import { Reporter } from 'src/types' +import { Reporter } from '../types' export default class SimpleReporter implements Reporter { start (context) { diff --git a/src/reporters/fancy.ts b/src/reporters/fancy.ts index dc2aef4..4ba6f9b 100644 --- a/src/reporters/fancy.ts +++ b/src/reporters/fancy.ts @@ -5,7 +5,7 @@ import { renderBar, colorize, ellipsisLeft } from '../utils/cli' import { formatRequest } from '../utils/webpack' import { BULLET, TICK, CROSS, CIRCLE_OPEN } from '../utils/consts' import LogUpdate from '../utils/log-update' -import { Reporter } from 'src/types' +import { Reporter } from '../types' const logUpdate = new LogUpdate() diff --git a/src/reporters/profile.ts b/src/reporters/profile.ts index 9afb641..b32b18a 100644 --- a/src/reporters/profile.ts +++ b/src/reporters/profile.ts @@ -2,7 +2,7 @@ import chalk from 'chalk' import { colorize } from '../utils/cli' import Profiler from '../profiler' -import { Reporter } from 'src/types' +import { Reporter } from '../types' export default class ProfileReporter implements Reporter { progress (context) { diff --git a/src/reporters/stats.ts b/src/reporters/stats.ts index b3df3be..5233d75 100644 --- a/src/reporters/stats.ts +++ b/src/reporters/stats.ts @@ -1,4 +1,4 @@ -import { Reporter } from 'src/types' +import { Reporter } from '../types' export default class StatsReporter implements Reporter { private options: any diff --git a/src/utils/cli.ts b/src/utils/cli.ts index 0ebcdea..db32ccf 100644 --- a/src/utils/cli.ts +++ b/src/utils/cli.ts @@ -1,5 +1,5 @@ import chalk from 'chalk' -import _consola from 'consola' +import { consola as _consola } from 'consola' import { markdownTable } from 'markdown-table' import { BLOCK_CHAR, BLOCK_CHAR2, BAR_LENGTH } from './consts' diff --git a/yarn.lock b/yarn.lock index c8adc0d..7f041cb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1043,6 +1043,11 @@ consola@^2.15.3: resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550" integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw== +consola@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/consola/-/consola-3.2.3.tgz#0741857aa88cfa0d6fd53f1cff0375136e98502f" + integrity sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ== + conventional-changelog-angular@^5.0.12: version "5.0.13" resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz#896885d63b914a70d4934b59d2fe7bde1832b28c" From b313e60bced9c4f3327bdef6762278bfd6fb5baa Mon Sep 17 00:00:00 2001 From: Rafal Chlodnicki Date: Fri, 17 Nov 2023 09:12:48 +0100 Subject: [PATCH 2/3] bump node in ci --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 34138bf..ea12970 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,9 +16,9 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v2 with: - node-version: '14' + node-version: '16' cache: yarn - run: yarn install - run: yarn prepack - run: yarn lint - - run: npx node@12 ./node_modules/.bin/mocha ./test/*.test.* + - run: npx node ./node_modules/.bin/mocha ./test/*.test.* From b97c0cf0a391497b6c929f851ab46764fcb732dc Mon Sep 17 00:00:00 2001 From: Rafal Chlodnicki Date: Fri, 17 Nov 2023 09:25:10 +0100 Subject: [PATCH 3/3] bump to 14.18.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 278b65a..8f8acb9 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,6 @@ "webpack": "3 || 4 || 5" }, "engines": { - "node": ">=v12.22.12" + "node": ">=14.18.0" } }