From 4350ab63f8fc5a76a4f6481e95cad66aa58d61ab Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Thu, 25 Jul 2024 14:05:56 +0100 Subject: [PATCH 1/3] refactor(npm)!: don't replace consola --- package.json | 1 - src/presets/nodeless.ts | 1 - src/runtime/npm/consola.ts | 21 ----------------- src/runtime/npm/consola/utils.ts | 39 -------------------------------- 4 files changed, 62 deletions(-) delete mode 100644 src/runtime/npm/consola.ts delete mode 100644 src/runtime/npm/consola/utils.ts diff --git a/package.json b/package.json index b1580485..83353809 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,6 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "consola": "^3.2.3", "defu": "^6.1.4", "ohash": "^1.1.3", "pathe": "^1.1.2", diff --git a/src/presets/nodeless.ts b/src/presets/nodeless.ts index 8fccfd39..4964af5e 100644 --- a/src/presets/nodeless.ts +++ b/src/presets/nodeless.ts @@ -72,7 +72,6 @@ const nodeless: Preset & { alias: Map } = { // npm fsevents: "unenv/runtime/npm/fsevents", - "consola/core": "consola/core", "node-fetch": "unenv/runtime/npm/node-fetch", "node-fetch-native": "unenv/runtime/npm/node-fetch", "node-fetch-native/polyfill": "unenv/runtime/mock/empty", diff --git a/src/runtime/npm/consola.ts b/src/runtime/npm/consola.ts deleted file mode 100644 index 33ea0f23..00000000 --- a/src/runtime/npm/consola.ts +++ /dev/null @@ -1,21 +0,0 @@ -import type { ConsolaReporter } from "consola"; -import { createConsola as _createConsola } from "consola/core"; - -const basicReporter: ConsolaReporter = { - log(logObj) { - (console[logObj.type as "log"] || console.log)(...logObj.args); - }, -}; - -export function createConsola(options: any = {}) { - return _createConsola({ - reporters: [basicReporter], - ...options, - }); -} - -export const consola = createConsola(); - -(consola as any).consola = consola; - -export default consola; diff --git a/src/runtime/npm/consola/utils.ts b/src/runtime/npm/consola/utils.ts deleted file mode 100644 index e95ff01a..00000000 --- a/src/runtime/npm/consola/utils.ts +++ /dev/null @@ -1,39 +0,0 @@ -type ConsolaUtils = typeof import("consola/utils"); - -// TODO: https://github.com/unjs/consola/issues/263 - -const _colorize = String; - -export const colorize: ConsolaUtils["colorize"] = (color, str) => - _colorize(str); - -export const getColor: ConsolaUtils["getColor"] = (color, fallback) => () => - _colorize(color); - -export const stripAnsi: ConsolaUtils["stripAnsi"] = (str) => str; - -export const box: ConsolaUtils["box"] = (str, opts) => str; - -export const align: ConsolaUtils["align"] = (alignment, str, len, space) => str; -export const leftAlign: ConsolaUtils["leftAlign"] = (str, len, space?) => str; -export const rightAlign: ConsolaUtils["rightAlign"] = (str, len, space?) => str; -export const centerAlign: ConsolaUtils["centerAlign"] = (str, len, space?) => - str; - -export const colors = new Proxy({} as any, { - get(_, colorName) { - return _colorize; - }, -}); - -export default { - colorize, - getColor, - stripAnsi, - align, - leftAlign, - rightAlign, - centerAlign, - box, - colors, -}; From b7fecbbf626a3ce18eb42f2a0d3d11a600dc149c Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Thu, 25 Jul 2024 14:06:01 +0100 Subject: [PATCH 2/3] update lockfile --- pnpm-lock.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 91ec5924..44bb6fc4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,9 +8,6 @@ importers: .: dependencies: - consola: - specifier: ^3.2.3 - version: 3.2.3 defu: specifier: ^6.1.4 version: 6.1.4 From 73db05951b214cbd666532faac0ec7514f8448ec Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Thu, 25 Jul 2024 14:08:24 +0100 Subject: [PATCH 3/3] add consola as dev dep --- package.json | 1 + pnpm-lock.yaml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/package.json b/package.json index 83353809..82dd6605 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "@types/node": "^20.14.12", "automd": "^0.3.8", "changelogen": "^0.5.5", + "consola": "^3.2.3", "eslint": "^9.7.0", "eslint-config-unjs": "^0.3.2", "jiti": "^1.21.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 44bb6fc4..7ee8faec 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -30,6 +30,9 @@ importers: changelogen: specifier: ^0.5.5 version: 0.5.5 + consola: + specifier: ^3.2.3 + version: 3.2.3 eslint: specifier: ^9.7.0 version: 9.7.0