diff --git a/Make.bat b/Make.bat index c6864f08e..3822cfd9f 100644 --- a/Make.bat +++ b/Make.bat @@ -273,15 +273,10 @@ REM Main build sequence Ends REM YARN END REM WGET - REM Comment out the below for loop as the latest version (0.62.0) having - REM some problem, so for the time being hardcoded the version to 0.61.0 - REM FOR /f "tokens=2 delims='" %%i IN ('yarn info nw ^| findstr "latest: "') DO SET "NW_VERSION=%%i" - REM :GET_NW - REM wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" - REM IF %ERRORLEVEL% NEQ 0 GOTO GET_NW - - SET "NW_VERSION=0.61.0" - wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" + FOR /f "tokens=2 delims='" %%i IN ('yarn info nw ^| findstr "latest: "') DO SET "NW_VERSION=%%i" + :GET_NW + wget https://dl.nwjs.io/v%NW_VERSION%/nwjs-v%NW_VERSION%-win-x64.zip -O "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" + IF %ERRORLEVEL% NEQ 0 GOTO GET_NW tar -C "%TMPDIR%" -xvf "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" || EXIT /B 1 REM WGET END diff --git a/pkg/linux/build-functions.sh b/pkg/linux/build-functions.sh index b389e8774..96bb04007 100644 --- a/pkg/linux/build-functions.sh +++ b/pkg/linux/build-functions.sh @@ -128,10 +128,7 @@ _build_runtime() { # YARN END # WGET: - # Comment out the below line as the latest version (0.62.0) having some - # problem, so for the time being hardcoded the version to 0.61.0 - # NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}') - NW_VERSION="0.61.0" + NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}') pushd "${BUILDROOT}" > /dev/null while true;do diff --git a/pkg/mac/build-functions.sh b/pkg/mac/build-functions.sh index 8dacc6ab4..01e84fb49 100644 --- a/pkg/mac/build-functions.sh +++ b/pkg/mac/build-functions.sh @@ -33,10 +33,7 @@ _build_runtime() { # YARN END # WGET: - # Comment out the below line as the latest version (0.62.0) having some - # problem, so for the time being hardcoded the version to 0.61.0 - # NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}') - NW_VERSION="0.61.0" + NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}') pushd "${BUILD_ROOT}" > /dev/null while true;do diff --git a/runtime/package.json b/runtime/package.json index de49baf12..bde40e4a8 100644 --- a/runtime/package.json +++ b/runtime/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "eslint": "^6.3.0", - "nw": "0.61.0" + "nw": "^0.64.0" }, "scripts": { "linter": "yarn eslint --no-eslintrc -c .eslintrc.js --ext .js ." diff --git a/runtime/yarn.lock b/runtime/yarn.lock index 3449ef79b..a1403ae77 100644 --- a/runtime/yarn.lock +++ b/runtime/yarn.lock @@ -1008,10 +1008,10 @@ number-is-nan@^1.0.0: resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= -nw@0.61.0: - version "0.61.0" - resolved "https://registry.yarnpkg.com/nw/-/nw-0.61.0.tgz#c35e80be4ad7a5570659796d66bdc16d11e0e890" - integrity sha512-SazcPW9+kplf7/K2KuTaamOFGtKnnH4Gs/cHHRMf9luTkCGe2cFsnb6/fEP5xvu9tpoW9Z/oUKzj9lZ6kylFWQ== +nw@^0.64.0: + version "0.64.1" + resolved "https://registry.yarnpkg.com/nw/-/nw-0.64.1.tgz#eaf96dd22081a679316b86d31405a54b37ba7181" + integrity sha512-+h1qQlhBdW56Xbe5EVojb2zfjo/fccM7rzecHTiNBl++FHA3nAGxn2UrwmqpUa+v/mQ5+EUFXpBlmkbl4y4fEg== dependencies: chalk "~1.1.3" decompress "^4.2.0"