Fixed #3 & #4. Added edge support. More readme

webview · Mar 17, 2020 · 85bc1e6 · 85bc1e6
1 parent 4dfd47c
commit 85bc1e6
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 25 deletions.
diff --git a/.cargo/config b/.cargo/config
@@ -0,0 +1,2 @@
+[target.x86_64-pc-windows-msvc]
+rustflags = ["-Ctarget-feature=+crt-static"]
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "deno_webview"
-version = "0.2.0"
+version = "0.2.2"
 authors = ["Elias Sjögreen <[email protected]>"]
 edition = "2018"
 
@@ -14,4 +14,4 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 
 [features]
-edge = ["webview-sys/edge"]
+default = ["webview-sys/edge"]
diff --git a/README.md b/README.md
@@ -144,20 +144,19 @@ cargo build --release --locked
 
 ```
 
-optionally with edge (does not work yet
-[#3](https://github.com/eliassjogreen/deno_webview/issues/3))
+optionally with mshtml
 
 ```
 
-deno -A scripts/build.ts edge
+deno -A scripts/build.ts mshtml
 
 ```
 
 or
 
 ```
 
-cargo build --release --locked --features edge
+cargo build --release --locked --no-default-features
 
 ```
 
@@ -174,6 +173,15 @@ using local binaries can be easier to do using the
 deno -A scripts/dev.ts example.ts
 ```
 
+## Environment variables
+
+-   `DEV` - When developing locally `DEV` should be set to the local release
+    path, usually `file://./target/release`
+-   `MSHTML` - Due to MSHTML (ie) no longer being enabled by default the only
+    way to enable it is to set the `MSHTML` variable to the path of a binary
+    build built with the `--no-default-features` flag or using
+    `deno -A scripts/build.ts mshtml`
+
 ## Contributing
 
 Contributions either in the form of pull requests or issues are always welcome.
@@ -201,7 +209,7 @@ Just remember to format using `deno fmt` and `cargo fmt`. Thx <3
         `*mut CWebView`)~~ Used solution found
         [here](https://github.com/crabmusket/deno_sqlite_plugin/blob/2df9e495f34d246881de0b48c9c79cc9e271abeb/src/lib.rs#L18)
 -   [x] Better errors and responses from rust land
--   [ ] Update ci so building with Edge works
+-   [x] Update ci so building with Edge works
         [#3](https://github.com/eliassjogreen/deno_webview/issues/3)
 -   [ ] Two-way deno bindings (to call deno from javascript)
 -   [ ] More examples

diff --git a/examples/user_agent.ts b/examples/user_agent.ts
@@ -0,0 +1,18 @@
+import { WebView } from "../mod.ts";
+
+new WebView({
+    title: "User agent deno_webview example",
+    url: `data:text/html,
+      <html>
+      <body>
+        <h1 id="h1">2 Nav</h1>
+        <script>document.body.innerHTML = window.navigator.userAgent;</script>
+      </body>
+      </html>
+      `,
+    width: 800,
+    height: 600,
+    resizable: true,
+    debug: false,
+    frameless: false
+}).run();
diff --git a/plugin.ts b/plugin.ts
@@ -1,17 +1,18 @@
 import { prepare } from "https://deno.land/x/[email protected]/mod.ts";
 
 const DEV = Deno.env("DEV");
+const MSHTML = Deno.env("MSHTML");
 
 const pluginPath = DEV !== undefined
   ? DEV
-  : "https://github.com/eliassjogreen/deno_webview/releases/download/0.2.0";
+  : "https://github.com/eliassjogreen/deno_webview/releases/download/0.2.2";
 
 const plugin = await prepare({
   name: "deno_webview",
-  checkCache: DEV !== undefined,
+  checkCache: DEV === undefined,
   urls: {
     mac: `${pluginPath}/libdeno_webview.dylib`,
-    win: `${pluginPath}/deno_webview.dll`,
+    win: MSHTML === undefined ? `${pluginPath}/deno_webview.dll` : MSHTML,
     linux: `${pluginPath}/libdeno_webview.so`
   }
 });

diff --git a/scripts/build.ts b/scripts/build.ts
@@ -1,9 +1,8 @@
-export async function build(edge: boolean = Deno.args[0] === "edge") {
+export async function build(mshtml: boolean = Deno.args.includes("mshtml")) {
   const command = ["cargo", "build", "--release", "--locked"];
 
-  // TODO (#3) fix
-  if (edge) {
-    command.push("--features", "edge");
+  if (mshtml) {
+    command.push("--no-default-features");
   }
 
   const cargo = Deno.run({

diff --git a/scripts/dev.ts b/scripts/dev.ts
@@ -1,16 +1,27 @@
 import { build } from "./build.ts";
 
-export async function dev(file: string = Deno.args[0]) {
-  await build();
+export async function dev(
+    file: string = Deno.args[0],
+    mshtml: boolean = Deno.args.includes("mshtml")
+) {
+    await build();
 
-  Deno.run({
-    args: ["deno", "run", "-A", file],
-    env: {
-      "DEV": "file://./target/release"
+    const env: {
+        [key: string]: string;
+    } = {
+        DEV: "file://./target/release"
+    };
+
+    if (mshtml) {
+        env["MSHTML"] = "file://./target/release/deno_webview.dll";
     }
-  });
+
+    Deno.run({
+        args: ["deno", "run", "-A", "-r", file],
+        env
+    });
 }
 
 if (import.meta.main) {
-  dev();
+    await dev();
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[target.x86_64-pc-windows-msvc]
		rustflags = ["-Ctarget-feature=+crt-static"]