From 6ebbfa0591c809a9c591262e512da0c2b482dab2 Mon Sep 17 00:00:00 2001 From: Titouan Mathis Date: Wed, 15 Dec 2021 15:03:11 +0100 Subject: [PATCH 1/2] Bump version number --- package-lock.json | 4 ++-- package.json | 2 +- packages/demo/package.json | 2 +- packages/webpack-config/package.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index a37b314..23a2798 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@studiometa/webpack-config-root", - "version": "3.1.0-alpha.2", + "version": "3.1.0-alpha.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@studiometa/webpack-config-root", - "version": "3.1.0-alpha.2", + "version": "3.1.0-alpha.3", "workspaces": [ "packages/*" ], diff --git a/package.json b/package.json index e3901c4..3193267 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@studiometa/webpack-config-root", - "version": "3.1.0-alpha.2", + "version": "3.1.0-alpha.3", "private": true, "type": "commonjs", "workspaces": [ diff --git a/packages/demo/package.json b/packages/demo/package.json index 5ad0da7..92b9c73 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -1,6 +1,6 @@ { "name": "@studiometa/webpack-config-demo", - "version": "3.1.0-alpha.2", + "version": "3.1.0-alpha.3", "private": true, "type": "module", "scripts": { diff --git a/packages/webpack-config/package.json b/packages/webpack-config/package.json index 0c26f82..a30ea8e 100644 --- a/packages/webpack-config/package.json +++ b/packages/webpack-config/package.json @@ -1,6 +1,6 @@ { "name": "@studiometa/webpack-config", - "version": "3.1.0-alpha.2", + "version": "3.1.0-alpha.3", "description": "A basic webpack config", "type": "module", "main": "src/index.js", From 018ac6335a64986bf45f4b9454f67c1b4d982cf3 Mon Sep 17 00:00:00 2001 From: Titouan Mathis Date: Wed, 15 Dec 2021 15:04:06 +0100 Subject: [PATCH 2/2] Presets/Prototyping: Fix conversion to dash-case for Twig functions --- package-lock.json | 18 ++++-------------- packages/webpack-config/package.json | 2 +- packages/webpack-config/src/utils/Html.js | 6 +++--- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 23a2798..c96fb51 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7011,11 +7011,6 @@ "graceful-fs": "^4.1.6" } }, - "node_modules/kebab-case": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/kebab-case/-/kebab-case-1.0.1.tgz", - "integrity": "sha512-txPHx6nVLhv8PHGXIlAk0nYoh894SpAqGPXNvbg2hh8spvHXIah3+vT87DLoa59nKgC6scD3u3xAuRIgiMqbfQ==" - }, "node_modules/keygrip": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz", @@ -17546,7 +17541,7 @@ }, "packages/demo": { "name": "@studiometa/webpack-config-demo", - "version": "3.1.0-alpha.1", + "version": "3.1.0-alpha.2", "dependencies": { "@studiometa/js-toolkit": "^2.0.0-beta.0", "@studiometa/ui": "^0.1.0", @@ -17616,7 +17611,7 @@ }, "packages/webpack-config": { "name": "@studiometa/webpack-config", - "version": "3.1.0-alpha.1", + "version": "3.1.0-alpha.2", "license": "MIT", "dependencies": { "@babel/plugin-transform-runtime": "^7.16.4", @@ -17640,9 +17635,9 @@ "glob": "^7.2.0", "html-webpack-plugin": "^5.5.0", "js-yaml-loader": "^1.2.2", - "kebab-case": "^1.0.1", "lodash.merge": "^4.6.2", "mini-css-extract-plugin": "^2.4.5", + "param-case": "^3.0.4", "postcss": "^8.3.11", "postcss-loader": "^6.2.0", "postcss-preset-env": "^6.7.0", @@ -18946,9 +18941,9 @@ "glob": "^7.2.0", "html-webpack-plugin": "^5.5.0", "js-yaml-loader": "^1.2.2", - "kebab-case": "*", "lodash.merge": "^4.6.2", "mini-css-extract-plugin": "^2.4.5", + "param-case": "*", "postcss": "^8.3.11", "postcss-loader": "^6.2.0", "postcss-preset-env": "^6.7.0", @@ -22924,11 +22919,6 @@ "graceful-fs": "^4.1.6" } }, - "kebab-case": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/kebab-case/-/kebab-case-1.0.1.tgz", - "integrity": "sha512-txPHx6nVLhv8PHGXIlAk0nYoh894SpAqGPXNvbg2hh8spvHXIah3+vT87DLoa59nKgC6scD3u3xAuRIgiMqbfQ==" - }, "keygrip": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz", diff --git a/packages/webpack-config/package.json b/packages/webpack-config/package.json index a30ea8e..949535c 100644 --- a/packages/webpack-config/package.json +++ b/packages/webpack-config/package.json @@ -70,9 +70,9 @@ "glob": "^7.2.0", "html-webpack-plugin": "^5.5.0", "js-yaml-loader": "^1.2.2", - "kebab-case": "^1.0.1", "lodash.merge": "^4.6.2", "mini-css-extract-plugin": "^2.4.5", + "param-case": "^3.0.4", "postcss": "^8.3.11", "postcss-loader": "^6.2.0", "postcss-preset-env": "^6.7.0", diff --git a/packages/webpack-config/src/utils/Html.js b/packages/webpack-config/src/utils/Html.js index 192d4ad..e055d35 100644 --- a/packages/webpack-config/src/utils/Html.js +++ b/packages/webpack-config/src/utils/Html.js @@ -4,7 +4,7 @@ * @copyright Studio Meta * @license https://github.com/studiometa/twig-toolkit/blob/master/LICENSE */ -import toKebab from 'kebab-case'; +import { paramCase } from 'param-case'; /** * @typdef {string | Record | Record} Classes @@ -78,7 +78,7 @@ export default class Html { if (key === '_keys' || (typeof value === 'boolean' && !value) || value === '') { continue; } - renderedStyles.push(`${toKebab(key)}: ${value};`); + renderedStyles.push(`${paramCase(key)}: ${value};`); } return renderedStyles.join(' '); } @@ -101,7 +101,7 @@ export default class Html { continue; } - key = toKebab(key); + key = paramCase(key); if (typeof value === 'boolean') { if (value) { renderedAttributes.push(key);