diff --git a/.gitea/workflows/release-draft.yml b/.gitea/workflows/release-draft.yml index fd37392..bd64dea 100644 --- a/.gitea/workflows/release-draft.yml +++ b/.gitea/workflows/release-draft.yml @@ -16,11 +16,11 @@ jobs: steps: - name: Checkout uses: https://github.com/actions/checkout@v4 - + - name: Install dependencies run: | - npm ci --include=dev - npm --prefix server ci --include=dev + npm ci + npm install --prefix server - name: Resolve release version id: version @@ -45,6 +45,9 @@ jobs: node tools/set-release-version.js --version "${{ steps.version.outputs.release_version }}" + - name: Install Angular CLI + run: npm install -g @angular/cli + - name: Build Linux assets run: npm run release:build:linux @@ -78,4 +81,4 @@ jobs: --repository "${{ github.repository }}" --release-id "${{ steps.release.outputs.release_id }}" --dist-electron dist-electron - --dist-server dist-server \ No newline at end of file + --dist-server dist-server diff --git a/package.json b/package.json index 629a14d..aa1c185 100644 --- a/package.json +++ b/package.json @@ -11,25 +11,25 @@ "prebuild": "npm run bundle:rnnoise", "prestart": "npm run bundle:rnnoise", "bundle:rnnoise": "esbuild node_modules/@timephy/rnnoise-wasm/dist/NoiseSuppressorWorklet.js --bundle --format=esm --outfile=public/rnnoise-worklet.js", - "start": "ng serve", - "build": "ng build", - "build:electron": "tsc -p tsconfig.electron.json", - "build:all": "npm run build && npm run build:electron && cd server && npm run build", - "build:prod": "ng build --configuration production --base-href='./'", + "start": "npx run ng serve", + "build": "npx run ng build", + "build:electron": "npx tsc -p tsconfig.electron.json", + "build:all": "npx run build && npx run build:electron && cd server && npm run build", + "build:prod": "npx run ng build --configuration production --base-href='./'", "watch": "ng build --watch --configuration development", "test": "ng test", "server:build": "cd server && npm run build", "server:start": "cd server && npm start", "server:dev": "cd server && npm run dev", - "electron": "npm run ng build && npm run build:electron && electron . --no-sandbox --disable-dev-shm-usage", - "electron:dev": "concurrently \"npm run ng serve\" \"wait-on http://localhost:4200 && npm run build:electron && cross-env NODE_ENV=development electron . --no-sandbox --disable-dev-shm-usage\"", + "electron": "npx run ng build && npx run build:electron && electron . --no-sandbox --disable-dev-shm-usage", + "electron:dev": "concurrently \"npx run ng serve\" \"wait-on http://localhost:4200 && npx run build:electron && cross-env NODE_ENV=development electron . --no-sandbox --disable-dev-shm-usage\"", "electron:full": "./dev.sh", - "electron:full:build": "npm run build:all && concurrently --kill-others \"cd server && npm start\" \"cross-env NODE_ENV=production electron . --no-sandbox --disable-dev-shm-usage\"", + "electron:full:build": "npx run build:all && concurrently --kill-others \"cd server && npm start\" \"cross-env NODE_ENV=production electron . --no-sandbox --disable-dev-shm-usage\"", "migration:generate": "typeorm migration:generate electron/migrations/Auto -d dist/electron/data-source.js", "migration:create": "typeorm migration:create electron/migrations/New", "migration:run": "typeorm migration:run -d dist/electron/data-source.js", "migration:revert": "typeorm migration:revert -d dist/electron/data-source.js", - "electron:build": "npm run build:prod && npm run build:electron && electron-builder", + "electron:build": "npx run build:prod && npx run build:electron && electron-builder", "electron:build:win": "npm run build:prod && npm run build:electron && electron-builder --win", "electron:build:mac": "npm run build:prod && npm run build:electron && electron-builder --mac", "electron:build:linux": "npm run build:prod && npm run build:electron && electron-builder --linux", diff --git a/server/src/index.ts b/server/src/index.ts index e933c70..0b2b611 100644 --- a/server/src/index.ts +++ b/server/src/index.ts @@ -4,10 +4,7 @@ import path from 'path'; import fs from 'fs'; import { createServer as createHttpServer } from 'http'; import { createServer as createHttpsServer } from 'https'; -import { - resolveCertificateDirectory, - resolveEnvFilePath -} from './runtime-paths'; +import { resolveCertificateDirectory, resolveEnvFilePath } from './runtime-paths'; // Load .env from project root (one level up from server/) dotenv.config({ path: resolveEnvFilePath() });