Skip to content

Enforce Path Imports for MUI Icons #1393

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.

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

Merged
merged 7 commits into from
Feb 10, 2025
Merged
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
2 changes: 1 addition & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"login": "saulshanabrook",
"name": "Saul Shanabrook",
"avatar_url": "https://avatars1.githubusercontent.com/u/1186124?v=4",
"profile": "https://www.saulshanabrook.com/",
"profile": "https://saul.shanabrook.com/",
"contributions": [
"code",
"projectManagement",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ jobs:

- name: Upload Playwright Test report
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: jupyterlab_git-playwright-tests
path: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}

- name: Upload Distributions
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: jupyterlab_git-releaser-dist-${{ github.run_number }}
path: .jupyter_releaser_checkout/dist
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ The Jupyter Git extension is part of [Project Jupyter](http://jupyter.org/) and
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/neelamgehlot"><img src="https://avatars2.githubusercontent.com/u/15882916?v=4?s=100" width="100px;" alt="Neelam Gehlot"/><br /><sub><b>Neelam Gehlot</b></sub></a><br /><a href="https://github.com/jupyterlab/jupyterlab-git/commits?author=neelamgehlot" title="Code">💻</a> <a href="https://github.com/jupyterlab/jupyterlab-git/pulls?q=is%3Apr+reviewed-by%3Aneelamgehlot" title="Reviewed Pull Requests">👀</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://noahstapp.com/"><img src="https://avatars0.githubusercontent.com/u/30483654?v=4?s=100" width="100px;" alt="Noah Stapp"/><br /><sub><b>Noah Stapp</b></sub></a><br /><a href="https://github.com/jupyterlab/jupyterlab-git/commits?author=NoahStapp" title="Code">💻</a> <a href="https://github.com/jupyterlab/jupyterlab-git/pulls?q=is%3Apr+reviewed-by%3ANoahStapp" title="Reviewed Pull Requests">👀</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.saulshanabrook.com/"><img src="https://avatars1.githubusercontent.com/u/1186124?v=4?s=100" width="100px;" alt="Saul Shanabrook"/><br /><sub><b>Saul Shanabrook</b></sub></a><br /><a href="https://github.com/jupyterlab/jupyterlab-git/commits?author=saulshanabrook" title="Code">💻</a> <a href="#projectManagement-saulshanabrook" title="Project Management">📆</a> <a href="https://github.com/jupyterlab/jupyterlab-git/pulls?q=is%3Apr+reviewed-by%3Asaulshanabrook" title="Reviewed Pull Requests">👀</a> <a href="#infra-saulshanabrook" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://saul.shanabrook.com/"><img src="https://avatars1.githubusercontent.com/u/1186124?v=4?s=100" width="100px;" alt="Saul Shanabrook"/><br /><sub><b>Saul Shanabrook</b></sub></a><br /><a href="https://github.com/jupyterlab/jupyterlab-git/commits?author=saulshanabrook" title="Code">💻</a> <a href="#projectManagement-saulshanabrook" title="Project Management">📆</a> <a href="https://github.com/jupyterlab/jupyterlab-git/pulls?q=is%3Apr+reviewed-by%3Asaulshanabrook" title="Reviewed Pull Requests">👀</a> <a href="#infra-saulshanabrook" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/shawnesquivel"><img src="https://avatars.githubusercontent.com/u/94336773?v=4?s=100" width="100px;" alt="Shawn Esquivel"/><br /><sub><b>Shawn Esquivel</b></sub></a><br /><a href="https://github.com/jupyterlab/jupyterlab-git/commits?author=shawnesquivel" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://sheezaaziz.com"><img src="https://avatars.githubusercontent.com/u/47278108?v=4?s=100" width="100px;" alt="Sheeza Aziz"/><br /><sub><b>Sheeza Aziz</b></sub></a><br /><a href="https://github.com/jupyterlab/jupyterlab-git/commits?author=sheezaaziz" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://sinakhalili.com"><img src="https://avatars.githubusercontent.com/u/20732540?v=4?s=100" width="100px;" alt="Sina Khalili"/><br /><sub><b>Sina Khalili</b></sub></a><br /><a href="https://github.com/jupyterlab/jupyterlab-git/commits?author=SinaKhalili" title="Code">💻</a></td>
Expand Down
3 changes: 1 addition & 2 deletions jupyterlab_git/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""Initialize the backend server extension
"""
"""Initialize the backend server extension"""

from traitlets import CFloat, List, Dict, Unicode, default
from traitlets.config import Configurable
Expand Down
28 changes: 24 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
"@babel/preset-env": "^7.0.0",
"@jupyterlab/builder": "^4.0.0",
"@jupyterlab/testutils": "^4.0.0",
"@stylistic/eslint-plugin": "^3.0.1",
"@testing-library/jest-dom": "^6.1.4",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.5.1",
Expand All @@ -114,11 +115,11 @@
"@types/react-virtualized-auto-sizer": "^1.0.0",
"@types/react-window": "^1.8.2",
"@types/resize-observer-browser": "^0.1.7",
"@typescript-eslint/eslint-plugin": "^6.1.0",
"@typescript-eslint/parser": "^6.1.0",
"@typescript-eslint/eslint-plugin": "^8.0.0",
"@typescript-eslint/parser": "^8.0.0",
"all-contributors-cli": "^6.14.0",
"css-loader": "^6.7.1",
"eslint": "^8.36.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-react": "^7.33.0",
Expand Down Expand Up @@ -210,6 +211,7 @@
"sourceType": "module"
},
"plugins": [
"@stylistic",
"@typescript-eslint"
],
"rules": {
Expand All @@ -235,7 +237,7 @@
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-namespace": "off",
"@typescript-eslint/no-use-before-define": "off",
"@typescript-eslint/quotes": [
"@stylistic/quotes": [
"error",
"single",
{
Expand All @@ -248,6 +250,24 @@
"all"
],
"eqeqeq": "error",
"no-restricted-imports": [
"error",
{
"paths": [
{
"name": "@mui/icons-material",
"message":
"Please import icons using path imports, e.g. import AddIcon from '@mui/icons-material/Add'"
}
],
"patterns": [
{
"group": ["@mui/*/*/*"],
"message": "3rd level imports in mui are considered private"
}
]
}
],
"prefer-arrow-callback": "error"
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/GitPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { TranslationBundle } from '@jupyterlab/translation';
import { CommandRegistry } from '@lumino/commands';
import { JSONObject } from '@lumino/coreutils';
import { Signal } from '@lumino/signaling';
import { WarningRounded as WarningRoundedIcon } from '@mui/icons-material';
import WarningRoundedIcon from '@mui/icons-material/WarningRounded';
import Tab from '@mui/material/Tab';
import Tabs from '@mui/material/Tabs';
import * as React from 'react';
Expand Down
2 changes: 1 addition & 1 deletion src/components/StatusWidget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ReactWidget, UseSignal } from '@jupyterlab/apputils';
import { ISettingRegistry } from '@jupyterlab/settingregistry';
import { IStatusBar } from '@jupyterlab/statusbar';
import { TranslationBundle } from '@jupyterlab/translation';
import { Badge } from '@mui/material';
import Badge from '@mui/material/Badge';
import React from 'react';
import { classes } from 'typestyle';
import { Operation, showGitOperationDialog } from '../commandsAndMenu';
Expand Down
1 change: 1 addition & 0 deletions src/components/SubmoduleMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export interface ISubmoduleMenuProps {
/**
* Interface describing component state.
*/
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
export interface ISubmoduleMenuState {}

/**
Expand Down
4 changes: 3 additions & 1 deletion src/components/Toolbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ import {
refreshIcon
} from '@jupyterlab/ui-components';
import { CommandRegistry } from '@lumino/commands';
import { Badge, Tab, Tabs } from '@mui/material';
import Badge from '@mui/material/Badge';
import Tab from '@mui/material/Tab';
import Tabs from '@mui/material/Tabs';
import * as React from 'react';
import { classes } from 'typestyle';
import { showError } from '../notifications';
Expand Down
2 changes: 1 addition & 1 deletion src/components/WarningBox.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CardContent } from '@mui/material';
import CardContent from '@mui/material/CardContent';
import Card from '@mui/material/Card';
import CardHeader from '@mui/material/CardHeader';
import * as React from 'react';
Expand Down
Loading
Loading