Skip to content

Commit

Permalink
Merge support/nodejs-upgrade into dev
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit 97f78db
Author: Victor Miti <[email protected]>
Date:   Mon Nov 25 00:37:26 2024 +0000

    Bump nvm from 0.39.5 to 0.40.1

commit 4f19264
Author: Victor Miti <[email protected]>
Date:   Sun Nov 24 23:42:20 2024 +0000

    Bump Node.js from 18 to 20

commit 7e26063
Author: Victor Miti <[email protected]>
Date:   Sun Nov 24 22:57:14 2024 +0000

    Use `align-items: flex-end` instead of `align-items: end`

    Because of the following webpack warning:

    ```console
    WARNING in ./rca/static_src/sass/main.scss (./rca/static_src/sass/main.scss.webpack[javascript/auto]!=!./node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[1].use[1]!./node_modules/postcss-loader/dist/cjs.js??ruleSet[1].rules[1].use[2]!./node_modules/sass-loader/dist/cjs.js??ruleSet[1].rules[1].use[3]!./rca/static_src/sass/main.scss)
    Module Warning (from ./node_modules/postcss-loader/dist/cjs.js):
    (3:110034) from "autoprefixer" plugin: end value has mixed support, consider using flex-end instead

    Code:
      align-items:end

     @ ./rca/static_src/sass/main.scss
     @ ./rca/static_src/javascript/main.entry.js 35:0-27

    webpack compiled with 1 warning in 3075 ms
    ```

commit a96a08b
Author: Victor Miti <[email protected]>
Date:   Sun Nov 24 22:56:05 2024 +0000

    Update webpack config following e1e8020

commit e1e8020
Author: Victor Miti <[email protected]>
Date:   Sun Nov 24 22:30:06 2024 +0000

    Bump webpack and friends to latest versions

    webpack                 |   4.47.0 -> 5.96.1 |
    webpack-cli             |   3.3.12 -> 5.1.4  |
    webpack-dev-server      |   3.11.3 -> 5.1.0  |

    copy-webpack-plugin     |   5.1.2 -> 12.0.2  |
    mini-css-extract-plugin |   0.7.0 -> 2.9.2   |
    babel-loader            |   8.2.5 -> 9.2.1   |
    css-loader              |   3.6.0 -> 7.1.2   |
    postcss-loader          |   3.0.0 -> 8.1.1   |
    sass-loader             |   7.3.1 -> 16.0.3  |

commit 86d6313
Author: Victor Miti <[email protected]>
Date:   Sun Nov 24 22:19:57 2024 +0000

    Fix Needless disable for "scale-unlimited/declaration-strict-value"

commit 22c5dae
Author: Victor Miti <[email protected]>
Date:   Thu Nov 21 09:19:23 2024 +0000

    npm audit fix

commit f11858d
Author: Victor Miti <[email protected]>
Date:   Thu Nov 21 09:17:56 2024 +0000

    Upgrade Node.js 16 to 18
  • Loading branch information
JakubMastalerz committed Jan 24, 2025
1 parent 9ebcbc8 commit 2ab154f
Show file tree
Hide file tree
Showing 11 changed files with 6,968 additions and 8,320 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '16'
node-version-file: .nvmrc
- name: Install npm dependencies
run: npm install
- name: CSS linting
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ jobs:
run: |
poetry config virtualenvs.create false &&
poetry install
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '16'
node-version-file: .nvmrc
- name: Install npm dependencies
run: npm install
- name: Compile static files
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
20
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
default_language_version:
node: 18.4.0
node: system
python: python3.11
repos:
- repo: https://github.com/python/black
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# (Keep the version in sync with the node install below)
FROM node:16 as frontend
FROM node:20 as frontend

# Make build & post-install scripts behave as if we were in a CI environment (e.g. for logging verbosity purposes).
ARG CI=true
Expand Down Expand Up @@ -118,7 +118,7 @@ RUN apt-get update --yes --quiet && apt-get install --yes --quiet --no-install-r
USER rca

# Install nvm and node/npm
ARG NVM_VERSION=0.39.5
ARG NVM_VERSION=0.40.1
COPY --chown=rca .nvmrc ./
RUN curl https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh | bash \
&& bash --login -c "nvm install --no-progress && nvm alias default $(nvm run --silent --version)"
Expand Down
Loading

0 comments on commit 2ab154f

Please sign in to comment.