diff --git a/Make.bat b/Make.bat index d1eef782d..4c75b20b3 100644 --- a/Make.bat +++ b/Make.bat @@ -274,14 +274,11 @@ REM Main build sequence Ends REM YARN END REM WGET - 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 + 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 - REM Remove the above commented code once below issue is fixed - REM Pining NWjs because of https://github.com/nwjs/nw.js/issues/8039 in 0.74.0 - SET "NW_VERSION=0.72.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" tar -C "%TMPDIR%" -xvf "%TMPDIR%\nwjs-v%NW_VERSION%-win-x64.zip" || EXIT /B 1 diff --git a/pkg/linux/build-functions.sh b/pkg/linux/build-functions.sh index 62d8dc882..d73920371 100644 --- a/pkg/linux/build-functions.sh +++ b/pkg/linux/build-functions.sh @@ -141,10 +141,7 @@ _build_runtime() { # YARN END # WGET: - # NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}') - # Remove the above commented code once below issue is fixed - # Pining NWjs because of https://github.com/nwjs/nw.js/issues/8039 in 0.74.0 - NW_VERSION="0.72.0" + NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}') pushd "${BUILDROOT}" > /dev/null || exit while true;do diff --git a/pkg/mac/build-functions.sh b/pkg/mac/build-functions.sh index bc69634e7..44dca9327 100644 --- a/pkg/mac/build-functions.sh +++ b/pkg/mac/build-functions.sh @@ -35,10 +35,7 @@ _build_runtime() { # YARN END # WGET: - # NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}') - # Remove the above commented code once below issue is fixed - # Pining NWjs because of https://github.com/nwjs/nw.js/issues/8039 in 0.74.0 - NW_VERSION="0.72.0" + NW_VERSION=$(yarn info nw | grep latest | awk -F "'" '{ print $2}') pushd "${BUILD_ROOT}" > /dev/null || exit while true;do diff --git a/runtime/package.json b/runtime/package.json index 880512ba9..196994cd7 100644 --- a/runtime/package.json +++ b/runtime/package.json @@ -19,13 +19,16 @@ "always-on-top": true, "icon": "assets/pgAdmin4.png" }, + "icons": { + "256": "assets/pgAdmin4.png" + }, "dependencies": { "axios": "^1.3.5", "bootstrap": "^4.5.3" }, "devDependencies": { "eslint": "^8.38.0", - "nw": "^0.72.0" + "nw": "^0.76.0" }, "scripts": { "linter": "yarn eslint --no-eslintrc -c .eslintrc.js --ext .js ." diff --git a/runtime/yarn.lock b/runtime/yarn.lock index d92eed837..7c72ba4e4 100644 --- a/runtime/yarn.lock +++ b/runtime/yarn.lock @@ -967,10 +967,10 @@ number-is-nan@^1.0.0: resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ== -nw@^0.72.0: - version "0.72.0" - resolved "https://registry.yarnpkg.com/nw/-/nw-0.72.0.tgz#b8d340c165756b2f07320e999f5aaa486131e38f" - integrity sha512-uMLsvXe3cDJ+YY8Jcd+YoLg7ggqJAbpTskNx0X21Z6gn9oWWnte9eJsWNC/9J5itg3TzzqyvIyUfXsMGekqPmw== +nw@^0.76.0: + version "0.76.0" + resolved "https://registry.yarnpkg.com/nw/-/nw-0.76.0.tgz#b84efbf64ed26f65032f03a05a621f835d17f596" + integrity sha512-3CfSBPIqb/fpQFNIymZVHadFOirwTFc/G8lNqJpa8lBQmF9neVNufFPvBpGVn94vh0P1zAMEM1wrPfcHOa6Iaw== dependencies: chalk "~1.1.3" decompress "^4.2.0"