From ad1aa58c91074fb2c2dcb428d8dd2af2eb2f4d7e Mon Sep 17 00:00:00 2001 From: Yichen Yao Date: Fri, 27 Feb 2026 17:29:05 -0800 Subject: [PATCH 1/7] Scope various packaged to rnw-scripts namespace. (#15705) * Scope various packaged to rnw-scripts namespace. * Fix build. * Fix build 1. * Revert unnecessary white space change. * Change files * Fix telemetry test. * Change files * Fix prettier. --- ...e-windows-cli-a40f1783-563c-4fcd-b074-1960bd4d254e.json | 7 +++++++ ...ows-telemetry-6ede3088-858e-4020-98bb-16bf34a5a427.json | 7 +++++++ .../cli/src/e2etest/projects/BarPackage/package.json | 4 ++-- .../cli/src/e2etest/projects/FooPackage/package.json | 4 ++-- .../telemetry/src/test/projectUtils.test.ts | 4 +++- packages/debug-test/package.json | 4 ++-- packages/e2e-test-app-fabric/package.json | 2 +- packages/playground/package.json | 2 +- 8 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 change/@react-native-windows-cli-a40f1783-563c-4fcd-b074-1960bd4d254e.json create mode 100644 change/@react-native-windows-telemetry-6ede3088-858e-4020-98bb-16bf34a5a427.json diff --git a/change/@react-native-windows-cli-a40f1783-563c-4fcd-b074-1960bd4d254e.json b/change/@react-native-windows-cli-a40f1783-563c-4fcd-b074-1960bd4d254e.json new file mode 100644 index 00000000000..3dc65cd1b7a --- /dev/null +++ b/change/@react-native-windows-cli-a40f1783-563c-4fcd-b074-1960bd4d254e.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "Scope various foo and bar test package to rnw-scripts.\"", + "packageName": "@react-native-windows/cli", + "email": "yicyao@microsoft.com", + "dependentChangeType": "none" +} diff --git a/change/@react-native-windows-telemetry-6ede3088-858e-4020-98bb-16bf34a5a427.json b/change/@react-native-windows-telemetry-6ede3088-858e-4020-98bb-16bf34a5a427.json new file mode 100644 index 00000000000..4d39505c9ac --- /dev/null +++ b/change/@react-native-windows-telemetry-6ede3088-858e-4020-98bb-16bf34a5a427.json @@ -0,0 +1,7 @@ +{ + "type": "none", + "comment": "Fix telemetry test.", + "packageName": "@react-native-windows/telemetry", + "email": "yicyao@microsoft.com", + "dependentChangeType": "none" +} diff --git a/packages/@react-native-windows/cli/src/e2etest/projects/BarPackage/package.json b/packages/@react-native-windows/cli/src/e2etest/projects/BarPackage/package.json index dc9e484e09c..76d39423d0c 100644 --- a/packages/@react-native-windows/cli/src/e2etest/projects/BarPackage/package.json +++ b/packages/@react-native-windows/cli/src/e2etest/projects/BarPackage/package.json @@ -1,7 +1,7 @@ { - "name": "bar", + "name": "@rnw-scripts/bar", "version": "1.2.3", "description": "Synthetic project.json for testing project.json logic", "license": "MIT", "private": true -} +} \ No newline at end of file diff --git a/packages/@react-native-windows/cli/src/e2etest/projects/FooPackage/package.json b/packages/@react-native-windows/cli/src/e2etest/projects/FooPackage/package.json index 7fe5ca0c508..407fbc6d0ca 100644 --- a/packages/@react-native-windows/cli/src/e2etest/projects/FooPackage/package.json +++ b/packages/@react-native-windows/cli/src/e2etest/projects/FooPackage/package.json @@ -1,7 +1,7 @@ { - "name": "foo", + "name": "@rnw-scripts/foo", "version": "1.2.3", "description": "Synthetic project.json for testing project.json logic", "license": "MIT", "private": true -} +} \ No newline at end of file diff --git a/packages/@react-native-windows/telemetry/src/test/projectUtils.test.ts b/packages/@react-native-windows/telemetry/src/test/projectUtils.test.ts index 6dc86e05cc1..f7c314f132a 100644 --- a/packages/@react-native-windows/telemetry/src/test/projectUtils.test.ts +++ b/packages/@react-native-windows/telemetry/src/test/projectUtils.test.ts @@ -74,7 +74,9 @@ test('configToProjectInfo() works with playground project info', async () => { const projectInfo = info as projectUtils.AppProjectInfo; - expect(projectInfo.id).toBe(projectUtils.getProjectId('playground')); + expect(projectInfo.id).toBe( + projectUtils.getProjectId('@rnw-scripts/playground'), + ); expect(projectInfo.platforms).toStrictEqual(['windows']); expect(projectInfo.rnwLang).toBe('cpp'); expect(projectInfo.usesTS).toBe(true); diff --git a/packages/debug-test/package.json b/packages/debug-test/package.json index 67849e4c503..8be8825664e 100644 --- a/packages/debug-test/package.json +++ b/packages/debug-test/package.json @@ -1,5 +1,5 @@ { - "name": "debug-test", + "name": "@rnw-scripts/debug-test", "version": "0.0.0", "private": true, "scripts": { @@ -19,4 +19,4 @@ "ts-jest": "^29.0.3", "ws": "^6.2.2" } -} +} \ No newline at end of file diff --git a/packages/e2e-test-app-fabric/package.json b/packages/e2e-test-app-fabric/package.json index 579bf7d7b31..0f5e1646d52 100644 --- a/packages/e2e-test-app-fabric/package.json +++ b/packages/e2e-test-app-fabric/package.json @@ -1,5 +1,5 @@ { - "name": "e2e-test-app-fabric", + "name": "@rnw-scripts/e2e-test-app-fabric", "version": "0.0.0", "private": true, "scripts": { diff --git a/packages/playground/package.json b/packages/playground/package.json index 8018d4dcad0..0f0231f2653 100644 --- a/packages/playground/package.json +++ b/packages/playground/package.json @@ -1,5 +1,5 @@ { - "name": "playground", + "name": "@rnw-scripts/playground", "version": "0.0.54", "private": true, "scripts": { From c536367e36ea4517d396765afaaa4744da37dae0 Mon Sep 17 00:00:00 2001 From: Yichen Yao Date: Mon, 2 Mar 2026 16:49:57 -0800 Subject: [PATCH 2/7] Add some more packages to @rnw-scripts namespace. --- packages/e2e-test-app/package.json | 2 +- packages/integration-test-app/package.json | 2 +- packages/sample-apps/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/e2e-test-app/package.json b/packages/e2e-test-app/package.json index c06fb17afd1..f5b9fd4604d 100644 --- a/packages/e2e-test-app/package.json +++ b/packages/e2e-test-app/package.json @@ -1,5 +1,5 @@ { - "name": "e2e-test-app", + "name": "@rnw-scripts/e2e-test-app", "version": "0.0.0", "private": true, "scripts": { diff --git a/packages/integration-test-app/package.json b/packages/integration-test-app/package.json index 24333fc4bb3..7eeb66f1f11 100644 --- a/packages/integration-test-app/package.json +++ b/packages/integration-test-app/package.json @@ -1,5 +1,5 @@ { - "name": "integration-test-app", + "name": "@rnw-scripts/integration-test-app", "version": "0.0.0", "private": true, "scripts": { diff --git a/packages/sample-apps/package.json b/packages/sample-apps/package.json index f31dff9b6e3..33c7dd32270 100644 --- a/packages/sample-apps/package.json +++ b/packages/sample-apps/package.json @@ -1,5 +1,5 @@ { - "name": "sample-apps", + "name": "@rnw-scripts/sample-apps", "version": "0.0.0", "private": true, "scripts": { From 1795d603e779f5cc86bd95c66142fe3db9844e55 Mon Sep 17 00:00:00 2001 From: Yichen Yao Date: Mon, 2 Mar 2026 18:26:01 -0800 Subject: [PATCH 3/7] Remove sample-apps from rnw-scripts namespace. --- packages/sample-apps/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sample-apps/package.json b/packages/sample-apps/package.json index 33c7dd32270..f31dff9b6e3 100644 --- a/packages/sample-apps/package.json +++ b/packages/sample-apps/package.json @@ -1,5 +1,5 @@ { - "name": "@rnw-scripts/sample-apps", + "name": "sample-apps", "version": "0.0.0", "private": true, "scripts": { From 0954a01da5ce3de8e8f678b32adf8c09c7d95d47 Mon Sep 17 00:00:00 2001 From: Yichen Yao Date: Mon, 2 Mar 2026 18:52:03 -0800 Subject: [PATCH 4/7] Remove playground from rnw-scripts namespace. --- packages/playground/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/playground/package.json b/packages/playground/package.json index 0f0231f2653..8018d4dcad0 100644 --- a/packages/playground/package.json +++ b/packages/playground/package.json @@ -1,5 +1,5 @@ { - "name": "@rnw-scripts/playground", + "name": "playground", "version": "0.0.54", "private": true, "scripts": { From 93e70fc7ede1aa951752defdef6f19c9cb1e35ad Mon Sep 17 00:00:00 2001 From: Yichen Yao Date: Thu, 5 Mar 2026 16:41:40 -0800 Subject: [PATCH 5/7] Fix Ensure servers readiness task. --- .ado/jobs/desktop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ado/jobs/desktop.yml b/.ado/jobs/desktop.yml index 759eeeffe36..92429414996 100644 --- a/.ado/jobs/desktop.yml +++ b/.ado/jobs/desktop.yml @@ -317,8 +317,8 @@ jobs: targetType: 'inline' script: | # Test website - Invoke-WebRequest -Uri 'http://localhost:5555' - Invoke-WebRequest -Uri 'https://localhost:5543' + Invoke-WebRequest -UseBasicParsing -Uri 'http://localhost:5555' + Invoke-WebRequest -UseBasicParsing -Uri 'https://localhost:5543' # Bundler Invoke-WebRequest -UseBasicParsing -Uri "http://localhost:8081/IntegrationTests/IntegrationTestsApp.bundle?platform=windows&dev=true" From 0d0ee2cdae7b39d27dc143d13f184d629fa3a12b Mon Sep 17 00:00:00 2001 From: Yichen Yao Date: Thu, 5 Mar 2026 16:44:32 -0800 Subject: [PATCH 6/7] Remove e2e-test-app-* from rnw-scripts namespace. --- packages/e2e-test-app-fabric/package.json | 2 +- packages/e2e-test-app/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/e2e-test-app-fabric/package.json b/packages/e2e-test-app-fabric/package.json index 0f5e1646d52..579bf7d7b31 100644 --- a/packages/e2e-test-app-fabric/package.json +++ b/packages/e2e-test-app-fabric/package.json @@ -1,5 +1,5 @@ { - "name": "@rnw-scripts/e2e-test-app-fabric", + "name": "e2e-test-app-fabric", "version": "0.0.0", "private": true, "scripts": { diff --git a/packages/e2e-test-app/package.json b/packages/e2e-test-app/package.json index f5b9fd4604d..c06fb17afd1 100644 --- a/packages/e2e-test-app/package.json +++ b/packages/e2e-test-app/package.json @@ -1,5 +1,5 @@ { - "name": "@rnw-scripts/e2e-test-app", + "name": "e2e-test-app", "version": "0.0.0", "private": true, "scripts": { From 2a48d1828f0488b0569bf78c955b4918fe2350f8 Mon Sep 17 00:00:00 2001 From: Yichen Yao Date: Thu, 5 Mar 2026 17:11:07 -0800 Subject: [PATCH 7/7] Remove integration-test-app from rnw-scripts namespace. --- packages/integration-test-app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/integration-test-app/package.json b/packages/integration-test-app/package.json index 7eeb66f1f11..24333fc4bb3 100644 --- a/packages/integration-test-app/package.json +++ b/packages/integration-test-app/package.json @@ -1,5 +1,5 @@ { - "name": "@rnw-scripts/integration-test-app", + "name": "integration-test-app", "version": "0.0.0", "private": true, "scripts": {