Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,11 @@
"@svgr/plugin-jsx": "workspace:*",
"@svgr/plugin-prettier": "workspace:*",
"@svgr/plugin-svgo": "workspace:*",
"camelcase": "^6.2.0",
"chalk": "^4.1.2",
"change-case": "^4.0.0",
"commander": "^9.4.1",
"dashify": "^2.0.0",
"glob": "^8.0.3",
"snake-case": "^3.0.4"
"glob": "^8.0.3"
},
"devDependencies": {
"@types/glob": "^8.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/util.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe('util', () => {
expect(formatExportName('foo')).toBe('Foo')
expect(formatExportName('foo-bar')).toBe('FooBar')
expect(formatExportName('2foo')).toBe('Svg2foo')
expect(formatExportName('2foo-bar')).toBe('Svg2FooBar')
expect(formatExportName('2foo-bar')).toBe('Svg2fooBar')
})
})
})
10 changes: 4 additions & 6 deletions packages/cli/src/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ import svgo from '@svgr/plugin-svgo'
import jsx from '@svgr/plugin-jsx'
import prettier from '@svgr/plugin-prettier'
// @ts-ignore
import camelCase from 'camelcase'
// @ts-ignore
import dashify from 'dashify'
import { snakeCase } from 'snake-case'
import { camelCase, pascalCase, snakeCase } from 'change-case'

export function transformFilename(
filename: string,
Expand All @@ -21,7 +19,7 @@ export function transformFilename(
case 'camel':
return camelCase(filename)
case 'pascal':
return camelCase(filename, { pascalCase: true })
return pascalCase(filename)
case 'snake':
return snakeCase(filename)
default:
Expand Down Expand Up @@ -64,12 +62,12 @@ export const politeWrite = (data: string, silent?: boolean): void => {

export const formatExportName = (name: string): string => {
if (/[-]/g.test(name) && /^\d/.test(name)) {
return `Svg${camelCase(name, { pascalCase: true })}`
return `Svg${pascalCase(name)}`
}

if (/^\d/.test(name)) {
return `Svg${name}`
}

return camelCase(name, { pascalCase: true })
return pascalCase(name)
}
5 changes: 2 additions & 3 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@
"dependencies": {
"@babel/core": "^7.21.3",
"@svgr/babel-preset": "workspace:*",
"camelcase": "^6.2.0",
"cosmiconfig": "^8.3.6",
"snake-case": "^3.0.4"
"change-case": "^4.0.0",
"cosmiconfig": "^8.3.6"
},
"devDependencies": {
"svgo": "^3.0.2"
Expand Down
8 changes: 2 additions & 6 deletions packages/core/src/state.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { parse as parsePath } from 'path'
// @ts-ignore
import camelCase from 'camelcase'
import { pascalCase } from 'change-case'
import type { ConfigPlugin } from './plugins'

export interface State {
Expand All @@ -17,11 +16,8 @@ const VALID_CHAR_REGEX = /[^a-zA-Z0-9 _-]/g

const getComponentName = (filePath?: string): string => {
if (!filePath) return 'SvgComponent'
const pascalCaseFileName = camelCase(
const pascalCaseFileName = pascalCase(
parsePath(filePath).name.replace(VALID_CHAR_REGEX, ''),
{
pascalCase: true,
},
)
return `Svg${pascalCaseFileName}`
}
Expand Down
96 changes: 77 additions & 19 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.