Merge remote-tracking branch 'origin/develop' into renovate/css-minimizer-webpack-plugin-7.x

This commit is contained in:
Henry Jameson 2025-02-03 17:38:16 +02:00
commit acd4453380
5 changed files with 1068 additions and 1969 deletions

View file

@ -1,5 +1,5 @@
// https://github.com/shelljs/shelljs // https://github.com/shelljs/shelljs
require('./check-versions')() import('./check-versions.mjs').then(m => m.default())
require('shelljs/global') require('shelljs/global')
env.NODE_ENV = 'production' env.NODE_ENV = 'production'

View file

@ -1,10 +1,7 @@
var semver = require('semver') import semver from 'semver'
var chalk = require('chalk') import chalk from 'chalk'
var packageConfig = require('../package.json')
var exec = function (cmd) { import packageConfig from '../package.json' with { type: 'json' }
return require('child_process')
.execSync(cmd).toString().trim()
}
var versionRequirements = [ var versionRequirements = [
{ {
@ -14,10 +11,10 @@ var versionRequirements = [
} }
] ]
module.exports = function () { export default function () {
var warnings = [] const warnings = []
for (var i = 0; i < versionRequirements.length; i++) { for (let i = 0; i < versionRequirements.length; i++) {
var mod = versionRequirements[i] const mod = versionRequirements[i]
if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) { if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
warnings.push(mod.name + ': ' + warnings.push(mod.name + ': ' +
chalk.red(mod.currentVersion) + ' should be ' + chalk.red(mod.currentVersion) + ' should be ' +
@ -28,8 +25,8 @@ module.exports = function () {
if (warnings.length) { if (warnings.length) {
console.warn(chalk.yellow('\nTo use this template, you must update following to modules:\n')) console.warn(chalk.yellow('\nTo use this template, you must update following to modules:\n'))
for (var i = 0; i < warnings.length; i++) { for (let i = 0; i < warnings.length; i++) {
var warning = warnings[i] const warning = warnings[i]
console.warn(' ' + warning) console.warn(' ' + warning)
} }
console.warn() console.warn()

View file

@ -1,4 +1,4 @@
require('./check-versions')() import('./check-versions.mjs').then(m => m.default())
var config = require('../config') var config = require('../config')
if (!process.env.NODE_ENV) process.env.NODE_ENV = config.dev.env if (!process.env.NODE_ENV) process.env.NODE_ENV = config.dev.env
var path = require('path') var path = require('path')

View file

@ -37,7 +37,7 @@
"localforage": "1.10.0", "localforage": "1.10.0",
"pako": "^2.1.0", "pako": "^2.1.0",
"parse-link-header": "2.0.0", "parse-link-header": "2.0.0",
"phoenix": "1.7.18", "phoenix": "1.7.19",
"punycode.js": "2.3.1", "punycode.js": "2.3.1",
"qrcode": "1.5.4", "qrcode": "1.5.4",
"querystring-es3": "0.2.1", "querystring-es3": "0.2.1",
@ -65,12 +65,12 @@
"babel-loader": "9.2.1", "babel-loader": "9.2.1",
"babel-plugin-lodash": "3.3.4", "babel-plugin-lodash": "3.3.4",
"chai": "4.5.0", "chai": "4.5.0",
"chalk": "1.1.3", "chalk": "5.4.1",
"chromedriver": "108.0.0", "chromedriver": "132.0.2",
"connect-history-api-fallback": "2.0.0", "connect-history-api-fallback": "2.0.0",
"copy-webpack-plugin": "11.0.0", "copy-webpack-plugin": "12.0.2",
"cross-spawn": "7.0.6", "cross-spawn": "7.0.6",
"css-loader": "6.11.0", "css-loader": "7.1.2",
"css-minimizer-webpack-plugin": "7.0.0", "css-minimizer-webpack-plugin": "7.0.0",
"custom-event-polyfill": "1.0.7", "custom-event-polyfill": "1.0.7",
"eslint": "8.57.1", "eslint": "8.57.1",
@ -126,7 +126,7 @@
"vue-style-loader": "4.1.3", "vue-style-loader": "4.1.3",
"webpack": "5.97.1", "webpack": "5.97.1",
"webpack-dev-middleware": "3.7.3", "webpack-dev-middleware": "3.7.3",
"webpack-hot-middleware": "2.25.3", "webpack-hot-middleware": "2.26.1",
"webpack-merge": "0.20.0" "webpack-merge": "0.20.0"
}, },
"engines": { "engines": {

2998
yarn.lock

File diff suppressed because it is too large Load diff