diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 493304b..a204de1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: - name: Install deno uses: denoland/setup-deno@v1 with: - deno-version: v1.x + deno-version: v2.x - name: install webkit2gtk (Linux) if: matrix.os == 'ubuntu-latest' diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index e09b1c5..0e86029 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -13,7 +13,7 @@ jobs: - name: Install stable deno uses: denoland/setup-deno@v1 with: - deno-version: v1.x + deno-version: v2.x - name: Run check run: deno task check diff --git a/deno.json b/deno.json index 084c862..42347a3 100644 --- a/deno.json +++ b/deno.json @@ -1,6 +1,6 @@ { "name": "@webview/webview", - "version": "0.8.0", + "version": "0.8.1", "exports": "./mod.ts", "lock": false, "tasks": { @@ -17,5 +17,5 @@ "fmt": { "exclude": ["webview/"] }, - "imports": { "@denosaurs/plug": "jsr:@denosaurs/plug@^1.0.5" } + "imports": { "@denosaurs/plug": "jsr:@denosaurs/plug@^1.0.6" } } diff --git a/examples/ssr/worker.tsx b/examples/ssr/worker.tsx index f0f089a..6d03c50 100644 --- a/examples/ssr/worker.tsx +++ b/examples/ssr/worker.tsx @@ -5,6 +5,7 @@ /// import { serve } from "https://deno.land/std@0.157.0/http/server.ts"; +// deno-lint-ignore verbatim-module-syntax import { h, ssr, tw } from "https://crux.land/nanossr@0.0.1"; const Hello = (props: { name: string }) => ( diff --git a/script/build.bat b/script/build.bat index 103aeed..e959c8f 100644 --- a/script/build.bat +++ b/script/build.bat @@ -1,23 +1,4 @@ @echo off - -echo Prepare directories... -set script_dir=%~dp0 -set src_dir=%script_dir%..\webview -set build_dir=%script_dir%..\build -mkdir "%build_dir%" - -echo Webview directory: %src_dir% -echo Build directory: %build_dir% - -:: If you update the nuget package, change its version here -set nuget_version=1.0.1150.38 -echo Using Nuget Package microsoft.web.webview2.%nuget_version% -if not exist "%script_dir%\microsoft.web.webview2.%nuget_version%" ( - curl -sSLO https://dist.nuget.org/win-x86-commandline/latest/nuget.exe - nuget.exe install Microsoft.Web.Webview2 -Version %nuget_version% -OutputDirectory %script_dir% - echo Nuget package installed -) - echo Looking for vswhere.exe... set "vswhere=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" if not exist "%vswhere%" set "vswhere=%ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe" @@ -37,40 +18,8 @@ if not exist "%vc_dir%\Common7\Tools\vsdevcmd.bat" ( ) echo Found %vc_dir% -:: 4100: unreferenced formal parameter -set warning_params=/W4 /wd4100 - -:: build dlls if not found -if not exist "%src_dir%\dll\x64\webview.dll" ( - mkdir "%src_dir%\dll\x86" - mkdir "%src_dir%\dll\x64" - copy "%script_dir%\microsoft.web.webview2.%nuget_version%\build\native\x64\WebView2Loader.dll" "%src_dir%\dll\x64" - copy "%script_dir%\microsoft.web.webview2.%nuget_version%\build\native\x86\WebView2Loader.dll" "%src_dir%\dll\x86" - - call "%vc_dir%\Common7\Tools\vsdevcmd.bat" -arch=x86 -host_arch=x64 - - echo "Building webview.dll (x86)" - cl %warning_params% ^ - /D "WEBVIEW_API=__declspec(dllexport)" ^ - /I "%script_dir%\microsoft.web.webview2.%nuget_version%\build\native\include" ^ - "%script_dir%\microsoft.web.webview2.%nuget_version%\build\native\x86\WebView2Loader.dll.lib" ^ - /std:c++17 /EHsc "/Fo%build_dir%"\ ^ - "%src_dir%\webview.cc" /link /DLL "/OUT:%src_dir%\dll\x86\webview.dll" || exit \b - - call "%vc_dir%\Common7\Tools\vsdevcmd.bat" -arch=x64 -host_arch=x64 - echo "Building webview.dll (x64)" - cl %warning_params% ^ - /D "WEBVIEW_API=__declspec(dllexport)" ^ - /I "%script_dir%\microsoft.web.webview2.%nuget_version%\build\native\include" ^ - "%script_dir%\microsoft.web.webview2.%nuget_version%\build\native\x64\WebView2Loader.dll.lib" ^ - /std:c++17 /EHsc "/Fo%build_dir%"\ ^ - "%src_dir%\webview.cc" /link /DLL "/OUT:%src_dir%\dll\x64\webview.dll" || exit \b -) -if not exist "%build_dir%\webview.dll" ( - copy "%src_dir%\dll\x64\webview.dll" %build_dir% -) -if not exist "%build_dir%\WebView2Loader.dll" ( - copy "%script_dir%\microsoft.web.webview2.%nuget_version%\build\native\x64\WebView2Loader.dll" "%build_dir%" -) - call "%vc_dir%\Common7\Tools\vsdevcmd.bat" -arch=x64 -host_arch=x64 +cd %~dp0..\webview + +cmake -G "Ninja Multi-Config" -B build -S . +cmake --build build --config Release diff --git a/src/ffi.ts b/src/ffi.ts index e0be4f8..bcf93ed 100644 --- a/src/ffi.ts +++ b/src/ffi.ts @@ -1,7 +1,7 @@ import manifest from "../deno.json" with { type: "json" }; import { dlopen, download } from "@denosaurs/plug"; -import { Webview } from "./webview.ts"; +import type { Webview } from "./webview.ts"; const version = manifest.version; const cache = Deno.env.get("PLUGIN_URL") === undefined ? "use" : "reloadAll"; diff --git a/webview b/webview index 2ee04cc..b19c598 160000 --- a/webview +++ b/webview @@ -1 +1 @@ -Subproject commit 2ee04ccd0530e3928a872f5d508c114403803e61 +Subproject commit b19c598d8ceb863de6079d227ea46f23a797b4f2