Skip to content

Commit

Permalink
Merge branch 'main' into ree-visual-acceptance-tests
Browse files Browse the repository at this point in the history
* main: (25 commits)
  Upgrade to a39, enable new image widget (#405)
  Finish interrupted push
  Fixes #400, install in Volto 17
  Fix Invalid html structure in caption component (#401)
  build deps
  Upgrade to Volto a37 (#403)
  Release 4.0.0
  Fix release-it script
  Changelog
  Fix tabbing in header (reapplies #346 as breaking) (#374)
  Customizable mobile navigation (#393)
  Fix Description block width in Edit/Add (#394)
  Slight improvements
  Adjust height
  Add BMv3 ready logo
  Remove not needed dockerfiles folder
  Update setup. Use new images. (#390)
  fix Logo alt-Title + add German translations (#337)
  fix link in introduction block being smaller than normal text (#366)
  Release 3.3.2
  ...
  • Loading branch information
sneridagh committed Jul 2, 2024
2 parents a45a612 + ad4ca5f commit c7cc7dd
Show file tree
Hide file tree
Showing 39 changed files with 20,315 additions and 14,942 deletions.
43 changes: 17 additions & 26 deletions .github/workflows/acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ name: Acceptance tests
on: [push, pull_request]

env:
node-version: 20.x
NODE_VERSION: 20.x
CYPRESS_RETRIES: 2

jobs:
acceptance:
Expand All @@ -11,18 +12,13 @@ jobs:
steps:
- uses: actions/checkout@v4

- 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
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
Expand All @@ -42,7 +38,7 @@ jobs:
uses: actions/cache@v4
with:
path: ~/.cache/Cypress
key: binary-${{ env.node-version }}-${{ hashFiles('pnpm-lock.yaml') }}
key: binary-${{ env.NODE_VERSION }}-${{ hashFiles('pnpm-lock.yaml') }}

- name: Install dependencies
run: make install
Expand All @@ -56,8 +52,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
Expand All @@ -84,7 +80,7 @@ jobs:

# working-directory: backend

- run: make test-acceptance-headless
- run: make ci-acceptance-test

# Upload Cypress screenshots
- uses: actions/upload-artifact@v3
Expand All @@ -106,18 +102,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
Expand Down Expand Up @@ -151,8 +142,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
Expand All @@ -179,7 +170,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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- main

env:
node-version: 20.x
NODE_VERSION: 20.x
ADDON_NAME: volto-light-theme

jobs:
Expand All @@ -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
Expand Down
15 changes: 5 additions & 10 deletions .github/workflows/code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Code analysis checks
on: [push]

env:
node-version: 20.x
NODE_VERSION: 20.x

jobs:
codeanalysis:
Expand All @@ -12,18 +12,13 @@ jobs:
- name: Main checkout
uses: actions/checkout@v4

- 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
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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ 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"]["tag"] or 'latest')' >> $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 }}"

Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
with:
platforms: linux/amd64
context: ./
file: dockerfiles/Dockerfile
file: Dockerfile
build-args: |
ADDON_NAME=@kitconcept/volto-light-theme
ADDON_PATH=volto-light-theme
Expand Down
15 changes: 5 additions & 10 deletions .github/workflows/i18n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: i18n
on: [push]

env:
node-version: 20.x
NODE_VERSION: 20.x

jobs:
unit:
Expand All @@ -12,18 +12,13 @@ jobs:
- name: Main checkout
uses: actions/checkout@v4

- 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
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
Expand Down
15 changes: 5 additions & 10 deletions .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Unit Tests
on: [push]

env:
node-version: 20.x
NODE_VERSION: 20.x

jobs:
unit:
Expand All @@ -12,18 +12,13 @@ jobs:
- name: Main checkout
uses: actions/checkout@v4

- 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
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
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/visual-acceptance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,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
Expand Down Expand Up @@ -91,7 +86,7 @@ jobs:

# working-directory: backend

- run: make test-acceptance-visual-headless
- run: make ci-acceptance-test-visual

# Upload Cypress screenshots
- uses: actions/upload-artifact@v3
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ core
.changelog.draft
build
.DS_Store
public
6 changes: 6 additions & 0 deletions BMv3-ready.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 49 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,55 @@

<!-- towncrier release notes start -->

## 4.0.1 (2024-06-28)

### Bugfix

- Fix Invalid html structure in caption component @iRohitSingh [#398](https://github.com/kitconcept/volto-light-theme/pull/398)
- Fix install in Volto 17 @sneridagh [#400](https://github.com/kitconcept/volto-light-theme/pull/400)

### Internal

- Upgrade to Volto 18a37 @sneridagh [#403](https://github.com/kitconcept/volto-light-theme/pull/403)

## 4.0.0 (2024-06-21)

### Breaking

- Fix tabbing order in the top header. It modifies the underlying HTML to move the top header to the bottom, and modifies CSS to adjust. @iRohitSingh @sneridagh [#374](https://github.com/kitconcept/volto-light-theme/pull/374)
- Updated the MobileNavigation component to be more easily customizable.
The component can now handle infinite navigation depth instead of only three levels, if configured to do so.
The Burger Menu can now be easily customized by overriding the new MobileNavigationToggler.jsx file.
@lenadax

Breaking:
- The "hamburger" icon in the mobile navigation now has an additional wrapper that allows for better customization.

If you have overriden the hamburger icon, you should make sure that your customizations still work and adjust otherwise. [#393](https://github.com/kitconcept/volto-light-theme/pull/393)

### Bugfix

- Fix Logo alt-Title @jonaspiterek [#337](https://github.com/kitconcept/volto-light-theme/pull/337)
- fix link in introduction block being smaller than normal text @jonaspiterek [#365](https://github.com/kitconcept/volto-light-theme/pull/365)
- Fix Description block width in Edit and Add mode. @danalvrz [#394](https://github.com/kitconcept/volto-light-theme/pull/394)

### Internal

- Update the setup. Use new images. @sneridagh [#390](https://github.com/kitconcept/volto-light-theme/pull/390)

## 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
Expand Down
30 changes: 30 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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:deps
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/
Loading

0 comments on commit c7cc7dd

Please sign in to comment.