clean up and update more makefiles

Opentrons · Feb 16, 2024 · 9021ba9 · 9021ba9
1 parent 54d8b89
commit 9021ba9
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 65 deletions.
diff --git a/app-shell-odd/webpack.config.js b/app-shell-odd/webpack.config.js
diff --git a/app/src/index.hbs b/app/src/index.hbs
diff --git a/components/Makefile b/components/Makefile
@@ -9,9 +9,6 @@ tests ?=
 cov_opts ?= --coverage=true --ci=true --collectCoverageFrom='components/src/**/*.(js|ts|tsx)'
 test_opts ?=
 
-# override webpack's default hashing algorithm for node 18: https://github.com/webpack/webpack/issues/14532
-export NODE_OPTIONS := --openssl-legacy-provider
-
 # standard targets
 #####################################################################
 
@@ -32,7 +29,7 @@ dist:
 .PHONY: lib
 lib: export NODE_ENV := production
 lib:
-	pnpm webpack
+	pnpm vite build
 
 # development
 #####################################################################

diff --git a/labware-library/Makefile b/labware-library/Makefile
@@ -22,19 +22,18 @@ clean:
 	shx rm -rf dist
 
 # production assets
-# override webpack's default hashing algorithm for node 18: https://github.com/webpack/webpack/issues/14532
 .PHONY: dist
 dist: export NODE_ENV := production
 dist:
-	export NODE_OPTIONS=--openssl-legacy-provider && webpack --profile
+	vite build
 	node ./renderStatic.js
 
 # development assets server
 .PHONY: dev
 dev: export NODE_ENV := development
 dev: export NODE_OPTIONS := --openssl-legacy-provider
 dev:
-	webpack-dev-server --hot --host=::
+	vite serve --host=::
 
 # production assets server
 .PHONY: serve