Skip to content

Commit

Permalink
Merge pull request #306 from etn-ccis/feature/sprites
Browse files Browse the repository at this point in the history
feat: generate family sprites
  • Loading branch information
joebochill authored Feb 16, 2024
2 parents 2267429 + cac88ca commit bbea9ec
Show file tree
Hide file tree
Showing 64 changed files with 11,018 additions and 4,087 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/node_modules
**/**/node_modules
**/**/package-lock.json
**/**/material-design-icons

# cache
.yarn/cache
Expand Down
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ plugins:
spec: "@yarnpkg/plugin-workspace-tools"

yarnPath: .yarn/releases/yarn-3.3.0.cjs
enableStrictSsl: false
10 changes: 5 additions & 5 deletions demos/react-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"@emotion/css": "^11.10.5",
"@emotion/react": "^11.10.8",
"@emotion/styled": "^11.10.5",
"@mui/icons-material": "^5.10.14",
"@mui/material": "^5.10.17",
"@mui/styles": "^5.10.14",
"@mui/icons-material": "5.15.2",
"@mui/material": "5.15.2",
"@mui/styles": "^5.15.7",
"react": "^18.2.0",
"react-app-polyfill": "^3.0.0",
"react-dom": "^18.2.0",
Expand Down Expand Up @@ -60,8 +60,8 @@
"@testing-library/user-event": "^14.4.3",
"@types/jest": "^29.4.0",
"@types/node": "^18.0.0",
"@types/react": "^18.0.25",
"@types/react-dom": "^18.0.9",
"@types/react": "18.2.48",
"@types/react-dom": "^18.2.18",
"@types/react-router-dom": "^5.3.3",
"@typescript-eslint/eslint-plugin": "^5.57.0",
"@typescript-eslint/parser": "^6.16.0",
Expand Down
12 changes: 12 additions & 0 deletions demos/react-demo/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,18 @@ import reportWebVitals from './reportWebVitals';
import './index.css';
import '@brightlayer-ui/icons/BrightlayerUIIcons.css';

// TODO: Remove this after the issues with @types/react goes away
// https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/68444
/* eslint-disable */
declare global {
namespace React {
interface DOMAttributes<T> {
placeholder?: string | undefined;
}
}
}
/* eslint-enable */

const container = document.getElementById('root');
if (!container) throw new Error('Root Element was not found in the DOM');

Expand Down
Loading

0 comments on commit bbea9ec

Please sign in to comment.