From b4404c135141d1c973d8d1ba1cf2cacaa2df4017 Mon Sep 17 00:00:00 2001 From: ngittlen <2019297+ngittlen@users.noreply.github.com> Date: Fri, 18 Oct 2024 16:04:44 -0400 Subject: [PATCH] Remove deprecated camel-case and param-case pkgs --- cli.js | 11 ++++---- package-lock.json | 65 +++++++---------------------------------------- package.json | 3 +-- 3 files changed, 15 insertions(+), 64 deletions(-) diff --git a/cli.js b/cli.js index d772786..bb44930 100755 --- a/cli.js +++ b/cli.js @@ -28,10 +28,9 @@ import fs from 'fs'; import path from 'path'; import { createRequire } from 'module'; -import { camelCase } from 'camel-case'; -import { paramCase } from 'param-case'; import { Command } from 'commander'; import { minify } from './src/htmlminifier.js'; +import * as changeCase from 'change-case'; const require = createRequire(import.meta.url); @@ -146,13 +145,13 @@ const mainOptionKeys = Object.keys(mainOptions); mainOptionKeys.forEach(function (key) { const option = mainOptions[key]; if (Array.isArray(option)) { - key = key === 'minifyURLs' ? '--minify-urls' : '--' + paramCase(key); + key = key === 'minifyURLs' ? '--minify-urls' : '--' + changeCase.kebabCase(key); key += option[1] === parseJSON ? ' [value]' : ' '; program.option(key, option[0], option[1]); } else if (~['html5', 'includeAutoGeneratedTags'].indexOf(key)) { - program.option('--no-' + paramCase(key), option); + program.option('--no-' + changeCase.kebabCase(key), option); } else { - program.option('--' + paramCase(key), option); + program.option('--' + changeCase.kebabCase(key), option); } }); program.option('-o --output ', 'Specify output file (if not specified STDOUT will be used for output)'); @@ -202,7 +201,7 @@ function createOptions() { const options = {}; mainOptionKeys.forEach(function (key) { - const param = programOptions[key === 'minifyURLs' ? 'minifyUrls' : camelCase(key)]; + const param = programOptions[key === 'minifyURLs' ? 'minifyUrls' : changeCase.camelCase(key)]; if (typeof param !== 'undefined') { options[key] = param; diff --git a/package-lock.json b/package-lock.json index d2039fa..f8e71a2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,11 +9,10 @@ "version": "7.2.0", "license": "MIT", "dependencies": { - "camel-case": "^4.1.2", + "change-case": "^5.4.4", "clean-css": "~5.3.2", "commander": "^10.0.0", "entities": "^4.4.0", - "param-case": "^3.0.4", "relateurl": "^0.2.7", "terser": "^5.15.1" }, @@ -2721,15 +2720,6 @@ "node": ">=6" } }, - "node_modules/camel-case": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", - "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", - "dependencies": { - "pascal-case": "^3.1.2", - "tslib": "^2.0.3" - } - }, "node_modules/camelcase": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", @@ -2792,6 +2782,12 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, + "node_modules/change-case": { + "version": "5.4.4", + "resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz", + "integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==", + "license": "MIT" + }, "node_modules/char-regex": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", @@ -3302,15 +3298,6 @@ "node": ">=12" } }, - "node_modules/dot-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", - "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", - "dependencies": { - "no-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, "node_modules/dot-prop": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", @@ -6392,14 +6379,6 @@ "node": ">=8" } }, - "node_modules/lower-case": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", - "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", - "dependencies": { - "tslib": "^2.0.3" - } - }, "node_modules/lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -6632,15 +6611,6 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "node_modules/no-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", - "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", - "dependencies": { - "lower-case": "^2.0.2", - "tslib": "^2.0.3" - } - }, "node_modules/node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -6846,15 +6816,6 @@ "node": ">=6" } }, - "node_modules/param-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", - "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==", - "dependencies": { - "dot-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -6897,15 +6858,6 @@ "url": "https://github.com/inikulin/parse5?sponsor=1" } }, - "node_modules/pascal-case": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", - "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", - "dependencies": { - "no-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -8344,7 +8296,8 @@ "node_modules/tslib": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz", - "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==" + "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==", + "dev": true }, "node_modules/type-check": { "version": "0.4.0", diff --git a/package.json b/package.json index 6110ab2..05d9a9b 100644 --- a/package.json +++ b/package.json @@ -74,11 +74,10 @@ "prepare": "is-ci || husky install" }, "dependencies": { - "camel-case": "^4.1.2", + "change-case": "^5.4.4", "clean-css": "~5.3.2", "commander": "^10.0.0", "entities": "^4.4.0", - "param-case": "^3.0.4", "relateurl": "^0.2.7", "terser": "^5.15.1" },