diff --git a/.env b/.env
new file mode 100644
index 0000000..e23d66d
--- /dev/null
+++ b/.env
@@ -0,0 +1,3 @@
+VITE_CI=$CI
+VITE_COMMIT_REF=${COMMIT_REF:-dev}
+VITE_BRANCH=${BRANCH:-beta}
\ No newline at end of file
diff --git a/.eslintrc.yml b/.eslintrc.yml
index f1c84d4..6ce575e 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -19,7 +19,7 @@ env:
browser: true
es2021: true
globals:
- process: readonly
+ VITE_ENV: readonly
parserOptions:
ecmaFeatures:
jsx: true
diff --git a/app/SwUtils.js b/app/SwUtils.js
index 9a3f8c8..6ffe1af 100644
--- a/app/SwUtils.js
+++ b/app/SwUtils.js
@@ -47,7 +47,7 @@ export function unregister(){
}
export function register(config){
- if (process.env.NODE_ENV === 'production' && process.env.BRANCH !== 'beta' && 'serviceWorker' in navigator){
+ if (import.meta.env.PROD && import.meta.env.VITE_BRANCH !== 'beta' && 'serviceWorker' in navigator){
const swUrl = '/service-worker.js';
return window.location.hostname === 'localhost' ? checkValidServiceWorker(swUrl, config) : registerValidSW(swUrl, config);
}
diff --git a/app/components/AppDrawer.jsx b/app/components/AppDrawer.jsx
index 8d268e8..77bd60a 100644
--- a/app/components/AppDrawer.jsx
+++ b/app/components/AppDrawer.jsx
@@ -128,7 +128,7 @@ function AppDrawer({ isDesktop, setOpen, open, subNav }){
)}
- KittenLocks v{process.env.VERSION} ({process.env.COMMIT_REF.slice(0, 7)})
+ KittenLocks v{VITE_ENV.VERSION} ({import.meta.env.VITE_COMMIT_REF.slice(0, 7)})
);
diff --git a/app/components/AppHeader.jsx b/app/components/AppHeader.jsx
index bc6d2d9..b00a175 100644
--- a/app/components/AppHeader.jsx
+++ b/app/components/AppHeader.jsx
@@ -89,7 +89,7 @@ function AppHeader({ isDesktop, setOpen, showLogin, open }){
useEffect(() => {
if ('serviceWorker' in navigator){
const onMessage = event => event.data && event.data.type === 'CLIENT_RELOAD' && window.location.reload();
- if (noOffline || process.env.BRANCH === 'beta' || process.env.NODE_ENV !== 'production'){
+ if (noOffline || import.meta.env.VITE_BRANCH === 'beta' || import.meta.env.DEV){
unregister();
if (navigator.serviceWorker) navigator.serviceWorker.removeEventListener('message', onMessage);
} else register({
@@ -148,7 +148,7 @@ function AppHeader({ isDesktop, setOpen, showLogin, open }){
{ app.currentUser && }
Advanced Settings:
- { process.env.BRANCH !== 'beta' && process.env.NODE_ENV === 'production' && (
+ { import.meta.env.VITE_BRANCH !== 'beta' && import.meta.env.PROD && (