mirror of
https://github.com/cpvalente/ontime.git
synced 2026-08-20 14:39:06 +00:00
chore: upgrade node dependencies
This commit is contained in:
committed by
Carlos Valente
parent
917b182e39
commit
4758bc84b5
@@ -14,12 +14,12 @@ jobs:
|
|||||||
- name: Use Node.js
|
- name: Use Node.js
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 18.18.2
|
node-version: 20
|
||||||
|
|
||||||
- name: Setup pnpm
|
- name: Setup pnpm
|
||||||
uses: pnpm/action-setup@v3
|
uses: pnpm/action-setup@v3
|
||||||
with:
|
with:
|
||||||
version: 8
|
version: 9
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: pnpm install --frozen-lockfile
|
run: pnpm install --frozen-lockfile
|
||||||
@@ -56,12 +56,12 @@ jobs:
|
|||||||
- name: Use Node.js
|
- name: Use Node.js
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 18.18.2
|
node-version: 20
|
||||||
|
|
||||||
- name: Setup pnpm
|
- name: Setup pnpm
|
||||||
uses: pnpm/action-setup@v3
|
uses: pnpm/action-setup@v3
|
||||||
with:
|
with:
|
||||||
version: 8
|
version: 9
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: pnpm install --frozen-lockfile
|
run: pnpm install --frozen-lockfile
|
||||||
@@ -89,12 +89,12 @@ jobs:
|
|||||||
- name: Use Node.js
|
- name: Use Node.js
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 18.18.2
|
node-version: 20
|
||||||
|
|
||||||
- name: Setup pnpm
|
- name: Setup pnpm
|
||||||
uses: pnpm/action-setup@v3
|
uses: pnpm/action-setup@v3
|
||||||
with:
|
with:
|
||||||
version: 8
|
version: 9
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: pnpm install --frozen-lockfile
|
run: pnpm install --frozen-lockfile
|
||||||
|
|||||||
@@ -20,13 +20,13 @@ jobs:
|
|||||||
- name: Use Node.js
|
- name: Use Node.js
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 18.18.2
|
node-version: 20
|
||||||
registry-url: 'https://registry.npmjs.org'
|
registry-url: 'https://registry.npmjs.org'
|
||||||
|
|
||||||
- name: Setup pnpm
|
- name: Setup pnpm
|
||||||
uses: pnpm/action-setup@v3
|
uses: pnpm/action-setup@v3
|
||||||
with:
|
with:
|
||||||
version: 8
|
version: 9
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: pnpm install --frozen-lockfile
|
run: pnpm install --frozen-lockfile
|
||||||
|
|||||||
@@ -17,12 +17,12 @@ jobs:
|
|||||||
- name: Use Node.js
|
- name: Use Node.js
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 18.18.2
|
node-version: 20
|
||||||
|
|
||||||
- name: Setup pnpm
|
- name: Setup pnpm
|
||||||
uses: pnpm/action-setup@v3
|
uses: pnpm/action-setup@v3
|
||||||
with:
|
with:
|
||||||
version: 8
|
version: 9
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: pnpm install --frozen-lockfile
|
run: pnpm install --frozen-lockfile
|
||||||
@@ -73,12 +73,12 @@ jobs:
|
|||||||
- name: Use Node.js
|
- name: Use Node.js
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 18.18.2
|
node-version: 20
|
||||||
|
|
||||||
- name: Setup pnpm
|
- name: Setup pnpm
|
||||||
uses: pnpm/action-setup@v3
|
uses: pnpm/action-setup@v3
|
||||||
with:
|
with:
|
||||||
version: 8
|
version: 9
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: pnpm install --frozen-lockfile
|
run: pnpm install --frozen-lockfile
|
||||||
|
|||||||
+2
-2
@@ -9,8 +9,8 @@ Ontime consists of 3 distinct parts
|
|||||||
The steps below will assume you have locally installed the necessary dependencies.
|
The steps below will assume you have locally installed the necessary dependencies.
|
||||||
Other dependencies will be installed as part of the setup
|
Other dependencies will be installed as part of the setup
|
||||||
|
|
||||||
- __node__ (~18.18.2)
|
- __node__ (~20)
|
||||||
- __pnpm__ (>=8)
|
- __pnpm__ (~9)
|
||||||
- __docker__ (only necessary to run and build docker images)
|
- __docker__ (only necessary to run and build docker images)
|
||||||
|
|
||||||
## LOCAL DEVELOPMENT
|
## LOCAL DEVELOPMENT
|
||||||
|
|||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
FROM node:18.18-alpine AS builder
|
FROM node:20-alpine AS builder
|
||||||
ENV PNPM_HOME="/pnpm"
|
ENV PNPM_HOME="/pnpm"
|
||||||
ENV PATH="$PNPM_HOME:$PATH"
|
ENV PATH="$PNPM_HOME:$PATH"
|
||||||
RUN corepack enable
|
RUN corepack enable
|
||||||
@@ -7,7 +7,7 @@ WORKDIR /app
|
|||||||
RUN pnpm --filter=ontime-ui --filter=ontime-server --filter=ontime-utils install --config.dedupe-peer-dependents=false --frozen-lockfile
|
RUN pnpm --filter=ontime-ui --filter=ontime-server --filter=ontime-utils install --config.dedupe-peer-dependents=false --frozen-lockfile
|
||||||
RUN pnpm --filter=ontime-ui --filter=ontime-server run build:docker
|
RUN pnpm --filter=ontime-ui --filter=ontime-server run build:docker
|
||||||
|
|
||||||
FROM node:18.18-alpine
|
FROM node:20-alpine
|
||||||
|
|
||||||
# Set environment variables
|
# Set environment variables
|
||||||
# Environment Variable to signal that we are running production
|
# Environment Variable to signal that we are running production
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ export default function useLongPress(callback: () => void, options: LongPressOpt
|
|||||||
const { threshold = 400, onStart, onFinish, onCancel } = options;
|
const { threshold = 400, onStart, onFinish, onCancel } = options;
|
||||||
const isLongPressActive = useRef(false);
|
const isLongPressActive = useRef(false);
|
||||||
const isPressed = useRef(false);
|
const isPressed = useRef(false);
|
||||||
const timerId = useRef<NodeJS.Timer>();
|
const timerId = useRef<NodeJS.Timeout>();
|
||||||
|
|
||||||
return useMemo(() => {
|
return useMemo(() => {
|
||||||
const start = (event: SyntheticEvent) => {
|
const start = (event: SyntheticEvent) => {
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"main": "main.js",
|
"main": "main.js",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"electron": "^28.3.3",
|
"electron": "^31.2.0",
|
||||||
"electron-builder": "^24.13.3",
|
"electron-builder": "^24.13.3",
|
||||||
"eslint": "^8.56.0",
|
"eslint": "^8.56.0",
|
||||||
"eslint-config-prettier": "^9.1.0",
|
"eslint-config-prettier": "^9.1.0",
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
"@types/cors": "^2.8.17",
|
"@types/cors": "^2.8.17",
|
||||||
"@types/express": "^4.17.17",
|
"@types/express": "^4.17.17",
|
||||||
"@types/multer": "^1.4.11",
|
"@types/multer": "^1.4.11",
|
||||||
"@types/node": "^18.11.18",
|
"@types/node": "^20.14.10",
|
||||||
"@types/node-osc": "^6.0.2",
|
"@types/node-osc": "^6.0.2",
|
||||||
"@types/websocket": "^1.0.5",
|
"@types/websocket": "^1.0.5",
|
||||||
"@types/ws": "^8.5.10",
|
"@types/ws": "^8.5.10",
|
||||||
@@ -36,14 +36,13 @@
|
|||||||
"esbuild": "^0.19.10",
|
"esbuild": "^0.19.10",
|
||||||
"eslint": "^8.56.0",
|
"eslint": "^8.56.0",
|
||||||
"eslint-plugin-prettier": "^5.1.3",
|
"eslint-plugin-prettier": "^5.1.3",
|
||||||
"nodemon": "^2.0.20",
|
|
||||||
"ontime-types": "workspace:*",
|
"ontime-types": "workspace:*",
|
||||||
"prettier": "^3.3.1",
|
"prettier": "^3.3.1",
|
||||||
"server-timing": "^3.3.3",
|
"server-timing": "^3.3.3",
|
||||||
"shx": "^0.3.4",
|
"shx": "^0.3.4",
|
||||||
"ts-node": "^10.9.1",
|
|
||||||
"typescript": "^5.4.3",
|
|
||||||
"ts-essentials": "^9.4.1",
|
"ts-essentials": "^9.4.1",
|
||||||
|
"tsx": "^4.16.2",
|
||||||
|
"typescript": "^5.4.3",
|
||||||
"vitest": "^1.6.0"
|
"vitest": "^1.6.0"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -51,9 +50,9 @@
|
|||||||
"set:demoproject": "shx cp ../../demo-db/db.json src/preloaded-db/db.json",
|
"set:demoproject": "shx cp ../../demo-db/db.json src/preloaded-db/db.json",
|
||||||
"set:testproject": "shx cp ../../demo-db/db.json test-db/db.json",
|
"set:testproject": "shx cp ../../demo-db/db.json test-db/db.json",
|
||||||
"postinstall": "pnpm addversion && pnpm set:demoproject && pnpm set:testproject",
|
"postinstall": "pnpm addversion && pnpm set:demoproject && pnpm set:testproject",
|
||||||
"dev": "cross-env NODE_ENV=development nodemon --exec \"ts-node-esm\" ./src/index.ts",
|
"dev": "cross-env NODE_ENV=development tsx ./src/index.ts",
|
||||||
"dev:inspect": "cross-env NODE_ENV=development nodemon --exec \"node --inspect --loader ts-node/esm\" ./src/index.ts",
|
"dev:inspect": "cross-env NODE_ENV=development tsx --inspect ./src/index.ts",
|
||||||
"dev:test": "cross-env IS_TEST=true nodemon --exec \"ts-node-esm\" ./src/index.ts",
|
"dev:test": "cross-env IS_TEST=true tsx ./src/index.ts",
|
||||||
"prebuild": "pnpm set:demoproject",
|
"prebuild": "pnpm set:demoproject",
|
||||||
"build": "pnpm prebuild && esbuild src/app.ts --log-level=error --platform=node --format=cjs --bundle --minify --legal-comments=external --outfile=dist/index.cjs",
|
"build": "pnpm prebuild && esbuild src/app.ts --log-level=error --platform=node --format=cjs --bundle --minify --legal-comments=external --outfile=dist/index.cjs",
|
||||||
"build:electron": "pnpm prebuild && esbuild src/app.ts --log-level=error --platform=node --format=cjs --bundle --minify --legal-comments=external --outfile=dist/index.cjs",
|
"build:electron": "pnpm prebuild && esbuild src/app.ts --log-level=error --platform=node --format=cjs --bundle --minify --legal-comments=external --outfile=dist/index.cjs",
|
||||||
|
|||||||
@@ -8,12 +8,12 @@ import { timerConfig } from '../config/config.js';
|
|||||||
* Service manages Ontime's main timer
|
* Service manages Ontime's main timer
|
||||||
*/
|
*/
|
||||||
export class TimerService {
|
export class TimerService {
|
||||||
private readonly _interval: NodeJS.Timer;
|
private readonly _interval: NodeJS.Timeout;
|
||||||
/** how often we recalculate */
|
/** how often we recalculate */
|
||||||
static _refreshInterval: number;
|
static _refreshInterval: number;
|
||||||
|
|
||||||
/** when timer will be finished */
|
/** when timer will be finished */
|
||||||
private endCallback: NodeJS.Timer;
|
private endCallback: NodeJS.Timeout;
|
||||||
|
|
||||||
private onUpdateCallback: (updateResult: UpdateResult) => void;
|
private onUpdateCallback: (updateResult: UpdateResult) => void;
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ export type GetTimeFn = () => number;
|
|||||||
|
|
||||||
export class AuxTimerService {
|
export class AuxTimerService {
|
||||||
private timer: SimpleTimer;
|
private timer: SimpleTimer;
|
||||||
private interval: NodeJS.Timer | null = null;
|
private interval: NodeJS.Timeout | null = null;
|
||||||
private emit: EmitFn;
|
private emit: EmitFn;
|
||||||
private getTime: GetTimeFn;
|
private getTime: GetTimeFn;
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ let currentAuthCode: MaybeString = null;
|
|||||||
|
|
||||||
let currentSheetId: MaybeString = null;
|
let currentSheetId: MaybeString = null;
|
||||||
|
|
||||||
let pollInterval: NodeJS.Timer | null = null;
|
let pollInterval: NodeJS.Timeout | null = null;
|
||||||
let cleanupTimeout: NodeJS.Timeout | null = null;
|
let cleanupTimeout: NodeJS.Timeout | null = null;
|
||||||
|
|
||||||
function reset() {
|
function reset() {
|
||||||
|
|||||||
+3
-3
@@ -16,8 +16,8 @@
|
|||||||
},
|
},
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "~18.18.2",
|
"node": "~20",
|
||||||
"pnpm": ">=8"
|
"pnpm": "~9"
|
||||||
},
|
},
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -40,7 +40,7 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@playwright/test": "^1.42.1",
|
"@playwright/test": "^1.42.1",
|
||||||
"@types/node": "^18.11.18",
|
"@types/node": "^20.14.10",
|
||||||
"@typescript-eslint/eslint-plugin": "^v7.12.0",
|
"@typescript-eslint/eslint-plugin": "^v7.12.0",
|
||||||
"@typescript-eslint/parser": "^7.12.0",
|
"@typescript-eslint/parser": "^7.12.0",
|
||||||
"cross-env": "^7.0.3",
|
"cross-env": "^7.0.3",
|
||||||
|
|||||||
Generated
+6637
-5372
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user