Skip to content

Commit

Permalink
MIse à jour de Node.js (#1642)
Browse files Browse the repository at this point in the history
La lib `node-sass` est dépréciée depuis longtemps et la nouvelle lib a
la même API : https://sass-lang.com/blog/libsass-is-deprecated/

Yarn n'a plus autant d'intérêt aujourd'hui. NPM va tout aussi vite, a
un lockfile par défaut depuis un moment et est installé avec Node de
toute façon donc on évite une dépendance de plus.

Le Dockerfile contient à nouveau une version spécifique de Node pour
éviter les mises à jour surprise quand l'image Debian de base change de
version (actuellement la version de base est la v12 alors qu'on est en
v6 sur le serveur de prod). La version 22 est l'actuelle LTS.

Infos : https://nodejs.org/en/about/previous-releases
  • Loading branch information
Mopolo authored Feb 20, 2025
1 parent f5c4ebf commit 4c13237
Show file tree
Hide file tree
Showing 10 changed files with 13,177 additions and 5,390 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ vendor: composer.phar composer.lock
php composer.phar install --no-scripts

node_modules:
yarn install
npm install --legacy-peer-deps

composer.phar:
# You may replace the commit hash by whatever the last commit hash is on https://github.com/composer/getcomposer.org/commits/main
Expand Down
2 changes: 1 addition & 1 deletion clevercloud/scripts/cc_pre_build_hook.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash

yarn install --ignore-engines
npm install --legacy-peer-deps

mkdir $APP_HOME/tmp
5 changes: 2 additions & 3 deletions docker/dockerfiles/apachephp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ RUN apt-get update && \
RUN if [ "$ENABLE_XDEBUG" = "true" ]; then echo ************ XDEBUG ENABLED **********; \
else echo ------------ XDEBUG DISABLED ==========; fi

RUN curl -sL https://deb.nodesource.com/setup_22.x | bash -

# Install required PHP extensions for AFUP website and other management package
RUN apt-get update && \
apt-get install -y --no-install-recommends \
Expand All @@ -27,7 +29,6 @@ RUN apt-get update && \
libmcrypt4 \
libicu-dev \
nodejs \
npm \
&& \
docker-php-ext-install \
pdo_mysql \
Expand All @@ -37,8 +38,6 @@ RUN apt-get update && \
intl \
pcntl \
&& \
# Install Yarn
npm install -g yarn && \
if [ "$ENABLE_XDEBUG" = "true" ]; then pecl install xdebug-2.6.1 && docker-php-ext-enable xdebug; fi && \
apt-get autoremove --purge -y && \
rm -rf /var/lib/apt/lists/*
Expand Down
11 changes: 0 additions & 11 deletions htdocs/npm-shrinkwrap.json

This file was deleted.

23 changes: 0 additions & 23 deletions htdocs/package.json

This file was deleted.

12 changes: 6 additions & 6 deletions htdocs/templates/site/scss/components/prev-next-links.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
display: block;
margin: 50px 10px;
padding: 2em;
text-decoration: none;
outline: none;
text-align: center;
border: 1px solid #ddd;
color: #333;

@media (max-width: 768px) {
margin: 10px 0;
padding: 1em;
Expand All @@ -21,12 +27,6 @@
margin-right: 0;
}

text-decoration: none;
outline: none;
text-align: center;
border: 1px solid #ddd;
color: #333;

&__prev, &__next {
font-size: .8em;
margin: 10px 0;
Expand Down
60 changes: 30 additions & 30 deletions htdocs/templates/site/scss/styles.scss
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
@import 'base/fonts';
@import 'base/grid';
@import 'base/internet-explorer';
@import 'base/layout';
@import 'base/print';
@import 'base/reset';
@import 'base/typography';
@use 'base/fonts';
@use 'base/grid';
@use 'base/internet-explorer';
@use 'base/layout';
@use 'base/print';
@use 'base/reset';
@use 'base/typography';

@import 'components/btn';
@import 'components/table';
@import 'components/header';
@import 'components/subheader';
@import 'components/sidebar-article';
@import 'components/footer';
@import 'components/pagination';
@import 'components/flash';
@import 'components/secondary-menu';
@import 'components/mobile-nav';
@import 'components/article-header';
@import 'components/article-teaser';
@import 'components/home';
@import 'components/member';
@import 'components/general-meeting';
@import 'components/members';
@import "components/prev-next-links";
@use 'components/btn';
@use 'components/table';
@use 'components/header';
@use 'components/subheader';
@use 'components/sidebar-article';
@use 'components/footer';
@use 'components/pagination';
@use 'components/flash';
@use 'components/secondary-menu';
@use 'components/mobile-nav';
@use 'components/article-header';
@use 'components/article-teaser';
@use 'components/home';
@use 'components/member';
@use 'components/general-meeting';
@use 'components/members';
@use "components/prev-next-links";

@import 'generic/form';
@import 'generic/table';
@import 'generic/time';
@use 'generic/form';
@use 'generic/table' as generictable;
@use 'generic/time';

@import 'base/responsive-tablet';
@import 'base/responsive-mobile';
@use 'base/responsive-tablet';
@use 'base/responsive-mobile';

@import 'migration/migration';
@use 'migration/migration';
Loading

0 comments on commit 4c13237

Please sign in to comment.