mirror of
https://github.com/IRBorisov/ConceptPortal.git
synced 2025-06-26 04:50:36 +03:00
Upgrade build system base versions
This commit is contained in:
parent
583edde582
commit
56bda11773
|
@ -54,6 +54,7 @@ db.sqlite3-journal
|
|||
# React
|
||||
.DS_*
|
||||
*.log
|
||||
*.tsbuildinfo
|
||||
logs
|
||||
**/*.backup.*
|
||||
**/*.back.*
|
||||
|
|
6
.github/workflows/frontend.yml
vendored
6
.github/workflows/frontend.yml
vendored
|
@ -18,12 +18,11 @@ on:
|
|||
|
||||
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:
|
||||
|
@ -33,9 +32,10 @@ jobs:
|
|||
with:
|
||||
node-version: ${{ matrix.node-version }}
|
||||
cache-dependency-path: rsconcept/frontend/package-lock.json
|
||||
cache: 'npm'
|
||||
cache: "npm"
|
||||
- name: Build
|
||||
run: |
|
||||
npm install -g typescript vite jest
|
||||
npm ci
|
||||
npm run build --if-present
|
||||
- name: Test
|
||||
|
|
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -47,6 +47,7 @@ db.sqlite3-journal
|
|||
# React
|
||||
.DS_*
|
||||
*.log
|
||||
*.tsbuildinfo
|
||||
logs
|
||||
**/*.backup.*
|
||||
**/*.back.*
|
||||
|
|
|
@ -2,4 +2,3 @@
|
|||
|
||||
VITE_PORTAL_BACKEND=http://localhost:8000
|
||||
VITE_PORTAL_FRONT_PORT=3000
|
||||
VITE_PORTAL_FRONT_HTTPS=false
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
1
rsconcept/frontend/env/.env.development
vendored
1
rsconcept/frontend/env/.env.development
vendored
|
@ -2,4 +2,3 @@
|
|||
|
||||
VITE_PORTAL_BACKEND=http://localhost:8002
|
||||
VITE_PORTAL_FRONT_PORT=3002
|
||||
VITE_PORTAL_FRONT_HTTPS=false
|
||||
|
|
1
rsconcept/frontend/env/.env.production
vendored
1
rsconcept/frontend/env/.env.production
vendored
|
@ -2,4 +2,3 @@
|
|||
|
||||
VITE_PORTAL_BACKEND=https://api.portal.acconcept.ru
|
||||
VITE_PORTAL_FRONT_PORT=443
|
||||
VITE_PORTAL_FRONT_HTTPS=true
|
||||
|
|
1
rsconcept/frontend/env/.env.production.local
vendored
1
rsconcept/frontend/env/.env.production.local
vendored
|
@ -2,5 +2,4 @@
|
|||
|
||||
VITE_PORTAL_BACKEND=https://localhost:8001
|
||||
VITE_PORTAL_FRONT_PORT=3001
|
||||
VITE_PORTAL_FRONT_HTTPS=true
|
||||
|
||||
|
|
1305
rsconcept/frontend/package-lock.json
generated
1305
rsconcept/frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
|
@ -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) {
|
||||
|
|
|
@ -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,
|
||||
|
||||
|
|
|
@ -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: {
|
||||
|
|
Loading…
Reference in New Issue
Block a user