From ff6f24c9b67b9e45b6c2efbff279e16b82491daf Mon Sep 17 00:00:00 2001 From: Logan McAnsh Date: Tue, 3 Sep 2024 20:24:27 -0400 Subject: [PATCH 1/2] chore: use chalk for node <= 20 support Signed-off-by: Logan McAnsh --- examples/basic/package.json | 1 + examples/basic/server.js | 7 +++---- examples/playground/package.json | 1 + examples/playground/server.js | 6 +++--- examples/vite/package.json | 1 + examples/vite/server/index.ts | 7 +++---- pnpm-lock.yaml | 9 +++++++++ 7 files changed, 21 insertions(+), 11 deletions(-) diff --git a/examples/basic/package.json b/examples/basic/package.json index 33624e82..8c1cbc62 100644 --- a/examples/basic/package.json +++ b/examples/basic/package.json @@ -17,6 +17,7 @@ "@remix-run/css-bundle": "*", "@remix-run/node": "*", "@remix-run/react": "*", + "chalk": "^5.3.0", "cross-env": "^7.0.3", "fastify": "^4.28.1", "get-port": "^7.1.0", diff --git a/examples/basic/server.js b/examples/basic/server.js index 886102ca..3bcfa588 100644 --- a/examples/basic/server.js +++ b/examples/basic/server.js @@ -1,7 +1,7 @@ import fs from "node:fs"; import path from "node:path"; import url from "node:url"; -import { styleText } from "node:util"; +import chalk from "chalk"; import fastify from "fastify"; import { createRequestHandler } from "@mcansh/remix-fastify"; import { broadcastDevReady, installGlobals } from "@remix-run/node"; @@ -110,14 +110,13 @@ let { port: usedPort } = new URL(address); if (usedPort !== String(desiredPort)) { console.warn( - styleText( - "yellow", + chalk.yellow( `⚠️ Port ${desiredPort} is not available, using ${usedPort} instead.`, ), ); } -console.log(`✅ app ready: ${address}`); +console.log(chalk.green(`✅ app ready: ${address}`)); if (process.env.NODE_ENV === "development") { await broadcastDevReady(initialBuild); diff --git a/examples/playground/package.json b/examples/playground/package.json index a0ad06e3..31cd72ce 100644 --- a/examples/playground/package.json +++ b/examples/playground/package.json @@ -19,6 +19,7 @@ "@mcansh/remix-fastify": "workspace:*", "@remix-run/node": "*", "@remix-run/react": "*", + "chalk": "^5.3.0", "fastify": "^4.28.1", "get-port": "^7.1.0", "isbot": "^5.1.11", diff --git a/examples/playground/server.js b/examples/playground/server.js index 46795888..14853594 100644 --- a/examples/playground/server.js +++ b/examples/playground/server.js @@ -1,4 +1,4 @@ -import { styleText } from 'node:util' +import chalk from "chalk"; import { remixFastify } from "@mcansh/remix-fastify"; import { installGlobals } from "@remix-run/node"; import { fastify } from "fastify"; @@ -30,8 +30,8 @@ let parsedAddress = new URL(address); if (parsedAddress.port !== String(desiredPort)) { console.warn( - styleText('yellow', `⚠️ Port ${desiredPort} is not available, using ${parsedAddress.port} instead.`,) + chalk.yellow(`⚠️ Port ${desiredPort} is not available, using ${parsedAddress.port} instead.`) ) } -console.log(`✅ app ready: ${address}`); +console.log(chalk.green(`✅ app ready: ${address}`)); diff --git a/examples/vite/package.json b/examples/vite/package.json index f5b02f13..131e0956 100644 --- a/examples/vite/package.json +++ b/examples/vite/package.json @@ -17,6 +17,7 @@ "@mcansh/remix-fastify": "3.4.0", "@remix-run/node": "*", "@remix-run/react": "*", + "chalk": "^5.3.0", "cross-env": "^7.0.3", "fastify": "^4.28.1", "get-port": "^7.1.0", diff --git a/examples/vite/server/index.ts b/examples/vite/server/index.ts index 5c07e7f2..9e889503 100644 --- a/examples/vite/server/index.ts +++ b/examples/vite/server/index.ts @@ -1,5 +1,5 @@ import process from "node:process"; -import { styleText } from "node:util"; +import chalk from "chalk"; import { remixFastify } from "@mcansh/remix-fastify"; import { installGlobals } from "@remix-run/node"; import { fastify } from "fastify"; @@ -24,11 +24,10 @@ let { port: usedPort } = new URL(address); if (usedPort !== String(desiredPort)) { console.warn( - styleText( - "yellow", + chalk.yellow( `⚠️ Port ${desiredPort} is not available, using ${usedPort} instead.`, ), ); } -console.log(styleText("green", `✅ app ready: ${address}`)); +console.log(chalk.green(`✅ app ready: ${address}`)); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0e566f5a..ecd9883b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -99,6 +99,9 @@ importers: '@remix-run/react': specifier: latest version: 2.11.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.4) + chalk: + specifier: ^5.3.0 + version: 5.3.0 cross-env: specifier: ^7.0.3 version: 7.0.3 @@ -160,6 +163,9 @@ importers: '@remix-run/react': specifier: latest version: 2.11.2(react-dom@19.0.0-rc-100dfd7dab-20240701(react@19.0.0-rc-100dfd7dab-20240701))(react@19.0.0-rc-100dfd7dab-20240701)(typescript@5.5.4) + chalk: + specifier: ^5.3.0 + version: 5.3.0 fastify: specifier: ^4.28.1 version: 4.28.1 @@ -248,6 +254,9 @@ importers: '@remix-run/react': specifier: latest version: 2.11.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.5.4) + chalk: + specifier: ^5.3.0 + version: 5.3.0 cross-env: specifier: ^7.0.3 version: 7.0.3 From 8187d0e8d3847eafee35d1d0476bbb711955850f Mon Sep 17 00:00:00 2001 From: Logan McAnsh Date: Tue, 3 Sep 2024 20:25:02 -0400 Subject: [PATCH 2/2] chore: use latest pnpm Signed-off-by: Logan McAnsh --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 62ff848b..16f9b4a1 100644 --- a/package.json +++ b/package.json @@ -48,5 +48,5 @@ "@changesets/assemble-release-plan@6.0.0": "patches/@changesets__assemble-release-plan@6.0.0.patch" } }, - "packageManager": "pnpm@9.8.0+sha512.8e4c3550fb500e808dbc30bb0ce4dd1eb614e30b1c55245f211591ec2cdf9c611cabd34e1364b42f564bd54b3945ed0f49d61d1bbf2ec9bd74b866fcdc723276" + "packageManager": "pnpm@9.9.0+sha512.60c18acd138bff695d339be6ad13f7e936eea6745660d4cc4a776d5247c540d0edee1a563695c183a66eb917ef88f2b4feb1fc25f32a7adcadc7aaf3438e99c1" }