Fix windows i686

Author: Brooooooklyn

.github/workflows/CI.yaml

@@ -188,9 +188,6 @@ jobs:
 
   build-win32-ia686:
     runs-on: windows-latest
-    env:
-      CARGO_PROFILE_napi_OPT_LEVEL: 0
-      CARGO_PROFILE_napi_OPT_LTO: false
     steps:
       - uses: actions/checkout@v2
 
@@ -246,9 +243,7 @@ jobs:
         run: yarn build --target i686-pc-windows-msvc
 
       - name: Test binary
-        run: |
-          node -v
-          node simple-test.js
+        run: yarn test
 
       - name: Upload artifact
         uses: actions/upload-artifact@v2

Cargo.toml

@@ -10,8 +10,8 @@ version = "0.1.0"
 crate-type = ["cdylib"]
 
 [dependencies]
-napi = {git = "https://github.com/napi-rs/napi-rs", branch = "cstring-issues"}
-napi-derive = {git = "https://github.com/napi-rs/napi-rs", branch = "cstring-issues"}
+napi = {git = "https://github.com/napi-rs/napi-rs", branch = "rust-codegen-win32"}
+napi-derive = {git = "https://github.com/napi-rs/napi-rs", branch = "rust-codegen-win32"}
 
 [target.'cfg(all(unix, not(target_env = "musl")))'.dependencies]
 jemallocator = {version = "0.3", features = ["disable_initial_exec_tls"]}
@@ -20,7 +20,7 @@ jemallocator = {version = "0.3", features = ["disable_initial_exec_tls"]}
 mimalloc = {version = "0.1"}
 
 [build-dependencies]
-napi-build = {git = "https://github.com/napi-rs/napi-rs", branch = "cstring-issues"}
+napi-build = {git = "https://github.com/napi-rs/napi-rs", branch = "rust-codegen-win32"}
 
 [profile.release]
 lto = true

npm/win32-x64-msvc/package.json

@@ -9,7 +9,7 @@
   "keywords": ["napi-rs", "NAPI", "N-API", "Rust", "node-addon", "node-addon-api"],
   "license": "MIT",
   "engines": {
-    "node": ">= 8.9"
+    "node": ">= 10"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

package.json

@@ -5,18 +5,8 @@
   "main": "index.js",
   "repository": "[email protected]:napi-rs/package-template.git",
   "license": "MIT",
-  "keywords": [
-    "napi-rs",
-    "NAPI",
-    "N-API",
-    "Rust",
-    "node-addon",
-    "node-addon-api"
-  ],
-  "files": [
-    "index.d.ts",
-    "index.js"
-  ],
+  "keywords": ["napi-rs", "NAPI", "N-API", "Rust", "node-addon", "node-addon-api"],
+  "files": ["index.d.ts", "index.js"],
   "napi": {
     "name": "package-template",
     "triples": {
@@ -75,27 +65,14 @@
     "@node-rs/helper": "^1.0.0-alpha.1"
   },
   "lint-staged": {
-    "*.@(js|ts|tsx)": [
-      "prettier --write",
-      "eslint -c .eslintrc.yml --fix"
-    ],
-    "*.@(yml|yaml)": [
-      "prettier --parser yaml --write"
-    ],
-    "*.md": [
-      "prettier --parser markdown --write"
-    ],
-    "*.json": [
-      "prettier --parser json --write"
-    ]
+    "*.@(js|ts|tsx)": ["prettier --write", "eslint -c .eslintrc.yml --fix"],
+    "*.@(yml|yaml)": ["prettier --parser yaml --write"],
+    "*.md": ["prettier --parser markdown --write"],
+    "*.json": ["prettier --parser json --write"]
   },
   "ava": {
-    "require": [
-      "ts-node/register/transpile-only"
-    ],
-    "extensions": [
-      "ts"
-    ],
+    "require": ["ts-node/register/transpile-only"],
+    "extensions": ["ts"],
     "environmentVariables": {
       "TS_NODE_PROJECT": "./tsconfig.json"
     }
@@ -113,4 +90,4 @@
       "pre-commit": "lint-staged"
     }
   }
-}
+}

simple-test.js

@@ -1,5 +1,10 @@
-const { sync } = require('./index')
+const { exec } = require('child_process')
 
-console.assert(sync(0) === 100, 'Simple test failed')
-
-console.info('Simple test passed')
+exec(`node -e "console.log(require('./index.js'))"`, (err, stdout, stderr) => {
+  console.info(stdout)
+  console.info(stderr)
+  if (err) {
+    console.error(err)
+    process.exit(1)
+  }
+})

src/lib.rs

@@ -1,22 +1,18 @@
 #[macro_use]
-extern crate napi;
-#[macro_use]
 extern crate napi_derive;
 
 use std::convert::TryInto;
 
-use napi::{CallContext, Env, JsNumber, JsObject, Module, Result, Task};
+use napi::{CallContext, Env, JsNumber, JsObject, Result, Task};
 
 #[cfg(all(unix, not(target_env = "musl")))]
 #[global_allocator]
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;
 
-#[cfg(all(windows, target_arch = "x86_64"))]
+#[cfg(windows)]
 #[global_allocator]
 static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
-register_module!(example, init);
-
 struct AsyncTask(u32);
 
 impl Task for AsyncTask {
@@ -35,10 +31,11 @@ impl Task for AsyncTask {
   }
 }
 
-fn init(module: &mut Module) -> Result<()> {
-  module.create_named_method("sync", sync_fn)?;
+#[module_exports]
+fn init(mut exports: JsObject) -> Result<()> {
+  exports.create_named_method("sync", sync_fn)?;
 
-  module.create_named_method("sleep", sleep)?;
+  exports.create_named_method("sleep", sleep)?;
   Ok(())
 }