Skip to content
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

Jump to bottom

fix: Use relative path for project-local css/scripts #894

Merged
merged 4 commits into from
Sep 20, 2024
Merged

fix: Use relative path for project-local css/scripts #894

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a1731a3
fix: Use relative path for project-local css/scripts
jeromelaban Sep 20, 2024
ea1643d
chore: Search both relative and full paths for script/css
jeromelaban Sep 20, 2024
70c1d18
chore: Adjust lookup
jeromelaban Sep 20, 2024
0cae5d1
chore: Adjust paths
jeromelaban Sep 20, 2024
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
19 changes: 16 additions & 3 deletions src/Uno.Wasm.Bootstrap/ShellTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,9 +352,22 @@ private void ExtractAdditionalJS()
{
var (fullSourcePath, relativePath) = GetFilePaths(projectResource);

if (fullSourcePath.Contains("WasmScripts"))
string? getPath()
{
var scriptName = Path.GetFileName(fullSourcePath);
if (relativePath.Contains(WasmScriptsFolder))
{
return relativePath;
}
else if (fullSourcePath.Contains(WasmScriptsFolder))
{
return fullSourcePath;
}
return null;
}

if (getPath() is { Length: > 0 } path)
{
var scriptName = Path.GetFileName(path);

Log.LogMessage($"Embedded resources JS {scriptName}");

Expand Down Expand Up @@ -389,7 +402,7 @@ private void ExtractAdditionalCSS()
{
var (fullSourcePath, relativePath) = GetFilePaths(projectResource);

if (fullSourcePath.Contains("WasmCSS"))
if (relativePath.Contains("WasmCSS") || fullSourcePath.Contains("WasmCSS"))
{
var cssName = Path.GetFileName(fullSourcePath);

Expand Down
Loading