Upgrade build system base versions

.dockerignore

@@ -54,6 +54,7 @@ db.sqlite3-journal
 # React
 .DS_*
 *.log
+*.tsbuildinfo
 logs
 **/*.backup.*
 **/*.back.*

.github/workflows/frontend.yml

@@ -9,35 +9,35 @@ defaults:
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
     paths:
       - rsconcept/frontend/**
       - .github/workflows/frontend.yml
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 jobs:
   build:
-
     runs-on: ubuntu-22.04
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [22.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache-dependency-path: rsconcept/frontend/package-lock.json
-        cache: 'npm'
-    - name: Build
-      run: |
-        npm ci
-        npm run build --if-present
-    - name: Test
-      run: |
-        npm test
+      - uses: actions/checkout@v4
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache-dependency-path: rsconcept/frontend/package-lock.json
+          cache: "npm"
+      - name: Build
+        run: |
+          npm install -g typescript vite jest
+          npm ci
+          npm run build --if-present
+      - name: Test
+        run: |
+          npm test

.gitignore

@@ -47,6 +47,7 @@ db.sqlite3-journal
 # React
 .DS_*
 *.log
+*.tsbuildinfo
 logs
 **/*.backup.*
 **/*.back.*

rsconcept/frontend/.env.local

@@ -1,5 +1,4 @@
 # Local build config
 
 VITE_PORTAL_BACKEND=http://localhost:8000
-VITE_PORTAL_FRONT_PORT=3000
-VITE_PORTAL_FRONT_HTTPS=false
+VITE_PORTAL_FRONT_PORT=3000

rsconcept/frontend/Dockerfile

@@ -1,5 +1,5 @@
 # ======== Multi-stage base ==========
-FROM node:20-bullseye-slim AS node-base
+FROM node:22-bookworm-slim AS node-base
 RUN apt-get update -qq && \
     apt-get upgrade -y && \
     rm -rf /var/lib/apt/lists/*
@@ -10,10 +10,14 @@ FROM node-base AS builder
 
 WORKDIR /result
 
+RUN npm install -g typescript vite
+
 COPY ./ ./
 COPY ./env/.env.$BUILD_TYPE ./
 RUN rm -rf ./env
+
 RUN npm ci
+
 ENV NODE_ENV production
 RUN npm run build
 

rsconcept/frontend/env/.env.development

@@ -2,4 +2,3 @@
 
 VITE_PORTAL_BACKEND=http://localhost:8002
 VITE_PORTAL_FRONT_PORT=3002
-VITE_PORTAL_FRONT_HTTPS=false

rsconcept/frontend/env/.env.production

@@ -2,4 +2,3 @@
 
 VITE_PORTAL_BACKEND=https://api.portal.acconcept.ru
 VITE_PORTAL_FRONT_PORT=443
-VITE_PORTAL_FRONT_HTTPS=true

rsconcept/frontend/env/.env.production.local

@@ -2,5 +2,4 @@
 
 VITE_PORTAL_BACKEND=https://localhost:8001
 VITE_PORTAL_FRONT_PORT=3001
-VITE_PORTAL_FRONT_HTTPS=true
 

rsconcept/frontend/src/hooks/useOssDetails.ts

@@ -11,7 +11,7 @@ import { OssLoader } from '@/models/OssLoader';
 function useOssDetails({ target }: { target?: string }) {
   const { loading: userLoading } = useAuth();
   const [schema, setInner] = useState<IOperationSchema | undefined>(undefined);
-  const [loading, setLoading] = useState(true);
+  const [loading, setLoading] = useState(target != undefined);
   const [error, setError] = useState<ErrorData>(undefined);
 
   function setSchema(data?: IOperationSchemaData) {

rsconcept/frontend/tsconfig.json

@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
-    "target": "es6",
+    "target": "ES2022",
     "useDefineForClassFields": true,
-    "lib": ["ES2020", "dom", "dom.iterable"],
-    "module": "esnext",
+    "lib": ["ES2022", "dom", "dom.iterable"],
+    "module": "ES2022",
     "skipLibCheck": true,
     "esModuleInterop": true,
 

rsconcept/frontend/vite.config.ts

@@ -16,13 +16,11 @@ export default ({ mode }: { mode: string }) => {
     ...process.env,
     ...loadEnv(mode, process.cwd())
   };
-  const enableHttps = process.env.VITE_PORTAL_FRONT_HTTPS === 'true';
   return defineConfig({
     appType: 'spa',
     plugins: [react(), muteWarningsPlugin(warningsToIgnore)],
     server: {
-      port: Number(process.env.VITE_PORTAL_FRONT_PORT),
-      https: enableHttps
+      port: Number(process.env.VITE_PORTAL_FRONT_PORT)
     },
     publicDir: 'public',
     build: {