From 49de0cbe2e150382983314ffa2c9d24e7016235c Mon Sep 17 00:00:00 2001 From: Atul Date: Fri, 16 Aug 2019 06:12:01 +0200 Subject: [PATCH] disabling separate dll build for deps and bumping qode version --- binding.gyp | 3 ++- config/deps.gypi | 12 ++++++------ package-lock.json | 6 +++--- package.json | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/binding.gyp b/binding.gyp index 099136e05..5366582a5 100644 --- a/binding.gyp +++ b/binding.gyp @@ -9,9 +9,10 @@ "./config/moc.gypi", "./config/common.gypi", "./config/qt.gypi", + "./config/deps.gypi", ], 'dependencies': [ - './config/deps.gypi:nodeguidep', + # './config/deps.gypi:nodeguidep', ], 'conditions':[ ['OS=="mac"', { diff --git a/config/deps.gypi b/config/deps.gypi index e6cb1fa9f..c17428ae7 100644 --- a/config/deps.gypi +++ b/config/deps.gypi @@ -1,8 +1,8 @@ { - "targets": [ - { - "target_name": "nodeguidep", - 'type': 'shared_library', + # "targets": [ + # { + # "target_name": "nodeguidep", + # 'type': 'shared_library', "include_dirs": ['../deps/'], "sources": [ "../deps/yoga/log.cpp", @@ -28,6 +28,6 @@ ], }] ], - } - ] + # } + # ] } diff --git a/package-lock.json b/package-lock.json index 786d7fec5..1a90916d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@nodegui/qode": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@nodegui/qode/-/qode-1.0.0.tgz", - "integrity": "sha512-qSpB/1X0PhyZHrzQog+eLJlnb4q1ImuZxgRFFhZf4HEsBpH5579GFGGq3gthyKYLqEqtQgK3AdWzYOmEpgWE0w==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@nodegui/qode/-/qode-1.0.1.tgz", + "integrity": "sha512-HBJhTVqunLBy1BX3m/CefShLFWve0zSKM/UyuB+bw/r52gUzG9IXSC71fCMRRi/1qZjZcfvXqYWgTtSgjjlarA==", "requires": { "env-paths": "^2.2.0", "extract-zip": "^1.6.7", diff --git a/package.json b/package.json index 7387d9008..a5241ff8b 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "docs": "serve docs" }, "dependencies": { - "@nodegui/qode": "^1.0.0", + "@nodegui/qode": "^1.0.1", "bindings": "^1.5.0", "cuid": "^2.1.6", "node-addon-api": "^1.6.3",