From 8c335c996749810227ed5c035b5517e3e6aaa8dd Mon Sep 17 00:00:00 2001 From: myrmidex Date: Tue, 12 Aug 2025 01:14:02 +0200 Subject: [PATCH] Upgrade node + npm in build files --- docker/dev/podman/Dockerfile | 10 ++++------ docker/production/Dockerfile | 2 +- frontend/src/pages/onboarding/steps/FeedStep.tsx | 2 +- frontend/src/pages/onboarding/steps/PlatformStep.tsx | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/docker/dev/podman/Dockerfile b/docker/dev/podman/Dockerfile index b070c3b..3708dfe 100644 --- a/docker/dev/podman/Dockerfile +++ b/docker/dev/podman/Dockerfile @@ -9,24 +9,22 @@ RUN apt-get update && apt-get install -y \ libxml2-dev \ zip \ unzip \ - nodejs \ - npm \ nginx \ default-mysql-client \ && docker-php-ext-install pdo_mysql mbstring exif pcntl bcmath gd \ && pecl install redis xdebug \ && docker-php-ext-enable redis xdebug +# Install Node.js 22.x LTS (latest LTS version) +RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \ + && apt-get install -y nodejs + # Install Composer COPY --from=composer:latest /usr/bin/composer /usr/bin/composer # Set working directory WORKDIR /var/www/html -# Install Node.js 20.x (for better compatibility) -RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \ - && apt-get install -y nodejs - # Copy application code COPY . . diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile index 34432af..6383c51 100644 --- a/docker/production/Dockerfile +++ b/docker/production/Dockerfile @@ -1,5 +1,5 @@ # Multi-stage build for FFR Laravel application -FROM node:20 AS frontend-builder +FROM node:22-alpine AS frontend-builder WORKDIR /app diff --git a/frontend/src/pages/onboarding/steps/FeedStep.tsx b/frontend/src/pages/onboarding/steps/FeedStep.tsx index 1a2682e..cd9c1c5 100644 --- a/frontend/src/pages/onboarding/steps/FeedStep.tsx +++ b/frontend/src/pages/onboarding/steps/FeedStep.tsx @@ -32,7 +32,7 @@ const FeedStep: React.FC = () => { const firstFeed = feeds[0]; setFormData({ name: firstFeed.name || '', - provider: firstFeed.provider || 'vrt', + provider: (firstFeed.provider === 'vrt' || firstFeed.provider === 'belga') ? firstFeed.provider : 'vrt', language_id: firstFeed.language_id ?? 0, description: firstFeed.description || '' }); diff --git a/frontend/src/pages/onboarding/steps/PlatformStep.tsx b/frontend/src/pages/onboarding/steps/PlatformStep.tsx index 0632cd7..fbeef24 100644 --- a/frontend/src/pages/onboarding/steps/PlatformStep.tsx +++ b/frontend/src/pages/onboarding/steps/PlatformStep.tsx @@ -1,4 +1,4 @@ -import React, { useState, useEffect } from 'react'; +import React, { useState } from 'react'; import { Link, useNavigate } from 'react-router-dom'; import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; import { apiClient, type PlatformAccountRequest } from '../../../lib/api';