From d0de9b99dc3d9287764a2fa29faa805583be91c1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 May 2022 09:48:03 -0400 Subject: [PATCH 1/5] Bump @types/node from 14.18.12 to 14.18.17 (#5358) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 373802ca80..10c8aae0f7 100644 --- a/package.json +++ b/package.json @@ -304,7 +304,7 @@ "@types/md5-file": "^4.0.2", "@types/mini-css-extract-plugin": "^2.4.0", "@types/mock-fs": "^4.13.1", - "@types/node": "14.18.12", + "@types/node": "14.18.17", "@types/node-fetch": "^2.6.1", "@types/npm": "^2.0.32", "@types/proper-lockfile": "^4.1.2", diff --git a/yarn.lock b/yarn.lock index bb3c97d53a..dfbd4f8669 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1728,10 +1728,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.24.tgz#20ba1bf69c1b4ab405c7a01e950c4f446b05029f" integrity sha512-aveCYRQbgTH9Pssp1voEP7HiuWlD2jW2BO56w+bVrJn04i61yh6mRfoKO6hEYQD9vF+W8Chkwc6j1M36uPkx4g== -"@types/node@14.18.12", "@types/node@^14.6.2": - version "14.18.12" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz#0d4557fd3b94497d793efd4e7d92df2f83b4ef24" - integrity sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A== +"@types/node@14.18.17", "@types/node@^14.6.2": + version "14.18.17" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.17.tgz#37d3c01043fd09f3f17ffa8c17062bbb580f9558" + integrity sha512-oajWz4kOajqpKJMPgnCvBajPq8QAvl2xIWoFjlAJPKGu6n7pjov5SxGE45a+0RxHDoo4ycOMoZw1SCOWtDERbw== "@types/node@^10.12.0": version "10.17.24" From bfcae9e70235eff09b3983e9b0db0cfaad8e384f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 May 2022 09:48:16 -0400 Subject: [PATCH 2/5] Bump react-window from 1.8.6 to 1.8.7 (#5340) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 10c8aae0f7..ccaf214f53 100644 --- a/package.json +++ b/package.json @@ -385,7 +385,7 @@ "react-select": "^5.3.0", "react-select-event": "^5.5.0", "react-table": "^7.7.0", - "react-window": "^1.8.6", + "react-window": "^1.8.7", "sass": "^1.51.0", "sass-loader": "^12.6.0", "sharp": "^0.30.4", diff --git a/yarn.lock b/yarn.lock index dfbd4f8669..0b6f229984 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11086,10 +11086,10 @@ react-virtualized-auto-sizer@^1.0.6: resolved "https://registry.yarnpkg.com/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.6.tgz#66c5b1c9278064c5ef1699ed40a29c11518f97ca" integrity sha512-7tQ0BmZqfVF6YYEWcIGuoR3OdYe8I/ZFbNclFlGOC3pMqunkYF/oL30NCjSGl9sMEb17AnzixDz98Kqc3N76HQ== -react-window@^1.8.6: - version "1.8.6" - resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.6.tgz#d011950ac643a994118632665aad0c6382e2a112" - integrity sha512-8VwEEYyjz6DCnGBsd+MgkD0KJ2/OXFULyDtorIiTz+QzwoP94tBoA7CnbtyXMm+cCeAUER5KJcPtWl9cpKbOBg== +react-window@^1.8.7: + version "1.8.7" + resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.7.tgz#5e9fd0d23f48f432d7022cdb327219353a15f0d4" + integrity sha512-JHEZbPXBpKMmoNO1bNhoXOOLg/ujhL/BU4IqVU9r8eQPcy5KQnGHIHDRkJ0ns9IM5+Aq5LNwt3j8t3tIrePQzA== dependencies: "@babel/runtime" "^7.0.0" memoize-one ">=3.1.1 <6" From 005ae4123e0f4710f196d1f8f6a54fd94bc4ab92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 May 2022 09:48:22 -0400 Subject: [PATCH 3/5] Bump react-select from 5.3.0 to 5.3.2 (#5350) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 21 +++++++-------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index ccaf214f53..a2886af096 100644 --- a/package.json +++ b/package.json @@ -382,7 +382,7 @@ "react-refresh": "^0.12.0", "react-refresh-typescript": "^2.0.4", "react-router-dom": "^5.3.1", - "react-select": "^5.3.0", + "react-select": "^5.3.2", "react-select-event": "^5.5.0", "react-table": "^7.7.0", "react-window": "^1.8.7", diff --git a/yarn.lock b/yarn.lock index 0b6f229984..910ba5c160 100644 --- a/yarn.lock +++ b/yarn.lock @@ -472,7 +472,7 @@ resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.5.tgz#2c40f81449a4e554e9fc6396910ed4843ec2be50" integrity sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ== -"@emotion/react@^11.1.1": +"@emotion/react@^11.8.1": version "11.9.0" resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.9.0.tgz#b6d42b1db3bd7511e7a7c4151dc8bc82e14593b8" integrity sha512-lBVSF5d0ceKtfKCDQJveNAtkC7ayxpVlgOohLgXqRwqWr9bOf4TZAFFyIcNngnV6xK6X4x2ZeXq7vliHkoVkxQ== @@ -1857,20 +1857,13 @@ dependencies: "@types/react" "*" -"@types/react-transition-group@*", "@types/react-transition-group@^4.4.0": +"@types/react-transition-group@*", "@types/react-transition-group@^4.2.0", "@types/react-transition-group@^4.4.0": version "4.4.4" resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e" integrity sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug== dependencies: "@types/react" "*" -"@types/react-transition-group@^4.2.0": - version "4.4.0" - resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.0.tgz#882839db465df1320e4753e6e9f70ca7e9b4d46d" - integrity sha512-/QfLHGpu+2fQOqQaXh8MG9q03bFENooTb/it4jr5kKaZlDQfWvjqWZg48AwzPVMBHlRuTRAY7hRHCEOXz5kV6w== - dependencies: - "@types/react" "*" - "@types/react-virtualized-auto-sizer@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@types/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.1.tgz#b3187dae1dfc4c15880c9cfc5b45f2719ea6ebd4" @@ -11048,14 +11041,14 @@ react-select-event@^5.5.0: dependencies: "@testing-library/dom" ">=7" -react-select@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.3.0.tgz#dc77c1f95e1037ec4cb01c5e5d6272d80be8d3f6" - integrity sha512-GM6Fbv1+X+kb3e5Fc4oNeyOJkCIesY/D4NBiReKlGY4RxoeztFYm3J0KREgwMaIKQqwTiuLqTlpUBY3SYw5goQ== +react-select@^5.3.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.3.2.tgz#ecee0d5c59ed4acb7f567f7de3c75a488d93dacb" + integrity sha512-W6Irh7U6Ha7p5uQQ2ZnemoCQ8mcfgOtHfw3wuMzG6FAu0P+CYicgofSLOq97BhjMx8jS+h+wwWdCBeVVZ9VqlQ== dependencies: "@babel/runtime" "^7.12.0" "@emotion/cache" "^11.4.0" - "@emotion/react" "^11.1.1" + "@emotion/react" "^11.8.1" "@types/react-transition-group" "^4.4.0" memoize-one "^5.0.0" prop-types "^15.6.0" From d2abd582bc63899dc7ceff80caa33f706d3b7ae6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 May 2022 09:48:34 -0400 Subject: [PATCH 4/5] Bump @types/webpack-env from 1.16.3 to 1.16.4 (#5342) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a2886af096..783e58b23b 100644 --- a/package.json +++ b/package.json @@ -332,7 +332,7 @@ "@types/uuid": "^8.3.4", "@types/webpack": "^5.28.0", "@types/webpack-dev-server": "^4.7.2", - "@types/webpack-env": "^1.16.3", + "@types/webpack-env": "^1.16.4", "@types/webpack-node-externals": "^2.5.3", "@typescript-eslint/eslint-plugin": "^5.21.0", "@typescript-eslint/parser": "^5.17.0", diff --git a/yarn.lock b/yarn.lock index 910ba5c160..9be8f285b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2094,10 +2094,10 @@ dependencies: webpack-dev-server "*" -"@types/webpack-env@^1.16.3": - version "1.16.3" - resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.16.3.tgz#b776327a73e561b71e7881d0cd6d34a1424db86a" - integrity sha512-9gtOPPkfyNoEqCQgx4qJKkuNm/x0R2hKR7fdl7zvTJyHnIisuE/LfvXOsYWL0o3qq6uiBnKZNNNzi3l0y/X+xw== +"@types/webpack-env@^1.16.4": + version "1.16.4" + resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.16.4.tgz#1f4969042bf76d7ef7b5914f59b3b60073f4e1f4" + integrity sha512-llS8qveOUX3wxHnSykP5hlYFFuMfJ9p5JvIyCiBgp7WTfl6K5ZcyHj8r8JsN/J6QODkAsRRCLIcTuOCu8etkUw== "@types/webpack-node-externals@^2.5.3": version "2.5.3" From d99cc5a0158131dc6b290875bb6248bc8bb1b154 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Wed, 11 May 2022 10:26:43 -0400 Subject: [PATCH 5/5] Bundle tray icons in repo (#5362) --- .gitignore | 1 - Makefile | 8 ++------ build/generate-tray-icons.ts | 12 ++++++------ build/tray/trayIconDarkTemplate.png | Bin 0 -> 392 bytes build/tray/trayIconDarkTemplate@2x.png | Bin 0 -> 724 bytes build/tray/trayIconTemplate.png | Bin 0 -> 397 bytes build/tray/trayIconTemplate@2x.png | Bin 0 -> 717 bytes package.json | 2 +- 8 files changed, 9 insertions(+), 14 deletions(-) create mode 100644 build/tray/trayIconDarkTemplate.png create mode 100644 build/tray/trayIconDarkTemplate@2x.png create mode 100644 build/tray/trayIconTemplate.png create mode 100644 build/tray/trayIconTemplate@2x.png diff --git a/.gitignore b/.gitignore index 4c9c3c8165..d018f3b251 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,6 @@ locales/**/**.js lens.log static/build static/types -build/tray/ binaries/client/ binaries/server/ src/extensions/*/*.js diff --git a/Makefile b/Makefile index 1199ee381d..6db96fbc2b 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ compile-dev: node_modules ci-validate-dev: binaries/client build-extensions compile-dev .PHONY: dev -dev: binaries/client build/tray/trayIconTemplate.png build-extensions +dev: binaries/client build-extensions rm -rf static/build/ yarn dev @@ -53,7 +53,7 @@ integration: build yarn integration .PHONY: build -build: node_modules binaries/client build/tray/trayIconTemplate.png +build: node_modules binaries/client yarn run npm:fix-build-version $(MAKE) build-extensions -B yarn run compile @@ -70,9 +70,6 @@ $(extension_node_modules): node_modules $(extension_dists): src/extensions/npm/extensions/dist $(extension_node_modules) cd $(@:/dist=) && ../../node_modules/.bin/npm run build -build/tray/trayIconTemplate.png: node_modules - yarn ts-node ./build/generate-tray-icons.ts - .PHONY: clean-old-extensions clean-old-extensions: find ./extensions -mindepth 1 -maxdepth 1 -type d '!' -exec test -e '{}/package.json' \; -exec rm -rf {} \; @@ -129,7 +126,6 @@ clean: clean-npm clean-extensions rm -rf binaries/client rm -rf dist rm -rf static/build - rm -rf build/tray rm -rf node_modules rm -rf site rm -rf docs/extensions/api diff --git a/build/generate-tray-icons.ts b/build/generate-tray-icons.ts index c09ab6320d..a7ab3bd48b 100644 --- a/build/generate-tray-icons.ts +++ b/build/generate-tray-icons.ts @@ -28,23 +28,23 @@ console.log("Generating tray icon pngs"); ensureDirSync(outputFolder); -Promise.allSettled([ - sharp(Buffer.from(darkTemplate)) +Promise.all([ + sharp(Buffer.from(lightTemplate)) .resize({ width: size, height: size }) .png() .toFile(path.join(outputFolder, "trayIconDarkTemplate.png")), - sharp(Buffer.from(darkTemplate)) + sharp(Buffer.from(lightTemplate)) .resize({ width: size*2, height: size*2 }) .png() .toFile(path.join(outputFolder, "trayIconDarkTemplate@2x.png")), - sharp(Buffer.from(lightTemplate)) + sharp(Buffer.from(darkTemplate)) .resize({ width: size, height: size }) .png() .toFile(path.join(outputFolder, "trayIconTemplate.png")), - sharp(Buffer.from(lightTemplate)) + sharp(Buffer.from(darkTemplate)) .resize({ width: size*2, height: size*2 }) .png() .toFile(path.join(outputFolder, "trayIconTemplate@2x.png")), ]) - .then(console.log) + .then((resolutions) => console.log(`Generated ${resolutions.length} images`)) .catch(console.error); diff --git a/build/tray/trayIconDarkTemplate.png b/build/tray/trayIconDarkTemplate.png new file mode 100644 index 0000000000000000000000000000000000000000..63f2eb18953367d8687dcef3a423acadc3af84a1 GIT binary patch literal 392 zcmV;30eAk1P)AzhWG*I&3>$yqT~{Az$i|DW#HHDePAw4o&qj`3h?5R-+^i1J}LUF9ADtf92>x< z3)}+Mh;f=HSAlOc4($E_JOUFy2e=K+4N%T(+8#$h9awRHI0@_rXF<-rq<}Us8w~j> zXrm=ZD{x!~1!jPcByLBJCEzeP|5H{w)|TuZ4LQp;kZ4dH8)OgY+L{Nh)oT7iyI@sX zVbk5U;&uCO`~E7xQ<8jV1bcP1HzU@?2&F|&qp2X;ioT+83emkZPD~Pvgd+h-NI5=@ mu|o=vgCuNH)|wkdD*OZ5PQbBv-z^jX00008; z93OyYwHY?+Z-BkE2Jga;BWlwQ{0Qt{1nRtjm+NmG@X!(b2~bj-sT|&fD+yo_=+*me zjs$incejH(5(~Zy_zAoK>UC{0$Kf@jkf->tFDrO`>cI8u`g-77z>&P`P0A_bhe)kwgw^#53V{B5OutY_?oc> zckrVtatJ&0et*QzwC7>mFx~UMk?qZ#1ct0}D{!KQ>zFhm^>N5J@6)x-+T23uvC%1r2(}B#;_^|b#E>3DYbVvNdssspawxXGKPt4H!A0p zS(m2P@K*u?pvM{f8L-MRhE1A*Wk%0KWrE5CFycsHrm z$vK8SmP2j_-Y8hmap+*lyKYy`QT{>k$_20|H75@1db56v#2|9)NfrYZ#<70=+^UXY zqmjUp^l@(sPYNa^Md!LcolMKpdS#54vOA<-RF&$uB=8$9u2*7XTH;p#0000Y<(@P1&z_n2f66wDS^U5f58)7lxUGTjFoN?&(cg)AwY?0?W1*I~ zh`GY6!gnfg3y*o(&GQAW(T@&J3x0wDIqiDoO-!Tx_CQ~-R`Br%{%jP84Se&_jtXt8 z%AaQ7xKQ9L?i+b45tzhA!Ru3QXImSM0yAGS}R#wc4uwVYkPsVuee! zbFBD#eg{TnQTbN`e3otesonieVjYwy9rO&EMqU{zAES*v@cpz4Z(zPLO>y; r3ivM>`;Nk&Sx7jf9BYng7ghKI;f#FQ*R~j600000NkvXXu0mjfDiN#W literal 0 HcmV?d00001 diff --git a/build/tray/trayIconTemplate@2x.png b/build/tray/trayIconTemplate@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..553a8ec373fdc3b82c797bf91c69a242ab811f06 GIT binary patch literal 717 zcmV;;0y6!HP)D;c6yXJM`EYPXnn;Z^o zmF#whY+sDL1NaHN0UEV;v%=u5AVXd{pKDhcd1Ef%PH2Ax@U6g*z4dCzbSK1%rEGJN z1Kl}6%kj40S@MR?>uf17k>G%>Q+e`vz(|4M6`eOJrNXbsiq54(@=QMq+$n4<5&Q+L z|0BZQV1J+X76E5~b9JocvN46;3U41PHRk}2fTt-r?Zv&wmF44ds#utZzy|o8z%AlA%>!Q>6;ZQJ{mH2SlVefOOFy_3r8%_r-JKjZX z4TTC16N1OOWK|Gapc-~Z>{#H>DzfhRBuLwV3I}>Zug%K)@x(Dm0c^ZcHLQZ{P*!2I7IeRrHm)}00000NkvXXu0mjfFXT%W literal 0 HcmV?d00001 diff --git a/package.json b/package.json index 783e58b23b..15c875dbb1 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "dist": "yarn run compile && electron-builder --publish onTag", "dist:dir": "yarn run dist --dir -c.compression=store -c.mac.identity=null", "download:binaries": "yarn run ts-node build/download_binaries.ts", - "build:tray-icons": "yarn run ts-node build/build_tray_icon.ts", + "build:tray-icons": "yarn run ts-node build/generate-tray-icons.ts", "build:theme-vars": "yarn run ts-node build/build_theme_vars.ts", "lint": "PROD=true yarn run eslint --ext js,ts,tsx --max-warnings=0 .", "lint:fix": "yarn run lint --fix",