Skip to content

chore(deps): replace camelcase with a local helper in SVG transforms #21029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vbudhram wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore(deps): replace camelcase with a local helper in SVG transforms #21029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/fxa-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
"babel-eslint": "^10.1.0",
"babel-loader": "^9.1.3",
"babel-preset-react-app": "^10.0.1",
"camelcase": "^6.3.0",
"eslint": "^7.32.0",
"file-loader": "^6.2.0",
"grunt": "^1.6.1",
Expand Down
17 changes: 13 additions & 4 deletions packages/fxa-react/svg-transform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,23 @@
// https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/config/jest/fileTransform.js

const path = require('path');
const camelcase = require('camelcase');

// Turns an SVG basename into PascalCase. Twin of the helper in
// packages/fxa-settings/config/jest/fileTransform.js.
function toPascalCase(name) {
return name
.replace(/([a-z])([A-Z])/g, '$1-$2')
.split(/[_.\- ]+/)
.filter(Boolean)
.map((part) => part.charAt(0).toUpperCase() + part.slice(1).toLowerCase())
.join('')
.replace(/\d[a-z]/g, (match) => match.toUpperCase());
}

module.exports = {
process(src, filename) {
const assetFilename = JSON.stringify(path.basename(filename));
const pascalCaseFilename = camelcase(path.parse(filename).name, {
pascalCase: true,
});
const pascalCaseFilename = toPascalCase(path.parse(filename).name);
const componentName = `Svg${pascalCaseFilename}`;
return `const React = require('react');
module.exports = {
Expand Down
17 changes: 13 additions & 4 deletions packages/fxa-settings/config/jest/fileTransform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,18 @@
'use strict';

const path = require('path');
const camelcase = require('camelcase');

// Turns an SVG basename into PascalCase. Twin of the helper in
// packages/fxa-react/svg-transform.js.
function toPascalCase(name) {
return name
.replace(/([a-z])([A-Z])/g, '$1-$2')
.split(/[_.\- ]+/)
.filter(Boolean)
.map((part) => part.charAt(0).toUpperCase() + part.slice(1).toLowerCase())
.join('')
.replace(/\d[a-z]/g, (match) => match.toUpperCase());
}

// This is a custom Jest transformer turning file imports into filenames.
// http://facebook.github.io/jest/docs/en/webpack.html
Expand All @@ -15,9 +26,7 @@ module.exports = {
if (filename.match(/\.svg$/)) {
// Based on how SVGR generates a component name:
// https://github.com/smooth-code/svgr/blob/01b194cf967347d43d4cbe6b434404731b87cf27/packages/core/src/state.js#L6
const pascalCaseFilename = camelcase(path.parse(filename).name, {
pascalCase: true,
});
const pascalCaseFilename = toPascalCase(path.parse(filename).name);
const componentName = `Svg${pascalCaseFilename}`;
return {
code: `const React = require('react');
Expand Down
1 change: 0 additions & 1 deletion packages/fxa-settings/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@
"bfj": "^9.1.1",
"browserify-zlib": "^0.2.0",
"browserslist": "^4.28.4",
"camelcase": "^6.2.1",
"case-sensitive-paths-webpack-plugin": "^2.4.0",
"classnames": "^2.5.1",
"crypto-browserify": "^3.12.0",
Expand Down
2 changes: 0 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34108,7 +34108,6 @@ __metadata:
babel-eslint: "npm:^10.1.0"
babel-loader: "npm:^9.1.3"
babel-preset-react-app: "npm:^10.0.1"
camelcase: "npm:^6.3.0"
classnames: "npm:^2.5.1"
eslint: "npm:^7.32.0"
fetch-mock: "npm:^9.11.0"
Expand Down Expand Up @@ -34176,7 +34175,6 @@ __metadata:
bfj: "npm:^9.1.1"
browserify-zlib: "npm:^0.2.0"
browserslist: "npm:^4.28.4"
camelcase: "npm:^6.2.1"
case-sensitive-paths-webpack-plugin: "npm:^2.4.0"
classnames: "npm:^2.5.1"
crypto-browserify: "npm:^3.12.0"
Expand Down
Loading