diff --git a/docs/development/setting-up.md b/docs/development/setting-up.md index e76f42e04..6b98587ef 100644 --- a/docs/development/setting-up.md +++ b/docs/development/setting-up.md @@ -9,8 +9,8 @@ Make sure you follow the setup guide of [Qode][qode_setup] so that you have a bu **Requirements** 1. Node version: > 11 -2. Python 2.x , Make, GCC v7 -3. Make sure you dont have spaces inside your home path. NodeGYP has issues with spaces in the path. https://github.com/nodejs/node-gyp/issues/209 +2. CMake 3.1 and up (Installation instructions can be found here: https://cmake.org/install/) +3. Make, GCC v7 4. Qt (_Optional_): Make sure you followed the setup instructions from [Qode][qode_setup] ### Windows: @@ -18,9 +18,10 @@ Make sure you follow the setup guide of [Qode][qode_setup] so that you have a bu **Requirements** 1. Node version: > 11 -2. Python 2.x and Visual Studio Community 2017 -3. Powershell -4. Qt (_Optional_): Make sure you followed the setup instructions from [Qode][qode_setup] +2. CMake 3.1 and up (Installation instructions can be found here: https://cmake.org/install/) +3. Visual Studio Community 2017 +4. Powershell +5. Qt (_Optional_): Make sure you followed the setup instructions from [Qode][qode_setup] ### Linux: @@ -29,8 +30,9 @@ Supported versions: Ubuntu 17.10 and up **Requirements** 1. Node version: > 11 -2. Python 2.x , Make, GCC v7, pkg-config -3. Qt (_Optional_): Make sure you followed the setup instructions from [Qode][qode_setup] +2. CMake 3.1 and up (Installation instructions can be found here: https://cmake.org/install/) +3. Make, GCC v7, pkg-config +4. Qt (_Optional_): Make sure you followed the setup instructions from [Qode][qode_setup] On Ubuntu: `$ sudo apt-get install pkg-config build-essentials` should install everything except Qt5. diff --git a/docs/react/about.md b/docs/react/about.md index 922a93047..bb073d00a 100644 --- a/docs/react/about.md +++ b/docs/react/about.md @@ -12,12 +12,6 @@ Get started building with React NodeGUI in the [First React NodeGUI app](react/f As soon as a new version of NodeGui is released a corresponding version of React NodeGUI will be released simultaneously. This makes sure that both NodeGui and React NodeGUI releases go out in sync. NodeGui an React NodeGUI will be released as separate packages in order keep everything easily maintainable. -### Versioning - -NodeGui/React NodeGUI follows [`semver`](https://semver.org). -For most applications, and using any recent version of npm, -running `$ npm install @nodegui/react-nodegui` will do the right thing. - ## Core Philosophy [See core philosophy of NodeGui](tutorial/about?id=core-philosophy) diff --git a/docs/tutorial/about.md b/docs/tutorial/about.md index f838bf4ab..b66eeca95 100644 --- a/docs/tutorial/about.md +++ b/docs/tutorial/about.md @@ -14,12 +14,6 @@ When a new version of Node.js is released, NodeGui usually waits about a month b NodeGui's version of Qt is usually updated within a month after a new stable version is released, depending on the effort involved in the upgrade. -### Versioning - -NodeGui follows [`semver`](https://semver.org). -For most applications, and using any recent version of npm, -running `$ npm install @nodegui/nodegui` will do the right thing. - ## Core Philosophy In order to evolve faster with every Node.Js release, NodeGui aims to patch NodeJs with as much minimum code as possible. This makes sure we support all Node features and keeps upgrade process simple. diff --git a/docs/tutorial/development-environment.md b/docs/tutorial/development-environment.md index fae0f3680..11285d1bc 100644 --- a/docs/tutorial/development-environment.md +++ b/docs/tutorial/development-environment.md @@ -10,9 +10,9 @@ rudimentary understanding of your operating system's command line client. **Requirements:** - NodeGui supports macOS 10.10 (Yosemite) and up. NodeGui currently only supports 64bit OS. -- Python 2.x , Make, GCC v7 +- CMake 3.1 and up (Installation instructions can be found here: https://cmake.org/install/) +- Make, GCC v7 - Currently supported Node.Js versions are 12.x and up. -- Make sure you dont have spaces inside your home path. NodeGYP has issues with spaces in the path. https://github.com/nodejs/node-gyp/issues/209 We strongly suggest you use some kind of version manager for Node.Js. This would allow you to switch to any version of nodejs quite easily. We recommend `nvm`: https://github.com/nvm-sh/nvm @@ -35,13 +35,11 @@ for JavaScript development. > NodeGui supports Windows 7 and later versions – attempting to develop NodeGui > applications on earlier versions of Windows might not work. NodeGui currently only supports 64bit OS. - **Requirements:** -- Python 2.x, Visual studio 2017 +- Visual studio 2017 +- CMake 3.1 and up (Installation instructions can be found here: https://cmake.org/install/) - Currently supported Node.Js versions are 12.x and up. -- Make sure you dont have spaces inside your home path. NodeGYP has issues with spaces in the path. https://github.com/nodejs/node-gyp/issues/209 - We strongly suggest you use some kind of version manager for Node.Js. This would allow you to switch to any version of nodejs quite easily. We recommend `nvm`: https://github.com/nvm-sh/nvm @@ -67,9 +65,9 @@ for JavaScript development. **Requirements:** -- Python 2.x , Make, GCC v7 +- Make, GCC v7 +- CMake 3.1 and up (Installation instructions can be found here: https://cmake.org/install/) - Currently supported Node.Js versions are 12.x and up. -- Make sure you dont have spaces inside your home path. NodeGYP has issues with spaces in the path. https://github.com/nodejs/node-gyp/issues/209 - On Ubuntu and Ubuntu-based distros it is advisable to run `sudo apt-get update`, followed by `sudo apt-get install pkg-config build-essential` We strongly suggest you use some kind of version manager for Node.Js. This would allow you to switch to any version of nodejs quite easily. We recommend `nvm`: https://github.com/nvm-sh/nvm diff --git a/package-lock.json b/package-lock.json index cc3e6b14a..de4e9ffa0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@nodegui/nodegui", - "version": "0.1.9", + "version": "0.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -47,11 +47,6 @@ "integrity": "sha512-uUrgZ8AxS+Lio0fZKAipJjAh415JyrOZowliZAzmnJSsf7piVL5w+G0+gFJ0KSu3QRhvui/7zuvpLz03YjXAhg==", "dev": true }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" - }, "accepts": { "version": "1.3.7", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", @@ -138,26 +133,12 @@ "color-convert": "^1.9.0" } }, - "aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" - }, "arch": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz", "integrity": "sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==", "dev": true }, - "are-we-there-yet": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", - "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, "arg": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/arg/-/arg-2.0.0.tgz", @@ -591,11 +572,6 @@ "typedarray": "^0.0.6" } }, - "console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" - }, "content-disposition": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", @@ -611,7 +587,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-6.0.0.tgz", "integrity": "sha512-G/B6gtkjgthT8AP/xN1wdj5Xe18fVyk58JepK8GxpUbqcz3hyWxegocMbvnZK+KoTslwd0ACZ3woi/DVUdVjyQ==", - "dev": true, "requires": { "cross-spawn": "^7.0.0" }, @@ -620,7 +595,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.0.tgz", "integrity": "sha512-6U/8SMK2FBNnB21oQ4+6Nsodxanw1gTkntYA2zBdkFYFu3ZDx65P2ONEXGSvob/QS6REjVHQ9zxzdOafwFdstw==", - "dev": true, "requires": { "path-key": "^3.1.0", "shebang-command": "^1.2.0", @@ -630,8 +604,7 @@ "path-key": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.0.tgz", - "integrity": "sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==", - "dev": true + "integrity": "sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==" } } }, @@ -868,21 +841,6 @@ "rimraf": "2" } }, - "gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, "get-stream": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", @@ -1253,39 +1211,6 @@ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.1.tgz", "integrity": "sha512-2+DuKodWvwRTrCfKOeR24KIc5unKjOh8mz17NCzVnHWfjAdDqbfbjqh7gUT+BkXBRQM52+xCHciKWonJ3CbJMQ==" }, - "node-gyp": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-5.0.3.tgz", - "integrity": "sha512-z/JdtkFGUm0QaQUusvloyYuGDub3nUbOo5de1Fz57cM++osBTvQatBUSTlF1k/w8vFHPxxXW6zxGvkxXSpaBkQ==", - "requires": { - "env-paths": "^1.0.0", - "glob": "^7.0.3", - "graceful-fs": "^4.1.2", - "mkdirp": "^0.5.0", - "nopt": "2 || 3", - "npmlog": "0 || 1 || 2 || 3 || 4", - "request": "^2.87.0", - "rimraf": "2", - "semver": "~5.3.0", - "tar": "^4.4.8", - "which": "1" - }, - "dependencies": { - "env-paths": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz", - "integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=" - } - } - }, - "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "requires": { - "abbrev": "1" - } - }, "normalize-url": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.3.0.tgz", @@ -1300,17 +1225,6 @@ "path-key": "^2.0.0" } }, - "npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", @@ -1321,11 +1235,6 @@ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - }, "on-headers": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", @@ -1665,11 +1574,6 @@ } } }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" - }, "setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", @@ -1679,7 +1583,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, "requires": { "shebang-regex": "^1.0.0" } @@ -1687,13 +1590,13 @@ "shebang-regex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "dev": true }, "source-map": { "version": "0.6.1", @@ -2005,14 +1908,6 @@ "isexe": "^2.0.0" } }, - "wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "requires": { - "string-width": "^1.0.2 || 2" - } - }, "widest-line": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz", diff --git a/package.json b/package.json index e57e31ecc..99a7a8aaf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nodegui/nodegui", - "version": "0.1.9", + "version": "0.2.0", "description": "A cross platform library to build native desktop apps.", "main": "dist/index.js", "typings": "dist/index.d.ts", @@ -18,7 +18,6 @@ "private": false, "scripts": { "dev": "npm run build && qode dist/demo.js", - "install": "npm -v", "postinstall": "npm run build:addon", "build": "tsc && npm run build:addon", "build:addon": "cross-env CMAKE_BUILD_PARALLEL_LEVEL=8 cmake-js compile", @@ -30,7 +29,6 @@ "cross-env": "^6.0.0", "cuid": "^2.1.6", "node-addon-api": "^1.6.3", - "node-gyp": "^5.0.3", "postcss-nodegui-autoprefixer": "0.0.7" }, "devDependencies": { @@ -39,6 +37,5 @@ "prettier": "^1.17.1", "serve": "^11.1.0", "typescript": "^3.4.5" - }, - "gypfile": true + } }