Skip to content

Commit

Permalink
Merge branch 'main' into 60-neodxlog-enhance-error-handling
Browse files Browse the repository at this point in the history
# Conflicts:
#	libs/svg/README.md
  • Loading branch information
secundant committed Jul 22, 2023
2 parents c4bc44c + e4c7770 commit 2693f90
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export default defineConfig({
svg({
root: 'assets',
output: 'public',
definition: 'src/shared/ui/icon/sprite.h.ts'
definitions: 'src/shared/ui/icon/sprite.h.ts'
})
]
});
Expand All @@ -94,7 +94,7 @@ export default {
svg({
root: 'assets',
output: 'public',
definition: 'src/shared/ui/icon/sprite.h.ts'
definitions: 'src/shared/ui/icon/sprite.h.ts'
})
]
};
Expand All @@ -113,7 +113,7 @@ export default {
svg({
root: 'assets',
output: 'public',
definition: 'src/shared/ui/icon/sprite.h.ts'
definitions: 'src/shared/ui/icon/sprite.h.ts'
})
]
};
Expand All @@ -132,7 +132,7 @@ export default {
svg({
root: 'assets',
output: 'public',
definition: 'src/shared/ui/icon/sprite.h.ts'
definitions: 'src/shared/ui/icon/sprite.h.ts'
})
]
};
Expand Down
2 changes: 1 addition & 1 deletion libs/svg/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ By default, it creates a single sprite containing all icons without any grouping
```tsx
// shared/ui/icon/icon.tsx
import clsx from 'clsx';
import { SVGProps, ForwardedRef, forwardRef } from 'react';
import { SVGProps } from 'react';
import { SpritesMap } from './sprite.gen';

// Merging all icons as `SPRITE_NAME/SPRITE_ICON_NAME`
Expand Down

0 comments on commit 2693f90

Please sign in to comment.