Merge branch 'master' into turn-on-strict

.gitignore

@@ -8,7 +8,6 @@ locales/**/**.js
 lens.log
 static/build
 static/types
-build/tray/
 binaries/client/
 binaries/server/
 src/extensions/*/*.js

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
@@ -74,9 +74,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 {} \;
@@ -131,7 +128,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

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);

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",
@@ -307,7 +307,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",
@@ -335,7 +335,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",
@@ -384,10 +384,10 @@
     "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.6",
+    "react-window": "^1.8.7",
     "sass": "^1.51.0",
     "sass-loader": "^12.6.0",
     "sharp": "^0.30.4",

yarn.lock

@@ -1713,10 +1713,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.31.tgz#a5bb84ecfa27eec5e1c802c6bbf8139bdb163a5d"
   integrity sha512-AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q==
 
-"@types/node@14.18.12":
-  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":
+  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.60"
@@ -2084,7 +2084,7 @@
   dependencies:
     webpack-dev-server "*"
 
-"@types/webpack-env@^1.16.3":
+"@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==
@@ -10892,7 +10892,7 @@ react-select-event@^5.5.0:
   dependencies:
     "@testing-library/dom" ">=7"
 
-react-select@^5.3.0:
+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==
@@ -10930,7 +10930,7 @@ 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:
+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==