Skip to content

fix(windows): separate .wapproj from .vcxproj to prevent output from being overwritten #2806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tido64 merged 2 commits into from
Jun 11, 2026
Merged

fix(windows): separate .wapproj from .vcxproj to prevent output from being overwritten #2806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aec826
fix(windows): separate `.wapproj` from `.vcxproj` to prevent output f…
tido64 Jun 11, 2026
0ad1556
correctly forward fs
tido64 Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions packages/app/test/pack.test.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,35 +284,35 @@ describe("npm pack", () => {
"windows/Win32/AutolinkedNativeModules.g.h",
"windows/Win32/DevMenu.cpp",
"windows/Win32/DevMenu.h",
"windows/Win32/Images/SplashScreen.scale-100.png",
"windows/Win32/Images/SplashScreen.scale-200.png",
"windows/Win32/Images/SplashScreen.scale-400.png",
"windows/Win32/Images/Square150x150Logo.scale-100.png",
"windows/Win32/Images/Square150x150Logo.scale-200.png",
"windows/Win32/Images/Square150x150Logo.scale-400.png",
"windows/Win32/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png",
"windows/Win32/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png",
"windows/Win32/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png",
"windows/Win32/Images/Square44x44Logo.altform-unplated_targetsize-16.png",
"windows/Win32/Images/Square44x44Logo.altform-unplated_targetsize-256.png",
"windows/Win32/Images/Square44x44Logo.altform-unplated_targetsize-48.png",
"windows/Win32/Images/Square44x44Logo.scale-100.png",
"windows/Win32/Images/Square44x44Logo.scale-200.png",
"windows/Win32/Images/Square44x44Logo.scale-400.png",
"windows/Win32/Images/Square44x44Logo.targetsize-16.png",
"windows/Win32/Images/Square44x44Logo.targetsize-256.png",
"windows/Win32/Images/Square44x44Logo.targetsize-48.png",
"windows/Win32/Images/StoreLogo.scale-100.png",
"windows/Win32/Images/StoreLogo.scale-200.png",
"windows/Win32/Images/StoreLogo.scale-400.png",
"windows/Win32/Images/Wide310x150Logo.scale-200.png",
"windows/Win32/Main.cpp",
"windows/Win32/Main.h",
"windows/Win32/Main.ico",
"windows/Win32/Main.rc",
"windows/Win32/Main.small.ico",
"windows/Win32/Package.appxmanifest",
"windows/Win32/ReactApp.Package.wapproj",
"windows/Win32/ReactApp.Package/Images/SplashScreen.scale-100.png",
"windows/Win32/ReactApp.Package/Images/SplashScreen.scale-200.png",
"windows/Win32/ReactApp.Package/Images/SplashScreen.scale-400.png",
"windows/Win32/ReactApp.Package/Images/Square150x150Logo.scale-100.png",
"windows/Win32/ReactApp.Package/Images/Square150x150Logo.scale-200.png",
"windows/Win32/ReactApp.Package/Images/Square150x150Logo.scale-400.png",
"windows/Win32/ReactApp.Package/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png",
"windows/Win32/ReactApp.Package/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png",
"windows/Win32/ReactApp.Package/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png",
"windows/Win32/ReactApp.Package/Images/Square44x44Logo.altform-unplated_targetsize-16.png",
"windows/Win32/ReactApp.Package/Images/Square44x44Logo.altform-unplated_targetsize-256.png",
"windows/Win32/ReactApp.Package/Images/Square44x44Logo.altform-unplated_targetsize-48.png",
"windows/Win32/ReactApp.Package/Images/Square44x44Logo.scale-100.png",
"windows/Win32/ReactApp.Package/Images/Square44x44Logo.scale-200.png",
"windows/Win32/ReactApp.Package/Images/Square44x44Logo.scale-400.png",
"windows/Win32/ReactApp.Package/Images/Square44x44Logo.targetsize-16.png",
"windows/Win32/ReactApp.Package/Images/Square44x44Logo.targetsize-256.png",
"windows/Win32/ReactApp.Package/Images/Square44x44Logo.targetsize-48.png",
"windows/Win32/ReactApp.Package/Images/StoreLogo.scale-100.png",
"windows/Win32/ReactApp.Package/Images/StoreLogo.scale-200.png",
"windows/Win32/ReactApp.Package/Images/StoreLogo.scale-400.png",
"windows/Win32/ReactApp.Package/Images/Wide310x150Logo.scale-200.png",
"windows/Win32/ReactApp.Package/Package.appxmanifest",
"windows/Win32/ReactApp.Package/ReactApp.Package.wapproj",
"windows/Win32/ReactApp.vcxproj",
"windows/Win32/ReactApp.vcxproj.filters",
"windows/Win32/pch.cpp",
Expand Down
2 changes: 1 addition & 1 deletion packages/app/test/windows/copyAndReplace.test.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { fs, setMockFiles } from "../fs.mock.mts";

describe("copyAndReplace()", () => {
const copyAndReplace: typeof copyAndReplaceActual = (src, dst, r) =>
copyAndReplaceActual(src, dst, r, fs.promises);
copyAndReplaceActual(src, dst, r, fs);

const readTextFile: typeof readTextFileActual = (p) =>
readTextFileActual(p, fs);
Expand Down
0 ...s/Win32/Images/SplashScreen.scale-100.png → ...Package/Images/SplashScreen.scale-100.png
View file
Open in desktop
File renamed without changes
0 ...s/Win32/Images/SplashScreen.scale-200.png → ...Package/Images/SplashScreen.scale-200.png
View file
Open in desktop
File renamed without changes
0 ...s/Win32/Images/SplashScreen.scale-400.png → ...Package/Images/SplashScreen.scale-400.png
View file
Open in desktop
File renamed without changes
0 ...32/Images/Square150x150Logo.scale-100.png → ...ge/Images/Square150x150Logo.scale-100.png
View file
Open in desktop
File renamed without changes
0 ...32/Images/Square150x150Logo.scale-200.png → ...ge/Images/Square150x150Logo.scale-200.png
View file
Open in desktop
File renamed without changes
0 ...32/Images/Square150x150Logo.scale-400.png → ...ge/Images/Square150x150Logo.scale-400.png
View file
Open in desktop
File renamed without changes
0 ...o.altform-lightunplated_targetsize-16.png → ...o.altform-lightunplated_targetsize-16.png
View file
Open in desktop
File renamed without changes
0 ....altform-lightunplated_targetsize-256.png → ....altform-lightunplated_targetsize-256.png
View file
Open in desktop
File renamed without changes
0 ...o.altform-lightunplated_targetsize-48.png → ...o.altform-lightunplated_targetsize-48.png
View file
Open in desktop
File renamed without changes
0 ...44Logo.altform-unplated_targetsize-16.png → ...44Logo.altform-unplated_targetsize-16.png
View file
Open in desktop
File renamed without changes
0 ...4Logo.altform-unplated_targetsize-256.png → ...4Logo.altform-unplated_targetsize-256.png
View file
Open in desktop
File renamed without changes
0 ...44Logo.altform-unplated_targetsize-48.png → ...44Logo.altform-unplated_targetsize-48.png
View file
Open in desktop
File renamed without changes
0 ...in32/Images/Square44x44Logo.scale-100.png → ...kage/Images/Square44x44Logo.scale-100.png
View file
Open in desktop
File renamed without changes
0 ...in32/Images/Square44x44Logo.scale-200.png → ...kage/Images/Square44x44Logo.scale-200.png
View file
Open in desktop
File renamed without changes
0 ...in32/Images/Square44x44Logo.scale-400.png → ...kage/Images/Square44x44Logo.scale-400.png
View file
Open in desktop
File renamed without changes
0 .../Images/Square44x44Logo.targetsize-16.png → .../Images/Square44x44Logo.targetsize-16.png
View file
Open in desktop
File renamed without changes
0 ...Images/Square44x44Logo.targetsize-256.png → ...Images/Square44x44Logo.targetsize-256.png
View file
Open in desktop
File renamed without changes
0 .../Images/Square44x44Logo.targetsize-48.png → .../Images/Square44x44Logo.targetsize-48.png
View file
Open in desktop
File renamed without changes
0 ...dows/Win32/Images/StoreLogo.scale-100.png → ...pp.Package/Images/StoreLogo.scale-100.png
View file
Open in desktop
File renamed without changes
0 ...dows/Win32/Images/StoreLogo.scale-200.png → ...pp.Package/Images/StoreLogo.scale-200.png
View file
Open in desktop
File renamed without changes
0 ...dows/Win32/Images/StoreLogo.scale-400.png → ...pp.Package/Images/StoreLogo.scale-400.png
View file
Open in desktop
File renamed without changes
0 ...in32/Images/Wide310x150Logo.scale-200.png → ...kage/Images/Wide310x150Logo.scale-200.png
View file
Open in desktop
File renamed without changes
0 ...es/app/windows/Win32/Package.appxmanifest → ...n32/ReactApp.Package/Package.appxmanifest
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...pp/windows/Win32/ReactApp.Package.wapproj → ...ReactApp.Package/ReactApp.Package.wapproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ProjectGuid>{b44cead7-fbff-4a17-95eb-ff5434bbd79d}</ProjectGuid>
<TargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)'!=''">$(WindowsTargetPlatformVersion)</TargetPlatformVersion>
<DefaultLanguage>en-US</DefaultLanguage>
<EntryPointProjectUniqueName>ReactApp.vcxproj</EntryPointProjectUniqueName>
<EntryPointProjectUniqueName>..\ReactApp.vcxproj</EntryPointProjectUniqueName>
<DebuggerType>NativeOnly</DebuggerType>
<BackgroundTaskDebugEngines>NativeOnly</BackgroundTaskDebugEngines>
</PropertyGroup>
Expand Down Expand Up @@ -87,7 +87,7 @@
<!-- ReactApp content items -->
</ItemGroup>
<ItemGroup>
<ProjectReference Include="ReactApp.vcxproj">
<ProjectReference Include="..\ReactApp.vcxproj">
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
</ProjectReference>
</ItemGroup>
Expand Down
23 changes: 12 additions & 11 deletions packages/app/windows/app.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,19 @@ export async function copyAndReplace(
srcPath,
destPath,
replacements,
fs = nodefs.promises
fs = nodefs
) {
mkdir_p(path.dirname(destPath), fs);

if (!replacements) {
return cp_r(srcPath, destPath, nodefs);
return cp_r(srcPath, destPath, fs);
}

const fsp = fs.promises;

// Treat as text file
const data = await fs.readFile(srcPath, { encoding: "utf-8" });
return writeTextFile(destPath, replaceContent(data, replacements), fs);
const data = await fsp.readFile(srcPath, { encoding: "utf-8" });
return writeTextFile(destPath, replaceContent(data, replacements), fsp);
}

/**
Expand Down Expand Up @@ -185,8 +189,7 @@ export async function generateSolution(destPath, options, fs = nodefs) {
mkdir_p(destPath, fs);

/** @type {typeof copyAndReplace} */
const copyAndReplaceAsync = (src, dst, r) =>
copyAndReplace(src, dst, r, fs.promises);
const copyAndReplaceAsync = (src, dst, r) => copyAndReplace(src, dst, r, fs);

const copyTasks = projectFiles.map(([file, replacements]) =>
copyAndReplaceAsync(
Expand All @@ -208,6 +211,7 @@ export async function generateSolution(destPath, options, fs = nodefs) {
const slnPath = path.join(destPath, `${info.bundle.appName}.sln`);
const vcxprojPath = path.join(projectFilesDestPath, projectFileName);
const vcxprojLocalPath = path.relative(destPath, vcxprojPath);
const wapprojPath = "ReactApp.Package\\ReactApp.Package.wapproj";
copyTasks.push(
writeTextFile(
slnPath,
Expand All @@ -230,11 +234,8 @@ export async function generateSolution(destPath, options, fs = nodefs) {
`"${path.relative(destPath, rnWindowsPath)}\\`
)
.replace(
"ReactApp.Package\\ReactApp.Package.wapproj", // Win32
vcxprojLocalPath.replace(
"ReactApp.vcxproj",
"ReactApp.Package.wapproj"
)
wapprojPath, // Win32
vcxprojLocalPath.replace("ReactApp.vcxproj", wapprojPath)
)
.replace("ReactApp\\ReactApp.vcxproj", vcxprojLocalPath) // Win32
.replace("ReactTestApp\\ReactTestApp.vcxproj", vcxprojLocalPath) // UWP
Expand Down
6 changes: 3 additions & 3 deletions packages/app/windows/win32.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ export function configureForWin32({
projectFileName: "ReactApp.vcxproj",
projectFiles: [
["AutolinkedNativeModules.g.cpp"],
["Images"],
["Main.ico"],
["Main.rc"],
["Main.small.ico"],
["Package.appxmanifest"],
["ReactApp.Package/Images"],
["ReactApp.Package/Package.appxmanifest"],
[
"ReactApp.Package.wapproj",
"ReactApp.Package/ReactApp.Package.wapproj",
{
"<!-- ReactApp content items -->": bundle.contentItems,
},
Expand Down
Loading