diff --git a/app-shell-odd/Makefile b/app-shell-odd/Makefile index 1e1c1aad8bd..af0c5c531d3 100644 --- a/app-shell-odd/Makefile +++ b/app-shell-odd/Makefile @@ -11,9 +11,6 @@ PATH := $(shell cd .. && yarn bin):$(PATH) # dev server port PORT ?= 8090 -# override webpack's default hashing algorithm for node 18: https://github.com/webpack/webpack/issues/14532 -export NODE_OPTIONS := --openssl-legacy-provider - # dep directories for production build # TODO(mc, 2018-08-07): figure out a better way to do this ui_dir := ../app @@ -86,7 +83,7 @@ push-ot3: dist-ot3 .PHONY: dev dev: export NODE_ENV := development dev: - webpack + NODE_OPTIONS=--openssl-legacy-provider webpack $(electron) .PHONY: test diff --git a/app-shell/package.json b/app-shell/package.json index 83f2d88517d..16868d0370a 100644 --- a/app-shell/package.json +++ b/app-shell/package.json @@ -45,7 +45,7 @@ "@types/uuid": "^3.4.7", "ajv": "6.12.3", "dateformat": "3.0.3", - "electron-context-menu": "^3.5.0", + "electron-context-menu": "3.6.1", "electron-debug": "3.0.1", "electron-devtools-installer": "3.2.0", "electron-store": "5.1.1", diff --git a/package.json b/package.json index 9303f24bad5..bc671934f8a 100755 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ }, "packageManager": "yarn@1.22.19", "engines": { - "node": ">=18.12.0 <22.0.0" + "node": ">=18.14.0 <22.0.0" }, "devDependencies": { "@babel/core": "^7.12.10", diff --git a/yarn.lock b/yarn.lock index f42f87f2cb6..c66c9d420b3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8637,10 +8637,10 @@ electron-builder@24.0.0: simple-update-notifier "^1.1.0" yargs "^17.6.2" -electron-context-menu@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.5.0.tgz#f5d6df982e37555a77666bcecff59b094211b54a" - integrity sha512-z4agpok6YnXlGFs66zU9EBFft4llUFJ41NYFEMMS0fnprMKBztJUCHBA6LMAqJgjabfqsYC7kxlvjvepxodOqg== +electron-context-menu@3.6.1: + version "3.6.1" + resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.6.1.tgz#42f117e15309687b22283e6f8f7a0d95a19afe84" + integrity sha512-lcpO6tzzKUROeirhzBjdBWNqayEThmdW+2I2s6H6QMrwqTVyT3EK47jW3Nxm60KTxl5/bWfEoIruoUNn57/QkQ== dependencies: cli-truncate "^2.1.0" electron-dl "^3.2.1"