Skip to content

feat(assets): Switch to pnpm and rspack #832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sakshamarora1 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat(assets): Switch to pnpm and rspack #832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7ba4c7
feat(assets): Switch to pnpm and rspack
sakshamarora1 Jun 26, 2026
4fa9978
fix(lint): Fix broken linting
sakshamarora1 Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,15 @@ jobs:
- name: Checkout
uses: actions/checkout@v5

- name: Use Node.js v20.x
uses: actions/setup-node@v6
- name: Install pnpm
uses: pnpm/action-setup@v4

@palkerecsenyi palkerecsenyi Jul 6, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason why we are not using v6 of the pnpm action?

@sakshamarora1 sakshamarora1 Jul 21, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No reason 👀
I will update

with:
node-version: v20.x
version: 10.33.2

- name: Use Node.js 22
uses: actions/setup-node@v4
with:
node-version: '22'

- name: Run eslint test
run: ./run-js-linter.sh -i
1 change: 1 addition & 0 deletions .invenio
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
flavour = RDM
logfile = /logs/invenio-cli.log
python_package_manager = uv
javascript_package_manager = pnpm

[cookiecutter]
project_name = CDS RDM
Expand Down
35 changes: 29 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,24 @@ RUN dnf config-manager --set-enabled crb
RUN dnf install -y krb5-workstation krb5-libs krb5-devel
COPY ./krb5.conf /etc/krb5.conf

# Node.js 22 + pnpm (base image ships Node 16 from NodeSource, too old for pnpm 10)
RUN dnf remove -y nodejs npm && \
dnf module reset -y nodejs && \
dnf module enable -y nodejs:22 && \
dnf install -y nodejs npm
RUN npm install -g pnpm@10.33.2
ENV PNPM_STORE_DIR=/opt/.cache/pnpm-store

# Sits above project-source COPYs so the layer only invalidates when the lockfile
# changes. --shamefully-hoist must match the flag pynpm.PNPMPackage forces during the
# later `invenio webpack install`, otherwise that step would purge node_modules and
# reinstall from scratch.
RUN mkdir -p ${INVENIO_INSTANCE_PATH}/assets
COPY package.json pnpm-lock.yaml ${INVENIO_INSTANCE_PATH}/assets/
RUN --mount=type=cache,target=/opt/.cache/pnpm-store \
cd ${INVENIO_INSTANCE_PATH}/assets && \
pnpm install --frozen-lockfile --shamefully-hoist

# Python and uv configuration
ENV PYTHONDONTWRITEBYTECODE=1 \
PYTHONUNBUFFERED=1 \
Expand Down Expand Up @@ -81,13 +99,18 @@ RUN --mount=type=cache,target=/opt/.cache/uv \
# don't want to use the cache (for image filesystem permission reasons)
ENV UV_NO_CACHE=1

RUN cp -r ./static/. ${INVENIO_INSTANCE_PATH}/static/ && \
cp -r ./assets/. ${INVENIO_INSTANCE_PATH}/assets/
# CI=true in `invenio webpack install` makes pnpm apply --frozen-lockfile (pynpm doesn't
# pass it) and skip the interactive prompt that would otherwise abort the build under
# no-TTY.
RUN --mount=type=cache,target=/opt/.cache/pnpm-store \
invenio collect --verbose && \
invenio webpack create && \
CI=true invenio webpack install

# Install JS deps from the package-lock file
COPY package-lock.json ${INVENIO_INSTANCE_PATH}/assets/
COPY ./assets/ ${INVENIO_INSTANCE_PATH}/assets/
COPY ./static/ ${INVENIO_INSTANCE_PATH}/static/
RUN cd ${INVENIO_INSTANCE_PATH}/assets && pnpm run build

@kpsherva kpsherva Jul 21, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you keep it the way it was? that we copy the file from the repo to instance assets and we use that to install later?


RUN invenio collect --verbose && \
invenio webpack buildall
COPY ./ .

ENTRYPOINT [ "bash", "-c"]
11 changes: 11 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,14 @@ To update dependencies before deployment, run:

1. Run `invenio-cli packages lock`
2. Commit the updated `uv.lock`

> [!TIP]
> To selectively update a specific package, you can use:
>
> ```bash
> uv lock --upgrade-package <package-name>
> ```

#### JavaScript dependencies
1. Run `invenio-cli assets lock`
2. Commit the updated `pnpm-lock.yaml` and `package.json`
4 changes: 4 additions & 0 deletions invenio.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,3 +800,7 @@ RDM_ALLOW_OWNERS_REMOVE_COMMUNITY_FROM_RECORD = False

AUDIT_LOGS_PERMISSION_POLICY = CDSAuditLogPermissionPolicy
APP_LOGS_PERMISSION_POLICY = CDSJobLogsPermissionPolicy

# Use rspack instead of webpack
WEBPACKEXT_PROJECT = "invenio_assets.webpack:rspack_project"
WEBPACKEXT_NPM_PKG_CLS = "pynpm:PNPMPackage"
Loading
Loading