Merge branch 'main' into fatmenu-mobile-menu

.editorconfig

@@ -18,8 +18,6 @@ trim_trailing_whitespace = true
 charset = utf-8
 # Indent style default
 indent_style = space
-# Max Line Length - a hard line wrap, should be disabled
-max_line_length = off
 
 [*.{py,cfg,ini}]
 # 4 space indentation

.eslintrc

@@ -29,6 +29,11 @@
     "react-hooks/exhaustive-deps": "warn",
     "react/react-in-jsx-scope": "off"
   },
+  "settings": {
+    "react": {
+      "version": "17.0.2"
+    }
+  },
   "globals": {
     "root": true,
     "__DEVELOPMENT__": true,

.github/workflows/acceptance.yml

@@ -4,7 +4,7 @@ on: [push]
 env:
   ADDON_NAME: "@kitconcept/volto-light-theme"
   ADDON_PATH: "volto-light-theme"
-  VOLTO_VERSION: "17.0.0-alpha.27"
+  VOLTO_VERSION: "17.2.0"
 
 jobs:
 

.github/workflows/deploy.yml

@@ -11,7 +11,7 @@ on:
 env:
   ENVIRONMENT: "light-theme.kitconcept.io"
   IMAGE_NAME: "ghcr.io/kitconcept/voltolighttheme-frontend"
-  VOLTO_VERSION: "17.0.0-alpha.26"
+  VOLTO_VERSION: "17.2.0"
 
 jobs:
   meta:

.stylelintrc

@@ -1,6 +1,5 @@
 {
   "extends": [
-    "stylelint-config-prettier",
     "stylelint-config-idiomatic-order"
   ],
   "plugins": [

CHANGELOG.md

@@ -8,6 +8,45 @@
 
 <!-- towncrier release notes start -->
 
+## 1.0.1 (2023-10-18)
+
+### Bugfix
+
+- Small CSS adjustments @sneridagh [#249](https://github.com/kitconcept/volto-light-theme/pull/249)
+
+### Internal
+
+- Update to Volto 17 final @sneridagh [#246](https://github.com/kitconcept/volto-light-theme/pull/246)
+- Bump Volto version @sneridagh [#249](https://github.com/kitconcept/volto-light-theme/pull/249)
+
+
+## 1.0.0 (2023-09-29)
+
+### Feature
+
+- Update to use the proper linter versions and correct violations @sneridagh [#245](https://github.com/kitconcept/volto-light-theme/pull/245)
+
+### Bugfix
+
+- Upgrade highlight to 3.0.0 and downgrade Plone to 6.0.6 @sneridagh [#244](https://github.com/kitconcept/volto-light-theme/pull/244)
+
+
+## 1.0.0-rc.20 (2023-09-28)
+
+### Feature
+
+- Add volto-highlight-block @sneridagh [#243](https://github.com/kitconcept/volto-light-theme/pull/243)
+
+
+## 1.0.0-rc.19 (2023-09-28)
+
+### Bugfix
+
+- Remove too large margins on listing blocks @steffenri [#239](https://github.com/kitconcept/volto-light-theme/pull/239)
+- Fix font sizes of one element in grids for edit mode @sneridagh [#241](https://github.com/kitconcept/volto-light-theme/pull/241)
+- Update to latest accordion-block, some fixes @sneridagh [#242](https://github.com/kitconcept/volto-light-theme/pull/242)
+
+
 ## 1.0.0-rc.18 (2023-09-25)
 
 ### Feature

Makefile

@@ -21,8 +21,8 @@ GREEN=`tput setaf 2`
 RESET=`tput sgr0`
 YELLOW=`tput setaf 3`
 
-PLONE_VERSION=6
-VOLTO_VERSION=17.0.0-alpha.27
+PLONE_VERSION=6.0.6
+VOLTO_VERSION=17.2.0
 
 ADDON_NAME='@kitconcept/volto-light-theme'
 ADDON_PATH='volto-light-theme'

README.md

@@ -53,7 +53,7 @@ Since the new container queries spec is out, we will be introducing it to the cu
 
 ### Organization of the files
 
-We will start organising de files in the root of `theme` folder, to differentiate from a normal "SemanticUI" theme. Take a look at the current state. We will follow this convention:
+We will start organising the files in the root of `theme` folder, to differentiate from a normal "SemanticUI" theme. Take a look at the current state. We will follow this convention:
 
 - One less file per component/block
 - All less files loading are centralized in one main less file `custom.less` in this project, could be different in the future.
@@ -125,6 +125,7 @@ It is recommended that your project or policy add-on `package.json` include the
     "@kitconcept/volto-introduction-block": "1.0.0",
     "@kitconcept/volto-light-theme": "1.0.0",
     "@kitconcept/volto-separator-block": "4.0.0",
+    "@kitconcept/volto-highlight-block": "3.0.0",
   }
 ```
 

dockerfiles/docker-compose.yml

@@ -13,11 +13,11 @@ services:
     volumes:
       - ${CURRENT_DIR}:/app/src/addons/${ADDON_PATH}/
     environment:
-      RAZZLE_INTERNAL_API_PATH: http://backend:8080/Plone
+      # RAZZLE_INTERNAL_API_PATH: http://backend:8080/Plone
       # In case that you want to connect to and outside (non-docker) local instance
       # coment the above, use the next line
-      # RAZZLE_INTERNAL_API_PATH: http://host.docker.internal:8080/Plone
-      RAZZLE_API_PATH: http://127.0.0.1:8080/Plone
+      RAZZLE_INTERNAL_API_PATH: http://host.docker.internal:8080/Plone
+      RAZZLE_API_PATH: http://localhost:8080/Plone
       HOST: 0.0.0.0
     depends_on:
       - backend

news/255.bugfix

@@ -0,0 +1 @@
+Fix corner case if the separator add-on is not present @sneridagh

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitconcept/volto-light-theme",
-  "version": "1.0.0-rc.18",
+  "version": "1.0.1",
   "description": "Volto Light Theme by kitconcept",
   "main": "src/index.js",
   "repository": {
@@ -35,41 +35,43 @@
   "devDependencies": {
     "@babel/eslint-parser": "7.22.15",
     "@plone/scripts": "^3.0.0",
-    "eslint": "6.8.0",
-    "eslint-config-prettier": "6.11.0",
-    "eslint-config-react-app": "5.2.1",
-    "eslint-plugin-flowtype": "4.7.0",
-    "eslint-plugin-import": "2.20.2",
-    "eslint-plugin-jsx-a11y": "6.2.3",
-    "eslint-plugin-prettier": "3.1.3",
-    "eslint-plugin-react": "7.20.0",
-    "eslint-plugin-react-hooks": "4.0.2",
+    "eslint": "8.49.0",
+    "eslint-config-prettier": "9.0.0",
+    "eslint-config-react-app": "7.0.1",
+    "eslint-import-resolver-alias": "1.1.2",
+    "eslint-import-resolver-babel-plugin-root-import": "1.1.1",
+    "eslint-plugin-import": "2.28.1",
+    "eslint-plugin-jsx-a11y": "6.7.1",
+    "eslint-plugin-prettier": "5.0.0",
+    "eslint-plugin-react": "7.33.2",
+    "eslint-plugin-react-hooks": "4.6.0",
     "postcss-scss": "4.0.6",
-    "prettier": "2.0.5",
+    "prettier": "3.0.3",
     "razzle-plugin-scss": "4.2.18",
-    "release-it": "^16.1.0",
-    "stylelint": "14.0.1",
-    "stylelint-config-idiomatic-order": "8.1.0",
-    "stylelint-config-prettier": "9.0.4",
-    "stylelint-config-sass-guidelines": "9.0.1",
-    "stylelint-prettier": "1.1.2"
+    "release-it": "^16.2.1",
+    "stylelint": "15.10.3",
+    "stylelint-config-idiomatic-order": "9.0.0",
+    "stylelint-config-sass-guidelines": "10.0.0",
+    "stylelint-prettier": "4.0.2"
   },
   "peerAddons": [
     "@eeacms/volto-accordion-block",
     "@kitconcept/volto-button-block",
     "@kitconcept/volto-heading-block",
+    "@kitconcept/volto-highlight-block",
     "@kitconcept/volto-introduction-block",
     "@kitconcept/volto-separator-block",
     "@kitconcept/volto-slider-block"
   ],
   "peerDependencies": {
-    "@eeacms/volto-accordion-block": "^9.2.0",
+    "@eeacms/volto-accordion-block": "^10.4.0",
     "@kitconcept/volto-button-block": "^2.3.1",
     "@kitconcept/volto-dsgvo-banner": "^1.3.0",
     "@kitconcept/volto-heading-block": "^2.4.0",
+    "@kitconcept/volto-highlight-block": "^3.0.0",
     "@kitconcept/volto-introduction-block": "^1.0.0",
     "@kitconcept/volto-separator-block": "^4.0.0",
     "@kitconcept/volto-slider-block": "^5.1.1",
-    "@plone/volto": "^17.0.0-alpha.27"
+    "@plone/volto": "^17.2.0"
   }
 }

src/components/Blocks/Listing/ListingBody.jsx

@@ -11,9 +11,10 @@ const Headline = ({ headlineTag, id, data = {}, listingItems, isEditMode }) => {
   let attr = { id };
   const slug = Slugger.slug(data.headline);
   attr.id = slug || id;
-  const LinkedHeadline = useMemo(() => renderLinkElement(headlineTag), [
-    headlineTag,
-  ]);
+  const LinkedHeadline = useMemo(
+    () => renderLinkElement(headlineTag),
+    [headlineTag],
+  );
   return (
     <LinkedHeadline
       mode={!isEditMode && 'view'}

src/components/Blocks/Slate/ExtraAlignWrapper.js

@@ -4,19 +4,21 @@ import cx from 'classnames';
 // on some of the blocks, the ones that are more pure, eg. the ones the view is
 // super simple, and a single element (p or an h)... So it's required on slate
 // blocks and heading
-const ExtraAlignWrapper = (Component) => ({ ...props }) => {
-  const { data } = props;
+const ExtraAlignWrapper =
+  (Component) =>
+  ({ ...props }) => {
+    const { data } = props;
 
-  return (
-    <div
-      className={cx(`${data['@type']}`, {
-        [data.align]: data.align,
-        [data.styles?.align]: data.styles?.align,
-      })}
-    >
-      <Component {...props} />
-    </div>
-  );
-};
+    return (
+      <div
+        className={cx(`${data['@type']}`, {
+          [data.align]: data.align,
+          [data.styles?.align]: data.styles?.align,
+        })}
+      >
+        <Component {...props} />
+      </div>
+    );
+  };
 
 export default ExtraAlignWrapper;

src/components/Blocks/disableBgColorSchema.js

@@ -1,13 +1,12 @@
 export const disableBgColorSchema = ({ schema }) => {
-  const {
-    backgroundColor,
-    ...filteredSchemaProperties
-  } = schema.properties.styles.schema.properties;
+  const { backgroundColor, ...filteredSchemaProperties } =
+    schema.properties.styles.schema.properties;
   schema.properties.styles.schema.properties = filteredSchemaProperties;
 
-  schema.properties.styles.schema.fieldsets[0].fields = schema.properties.styles.schema.fieldsets[0].fields.filter(
-    (item) => item !== 'backgroundColor',
-  );
+  schema.properties.styles.schema.fieldsets[0].fields =
+    schema.properties.styles.schema.fieldsets[0].fields.filter(
+      (item) => item !== 'backgroundColor',
+    );
 
   return schema;
 };

src/components/Blocks/schema.js

@@ -36,3 +36,8 @@ export const defaultStylingSchema = ({ schema, formData, intl }) => {
 
   return schema;
 };
+
+export const removeStylingSchema = ({ schema, formData, intl }) => {
+  schema.fieldsets = schema.fieldsets.filter((item) => item.id !== 'styling');
+  return schema;
+};