From af5729844e9467c061f8be972b615d0683b467e2 Mon Sep 17 00:00:00 2001 From: Pleroma Renovate Bot Date: Sat, 1 Feb 2025 08:52:21 +0000 Subject: [PATCH 1/2] Update dependency chalk to v5 --- package.json | 2 +- yarn.lock | 23 ++++++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index caf11238f..bebb1ee9f 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "babel-loader": "9.2.1", "babel-plugin-lodash": "3.3.4", "chai": "4.5.0", - "chalk": "1.1.3", + "chalk": "5.4.1", "chromedriver": "108.0.0", "connect-history-api-fallback": "2.0.0", "copy-webpack-plugin": "11.0.0", diff --git a/yarn.lock b/yarn.lock index ad72815f7..cc31848c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2834,7 +2834,20 @@ chai@4.5.0: pathval "^1.1.1" type-detect "^4.1.0" -chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1: +chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@5.4.1: + version "5.4.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.4.1.tgz#1b48bf0963ec158dce2aacf69c093ae2dd2092d8" + integrity sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w== + +chalk@^1.0.0, chalk@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" dependencies: @@ -2844,14 +2857,6 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - chalk@^4.0.0, chalk@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" From 31609da231e257dcb5530658d925bccf63cfc8b4 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 3 Feb 2025 16:45:38 +0200 Subject: [PATCH 2/2] move to mjs --- build/build.js | 2 +- .../{check-versions.js => check-versions.mjs} | 23 ++++++++----------- build/dev-server.js | 2 +- 3 files changed, 12 insertions(+), 15 deletions(-) rename build/{check-versions.js => check-versions.mjs} (58%) diff --git a/build/build.js b/build/build.js index 99ca49c06..e84122888 100644 --- a/build/build.js +++ b/build/build.js @@ -1,5 +1,5 @@ // https://github.com/shelljs/shelljs -require('./check-versions')() +import('./check-versions.mjs').then(m => m.default()) require('shelljs/global') env.NODE_ENV = 'production' diff --git a/build/check-versions.js b/build/check-versions.mjs similarity index 58% rename from build/check-versions.js rename to build/check-versions.mjs index ed6256b3a..73c1eeb15 100644 --- a/build/check-versions.js +++ b/build/check-versions.mjs @@ -1,10 +1,7 @@ -var semver = require('semver') -var chalk = require('chalk') -var packageConfig = require('../package.json') -var exec = function (cmd) { - return require('child_process') - .execSync(cmd).toString().trim() -} +import semver from 'semver' +import chalk from 'chalk' + +import packageConfig from '../package.json' with { type: 'json' } var versionRequirements = [ { @@ -14,10 +11,10 @@ var versionRequirements = [ } ] -module.exports = function () { - var warnings = [] - for (var i = 0; i < versionRequirements.length; i++) { - var mod = versionRequirements[i] +export default function () { + const warnings = [] + for (let i = 0; i < versionRequirements.length; i++) { + const mod = versionRequirements[i] if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) { warnings.push(mod.name + ': ' + chalk.red(mod.currentVersion) + ' should be ' + @@ -28,8 +25,8 @@ module.exports = function () { if (warnings.length) { console.warn(chalk.yellow('\nTo use this template, you must update following to modules:\n')) - for (var i = 0; i < warnings.length; i++) { - var warning = warnings[i] + for (let i = 0; i < warnings.length; i++) { + const warning = warnings[i] console.warn(' ' + warning) } console.warn() diff --git a/build/dev-server.js b/build/dev-server.js index 145072e70..9fb6318ef 100644 --- a/build/dev-server.js +++ b/build/dev-server.js @@ -1,4 +1,4 @@ -require('./check-versions')() +import('./check-versions.mjs').then(m => m.default()) var config = require('../config') if (!process.env.NODE_ENV) process.env.NODE_ENV = config.dev.env var path = require('path')