diff --git a/app-shell/Makefile b/app-shell/Makefile index f8bdf2a81f7..2e323932aaf 100644 --- a/app-shell/Makefile +++ b/app-shell/Makefile @@ -171,5 +171,5 @@ dev-app-update.yml: dev: export NODE_ENV := development dev: export OPENTRONS_PROJECT := $(OPENTRONS_PROJECT) dev: clean-dev-autoupdate ./dev-app-update.yml - NODE_OPTIONS=--openssl-legacy-provider webpack + webpack $(electron) diff --git a/app/Makefile b/app/Makefile index 8d40b15d11c..4e19bfde78a 100644 --- a/app/Makefile +++ b/app/Makefile @@ -16,6 +16,9 @@ shell_dir := ../app-shell shell_odd_dir := ../app-shell-odd discovery_client_dir := ../discovery-client +# override webpack's default hashing algorithm for node 18: https://github.com/webpack/webpack/issues/14532 +export NODE_OPTIONS := --openssl-legacy-provider + # standard targets ##################################################################### @@ -61,7 +64,7 @@ dev-odd: .PHONY: dev-server dev-server: export OPENTRONS_PROJECT := $(OPENTRONS_PROJECT) dev-server: - NODE_OPTIONS=--openssl-legacy-provider webpack-dev-server --hot + webpack-dev-server --hot .PHONY: dev-shell dev-shell: diff --git a/labware-library/Makefile b/labware-library/Makefile index bb5b0a78b1f..923404bf57d 100644 --- a/labware-library/Makefile +++ b/labware-library/Makefile @@ -6,6 +6,9 @@ SHELL := bash # add node_modules/.bin to PATH PATH := $(shell cd .. && yarn bin):$(PATH) +# override webpack's default hashing algorithm for node 18: https://github.com/webpack/webpack/issues/14532 +export NODE_OPTIONS := --openssl-legacy-provider + .PHONY: all all: clean dist @@ -34,6 +37,6 @@ serve: all # end to end tests .PHONY: test-e2e test-e2e: - NODE_OPTIONS=--openssl-legacy-provider concurrently --no-color --kill-others --success first --names "labware-library-server,labware-library-tests" \ + concurrently --no-color --kill-others --success first --names "labware-library-server,labware-library-tests" \ "$(MAKE) dev CYPRESS=1 GTM_ID=''" \ "wait-on http://localhost:8080/ && cypress run --browser chrome --headless --record false" diff --git a/protocol-designer/Makefile b/protocol-designer/Makefile index 7e5ded101ba..98c47c86e21 100644 --- a/protocol-designer/Makefile +++ b/protocol-designer/Makefile @@ -6,6 +6,9 @@ SHELL := bash # add node_modules/.bin to PATH PATH := $(shell cd .. && yarn bin):$(PATH) +# override webpack's default hashing algorithm for node 18: https://github.com/webpack/webpack/issues/14532 +export NODE_OPTIONS := --openssl-legacy-provider + benchmark_output := $(shell node -e 'console.log(new Date());') # standard targets @@ -54,6 +57,6 @@ serve: all # end to end tests .PHONY: test-e2e test-e2e: - NODE_OPTIONS=--openssl-legacy-provider concurrently --no-color --kill-others --success first --names "protocol-designer-server,protocol-designer-tests" \ + concurrently --no-color --kill-others --success first --names "protocol-designer-server,protocol-designer-tests" \ "$(MAKE) dev CYPRESS=1" \ "wait-on http://localhost:8080/ && cypress run --browser chrome --headless --record false"