From 798ae115b000c1bdd2cc94e041d0129deb7691b9 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Mon, 2 Dec 2024 21:06:17 +0800 Subject: [PATCH] Fix the import for apps with a base path --- .../Properties/launchSettings.json | 25 +++++++++++++++++++ .../SkiaSharpSample/wwwroot/index.html | 3 ++- .../Internal/JSModuleInterop.cs | 2 +- .../SkiaSharp.Views.Blazor.csproj | 8 +++++- .../SkiaSharp.Views.Blazor/tsconfig.json | 14 ----------- .../wwwroot/DpiWatcher.js | 1 + .../wwwroot/DpiWatcher.js.map | 1 + .../wwwroot/SKHtmlCanvas.js | 1 + .../wwwroot/SKHtmlCanvas.js.map | 1 + .../wwwroot/SizeWatcher.js | 1 + .../wwwroot/SizeWatcher.js.map | 1 + .../wwwroot/types/dotnet/extras.d.ts | 4 +-- 12 files changed, 43 insertions(+), 19 deletions(-) delete mode 100644 source/SkiaSharp.Views/SkiaSharp.Views.Blazor/tsconfig.json create mode 100644 source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/DpiWatcher.js.map create mode 100644 source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/SKHtmlCanvas.js.map create mode 100644 source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/SizeWatcher.js.map diff --git a/samples/Basic/BlazorWebAssembly/SkiaSharpSample/Properties/launchSettings.json b/samples/Basic/BlazorWebAssembly/SkiaSharpSample/Properties/launchSettings.json index 4a42f9d4ce..bdfdbbafcf 100644 --- a/samples/Basic/BlazorWebAssembly/SkiaSharpSample/Properties/launchSettings.json +++ b/samples/Basic/BlazorWebAssembly/SkiaSharpSample/Properties/launchSettings.json @@ -20,6 +20,31 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } + }, + // Uncomment the element in index.html to use these profiles + "http/app": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "app", + "commandLineArgs": "--pathbase=/app", + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/app/_framework/debug/ws-proxy?browser={browserInspectUri}", + "applicationUrl": "http://localhost:5000", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https/app": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "launchUrl": "app", + "commandLineArgs": "--pathbase=/app", + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/app/_framework/debug/ws-proxy?browser={browserInspectUri}", + "applicationUrl": "https://localhost:5001;http://localhost:5000", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } } } } diff --git a/samples/Basic/BlazorWebAssembly/SkiaSharpSample/wwwroot/index.html b/samples/Basic/BlazorWebAssembly/SkiaSharpSample/wwwroot/index.html index 54278eb462..6394d03cf1 100644 --- a/samples/Basic/BlazorWebAssembly/SkiaSharpSample/wwwroot/index.html +++ b/samples/Basic/BlazorWebAssembly/SkiaSharpSample/wwwroot/index.html @@ -5,7 +5,8 @@ SkiaSharpSample - + + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/Internal/JSModuleInterop.cs b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/Internal/JSModuleInterop.cs index 6acc23d2e3..707a857b63 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/Internal/JSModuleInterop.cs +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/Internal/JSModuleInterop.cs @@ -20,7 +20,7 @@ internal partial class JSModuleInterop : IDisposable public JSModuleInterop(IJSRuntime js, string moduleName, string moduleUrl) { #if NET7_0_OR_GREATER - moduleTask = JSHost.ImportAsync(moduleName, "/" + moduleUrl); + moduleTask = JSHost.ImportAsync(moduleName, "../" + moduleUrl); #else if (js is not IJSInProcessRuntime) throw new NotSupportedException("SkiaSharp currently only works on Web Assembly."); diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/SkiaSharp.Views.Blazor.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/SkiaSharp.Views.Blazor.csproj index 3c20e1bfb8..eab705de81 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/SkiaSharp.Views.Blazor.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/SkiaSharp.Views.Blazor.csproj @@ -12,6 +12,12 @@ aspnet;blazor;web + + es2015 + es2015 + True + + @@ -21,7 +27,7 @@ - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/tsconfig.json b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/tsconfig.json deleted file mode 100644 index 2da1b0eef8..0000000000 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "compilerOptions": { - "noImplicitAny": false, - "noEmitOnError": true, - "removeComments": false, - "sourceMap": false, - "target": "ES2020", - "module": "ES2020", - "outDir": "wwwroot" - }, - "exclude": [ - "node_modules" - ] -} diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/DpiWatcher.js b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/DpiWatcher.js index 635cd40c90..fe3873a534 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/DpiWatcher.js +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/DpiWatcher.js @@ -30,3 +30,4 @@ export class DpiWatcher { } } } +//# sourceMappingURL=DpiWatcher.js.map \ No newline at end of file diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/DpiWatcher.js.map b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/DpiWatcher.js.map new file mode 100644 index 0000000000..9b6c1448bc --- /dev/null +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/DpiWatcher.js.map @@ -0,0 +1 @@ +{"version":3,"file":"DpiWatcher.js","sourceRoot":"","sources":["DpiWatcher.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,UAAU;IAKf,MAAM,CAAC,MAAM;QACnB,OAAO,MAAM,CAAC,gBAAgB,CAAC;IAChC,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,QAA4B;QAC/C,wEAAwE;QAExE,UAAU,CAAC,OAAO,GAAG,MAAM,CAAC,gBAAgB,CAAC;QAC7C,UAAU,CAAC,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACjE,UAAU,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAE/B,OAAO,UAAU,CAAC,OAAO,CAAC;IAC3B,CAAC;IAEM,MAAM,CAAC,IAAI;QACjB,mFAAmF;QAEnF,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAEzC,UAAU,CAAC,QAAQ,GAAG,SAAS,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,MAAM;QACZ,IAAI,CAAC,UAAU,CAAC,QAAQ;YACvB,OAAO;QAER,MAAM,UAAU,GAAG,MAAM,CAAC,gBAAgB,CAAC;QAC3C,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;QACnC,UAAU,CAAC,OAAO,GAAG,UAAU,CAAC;QAEhC,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,UAAU,CAAC,GAAG,KAAK,EAAE,CAAC;YAC5C,IAAI,OAAO,UAAU,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;gBAC/C,UAAU,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YAC1C,CAAC;iBAAM,CAAC;gBACP,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;YACjE,CAAC;QACF,CAAC;IACF,CAAC;CACD"} \ No newline at end of file diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/SKHtmlCanvas.js b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/SKHtmlCanvas.js index d0907933bd..08c9ea6760 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/SKHtmlCanvas.js +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/SKHtmlCanvas.js @@ -181,3 +181,4 @@ export class SKHtmlCanvas { return GL.currentContext && GL.currentContext.GLctx || GLctx; } } +//# sourceMappingURL=SKHtmlCanvas.js.map \ No newline at end of file diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/SKHtmlCanvas.js.map b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/SKHtmlCanvas.js.map new file mode 100644 index 0000000000..874f1d3fec --- /dev/null +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/SKHtmlCanvas.js.map @@ -0,0 +1 @@ +{"version":3,"file":"SKHtmlCanvas.js","sourceRoot":"","sources":["SKHtmlCanvas.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/SizeWatcher.js b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/SizeWatcher.js index 7c57c394de..592cd63459 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/SizeWatcher.js +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/SizeWatcher.js @@ -45,3 +45,4 @@ export class SizeWatcher { } } } +//# sourceMappingURL=SizeWatcher.js.map \ No newline at end of file diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/SizeWatcher.js.map b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/SizeWatcher.js.map new file mode 100644 index 0000000000..21d9148687 --- /dev/null +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/SizeWatcher.js.map @@ -0,0 +1 @@ +{"version":3,"file":"SizeWatcher.js","sourceRoot":"","sources":["SizeWatcher.ts"],"names":[],"mappings":"AAWA,MAAM,OAAO,WAAW;IAIhB,MAAM,CAAC,OAAO,CAAC,OAAoB,EAAE,SAAiB,EAAE,QAA6B;QAC3F,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ;YACxC,OAAO;QAER,mFAAmF;QAEnF,WAAW,CAAC,IAAI,EAAE,CAAC;QAEnB,OAAO,GAAG,OAAO,IAAI,QAAQ,CAAC,aAAa,CAAC,GAAG,GAAG,SAAS,GAAG,GAAG,CAAC,CAAC;QAEnE,MAAM,cAAc,GAAG,OAA6B,CAAC;QACrD,cAAc,CAAC,WAAW,GAAG;YAC5B,QAAQ,EAAE,QAAQ;SAClB,CAAC;QAEF,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC7C,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAEtC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,SAAiB;QACxC,IAAI,CAAC,SAAS,IAAI,CAAC,WAAW,CAAC,QAAQ;YACtC,OAAO;QAER,uDAAuD;QAEvD,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACpD,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACvD,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,IAAI;QACV,IAAI,WAAW,CAAC,QAAQ;YACvB,OAAO;QAER,2CAA2C;QAE3C,WAAW,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAuB,CAAC;QACtD,WAAW,CAAC,QAAQ,GAAG,IAAI,cAAc,CAAC,CAAC,OAAO,EAAE,EAAE;YACrD,KAAK,IAAI,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC3B,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAClC,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,OAAgB;QAC7B,MAAM,cAAc,GAAG,OAA6B,CAAC;QACrD,MAAM,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAC;QAE5C,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,QAAQ;YAClC,OAAO;QAER,IAAI,OAAO,QAAQ,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;YAC7C,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QAC9D,CAAC;aAAM,CAAC;YACP,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QACrF,CAAC;IACF,CAAC;CACD"} \ No newline at end of file diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/types/dotnet/extras.d.ts b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/types/dotnet/extras.d.ts index 4a3d71e034..88a652bec7 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/types/dotnet/extras.d.ts +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Blazor/wwwroot/types/dotnet/extras.d.ts @@ -1,7 +1,7 @@ - + declare namespace DotNet { interface DotNetObjectReference extends DotNet.DotNetObject { _id: number; - dispose(); + dispose(): void; } }