From 3d94825aee2732ead1e6fbb54dd7b9ed24492c76 Mon Sep 17 00:00:00 2001 From: condyl Date: Fri, 6 Mar 2026 14:27:28 -0500 Subject: [PATCH] chore: integrate cross-env for environment variable management and update API base URL handling --- package-lock.json | 26 ++++++++++++++++++++++++++ package.json | 4 +++- src/lib/generator/fetchData.js | 4 +++- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9ce765b..a460c4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,6 +41,7 @@ "@types/react-dom": "^18.3.0", "@vitejs/plugin-react": "^4.3.1", "autoprefixer": "^10.4.23", + "cross-env": "^10.1.0", "eslint": "^8.57.0", "eslint-plugin-react": "^7.34.3", "eslint-plugin-react-hooks": "^4.6.2", @@ -367,6 +368,13 @@ "node": ">=6.9.0" } }, + "node_modules/@epic-web/invariant": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@epic-web/invariant/-/invariant-1.0.0.tgz", + "integrity": "sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==", + "dev": true, + "license": "MIT" + }, "node_modules/@esbuild/aix-ppc64": { "version": "0.27.2", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.2.tgz", @@ -3713,6 +3721,24 @@ "dev": true, "license": "MIT" }, + "node_modules/cross-env": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.1.0.tgz", + "integrity": "sha512-GsYosgnACZTADcmEyJctkJIoqAhHjttw7RsFrVoJNXbsWWqaq6Ym+7kZjq6mS45O0jij6vtiReppKQEtqWy6Dw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@epic-web/invariant": "^1.0.0", + "cross-spawn": "^7.0.6" + }, + "bin": { + "cross-env": "dist/bin/cross-env.js", + "cross-env-shell": "dist/bin/cross-env-shell.js" + }, + "engines": { + "node": ">=20" + } + }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", diff --git a/package.json b/package.json index 6cb08c2..613479e 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,8 @@ "version": "0.0.0", "type": "module", "scripts": { - "dev": "vite", + "dev": "cross-env VITE_API_BASE_URL=https://brocktimetable.connorbernard.com/api vite", + "dev:local": "cross-env VITE_API_BASE_URL=http://localhost:3001/api vite", "build": "vite build", "lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0", "preview": "vite preview", @@ -44,6 +45,7 @@ "@types/react-dom": "^18.3.0", "@vitejs/plugin-react": "^4.3.1", "autoprefixer": "^10.4.23", + "cross-env": "^10.1.0", "eslint": "^8.57.0", "eslint-plugin-react": "^7.34.3", "eslint-plugin-react-hooks": "^4.6.2", diff --git a/src/lib/generator/fetchData.js b/src/lib/generator/fetchData.js index e55e70b..cd79fbd 100644 --- a/src/lib/generator/fetchData.js +++ b/src/lib/generator/fetchData.js @@ -1,6 +1,8 @@ import axios from "axios"; -const API_BASE_URL = "https://brocktimetable.connorbernard.com/api"; +const API_BASE_URL = + import.meta.env.VITE_API_BASE_URL || + "https://brocktimetable.connorbernard.com/api"; const fetchData = async (endpoint, params) => { try {