Skip to content

Fix AddViteApp port configuration to use Aspire-assigned port #724

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
aaronpowell merged 15 commits into from
Jun 16, 2025
Merged

Fix AddViteApp port configuration to use Aspire-assigned port #724

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3e06c5c
Initial plan for issue
Copilot Jun 10, 2025
d959530
Implement AddViteApp port configuration with command line arguments
Copilot Jun 10, 2025
e9edf76
Finalize AddViteApp port configuration and update example
Copilot Jun 10, 2025
c2d7e81
Improving on Copilots take
aaronpowell Jun 10, 2025
8ed59ff
Keeping PORT on env vars
aaronpowell Jun 10, 2025
6040d2d
Simplify AddViteApp port configuration by using vite.config.ts
Copilot Jun 10, 2025
ac4d965
Simplifying the code
aaronpowell Jun 10, 2025
8fa7f76
Fixing test
aaronpowell Jun 10, 2025
de2f20e
Merge branch 'copilot/fix-718' of https://github.com/CommunityToolkit…
aaronpowell Jun 10, 2025
8d2f7aa
Reverting a copilot change
aaronpowell Jun 10, 2025
56c930b
Using an endpoint reference expression which is a better approach for…
aaronpowell Jun 10, 2025
2da789f
Think we only need -- for npm, not other package managers
aaronpowell Jun 10, 2025
ef4e6e9
Cleaning up using statements
aaronpowell Jun 10, 2025
91305ae
Remove automatic WithExternalHttpEndpoints from AddViteApp to let use…
Copilot Jun 10, 2025
5108520
Merge branch 'main' into copilot/fix-718
aaronpowell Jun 16, 2025
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
Prev Previous commit
Next Next commit
Improving on Copilots take
  • Loading branch information
@aaronpowell
aaronpowell committed Jun 10, 2025
commit c2d7e818f868eddb44d102b343ecf14e2d0dc993
4 changes: 1 addition & 3 deletions examples/nodejs-ext/pnpm-demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "run-script-os",
"dev:windows": "vite dev --port %PORT%",
"dev:default": "vite dev --port $PORT",
"dev": "vite dev",
"build": "tsc -b && vite build",
"lint": "eslint .",
"preview": "vite preview"
Expand Down
5 changes: 2 additions & 3 deletions examples/nodejs-ext/vite-demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "run-script-os",
"dev:windows": "vite dev --port %PORT%",
"dev:default": "vite dev --port $PORT",
"dev": "vite dev",
"build": "tsc -b && vite build",
"lint": "eslint .",
"preview": "vite preview"
Expand All @@ -30,3 +28,4 @@
"vite": "^6.3.4"
}
}

3 changes: 0 additions & 3 deletions examples/nodejs-ext/vite-demo/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,4 @@ import react from '@vitejs/plugin-react'
// https://vitejs.dev/config/
export default defineConfig({
plugins: [react()],
server: {
port: parseInt(process.env.PORT || '5173')
}
})
5 changes: 2 additions & 3 deletions examples/nodejs-ext/yarn-demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "run-script-os",
"dev:windows": "vite dev --port %PORT%",
"dev:default": "vite dev --port $PORT",
"dev": "vite dev",
"build": "tsc -b && vite build",
"lint": "eslint .",
"preview": "vite preview"
Expand All @@ -30,3 +28,4 @@
"vite": "^6.3.4"
}
}

36 changes: 21 additions & 15 deletions src/CommunityToolkit.Aspire.Hosting.NodeJS.Extensions/NodeJSHostingExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,27 +38,33 @@ public static IResourceBuilder<NodeAppResource> AddViteApp(this IDistributedAppl
};

var endpointBuilder = useHttps
? resource.WithHttpsEndpoint(env: "PORT").WithExternalHttpEndpoints()
: resource.WithHttpEndpoint(env: "PORT").WithExternalHttpEndpoints();
? resource.WithHttpsEndpoint().WithExternalHttpEndpoints()
: resource.WithHttpEndpoint().WithExternalHttpEndpoints();

// Configure Vite to use the assigned port from the endpoint
return endpointBuilder.WithArgs(ctx =>
builder.Eventing.Subscribe<ResourceEndpointsAllocatedEvent>((@event, ct) =>
{
// Add -- separator to pass arguments to the underlying command (vite dev)
ctx.Args.Add("--");
ctx.Args.Add("--port");

// Try to get the port from the environment variable set by the endpoint
if (ctx.EnvironmentVariables.TryGetValue("PORT", out var portValue))
if (@event.Resource.Name != name)
{
ctx.Args.Add(portValue);
return Task.CompletedTask;
}
else

endpointBuilder.WithArgs(ctx =>
{
// Fallback to Vite's default port
ctx.Args.Add("5173");
}
if (@event.Resource.TryGetEndpoints(out var endpoints))
{
// Set the PORT environment variable to the first endpoint's port
var firstEndpoint = endpoints.FirstOrDefault();

ctx.Args.Add("--");
ctx.Args.Add("--port");
ctx.Args.Add(firstEndpoint?.AllocatedEndpoint?.Port.ToString() ?? "5173");
}
});

return Task.CompletedTask;
});

return resource;
}

/// <summary>
Expand Down