diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000000..0d1349ca19 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,9 @@ +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode" + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json index 68e80d73e3..8f76279114 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,26 +1,65 @@ { "editor.formatOnSave": true, + "editor.detectIndentation": false, "editor.trimAutoWhitespace": true, "editor.insertSpaces": true, "editor.tabSize": 2, + + "eslint.enable": true, + "eslint.workingDirectories": [{ "mode": "auto" }], // infer working directory based on .eslintrc/package.json location + "files.trimTrailingWhitespace": true, - "json.format.enable": false, - "javascript.preferences.quoteStyle": "single", - "typescript.preferences.quoteStyle": "single", - "[handlebars]": { - "editor.formatOnSave": false - }, "files.associations": { "**/package.json.hbs": "json", "**/*.json.hbs": "jsonc", "**/README.md.hbs": "markdown" }, - "search.exclude": { - "**/node_modules": true, - "**/lib": true - }, "files.exclude": { "**/lib-amd": true, "**/lib-commonjs": true + }, + "files.watcherExclude": { + "**/.git/objects/**": true, + "**/.git/subtree-cache/**": true, + "**/node_modules/**": true, + "**/.hg/store/**": true, + "**/lib": true, + "**/lib-commonjs": true, + "**/lib-amd": true + }, + + "javascript.preferences.quoteStyle": "single", + + "json.format.enable": false, + + "typescript.preferences.quoteStyle": "single", + "typescript.format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": false, + "typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false, + "typescript.tsdk": "./node_modules/typescript/lib", + + "search.exclude": { + "**/node_modules": true, + "**/lib": true, + "**/lib-amd": true, + "**/lib-commonjs": true, + "**/dist": true + }, + "[json]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[jsonc]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[typescriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[javascript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[handlebars]": { + "editor.formatOnSave": false } } diff --git a/apps/fluent-tester/package.json b/apps/fluent-tester/package.json index 5bef5308bd..43e57fa6e5 100644 --- a/apps/fluent-tester/package.json +++ b/apps/fluent-tester/package.json @@ -13,6 +13,7 @@ "just": "fluentui-scripts", "clean": "fluentui-scripts clean", "code-style": "fluentui-scripts code-style", + "depcheck": "fluentui-scripts depcheck", "lint": "fluentui-scripts eslint", "start": "fluentui-scripts metro --server", "test": "fluentui-scripts jest", @@ -21,20 +22,11 @@ "dependencies": { "@fluentui/react-native": ">=0.15.85 <1.0.0", "@fluentui-react-native/stack": ">=0.2.6 <1.0.0", - "@fluentui-react-native/button": ">=0.10.7 <1.0.0", - "@fluentui-react-native/separator": ">=0.4.6 <1.0.0", - "@fluentui-react-native/checkbox": ">=0.5.1 <1.0.0", - "@fluentui-react-native/text": ">=0.6.6 <1.0.0", "@fluentui-react-native/interactive-hooks": ">=0.5.0 <1.0.0", - "@fluentui-react-native/pressable": ">=0.3.83 <1.0.0", - "@fluentui-react-native/focus-trap-zone": ">=0.4.7 <1.0.0", - "@fluentui-react-native/link": ">=0.8.8 <1.0.0", - "@fluentui-react-native/radio-group": ">=0.4.4 <1.0.0", - "@fluentui-react-native/persona-coin": ">=0.3.82 <1.0.0", - "@fluentui-react-native/persona": ">=0.5.79 <1.0.0", - "@fluentui-react-native/contextual-menu": ">=0.3.7 <1.0.0", "@uifabricshared/theming-react-native": ">=0.7.74 <1.0.0", + "@uifabricshared/theme-registry": ">=0.3.68 <1.0.0", "@uifabricshared/themed-stylesheet": ">=0.3.67 <1.0.0", + "@uifabricshared/theming-ramp": ">=0.10.1 <1.0.0", "react-native-svg": "^11.0.0" }, "devDependencies": { diff --git a/apps/fluent-tester/src/RNTester/FabricTester.tsx b/apps/fluent-tester/src/RNTester/FabricTester.tsx index a47072acfb..951669800b 100644 --- a/apps/fluent-tester/src/RNTester/FabricTester.tsx +++ b/apps/fluent-tester/src/RNTester/FabricTester.tsx @@ -1,5 +1,4 @@ -import { StealthButton } from '@fluentui-react-native/button'; -import { Separator } from '@fluentui-react-native/separator'; +import { StealthButton, Separator } from '@fluentui/react-native'; import { useTheme } from '@uifabricshared/theming-react-native'; import * as React from 'react'; import { Picker, ScrollView, View, Text } from 'react-native'; @@ -106,12 +105,11 @@ const Header: React.FunctionComponent<{}> = () => { } export const FabricTester: React.FunctionComponent = (props: IFabricTesterProps) => { - // sort tests alphabetically by name const sortedTestComponents = props.enabledTests.sort((a, b) => a.name.localeCompare(b.name)); const { initialTest } = props; - const initialSelectedTestIndex = sortedTestComponents.findIndex(description => { + const initialSelectedTestIndex = sortedTestComponents.findIndex((description) => { return description.name === initialTest; }); @@ -122,8 +120,8 @@ export const FabricTester: React.FunctionComponent = (props: const TestListSeparator = Separator.customize({ tokens: { color: useTheme().colors.inputBorder, - separatorWidth: 2 - } + separatorWidth: 2, + }, }); return ( @@ -158,4 +156,4 @@ export const FabricTester: React.FunctionComponent = (props: ); -}; \ No newline at end of file +}; diff --git a/apps/fluent-tester/src/RNTester/TestComponents/Button/ButtonFocusTest.tsx b/apps/fluent-tester/src/RNTester/TestComponents/Button/ButtonFocusTest.tsx index 40df60bb78..565c1ced90 100644 --- a/apps/fluent-tester/src/RNTester/TestComponents/Button/ButtonFocusTest.tsx +++ b/apps/fluent-tester/src/RNTester/TestComponents/Button/ButtonFocusTest.tsx @@ -1,4 +1,4 @@ -import { Button } from '@fluentui-react-native/button'; +import { Button } from '@fluentui/react-native'; import { IFocusable } from '@fluentui-react-native/interactive-hooks'; import { Stack } from '@fluentui-react-native/stack'; import * as React from 'react'; @@ -7,7 +7,7 @@ import { stackStyle } from '../Common/styles'; export const ButtonFocusTest: React.FunctionComponent<{}> = () => { const [state, setState] = React.useState({ - focused: false + focused: false, }); const buttonRef = React.useRef(null); @@ -17,7 +17,6 @@ export const ButtonFocusTest: React.FunctionComponent<{}> = () => { const node = findNodeHandle(buttonRef.current); console.log(node); buttonRef.current.focus(); - } }, [state, setState]); @@ -27,4 +26,4 @@ export const ButtonFocusTest: React.FunctionComponent<{}> = () => {