diff --git a/apps/fluent-tester/package.json b/apps/fluent-tester/package.json index 2f75270529..0ef9a31f6c 100644 --- a/apps/fluent-tester/package.json +++ b/apps/fluent-tester/package.json @@ -10,8 +10,6 @@ "url": "https://github.com/microsoft/fluentui-react-native.git", "directory": "apps/fluent-tester" }, - "main": "lib-commonjs/index.js", - "module": "lib/index.js", "types": "lib/index.d.ts", "exports": { ".": { @@ -24,7 +22,6 @@ "scripts": { "android": "rnx-cli run --platform android", "build": "fluentui-scripts build", - "build-cjs": "tsgo --outDir lib-commonjs", "build-core": "tsgo --outDir lib --module esnext --moduleResolution bundler", "bundle": "rnx-cli bundle --dev false", "bundle:android": "rnx-cli bundle --dev false --platform android", @@ -54,23 +51,10 @@ "@babel/core": "catalog:", "@babel/runtime": "catalog:", "@fluentui-react-native/babel-config": "workspace:*", - "@fluentui-react-native/callout": "workspace:*", "@fluentui-react-native/eslint-config-rules": "workspace:*", - "@fluentui-react-native/experimental-appearance-additions": "workspace:*", - "@fluentui-react-native/experimental-avatar": "workspace:*", - "@fluentui-react-native/experimental-checkbox": "workspace:*", - "@fluentui-react-native/experimental-expander": "workspace:*", - "@fluentui-react-native/experimental-native-date-picker": "workspace:*", - "@fluentui-react-native/experimental-native-font-metrics": "workspace:*", - "@fluentui-react-native/experimental-shimmer": "workspace:*", - "@fluentui-react-native/focus-zone": "workspace:*", "@fluentui-react-native/kit-config": "workspace:*", - "@fluentui-react-native/menu-button": "workspace:*", - "@fluentui-react-native/radio-group": "workspace:*", "@fluentui-react-native/scripts": "workspace:*", "@fluentui-react-native/tester-core": "workspace:*", - "@fluentui-react-native/tooltip": "workspace:*", - "@fluentui-react-native/vibrancy-view": "workspace:*", "@react-native-community/cli": "^13.6.4", "@react-native-community/cli-platform-android": "^13.6.4", "@react-native-community/cli-platform-ios": "^13.6.4", @@ -106,9 +90,7 @@ }, "furn": { "depcheck": { - "ignoreMatches": [ - "@fluentui-react-native/experimental-expander" - ] + "ignoreMatches": [] } }, "rnx-kit": { diff --git a/apps/fluent-tester/tsconfig.json b/apps/fluent-tester/tsconfig.json index b59c5d96d6..7c69f556dd 100644 --- a/apps/fluent-tester/tsconfig.json +++ b/apps/fluent-tester/tsconfig.json @@ -2,6 +2,8 @@ "extends": "@fluentui-react-native/scripts/configs/tsconfig.json", "compilerOptions": { "outDir": "lib", + "module": "esnext", + "moduleResolution": "bundler", "allowSyntheticDefaultImports": true, "types": ["@types/jasmine", "@wdio/globals/types", "@wdio/jasmine-framework", "node"] }, diff --git a/apps/tester-core/babel.config.js b/apps/tester-core/babel.config.cjs similarity index 100% rename from apps/tester-core/babel.config.js rename to apps/tester-core/babel.config.cjs diff --git a/apps/tester-core/eslint.config.js b/apps/tester-core/eslint.config.cjs similarity index 100% rename from apps/tester-core/eslint.config.js rename to apps/tester-core/eslint.config.cjs diff --git a/apps/tester-core/package.json b/apps/tester-core/package.json index 300f21266a..18b8075918 100644 --- a/apps/tester-core/package.json +++ b/apps/tester-core/package.json @@ -11,21 +11,18 @@ "url": "https://github.com/microsoft/fluentui-react-native.git", "directory": "apps/fluent-tester-core" }, - "main": "lib-commonjs/index.js", - "module": "lib/index.js", + "type": "module", "types": "lib/index.d.ts", "exports": { ".": { "types": "./lib/index.d.ts", "import": "./lib/index.js", - "require": "./lib-commonjs/index.js", "default": "./src/index.ts" } }, "scripts": { "build": "fluentui-scripts build", - "build-cjs": "tsgo --outDir lib-commonjs", - "build-core": "tsgo --outDir lib --module esnext --moduleResolution bundler", + "build-core": "tsgo --outDir lib", "clean": "fluentui-scripts clean", "depcheck": "fluentui-scripts depcheck", "format": "fluentui-scripts format", @@ -33,55 +30,7 @@ "lint-package": "fluentui-scripts lint-package" }, "dependencies": { - "@fluentui-react-native/adapters": "workspace:*", - "@fluentui-react-native/android-theme": "workspace:*", - "@fluentui-react-native/apple-theme": "workspace:*", - "@fluentui-react-native/avatar": "workspace:*", - "@fluentui-react-native/badge": "workspace:*", - "@fluentui-react-native/button": "workspace:*", - "@fluentui-react-native/callout": "workspace:*", - "@fluentui-react-native/chip": "workspace:*", - "@fluentui-react-native/default-theme": "workspace:*", - "@fluentui-react-native/divider": "workspace:*", - "@fluentui-react-native/drawer": "workspace:*", - "@fluentui-react-native/dropdown": "workspace:*", "@fluentui-react-native/e2e-testing": "workspace:*", - "@fluentui-react-native/experimental-activity-indicator": "workspace:*", - "@fluentui-react-native/experimental-appearance-additions": "workspace:*", - "@fluentui-react-native/experimental-avatar": "workspace:*", - "@fluentui-react-native/experimental-checkbox": "workspace:*", - "@fluentui-react-native/experimental-expander": "workspace:*", - "@fluentui-react-native/experimental-menu-button": "workspace:*", - "@fluentui-react-native/experimental-native-date-picker": "workspace:*", - "@fluentui-react-native/experimental-native-font-metrics": "workspace:*", - "@fluentui-react-native/experimental-shadow": "workspace:*", - "@fluentui-react-native/experimental-shimmer": "workspace:*", - "@fluentui-react-native/focus-zone": "workspace:*", - "@fluentui-react-native/framework": "workspace:*", - "@fluentui-react-native/framework-base": "workspace:*", - "@fluentui-react-native/icon": "workspace:*", - "@fluentui-react-native/input": "workspace:*", - "@fluentui-react-native/interactive-hooks": "workspace:*", - "@fluentui-react-native/menu": "workspace:*", - "@fluentui-react-native/menu-button": "workspace:*", - "@fluentui-react-native/notification": "workspace:*", - "@fluentui-react-native/overflow": "workspace:*", - "@fluentui-react-native/radio-group": "workspace:*", - "@fluentui-react-native/separator": "workspace:*", - "@fluentui-react-native/spinner": "workspace:*", - "@fluentui-react-native/stack": "workspace:*", - "@fluentui-react-native/switch": "workspace:*", - "@fluentui-react-native/tablist": "workspace:*", - "@fluentui-react-native/text": "workspace:*", - "@fluentui-react-native/theme": "workspace:*", - "@fluentui-react-native/theme-tokens": "workspace:*", - "@fluentui-react-native/theme-types": "workspace:*", - "@fluentui-react-native/themed-stylesheet": "workspace:*", - "@fluentui-react-native/theming-utils": "workspace:*", - "@fluentui-react-native/tooltip": "workspace:*", - "@fluentui-react-native/vibrancy-view": "workspace:*", - "@fluentui-react-native/win32-theme": "workspace:*", - "@fluentui/react-native": "workspace:*", "@fluentui/react-native-icons": "^2.0.316", "@fortawesome/fontawesome-svg-core": "^6.2.0", "@fortawesome/free-solid-svg-icons": "^6.2.0", @@ -89,7 +38,8 @@ "@react-native-community/slider": "^4.5.7", "@react-native-menu/menu": "^0.7.3", "@react-native-picker/picker": "^2.7.0", - "@types/node": "catalog:" + "@types/node": "catalog:", + "fluentui-react-native": "workspace:*" }, "devDependencies": { "@babel/core": "catalog:", @@ -131,20 +81,7 @@ "webdriverio": "catalog:" }, "peerDependencies": { - "@fluentui-react-native/callout": "workspace:*", - "@fluentui-react-native/experimental-appearance-additions": "workspace:*", - "@fluentui-react-native/experimental-avatar": "workspace:*", - "@fluentui-react-native/experimental-checkbox": "workspace:*", - "@fluentui-react-native/experimental-expander": "workspace:*", - "@fluentui-react-native/experimental-native-date-picker": "workspace:*", - "@fluentui-react-native/experimental-native-font-metrics": "workspace:*", - "@fluentui-react-native/experimental-shimmer": "workspace:*", - "@fluentui-react-native/focus-zone": "workspace:*", - "@fluentui-react-native/menu-button": "workspace:*", - "@fluentui-react-native/radio-group": "workspace:*", "@fluentui-react-native/tester-core": "workspace:*", - "@fluentui-react-native/tooltip": "workspace:*", - "@fluentui-react-native/vibrancy-view": "workspace:*", "@office-iss/react-native-win32": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0", "@types/react": "~18.2.0 || ~19.0.0 || ~19.1.4", "react": "18.2.0 || 19.0.0 || 19.1.4", @@ -154,42 +91,6 @@ "react-native-windows": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0" }, "peerDependenciesMeta": { - "@fluentui-react-native/callout": { - "optional": true - }, - "@fluentui-react-native/experimental-appearance-additions": { - "optional": true - }, - "@fluentui-react-native/experimental-avatar": { - "optional": true - }, - "@fluentui-react-native/experimental-checkbox": { - "optional": true - }, - "@fluentui-react-native/experimental-expander": { - "optional": true - }, - "@fluentui-react-native/experimental-native-date-picker": { - "optional": true - }, - "@fluentui-react-native/experimental-native-font-metrics": { - "optional": true - }, - "@fluentui-react-native/experimental-shimmer": { - "optional": true - }, - "@fluentui-react-native/menu-button": { - "optional": true - }, - "@fluentui-react-native/radio-group": { - "optional": true - }, - "@fluentui-react-native/tooltip": { - "optional": true - }, - "@fluentui-react-native/vibrancy-view": { - "optional": true - }, "@office-iss/react-native-win32": { "optional": true }, @@ -208,9 +109,7 @@ }, "furn": { "depcheck": { - "ignoreMatches": [ - "@fluentui-react-native/experimental-expander" - ] + "ignoreMatches": [] } }, "rnx-kit": { diff --git a/apps/tester-core/src/FluentTester.tsx b/apps/tester-core/src/FluentTester.tsx index 960e0f9d28..1e038a37e0 100644 --- a/apps/tester-core/src/FluentTester.tsx +++ b/apps/tester-core/src/FluentTester.tsx @@ -1,13 +1,14 @@ import * as React from 'react'; import { ScrollView, View, Text as RNText, Platform, SafeAreaView, BackHandler, I18nManager } from 'react-native'; -import { Separator, TextV1 as Text } from '@fluentui/react-native'; -import { ButtonV1 as Button } from '@fluentui-react-native/button'; +import { Separator } from 'fluentui-react-native/separator'; +import { TextV1 as Text } from 'fluentui-react-native/text'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; import { BASE_TESTPAGE, TESTPAGE_BUTTONS_SCROLLVIEWER, TESTPAGE_CONTENT_SCROLLVIEWER } from '@fluentui-react-native/e2e-testing'; import { ROOT_VIEW } from '@fluentui-react-native/e2e-testing'; -import type { Theme } from '@fluentui-react-native/framework'; -import { useTheme } from '@fluentui-react-native/theme-types'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import type { Theme } from 'fluentui-react-native/framework'; +import { useTheme } from 'fluentui-react-native/theme-types'; +import { themedStyleSheet } from 'fluentui-react-native/themed-stylesheet'; import { fluentTesterStyles, mobileStyles } from './TestComponents/Common/styles'; import { testProps } from './TestComponents/Common/TestProps'; diff --git a/apps/tester-core/src/FluentTesterApp.tsx b/apps/tester-core/src/FluentTesterApp.tsx index 48474bb8e1..5f84c92368 100644 --- a/apps/tester-core/src/FluentTesterApp.tsx +++ b/apps/tester-core/src/FluentTesterApp.tsx @@ -7,8 +7,8 @@ import { Platform } from 'react-native'; -import { useHorizontalSizeClass } from '@fluentui-react-native/experimental-appearance-additions'; -import { ThemeReference, ThemeProvider } from '@fluentui-react-native/theme'; +import { useHorizontalSizeClass } from 'fluentui-react-native/experimental-appearance-additions'; +import { ThemeReference, ThemeProvider } from 'fluentui-react-native/theme'; import type { FluentTesterProps } from './FluentTester'; import { FluentTester } from './FluentTester'; diff --git a/apps/tester-core/src/TestComponents/ActivityIndicator/ActivityIndicatorTest.tsx b/apps/tester-core/src/TestComponents/ActivityIndicator/ActivityIndicatorTest.tsx index c73503bb2a..377363f77e 100644 --- a/apps/tester-core/src/TestComponents/ActivityIndicator/ActivityIndicatorTest.tsx +++ b/apps/tester-core/src/TestComponents/ActivityIndicator/ActivityIndicatorTest.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { View, Switch } from 'react-native'; -import { Text } from '@fluentui/react-native'; +import { Text } from 'fluentui-react-native/text'; import { ACTIVITY_INDICATOR_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import { ActivityIndicator } from '@fluentui-react-native/experimental-activity-indicator'; -import { Stack } from '@fluentui-react-native/stack'; +import { ActivityIndicator } from 'fluentui-react-native/experimental-activity-indicator'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle, commonTestStyles as commonStyles } from '../Common/styles'; import type { TestSection, PlatformStatus } from '../Test'; diff --git a/apps/tester-core/src/TestComponents/Avatar/BasicAvatar.android.tsx b/apps/tester-core/src/TestComponents/Avatar/BasicAvatar.android.tsx index a1c709ad90..b7425c0bc2 100644 --- a/apps/tester-core/src/TestComponents/Avatar/BasicAvatar.android.tsx +++ b/apps/tester-core/src/TestComponents/Avatar/BasicAvatar.android.tsx @@ -2,11 +2,11 @@ import type { FunctionComponent } from 'react'; import React from 'react'; import { View } from 'react-native'; -import { Avatar } from '@fluentui-react-native/avatar'; -import type { PresenceBadgeStatus } from '@fluentui-react-native/badge'; -import { PresenceBadgeStatuses } from '@fluentui-react-native/badge'; -import type { InteractionEvent } from '@fluentui-react-native/interactive-hooks'; -import { Switch } from '@fluentui-react-native/switch'; +import { Avatar } from 'fluentui-react-native/avatar'; +import type { PresenceBadgeStatus } from 'fluentui-react-native/badge'; +import { PresenceBadgeStatuses } from 'fluentui-react-native/badge'; +import type { InteractionEvent } from 'fluentui-react-native/interactive-hooks'; +import { Switch } from 'fluentui-react-native/switch'; import { StyledPicker } from '../Common/StyledPicker'; import { mobileStyles } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Avatar/BasicAvatar.tsx b/apps/tester-core/src/TestComponents/Avatar/BasicAvatar.tsx index 92efc3e4fc..7604b642a4 100644 --- a/apps/tester-core/src/TestComponents/Avatar/BasicAvatar.tsx +++ b/apps/tester-core/src/TestComponents/Avatar/BasicAvatar.tsx @@ -2,11 +2,11 @@ import { useState, useCallback } from 'react'; import type { FunctionComponent } from 'react'; import { View, Text, Platform } from 'react-native'; -import { ToggleButton } from '@fluentui/react-native'; -import type { AvatarSize, AvatarColor, AvatarActive } from '@fluentui-react-native/avatar'; -import { AvatarSizes, AvatarColors, Avatar } from '@fluentui-react-native/avatar'; -import type { PresenceBadgeStatus } from '@fluentui-react-native/badge'; -import { PresenceBadgeStatuses } from '@fluentui-react-native/badge'; +import { ToggleButton } from 'fluentui-react-native/button'; +import type { AvatarSize, AvatarColor, AvatarActive } from 'fluentui-react-native/avatar'; +import { AvatarSizes, AvatarColors, Avatar } from 'fluentui-react-native/avatar'; +import type { PresenceBadgeStatus } from 'fluentui-react-native/badge'; +import { PresenceBadgeStatuses } from 'fluentui-react-native/badge'; import { svgProps } from '../Common/iconExamples'; import { StyledPicker } from '../Common/StyledPicker'; diff --git a/apps/tester-core/src/TestComponents/Avatar/CustomizedAvatar.tsx b/apps/tester-core/src/TestComponents/Avatar/CustomizedAvatar.tsx index e603462291..fd2e1d33bb 100644 --- a/apps/tester-core/src/TestComponents/Avatar/CustomizedAvatar.tsx +++ b/apps/tester-core/src/TestComponents/Avatar/CustomizedAvatar.tsx @@ -1,10 +1,10 @@ import React, { useState, useMemo } from 'react'; import { View, Text, TextInput, Platform, StyleSheet } from 'react-native'; -import { ToggleButton } from '@fluentui/react-native'; -import type { AvatarSize } from '@fluentui-react-native/avatar'; -import { Avatar } from '@fluentui-react-native/avatar'; -import type { FontWeight } from '@fluentui-react-native/theme-types'; +import { ToggleButton } from 'fluentui-react-native/button'; +import type { AvatarSize } from 'fluentui-react-native/avatar'; +import { Avatar } from 'fluentui-react-native/avatar'; +import type { FontWeight } from 'fluentui-react-native/theme-types'; import { svgProps } from '../Common/iconExamples'; import { commonTestStyles as commonStyles } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Avatar/E2EAvatarTest.tsx b/apps/tester-core/src/TestComponents/Avatar/E2EAvatarTest.tsx index ece4426ede..7d8a5d6a4f 100644 --- a/apps/tester-core/src/TestComponents/Avatar/E2EAvatarTest.tsx +++ b/apps/tester-core/src/TestComponents/Avatar/E2EAvatarTest.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { View } from 'react-native'; -import { Avatar } from '@fluentui-react-native/avatar'; +import { Avatar } from 'fluentui-react-native/avatar'; import { AVATAR_ACCESSIBILITY_HINT, AVATAR_ACCESSIBILITY_LABEL, diff --git a/apps/tester-core/src/TestComponents/Avatar/NativeAvatarTest.tsx b/apps/tester-core/src/TestComponents/Avatar/NativeAvatarTest.tsx index cda5337cf9..537e41be57 100644 --- a/apps/tester-core/src/TestComponents/Avatar/NativeAvatarTest.tsx +++ b/apps/tester-core/src/TestComponents/Avatar/NativeAvatarTest.tsx @@ -1,11 +1,11 @@ import * as React from 'react'; import { Switch, View } from 'react-native'; -import { Text } from '@fluentui/react-native'; +import { Text } from 'fluentui-react-native/text'; import { NATIVE_AVATAR_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import type { Size } from '@fluentui-react-native/experimental-avatar/'; -import { NativeAvatar } from '@fluentui-react-native/experimental-avatar/'; -import { Stack } from '@fluentui-react-native/stack'; +import type { Size } from 'fluentui-react-native/experimental-avatar'; +import { NativeAvatar } from 'fluentui-react-native/experimental-avatar'; +import { Stack } from 'fluentui-react-native/stack'; import { testImageSource, rainbowGradientSource } from './testImageSources'; import { commonTestStyles as commonStyles } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Badge/BasicBadgeTest.tsx b/apps/tester-core/src/TestComponents/Badge/BasicBadgeTest.tsx index bd9d677529..b6c2fb8109 100644 --- a/apps/tester-core/src/TestComponents/Badge/BasicBadgeTest.tsx +++ b/apps/tester-core/src/TestComponents/Badge/BasicBadgeTest.tsx @@ -1,7 +1,7 @@ import React, { useState, useCallback, useMemo } from 'react'; import { View, Platform, Image } from 'react-native'; -import { ToggleButton } from '@fluentui/react-native'; +import { ToggleButton } from 'fluentui-react-native/button'; import type { BadgeAppearance, BadgeColor, @@ -10,10 +10,10 @@ import type { BadgeIconPosition, BadgeProps, BadgeTokens, -} from '@fluentui-react-native/badge'; -import { Badge, BadgeAppearances, BadgeColors, BadgeShapes, BadgeSizes } from '@fluentui-react-native/badge'; -import { useFluentTheme } from '@fluentui-react-native/framework'; -import { Text } from '@fluentui-react-native/text'; +} from 'fluentui-react-native/badge'; +import { Badge, BadgeAppearances, BadgeColors, BadgeShapes, BadgeSizes } from 'fluentui-react-native/badge'; +import { useFluentTheme } from 'fluentui-react-native/framework'; +import { Text } from 'fluentui-react-native/text'; import { svgProps, iconProps } from '../Common/iconExamples'; import { StyledPicker } from '../Common/StyledPicker'; diff --git a/apps/tester-core/src/TestComponents/Badge/CounterBadgeTest.android.tsx b/apps/tester-core/src/TestComponents/Badge/CounterBadgeTest.android.tsx index 02a1ee30c2..92bea8d551 100644 --- a/apps/tester-core/src/TestComponents/Badge/CounterBadgeTest.android.tsx +++ b/apps/tester-core/src/TestComponents/Badge/CounterBadgeTest.android.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { View, Text } from 'react-native'; -import { CounterBadge } from '@fluentui-react-native/badge'; +import { CounterBadge } from 'fluentui-react-native/badge'; export const CounterBadgeTest: React.FunctionComponent = () => { return ( diff --git a/apps/tester-core/src/TestComponents/Badge/CounterBadgeTest.tsx b/apps/tester-core/src/TestComponents/Badge/CounterBadgeTest.tsx index a4c01fdca7..e323730b6b 100644 --- a/apps/tester-core/src/TestComponents/Badge/CounterBadgeTest.tsx +++ b/apps/tester-core/src/TestComponents/Badge/CounterBadgeTest.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { View, Platform, Text } from 'react-native'; -import { CounterBadge } from '@fluentui-react-native/badge'; +import { CounterBadge } from 'fluentui-react-native/badge'; import { iconProps } from '../Common/iconExamples'; diff --git a/apps/tester-core/src/TestComponents/Badge/E2EBadgeTest.tsx b/apps/tester-core/src/TestComponents/Badge/E2EBadgeTest.tsx index de75c94737..5d3c91c121 100644 --- a/apps/tester-core/src/TestComponents/Badge/E2EBadgeTest.tsx +++ b/apps/tester-core/src/TestComponents/Badge/E2EBadgeTest.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { View } from 'react-native'; -import { Badge, PresenceBadge } from '@fluentui-react-native/badge'; +import { Badge, PresenceBadge } from 'fluentui-react-native/badge'; import { BADGE_TEST_COMPONENT, BADGE_SECONDARY_TEST_COMPONENT } from '@fluentui-react-native/e2e-testing'; import { testProps } from '../Common/TestProps'; diff --git a/apps/tester-core/src/TestComponents/Badge/PresenceBadgeTest.android.tsx b/apps/tester-core/src/TestComponents/Badge/PresenceBadgeTest.android.tsx index d9c3445808..766ce83665 100644 --- a/apps/tester-core/src/TestComponents/Badge/PresenceBadgeTest.android.tsx +++ b/apps/tester-core/src/TestComponents/Badge/PresenceBadgeTest.android.tsx @@ -1,8 +1,8 @@ import React, { useCallback, useState } from 'react'; import { View, StyleSheet, Text } from 'react-native'; -import { ToggleButton } from '@fluentui/react-native'; -import { PresenceBadge } from '@fluentui-react-native/badge'; +import { ToggleButton } from 'fluentui-react-native/button'; +import { PresenceBadge } from 'fluentui-react-native/badge'; export const PresenceBadgeTest: React.FunctionComponent = () => { const [outOfOffice, setOutOfOffice] = useState(false); diff --git a/apps/tester-core/src/TestComponents/Badge/PresenceBadgeTest.tsx b/apps/tester-core/src/TestComponents/Badge/PresenceBadgeTest.tsx index cc0ad103cd..a7a3d2caac 100644 --- a/apps/tester-core/src/TestComponents/Badge/PresenceBadgeTest.tsx +++ b/apps/tester-core/src/TestComponents/Badge/PresenceBadgeTest.tsx @@ -1,9 +1,9 @@ import React, { useState, useCallback } from 'react'; import { View, Platform, Text } from 'react-native'; -import { ToggleButton } from '@fluentui/react-native'; -import type { BadgeSize } from '@fluentui-react-native/badge'; -import { PresenceBadge, BadgeSizes } from '@fluentui-react-native/badge'; +import { ToggleButton } from 'fluentui-react-native/button'; +import type { BadgeSize } from 'fluentui-react-native/badge'; +import { PresenceBadge, BadgeSizes } from 'fluentui-react-native/badge'; import { StyledPicker } from '../Common/StyledPicker'; diff --git a/apps/tester-core/src/TestComponents/Button/ButtonHOCTestSection.tsx b/apps/tester-core/src/TestComponents/Button/ButtonHOCTestSection.tsx index cb2d0f1b34..c18e3851a1 100644 --- a/apps/tester-core/src/TestComponents/Button/ButtonHOCTestSection.tsx +++ b/apps/tester-core/src/TestComponents/Button/ButtonHOCTestSection.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { Platform, View } from 'react-native'; -import { ButtonV1 as Button } from '@fluentui/react-native'; -import type { InteractionEvent } from '@fluentui-react-native/interactive-hooks'; -import { isGestureResponderEvent } from '@fluentui-react-native/interactive-hooks'; -import { TextV1 as Text } from '@fluentui-react-native/text'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import type { InteractionEvent } from 'fluentui-react-native/interactive-hooks'; +import { isGestureResponderEvent } from 'fluentui-react-native/interactive-hooks'; +import { TextV1 as Text } from 'fluentui-react-native/text'; import { svgProps } from '../Common/iconExamples'; import { commonTestStyles, stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Button/ButtonIconTestSection.android.tsx b/apps/tester-core/src/TestComponents/Button/ButtonIconTestSection.android.tsx index f10d66e114..61baf8954c 100644 --- a/apps/tester-core/src/TestComponents/Button/ButtonIconTestSection.android.tsx +++ b/apps/tester-core/src/TestComponents/Button/ButtonIconTestSection.android.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { View } from 'react-native'; -import { ButtonV1 as Button } from '@fluentui/react-native'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; import { testImage, svgProps } from '../Common/iconExamples'; import { commonTestStyles, testContentRootViewStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Button/ButtonIconTestSection.tsx b/apps/tester-core/src/TestComponents/Button/ButtonIconTestSection.tsx index 1c5a750955..17ccc549dd 100644 --- a/apps/tester-core/src/TestComponents/Button/ButtonIconTestSection.tsx +++ b/apps/tester-core/src/TestComponents/Button/ButtonIconTestSection.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { Platform, View, StyleSheet } from 'react-native'; -import { ButtonV1 as Button } from '@fluentui/react-native'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; import { SvgXml } from 'react-native-svg'; import { testImage, svgProps, iconProps } from '../Common/iconExamples'; diff --git a/apps/tester-core/src/TestComponents/Button/ButtonShapeTestSection.tsx b/apps/tester-core/src/TestComponents/Button/ButtonShapeTestSection.tsx index c5bd51c108..58dae121af 100644 --- a/apps/tester-core/src/TestComponents/Button/ButtonShapeTestSection.tsx +++ b/apps/tester-core/src/TestComponents/Button/ButtonShapeTestSection.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { View } from 'react-native'; -import { ButtonV1 as Button, CompoundButton } from '@fluentui/react-native'; +import { ButtonV1 as Button, CompoundButton } from 'fluentui-react-native/button'; import { commonTestStyles, testContentRootViewStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Button/ButtonSizeTestSection.tsx b/apps/tester-core/src/TestComponents/Button/ButtonSizeTestSection.tsx index 5332d1683b..6252abe3da 100644 --- a/apps/tester-core/src/TestComponents/Button/ButtonSizeTestSection.tsx +++ b/apps/tester-core/src/TestComponents/Button/ButtonSizeTestSection.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { Platform, View } from 'react-native'; -import { ButtonV1 as Button, CompoundButton, FAB } from '@fluentui/react-native'; +import { ButtonV1 as Button, CompoundButton, FAB } from 'fluentui-react-native/button'; import { iconProps } from '../Common/iconExamples'; import { commonTestStyles, testContentRootViewStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Button/ButtonVariantTestSection.mobile.tsx b/apps/tester-core/src/TestComponents/Button/ButtonVariantTestSection.mobile.tsx index 2f18b7b03c..78bdcd541f 100644 --- a/apps/tester-core/src/TestComponents/Button/ButtonVariantTestSection.mobile.tsx +++ b/apps/tester-core/src/TestComponents/Button/ButtonVariantTestSection.mobile.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { View } from 'react-native'; -import { ButtonV1 as Button, FAB } from '@fluentui-react-native/button'; +import { ButtonV1 as Button, FAB } from 'fluentui-react-native/button'; import { iconProps } from '../Common/iconExamples'; import { commonTestStyles, testContentRootViewStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Button/ButtonVariantTestSection.tsx b/apps/tester-core/src/TestComponents/Button/ButtonVariantTestSection.tsx index 301c22489a..7f76821ab0 100644 --- a/apps/tester-core/src/TestComponents/Button/ButtonVariantTestSection.tsx +++ b/apps/tester-core/src/TestComponents/Button/ButtonVariantTestSection.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { View } from 'react-native'; -import { ButtonV1 as Button, CompoundButton, FAB } from '@fluentui-react-native/button'; +import { ButtonV1 as Button, CompoundButton, FAB } from 'fluentui-react-native/button'; import { iconProps } from '../Common/iconExamples'; import { commonTestStyles, testContentRootViewStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Button/E2EButtonTest.tsx b/apps/tester-core/src/TestComponents/Button/E2EButtonTest.tsx index 51ce77242f..3dcecdd3d7 100644 --- a/apps/tester-core/src/TestComponents/Button/E2EButtonTest.tsx +++ b/apps/tester-core/src/TestComponents/Button/E2EButtonTest.tsx @@ -1,8 +1,9 @@ import * as React from 'react'; import { View } from 'react-native'; -import type { NativeKeyEvent, HandledKeyEvent } from '@fluentui-react-native/adapters'; +import type { NativeKeyEvent, HandledKeyEvent } from 'fluentui-react-native/adapters'; -import { ButtonV1 as Button, Text } from '@fluentui/react-native'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { Text } from 'fluentui-react-native/text'; import { BUTTON_TEST_COMPONENT, BUTTON_ON_PRESS, @@ -15,7 +16,7 @@ import { BUTTON_FOCUSABLE_TEST_COMPONENT, BUTTON_FOCUSABLE_TEST_COMPONENT_LABEL, } from '@fluentui-react-native/e2e-testing'; -import { Stack } from '@fluentui-react-native/stack'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle } from '../Common/styles'; import { testProps } from '../Common/TestProps'; diff --git a/apps/tester-core/src/TestComponents/Button/ToggleButtonTestSection.tsx b/apps/tester-core/src/TestComponents/Button/ToggleButtonTestSection.tsx index e88d4911df..213f984f2b 100644 --- a/apps/tester-core/src/TestComponents/Button/ToggleButtonTestSection.tsx +++ b/apps/tester-core/src/TestComponents/Button/ToggleButtonTestSection.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { StyleSheet, View } from 'react-native'; -import { ToggleButton } from '@fluentui/react-native'; -import { Checkbox } from '@fluentui/react-native'; +import { ToggleButton } from 'fluentui-react-native/button'; +import { Checkbox } from 'fluentui-react-native/checkbox'; import { commonTestStyles, testContentRootViewStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Button/deprecated/ButtonFocusTest.tsx b/apps/tester-core/src/TestComponents/Button/deprecated/ButtonFocusTest.tsx index 9b60755b27..3585971c5d 100644 --- a/apps/tester-core/src/TestComponents/Button/deprecated/ButtonFocusTest.tsx +++ b/apps/tester-core/src/TestComponents/Button/deprecated/ButtonFocusTest.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; -import { Button } from '@fluentui/react-native'; -import type { IFocusable } from '@fluentui-react-native/interactive-hooks'; -import { Stack } from '@fluentui-react-native/stack'; +import { Button } from 'fluentui-react-native/button'; +import type { IFocusable } from 'fluentui-react-native/interactive-hooks'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle } from '../../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Button/deprecated/ButtonIconTest.tsx b/apps/tester-core/src/TestComponents/Button/deprecated/ButtonIconTest.tsx index 6325df6306..8d4defd3f2 100644 --- a/apps/tester-core/src/TestComponents/Button/deprecated/ButtonIconTest.tsx +++ b/apps/tester-core/src/TestComponents/Button/deprecated/ButtonIconTest.tsx @@ -1,8 +1,9 @@ import * as React from 'react'; import { Platform, View } from 'react-native'; -import { Button, Text } from '@fluentui/react-native'; -import { Stack } from '@fluentui-react-native/stack'; +import { Button } from 'fluentui-react-native/button'; +import { Text } from 'fluentui-react-native/text'; +import { Stack } from 'fluentui-react-native/stack'; import { testImage, svgProps } from '../../Common/iconExamples'; import { stackStyle } from '../../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Button/deprecated/E2EButtonTest.tsx b/apps/tester-core/src/TestComponents/Button/deprecated/E2EButtonTest.tsx index 8a2998bdc0..311428b2e4 100644 --- a/apps/tester-core/src/TestComponents/Button/deprecated/E2EButtonTest.tsx +++ b/apps/tester-core/src/TestComponents/Button/deprecated/E2EButtonTest.tsx @@ -1,7 +1,8 @@ import * as React from 'react'; import { View } from 'react-native'; -import { Button, Text } from '@fluentui/react-native'; +import { Button } from 'fluentui-react-native/button'; +import { Text } from 'fluentui-react-native/text'; import { BUTTON_TEST_COMPONENT_DEPRECATED, BUTTON_ON_PRESS_DEPRECATED, @@ -9,7 +10,7 @@ import { BUTTON_ACCESSIBILITY_LABEL_DEPRECATED, BUTTON_TEST_COMPONENT_LABEL_DEPRECATED, } from '@fluentui-react-native/e2e-testing'; -import { Stack } from '@fluentui-react-native/stack'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle } from '../../Common/styles'; import { testProps } from '../../Common/TestProps'; diff --git a/apps/tester-core/src/TestComponents/Callout/CalloutE2ETest.tsx b/apps/tester-core/src/TestComponents/Callout/CalloutE2ETest.tsx index 350754be7c..8e08a9009d 100644 --- a/apps/tester-core/src/TestComponents/Callout/CalloutE2ETest.tsx +++ b/apps/tester-core/src/TestComponents/Callout/CalloutE2ETest.tsx @@ -2,10 +2,12 @@ import * as React from 'react'; import type { KeyboardMetrics } from 'react-native'; import { View } from 'react-native'; -import type { DismissBehaviors } from '@fluentui/react-native'; -import { ButtonV1 as Button, Callout, Text } from '@fluentui/react-native'; +import type { DismissBehaviors } from 'fluentui-react-native/callout'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { Callout } from 'fluentui-react-native/callout'; +import { Text } from 'fluentui-react-native/text'; import { BUTTON_TO_OPEN_CALLOUT, CALLOUT_ACCESSIBILITY_LABEL, CALLOUT_TEST_COMPONENT } from '@fluentui-react-native/e2e-testing'; -import { Switch } from '@fluentui-react-native/switch'; +import { Switch } from 'fluentui-react-native/switch'; import { testProps } from '../Common/TestProps'; diff --git a/apps/tester-core/src/TestComponents/Callout/CalloutTest.tsx b/apps/tester-core/src/TestComponents/Callout/CalloutTest.tsx index b048e2b230..a115a900b2 100644 --- a/apps/tester-core/src/TestComponents/Callout/CalloutTest.tsx +++ b/apps/tester-core/src/TestComponents/Callout/CalloutTest.tsx @@ -2,10 +2,13 @@ import * as React from 'react'; import type { KeyboardMetrics } from 'react-native'; import { AccessibilityInfo, Platform, ScrollView, Switch, Text, View } from 'react-native'; -import { ButtonV1 as Button, Separator, Pressable } from '@fluentui/react-native'; -import type { IFocusable, RestoreFocusEvent, DismissBehaviors } from '@fluentui/react-native'; -import type { CalloutNativeCommands, ICalloutProps } from '@fluentui-react-native/callout'; -import { Callout } from '@fluentui-react-native/callout'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { Pressable } from 'fluentui-react-native/pressable'; +import { Separator } from 'fluentui-react-native/separator'; +import type { RestoreFocusEvent, DismissBehaviors } from 'fluentui-react-native/callout'; +import type { IFocusable } from 'fluentui-react-native/interactive-hooks'; +import type { CalloutNativeCommands, ICalloutProps } from 'fluentui-react-native/callout'; +import { Callout } from 'fluentui-react-native/callout'; import { CALLOUT_TESTPAGE } from '@fluentui-react-native/e2e-testing'; import { E2ECalloutTest } from './CalloutE2ETest'; @@ -350,9 +353,7 @@ const StandardCallout: React.FunctionComponent = () => { - - - {showStandardCallout && ( { return ( diff --git a/apps/tester-core/src/TestComponents/CheckboxV1/E2ECheckboxV1Test.tsx b/apps/tester-core/src/TestComponents/CheckboxV1/E2ECheckboxV1Test.tsx index 357f1e0402..508d585964 100644 --- a/apps/tester-core/src/TestComponents/CheckboxV1/E2ECheckboxV1Test.tsx +++ b/apps/tester-core/src/TestComponents/CheckboxV1/E2ECheckboxV1Test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { View } from 'react-native'; -import { Text } from '@fluentui/react-native'; +import { Text } from 'fluentui-react-native/text'; import { CHECKBOXV1_TEST_COMPONENT, CHECKBOXV1_ACCESSIBILITY_LABEL, @@ -9,8 +9,8 @@ import { CHECKBOXV1_TEST_COMPONENT_LABEL, CHECKBOXV1_ON_PRESS, } from '@fluentui-react-native/e2e-testing'; -import { Checkbox } from '@fluentui-react-native/experimental-checkbox'; -import { Stack } from '@fluentui-react-native/stack'; +import { Checkbox } from 'fluentui-react-native/experimental-checkbox'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle } from '../Common/styles'; import { testProps } from '../Common/TestProps'; diff --git a/apps/tester-core/src/TestComponents/CheckboxV1/OtherCheckboxPropsTest.tsx b/apps/tester-core/src/TestComponents/CheckboxV1/OtherCheckboxPropsTest.tsx index fb60fe2110..8db9160992 100644 --- a/apps/tester-core/src/TestComponents/CheckboxV1/OtherCheckboxPropsTest.tsx +++ b/apps/tester-core/src/TestComponents/CheckboxV1/OtherCheckboxPropsTest.tsx @@ -2,9 +2,9 @@ import React from 'react'; import { Platform, Pressable, View } from 'react-native'; import type { ViewStyle } from 'react-native'; -import { ButtonV1 as Button } from '@fluentui-react-native/button'; -import { Checkbox } from '@fluentui-react-native/experimental-checkbox'; -import { TextV1 } from '@fluentui-react-native/text'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { Checkbox } from 'fluentui-react-native/experimental-checkbox'; +import { TextV1 } from 'fluentui-react-native/text'; import { mobileStyles } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/CheckboxV1/SizeCheckboxTest.tsx b/apps/tester-core/src/TestComponents/CheckboxV1/SizeCheckboxTest.tsx index 230bd1a471..9792f5a77a 100644 --- a/apps/tester-core/src/TestComponents/CheckboxV1/SizeCheckboxTest.tsx +++ b/apps/tester-core/src/TestComponents/CheckboxV1/SizeCheckboxTest.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { Checkbox } from '@fluentui-react-native/experimental-checkbox'; +import { Checkbox } from 'fluentui-react-native/experimental-checkbox'; export const SizeCheckbox: React.FunctionComponent = () => { return ( diff --git a/apps/tester-core/src/TestComponents/CheckboxV1/TokenCheckboxTest.tsx b/apps/tester-core/src/TestComponents/CheckboxV1/TokenCheckboxTest.tsx index c27c3cadd7..de7a8e0c84 100644 --- a/apps/tester-core/src/TestComponents/CheckboxV1/TokenCheckboxTest.tsx +++ b/apps/tester-core/src/TestComponents/CheckboxV1/TokenCheckboxTest.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { View, TextInput, Platform } from 'react-native'; -import { Checkbox } from '@fluentui-react-native/experimental-checkbox'; -import type { InteractionEvent } from '@fluentui-react-native/interactive-hooks'; -import type { Theme } from '@fluentui-react-native/theme-types'; -import { useTheme } from '@fluentui-react-native/theme-types'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { Checkbox } from 'fluentui-react-native/experimental-checkbox'; +import type { InteractionEvent } from 'fluentui-react-native/interactive-hooks'; +import type { Theme } from 'fluentui-react-native/theme-types'; +import { useTheme } from 'fluentui-react-native/theme-types'; +import { themedStyleSheet } from 'fluentui-react-native/themed-stylesheet'; import { commonTestStyles as commonStyles } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Chip/ChipDefault.tsx b/apps/tester-core/src/TestComponents/Chip/ChipDefault.tsx index fb41be297f..dbda462e0d 100644 --- a/apps/tester-core/src/TestComponents/Chip/ChipDefault.tsx +++ b/apps/tester-core/src/TestComponents/Chip/ChipDefault.tsx @@ -1,10 +1,10 @@ import React, { useCallback } from 'react'; import { StyleSheet, View, ToastAndroid } from 'react-native'; -import { Chip } from '@fluentui-react-native/chip'; -import type { InteractionEvent } from '@fluentui-react-native/interactive-hooks'; -import { Switch } from '@fluentui-react-native/switch'; -import { Text } from '@fluentui-react-native/text'; +import { Chip } from 'fluentui-react-native/chip'; +import type { InteractionEvent } from 'fluentui-react-native/interactive-hooks'; +import { Switch } from 'fluentui-react-native/switch'; +import { Text } from 'fluentui-react-native/text'; import { svgProps } from '../Common/iconExamples'; diff --git a/apps/tester-core/src/TestComponents/Chip/E2EChipTest.tsx b/apps/tester-core/src/TestComponents/Chip/E2EChipTest.tsx index c71bae5373..da27ebf989 100644 --- a/apps/tester-core/src/TestComponents/Chip/E2EChipTest.tsx +++ b/apps/tester-core/src/TestComponents/Chip/E2EChipTest.tsx @@ -1,15 +1,15 @@ import * as React from 'react'; import { View } from 'react-native'; -import { Chip } from '@fluentui-react-native/chip'; +import { Chip } from 'fluentui-react-native/chip'; import { CHIP_CALLBACK_TEXT_END_STATE, CHIP_CALLBACK_TEXT_START_STATE, CHIP_TEST_COMPONENT, CHIP_TEXT, } from '@fluentui-react-native/e2e-testing'; -import type { InteractionEvent } from '@fluentui-react-native/interactive-hooks'; -import { Text } from '@fluentui-react-native/text'; +import type { InteractionEvent } from 'fluentui-react-native/interactive-hooks'; +import { Text } from 'fluentui-react-native/text'; import { testProps } from '../Common/TestProps'; diff --git a/apps/tester-core/src/TestComponents/ColorTokens/ColorTokenTest.tsx b/apps/tester-core/src/TestComponents/ColorTokens/ColorTokenTest.tsx index 742e311ab8..15f2980cc8 100644 --- a/apps/tester-core/src/TestComponents/ColorTokens/ColorTokenTest.tsx +++ b/apps/tester-core/src/TestComponents/ColorTokens/ColorTokenTest.tsx @@ -2,16 +2,17 @@ import * as React from 'react'; import type { ViewStyle, ColorValue } from 'react-native'; import { View, StyleSheet, Platform } from 'react-native'; -import { Text, ToggleButton } from '@fluentui/react-native'; -import { createAliasTokens } from '@fluentui-react-native/default-theme'; +import { ToggleButton } from 'fluentui-react-native/button'; +import { Text } from 'fluentui-react-native/text'; +import { createAliasTokens } from 'fluentui-react-native/default-theme'; import { COLORTOKENS_TEST_COMPONENT, COLORTOKEN_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import type { SvgIconProps } from '@fluentui-react-native/icon'; -import { globalTokens } from '@fluentui-react-native/theme-tokens'; -import type { Theme } from '@fluentui-react-native/theme-types'; -import { useTheme } from '@fluentui-react-native/theme-types'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; -import { getCurrentAppearance } from '@fluentui-react-native/theming-utils'; -import { createOfficeAliasTokens } from '@fluentui-react-native/win32-theme'; +import type { SvgIconProps } from 'fluentui-react-native/icon'; +import { globalTokens } from 'fluentui-react-native/theme-tokens'; +import type { Theme } from 'fluentui-react-native/theme-types'; +import { useTheme } from 'fluentui-react-native/theme-types'; +import { themedStyleSheet } from 'fluentui-react-native/themed-stylesheet'; +import { getCurrentAppearance } from 'fluentui-react-native/theming-utils'; +import { createOfficeAliasTokens } from 'fluentui-react-native/win32-theme'; import type { SvgProps } from 'react-native-svg'; import Svg, { G, Path } from 'react-native-svg'; diff --git a/apps/tester-core/src/TestComponents/Common/AlignmentPicker.tsx b/apps/tester-core/src/TestComponents/Common/AlignmentPicker.tsx index e4fe05405e..6d43ff897d 100644 --- a/apps/tester-core/src/TestComponents/Common/AlignmentPicker.tsx +++ b/apps/tester-core/src/TestComponents/Common/AlignmentPicker.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import type { StyleProp, ViewStyle } from 'react-native'; -import type { IconAlignment } from '@fluentui/react-native'; +import type { IconAlignment } from 'fluentui-react-native/persona-coin'; import { MenuPicker } from './MenuPicker'; import { undefinedText } from '../PersonaCoin/styles'; diff --git a/apps/tester-core/src/TestComponents/Common/MenuPicker.desktop.tsx b/apps/tester-core/src/TestComponents/Common/MenuPicker.desktop.tsx index cedce9b730..76281cfab2 100644 --- a/apps/tester-core/src/TestComponents/Common/MenuPicker.desktop.tsx +++ b/apps/tester-core/src/TestComponents/Common/MenuPicker.desktop.tsx @@ -1,8 +1,9 @@ import * as React from 'react'; import { View, StyleSheet } from 'react-native'; -import { ButtonV1 as Button, Text } from '@fluentui/react-native'; -import { Menu, MenuItem, MenuTrigger, MenuPopover, MenuList } from '@fluentui-react-native/menu'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { Text } from 'fluentui-react-native/text'; +import { Menu, MenuItem, MenuTrigger, MenuPopover, MenuList } from 'fluentui-react-native/menu'; import { SvgXml } from 'react-native-svg'; import type { MenuPickerProps, CollectionItem } from './MenuPicker.types'; diff --git a/apps/tester-core/src/TestComponents/Common/MenuPicker.ios.tsx b/apps/tester-core/src/TestComponents/Common/MenuPicker.ios.tsx index 0420b50dca..b820db59c2 100644 --- a/apps/tester-core/src/TestComponents/Common/MenuPicker.ios.tsx +++ b/apps/tester-core/src/TestComponents/Common/MenuPicker.ios.tsx @@ -1,9 +1,9 @@ import * as React from 'react'; import { View, StyleSheet } from 'react-native'; -import { ButtonV1 as Button } from '@fluentui-react-native/button'; -import { useFluentTheme } from '@fluentui-react-native/framework'; -import { Text } from '@fluentui-react-native/text'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { useFluentTheme } from 'fluentui-react-native/framework'; +import { Text } from 'fluentui-react-native/text'; import { MenuView } from '@react-native-menu/menu'; import type { MenuAction } from '@react-native-menu/menu'; import { SvgXml } from 'react-native-svg'; diff --git a/apps/tester-core/src/TestComponents/Common/Slider.tsx b/apps/tester-core/src/TestComponents/Common/Slider.tsx index 79e4ea0d9d..6e69dc8d71 100644 --- a/apps/tester-core/src/TestComponents/Common/Slider.tsx +++ b/apps/tester-core/src/TestComponents/Common/Slider.tsx @@ -2,8 +2,9 @@ import * as React from 'react'; import type { ViewProps, ViewStyle } from 'react-native'; import { StyleSheet, Text, View } from 'react-native'; -import { Separator, Pressable } from '@fluentui/react-native'; -import type { IPressableState } from '@fluentui-react-native/interactive-hooks'; +import { Pressable } from 'fluentui-react-native/pressable'; +import { Separator } from 'fluentui-react-native/separator'; +import type { IPressableState } from 'fluentui-react-native/interactive-hooks'; const thumbSize = 20; const defaultMaximumValue = 100; diff --git a/apps/tester-core/src/TestComponents/Common/StyledPicker.tsx b/apps/tester-core/src/TestComponents/Common/StyledPicker.tsx index c0d1e05de5..efc03bcf5e 100644 --- a/apps/tester-core/src/TestComponents/Common/StyledPicker.tsx +++ b/apps/tester-core/src/TestComponents/Common/StyledPicker.tsx @@ -1,7 +1,7 @@ import { Platform } from 'react-native'; import type { ColorValue } from 'react-native'; -import { useTheme } from '@fluentui-react-native/theme-types'; +import { useTheme } from 'fluentui-react-native/theme-types'; import { MenuPicker } from './MenuPicker'; import { commonTestStyles as commonStyles } from './styles'; diff --git a/apps/tester-core/src/TestComponents/Common/iconExamples.tsx b/apps/tester-core/src/TestComponents/Common/iconExamples.tsx index 34ea2d0abc..37bb1877e2 100644 --- a/apps/tester-core/src/TestComponents/Common/iconExamples.tsx +++ b/apps/tester-core/src/TestComponents/Common/iconExamples.tsx @@ -1,6 +1,6 @@ import { Platform } from 'react-native'; -import type { SvgIconProps, FontIconProps, IconProps } from '@fluentui-react-native/icon'; +import type { SvgIconProps, FontIconProps, IconProps } from 'fluentui-react-native/icon'; import TestSvg from '../../../assets/test.svg'; diff --git a/apps/tester-core/src/TestComponents/Common/styles.ts b/apps/tester-core/src/TestComponents/Common/styles.ts index 3de59dab43..a98b841266 100644 --- a/apps/tester-core/src/TestComponents/Common/styles.ts +++ b/apps/tester-core/src/TestComponents/Common/styles.ts @@ -1,6 +1,6 @@ import { Platform, StyleSheet } from 'react-native'; -import type { IStackProps } from '@fluentui-react-native/stack'; +import type { IStackProps } from 'fluentui-react-native/stack'; export const commonTestStyles = StyleSheet.create({ root: { diff --git a/apps/tester-core/src/TestComponents/ContextualMenu/ContextualMenuTest.tsx b/apps/tester-core/src/TestComponents/ContextualMenu/ContextualMenuTest.tsx index 4f3750f591..f830f4f1dc 100644 --- a/apps/tester-core/src/TestComponents/ContextualMenu/ContextualMenuTest.tsx +++ b/apps/tester-core/src/TestComponents/ContextualMenu/ContextualMenuTest.tsx @@ -1,9 +1,12 @@ import * as React from 'react'; import { Text, View, Switch } from 'react-native'; -import { Text as FURNText, ContextualMenu, ContextualMenuItem, Submenu, SubmenuItem, Separator, Checkbox } from '@fluentui/react-native'; +import { Checkbox } from 'fluentui-react-native/checkbox'; +import { ContextualMenu, ContextualMenuItem, Submenu, SubmenuItem } from 'fluentui-react-native/contextual-menu'; +import { Separator } from 'fluentui-react-native/separator'; +import { Text as FURNText } from 'fluentui-react-native/text'; import { CONTEXTUALMENU_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import { MenuButton } from '@fluentui-react-native/experimental-menu-button'; +import { MenuButton } from 'fluentui-react-native/experimental-menu-button'; import { E2EContextualMenuTest } from './E2EContextualMenuTest'; import { svgProps, fontProps, testImage } from '../Common/iconExamples'; diff --git a/apps/tester-core/src/TestComponents/ContextualMenu/E2EContextualMenuTest.tsx b/apps/tester-core/src/TestComponents/ContextualMenu/E2EContextualMenuTest.tsx index e7859d9f55..cd874c3bac 100644 --- a/apps/tester-core/src/TestComponents/ContextualMenu/E2EContextualMenuTest.tsx +++ b/apps/tester-core/src/TestComponents/ContextualMenu/E2EContextualMenuTest.tsx @@ -1,7 +1,9 @@ import * as React from 'react'; import { Text, View, Switch } from 'react-native'; -import { ButtonV1 as Button, ContextualMenu, ContextualMenuItem, Separator } from '@fluentui/react-native'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { ContextualMenu, ContextualMenuItem } from 'fluentui-react-native/contextual-menu'; +import { Separator } from 'fluentui-react-native/separator'; import { CONTEXTUALMENUITEM_TEST_COMPONENT, CONTEXTUALMENU_TEST_COMPONENT } from '@fluentui-react-native/e2e-testing'; import { testProps } from '../Common/TestProps'; diff --git a/apps/tester-core/src/TestComponents/CornerRadius/CornerRadiusTest.tsx b/apps/tester-core/src/TestComponents/CornerRadius/CornerRadiusTest.tsx index b2f71effbf..568833e7cf 100644 --- a/apps/tester-core/src/TestComponents/CornerRadius/CornerRadiusTest.tsx +++ b/apps/tester-core/src/TestComponents/CornerRadius/CornerRadiusTest.tsx @@ -1,12 +1,12 @@ import * as React from 'react'; import { View } from 'react-native'; -import { Text } from '@fluentui/react-native'; +import { Text } from 'fluentui-react-native/text'; import { HOMEPAGE_CORNERRADIUS_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import { useFluentTheme } from '@fluentui-react-native/framework'; -import { Stack } from '@fluentui-react-native/stack'; -import { globalTokens } from '@fluentui-react-native/theme-tokens'; -import { getCurrentAppearance } from '@fluentui-react-native/theming-utils'; +import { useFluentTheme } from 'fluentui-react-native/framework'; +import { Stack } from 'fluentui-react-native/stack'; +import { globalTokens } from 'fluentui-react-native/theme-tokens'; +import { getCurrentAppearance } from 'fluentui-react-native/theming-utils'; import { stackStyle } from '../Common/styles'; import type { TestSection, PlatformStatus } from '../Test'; diff --git a/apps/tester-core/src/TestComponents/Divider/DividerTest.tsx b/apps/tester-core/src/TestComponents/Divider/DividerTest.tsx index e8459a78d9..78094b640e 100644 --- a/apps/tester-core/src/TestComponents/Divider/DividerTest.tsx +++ b/apps/tester-core/src/TestComponents/Divider/DividerTest.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { Platform, StyleSheet, View } from 'react-native'; -import { Divider } from '@fluentui-react-native/divider'; +import { Divider } from 'fluentui-react-native/divider'; import { DIVIDER_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import { Stack } from '@fluentui-react-native/stack'; -import { TextV1 as Text } from '@fluentui-react-native/text'; +import { Stack } from 'fluentui-react-native/stack'; +import { TextV1 as Text } from 'fluentui-react-native/text'; import { CustomisedMobileDividers, MobileDividers } from './MobileDividerTest'; import TestSvg from '../../../assets/test.svg'; diff --git a/apps/tester-core/src/TestComponents/Divider/MobileDividerTest.tsx b/apps/tester-core/src/TestComponents/Divider/MobileDividerTest.tsx index f8fc5fe7cf..3657fb4d3d 100644 --- a/apps/tester-core/src/TestComponents/Divider/MobileDividerTest.tsx +++ b/apps/tester-core/src/TestComponents/Divider/MobileDividerTest.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { StyleSheet, View } from 'react-native'; -import { Divider } from '@fluentui-react-native/divider'; -import { Stack } from '@fluentui-react-native/stack'; -import { TextV1 as Text } from '@fluentui-react-native/text'; -import { globalTokens } from '@fluentui-react-native/theme-tokens'; +import { Divider } from 'fluentui-react-native/divider'; +import { Stack } from 'fluentui-react-native/stack'; +import { TextV1 as Text } from 'fluentui-react-native/text'; +import { globalTokens } from 'fluentui-react-native/theme-tokens'; import { commonTestStyles } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Drawer/DrawerDefault.tsx b/apps/tester-core/src/TestComponents/Drawer/DrawerDefault.tsx index 1c46b4fe9c..247f163ab9 100644 --- a/apps/tester-core/src/TestComponents/Drawer/DrawerDefault.tsx +++ b/apps/tester-core/src/TestComponents/Drawer/DrawerDefault.tsx @@ -1,13 +1,13 @@ import * as React from 'react'; import { StyleSheet, View } from 'react-native'; -import { Avatar } from '@fluentui-react-native/avatar'; -import { ButtonV1 as Button } from '@fluentui-react-native/button'; -import { Drawer } from '@fluentui-react-native/drawer'; -import type { DrawerPositionType } from '@fluentui-react-native/drawer'; -import { Stack } from '@fluentui-react-native/stack'; -import { Switch } from '@fluentui-react-native/switch'; -import { Text } from '@fluentui-react-native/text'; +import { Avatar } from 'fluentui-react-native/avatar'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { Drawer } from 'fluentui-react-native/drawer'; +import type { DrawerPositionType } from 'fluentui-react-native/drawer'; +import { Stack } from 'fluentui-react-native/stack'; +import { Switch } from 'fluentui-react-native/switch'; +import { Text } from 'fluentui-react-native/text'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Drawer/E2EDrawerTest.tsx b/apps/tester-core/src/TestComponents/Drawer/E2EDrawerTest.tsx index 479693480d..f140588ac8 100644 --- a/apps/tester-core/src/TestComponents/Drawer/E2EDrawerTest.tsx +++ b/apps/tester-core/src/TestComponents/Drawer/E2EDrawerTest.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; -import { Drawer } from '@fluentui-react-native/drawer'; -import { Stack } from '@fluentui-react-native/stack'; +import { Drawer } from 'fluentui-react-native/drawer'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle } from '../Common/styles'; export const E2EDrawerTest: React.FunctionComponent = () => { diff --git a/apps/tester-core/src/TestComponents/Dropdown/DropdownTest.tsx b/apps/tester-core/src/TestComponents/Dropdown/DropdownTest.tsx index b7bfb32ca2..70311c2a09 100644 --- a/apps/tester-core/src/TestComponents/Dropdown/DropdownTest.tsx +++ b/apps/tester-core/src/TestComponents/Dropdown/DropdownTest.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; -import { Option, Dropdown } from '@fluentui-react-native/dropdown'; -import { Stack } from '@fluentui-react-native/stack'; +import { Option, Dropdown } from 'fluentui-react-native/dropdown'; +import { Stack } from 'fluentui-react-native/stack'; import { DROPDOWN_TESTPAGE } from './consts'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Expander/ExpanderTest.tsx b/apps/tester-core/src/TestComponents/Expander/ExpanderTest.tsx index f83427e384..90f190bfe8 100644 --- a/apps/tester-core/src/TestComponents/Expander/ExpanderTest.tsx +++ b/apps/tester-core/src/TestComponents/Expander/ExpanderTest.tsx @@ -1,9 +1,9 @@ import * as React from 'react'; import { View, Switch } from 'react-native'; -import { Text } from '@fluentui/react-native'; -import { Expander } from '@fluentui-react-native/experimental-expander'; -import { Stack } from '@fluentui-react-native/stack'; +import { Text } from 'fluentui-react-native/text'; +import { Expander } from 'fluentui-react-native/experimental-expander'; +import { Stack } from 'fluentui-react-native/stack'; import { EXPANDER_TESTPAGE } from './consts'; import { stackStyle, commonTestStyles as commonStyles } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/FocusTrapZone/FocusTrapZoneTest.tsx b/apps/tester-core/src/TestComponents/FocusTrapZone/FocusTrapZoneTest.tsx index c93bf5ef27..2110f399ea 100644 --- a/apps/tester-core/src/TestComponents/FocusTrapZone/FocusTrapZoneTest.tsx +++ b/apps/tester-core/src/TestComponents/FocusTrapZone/FocusTrapZoneTest.tsx @@ -2,14 +2,15 @@ import * as React from 'react'; import type { TouchableHighlightProps } from 'react-native'; import { TouchableHighlight, View } from 'react-native'; -import { FocusTrapZone, Text } from '@fluentui/react-native'; +import { FocusTrapZone } from 'fluentui-react-native/focus-trap-zone'; +import { Text } from 'fluentui-react-native/text'; import { FOCUSTRAPZONE_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import type { Theme } from '@fluentui-react-native/framework'; -import type { KeyPressEvent } from '@fluentui-react-native/interactive-hooks'; -import { useFocusState } from '@fluentui-react-native/interactive-hooks'; -import { Stack } from '@fluentui-react-native/stack'; -import { useTheme } from '@fluentui-react-native/theme-types'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import type { Theme } from 'fluentui-react-native/framework'; +import type { KeyPressEvent } from 'fluentui-react-native/interactive-hooks'; +import { useFocusState } from 'fluentui-react-native/interactive-hooks'; +import { Stack } from 'fluentui-react-native/stack'; +import { useTheme } from 'fluentui-react-native/theme-types'; +import { themedStyleSheet } from 'fluentui-react-native/themed-stylesheet'; import { stackStyle } from '../Common/styles'; import type { TestSection, PlatformStatus } from '../Test'; diff --git a/apps/tester-core/src/TestComponents/FocusZone/FocusZoneE2ETest.tsx b/apps/tester-core/src/TestComponents/FocusZone/FocusZoneE2ETest.tsx index a32b89f44c..f2e9cbcca4 100644 --- a/apps/tester-core/src/TestComponents/FocusZone/FocusZoneE2ETest.tsx +++ b/apps/tester-core/src/TestComponents/FocusZone/FocusZoneE2ETest.tsx @@ -1,10 +1,13 @@ import React from 'react'; import { Platform, View } from 'react-native'; -import type { FocusZoneDirection, FocusZoneTabNavigation, IFocusable } from '@fluentui/react-native'; -import { FocusZone, MenuButton, Text } from '@fluentui/react-native'; -import type { ButtonProps } from '@fluentui-react-native/button'; -import { ButtonV1 as Button } from '@fluentui-react-native/button'; +import type { FocusZoneDirection, FocusZoneTabNavigation } from 'fluentui-react-native/focus-zone'; +import type { IFocusable } from 'fluentui-react-native/interactive-hooks'; +import { FocusZone } from 'fluentui-react-native/focus-zone'; +import { MenuButton } from 'fluentui-react-native/menu-button'; +import { Text } from 'fluentui-react-native/text'; +import type { ButtonProps } from 'fluentui-react-native/button'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; import { FOCUSZONE_CIRCLE_NAV_SWITCH, FOCUSZONE_DEFAULT_TABBABLE_SWITCH, @@ -18,7 +21,7 @@ import { FOCUSZONE_TWO_DIM_SWITCH, } from '@fluentui-react-native/e2e-testing'; import type { GridButtonIndex } from '@fluentui-react-native/e2e-testing'; -import { Switch } from '@fluentui-react-native/switch'; +import { Switch } from 'fluentui-react-native/switch'; import { focusZoneTestStyles, GridButton } from './styles'; import { commonTestStyles } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/FocusZone/FocusZoneTest.tsx b/apps/tester-core/src/TestComponents/FocusZone/FocusZoneTest.tsx index 112236c402..df43aeeafd 100644 --- a/apps/tester-core/src/TestComponents/FocusZone/FocusZoneTest.tsx +++ b/apps/tester-core/src/TestComponents/FocusZone/FocusZoneTest.tsx @@ -1,12 +1,15 @@ import * as React from 'react'; import { View, ScrollView, Pressable, TextInput } from 'react-native'; -import type { FocusZoneDirection, FocusZoneTabNavigation } from '@fluentui/react-native'; -import { FocusZone, MenuButton, Text, useOnPressWithFocus } from '@fluentui/react-native'; -import { ButtonV1 as Button } from '@fluentui-react-native/button'; +import type { FocusZoneDirection, FocusZoneTabNavigation } from 'fluentui-react-native/focus-zone'; +import { FocusZone } from 'fluentui-react-native/focus-zone'; +import { useOnPressWithFocus } from 'fluentui-react-native/interactive-hooks'; +import { MenuButton } from 'fluentui-react-native/menu-button'; +import { Text } from 'fluentui-react-native/text'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; import { FOCUSZONE_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import type { CheckboxProps } from '@fluentui-react-native/experimental-checkbox'; -import { Checkbox } from '@fluentui-react-native/experimental-checkbox'; +import type { CheckboxProps } from 'fluentui-react-native/experimental-checkbox'; +import { Checkbox } from 'fluentui-react-native/experimental-checkbox'; import { FocusZone2D, FocusZoneDirections, FocusZoneListWrapper, FocusZoneTabNavigations, GridOfButtons } from './FocusZoneE2ETest'; import { focusZoneTestStyles, SubheaderText } from './styles'; diff --git a/apps/tester-core/src/TestComponents/FocusZone/styles.ts b/apps/tester-core/src/TestComponents/FocusZone/styles.ts index e8ad046c8e..68574cfee7 100644 --- a/apps/tester-core/src/TestComponents/FocusZone/styles.ts +++ b/apps/tester-core/src/TestComponents/FocusZone/styles.ts @@ -1,8 +1,8 @@ import { Platform, StyleSheet, View } from 'react-native'; -import { Text } from '@fluentui/react-native'; -import { ButtonV1 as Button } from '@fluentui-react-native/button'; -import { Icon } from '@fluentui-react-native/icon'; +import { Text } from 'fluentui-react-native/text'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { Icon } from 'fluentui-react-native/icon'; export const focusZoneTestStyles = StyleSheet.create({ focusZoneViewStyle: { diff --git a/apps/tester-core/src/TestComponents/Icon/IconLegacyE2ETest.tsx b/apps/tester-core/src/TestComponents/Icon/IconLegacyE2ETest.tsx index 5524adf419..c413721249 100644 --- a/apps/tester-core/src/TestComponents/Icon/IconLegacyE2ETest.tsx +++ b/apps/tester-core/src/TestComponents/Icon/IconLegacyE2ETest.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { View } from 'react-native'; -import { Text } from '@fluentui/react-native'; +import { Text } from 'fluentui-react-native/text'; import { ICON_ACCESSIBILITY_LABEL } from '@fluentui-react-native/e2e-testing'; -import { Icon } from '@fluentui-react-native/icon'; -import type { RasterImageIconProps } from '@fluentui-react-native/icon'; +import { Icon } from 'fluentui-react-native/icon'; +import type { RasterImageIconProps } from 'fluentui-react-native/icon'; import { testImage } from '../Common/iconExamples'; diff --git a/apps/tester-core/src/TestComponents/Icon/IconTest.tsx b/apps/tester-core/src/TestComponents/Icon/IconTest.tsx index 2dca34ca79..c9e4d2c9cc 100644 --- a/apps/tester-core/src/TestComponents/Icon/IconTest.tsx +++ b/apps/tester-core/src/TestComponents/Icon/IconTest.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { Platform, PlatformColor, View } from 'react-native'; -import { Text } from '@fluentui/react-native'; +import { Text } from 'fluentui-react-native/text'; import { ICON_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import type { RasterImageIconProps, SvgIconProps, FontIconProps } from '@fluentui-react-native/icon'; -import { Icon } from '@fluentui-react-native/icon'; +import type { RasterImageIconProps, SvgIconProps, FontIconProps } from 'fluentui-react-native/icon'; +import { Icon } from 'fluentui-react-native/icon'; import { E2ETestingIcon } from './IconLegacyE2ETest'; import { IconV1E2ETest } from './IconV1E2ETest'; diff --git a/apps/tester-core/src/TestComponents/Icon/IconV1E2ETest.tsx b/apps/tester-core/src/TestComponents/Icon/IconV1E2ETest.tsx index f31ddbd7e1..a6533fe6d1 100644 --- a/apps/tester-core/src/TestComponents/Icon/IconV1E2ETest.tsx +++ b/apps/tester-core/src/TestComponents/Icon/IconV1E2ETest.tsx @@ -1,15 +1,15 @@ import * as React from 'react'; import { View } from 'react-native'; -import { Text } from '@fluentui/react-native'; +import { Text } from 'fluentui-react-native/text'; import { ICON_ACCESSIBILITY_LABEL, ICON_TEST_COMPONENT, ICON_FONT_TEST_COMPONENT, ICON_SVG_TEST_COMPONENT, } from '@fluentui-react-native/e2e-testing'; -import type { FontIconPropsV1, SvgIconPropsV1 } from '@fluentui-react-native/icon'; -import { FontIcon, SvgIcon, IconV1 } from '@fluentui-react-native/icon'; +import type { FontIconPropsV1, SvgIconPropsV1 } from 'fluentui-react-native/icon'; +import { FontIcon, SvgIcon, IconV1 } from 'fluentui-react-native/icon'; import TestSvg from '../../../assets/test.svg'; diff --git a/apps/tester-core/src/TestComponents/Icon/IconV1Test.android.tsx b/apps/tester-core/src/TestComponents/Icon/IconV1Test.android.tsx index 9122db1f9b..93811fbf52 100644 --- a/apps/tester-core/src/TestComponents/Icon/IconV1Test.android.tsx +++ b/apps/tester-core/src/TestComponents/Icon/IconV1Test.android.tsx @@ -1,8 +1,8 @@ import React, { useMemo } from 'react'; import { Text, View } from 'react-native'; -import type { FontIconPropsV1, SvgIconPropsV1 } from '@fluentui-react-native/icon'; -import { FontIcon, SvgIcon, IconV1 } from '@fluentui-react-native/icon'; +import type { FontIconPropsV1, SvgIconPropsV1 } from 'fluentui-react-native/icon'; +import { FontIcon, SvgIcon, IconV1 } from 'fluentui-react-native/icon'; import TestSvg from '../../../assets/test.svg'; diff --git a/apps/tester-core/src/TestComponents/Icon/IconV1Test.tsx b/apps/tester-core/src/TestComponents/Icon/IconV1Test.tsx index c81ea13fb3..de6c0f5d8f 100644 --- a/apps/tester-core/src/TestComponents/Icon/IconV1Test.tsx +++ b/apps/tester-core/src/TestComponents/Icon/IconV1Test.tsx @@ -1,8 +1,8 @@ import React, { useMemo } from 'react'; import { Text, View } from 'react-native'; -import type { FontIconPropsV1, SvgIconPropsV1 } from '@fluentui-react-native/icon'; -import { FontIcon, SvgIcon, IconV1 } from '@fluentui-react-native/icon'; +import type { FontIconPropsV1, SvgIconPropsV1 } from 'fluentui-react-native/icon'; +import { FontIcon, SvgIcon, IconV1 } from 'fluentui-react-native/icon'; import TestSvg from '../../../assets/test.svg'; diff --git a/apps/tester-core/src/TestComponents/Input/E2EInputTest.tsx b/apps/tester-core/src/TestComponents/Input/E2EInputTest.tsx index dc75b2d1c0..3adcd66c07 100644 --- a/apps/tester-core/src/TestComponents/Input/E2EInputTest.tsx +++ b/apps/tester-core/src/TestComponents/Input/E2EInputTest.tsx @@ -8,10 +8,10 @@ import { INPUT_ONCLICK_STRING, INPUT_START_STRING, } from '@fluentui-react-native/e2e-testing'; -import type { IconProps } from '@fluentui-react-native/icon'; -import { Input } from '@fluentui-react-native/input'; -import { Stack } from '@fluentui-react-native/stack'; -import { Text } from '@fluentui-react-native/text'; +import type { IconProps } from 'fluentui-react-native/icon'; +import { Input } from 'fluentui-react-native/input'; +import { Stack } from 'fluentui-react-native/stack'; +import { Text } from 'fluentui-react-native/text'; import FilledSvg from '../../../assets/filledIcon.svg'; import OutlineSvg from '../../../assets/outlineIcon.svg'; diff --git a/apps/tester-core/src/TestComponents/Input/InputDefault.tsx b/apps/tester-core/src/TestComponents/Input/InputDefault.tsx index 6748a01e44..dec845d4f5 100644 --- a/apps/tester-core/src/TestComponents/Input/InputDefault.tsx +++ b/apps/tester-core/src/TestComponents/Input/InputDefault.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { KeyboardAvoidingView } from 'react-native'; -import type { IconProps } from '@fluentui-react-native/icon'; -import { Input } from '@fluentui-react-native/input'; +import type { IconProps } from 'fluentui-react-native/icon'; +import { Input } from 'fluentui-react-native/input'; import DismissSvg from '../../../assets/dismissIcon.svg'; import FilledSvg from '../../../assets/filledIcon.svg'; diff --git a/apps/tester-core/src/TestComponents/LinkLegacy/E2ELinkLegacyTest.tsx b/apps/tester-core/src/TestComponents/LinkLegacy/E2ELinkLegacyTest.tsx index 9e3e8f08e5..8a190e3cf5 100644 --- a/apps/tester-core/src/TestComponents/LinkLegacy/E2ELinkLegacyTest.tsx +++ b/apps/tester-core/src/TestComponents/LinkLegacy/E2ELinkLegacyTest.tsx @@ -1,14 +1,14 @@ import * as React from 'react'; import { Alert } from 'react-native'; -import { Link } from '@fluentui/react-native'; +import { Link } from 'fluentui-react-native/link'; import { LINK_TEST_COMPONENT, LINK_ACCESSIBILITY_LABEL, LINK_NO_A11Y_LABEL_COMPONENT, LINK_TEST_COMPONENT_LABEL, } from '@fluentui-react-native/e2e-testing'; -import { Stack } from '@fluentui-react-native/stack'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle } from '../Common/styles'; import { testProps } from '../Common/TestProps'; diff --git a/apps/tester-core/src/TestComponents/LinkLegacy/LinkLegacyTest.tsx b/apps/tester-core/src/TestComponents/LinkLegacy/LinkLegacyTest.tsx index 899399f6e0..d89635e4b7 100644 --- a/apps/tester-core/src/TestComponents/LinkLegacy/LinkLegacyTest.tsx +++ b/apps/tester-core/src/TestComponents/LinkLegacy/LinkLegacyTest.tsx @@ -1,9 +1,9 @@ import * as React from 'react'; import { Alert } from 'react-native'; -import { Link } from '@fluentui/react-native'; +import { Link } from 'fluentui-react-native/link'; import { LINK_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import { Stack } from '@fluentui-react-native/stack'; +import { Stack } from 'fluentui-react-native/stack'; import { E2ELinkLegacyTest } from './E2ELinkLegacyTest'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/LinkV1/E2ELinkV1Test.tsx b/apps/tester-core/src/TestComponents/LinkV1/E2ELinkV1Test.tsx index d4748c6bce..9d3281a3f4 100644 --- a/apps/tester-core/src/TestComponents/LinkV1/E2ELinkV1Test.tsx +++ b/apps/tester-core/src/TestComponents/LinkV1/E2ELinkV1Test.tsx @@ -1,13 +1,13 @@ import * as React from 'react'; -import { LinkV1 as Link } from '@fluentui/react-native'; +import { LinkV1 as Link } from 'fluentui-react-native/link'; import { LINKV1_TEST_COMPONENT, LINKV1_ACCESSIBILITY_LABEL, LINKV1_NO_A11Y_LABEL_COMPONENT, LINKV1_TEST_COMPONENT_LABEL, } from '@fluentui-react-native/e2e-testing'; -import { Stack } from '@fluentui-react-native/stack'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle } from '../Common/styles'; import { testProps } from '../Common/TestProps'; diff --git a/apps/tester-core/src/TestComponents/LinkV1/InlineLinksTest.android.tsx b/apps/tester-core/src/TestComponents/LinkV1/InlineLinksTest.android.tsx index 3292bf3927..a993df711b 100644 --- a/apps/tester-core/src/TestComponents/LinkV1/InlineLinksTest.android.tsx +++ b/apps/tester-core/src/TestComponents/LinkV1/InlineLinksTest.android.tsx @@ -1,8 +1,9 @@ import * as React from 'react'; import { View, Alert, StyleSheet } from 'react-native'; -import { LinkV1 as Link, TextV1 as Text } from '@fluentui/react-native'; -import { Stack } from '@fluentui-react-native/stack'; +import { LinkV1 as Link } from 'fluentui-react-native/link'; +import { TextV1 as Text } from 'fluentui-react-native/text'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/LinkV1/InlineLinksTest.tsx b/apps/tester-core/src/TestComponents/LinkV1/InlineLinksTest.tsx index 7a0acb7607..907e452c4b 100644 --- a/apps/tester-core/src/TestComponents/LinkV1/InlineLinksTest.tsx +++ b/apps/tester-core/src/TestComponents/LinkV1/InlineLinksTest.tsx @@ -1,8 +1,9 @@ import * as React from 'react'; import { Alert } from 'react-native'; -import { LinkV1 as Link, TextV1 as Text } from '@fluentui/react-native'; -import { Stack } from '@fluentui-react-native/stack'; +import { LinkV1 as Link } from 'fluentui-react-native/link'; +import { TextV1 as Text } from 'fluentui-react-native/text'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/LinkV1/LinkV1Test.tsx b/apps/tester-core/src/TestComponents/LinkV1/LinkV1Test.tsx index 1e76fe34c5..75f37a2214 100644 --- a/apps/tester-core/src/TestComponents/LinkV1/LinkV1Test.tsx +++ b/apps/tester-core/src/TestComponents/LinkV1/LinkV1Test.tsx @@ -2,10 +2,10 @@ import * as React from 'react'; import { Alert, View, StyleSheet, Text, TextInput } from 'react-native'; import { Platform } from 'react-native'; -import type { LinkTokens } from '@fluentui/react-native'; -import { LinkV1 as Link } from '@fluentui/react-native'; +import type { LinkTokens } from 'fluentui-react-native/link'; +import { LinkV1 as Link } from 'fluentui-react-native/link'; import { LINKV1_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import { Stack } from '@fluentui-react-native/stack'; +import { Stack } from 'fluentui-react-native/stack'; import { E2ELinkV1Test } from './E2ELinkV1Test'; import { InlineLinks } from './InlineLinksTest'; diff --git a/apps/tester-core/src/TestComponents/Menu/E2EMenuTest.tsx b/apps/tester-core/src/TestComponents/Menu/E2EMenuTest.tsx index 271490f1f9..523e66d679 100644 --- a/apps/tester-core/src/TestComponents/Menu/E2EMenuTest.tsx +++ b/apps/tester-core/src/TestComponents/Menu/E2EMenuTest.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { View } from 'react-native'; -import { ButtonV1 as Button } from '@fluentui-react-native/button'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; import { MENUITEM_ACCESSIBILITY_LABEL, MENUITEM_NO_A11Y_LABEL_COMPONENT, @@ -16,9 +16,9 @@ import { MENUITEM_DISABLED_COMPONENT, MENUITEM_CALLBACK_LABEL, } from '@fluentui-react-native/e2e-testing'; -import { Menu, MenuDivider, MenuGroup, MenuItem, MenuList, MenuPopover, MenuTrigger } from '@fluentui-react-native/menu'; -import { Stack } from '@fluentui-react-native/stack'; -import { TextV1 as Text } from '@fluentui-react-native/text'; +import { Menu, MenuDivider, MenuGroup, MenuItem, MenuList, MenuPopover, MenuTrigger } from 'fluentui-react-native/menu'; +import { Stack } from 'fluentui-react-native/stack'; +import { TextV1 as Text } from 'fluentui-react-native/text'; import { stackStyle } from '../Common/styles'; import { testProps } from '../Common/TestProps'; diff --git a/apps/tester-core/src/TestComponents/Menu/MenuComponentOutsideMenuList.tsx b/apps/tester-core/src/TestComponents/Menu/MenuComponentOutsideMenuList.tsx index 6dbbefe56c..b9a675c2ba 100644 --- a/apps/tester-core/src/TestComponents/Menu/MenuComponentOutsideMenuList.tsx +++ b/apps/tester-core/src/TestComponents/Menu/MenuComponentOutsideMenuList.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; -import { ButtonV1 as Button } from '@fluentui/react-native'; -import { Menu, MenuItem, MenuTrigger, MenuPopover, MenuList } from '@fluentui-react-native/menu'; -import { Stack } from '@fluentui-react-native/stack'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { Menu, MenuItem, MenuTrigger, MenuPopover, MenuList } from 'fluentui-react-native/menu'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Menu/MenuIcons.tsx b/apps/tester-core/src/TestComponents/Menu/MenuIcons.tsx index fadba7774b..87ab5a4ea5 100644 --- a/apps/tester-core/src/TestComponents/Menu/MenuIcons.tsx +++ b/apps/tester-core/src/TestComponents/Menu/MenuIcons.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { Platform } from 'react-native'; -import { ButtonV1 as Button } from '@fluentui/react-native'; -import { Menu, MenuItem, MenuItemCheckbox, MenuTrigger, MenuPopover, MenuList } from '@fluentui-react-native/menu'; -import { Stack } from '@fluentui-react-native/stack'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { Menu, MenuItem, MenuItemCheckbox, MenuTrigger, MenuPopover, MenuList } from 'fluentui-react-native/menu'; +import { Stack } from 'fluentui-react-native/stack'; import { testImage, svgProps } from '../Common/iconExamples'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Menu/MenuRefs.tsx b/apps/tester-core/src/TestComponents/Menu/MenuRefs.tsx index 4590756f90..17e4e7b733 100644 --- a/apps/tester-core/src/TestComponents/Menu/MenuRefs.tsx +++ b/apps/tester-core/src/TestComponents/Menu/MenuRefs.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; -import { ButtonV1 as Button } from '@fluentui/react-native'; -import { Menu, MenuItem, MenuTrigger, MenuPopover, MenuList } from '@fluentui-react-native/menu'; -import { Stack } from '@fluentui-react-native/stack'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { Menu, MenuItem, MenuTrigger, MenuPopover, MenuList } from 'fluentui-react-native/menu'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Menu/MenuScrollView.tsx b/apps/tester-core/src/TestComponents/Menu/MenuScrollView.tsx index 68427e35df..35a00a5849 100644 --- a/apps/tester-core/src/TestComponents/Menu/MenuScrollView.tsx +++ b/apps/tester-core/src/TestComponents/Menu/MenuScrollView.tsx @@ -1,9 +1,9 @@ import React, { useState } from 'react'; import { TextInput, StyleSheet, View } from 'react-native'; -import { ButtonV1 as Button } from '@fluentui/react-native'; -import { Menu, MenuItem, MenuTrigger, MenuPopover, MenuList } from '@fluentui-react-native/menu'; -import { Stack } from '@fluentui-react-native/stack'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { Menu, MenuItem, MenuTrigger, MenuPopover, MenuList } from 'fluentui-react-native/menu'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle } from '../Common/styles'; import { commonTestStyles as commonStyles } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Menu/MenuTest.tsx b/apps/tester-core/src/TestComponents/Menu/MenuTest.tsx index 2c7aa2cdff..37d64f900e 100644 --- a/apps/tester-core/src/TestComponents/Menu/MenuTest.tsx +++ b/apps/tester-core/src/TestComponents/Menu/MenuTest.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { Platform, StyleSheet, View } from 'react-native'; -import { ButtonV1 as Button } from '@fluentui/react-native'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; import { MENU_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import type { MenuProps } from '@fluentui-react-native/menu'; +import type { MenuProps } from 'fluentui-react-native/menu'; import { Menu, MenuItem, @@ -15,10 +15,10 @@ import { MenuDivider, MenuGroup, MenuGroupHeader, -} from '@fluentui-react-native/menu'; -import { Stack } from '@fluentui-react-native/stack'; -import { Switch } from '@fluentui-react-native/switch'; -import { TextV1 as Text } from '@fluentui-react-native/text'; +} from 'fluentui-react-native/menu'; +import { Stack } from 'fluentui-react-native/stack'; +import { Switch } from 'fluentui-react-native/switch'; +import { TextV1 as Text } from 'fluentui-react-native/text'; import { E2EMenuTest } from './E2EMenuTest'; import { MenuComponentOutsideMenuList } from './MenuComponentOutsideMenuList'; diff --git a/apps/tester-core/src/TestComponents/Menu/MenuTooltips.tsx b/apps/tester-core/src/TestComponents/Menu/MenuTooltips.tsx index 783fabda0f..5b35cd6bc1 100644 --- a/apps/tester-core/src/TestComponents/Menu/MenuTooltips.tsx +++ b/apps/tester-core/src/TestComponents/Menu/MenuTooltips.tsx @@ -1,8 +1,8 @@ import React from 'react'; -import { ButtonV1 as Button } from '@fluentui/react-native'; -import { Menu, MenuItem, MenuItemCheckbox, MenuItemRadio, MenuTrigger, MenuPopover, MenuList } from '@fluentui-react-native/menu'; -import { Stack } from '@fluentui-react-native/stack'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { Menu, MenuItem, MenuItemCheckbox, MenuItemRadio, MenuTrigger, MenuPopover, MenuList } from 'fluentui-react-native/menu'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Menu/MenuTriggerCallbacks.tsx b/apps/tester-core/src/TestComponents/Menu/MenuTriggerCallbacks.tsx index 7c0c4bd384..b43cabd491 100644 --- a/apps/tester-core/src/TestComponents/Menu/MenuTriggerCallbacks.tsx +++ b/apps/tester-core/src/TestComponents/Menu/MenuTriggerCallbacks.tsx @@ -1,9 +1,9 @@ import * as React from 'react'; import type { ColorValue } from 'react-native'; -import { ButtonV1 as Button } from '@fluentui/react-native'; -import { Menu, MenuItem, MenuTrigger, MenuPopover, MenuList } from '@fluentui-react-native/menu'; -import { Stack } from '@fluentui-react-native/stack'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { Menu, MenuItem, MenuTrigger, MenuPopover, MenuList } from 'fluentui-react-native/menu'; +import { Stack } from 'fluentui-react-native/stack'; import Svg, { Path } from 'react-native-svg'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/MenuButtonLegacy/CustomizedMenuButtonTest.tsx b/apps/tester-core/src/TestComponents/MenuButtonLegacy/CustomizedMenuButtonTest.tsx index 1057769e44..b456b9c034 100644 --- a/apps/tester-core/src/TestComponents/MenuButtonLegacy/CustomizedMenuButtonTest.tsx +++ b/apps/tester-core/src/TestComponents/MenuButtonLegacy/CustomizedMenuButtonTest.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { Text, View } from 'react-native'; -import { MenuButton } from '@fluentui/react-native'; +import { MenuButton } from 'fluentui-react-native/menu-button'; import { viewWrapperStyle, columnStyle, rowStyle } from './MenuButtonLegacyTestStyles'; import { menuItems } from './testData'; diff --git a/apps/tester-core/src/TestComponents/MenuButtonLegacy/MenuButtonLegacyE2ETest.tsx b/apps/tester-core/src/TestComponents/MenuButtonLegacy/MenuButtonLegacyE2ETest.tsx index 2193b4d80a..27b4e8d2c9 100644 --- a/apps/tester-core/src/TestComponents/MenuButtonLegacy/MenuButtonLegacyE2ETest.tsx +++ b/apps/tester-core/src/TestComponents/MenuButtonLegacy/MenuButtonLegacyE2ETest.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { Text, View } from 'react-native'; -import type { ContextualMenuProps } from '@fluentui/react-native'; -import { MenuButton } from '@fluentui/react-native'; +import type { ContextualMenuProps } from 'fluentui-react-native/contextual-menu'; +import { MenuButton } from 'fluentui-react-native/menu-button'; import { MENU_BUTTON_TEST_COMPONENT, MENU_BUTTON_ACCESSIBILITY_LABEL, diff --git a/apps/tester-core/src/TestComponents/MenuButtonLegacy/NestedMenuButtonTest.tsx b/apps/tester-core/src/TestComponents/MenuButtonLegacy/NestedMenuButtonTest.tsx index 4e8dba0c19..b85e8b2afa 100644 --- a/apps/tester-core/src/TestComponents/MenuButtonLegacy/NestedMenuButtonTest.tsx +++ b/apps/tester-core/src/TestComponents/MenuButtonLegacy/NestedMenuButtonTest.tsx @@ -1,7 +1,8 @@ import * as React from 'react'; import { Text, View, Switch } from 'react-native'; -import { Separator, MenuButton } from '@fluentui/react-native'; +import { MenuButton } from 'fluentui-react-native/menu-button'; +import { Separator } from 'fluentui-react-native/separator'; import { viewWrapperStyle, columnStyle, rowStyle, textColor } from './MenuButtonLegacyTestStyles'; import { menuItems, iconProps } from './testData'; diff --git a/apps/tester-core/src/TestComponents/MenuButtonLegacy/StandardMenuButtonTest.tsx b/apps/tester-core/src/TestComponents/MenuButtonLegacy/StandardMenuButtonTest.tsx index b07a3c4de0..e97659d102 100644 --- a/apps/tester-core/src/TestComponents/MenuButtonLegacy/StandardMenuButtonTest.tsx +++ b/apps/tester-core/src/TestComponents/MenuButtonLegacy/StandardMenuButtonTest.tsx @@ -1,9 +1,10 @@ import * as React from 'react'; import { Text, View, Switch, Platform } from 'react-native'; -import type { ContextualMenuProps } from '@fluentui/react-native'; -import { Separator, MenuButton } from '@fluentui/react-native'; -import type { IconSourcesType } from '@fluentui-react-native/icon'; +import type { ContextualMenuProps } from 'fluentui-react-native/contextual-menu'; +import { MenuButton } from 'fluentui-react-native/menu-button'; +import { Separator } from 'fluentui-react-native/separator'; +import type { IconSourcesType } from 'fluentui-react-native/icon'; import { viewWrapperStyle, columnStyle, rowStyle, textColor } from './MenuButtonLegacyTestStyles'; import { menuItems, iconProps } from './testData'; diff --git a/apps/tester-core/src/TestComponents/MenuButtonLegacy/testData.ts b/apps/tester-core/src/TestComponents/MenuButtonLegacy/testData.ts index 31ddda93e6..ced7ba37fd 100644 --- a/apps/tester-core/src/TestComponents/MenuButtonLegacy/testData.ts +++ b/apps/tester-core/src/TestComponents/MenuButtonLegacy/testData.ts @@ -1,4 +1,4 @@ -import type { MenuButtonItemProps } from '@fluentui/react-native'; +import type { MenuButtonItemProps } from 'fluentui-react-native/menu-button'; import { MENU_ITEM_1_COMPONENT } from '@fluentui-react-native/e2e-testing'; import { svgProps, testImage } from '../Common/iconExamples'; diff --git a/apps/tester-core/src/TestComponents/MenuButtonV1/CustomizedMenuButtonTest.tsx b/apps/tester-core/src/TestComponents/MenuButtonV1/CustomizedMenuButtonTest.tsx index 4a658a9cf4..6453b685e5 100644 --- a/apps/tester-core/src/TestComponents/MenuButtonV1/CustomizedMenuButtonTest.tsx +++ b/apps/tester-core/src/TestComponents/MenuButtonV1/CustomizedMenuButtonTest.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { Text, View } from 'react-native'; -import { MenuButton } from '@fluentui/react-native'; +import { MenuButton } from 'fluentui-react-native/menu-button'; import { viewWrapperStyle, columnStyle, rowStyle } from './MenuButtonV1TestStyles'; import { menuItems } from './testData'; diff --git a/apps/tester-core/src/TestComponents/MenuButtonV1/MenuButtonV1E2ETest.tsx b/apps/tester-core/src/TestComponents/MenuButtonV1/MenuButtonV1E2ETest.tsx index 6633a5e370..4c452bfae7 100644 --- a/apps/tester-core/src/TestComponents/MenuButtonV1/MenuButtonV1E2ETest.tsx +++ b/apps/tester-core/src/TestComponents/MenuButtonV1/MenuButtonV1E2ETest.tsx @@ -1,14 +1,14 @@ import * as React from 'react'; import { Text, View } from 'react-native'; -import type { ContextualMenuProps } from '@fluentui/react-native'; +import type { ContextualMenuProps } from 'fluentui-react-native/contextual-menu'; import { MENUBUTTONV1_TEST_COMPONENT, MENUBUTTONV1_ACCESSIBILITY_LABEL, MENUBUTTONV1_NO_A11Y_LABEL_COMPONENT, MENUBUTTONV1_TEST_COMPONENT_LABEL, } from '@fluentui-react-native/e2e-testing'; -import { MenuButton } from '@fluentui-react-native/experimental-menu-button'; +import { MenuButton } from 'fluentui-react-native/experimental-menu-button'; import { viewWrapperStyle, columnStyle, rowStyle, textColor } from './MenuButtonV1TestStyles'; import { menuItems } from './testData'; diff --git a/apps/tester-core/src/TestComponents/MenuButtonV1/NestedMenuButtonTest.tsx b/apps/tester-core/src/TestComponents/MenuButtonV1/NestedMenuButtonTest.tsx index a8c7420008..df074ea460 100644 --- a/apps/tester-core/src/TestComponents/MenuButtonV1/NestedMenuButtonTest.tsx +++ b/apps/tester-core/src/TestComponents/MenuButtonV1/NestedMenuButtonTest.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { Text, View, Switch } from 'react-native'; -import { Separator } from '@fluentui/react-native'; -import { MenuButton } from '@fluentui-react-native/experimental-menu-button'; +import { Separator } from 'fluentui-react-native/separator'; +import { MenuButton } from 'fluentui-react-native/experimental-menu-button'; import { viewWrapperStyle, columnStyle, rowStyle, textColor } from './MenuButtonV1TestStyles'; import { menuItems, iconProps } from './testData'; diff --git a/apps/tester-core/src/TestComponents/MenuButtonV1/StandardMenuButtonTest.tsx b/apps/tester-core/src/TestComponents/MenuButtonV1/StandardMenuButtonTest.tsx index 19dd292d1f..5c8044a216 100644 --- a/apps/tester-core/src/TestComponents/MenuButtonV1/StandardMenuButtonTest.tsx +++ b/apps/tester-core/src/TestComponents/MenuButtonV1/StandardMenuButtonTest.tsx @@ -6,10 +6,10 @@ import * as React from 'react'; import { Text, View, Switch, Platform } from 'react-native'; -import type { ContextualMenuProps } from '@fluentui/react-native'; -import { Separator } from '@fluentui/react-native'; -import { MenuButton } from '@fluentui-react-native/experimental-menu-button'; -import type { IconSourcesType } from '@fluentui-react-native/icon'; +import type { ContextualMenuProps } from 'fluentui-react-native/contextual-menu'; +import { Separator } from 'fluentui-react-native/separator'; +import { MenuButton } from 'fluentui-react-native/experimental-menu-button'; +import type { IconSourcesType } from 'fluentui-react-native/icon'; import { viewWrapperStyle, columnStyle, rowStyle, textColor } from './MenuButtonV1TestStyles'; import { menuItems, iconProps } from './testData'; diff --git a/apps/tester-core/src/TestComponents/MenuButtonV1/testData.ts b/apps/tester-core/src/TestComponents/MenuButtonV1/testData.ts index 84b90227af..ed5e82a80a 100644 --- a/apps/tester-core/src/TestComponents/MenuButtonV1/testData.ts +++ b/apps/tester-core/src/TestComponents/MenuButtonV1/testData.ts @@ -1,4 +1,4 @@ -import type { MenuButtonItemProps } from '@fluentui/react-native'; +import type { MenuButtonItemProps } from 'fluentui-react-native/menu-button'; import { testImage, svgProps } from '../Common/iconExamples'; diff --git a/apps/tester-core/src/TestComponents/NativeDatePicker/NativeDatePickerTest.tsx b/apps/tester-core/src/TestComponents/NativeDatePicker/NativeDatePickerTest.tsx index c0b3a4a9ee..e2016e03d0 100644 --- a/apps/tester-core/src/TestComponents/NativeDatePicker/NativeDatePickerTest.tsx +++ b/apps/tester-core/src/TestComponents/NativeDatePicker/NativeDatePickerTest.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { Platform, Switch, View } from 'react-native'; -import { Text } from '@fluentui/react-native'; -import { Button } from '@fluentui-react-native/button'; -import { NativeDatePicker } from '@fluentui-react-native/experimental-native-date-picker'; -import { Stack } from '@fluentui-react-native/stack'; +import { Text } from 'fluentui-react-native/text'; +import { Button } from 'fluentui-react-native/button'; +import { NativeDatePicker } from 'fluentui-react-native/experimental-native-date-picker'; +import { Stack } from 'fluentui-react-native/stack'; import { NATIVEDATEPICKER_TESTPAGE } from './consts'; import { stackStyle, commonTestStyles as commonStyles } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Notification/NotificationTest.tsx b/apps/tester-core/src/TestComponents/Notification/NotificationTest.tsx index db0e5183df..3c8f3ee921 100644 --- a/apps/tester-core/src/TestComponents/Notification/NotificationTest.tsx +++ b/apps/tester-core/src/TestComponents/Notification/NotificationTest.tsx @@ -1,11 +1,11 @@ import * as React from 'react'; import { Animated, StyleSheet, Switch, TextInput, View } from 'react-native'; -import { ButtonV1 as Button } from '@fluentui-react-native/button'; -import type { SvgIconProps } from '@fluentui-react-native/icon'; -import type { NotificationVariant } from '@fluentui-react-native/notification'; -import { Notification, NotificationVariants } from '@fluentui-react-native/notification'; -import { TextV1 as Text } from '@fluentui-react-native/text'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import type { SvgIconProps } from 'fluentui-react-native/icon'; +import type { NotificationVariant } from 'fluentui-react-native/notification'; +import { Notification, NotificationVariants } from 'fluentui-react-native/notification'; +import { TextV1 as Text } from 'fluentui-react-native/text'; import PlayButton from '../../../assets/play_button.svg'; import { StyledPicker } from '../Common/StyledPicker'; diff --git a/apps/tester-core/src/TestComponents/Overflow/OverflowE2ETest.tsx b/apps/tester-core/src/TestComponents/Overflow/OverflowE2ETest.tsx index f57fd95299..7ef7d894fd 100644 --- a/apps/tester-core/src/TestComponents/Overflow/OverflowE2ETest.tsx +++ b/apps/tester-core/src/TestComponents/Overflow/OverflowE2ETest.tsx @@ -2,8 +2,8 @@ import * as React from 'react'; import { View, StyleSheet } from 'react-native'; import type { StyleProp, ViewStyle } from 'react-native'; -import { ButtonV1 as Button } from '@fluentui-react-native/button'; -import { Divider } from '@fluentui-react-native/divider'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { Divider } from 'fluentui-react-native/divider'; import { FIRST_OVERFLOW_ITEM, FIRST_OVERFLOW_ITEM_ID, @@ -22,9 +22,9 @@ import { RADIO_275, RADIO_375, } from '@fluentui-react-native/e2e-testing'; -import { Overflow, OverflowItem, useOverflowMenu } from '@fluentui-react-native/overflow'; -import { RadioGroupV1 as RadioGroup, Radio } from '@fluentui-react-native/radio-group'; -import { TextV1 as Text } from '@fluentui-react-native/text'; +import { Overflow, OverflowItem, useOverflowMenu } from 'fluentui-react-native/overflow'; +import { RadioGroupV1 as RadioGroup, Radio } from 'fluentui-react-native/radio-group'; +import { TextV1 as Text } from 'fluentui-react-native/text'; const styles = StyleSheet.create({ menu: { diff --git a/apps/tester-core/src/TestComponents/Overflow/OverflowTest.tsx b/apps/tester-core/src/TestComponents/Overflow/OverflowTest.tsx index f069c92abc..db0b7f3922 100644 --- a/apps/tester-core/src/TestComponents/Overflow/OverflowTest.tsx +++ b/apps/tester-core/src/TestComponents/Overflow/OverflowTest.tsx @@ -2,13 +2,13 @@ import * as React from 'react'; import { View, StyleSheet } from 'react-native'; import type { ViewStyle } from 'react-native'; -import { ButtonV1 as Button } from '@fluentui-react-native/button'; -import { Divider } from '@fluentui-react-native/divider'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { Divider } from 'fluentui-react-native/divider'; import { OVERFLOW_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import { Menu, MenuTrigger, MenuList, MenuPopover, MenuItem } from '@fluentui-react-native/menu'; -import { Overflow, OverflowItem, useOverflowMenu } from '@fluentui-react-native/overflow'; -import { TabList, Tab } from '@fluentui-react-native/tablist'; -import { TextV1 as Text } from '@fluentui-react-native/text'; +import { Menu, MenuTrigger, MenuList, MenuPopover, MenuItem } from 'fluentui-react-native/menu'; +import { Overflow, OverflowItem, useOverflowMenu } from 'fluentui-react-native/overflow'; +import { TabList, Tab } from 'fluentui-react-native/tablist'; +import { TextV1 as Text } from 'fluentui-react-native/text'; import { E2EOverflowTest } from './OverflowE2ETest'; import MoreHorizontalIcon from '../../../assets/MoreHorizontalFilled.svg'; diff --git a/apps/tester-core/src/TestComponents/Persona/CustomizeUsage.tsx b/apps/tester-core/src/TestComponents/Persona/CustomizeUsage.tsx index 5749d8d5f1..0123941fd9 100644 --- a/apps/tester-core/src/TestComponents/Persona/CustomizeUsage.tsx +++ b/apps/tester-core/src/TestComponents/Persona/CustomizeUsage.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { View, Text, Switch, TextInput } from 'react-native'; -import { Persona } from '@fluentui/react-native'; -import type { Theme } from '@fluentui-react-native/theme-types'; -import { useTheme } from '@fluentui-react-native/theme-types'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { Persona } from 'fluentui-react-native/persona'; +import type { Theme } from 'fluentui-react-native/theme-types'; +import { useTheme } from 'fluentui-react-native/theme-types'; +import { themedStyleSheet } from 'fluentui-react-native/themed-stylesheet'; import { michaelImageUrl } from './styles'; import { Slider } from '../Common/Slider'; diff --git a/apps/tester-core/src/TestComponents/Persona/StandardUsage.tsx b/apps/tester-core/src/TestComponents/Persona/StandardUsage.tsx index bbeb992ffd..c3df035b75 100644 --- a/apps/tester-core/src/TestComponents/Persona/StandardUsage.tsx +++ b/apps/tester-core/src/TestComponents/Persona/StandardUsage.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { View, Text, Switch } from 'react-native'; -import type { PersonaSize } from '@fluentui/react-native'; -import { Persona } from '@fluentui/react-native'; +import type { PersonaSize } from 'fluentui-react-native/persona-coin'; +import { Persona } from 'fluentui-react-native/persona'; import { satyaImageUrl } from './styles'; import { MenuPicker } from '../Common/MenuPicker'; diff --git a/apps/tester-core/src/TestComponents/PersonaCoin/CustomizeUsage.mobile.tsx b/apps/tester-core/src/TestComponents/PersonaCoin/CustomizeUsage.mobile.tsx index 342b4e1889..2d8518bccb 100644 --- a/apps/tester-core/src/TestComponents/PersonaCoin/CustomizeUsage.mobile.tsx +++ b/apps/tester-core/src/TestComponents/PersonaCoin/CustomizeUsage.mobile.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { Switch, View, Text, TextInput, StyleSheet } from 'react-native'; -import { PersonaCoin } from '@fluentui/react-native'; -import { useTheme } from '@fluentui-react-native/theme-types'; +import { PersonaCoin } from 'fluentui-react-native/persona-coin'; +import { useTheme } from 'fluentui-react-native/theme-types'; import Slider from '@react-native-community/slider'; import type { SliderProps } from '@react-native-community/slider'; diff --git a/apps/tester-core/src/TestComponents/PersonaCoin/CustomizeUsage.tsx b/apps/tester-core/src/TestComponents/PersonaCoin/CustomizeUsage.tsx index d0f0293d80..c37a42e97b 100644 --- a/apps/tester-core/src/TestComponents/PersonaCoin/CustomizeUsage.tsx +++ b/apps/tester-core/src/TestComponents/PersonaCoin/CustomizeUsage.tsx @@ -1,11 +1,11 @@ import * as React from 'react'; import { Switch, View, Text, TextInput } from 'react-native'; -import type { IconAlignment } from '@fluentui/react-native'; -import { PersonaCoin } from '@fluentui/react-native'; -import type { Theme } from '@fluentui-react-native/theme-types'; -import { useTheme } from '@fluentui-react-native/theme-types'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import type { IconAlignment } from 'fluentui-react-native/persona-coin'; +import { PersonaCoin } from 'fluentui-react-native/persona-coin'; +import type { Theme } from 'fluentui-react-native/theme-types'; +import { useTheme } from 'fluentui-react-native/theme-types'; +import { themedStyleSheet } from 'fluentui-react-native/themed-stylesheet'; import { steveBallmerPhotoUrl } from './styles'; import { AlignmentPicker } from '../Common/AlignmentPicker'; diff --git a/apps/tester-core/src/TestComponents/PersonaCoin/StandardUsage.tsx b/apps/tester-core/src/TestComponents/PersonaCoin/StandardUsage.tsx index d01a367c8c..88298628b4 100644 --- a/apps/tester-core/src/TestComponents/PersonaCoin/StandardUsage.tsx +++ b/apps/tester-core/src/TestComponents/PersonaCoin/StandardUsage.tsx @@ -2,9 +2,9 @@ import * as React from 'react'; import type { ColorValue } from 'react-native'; import { Switch, View, Text } from 'react-native'; -import type { PersonaSize, PersonaCoinFluentColor, PersonaPresence } from '@fluentui/react-native'; -import { PersonaCoin } from '@fluentui/react-native'; -import { useTheme } from '@fluentui-react-native/theme-types'; +import type { PersonaSize, PersonaCoinFluentColor, PersonaPresence } from 'fluentui-react-native/persona-coin'; +import { PersonaCoin } from 'fluentui-react-native/persona-coin'; +import { useTheme } from 'fluentui-react-native/theme-types'; import { satyaPhotoUrl, undefinedText } from './styles'; import { StyledPicker } from '../Common/StyledPicker'; diff --git a/apps/tester-core/src/TestComponents/Pressable/PressableTest.tsx b/apps/tester-core/src/TestComponents/Pressable/PressableTest.tsx index 0a83c158c6..cbba9793a7 100644 --- a/apps/tester-core/src/TestComponents/Pressable/PressableTest.tsx +++ b/apps/tester-core/src/TestComponents/Pressable/PressableTest.tsx @@ -2,11 +2,11 @@ import * as React from 'react'; import type { GestureResponderEvent, ViewProps, ViewStyle } from 'react-native'; import { Alert, StyleSheet, View, Text } from 'react-native'; -import { Pressable } from '@fluentui/react-native'; +import { Pressable } from 'fluentui-react-native/pressable'; import { PRESSABLE_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import { useFocusState, useHoverState, usePressState } from '@fluentui-react-native/interactive-hooks'; -import type { IPressableState } from '@fluentui-react-native/interactive-hooks'; -import { Stack } from '@fluentui-react-native/stack'; +import { useFocusState, useHoverState, usePressState } from 'fluentui-react-native/interactive-hooks'; +import type { IPressableState } from 'fluentui-react-native/interactive-hooks'; +import { Stack } from 'fluentui-react-native/stack'; import { Square } from '../Common/Square'; import type { TestSection, PlatformStatus } from '../Test'; diff --git a/apps/tester-core/src/TestComponents/RadioGroupLegacy/RadioGroupLegacyE2ETest.tsx b/apps/tester-core/src/TestComponents/RadioGroupLegacy/RadioGroupLegacyE2ETest.tsx index 211359e3d3..1b7edbd784 100644 --- a/apps/tester-core/src/TestComponents/RadioGroupLegacy/RadioGroupLegacyE2ETest.tsx +++ b/apps/tester-core/src/TestComponents/RadioGroupLegacy/RadioGroupLegacyE2ETest.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { View } from 'react-native'; -import { RadioButton, RadioGroup } from '@fluentui/react-native'; +import { RadioButton, RadioGroup } from 'fluentui-react-native/radio-group'; import { RADIOGROUP_TEST_COMPONENT, RADIOGROUP_NO_A11Y_LABEL_COMPONENT, @@ -14,7 +14,7 @@ import { FIRST_RADIO_BUTTON_ACCESSIBILITY_LABEL, SECOND_RADIO_BUTTON_LABEL, } from '@fluentui-react-native/e2e-testing'; -import { Stack } from '@fluentui-react-native/stack'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle } from '../Common/styles'; import { testProps } from '../Common/TestProps'; diff --git a/apps/tester-core/src/TestComponents/RadioGroupLegacy/RadioGroupLegacyTest.tsx b/apps/tester-core/src/TestComponents/RadioGroupLegacy/RadioGroupLegacyTest.tsx index 675848de24..6f112832f5 100644 --- a/apps/tester-core/src/TestComponents/RadioGroupLegacy/RadioGroupLegacyTest.tsx +++ b/apps/tester-core/src/TestComponents/RadioGroupLegacy/RadioGroupLegacyTest.tsx @@ -1,7 +1,8 @@ import * as React from 'react'; import { View } from 'react-native'; -import { RadioButton, RadioGroup, Separator } from '@fluentui/react-native'; +import { RadioButton, RadioGroup } from 'fluentui-react-native/radio-group'; +import { Separator } from 'fluentui-react-native/separator'; import { RADIOGROUP_TESTPAGE } from '@fluentui-react-native/e2e-testing'; import { RadioGroupLegacyE2ETest } from './RadioGroupLegacyE2ETest'; diff --git a/apps/tester-core/src/TestComponents/RadioGroupV1/CustomizedRadioGroup.tsx b/apps/tester-core/src/TestComponents/RadioGroupV1/CustomizedRadioGroup.tsx index 651a876179..b360668e91 100644 --- a/apps/tester-core/src/TestComponents/RadioGroupV1/CustomizedRadioGroup.tsx +++ b/apps/tester-core/src/TestComponents/RadioGroupV1/CustomizedRadioGroup.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { View, TextInput, Text, StyleSheet } from 'react-native'; -import type { RadioGroupTokens, RadioTokens } from '@fluentui-react-native/radio-group'; -import { RadioGroupV1 as RadioGroup, Radio } from '@fluentui-react-native/radio-group'; +import type { RadioGroupTokens, RadioTokens } from 'fluentui-react-native/radio-group'; +import { RadioGroupV1 as RadioGroup, Radio } from 'fluentui-react-native/radio-group'; import { commonTestStyles as commonStyles } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/RadioGroupV1/DefaultRadioGroup.android.tsx b/apps/tester-core/src/TestComponents/RadioGroupV1/DefaultRadioGroup.android.tsx index 31731a0c92..355be402a8 100644 --- a/apps/tester-core/src/TestComponents/RadioGroupV1/DefaultRadioGroup.android.tsx +++ b/apps/tester-core/src/TestComponents/RadioGroupV1/DefaultRadioGroup.android.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { View } from 'react-native'; -import { RadioGroupV1 as RadioGroup, Radio } from '@fluentui-react-native/radio-group'; +import { RadioGroupV1 as RadioGroup, Radio } from 'fluentui-react-native/radio-group'; export const DefaultRadioGroup: React.FunctionComponent = () => { // Client's example onChange function diff --git a/apps/tester-core/src/TestComponents/RadioGroupV1/DefaultRadioGroup.tsx b/apps/tester-core/src/TestComponents/RadioGroupV1/DefaultRadioGroup.tsx index 6c1f5b2f2f..ffcea05635 100644 --- a/apps/tester-core/src/TestComponents/RadioGroupV1/DefaultRadioGroup.tsx +++ b/apps/tester-core/src/TestComponents/RadioGroupV1/DefaultRadioGroup.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { View } from 'react-native'; -import { Separator } from '@fluentui/react-native'; -import { RadioGroupV1 as RadioGroup, Radio } from '@fluentui-react-native/radio-group'; +import { Separator } from 'fluentui-react-native/separator'; +import { RadioGroupV1 as RadioGroup, Radio } from 'fluentui-react-native/radio-group'; export const DefaultRadioGroup: React.FunctionComponent = () => { // Client's example onChange function diff --git a/apps/tester-core/src/TestComponents/RadioGroupV1/DisabledRadioGroup.tsx b/apps/tester-core/src/TestComponents/RadioGroupV1/DisabledRadioGroup.tsx index 79ce2946df..12173022d2 100644 --- a/apps/tester-core/src/TestComponents/RadioGroupV1/DisabledRadioGroup.tsx +++ b/apps/tester-core/src/TestComponents/RadioGroupV1/DisabledRadioGroup.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { View } from 'react-native'; -import { Separator } from '@fluentui/react-native'; -import { RadioGroupV1 as RadioGroup, Radio } from '@fluentui-react-native/radio-group'; +import { Separator } from 'fluentui-react-native/separator'; +import { RadioGroupV1 as RadioGroup, Radio } from 'fluentui-react-native/radio-group'; export const DisabledRadioGroup: React.FunctionComponent = () => { // Client's example onChange function diff --git a/apps/tester-core/src/TestComponents/RadioGroupV1/HorizontalRadioGroup.tsx b/apps/tester-core/src/TestComponents/RadioGroupV1/HorizontalRadioGroup.tsx index 5e06728540..f0adc9caf4 100644 --- a/apps/tester-core/src/TestComponents/RadioGroupV1/HorizontalRadioGroup.tsx +++ b/apps/tester-core/src/TestComponents/RadioGroupV1/HorizontalRadioGroup.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { View } from 'react-native'; -import { Separator } from '@fluentui/react-native'; -import { RadioGroupV1 as RadioGroup, Radio } from '@fluentui-react-native/radio-group'; +import { Separator } from 'fluentui-react-native/separator'; +import { RadioGroupV1 as RadioGroup, Radio } from 'fluentui-react-native/radio-group'; export const HorizontalRadioGroup: React.FunctionComponent = () => { // Client's example onChange function diff --git a/apps/tester-core/src/TestComponents/RadioGroupV1/RadioGroupV1E2ETest.tsx b/apps/tester-core/src/TestComponents/RadioGroupV1/RadioGroupV1E2ETest.tsx index 3a9899dc9e..8bad709c12 100644 --- a/apps/tester-core/src/TestComponents/RadioGroupV1/RadioGroupV1E2ETest.tsx +++ b/apps/tester-core/src/TestComponents/RadioGroupV1/RadioGroupV1E2ETest.tsx @@ -14,8 +14,8 @@ import { FIRST_RADIO_ACCESSIBILITY_LABEL, SECOND_RADIO_LABEL, } from '@fluentui-react-native/e2e-testing'; -import { RadioGroupV1 as RadioGroup, Radio } from '@fluentui-react-native/radio-group'; -import { Stack } from '@fluentui-react-native/stack'; +import { RadioGroupV1 as RadioGroup, Radio } from 'fluentui-react-native/radio-group'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle } from '../Common/styles'; import { testProps } from '../Common/TestProps'; diff --git a/apps/tester-core/src/TestComponents/RadioGroupV1/RequiredRadioGroup.tsx b/apps/tester-core/src/TestComponents/RadioGroupV1/RequiredRadioGroup.tsx index f8796e9b5c..9f7bdc36d7 100644 --- a/apps/tester-core/src/TestComponents/RadioGroupV1/RequiredRadioGroup.tsx +++ b/apps/tester-core/src/TestComponents/RadioGroupV1/RequiredRadioGroup.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { View } from 'react-native'; -import { RadioGroupV1 as RadioGroup, Radio } from '@fluentui-react-native/radio-group'; +import { RadioGroupV1 as RadioGroup, Radio } from 'fluentui-react-native/radio-group'; export const RequiredRadioGroup: React.FunctionComponent = () => { // Client's example onChange function diff --git a/apps/tester-core/src/TestComponents/RadioGroupV1/SubtextRadioGroup.tsx b/apps/tester-core/src/TestComponents/RadioGroupV1/SubtextRadioGroup.tsx index 3cd8a4d7f1..916277c7ca 100644 --- a/apps/tester-core/src/TestComponents/RadioGroupV1/SubtextRadioGroup.tsx +++ b/apps/tester-core/src/TestComponents/RadioGroupV1/SubtextRadioGroup.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { View } from 'react-native'; -import { RadioGroupV1 as RadioGroup, Radio } from '@fluentui-react-native/radio-group'; +import { RadioGroupV1 as RadioGroup, Radio } from 'fluentui-react-native/radio-group'; export const SubtextRadioGroup: React.FunctionComponent = () => { // Client's example onChange function diff --git a/apps/tester-core/src/TestComponents/Separator/SeparatorTest.mobile.tsx b/apps/tester-core/src/TestComponents/Separator/SeparatorTest.mobile.tsx index 25c3c2af69..929418d27a 100644 --- a/apps/tester-core/src/TestComponents/Separator/SeparatorTest.mobile.tsx +++ b/apps/tester-core/src/TestComponents/Separator/SeparatorTest.mobile.tsx @@ -1,9 +1,9 @@ import * as React from 'react'; import { SEPARATOR_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import { Separator } from '@fluentui-react-native/separator'; -import { Stack } from '@fluentui-react-native/stack'; -import { TextV1 as Text } from '@fluentui-react-native/text'; +import { Separator } from 'fluentui-react-native/separator'; +import { Stack } from 'fluentui-react-native/stack'; +import { TextV1 as Text } from 'fluentui-react-native/text'; import { commonTestStyles, mobileStyles } from '../Common/styles'; import type { TestSection, PlatformStatus } from '../Test'; diff --git a/apps/tester-core/src/TestComponents/Separator/SeparatorTest.tsx b/apps/tester-core/src/TestComponents/Separator/SeparatorTest.tsx index b08b13fcd0..73264fade5 100644 --- a/apps/tester-core/src/TestComponents/Separator/SeparatorTest.tsx +++ b/apps/tester-core/src/TestComponents/Separator/SeparatorTest.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; -import { ButtonV1 } from '@fluentui-react-native/button'; +import { ButtonV1 } from 'fluentui-react-native/button'; import { SEPARATOR_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import { Separator } from '@fluentui-react-native/separator'; -import { Stack } from '@fluentui-react-native/stack'; -import { TextV1 as Text } from '@fluentui-react-native/text'; +import { Separator } from 'fluentui-react-native/separator'; +import { Stack } from 'fluentui-react-native/stack'; +import { TextV1 as Text } from 'fluentui-react-native/text'; import { stackStyle, separatorStackStyle } from '../Common/styles'; import type { TestSection, PlatformStatus } from '../Test'; diff --git a/apps/tester-core/src/TestComponents/Shadow/ShadowButtonTestSection.tsx b/apps/tester-core/src/TestComponents/Shadow/ShadowButtonTestSection.tsx index e39ffbe936..a7072e2a53 100644 --- a/apps/tester-core/src/TestComponents/Shadow/ShadowButtonTestSection.tsx +++ b/apps/tester-core/src/TestComponents/Shadow/ShadowButtonTestSection.tsx @@ -1,10 +1,11 @@ import * as React from 'react'; import { Platform, View, StyleSheet } from 'react-native'; -import { FAB, Text } from '@fluentui/react-native'; -import { ButtonV1 as Button } from '@fluentui-react-native/button'; -import { Shadow } from '@fluentui-react-native/experimental-shadow'; -import { useFluentTheme } from '@fluentui-react-native/framework'; +import { FAB } from 'fluentui-react-native/button'; +import { Text } from 'fluentui-react-native/text'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { Shadow } from 'fluentui-react-native/experimental-shadow'; +import { useFluentTheme } from 'fluentui-react-native/framework'; import { shadowTestPageStyles } from './ShadowTestPageStyles'; import { iconProps } from '../Common/iconExamples'; diff --git a/apps/tester-core/src/TestComponents/Shadow/ShadowDepthTestSection.tsx b/apps/tester-core/src/TestComponents/Shadow/ShadowDepthTestSection.tsx index 78fba881a8..51f2f3f3af 100644 --- a/apps/tester-core/src/TestComponents/Shadow/ShadowDepthTestSection.tsx +++ b/apps/tester-core/src/TestComponents/Shadow/ShadowDepthTestSection.tsx @@ -1,12 +1,12 @@ import * as React from 'react'; import { View, type ViewStyle } from 'react-native'; -import { Text } from '@fluentui/react-native'; -import { Shadow, getShadowTokenStyleSet } from '@fluentui-react-native/experimental-shadow'; -import { mergeStyles, useFluentTheme } from '@fluentui-react-native/framework'; -import type { ShadowToken, Theme } from '@fluentui-react-native/theme-types'; -import { useTheme } from '@fluentui-react-native/theme-types'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { Text } from 'fluentui-react-native/text'; +import { Shadow, getShadowTokenStyleSet } from 'fluentui-react-native/experimental-shadow'; +import { mergeStyles, useFluentTheme } from 'fluentui-react-native/framework'; +import type { ShadowToken, Theme } from 'fluentui-react-native/theme-types'; +import { useTheme } from 'fluentui-react-native/theme-types'; +import { themedStyleSheet } from 'fluentui-react-native/themed-stylesheet'; import { shadowTestPageStyles } from './ShadowTestPageStyles'; diff --git a/apps/tester-core/src/TestComponents/Shadow/ShadowTestPageStyles.tsx b/apps/tester-core/src/TestComponents/Shadow/ShadowTestPageStyles.tsx index 3c14b8bf45..848b7fa085 100644 --- a/apps/tester-core/src/TestComponents/Shadow/ShadowTestPageStyles.tsx +++ b/apps/tester-core/src/TestComponents/Shadow/ShadowTestPageStyles.tsx @@ -1,7 +1,7 @@ import { Platform } from 'react-native'; -import type { Theme } from '@fluentui-react-native/theme-types'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import type { Theme } from 'fluentui-react-native/theme-types'; +import { themedStyleSheet } from 'fluentui-react-native/themed-stylesheet'; /** * The default dark mode iOS background color from the theme is black ('#000000'), which shadows are not visible against. diff --git a/apps/tester-core/src/TestComponents/Shadow/ShadowWithDifferentPropsTestSection.tsx b/apps/tester-core/src/TestComponents/Shadow/ShadowWithDifferentPropsTestSection.tsx index abbe58fa25..811d70d381 100644 --- a/apps/tester-core/src/TestComponents/Shadow/ShadowWithDifferentPropsTestSection.tsx +++ b/apps/tester-core/src/TestComponents/Shadow/ShadowWithDifferentPropsTestSection.tsx @@ -1,12 +1,12 @@ import * as React from 'react'; import { View, type ViewStyle } from 'react-native'; -import { Text } from '@fluentui/react-native'; -import { Shadow } from '@fluentui-react-native/experimental-shadow'; -import type { Theme } from '@fluentui-react-native/framework'; -import { useFluentTheme } from '@fluentui-react-native/framework'; -import { mergeStyles } from '@fluentui-react-native/framework-base'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { Text } from 'fluentui-react-native/text'; +import { Shadow } from 'fluentui-react-native/experimental-shadow'; +import type { Theme } from 'fluentui-react-native/framework'; +import { useFluentTheme } from 'fluentui-react-native/framework'; +import { mergeStyles } from 'fluentui-react-native/framework-base'; +import { themedStyleSheet } from 'fluentui-react-native/themed-stylesheet'; import { shadowTestPageStyles } from './ShadowTestPageStyles'; diff --git a/apps/tester-core/src/TestComponents/Shimmer/ShimmerE2ETest.tsx b/apps/tester-core/src/TestComponents/Shimmer/ShimmerE2ETest.tsx index 3be301da38..2973680d95 100644 --- a/apps/tester-core/src/TestComponents/Shimmer/ShimmerE2ETest.tsx +++ b/apps/tester-core/src/TestComponents/Shimmer/ShimmerE2ETest.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { SHIMMER_TEST_COMPONENT } from '@fluentui-react-native/e2e-testing'; -import { Shimmer } from '@fluentui-react-native/experimental-shimmer'; -import { Stack } from '@fluentui-react-native/stack'; +import { Shimmer } from 'fluentui-react-native/experimental-shimmer'; +import { Stack } from 'fluentui-react-native/stack'; import { shimmerRectsAndRect } from './ShimmerTestElementSets'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Shimmer/ShimmerTest.tsx b/apps/tester-core/src/TestComponents/Shimmer/ShimmerTest.tsx index eacfa9666e..c1f98c31f8 100644 --- a/apps/tester-core/src/TestComponents/Shimmer/ShimmerTest.tsx +++ b/apps/tester-core/src/TestComponents/Shimmer/ShimmerTest.tsx @@ -2,8 +2,8 @@ import * as React from 'react'; import { Platform, StyleSheet } from 'react-native'; import { SHIMMER_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import { Shimmer } from '@fluentui-react-native/experimental-shimmer'; -import { Stack } from '@fluentui-react-native/stack'; +import { Shimmer } from 'fluentui-react-native/experimental-shimmer'; +import { Stack } from 'fluentui-react-native/stack'; import { E2ETestingShimmer } from './ShimmerE2ETest'; import { shimmerBorderRadiusTests, shimmerRectsAndRect, shimmerRectsAndCircle } from './ShimmerTestElementSets'; diff --git a/apps/tester-core/src/TestComponents/Shimmer/ShimmerTestElementSets.tsx b/apps/tester-core/src/TestComponents/Shimmer/ShimmerTestElementSets.tsx index f103cc801b..2423c8aff5 100644 --- a/apps/tester-core/src/TestComponents/Shimmer/ShimmerTestElementSets.tsx +++ b/apps/tester-core/src/TestComponents/Shimmer/ShimmerTestElementSets.tsx @@ -1,4 +1,4 @@ -import type { ShimmerRectElement, ShimmerCircleElement } from '@fluentui-react-native/experimental-shimmer'; +import type { ShimmerRectElement, ShimmerCircleElement } from 'fluentui-react-native/experimental-shimmer'; export function shimmerRects(): Array { return [ diff --git a/apps/tester-core/src/TestComponents/Spacing/SpacingTest.tsx b/apps/tester-core/src/TestComponents/Spacing/SpacingTest.tsx index 1e72e84e0f..8a8fc25d29 100644 --- a/apps/tester-core/src/TestComponents/Spacing/SpacingTest.tsx +++ b/apps/tester-core/src/TestComponents/Spacing/SpacingTest.tsx @@ -2,8 +2,8 @@ import * as React from 'react'; import { Text, View } from 'react-native'; import { SPACING_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import { Stack } from '@fluentui-react-native/stack'; -import { globalTokens } from '@fluentui-react-native/theme-tokens'; +import { Stack } from 'fluentui-react-native/stack'; +import { globalTokens } from 'fluentui-react-native/theme-tokens'; import { stackStyle } from '../Common/styles'; import type { TestSection, PlatformStatus } from '../Test'; diff --git a/apps/tester-core/src/TestComponents/Spinner/SpinnerE2ETest.tsx b/apps/tester-core/src/TestComponents/Spinner/SpinnerE2ETest.tsx index c446ce7aba..865c6ed397 100644 --- a/apps/tester-core/src/TestComponents/Spinner/SpinnerE2ETest.tsx +++ b/apps/tester-core/src/TestComponents/Spinner/SpinnerE2ETest.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { SPINNER_TEST_COMPONENT } from '@fluentui-react-native/e2e-testing'; -import { Spinner } from '@fluentui-react-native/spinner'; -import { Stack } from '@fluentui-react-native/stack'; +import { Spinner } from 'fluentui-react-native/spinner'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle } from '../Common/styles'; import { testProps } from '../Common/TestProps'; diff --git a/apps/tester-core/src/TestComponents/Spinner/SpinnerTest.tsx b/apps/tester-core/src/TestComponents/Spinner/SpinnerTest.tsx index 4d404b59f9..01bb44de5c 100644 --- a/apps/tester-core/src/TestComponents/Spinner/SpinnerTest.tsx +++ b/apps/tester-core/src/TestComponents/Spinner/SpinnerTest.tsx @@ -2,10 +2,10 @@ import * as React from 'react'; import { View, Switch } from 'react-native'; import { SPINNER_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import type { SpinnerStatus } from '@fluentui-react-native/spinner'; -import { Spinner } from '@fluentui-react-native/spinner'; -import { Stack } from '@fluentui-react-native/stack'; -import { Text, TextV1 } from '@fluentui-react-native/text'; +import type { SpinnerStatus } from 'fluentui-react-native/spinner'; +import { Spinner } from 'fluentui-react-native/spinner'; +import { Stack } from 'fluentui-react-native/stack'; +import { Text, TextV1 } from 'fluentui-react-native/text'; import { E2ETestingSpinner } from './SpinnerE2ETest'; import { stackStyle, commonTestStyles as commonStyles, commonTestStyles } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Spinner/SpinnerTest.win32.tsx b/apps/tester-core/src/TestComponents/Spinner/SpinnerTest.win32.tsx index 53e7ffb701..373d58f0c4 100644 --- a/apps/tester-core/src/TestComponents/Spinner/SpinnerTest.win32.tsx +++ b/apps/tester-core/src/TestComponents/Spinner/SpinnerTest.win32.tsx @@ -3,9 +3,9 @@ import { View /*Switch */ } from 'react-native'; //import type { SpinnerStatus } from '@fluentui-react-native/spinner'; import { SPINNER_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import { Spinner } from '@fluentui-react-native/spinner'; -import { Stack } from '@fluentui-react-native/stack'; -import { TextV1 as Text } from '@fluentui-react-native/text'; +import { Spinner } from 'fluentui-react-native/spinner'; +import { Stack } from 'fluentui-react-native/stack'; +import { TextV1 as Text } from 'fluentui-react-native/text'; import { E2ETestingSpinner } from './SpinnerE2ETest'; import { stackStyle, commonTestStyles as commonStyles } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/StrokeWidth/StrokeWidthTest.tsx b/apps/tester-core/src/TestComponents/StrokeWidth/StrokeWidthTest.tsx index 678356e943..de1d4e0c88 100644 --- a/apps/tester-core/src/TestComponents/StrokeWidth/StrokeWidthTest.tsx +++ b/apps/tester-core/src/TestComponents/StrokeWidth/StrokeWidthTest.tsx @@ -1,14 +1,14 @@ import * as React from 'react'; import { View } from 'react-native'; -import { Text } from '@fluentui/react-native'; +import { Text } from 'fluentui-react-native/text'; import { STROKEWIDTH_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import type { Theme } from '@fluentui-react-native/framework'; -import { useFluentTheme } from '@fluentui-react-native/framework'; -import { Stack } from '@fluentui-react-native/stack'; -import { globalTokens } from '@fluentui-react-native/theme-tokens'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; -import { getCurrentAppearance } from '@fluentui-react-native/theming-utils'; +import type { Theme } from 'fluentui-react-native/framework'; +import { useFluentTheme } from 'fluentui-react-native/framework'; +import { Stack } from 'fluentui-react-native/stack'; +import { globalTokens } from 'fluentui-react-native/theme-tokens'; +import { themedStyleSheet } from 'fluentui-react-native/themed-stylesheet'; +import { getCurrentAppearance } from 'fluentui-react-native/theming-utils'; import { stackStyle } from '../Common/styles'; import type { TestSection, PlatformStatus } from '../Test'; diff --git a/apps/tester-core/src/TestComponents/Svg/SvgTest.tsx b/apps/tester-core/src/TestComponents/Svg/SvgTest.tsx index 7745266c51..3d77ec677e 100644 --- a/apps/tester-core/src/TestComponents/Svg/SvgTest.tsx +++ b/apps/tester-core/src/TestComponents/Svg/SvgTest.tsx @@ -2,10 +2,10 @@ import * as React from 'react'; import { useState } from 'react'; import { StyleSheet, Switch, Text, TextInput, View } from 'react-native'; -import { ButtonV1 as Button, ToggleButton } from '@fluentui/react-native'; -import { Separator } from '@fluentui/react-native'; +import { ButtonV1 as Button, ToggleButton } from 'fluentui-react-native/button'; +import { Separator } from 'fluentui-react-native/separator'; import { SVG_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import { TextV1 } from '@fluentui-react-native/text'; +import { TextV1 } from 'fluentui-react-native/text'; import { Circle, Defs, diff --git a/apps/tester-core/src/TestComponents/Switch/CustomizedSwitch.tsx b/apps/tester-core/src/TestComponents/Switch/CustomizedSwitch.tsx index 7cfbd6b9c1..742586b6b1 100644 --- a/apps/tester-core/src/TestComponents/Switch/CustomizedSwitch.tsx +++ b/apps/tester-core/src/TestComponents/Switch/CustomizedSwitch.tsx @@ -1,9 +1,9 @@ import * as React from 'react'; import { View, TextInput, StyleSheet } from 'react-native'; -import type { SwitchTokens } from '@fluentui-react-native/switch'; -import { Switch } from '@fluentui-react-native/switch'; -import { TextV1 as Text } from '@fluentui-react-native/text'; +import type { SwitchTokens } from 'fluentui-react-native/switch'; +import { Switch } from 'fluentui-react-native/switch'; +import { TextV1 as Text } from 'fluentui-react-native/text'; import { commonTestStyles as commonStyles } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Switch/E2ESwitchTest.tsx b/apps/tester-core/src/TestComponents/Switch/E2ESwitchTest.tsx index 0c02720357..f65d59d298 100644 --- a/apps/tester-core/src/TestComponents/Switch/E2ESwitchTest.tsx +++ b/apps/tester-core/src/TestComponents/Switch/E2ESwitchTest.tsx @@ -8,9 +8,9 @@ import { SWITCH_TEST_COMPONENT_LABEL, SWITCH_ON_PRESS, } from '@fluentui-react-native/e2e-testing'; -import { Stack } from '@fluentui-react-native/stack'; -import { Switch } from '@fluentui-react-native/switch'; -import { TextV1 } from '@fluentui-react-native/text'; +import { Stack } from 'fluentui-react-native/stack'; +import { Switch } from 'fluentui-react-native/switch'; +import { TextV1 } from 'fluentui-react-native/text'; import { stackStyle, commonTestStyles } from '../Common/styles'; import { testProps } from '../Common/TestProps'; diff --git a/apps/tester-core/src/TestComponents/Switch/SwitchTest.tsx b/apps/tester-core/src/TestComponents/Switch/SwitchTest.tsx index e378bb4dd9..9e6ce424cc 100644 --- a/apps/tester-core/src/TestComponents/Switch/SwitchTest.tsx +++ b/apps/tester-core/src/TestComponents/Switch/SwitchTest.tsx @@ -2,10 +2,10 @@ import * as React from 'react'; import { View, StyleSheet } from 'react-native'; import { Platform } from 'react-native'; -import { ButtonV1 as Button } from '@fluentui-react-native/button'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; import { SWITCH_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import type { InteractionEvent } from '@fluentui-react-native/interactive-hooks'; -import { Switch } from '@fluentui-react-native/switch'; +import type { InteractionEvent } from 'fluentui-react-native/interactive-hooks'; +import { Switch } from 'fluentui-react-native/switch'; import { CustomizedSwitch } from './CustomizedSwitch'; import { E2ESwitchTest } from './E2ESwitchTest'; diff --git a/apps/tester-core/src/TestComponents/TabList/TabListE2ETest.tsx b/apps/tester-core/src/TestComponents/TabList/TabListE2ETest.tsx index 2a9c34c966..24ba0d3ccf 100644 --- a/apps/tester-core/src/TestComponents/TabList/TabListE2ETest.tsx +++ b/apps/tester-core/src/TestComponents/TabList/TabListE2ETest.tsx @@ -17,9 +17,9 @@ import { THIRD_TAB_KEY, SECOND_TAB_LABEL, } from '@fluentui-react-native/e2e-testing'; -import { Stack } from '@fluentui-react-native/stack'; -import { TabList, Tab } from '@fluentui-react-native/tablist'; -import { TextV1 as Text } from '@fluentui-react-native/text'; +import { Stack } from 'fluentui-react-native/stack'; +import { TabList, Tab } from 'fluentui-react-native/tablist'; +import { TextV1 as Text } from 'fluentui-react-native/text'; import { stackStyle } from '../Common/styles'; import { testProps } from '../Common/TestProps'; diff --git a/apps/tester-core/src/TestComponents/TabList/TabListTest.tsx b/apps/tester-core/src/TestComponents/TabList/TabListTest.tsx index c226c9932e..c46ecc07c2 100644 --- a/apps/tester-core/src/TestComponents/TabList/TabListTest.tsx +++ b/apps/tester-core/src/TestComponents/TabList/TabListTest.tsx @@ -1,12 +1,12 @@ import React from 'react'; import { View } from 'react-native'; -import { ButtonV1 as Button } from '@fluentui-react-native/button'; -import { Divider } from '@fluentui-react-native/divider'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { Divider } from 'fluentui-react-native/divider'; import { TABLIST_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import { Menu, MenuTrigger, MenuList, MenuItem, MenuPopover } from '@fluentui-react-native/menu'; -import { TabList, Tab } from '@fluentui-react-native/tablist'; -import { TextV1 as Text } from '@fluentui-react-native/text'; +import { Menu, MenuTrigger, MenuList, MenuItem, MenuPopover } from 'fluentui-react-native/menu'; +import { TabList, Tab } from 'fluentui-react-native/tablist'; +import { TextV1 as Text } from 'fluentui-react-native/text'; import { TabListE2ETest } from './TabListE2ETest'; import { svgProps, fontProps } from '../Common/iconExamples'; diff --git a/apps/tester-core/src/TestComponents/Test.tsx b/apps/tester-core/src/TestComponents/Test.tsx index c9be8243ea..05f3fce638 100644 --- a/apps/tester-core/src/TestComponents/Test.tsx +++ b/apps/tester-core/src/TestComponents/Test.tsx @@ -1,12 +1,15 @@ import * as React from 'react'; import { Platform, StyleSheet, Switch, View } from 'react-native'; -import { Link, Separator, Text, ToggleButton } from '@fluentui/react-native'; -import { ButtonV1 as Button } from '@fluentui-react-native/button'; +import { ToggleButton } from 'fluentui-react-native/button'; +import { Link } from 'fluentui-react-native/link'; +import { Separator } from 'fluentui-react-native/separator'; +import { Text } from 'fluentui-react-native/text'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; import { E2E_MODE_SWITCH, E2E_TEST_SECTION } from '@fluentui-react-native/e2e-testing'; -import type { SvgIconProps } from '@fluentui-react-native/icon'; -import { Stack } from '@fluentui-react-native/stack'; -import { useTheme } from '@fluentui-react-native/theme-types'; +import type { SvgIconProps } from 'fluentui-react-native/icon'; +import { Stack } from 'fluentui-react-native/stack'; +import { useTheme } from 'fluentui-react-native/theme-types'; import type { SvgProps } from 'react-native-svg'; import Svg, { G, Path } from 'react-native-svg'; diff --git a/apps/tester-core/src/TestComponents/TextLegacy/CustomizeUsage.tsx b/apps/tester-core/src/TestComponents/TextLegacy/CustomizeUsage.tsx index 8c2c0f5bad..9de1c96e7e 100644 --- a/apps/tester-core/src/TestComponents/TextLegacy/CustomizeUsage.tsx +++ b/apps/tester-core/src/TestComponents/TextLegacy/CustomizeUsage.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { Platform, View } from 'react-native'; -import { Text } from '@fluentui/react-native'; -import { Stack } from '@fluentui-react-native/stack'; +import { Text } from 'fluentui-react-native/text'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/TextLegacy/PressableUsage.tsx b/apps/tester-core/src/TestComponents/TextLegacy/PressableUsage.tsx index df6e94c256..73a87502ed 100644 --- a/apps/tester-core/src/TestComponents/TextLegacy/PressableUsage.tsx +++ b/apps/tester-core/src/TestComponents/TextLegacy/PressableUsage.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { Alert, Linking, View } from 'react-native'; -import { Text } from '@fluentui/react-native'; -import { Stack } from '@fluentui-react-native/stack'; +import { Text } from 'fluentui-react-native/text'; +import { Stack } from 'fluentui-react-native/stack'; import type { IKeyboardEvent, IHandledKeyboardEvent } from '@office-iss/react-native-win32'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/TextLegacy/StandardUsage.tsx b/apps/tester-core/src/TestComponents/TextLegacy/StandardUsage.tsx index 8723eca653..a9a921decf 100644 --- a/apps/tester-core/src/TestComponents/TextLegacy/StandardUsage.tsx +++ b/apps/tester-core/src/TestComponents/TextLegacy/StandardUsage.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { View } from 'react-native'; -import { Text } from '@fluentui/react-native'; -import { Stack } from '@fluentui-react-native/stack'; +import { Text } from 'fluentui-react-native/text'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/TextLegacy/TextLegacyE2ETest.tsx b/apps/tester-core/src/TestComponents/TextLegacy/TextLegacyE2ETest.tsx index f6fdb352c4..8953aeae46 100644 --- a/apps/tester-core/src/TestComponents/TextLegacy/TextLegacyE2ETest.tsx +++ b/apps/tester-core/src/TestComponents/TextLegacy/TextLegacyE2ETest.tsx @@ -1,14 +1,14 @@ import * as React from 'react'; import { View } from 'react-native'; -import { Text } from '@fluentui/react-native'; +import { Text } from 'fluentui-react-native/text'; import { DEPRECATED_TEXT_FIRST_ACCESSIBILITY_LABEL, DEPRECATED_TEXT_FIRST_COMPONENT, DEPRECATED_TEXT_SECOND_COMPONENT, DEPRECATED_TEXT_SECOND_COMPONENT_CONTENT, } from '@fluentui-react-native/e2e-testing'; -import { Stack } from '@fluentui-react-native/stack'; +import { Stack } from 'fluentui-react-native/stack'; import { stackStyle } from '../Common/styles'; import { testProps } from '../Common/TestProps'; diff --git a/apps/tester-core/src/TestComponents/TextV1/CustomizeUsage.tsx b/apps/tester-core/src/TestComponents/TextV1/CustomizeUsage.tsx index d8cbafe7df..61b9777022 100644 --- a/apps/tester-core/src/TestComponents/TextV1/CustomizeUsage.tsx +++ b/apps/tester-core/src/TestComponents/TextV1/CustomizeUsage.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { Platform, View } from 'react-native'; -import { Stack } from '@fluentui-react-native/stack'; -import { TextV1 as Text } from '@fluentui-react-native/text'; +import { Stack } from 'fluentui-react-native/stack'; +import { TextV1 as Text } from 'fluentui-react-native/text'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/TextV1/MaximumFontSize.ios.tsx b/apps/tester-core/src/TestComponents/TextV1/MaximumFontSize.ios.tsx index d2ec1cf676..b9b2a8baf7 100644 --- a/apps/tester-core/src/TestComponents/TextV1/MaximumFontSize.ios.tsx +++ b/apps/tester-core/src/TestComponents/TextV1/MaximumFontSize.ios.tsx @@ -1,9 +1,9 @@ import * as React from 'react'; import { Text, View } from 'react-native'; -import { Separator } from '@fluentui/react-native'; -import { Stack } from '@fluentui-react-native/stack'; -import { Caption1, Title2, Title3 } from '@fluentui-react-native/text'; +import { Separator } from 'fluentui-react-native/separator'; +import { Stack } from 'fluentui-react-native/stack'; +import { Caption1, Title2, Title3 } from 'fluentui-react-native/text'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/TextV1/PressableUsage.tsx b/apps/tester-core/src/TestComponents/TextV1/PressableUsage.tsx index 71069b3de5..b2c2872115 100644 --- a/apps/tester-core/src/TestComponents/TextV1/PressableUsage.tsx +++ b/apps/tester-core/src/TestComponents/TextV1/PressableUsage.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { Alert, Linking, View } from 'react-native'; -import { Stack } from '@fluentui-react-native/stack'; -import { TextV1 as Text } from '@fluentui-react-native/text'; +import { Stack } from 'fluentui-react-native/stack'; +import { TextV1 as Text } from 'fluentui-react-native/text'; import type { IKeyboardEvent, IHandledKeyboardEvent } from '@office-iss/react-native-win32'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/TextV1/StandardUsage.tsx b/apps/tester-core/src/TestComponents/TextV1/StandardUsage.tsx index a01c01f4f8..ff2497b384 100644 --- a/apps/tester-core/src/TestComponents/TextV1/StandardUsage.tsx +++ b/apps/tester-core/src/TestComponents/TextV1/StandardUsage.tsx @@ -2,8 +2,8 @@ import * as React from 'react'; import { View } from 'react-native'; import { HOMEPAGE_TEXTV1_BUTTON } from '@fluentui-react-native/e2e-testing'; -import { Stack } from '@fluentui-react-native/stack'; -import { TextV1 as Text } from '@fluentui-react-native/text'; +import { Stack } from 'fluentui-react-native/stack'; +import { TextV1 as Text } from 'fluentui-react-native/text'; import { stackStyle } from '../Common/styles'; import { testProps } from '../Common/TestProps'; diff --git a/apps/tester-core/src/TestComponents/TextV1/TextV1E2ETest.tsx b/apps/tester-core/src/TestComponents/TextV1/TextV1E2ETest.tsx index 7469e50afb..eae724dfc7 100644 --- a/apps/tester-core/src/TestComponents/TextV1/TextV1E2ETest.tsx +++ b/apps/tester-core/src/TestComponents/TextV1/TextV1E2ETest.tsx @@ -7,8 +7,8 @@ import { TEXTV1_NO_A11Y_LABEL_COMPONENT, TEXTV1_CONTENT, } from '@fluentui-react-native/e2e-testing'; -import { Stack } from '@fluentui-react-native/stack'; -import { TextV1 as Text } from '@fluentui-react-native/text'; +import { Stack } from 'fluentui-react-native/stack'; +import { TextV1 as Text } from 'fluentui-react-native/text'; import { stackStyle } from '../Common/styles'; import { testProps } from '../Common/TestProps'; diff --git a/apps/tester-core/src/TestComponents/TextV1/V2Usage.mobile.tsx b/apps/tester-core/src/TestComponents/TextV1/V2Usage.mobile.tsx index aa8730864e..9f06b71162 100644 --- a/apps/tester-core/src/TestComponents/TextV1/V2Usage.mobile.tsx +++ b/apps/tester-core/src/TestComponents/TextV1/V2Usage.mobile.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { View } from 'react-native'; -import { Stack } from '@fluentui-react-native/stack'; +import { Stack } from 'fluentui-react-native/stack'; import { Body1, Body1Strong, @@ -16,7 +16,7 @@ import { Title1, Title2, Title3, -} from '@fluentui-react-native/text'; +} from 'fluentui-react-native/text'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/TextV1/V2Usage.win32.tsx b/apps/tester-core/src/TestComponents/TextV1/V2Usage.win32.tsx index 89074e65fb..270ed60aac 100644 --- a/apps/tester-core/src/TestComponents/TextV1/V2Usage.win32.tsx +++ b/apps/tester-core/src/TestComponents/TextV1/V2Usage.win32.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { View } from 'react-native'; -import { Stack } from '@fluentui-react-native/stack'; +import { Stack } from 'fluentui-react-native/stack'; import { Body1, Body1Strong, @@ -16,7 +16,7 @@ import { Subtitle2Strong, Title1, Title1Strong, -} from '@fluentui-react-native/text'; +} from 'fluentui-react-native/text'; import { stackStyle } from '../Common/styles'; diff --git a/apps/tester-core/src/TestComponents/Theme/ThemeTest.android.tsx b/apps/tester-core/src/TestComponents/Theme/ThemeTest.android.tsx index baded9d319..9c1bad8ea2 100644 --- a/apps/tester-core/src/TestComponents/Theme/ThemeTest.android.tsx +++ b/apps/tester-core/src/TestComponents/Theme/ThemeTest.android.tsx @@ -3,11 +3,11 @@ import type { ColorValue, ViewStyle } from 'react-native'; import { Text as TextRN, View } from 'react-native'; import { StyleSheet } from 'react-native'; -import { Text } from '@fluentui/react-native'; +import { Text } from 'fluentui-react-native/text'; import { THEME_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import { useFluentTheme } from '@fluentui-react-native/framework'; -import type { Theme } from '@fluentui-react-native/theme-types'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { useFluentTheme } from 'fluentui-react-native/framework'; +import type { Theme } from 'fluentui-react-native/theme-types'; +import { themedStyleSheet } from 'fluentui-react-native/themed-stylesheet'; import { commonTestStyles } from '../Common/styles'; import type { TestSection, PlatformStatus } from '../Test'; diff --git a/apps/tester-core/src/TestComponents/Theme/ThemeTest.tsx b/apps/tester-core/src/TestComponents/Theme/ThemeTest.tsx index 96cca85dff..26a32f614c 100644 --- a/apps/tester-core/src/TestComponents/Theme/ThemeTest.tsx +++ b/apps/tester-core/src/TestComponents/Theme/ThemeTest.tsx @@ -2,11 +2,12 @@ import * as React from 'react'; import type { ViewStyle, ColorValue } from 'react-native'; import { View, StyleSheet } from 'react-native'; -import { Button, PrimaryButton, Text, StealthButton } from '@fluentui/react-native'; +import { Button, PrimaryButton, StealthButton } from 'fluentui-react-native/button'; +import { Text } from 'fluentui-react-native/text'; import { THEME_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import type { Theme } from '@fluentui-react-native/theme-types'; -import { useTheme } from '@fluentui-react-native/theme-types'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import type { Theme } from 'fluentui-react-native/theme-types'; +import { useTheme } from 'fluentui-react-native/theme-types'; +import { themedStyleSheet } from 'fluentui-react-native/themed-stylesheet'; import { commonTestStyles } from '../Common/styles'; import type { TestSection, PlatformStatus } from '../Test'; diff --git a/apps/tester-core/src/TestComponents/Tooltip/TooltipDefault.tsx b/apps/tester-core/src/TestComponents/Tooltip/TooltipDefault.tsx index 52b34caebc..f147c38c2f 100644 --- a/apps/tester-core/src/TestComponents/Tooltip/TooltipDefault.tsx +++ b/apps/tester-core/src/TestComponents/Tooltip/TooltipDefault.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { View } from 'react-native'; -import { ButtonV1 } from '@fluentui-react-native/button'; -import { Tooltip } from '@fluentui-react-native/tooltip'; +import { ButtonV1 } from 'fluentui-react-native/button'; +import { Tooltip } from 'fluentui-react-native/tooltip'; export const TooltipDefault: React.FunctionComponent = () => { const defaultContent = 'Tooltip shows relative to mouse cursor.'; diff --git a/apps/tester-core/src/TestComponents/Tooltip/TooltipPosition.tsx b/apps/tester-core/src/TestComponents/Tooltip/TooltipPosition.tsx index b7af293855..db87124232 100644 --- a/apps/tester-core/src/TestComponents/Tooltip/TooltipPosition.tsx +++ b/apps/tester-core/src/TestComponents/Tooltip/TooltipPosition.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { View } from 'react-native'; -import { ButtonV1 } from '@fluentui-react-native/button'; -import { Tooltip } from '@fluentui-react-native/tooltip'; +import { ButtonV1 } from 'fluentui-react-native/button'; +import { Tooltip } from 'fluentui-react-native/tooltip'; export const TooltipPosition: React.FunctionComponent = () => { const topCenterRef = React.useRef(null); diff --git a/apps/tester-core/src/TestComponents/VibrancyView/VibrancyViewTest.tsx b/apps/tester-core/src/TestComponents/VibrancyView/VibrancyViewTest.tsx index 6fe7e0fb09..c18334731c 100644 --- a/apps/tester-core/src/TestComponents/VibrancyView/VibrancyViewTest.tsx +++ b/apps/tester-core/src/TestComponents/VibrancyView/VibrancyViewTest.tsx @@ -2,11 +2,12 @@ import * as React from 'react'; import { Alert, StyleSheet, View } from 'react-native'; import type { ViewProps } from 'react-native'; -import { ButtonV1 as Button, Text } from '@fluentui/react-native'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { Text } from 'fluentui-react-native/text'; import { VIBRANCYVIEW_TESTPAGE } from '@fluentui-react-native/e2e-testing'; -import { Stack } from '@fluentui-react-native/stack'; -import type { Material, BlendingMode, State } from '@fluentui-react-native/vibrancy-view'; -import { VibrancyView } from '@fluentui-react-native/vibrancy-view'; +import { Stack } from 'fluentui-react-native/stack'; +import type { Material, BlendingMode, State } from 'fluentui-react-native/vibrancy-view'; +import { VibrancyView } from 'fluentui-react-native/vibrancy-view'; import { MenuPicker } from '../Common/MenuPicker'; import { stackStyle, commonTestStyles as commonStyles } from '../Common/styles'; diff --git a/apps/tester-core/src/theme/CustomThemes.ts b/apps/tester-core/src/theme/CustomThemes.ts index 0cb8082dfb..d9e657f48e 100644 --- a/apps/tester-core/src/theme/CustomThemes.ts +++ b/apps/tester-core/src/theme/CustomThemes.ts @@ -1,10 +1,10 @@ import { Platform } from 'react-native'; -import { createAndroidTheme } from '@fluentui-react-native/android-theme'; -import { createAppleTheme } from '@fluentui-react-native/apple-theme'; -import { createDefaultTheme } from '@fluentui-react-native/default-theme'; -import { ThemeReference } from '@fluentui-react-native/theme'; -import type { ThemeOptions } from '@fluentui-react-native/theme-types'; +import { createAndroidTheme } from 'fluentui-react-native/android-theme'; +import { createAppleTheme } from 'fluentui-react-native/apple-theme'; +import { createDefaultTheme } from 'fluentui-react-native/default-theme'; +import { ThemeReference } from 'fluentui-react-native/theme'; +import type { ThemeOptions } from 'fluentui-react-native/theme-types'; import type { OfficeBrand } from './applyBrand'; import { applyBrand } from './applyBrand'; diff --git a/apps/tester-core/src/theme/ThemePickers.android.tsx b/apps/tester-core/src/theme/ThemePickers.android.tsx index 56cc0f6ff7..e45da5d5ec 100644 --- a/apps/tester-core/src/theme/ThemePickers.android.tsx +++ b/apps/tester-core/src/theme/ThemePickers.android.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { View } from 'react-native'; -import type { Theme } from '@fluentui-react-native/framework'; -import { useTheme } from '@fluentui-react-native/framework'; -import { TextV1 as Text } from '@fluentui-react-native/text'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import type { Theme } from 'fluentui-react-native/framework'; +import { useTheme } from 'fluentui-react-native/framework'; +import { TextV1 as Text } from 'fluentui-react-native/text'; +import { themedStyleSheet } from 'fluentui-react-native/themed-stylesheet'; import type { PickerProps } from '@react-native-picker/picker'; import { Picker } from '@react-native-picker/picker'; diff --git a/apps/tester-core/src/theme/ThemePickers.ios.tsx b/apps/tester-core/src/theme/ThemePickers.ios.tsx index 25811fde50..8e4418fbbc 100644 --- a/apps/tester-core/src/theme/ThemePickers.ios.tsx +++ b/apps/tester-core/src/theme/ThemePickers.ios.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { View } from 'react-native'; -import { ButtonV1 as Button } from '@fluentui-react-native/button'; -import type { Theme } from '@fluentui-react-native/framework'; -import { useTheme } from '@fluentui-react-native/framework'; -import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import type { Theme } from 'fluentui-react-native/framework'; +import { useTheme } from 'fluentui-react-native/framework'; +import { themedStyleSheet } from 'fluentui-react-native/themed-stylesheet'; import { MenuView } from '@react-native-menu/menu'; import type { MenuAction } from '@react-native-menu/menu'; diff --git a/apps/tester-core/src/theme/ThemePickers.macos.tsx b/apps/tester-core/src/theme/ThemePickers.macos.tsx index 78baaa5667..1279074002 100644 --- a/apps/tester-core/src/theme/ThemePickers.macos.tsx +++ b/apps/tester-core/src/theme/ThemePickers.macos.tsx @@ -1,9 +1,9 @@ import * as React from 'react'; import { View, StyleSheet } from 'react-native'; -import { ButtonV1 as Button } from '@fluentui/react-native'; -import { Menu, MenuItem, MenuTrigger, MenuPopover, MenuList } from '@fluentui-react-native/menu'; -import { TextV1 as Text } from '@fluentui-react-native/text'; +import { ButtonV1 as Button } from 'fluentui-react-native/button'; +import { Menu, MenuItem, MenuTrigger, MenuPopover, MenuList } from 'fluentui-react-native/menu'; +import { TextV1 as Text } from 'fluentui-react-native/text'; import { SvgXml } from 'react-native-svg'; import type { ThemeNames } from './applyTheme'; diff --git a/apps/tester-core/src/theme/ThemePickers.tsx b/apps/tester-core/src/theme/ThemePickers.tsx index 5fec961537..9b9bac952a 100644 --- a/apps/tester-core/src/theme/ThemePickers.tsx +++ b/apps/tester-core/src/theme/ThemePickers.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { View, StyleSheet } from 'react-native'; -import { TextV1 as Text } from '@fluentui-react-native/text'; -import type { ThemeOptions } from '@fluentui-react-native/theme-types'; +import { TextV1 as Text } from 'fluentui-react-native/text'; +import type { ThemeOptions } from 'fluentui-react-native/theme-types'; import { themeChoices } from './applyTheme'; import type { ThemeNames } from './applyTheme'; diff --git a/apps/tester-core/src/theme/ThemePickers.win32.tsx b/apps/tester-core/src/theme/ThemePickers.win32.tsx index 5d75c70bc6..ebb4b06b3c 100644 --- a/apps/tester-core/src/theme/ThemePickers.win32.tsx +++ b/apps/tester-core/src/theme/ThemePickers.win32.tsx @@ -1,8 +1,8 @@ import * as React from 'react'; import { View, StyleSheet } from 'react-native'; -import { TextV1 as Text } from '@fluentui-react-native/text'; -import type { ThemeOptions } from '@fluentui-react-native/theme-types'; +import { TextV1 as Text } from 'fluentui-react-native/text'; +import type { ThemeOptions } from 'fluentui-react-native/theme-types'; import type { OfficeBrand } from './applyBrand'; import { brandOptions } from './applyBrand'; diff --git a/apps/tester-core/src/theme/applyBrand.ts b/apps/tester-core/src/theme/applyBrand.ts index 65b6ded6d3..54e1e794c5 100644 --- a/apps/tester-core/src/theme/applyBrand.ts +++ b/apps/tester-core/src/theme/applyBrand.ts @@ -1,5 +1,5 @@ -import type { PartialTheme, Theme } from '@fluentui-react-native/theme-types'; -import { getCurrentBrandAliasTokens } from '@fluentui-react-native/win32-theme'; +import type { PartialTheme, Theme } from 'fluentui-react-native/theme-types'; +import { getCurrentBrandAliasTokens } from 'fluentui-react-native/win32-theme'; export type OfficeBrand = 'Default' | 'Office' | 'Word' | 'Excel' | 'Powerpoint' | 'Outlook'; type BrandRampKey = diff --git a/apps/tester-core/src/theme/applyTheme.ts b/apps/tester-core/src/theme/applyTheme.ts index 9ebd1f6b1e..42e7b7271f 100644 --- a/apps/tester-core/src/theme/applyTheme.ts +++ b/apps/tester-core/src/theme/applyTheme.ts @@ -1,5 +1,5 @@ -import type { PartialTheme, ThemeOptions } from '@fluentui-react-native/framework'; -import { createOfficeTheme, getThemingModule } from '@fluentui-react-native/win32-theme'; +import type { PartialTheme, ThemeOptions } from 'fluentui-react-native/framework'; +import { createOfficeTheme, getThemingModule } from 'fluentui-react-native/win32-theme'; export type ThemeNames = 'Default' | 'Office' | 'Apple'; diff --git a/apps/tester-core/tsconfig.json b/apps/tester-core/tsconfig.json index b59c5d96d6..7c69f556dd 100644 --- a/apps/tester-core/tsconfig.json +++ b/apps/tester-core/tsconfig.json @@ -2,6 +2,8 @@ "extends": "@fluentui-react-native/scripts/configs/tsconfig.json", "compilerOptions": { "outDir": "lib", + "module": "esnext", + "moduleResolution": "bundler", "allowSyntheticDefaultImports": true, "types": ["@types/jasmine", "@wdio/globals/types", "@wdio/jasmine-framework", "node"] }, diff --git a/apps/win32-81/package.json b/apps/win32-81/package.json index 078f4d5d1a..4f27693c7d 100644 --- a/apps/win32-81/package.json +++ b/apps/win32-81/package.json @@ -8,8 +8,6 @@ "url": "https://github.com/microsoft/fluentui-react-native.git", "directory": "apps/win32" }, - "main": "lib-commonjs/index.js", - "module": "lib/index.js", "types": "lib/index.d.ts", "exports": { ".": { @@ -21,7 +19,6 @@ }, "scripts": { "build": "fluentui-scripts build", - "build-cjs": "tsgo --outDir lib-commonjs", "build-core": "tsgo --outDir lib --module esnext --moduleResolution bundler", "bundle": "rnx-cli bundle --dev false", "bundle-dev": "rnx-cli bundle", diff --git a/apps/win32-81/tsconfig.json b/apps/win32-81/tsconfig.json index 2c7e2516f6..7e1a156801 100644 --- a/apps/win32-81/tsconfig.json +++ b/apps/win32-81/tsconfig.json @@ -1,4 +1,8 @@ { "extends": "@fluentui-react-native/scripts/configs/tsconfig.json", + "compilerOptions": { + "module": "esnext", + "moduleResolution": "bundler" + }, "include": ["src"] } diff --git a/apps/win32/package.json b/apps/win32/package.json index 59b7566ee6..39bbfd9942 100644 --- a/apps/win32/package.json +++ b/apps/win32/package.json @@ -8,8 +8,6 @@ "url": "https://github.com/microsoft/fluentui-react-native.git", "directory": "apps/win32" }, - "main": "lib-commonjs/index.js", - "module": "lib/index.js", "types": "lib/index.d.ts", "exports": { ".": { @@ -21,7 +19,6 @@ }, "scripts": { "build": "fluentui-scripts build", - "build-cjs": "tsgo --outDir lib-commonjs", "build-core": "tsgo --outDir lib --module esnext --moduleResolution bundler", "bundle": "rnx-cli bundle --dev false", "bundle-dev": "rnx-cli bundle", diff --git a/apps/win32/tsconfig.json b/apps/win32/tsconfig.json index 2c7e2516f6..7e1a156801 100644 --- a/apps/win32/tsconfig.json +++ b/apps/win32/tsconfig.json @@ -1,4 +1,8 @@ { "extends": "@fluentui-react-native/scripts/configs/tsconfig.json", + "compilerOptions": { + "module": "esnext", + "moduleResolution": "bundler" + }, "include": ["src"] } diff --git a/lage.config.mjs b/lage.config.mjs index e5fb2a4e15..d5b420e636 100644 --- a/lage.config.mjs +++ b/lage.config.mjs @@ -36,6 +36,10 @@ const config = { inputs: ['**/*', '!node_modules/**/*', '!dist/**/*', '!lib/**/*', '!lib-commonjs/**/*'], outputs: [], }, + 'check-exports': { + inputs: ['*', 'src/**/*'], + outputs: [], + }, test: { dependsOn: ['build-all'], inputs: [], @@ -57,7 +61,7 @@ const config = { // ── Pipeline aliases ─────────────────────────────────────────────────── 'repo-checks': ['lint-lockfile', 'format:check', 'check-publishing'], - buildci: ['build-all', 'test', 'lint', 'lint-package', 'repo-checks'], + buildci: ['build-all', 'test', 'lint', 'lint-package', 'check-exports', 'repo-checks'], // ── Worker tasks ─────────────────────────────────────────────────────── pack: { diff --git a/packages/codemods/package.json b/packages/codemods/package.json index d5fb6df430..0b4565175f 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -36,8 +36,7 @@ "test": "fluentui-scripts jest" }, "dependencies": { - "jscodeshift": "^17.0.0", - "yargs": "^17.0.0" + "jscodeshift": "^17.0.0" }, "devDependencies": { "@babel/core": "catalog:", diff --git a/packages/codemods/src/index.ts b/packages/codemods/src/index.ts index 4d8b81b5e1..aaa99c9cb6 100644 --- a/packages/codemods/src/index.ts +++ b/packages/codemods/src/index.ts @@ -1,3 +1,3 @@ -import { transform, yargsParse } from './transform'; +import { transform, parseCliArgs } from './transform'; -transform(yargsParse(process.argv)); +transform(parseCliArgs(process.argv)); diff --git a/packages/codemods/src/transform.ts b/packages/codemods/src/transform.ts index 5a5f454b94..8e85661a7f 100644 --- a/packages/codemods/src/transform.ts +++ b/packages/codemods/src/transform.ts @@ -1,43 +1,64 @@ import { execSync } from 'child_process'; import path from 'path'; +import { parseArgs } from 'util'; -import yargs from 'yargs'; +import { findPackageJson, migratePackageJson } from './transforms/migrate-package-json'; const transformerDirectory = path.join(__dirname, 'transforms'); -const jscodeshiftExecutable = require.resolve('.bin/jscodeshift'); +const jscodeshiftExecutable = path.join(path.dirname(require.resolve('jscodeshift/package.json')), 'bin', 'jscodeshift.js'); -interface argsType { +const VALID_TRANSFORMS = ['button-v0-to-v1', 'deprecate-exports', 'migrate-to-mono-package'] as const; + +interface ArgsType { path: string; transform: string; } -export const yargsParse = (args: string[]): argsType => { - return yargs([]) - .help() - .exitProcess(false) - .option('path', { - alias: 'p', - type: 'string', - description: 'Path that transform should be run over', - normalize: true, - }) - .option('transform', { - alias: 't', - type: 'string', - description: 'Name of transform to run', - choices: ['button-v0-to-v1', 'deprecate-exports'], - }) - .demandOption(['path', 'transform']) - .parseSync(args); +export const parseCliArgs = (argv: string[]): ArgsType => { + const { values } = parseArgs({ + args: argv.slice(2), + options: { + path: { type: 'string', short: 'p' }, + transform: { type: 'string', short: 't' }, + }, + strict: true, + }); + + if (!values.path) { + throw new Error('Missing required option: --path (-p)'); + } + if (!values.transform) { + throw new Error('Missing required option: --transform (-t)'); + } + if (!(VALID_TRANSFORMS as readonly string[]).includes(values.transform)) { + throw new Error(`Invalid transform "${values.transform}". Valid choices: ${VALID_TRANSFORMS.join(', ')}`); + } + + return { path: values.path, transform: values.transform }; }; -export const transform = (args: argsType) => { +export const transform = (args: ArgsType) => { const codeshiftArgs = []; codeshiftArgs.push('-t', path.join(transformerDirectory, args.transform + '.js')); codeshiftArgs.push('--parser=tsx'); - codeshiftArgs.push('--extensions=tsx'); + codeshiftArgs.push('--extensions=tsx,ts,js'); codeshiftArgs.push(args.path); - execSync(jscodeshiftExecutable + ' ' + codeshiftArgs.join(' ')); + execSync(jscodeshiftExecutable + ' ' + codeshiftArgs.join(' '), { stdio: 'inherit' }); + + // For migrate-to-mono-package, also update the nearest package.json + if (args.transform === 'migrate-to-mono-package') { + const pkgJsonPath = findPackageJson(args.path); + if (pkgJsonPath) { + console.log(`\nMigrating ${pkgJsonPath}...`); + const result = migratePackageJson(pkgJsonPath); + console.log(` Removed ${result.removed.length} dependencies`); + if (result.monoPackageAdded) { + console.log(` Added fluentui-react-native dependency`); + } + } else { + console.warn(`\nWarning: No package.json found near ${args.path}`); + } + } }; diff --git a/packages/codemods/src/transforms/__testfixtures__/migrate-to-mono-package.input.tsx b/packages/codemods/src/transforms/__testfixtures__/migrate-to-mono-package.input.tsx new file mode 100644 index 0000000000..589423f865 --- /dev/null +++ b/packages/codemods/src/transforms/__testfixtures__/migrate-to-mono-package.input.tsx @@ -0,0 +1,38 @@ +import * as React from 'react'; + +import { Button } from '@fluentui-react-native/button'; +import type { SvgIconProps } from '@fluentui-react-native/icon'; +import type { IFocusable } from '@fluentui-react-native/interactive-hooks'; +import { Stack } from '@fluentui-react-native/stack'; +import { Text } from '@fluentui-react-native/text'; +import { Theme } from '@fluentui-react-native/theme-types'; +import { themedStyleSheet } from '@fluentui-react-native/themed-stylesheet'; +import { ThemeProvider } from '@fluentui-react-native/framework'; +import { Shimmer } from '@fluentui-react-native/experimental-shimmer'; +import { createThemedCompose } from '@uifabricshared/theming-react-native'; +import { settings } from '@uifabricshared/themed-settings'; + +// Barrel imports — should be decomposed into per-package imports +import { ButtonV1, Separator, TextV1 as MyText } from '@fluentui/react-native'; +import type { FocusZoneDirection, CheckboxProps } from '@fluentui/react-native'; +import { FocusZone, MenuButton, useOnPressWithFocus } from '@fluentui/react-native'; + +// Packages NOT in the mono-package — these should stay unchanged +import { TestSection } from '@fluentui-react-native/e2e-testing'; +import { something } from '@fluentui-react-native/scripts'; + +const someRequire = require('@fluentui-react-native/avatar'); +const alsoTransform = require('@uifabricshared/foundation-compose'); +const skipThis = require('@fluentui-react-native/e2e-testing'); + +export const Example: React.FunctionComponent = () => { + return ( + + +