Add support for Vite

RiotGames · Feb 22, 2024 · fe87642 · fe87642
2 parents 14540c4 + 0c84c01
commit fe87642
Show file tree

Hide file tree

Showing 31 changed files with 5,915 additions and 28,973 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,7 @@ dev.env
 prod.env
 shared.env
 build/
-frontend/build/**
+frontend/dist/**
 **/builds/**
 api/lambdas/get_aws_creds/get_aws_creds
 api/lambdas/get_user_data/get_user_data

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-16.17.0
+20.2.0
diff --git a/Makefile b/Makefile
@@ -11,12 +11,12 @@ all: build
 
 clean:
 	rm -rf cli/keyconjurer*
-	rm -r frontend/build
+	rm -r frontend/dist
 
 test: frontend_test go_test
 
 CLI_TARGETS = cli/keyconjurer-darwin cli/keyconjurer-darwin-amd64 cli/keyconjurer-darwin-arm64 cli/keyconjurer-linux cli/keyconjurer-linux-amd64 cli/keyconjurer-linux-arm64 cli/keyconjurer-windows.exe
-build: api_build frontend/build/index.html $(CLI_TARGETS)
+build: api_build frontend/dist/index.html $(CLI_TARGETS)
 
 go_test:
 	go test ./...
@@ -28,14 +28,8 @@ frontend_test:
 frontend/node_modules:
 	cd frontend && npm install
 
-frontend/build/index.html: frontend/node_modules
-	mkdir -p build/frontend/
-	@test $${FRONTEND_URL?is not set}
-	@test $${API_URL?is not set}
-	cd frontend && \
-	REACT_APP_VERSION='$(shell git rev-parse --short HEAD)-$(RELEASE)' \
-	REACT_APP_API_URL=${API_URL} \
-	npm run-script build
+frontend/dist/index.html: frontend/node_modules
+	VITE_APP_VERSION='$(shell git rev-parse --short HEAD)-$(RELEASE)' cd frontend && npm run-script build
 
 ### CLI Build Targets
 cli/keyconjurer-linux-arm64 cli/keyconjurer-linux:
@@ -92,10 +86,10 @@ cli_upload: $(CLI_TARGETS)
 	cd cli/ && \
 	aws s3 cp . s3://$(S3_FRONTEND_BUCKET_NAME)-$(RELEASE) --exclude "*" --include "keyconjurer*" --recursive
 
-frontend_upload: frontend/build/index.html
+frontend_upload: frontend/dist/index.html
 	@test $${S3_FRONTEND_BUCKET_NAME?is not set}
 	@test $${RELEASE?is not set}
-	cd frontend/build && \
+	cd frontend/dist && \
 	aws s3 cp . s3://$(S3_FRONTEND_BUCKET_NAME)-$(RELEASE) --include "*" --recursive
 
 api_upload: build/list_applications.zip

diff --git a/example.env b/example.env
@@ -18,7 +18,6 @@ export API_DOMAIN='api.keyconjurer.example.com'
 export API_URL="https://${API_DOMAIN}"
 
 export FRONTEND_DOMAIN='keyconjurer.example.com'
-export FRONTEND_URL='https://${FRONTEND_DOMAIN}'
 
 export TF_VAR_api_domain=$API_DOMAIN
 export TF_VAR_frontend_domain=$FRONTEND_DOMAIN

diff --git a/frontend/config/env.js b/frontend/config/env.js
diff --git a/frontend/config/getHttpsConfig.js b/frontend/config/getHttpsConfig.js
diff --git a/frontend/config/jest/babelTransform.js b/frontend/config/jest/babelTransform.js
diff --git a/frontend/config/jest/cssTransform.js b/frontend/config/jest/cssTransform.js
diff --git a/frontend/config/jest/fileTransform.js b/frontend/config/jest/fileTransform.js