Skip to content

chore: re-enable lint rule #31459

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

Merged
layershifter merged 1 commit into from
May 27, 2024
Merged

chore: re-enable lint rule #31459

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
9 changes: 4 additions & 5 deletions apps/react-18-tests-v9/src/Overflow.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import * as React from 'react';
Comment thread
layershifter marked this conversation as resolved.
Comment thread
layershifter marked this conversation as resolved.
import {
makeStyles,
shorthands,
Button,
Menu,
MenuTrigger,
Expand All @@ -27,20 +26,20 @@ const useStyles = makeStyles({
display: 'flex',
flexWrap: 'nowrap',
minWidth: 0,
...shorthands.overflow('hidden'),
overflow: 'hidden',
},

resizableArea: {
minWidth: '200px',
maxWidth: '800px',
...shorthands.border('2px', 'solid', tokens.colorBrandBackground),
...shorthands.padding('20px', '10px', '10px', '10px'),
border: `2px solid ${tokens.colorBrandBackground}`,
padding: '20px 10px 10px 10px',
position: 'relative',
resize: 'horizontal',
'::after': {
content: `'Resizable Area'`,
position: 'absolute',
...shorthands.padding('1px', '4px', '1px'),
padding: '1px 4px 1px',
top: '-2px',
left: '-2px',
fontFamily: 'monospace',
Expand Down
7 changes: 7 additions & 0 deletions change/@fluentui-eslint-plugin-7c1dd810-32a7-4f87-9ef7-3d90d20d5931.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "chore: re-enable deprecation/deprecation for files with styles",
"packageName": "@fluentui/eslint-plugin",
"email": "olfedias@microsoft.com",
"dependentChangeType": "patch"
}
7 changes: 0 additions & 7 deletions packages/eslint-plugin/src/configs/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,13 +336,6 @@ const getOverrides = () => [
'import/no-webpack-loader-syntax': 'off', // this is ok in docs
Comment thread
layershifter marked this conversation as resolved.
},
},
{
// Temporary overrides till Griffel migration is finished
files: ['**/*.stories.tsx', '**/*.styles.ts', '**/*.cy.tsx', '**/*.mixins.ts'],
rules: {
'deprecation/deprecation': 'off',
},
},
{
files: [...configHelpers.configFiles],
rules: {
Expand Down
12 changes: 6 additions & 6 deletions packages/react-components/recipes/src/templates/Example.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import { tokens } from '@fluentui/react-theme';
import { makeStyles, shorthands } from '@griffel/react';
import { makeStyles } from '@griffel/react';

export const useExampleStyles = makeStyles({
root: {
...shorthands.border('1px', 'solid', tokens.colorNeutralStroke1),
...shorthands.borderRadius('16px'),
...shorthands.padding('30px'),
...shorthands.margin('6px'),
border: `1px solid ${tokens.colorNeutralStroke1}`,
borderRadius: '16px',
padding: '30px',
margin: '6px',
},
innerContainer: {
display: 'flex',
backgroundColor: 'rgb(250, 250, 250)',
...shorthands.padding('48px', '24px', '48px', '24px'),
padding: '48px 24px 48px 24px',
},
centered: {
justifyContent: 'center',
Expand Down