Skip to content

Commit 526370c

Browse files
tido64tido64
committed
chore: migrate to @rnx-kit/cli 
1 parent afdbf84 commit 526370c

11 files changed

+94
-63
lines changed

‎apps/fluent-tester/metro.config.js‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* @format
66
*/
77

8-
const path = require('path');
8+
const path = require('node:path');
99
const { exclusionList, makeMetroConfig, resolveUniqueModule } = require('@rnx-kit/metro-config');
1010
const MetroSymlinksResolver = require('@rnx-kit/metro-resolver-symlinks');
1111

@@ -20,7 +20,8 @@ function pathForRegex(...parts) {
2020

2121
const excludeMixins = [];
2222
const extraNodeModules = {};
23-
function ensureUniqueModule(moduleName, excludeList, nodeModules) {
23+
24+
function ensureUniqueModule(moduleName) {
2425
const [nmEntry, excludePattern] = resolveUniqueModule(moduleName);
2526
excludeMixins.push(excludePattern);
2627
extraNodeModules[moduleName] = nmEntry;
@@ -30,31 +31,19 @@ function ensureUniqueModule(moduleName, excludeList, nodeModules) {
3031
['react-native-svg'].forEach((moduleName) => ensureUniqueModule(moduleName));
3132

3233
const blockList = exclusionList([
33-
// This stops "react-native run-windows" from causing the metro server to
34-
// crash if its already running. This should also cover /.*\/.vs\/.*/, as .vs folders go next to the .sln file
35-
new RegExp(`${pathForRegex(__dirname, 'windows')}.*`),
36-
37-
// Workaround for `EPERM: operation not permitted, lstat '~\midl-MIDLRT-cl.read.1.tlog'`
38-
/.*\.tlog$/,
39-
40-
// Workaround for `EBUSY: resource busy or locked, open '~\msbuild.ProjectImports.zip'`
41-
/.*\.ProjectImports\.zip$/,
42-
4334
// Exclude other test apps
44-
new RegExp(`${pathForRegex(__dirname, '../win32')}.*`),
35+
new RegExp(pathForRegex(__dirname, '../win32')),
4536

4637
// Exclude build output directory
47-
new RegExp(`${pathForRegex(__dirname, 'dist')}.*`),
38+
new RegExp(pathForRegex(__dirname, 'dist')),
4839

4940
...excludeMixins,
5041
]);
5142

5243
let config = makeMetroConfig({
5344
resolver: {
5445
blockList,
55-
extraNodeModules: {
56-
...extraNodeModules,
57-
},
46+
extraNodeModules,
5847
resolveRequest: MetroSymlinksResolver(),
5948
},
6049
transformer: {
@@ -63,6 +52,7 @@ let config = makeMetroConfig({
6352
},
6453
});
6554

66-
(config.resolver.assetExts = [...config.resolver.assetExts.filter((ext) => ext !== 'svg'), 'ttf', 'otf', 'png']),
67-
(config.resolver.sourceExts = [...config.resolver.sourceExts, 'svg']),
68-
(module.exports = config);
55+
config.resolver.assetExts = [...config.resolver.assetExts.filter((ext) => ext !== 'svg'), 'ttf', 'otf', 'png'];
56+
config.resolver.sourceExts = [...config.resolver.sourceExts, 'svg'];
57+
58+
module.exports = config;

‎apps/fluent-tester/package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@
1717
}
1818
},
1919
"scripts": {
20-
"android": "react-native run-android",
20+
"android": "rnx-cli run --platform android",
2121
"build": "fluentui-scripts build",
22-
"bundle": "react-native rnx-bundle --dev false",
23-
"bundle:android": "react-native rnx-bundle --dev false --platform android",
24-
"bundle:ios": "react-native rnx-bundle --dev false --platform ios",
25-
"bundle:macos": "react-native rnx-bundle --dev false --platform macos",
26-
"bundle:windows": "react-native rnx-bundle --dev false --platform windows",
22+
"bundle": "rnx-cli bundle --dev false",
23+
"bundle:android": "rnx-cli bundle --dev false --platform android",
24+
"bundle:ios": "rnx-cli bundle --dev false --platform ios",
25+
"bundle:macos": "rnx-cli bundle --dev false --platform macos",
26+
"bundle:windows": "rnx-cli bundle --dev false --platform windows",
2727
"clean": "fluentui-scripts clean",
2828
"depcheck": "fluentui-scripts depcheck",
29-
"ios": "react-native run-ios",
29+
"ios": "rnx-cli run --platform ios",
3030
"just": "fluentui-scripts",
3131
"lint": "fluentui-scripts eslint",
32-
"macos": "react-native run-macos --scheme FluentTester",
32+
"macos": "rnx-cli run --platform macos",
3333
"prettier": "fluentui-scripts prettier",
3434
"prettier-fix": "fluentui-scripts prettier --fix true",
35-
"start": "react-native rnx-start",
35+
"start": "rnx-cli start",
3636
"windows": "react-native run-windows --arch x64 --sln windows/FluentTester.sln"
3737
},
3838
"repository": {
@@ -116,7 +116,7 @@
116116
"@react-native/babel-preset": "^0.74.0",
117117
"@react-native/metro-babel-transformer": "^0.74.0",
118118
"@react-native/metro-config": "^0.74.0",
119-
"@rnx-kit/cli": "^0.18.9",
119+
"@rnx-kit/cli": "^0.18.14",
120120
"@rnx-kit/metro-config": "^2.1.0",
121121
"@rnx-kit/metro-resolver-symlinks": "^0.2.5",
122122
"@types/jasmine": "5.1.4",

‎apps/win32/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
"clean": "fluentui-scripts clean",
1919
"depcheck": "fluentui-scripts depcheck",
2020
"lint": "fluentui-scripts eslint",
21-
"start": "react-native rnx-start",
22-
"bundle": "react-native rnx-bundle --dev false",
23-
"bundle-dev": "react-native rnx-bundle",
21+
"start": "rnx-cli start",
22+
"bundle": "rnx-cli bundle --dev false",
23+
"bundle-dev": "rnx-cli bundle",
2424
"run-win32": "rex-win32 --bundle index.win32 --component FluentTester --basePath ./dist --useDirectDebugger --windowTitle \"FluentUI Tester\" --pluginProps --debugBundlePath index --jsEngine v8",
2525
"run-win32-dev": "rex-win32 --bundle index --component FluentTester --basePath ./dist --useDirectDebugger --windowTitle \"FluentUI Tester\" --pluginProps --debugBundlePath index --jsEngine v8 --useFastRefresh",
2626
"run-win32-devmain-dev": "rex-win32 --bundle index --component FluentTester --basePath ./dist --useDirectDebugger --windowTitle \"FluentUI Tester\" --pluginProps --debugBundlePath index --jsEngine v8 --useFastRefresh --useDevMain",
@@ -48,7 +48,7 @@
4848
"@react-native/babel-preset": "^0.74.0",
4949
"@react-native/metro-babel-transformer": "^0.74.0",
5050
"@react-native/metro-config": "^0.74.0",
51-
"@rnx-kit/cli": "^0.18.9",
51+
"@rnx-kit/cli": "^0.18.14",
5252
"@rnx-kit/metro-config": "^2.1.0",
5353
"@rnx-kit/metro-resolver-symlinks": "^0.2.5",
5454
"@types/react": "^18.2.0",

‎change/@fluentui-react-native-281e5e0c-89d0-4c9e-ad25-c9be53f9b5ac.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "none",
3+
"comment": "Migrate to `@rnx-kit/cli`",
4+
"packageName": "@fluentui/react-native",
5+
"email": "[email protected]",
6+
"dependentChangeType": "none"
7+
}

‎change/@fluentui-react-native-framework-9b4a6156-ce74-43cf-a552-9b0a5968884c.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "none",
3+
"comment": "Migrate to `@rnx-kit/cli`",
4+
"packageName": "@fluentui-react-native/framework",
5+
"email": "[email protected]",
6+
"dependentChangeType": "none"
7+
}

‎change/@fluentui-react-native-tester-334bdd10-7650-4228-84d2-5ba0fe353cf1.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "none",
3+
"comment": "Migrate to `@rnx-kit/cli`",
4+
"packageName": "@fluentui-react-native/tester",
5+
"email": "[email protected]",
6+
"dependentChangeType": "none"
7+
}

‎change/@fluentui-react-native-tester-win32-840688a7-95cc-4192-b46f-cdb75301a64f.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "none",
3+
"comment": "Migrate to `@rnx-kit/cli`",
4+
"packageName": "@fluentui-react-native/tester-win32",
5+
"email": "[email protected]",
6+
"dependentChangeType": "none"
7+
}

‎packages/framework/framework/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"depcheck": "fluentui-scripts depcheck",
2020
"just": "fluentui-scripts",
2121
"lint": "fluentui-scripts eslint",
22-
"start:tester": "react-native start --projectRoot ./src",
22+
"start:tester": "rnx-cli start",
2323
"start-test": "fluentui-scripts jest-watch",
2424
"test": "fluentui-scripts jest",
2525
"update-snapshots": "fluentui-scripts jest -u",
@@ -49,6 +49,7 @@
4949
"@fluentui-react-native/scripts": "workspace:*",
5050
"@react-native/babel-preset": "^0.74.0",
5151
"@react-native/metro-config": "^0.74.0",
52+
"@rnx-kit/cli": "^0.18.14",
5253
"@types/react": "^18.2.0",
5354
"@types/react-test-renderer": "^18.2.0",
5455
"react": "18.2.0",

‎packages/libraries/core/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"depcheck": "fluentui-scripts depcheck",
2626
"just": "fluentui-scripts",
2727
"lint": "fluentui-scripts eslint",
28-
"start:tester": "react-native start --projectRoot ./src",
28+
"start:tester": "rnx-cli start",
2929
"start-test": "fluentui-scripts jest-watch",
3030
"test": "fluentui-scripts jest",
3131
"update-snapshots": "fluentui-scripts jest -u",
@@ -76,6 +76,7 @@
7676
"@fluentui-react-native/scripts": "workspace:*",
7777
"@react-native/babel-preset": "^0.74.0",
7878
"@react-native/metro-config": "^0.74.0",
79+
"@rnx-kit/cli": "^0.18.14",
7980
"@types/react": "~18.2.0",
8081
"react": "18.2.0",
8182
"react-native": "^0.74.0",

‎packages/libraries/core/react-native.config.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
const path = require('node:path');
12
module.exports = {
2-
reactNativePath: '../../node_modules/@office-iss/react-native-win32'
3+
reactNativePath: path.dirname(require.resolve('@office-iss/react-native-win32/package.json')),
34
};

0 commit comments

Comments
 (0)