Merge with main

kitconcept · Jun 10, 2024 · 825c330 · 825c330
2 parents 5f4eb07 + 2064e77
commit 825c330
Show file tree

Hide file tree

Showing 35 changed files with 1,312 additions and 226 deletions.
diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
@@ -3,6 +3,7 @@ on: [push, pull_request]
 
 env:
   NODE_VERSION: 20.x
+  CYPRESS_RETRIES: 2
 
 jobs:
 
@@ -17,13 +18,8 @@ jobs:
         with:
           node-version: ${{ env.NODE_VERSION }}
 
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 8
-          # We don't want to install until later,
-          # when the cache and Cypress are in place
-          run_install: false
+      - name: Enable corepack
+        run: corepack enable
 
       - name: Get pnpm store directory
         shell: bash
@@ -57,8 +53,8 @@ jobs:
         name: Start Servers
         with:
           run: |
-            make start-test-acceptance-server-ci &
-            make start-test-acceptance-frontend &
+            make ci-acceptance-backend-start &
+            make acceptance-frontend-prod-start &
           # your step-level and job-level environment variables are available to your commands as-is
           # npm install will count towards the wait-for timeout
           # whenever possible, move unrelated scripts to a different step
@@ -85,7 +81,7 @@ jobs:
 
           # working-directory: backend
 
-      - run: make test-acceptance-headless
+      - run: make ci-acceptance-test
 
       # Upload Cypress screenshots
       - uses: actions/upload-artifact@v3
@@ -107,18 +103,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Use Node.js 20.x
+      - name: Use Node.js ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: ${{ env.NODE_VERSION }}
 
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 8
-          # We don't want to install until later,
-          # when the cache and Cypress are in place
-          run_install: false
+      - name: Enable corepack
+        run: corepack enable
 
       - name: Get pnpm store directory
         shell: bash
@@ -152,8 +143,8 @@ jobs:
         name: Start Servers
         with:
           run: |
-            make start-test-acceptance-server-a11y-ci &
-            make start-test-acceptance-frontend-a11y &
+            make ci-acceptance-a11y-backend-start &
+            make acceptance-a11y-frontend-prod-start &
           # your step-level and job-level environment variables are available to your commands as-is
           # npm install will count towards the wait-for timeout
           # whenever possible, move unrelated scripts to a different step
@@ -180,7 +171,7 @@ jobs:
 
           # working-directory: backend
 
-      - run: make test-acceptance-headless-a11y
+      - run: make ci-acceptance-a11y-test
 
       # Upload Cypress screenshots
       - uses: actions/upload-artifact@v3

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -6,7 +6,7 @@ on:
       - main
 
 env:
-  node-version: 20.x
+  NODE_VERSION: 20.x
   ADDON_NAME: volto-light-theme
 
 jobs:
@@ -21,10 +21,10 @@ jobs:
       - name: Install pipx
         run: pip install towncrier
 
-      - name: Use Node.js ${{ env.node-version }}
+      - name: Use Node.js ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ env.node-version }}
+          node-version: ${{ env.NODE_VERSION }}
 
       - uses: pnpm/action-setup@v3
         name: Install pnpm

diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
@@ -1,5 +1,9 @@
 name: Code analysis checks
 on: [push]
+
+env:
+  NODE_VERSION: 20.x
+
 jobs:
   codeanalysis:
     runs-on: ubuntu-latest
@@ -8,18 +12,13 @@ jobs:
       - name: Main checkout
         uses: actions/checkout@v4
 
-      - name: Use Node.js 20.x
+      - name: Use Node.js ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: ${{ env.NODE_VERSION }}
 
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 8
-          # We don't want to install until later,
-          # when the cache and Cypress are in place
-          run_install: false
+      - name: Enable corepack
+        run: corepack enable
 
       - name: Get pnpm store directory
         shell: bash

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -11,14 +11,14 @@ on:
 env:
   ENVIRONMENT: "light-theme.kitconcept.io"
   IMAGE_NAME: "ghcr.io/kitconcept/voltolighttheme-frontend"
-  VOLTO_VERSION: "17.15.5"
 
 jobs:
   meta:
     runs-on: ubuntu-latest
     outputs:
       ENVIRONMENT: ${{ steps.vars.outputs.ENVIRONMENT }}
       STACK_NAME: ${{ steps.vars.outputs.STACK_NAME }}
+      VOLTO_VERSION: ${{ steps.vars.outputs.VOLTO_VERSION }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -29,6 +29,9 @@ jobs:
           ENVIRONMENT=${{ env.ENVIRONMENT }}
           echo "ENVIRONMENT=${ENVIRONMENT}" >> $GITHUB_OUTPUT
           echo "STACK_NAME=${ENVIRONMENT//./-}" >> $GITHUB_OUTPUT
+          python3 -c 'import json; data = json.load(open("./mrs.developer.json")); print("VOLTO_VERSION=" + data["core"].get("tag") or "latest")' >> $GITHUB_OUTPUT
+
+      - run: echo "${{ steps.vars.outputs.VOLTO_VERSION }}"
 
   release:
     runs-on: ubuntu-latest
@@ -69,11 +72,11 @@ jobs:
         with:
           platforms: linux/amd64
           context: ./
-          file: dockerfiles/Dockerfile
+          file: Dockerfile
           build-args: |
             ADDON_NAME=@kitconcept/volto-light-theme
             ADDON_PATH=volto-light-theme
-            VOLTO_VERSION=${{ env.VOLTO_VERSION }}
+            VOLTO_VERSION=${{ needs.meta.outputs.VOLTO_VERSION }}
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: $${{ steps.meta.outputs.labels }}

diff --git a/.github/workflows/i18n.yml b/.github/workflows/i18n.yml
@@ -1,5 +1,9 @@
 name: i18n
 on: [push]
+
+env:
+  NODE_VERSION: 20.x
+
 jobs:
   unit:
     runs-on: ubuntu-latest
@@ -8,18 +12,13 @@ jobs:
       - name: Main checkout
         uses: actions/checkout@v4
 
-      - name: Use Node.js 20.x
+      - name: Use Node.js ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: ${{ env.NODE_VERSION }}
 
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 8
-          # We don't want to install until later,
-          # when the cache and Cypress are in place
-          run_install: false
+      - name: Enable corepack
+        run: corepack enable
 
       - name: Get pnpm store directory
         shell: bash

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -1,5 +1,9 @@
 name: Unit Tests
 on: [push]
+
+env:
+  NODE_VERSION: 20.x
+
 jobs:
   unit:
     runs-on: ubuntu-latest
@@ -8,18 +12,13 @@ jobs:
       - name: Main checkout
         uses: actions/checkout@v4
 
-      - name: Use Node.js 20.x
+      - name: Use Node.js ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: ${{ env.NODE_VERSION }}
 
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 8
-          # We don't want to install until later,
-          # when the cache and Cypress are in place
-          run_install: false
+      - name: Enable corepack
+        run: corepack enable
 
       - name: Get pnpm store directory
         shell: bash

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,40 @@
 
 <!-- towncrier release notes start -->
 
+## 3.3.2 (2024-05-31)
+
+### Bugfix
+
+- Add top padding to login page @danalvrz [#387](https://github.com/kitconcept/volto-light-theme/pull/387)
+- Add default width mixin to content creation Forms @danalvrz [#388](https://github.com/kitconcept/volto-light-theme/pull/388)
+
+## 3.3.1 (2024-05-30)
+
+### Bugfix
+
+- Fix image grid clossure issues in inlined JSX method when selecting an image after uploading another image in another grid element @sneridagh [#389](https://github.com/kitconcept/volto-light-theme/pull/389)
+
+## 3.3.0 (2024-04-26)
+
+### Feature
+
+- Make font-weights, font-sizes and font-heights overrideable adding the `!default` thingy @erral [#371](https://github.com/kitconcept/volto-light-theme/pull/371)
+
+### Bugfix
+
+- Fix event title margin bottom. @iFlameing [#357](https://github.com/kitconcept/volto-light-theme/pull/357)
+- Fix Image block in grid is not working @iRohitSingh [#376](https://github.com/kitconcept/volto-light-theme/pull/376)
+
+## 3.2.0 (2024-03-25)
+
+### Feature
+
+- Use project-less approach for developing @sneridagh [#369](https://github.com/kitconcept/volto-light-theme/pull/369)
+
+### Bugfix
+
+- Revert breaking change introduced in #346 @sneridagh [#373](https://github.com/kitconcept/volto-light-theme/pull/373)
+
 ## 3.1.2 (2024-03-18)
 
 ### Internal
@@ -335,19 +369,19 @@
 
 - Add external link for slate block @iRohitSingh [#188](https://github.com/kitconcept/volto-light-theme/pull/188)
 - Fix responsive of listing block. @iFlameing [#189](https://github.com/kitconcept/volto-light-theme/pull/189)
-- Fix pagination styles for Listings. @danalvrz 
+- Fix pagination styles for Listings. @danalvrz
 
   Change divider bar in News Item head title from string to pseudo-element. @danalvrz
 
   Fix text decoration for links. @danalvrz
 
-  Fix background color for in-Grid Slate. @danalvrz 
+  Fix background color for in-Grid Slate. @danalvrz
 
-  Fix Image block margins. @danalvrz 
+  Fix Image block margins. @danalvrz
 
   Fix Grid Listing variation CSS. @danalvrz
 
-  Fix Separator margin when preceded by Image block. @danalvrz 
+  Fix Separator margin when preceded by Image block. @danalvrz
 
   Fix Teaser margin in mobile. @danalvrz [#191](https://github.com/kitconcept/volto-light-theme/pull/191)
 - Enable automatic hyphenation. @iFlameing [#193](https://github.com/kitconcept/volto-light-theme/pull/193)

diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,30 @@
+# syntax=docker/dockerfile:1
+ARG VOLTO_VERSION
+# TODO: Replace with
+# FROM plone/frontend-builder:${VOLTO_VERSION}
+# when the main image is ready
+FROM ghcr.io/kitconcept/frontend-builder:${VOLTO_VERSION} as builder
+
+COPY --chown=node packages/volto-light-theme /app/packages/volto-light-theme
+COPY --chown=node volto.config.js /app/
+COPY --chown=node package.json /app/package.json.temp
+
+RUN --mount=type=cache,id=pnpm,target=/app/.pnpm-store,uid=1000 <<EOT
+     python3 -c "import json; data = json.load(open('package.json.temp')); deps = data['dependencies']; data['dependencies'].update(deps); json.dump(data, open('package.json', 'w'), indent=2)"
+     rm package.json.temp
+     pnpm install
+     pnpm build
+     pnpm install --prod
+EOT
+
+# TODO: Replace with
+# FROM plone/frontend-prod-config:${VOLTO_VERSION}
+# when the main image is ready
+FROM ghcr.io/kitconcept/frontend-prod-config:${VOLTO_VERSION}
+
+LABEL maintainer="Plone Foundation <[email protected]>" \
+      org.label-schema.name="adfsdf-frontend" \
+      org.label-schema.description="adfsdf frontend image." \
+      org.label-schema.vendor="Plone Foundation"
+
+COPY --from=builder /app/ /app/