Skip to content
This repository has been archived by the owner on Nov 23, 2022. It is now read-only.

Upgrade to volto16 #605

Merged
merged 57 commits into from
Nov 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
8e17182
chore: upgraded volto to 16 alpha 45
pnicolli Oct 27, 2022
3b87f4e
chore: upgraded volto to 16 alpha 45
pnicolli Oct 27, 2022
77efaea
chore: upgrades for volto16
pnicolli Oct 27, 2022
22b947c
chore: upgraded mrs-developer
pnicolli Oct 28, 2022
fa0ff74
chore: upgrade dependencies
pnicolli Oct 30, 2022
88c09b3
refactor: upgrade razzle config for razzle 4
pnicolli Oct 30, 2022
438e57d
feat: added layout views i18n names
pnicolli Oct 30, 2022
f4799f1
chore: removed passwordreset view backport
pnicolli Oct 30, 2022
6321abd
refactor: removed mrs-developer, deprecated @italia
pnicolli Oct 30, 2022
ae411cc
chore: removed routes backports
pnicolli Nov 1, 2022
7dda987
chore: re-added our custom Image component
pnicolli Nov 1, 2022
54fe1fe
fix: config and sass dependencies
pnicolli Nov 1, 2022
8e4759e
chore: updated locales
pnicolli Nov 1, 2022
a94d3eb
fix: styles after sass upgrade
pnicolli Nov 1, 2022
047f324
chore: upgrade dependencies
pnicolli Nov 2, 2022
7f2b6ff
chore: added test deployment config
pnicolli Nov 2, 2022
a3d423b
fix: dockerfile
pnicolli Nov 2, 2022
8ad93d1
fix: cleanup rendering warnings
pnicolli Nov 3, 2022
9fda11a
fix: workaround nested bootstrap/reboot
mamico Nov 3, 2022
8a7dcb4
chore: bundlewatch removed
mamico Nov 3, 2022
0dc9706
chore: volto16 update actions
mamico Nov 3, 2022
92a5d36
Merge branch 'upgrade_to_volto16' of github.com:redturtle/design-volt…
pnicolli Nov 3, 2022
c49bfb6
fix: print styles compilation that broke reboot compilation
pnicolli Nov 3, 2022
cc4fcac
fix: test config
pnicolli Nov 3, 2022
6380cb2
fix: tests
pnicolli Nov 3, 2022
df5100b
chore: customizationPaths
mamico Nov 3, 2022
28c02bd
chore: bundle_size action
mamico Nov 3, 2022
4137b04
chore: remove duplicated action
mamico Nov 3, 2022
00be5a0
chore: actions cleanup
mamico Nov 3, 2022
6f86401
fix: invalid comment
mamico Nov 4, 2022
59f92fd
fix: view responsive image in gallery
mamico Nov 4, 2022
c02a742
fix: image intersectionobserver
mamico Nov 4, 2022
0823b3a
fix: img responsive
mamico Nov 4, 2022
9dae05c
fix: intersection observer simplified
mamico Nov 8, 2022
a2a1965
Merge branch 'master' into upgrade_to_volto16
mamico Nov 8, 2022
26d63b6
Merge branch 'upgrade_to_volto16' of github.com:RedTurtle/design-volt…
mamico Nov 8, 2022
7e6dddf
Merge branch 'master' into upgrade_to_volto16
mamico Nov 10, 2022
23faee7
chore: dockerfile + dockercompose
mamico Nov 11, 2022
c35a4c7
feat!: update volto
mamico Nov 13, 2022
cfecb68
feat: node 16 / yarn 3
mamico Nov 13, 2022
74cd287
ci: yarn 3
mamico Nov 13, 2022
52f1af8
ci: make
mamico Nov 13, 2022
708b4b0
ci: yarn 3
mamico Nov 13, 2022
6ccad76
ci
mamico Nov 13, 2022
b96454b
ci: dockerfile
mamico Nov 13, 2022
21ea648
ci: dockerfile
mamico Nov 13, 2022
41fa38a
ci: bundlesize
mamico Nov 13, 2022
66dfada
docs: docker compose update
mamico Nov 14, 2022
7243349
feat: slick font removed
mamico Nov 16, 2022
c15c91c
fix: missing image styles from plone/volto#2103
pnicolli Nov 23, 2022
1a4b797
chore: upgrade to volto 16.0.0
mamico Nov 23, 2022
9d024be
Merge branch 'upgrade_to_volto16' of github.com:RedTurtle/design-volt…
mamico Nov 23, 2022
e1f001e
build: upgraded docker base image to bullseye, cleaned up env vars
pnicolli Nov 23, 2022
43ed3ce
chore: removed old i18n pre-commit hook
pnicolli Nov 23, 2022
64891fa
build: use yarn 3
pnicolli Nov 23, 2022
ef3963a
build: commit hooks dependencies
pnicolli Nov 23, 2022
68bd3cf
Merge branch 'master' into upgrade_to_volto16
pnicolli Nov 23, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
34 changes: 18 additions & 16 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
.vscode/
logs
*.log
npm-debug.log*
.DS_Store

coverage
node_modules
build
src/addons
.env.local
.env.development.local
.env.test.local
.env.production.local

cache
coverage
data
omelette
docker-compose.yml
docker-compose.*
Dockerfile
.DS_Store
.env.development.local
.env.local
.env.production.local
.env.test.local
.git
.gitignore
.history
locales/*.json
*.log
logs
node_modules
npm-debug.log*
omelette
.vscode/
.yarn/
.yarnrc
13 changes: 12 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const addonsAliases = [];
if (packageJson.addons) {
const addons = packageJson.addons;
addons.forEach((addon) => {
// TODO deprecated: remove in version 8
const addonPath = `@italia/addons/${addon}/src`;
addonsAliases.push([`@italia/addons/${addon}`, addonPath]);
});
Expand All @@ -20,7 +21,17 @@ module.exports = {
map: [
['@plone/volto', '@plone/volto/src'],
['@package', './src'],
['@italia', './src'],
['@italia', './src'], // TODO deprecated: remove in version 8
['design-volto-theme', './src'],
// TODO remove the next two when implemented in core
[
'@plone/volto/components/theme/Image/Image',
path.resolve(`${projectRootPath}/src/components/Image/Image.jsx`),
],
[
'@plone/volto/helpers/Image/Image',
path.resolve(`${projectRootPath}/src/components/Image/helpers.js`),
],
...addonsAliases,
],
extensions: ['.js', '.jsx', '.json'],
Expand Down
17 changes: 6 additions & 11 deletions .github/workflows/bundle_size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: develop
# ref: ${{ github.base_ref }}
- uses: actions/setup-node@v3
with:
node-version: 14
node-version: 16

- name: Install dependencies
run: yarn --frozen-lockfile
run: yarn set version 3.2.3 && yarn --immutable
env:
NODE_AUTH_TOKEN: ${{secrets.TOKEN_REPO}}

Expand All @@ -45,17 +45,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 14
node-version: 16
- name: Install dependencies
run: yarn --frozen-lockfile
env:
NODE_AUTH_TOKEN: ${{secrets.TOKEN_REPO}}

- name: Dev requirements
run: yarn develop
run: yarn set version 3.2.3 && yarn --immutable
env:
NODE_AUTH_TOKEN: ${{secrets.TOKEN_REPO}}

Expand Down
23 changes: 0 additions & 23 deletions .github/workflows/bundlewatch.yml

This file was deleted.

2 changes: 0 additions & 2 deletions .github/workflows/develop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# This is a basic workflow to help you get started with Actions
name: Docker build for latest develop version


Expand Down Expand Up @@ -36,7 +35,6 @@ on:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build_develop:
# The type of runner that the job will run on
runs-on: ubuntu-latest
Expand Down
58 changes: 0 additions & 58 deletions .github/workflows/test.yml

This file was deleted.

31 changes: 13 additions & 18 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,26 @@ jobs:
timeout-minutes: 45
strategy:
matrix:
node-version: [14.x]
# node-version: [14.x, 16.x]
# node-version: [14.x]
node-version: [14.x, 16.x]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

# node setup
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: yarn

# node cache
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: actions/cache@v1
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-

## node install
- run: yarn --frozen-lockfile
# node install
- run: yarn set version 3.2.3 && yarn --immutable

- name: Jest tests
run: yarn test

# Bundlewatch
# - run: yarn build
# - uses: jackyef/bundlewatch-gh-action@master
# with:
# bundlewatch-github-token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}
53 changes: 53 additions & 0 deletions .github/workflows/volto16.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Docker build for new volto 16 version
on:
push:
branches: [upgrade_to_volto16]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2

- name: Cache Docker layers
uses: actions/cache@v3
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-

- name: Login to DockerHub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push Docker images
uses: docker/build-push-action@v3
with:
# List of tags
tags: redturtletech/io-comune-base:volto16
pull: true
# Push is a shorthand for --output=type=registry
push: true
builder: ${{ steps.buildx.outputs.name }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache

- name: Deploy to rancher
uses: redturtle/[email protected]
with:
host: ${{ secrets.RANCHER_HOST }}
api-username: ${{ secrets.RANCHER_API_USERNAME }}
api-password: ${{ secrets.RANCHER_API_PASSWORD }}
cluster-id: ${{ secrets.RANCHER_CLUSTER_ID }}
project-id: ${{ secrets.RANCHER_PROJECT_ID }}
namespace: ${{ secrets.RANCHER_NAMESPACE_DEVELOP }}
workload: ${{ secrets.RANCHER_WORKLOAD_VOLTO16 }}
image: redturtletech/io-comune-base:volto16
slack-hook-url: ${{ secrets.RANCHER_SLACK_HOOK_URL }}
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
.vscode/
.history
.yarn/
.yarnrc
logs
*.log
npm-debug.log*
Expand All @@ -11,10 +9,12 @@ src/addons
coverage
node_modules
build
cache
.env.local
.env.development.local
.env.test.local
.env.production.local
.yarn/install-state.gz

data
omelette
Expand Down
1 change: 1 addition & 0 deletions .husky/commit-msg
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
npx --no -- commitlint --edit ${1}
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
npx lint-staged
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/fermium
lts/gallium
Loading