Upgrade deps and qode (#865)

* bump deps

* fix test

* fix node verison

* 0.36.0

* revert tsconfig

* add env

* fix cmake build for windows

* fix qode bump

* temp fix

.github/workflows/docs.yml

@@ -12,7 +12,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: actions/setup-node@v2
               with:
-                node-version: '14.x'
+                node-version: '16.x'
             - name: Add key to allow access to repository
               env:
                   SSH_AUTH_SOCK: /tmp/ssh_agent.sock
@@ -33,7 +33,7 @@ jobs:
               run: |
                   git config --global user.email "actions@gihub.com"
                   git config --global user.name "gh-actions"
-                  npm install --ignore-scripts
+                  yarn install --ignore-scripts
                   npm run docs
                   cd website
                   if [ -e yarn.lock ]; then

.github/workflows/latest.yml

@@ -13,9 +13,9 @@ jobs:
             - uses: actions/checkout@v2
             - uses: actions/setup-node@v2
               with:
-                node-version: '14.x'
+                node-version: '16.x'
             - name: Install deps
-              run: npm install --ignore-scripts
+              run: yarn install --ignore-scripts
             - name: Build nodegui
               run: npx tsc
             - name: Archive using npm pack
@@ -32,9 +32,9 @@ jobs:
                   body: >
                       Latest auto release corresponding to commit ${{github.sha}} 🔥. 
                       To install do: 
-                      `npm install https://github.com/nodegui/nodegui/releases/download/v0.0.0-latest-master/nodegui-master.tgz`
+                      `yarn install https://github.com/nodegui/nodegui/releases/download/v0.0.0-latest-master/nodegui-master.tgz`
                       or 
-                      `npm install http://master-release.nodegui.org`
+                      `yarn install http://master-release.nodegui.org`
                   assets: >
                       nodegui-nodegui-0.0.0-latest-master.tgz:nodegui-master.tgz:application/tar+gzip
                   recreate: true

.github/workflows/release.yml

@@ -12,11 +12,12 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '14.x'
+          node-version: '16.x'
       - name: Install ubuntu deps
         run: sudo apt install mesa-common-dev libglu1-mesa-dev
-      - run: npm install
+      - run: yarn install
       - run: echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}' >> .npmrc
       - run: npm publish --access=public
         env:
           NPM_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
+          CMAKE_BUILD_PARALLEL_LEVEL: 8

.github/workflows/test.yml

@@ -12,14 +12,16 @@ jobs:
             - uses: actions/checkout@v2
             - uses: actions/setup-node@v2
               with:
-                node-version: '14.x'
+                node-version: '16.x'
             - name: Install ubuntu deps
               if: contains(matrix.os, 'ubuntu')
               run: sudo apt install mesa-common-dev libglu1-mesa-dev
             - name: Install deps
-              run: npm install
+              run: yarn install
             - name: Build nodegui
               run: npm run build
+              env:
+                CMAKE_BUILD_PARALLEL_LEVEL: 8
             - name: Run tests
               run: npm run test
             - name: Run linters for cpp

CMakeLists.txt

@@ -228,7 +228,7 @@ if (WIN32)
     target_compile_definitions(${CORE_WIDGETS_ADDON} PRIVATE
         ENABLE_DLL_EXPORT=1
     )
-    target_compile_options(${CORE_WIDGETS_ADDON} PRIVATE "/MP4")
+    target_compile_options(${CORE_WIDGETS_ADDON} PRIVATE "/MP")
 
 endif()
 

config/qode.cmake

@@ -16,7 +16,7 @@ macro(AddQodeSupport addonName)
         message(STATUS "Using Qode installation for ${addonName} QODE_BINARY_DIR:${QODE_BINARY_DIR}")
         
         target_link_libraries(${CORE_WIDGETS_ADDON} PRIVATE 
-            "${QODE_BINARY_DIR}\\qode.lib"      
+            "${QODE_BINARY_DIR}\\node.lib"      
         )
 
     endif() 

package.json

@@ -1,7 +1,7 @@
 {
     "name": "@nodegui/nodegui",
-    "version": "0.35.0",
-    "description": "A cross platform library to build native desktop apps.",
+    "version": "0.36.0",
+    "description": "A cross-platform library to build native desktop apps.",
     "main": "dist/index.js",
     "typings": "dist/index.d.ts",
     "author": "Atul R <atulanand94@gmail.com>",
@@ -32,36 +32,36 @@
     "engineStrict": false,
     "dependencies": {
         "@nodegui/artifact-installer": "^1.1.0",
-        "@nodegui/qode": "^2.1.0",
-        "cmake-js": "^6.1.0",
+        "@nodegui/qode": "^16.4.0",
+        "cmake-js": "^6.2.1",
         "cross-env": "^7.0.3",
-        "cuid": "^2.1.6",
+        "cuid": "^2.1.8",
         "manage-path": "^2.0.0",
-        "memoize-one": "^5.1.1",
-        "node-addon-api": "^3.1.0",
+        "memoize-one": "^5.2.1",
+        "node-addon-api": "^4.0.0",
         "postcss-nodegui-autoprefixer": "0.0.7"
     },
     "devDependencies": {
-        "@types/bindings": "^1.5.0",
-        "@types/jest": "^26.0.20",
-        "@types/node": "^14.14.22",
-        "@typescript-eslint/eslint-plugin": "^4.13.0",
-        "@typescript-eslint/parser": "^4.13.0",
+        "@types/bindings": "^1.5.1",
+        "@types/jest": "^26.0.24",
+        "@types/node": "^16.4.13",
+        "@typescript-eslint/eslint-plugin": "^4.29.0",
+        "@typescript-eslint/parser": "^4.29.0",
         "clang-format": "^1.5.0",
-        "eslint": "^6.6.0",
-        "eslint-config-prettier": "^6.15.0",
-        "eslint-plugin-prettier": "^3.3.1",
-        "husky": "^4.3.8",
-        "jest": "^25.5.4",
-        "prettier": "^2.2.1",
-        "ts-jest": "^25.5.1",
         "typedoc": "^0.17.8",
         "typedoc-plugin-markdown": "^2.4.2",
-        "typescript": "^4.1.3"
+        "eslint": "^7.32.0",
+        "eslint-config-prettier": "^8.3.0",
+        "eslint-plugin-prettier": "^3.4.0",
+        "husky": "^7.0.1",
+        "jest": "^27.0.6",
+        "prettier": "^2.3.2",
+        "ts-jest": "^27.0.4",
+        "typescript": "^4.3.5"
     },
     "binary": {
         "napi_versions": [
-            3
+            4
         ]
     },
     "husky": {

src/cpp/include/nodegui/core/Integration/qode-api.h

@@ -1,15 +1,16 @@
+// Temporary fix till we figure out how to get this working without exe symbol exports
 #ifdef _WIN32
-#define QODE_IMPORT __declspec(dllimport)
+#define QODE_FIX static
 #else
-#define QODE_IMPORT
+#define QODE_FIX extern
 #endif
 
 #pragma once
 // From Qode headers
 namespace qode {
-QODE_IMPORT extern int qode_argc;
-QODE_IMPORT extern char **qode_argv;
-QODE_IMPORT typedef int (*QodeCustomRunLoopFunc)();
-QODE_IMPORT extern void InjectCustomRunLoop(
+QODE_FIX int qode_argc;
+QODE_FIX char **qode_argv;
+typedef int (*QodeCustomRunLoopFunc)();
+extern void InjectCustomRunLoop(
     QodeCustomRunLoopFunc customRunLoop);
 }  // namespace qode

src/lib/QtWidgets/__tests__/QWidget.test.ts

@@ -3,7 +3,7 @@ import { CursorShape } from '../../QtEnums/CursorShape';
 import { QCursor } from '../../..';
 
 describe('QWidget', () => {
-    const view = new QWidget();
+    let view = new QWidget();
     afterAll(() => {
         if (view) {
             view.close();