Skip to content
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a2bfc62
create a more robust depcheck implementation
JasonVMo Jul 28, 2025
0a19faa
fix missing eslint config dependencies
JasonVMo Jul 28, 2025
cc464e2
apply depcheck fix to directories to fix error level issues
JasonVMo Jul 28, 2025
271699d
fix missing deps for private packages
JasonVMo Jul 28, 2025
a9fc3a2
applying package updates
UI-Fabric-RN-Bot Jul 25, 2025
8440fa2
JSX runtime (part 2 of 3) - more formal rendering logic for both clas…
JasonVMo Jul 29, 2025
5076751
applying package updates
UI-Fabric-RN-Bot Jul 29, 2025
b9aa67b
apply more dependency fixes
JasonVMo Jul 29, 2025
fb9d675
JSX runtime (part 2 of 3) - more formal rendering logic for both clas…
JasonVMo Jul 29, 2025
7d54e98
applying package updates
UI-Fabric-RN-Bot Jul 29, 2025
0494df9
Merge remote-tracking branch 'origin/main' into user/jasonvmo/deps
JasonVMo Jul 29, 2025
24a8f09
switch to pnpm and fix to build stage
JasonVMo Jul 29, 2025
18c1435
fix dependencies up through linting
JasonVMo Jul 29, 2025
caded41
fix babel and jest configs and add dedicated babel config package
JasonVMo Jul 30, 2025
9b614c5
split jest configurations into a separate package
JasonVMo Jul 31, 2025
2366a6a
fix more tests
JasonVMo Jul 31, 2025
6e24494
move repo to pnpm, create babel and jest config packages, fix depende…
JasonVMo Aug 1, 2025
fabe04b
Change files
JasonVMo Aug 1, 2025
e27726a
add missing @types/jest devDependency
JasonVMo Aug 1, 2025
495139d
fix ios/mac pod install
JasonVMo Aug 1, 2025
3ac02b8
fix align-deps issue
JasonVMo Aug 1, 2025
febbb2e
fix more align-deps / depcheck issues
JasonVMo Aug 1, 2025
8800909
switch back to node-modules temporarily to deal with appium issues as…
JasonVMo Aug 4, 2025
8d122ae
add build fixes for node-modules linking
JasonVMo Aug 4, 2025
3f432ce
revert podfiles to non-pnpm behavior, fix prettier issues, respond to…
JasonVMo Aug 4, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 10 additions & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,16 @@ dynamicPackageExtensions: ./scripts/dynamic.extensions.mjs

enableGlobalCache: false

nodeLinker: node-modules
nodeLinker: pnpm

packageExtensions:
'@svgr/core@*':
dependencies:
'@svgr/plugin-svgo': '*'
'@svgr/plugin-jsx': '*'
'react-native-svg@*':
dependencies:
'buffer': '*'

plugins:
- checksum: 672e525b81762c6162366bd3ffec5e86ab8fac2655ef0267047e86a0f32e79a4bde0f170bc30479663f40aa3f006d91f8dc3289f679dd4dc5ae5a5d12ba3ad0b
Expand Down
1 change: 0 additions & 1 deletion apps/E2E/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "@fluentui-react-native/scripts/configs/tsconfig.json",
"compilerOptions": {
"baseUrl": ".",
"importHelpers": true,
"outDir": "lib",
"paths": {
"*": ["*", "*.win32", "./*"],
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = require('@fluentui-react-native/scripts/configs/babel.config');
module.exports = require('@fluentui-react-native/babel-config');
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
const { configureReactNativeJest } = require('@fluentui-react-native/scripts');
const { configureReactNativeJest } = require('@fluentui-react-native/jest-config');
module.exports = configureReactNativeJest('android');
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
},
"dependencies": {},
"devDependencies": {
"@fluentui-react-native/babel-config": "workspace:*",
"@fluentui-react-native/eslint-config-rules": "workspace:*",
"@fluentui-react-native/jest-config": "workspace:*",
"@fluentui-react-native/test-tools": "workspace:*",
"@fluentui-react-native/scripts": "workspace:*",
"react": "18.2.0",
Expand Down
10 changes: 6 additions & 4 deletions apps/fluent-tester/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
require_relative '../../../node_modules/react-native-test-app/test_app'
ENV['REACT_NATIVE_NODE_MODULES_DIR'] = File.join(__dir__, '../node_modules')

require_relative '../node_modules/react-native-test-app/test_app'

workspace 'FluentTester.xcworkspace'

react_native_path = "#{__dir__}/../../../node_modules/react-native"
react_native_path = "#{__dir__}/../node_modules/react-native"

use_test_app! do |target|
target.app do
platform :ios, '15.0'

# There is a bug where autolinking isn't working, so specify these manually.
pod 'FRNAppearanceAdditions', :path => '../../../packages/experimental/AppearanceAdditions/FRNAppearanceAdditions.podspec'
pod 'FRNFontMetrics', :path => '../../../packages/experimental/NativeFontMetrics/FRNFontMetrics.podspec'
pod 'FRNAppearanceAdditions', :path => '../node_modules/@fluentui-react-native/experimental-appearance-additions/FRNAppearanceAdditions.podspec'
pod 'FRNFontMetrics', :path => '../node_modules/@fluentui-react-native/experimental-native-font-metrics/FRNFontMetrics.podspec'
end
end
272 changes: 136 additions & 136 deletions apps/fluent-tester/ios/Podfile.lock

Large diffs are not rendered by default.

16 changes: 9 additions & 7 deletions apps/fluent-tester/macos/Podfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
require_relative '../../../node_modules/react-native-test-app/macos/test_app'
ENV['REACT_NATIVE_NODE_MODULES_DIR'] = File.join(__dir__, '../node_modules')

require_relative '../node_modules/react-native-test-app/macos/test_app'

workspace 'FluentTester.xcworkspace'

react_native_path = "#{__dir__}/../../../node_modules/react-native"
react_native_path = "#{__dir__}/../node_modules/react-native"

use_test_app! do |target|
target.app do
platform :osx, '12'

# There is a bug where autolinking isn't working, do specify these manually.
pod 'FRNAvatar', :path => '../../../packages/experimental/Avatar/FRNAvatar.podspec'
pod 'FRNCheckbox', :path => '../../../packages/experimental/Checkbox/FRNCheckbox.podspec'
pod 'FRNMenuButton', :path => '../../../packages/components/MenuButton/FRNMenuButton.podspec'
pod 'FRNRadioButton', :path => '../../../packages/components/RadioGroup/FRNRadioButton.podspec'
pod 'RCTFocusZone', :path => '../../../packages/components/FocusZone/RCTFocusZone.podspec'
pod 'FRNAvatar', :path => '../node_modules/@fluentui-react-native/experimental-avatar/FRNAvatar.podspec'
pod 'FRNCheckbox', :path => '../node_modules/@fluentui-react-native/experimental-checkbox/FRNCheckbox.podspec'
pod 'FRNMenuButton', :path => '../node_modules/@fluentui-react-native/menu-button/FRNMenuButton.podspec'
pod 'FRNRadioButton', :path => '../node_modules/@fluentui-react-native/radio-group/FRNRadioButton.podspec'
pod 'RCTFocusZone', :path => '../node_modules/@fluentui-react-native/focus-zone/RCTFocusZone.podspec'
end
end
276 changes: 138 additions & 138 deletions apps/fluent-tester/macos/Podfile.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/fluent-tester/metro.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function ensureUniqueModule(moduleName, excludeList, nodeModules) {
}

// build up the added excludes and extraNodeModules
['react-is', 'invariant', '@babel/runtime', 'base64-js'].forEach((moduleName) => ensureUniqueModule(moduleName));
['react-native-svg'].forEach((moduleName) => ensureUniqueModule(moduleName));

const blockList = exclusionList([
// This stops "react-native run-windows" from causing the metro server to
Expand Down
15 changes: 11 additions & 4 deletions apps/fluent-tester/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,31 +90,37 @@
"@fortawesome/free-solid-svg-icons": "^6.2.0",
"@fortawesome/react-native-fontawesome": "^0.3.0",
"@office-iss/react-native-win32": "^0.74.0",
"@react-native-community/slider": "^4.2.0",
"@react-native-community/slider": "^4.5.7",
"@react-native-menu/menu": "^0.7.3",
"@react-native-picker/picker": "^2.7.0",
"@types/node": "^22.0.0",
"@types/react": "~18.2.0",
"@warren-ms/react-native-icons": "^0.0.13",
"react": "18.2.0",
"react-native": "^0.74.0",
"react-native-macos": "^0.74.0",
"react-native-svg": "^15.4.0",
"react-native-windows": "^0.74.0",
"tslib": "^2.3.1"
"react-native-windows": "^0.74.0"
},
"devDependencies": {
"@babel/core": "^7.20.0",
"@babel/runtime": "^7.20.0",
"@fluentui-react-native/eslint-config-rules": "workspace:*",
"@fluentui-react-native/experimental-native-font-metrics": "workspace:*",
"@fluentui-react-native/focus-zone": "workspace:*",
"@fluentui-react-native/menu-button": "workspace:*",
"@fluentui-react-native/scripts": "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",
"@react-native/babel-preset": "^0.74.0",
"@react-native/metro-babel-transformer": "^0.74.0",
"@react-native/metro-config": "^0.74.0",
"@rnx-kit/cli": "^0.18.9",
"@rnx-kit/metro-config": "^2.1.0",
"@rnx-kit/metro-resolver-symlinks": "^0.2.5",
"@types/jasmine": "5.1.4",
"@types/react-test-renderer": "^18.2.0",
"@wdio/cli": "^8.40.0",
"@wdio/globals": "^8.40.0",
"@wdio/jasmine-framework": "^8.40.0",
Expand Down Expand Up @@ -196,7 +202,8 @@
"react",
"react-test-renderer",
"svg",
"test-app"
"test-app",
"community/cli"
]
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
import * as React from 'react';
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 Slider from '@react-native-community/slider';
import type { SliderProps } from '@react-native-community/slider';

import type { undefinedText } from './styles';
import { steveBallmerPhotoUrl } from './styles';
import { commonTestStyles as commonStyles } from '../Common/styles';

const NativeSlider = Slider as unknown as React.ComponentType<SliderProps>;

type WithUndefined<T> = T | typeof undefinedText;

const styles = StyleSheet.create({ slider: { ...commonStyles.vmargin, flex: 1 } });
Expand All @@ -19,7 +22,7 @@ const StyledSlider = (props) => {
return (
<View style={{ flexDirection: 'row' }}>
<Text style={{ flex: 0.5, color: theme.colors.inputText }}>{title}</Text>
<Slider step={step || 1} minimumValue={min} maximumValue={max} value={initial} style={styles.slider} onValueChange={onChange} />
<NativeSlider step={step || 1} minimumValue={min} maximumValue={max} value={initial} style={styles.slider} onValueChange={onChange} />
<Text style={{ flex: 0.2, color: theme.colors.inputText }}>{current}</Text>
</View>
);
Expand Down
2 changes: 1 addition & 1 deletion apps/fluent-tester/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"extends": "@fluentui-react-native/scripts/configs/tsconfig.json",
"compilerOptions": {
"baseUrl": ".",
"importHelpers": true,
"outDir": "lib",
"allowSyntheticDefaultImports": true,
"paths": {
"*": ["*", "*.win32", "./*"],
"src/*": ["./src/*", "src"]
Expand Down
17 changes: 16 additions & 1 deletion apps/win32/metro.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,21 @@
* @format
*/
// @ts-check
const { makeMetroConfig } = require('@rnx-kit/metro-config');
const { exclusionList, makeMetroConfig, resolveUniqueModule } = require('@rnx-kit/metro-config');
const MetroSymlinksResolver = require('@rnx-kit/metro-resolver-symlinks');
const { getDefaultConfig } = require('metro-config');

const excludeMixins = [];
const extraNodeModules = {};
function ensureUniqueModule(moduleName, excludeList, nodeModules) {
const [nmEntry, excludePattern] = resolveUniqueModule(moduleName);
excludeMixins.push(excludePattern);
extraNodeModules[moduleName] = nmEntry;
}

// build up the added excludes and extraNodeModules
['react-native-svg'].forEach((moduleName) => ensureUniqueModule(moduleName));

module.exports = async () => {
const {
resolver: { sourceExts, assetExts },
Expand All @@ -17,6 +28,10 @@ module.exports = async () => {
return makeMetroConfig({
resolver: {
assetExts: [...assetExts.filter((ext) => ext !== 'svg'), 'ttf', 'otf', 'png'],
blockList: exclusionList(excludeMixins),
extraNodeModules: {
...extraNodeModules,
},
sourceExts: [...sourceExts, 'svg'],
resolveRequest: MetroSymlinksResolver(),
},
Expand Down
4 changes: 2 additions & 2 deletions apps/win32/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
"@fluentui-react-native/tester": "workspace:*",
"react": "18.2.0",
"react-native": "^0.74.0",
"react-native-svg": "^15.4.0",
"tslib": "^2.3.1"
"react-native-svg": "^15.4.0"
},
"devDependencies": {
"@babel/core": "^7.20.0",
Expand All @@ -53,6 +52,7 @@
"@rnx-kit/metro-config": "^2.1.0",
"@rnx-kit/metro-resolver-symlinks": "^0.2.5",
"@types/react": "^18.2.0",
"@types/react-test-renderer": "^18.2.0",
"metro-config": "^0.80.3",
"react-native-svg-transformer": "^1.0.0",
"react-test-renderer": "18.2.0",
Expand Down
1 change: 0 additions & 1 deletion apps/win32/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"extends": "@fluentui-react-native/scripts/configs/tsconfig.json",
"compilerOptions": {
"baseUrl": ".",
"importHelpers": true,
"paths": {
"*": ["*", "*.win32"],
"src/*": ["./src/*"]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "move repo to pnpm, create babel and jest config packages, fix dependencies",
"packageName": "@fluentui/react-native",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "move repo to pnpm, create babel and jest config packages, fix dependencies",
"packageName": "@fluentui-react-native/adapters",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "move repo to pnpm, create babel and jest config packages, fix dependencies",
"packageName": "@fluentui-react-native/android-theme",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "move repo to pnpm, create babel and jest config packages, fix dependencies",
"packageName": "@fluentui-react-native/apple-theme",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "move repo to pnpm, create babel and jest config packages, fix dependencies",
"packageName": "@fluentui-react-native/avatar",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "move repo to pnpm, create babel and jest config packages, fix dependencies",
"packageName": "@fluentui-react-native/badge",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "move repo to pnpm, create babel and jest config packages, fix dependencies",
"packageName": "@fluentui-react-native/button",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "move repo to pnpm, create babel and jest config packages, fix dependencies",
"packageName": "@fluentui-react-native/callout",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "move repo to pnpm, create babel and jest config packages, fix dependencies",
"packageName": "@fluentui-react-native/checkbox",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "move repo to pnpm, create babel and jest config packages, fix dependencies",
"packageName": "@fluentui-react-native/chip",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "move repo to pnpm, create babel and jest config packages, fix dependencies",
"packageName": "@fluentui-react-native/codemods",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "move repo to pnpm, create babel and jest config packages, fix dependencies",
"packageName": "@fluentui-react-native/composition",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "move repo to pnpm, create babel and jest config packages, fix dependencies",
"packageName": "@fluentui-react-native/contextual-menu",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "move repo to pnpm, create babel and jest config packages, fix dependencies",
"packageName": "@fluentui-react-native/default-theme",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "move repo to pnpm, create babel and jest config packages, fix dependencies",
"packageName": "@fluentui-react-native/divider",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "move repo to pnpm, create babel and jest config packages, fix dependencies",
"packageName": "@fluentui-react-native/drawer",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "move repo to pnpm, create babel and jest config packages, fix dependencies",
"packageName": "@fluentui-react-native/dropdown",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "move repo to pnpm, create babel and jest config packages, fix dependencies",
"packageName": "@fluentui-react-native/e2e-testing",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Loading
Loading