cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-09-05 22:39:11 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

fix: issue with resolving dev environment (#501)

Browse Source 
* fix: issue with resolving dev environment

* fix: revert accidental commtit

* chore: version bump
This commit is contained in:
Carlos Valente
2023-08-31 22:08:18 +02:00
committed by GitHub
parent a3bbd74db7
commit 23dcca5527
6 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/client/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "ontime-ui", "name": "ontime-ui",
"version": "2.7.0", "version": "2.7.1",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@chakra-ui/react": "^2.7.0", "@chakra-ui/react": "^2.7.0",
apps/client/src/common/api/apiConstants.ts
+2 -1
View File
@@ -12,9 +12,10 @@ export const RUNTIME = ['runtimeStore'];
const location = window.location; const location = window.location;
const socketProtocol = location.protocol === 'https:' ? 'wss' : 'ws'; const socketProtocol = location.protocol === 'https:' ? 'wss' : 'ws';
export const isProduction = import.meta.env.MODE === 'production';
const STATIC_PORT = 4001; const STATIC_PORT = 4001;
export const serverPort = import.meta.env.DEV ? STATIC_PORT : location.port; export const serverPort = isProduction ? location.port : STATIC_PORT;
export const serverURL = `${location.protocol}//${location.hostname}:${serverPort}`; export const serverURL = `${location.protocol}//${location.hostname}:${serverPort}`;
export const websocketUrl = `${socketProtocol}://${location.hostname}:${serverPort}/ws`; export const websocketUrl = `${socketProtocol}://${location.hostname}:${serverPort}/ws`;
apps/client/src/common/utils/socket.ts
+2 -2
View File
@@ -1,6 +1,6 @@
import { Log, RuntimeStore } from 'ontime-types'; import { Log, RuntimeStore } from 'ontime-types';
import { RUNTIME, websocketUrl } from '../api/apiConstants'; import { isProduction, RUNTIME, websocketUrl } from '../api/apiConstants';
import { ontimeQueryClient } from '../queryClient'; import { ontimeQueryClient } from '../queryClient';
import { socketClientName } from '../stores/connectionName'; import { socketClientName } from '../stores/connectionName';
import { addLog } from '../stores/logger'; import { addLog } from '../stores/logger';
@@ -64,7 +64,7 @@ export const connectSocket = (preferredClientName?: string) => {
} }
case 'ontime': { case 'ontime': {
runtime.setState(payload as RuntimeStore); runtime.setState(payload as RuntimeStore);
if (import.meta.env.DEV) { if (!isProduction) {
ontimeQueryClient.setQueryData(RUNTIME, data.payload); ontimeQueryClient.setQueryData(RUNTIME, data.payload);
} }
break; break;
apps/electron/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "ontime", "name": "ontime",
"version": "2.7.0", "version": "2.7.1",
"author": "Carlos Valente", "author": "Carlos Valente",
"description": "Time keeping for live events", "description": "Time keeping for live events",
"repository": "https://github.com/cpvalente/ontime", "repository": "https://github.com/cpvalente/ontime",
apps/server/package.json
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "ontime-server", "name": "ontime-server",
"type": "module", "type": "module",
"main": "src/index.ts", "main": "src/index.ts",
"version": "2.7.0", "version": "2.7.1",
"exports": "./src/index.js", "exports": "./src/index.js",
"dependencies": { "dependencies": {
"body-parser": "^1.20.0", "body-parser": "^1.20.0",
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "ontime", "name": "ontime",
"version": "2.7.0", "version": "2.7.1",
"description": "Time keeping for live events", "description": "Time keeping for live events",
"keywords": [ "keywords": [
"lighdev", "lighdev",