Merge branch 'master' into draft_save

plone · Sep 15, 2023 · e9d4c3b · e9d4c3b
2 parents 18dcdce + f3fc56c
commit e9d4c3b
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/api/versions.cfg b/api/versions.cfg
@@ -3,3 +3,4 @@
 # Added by buildout at 2021-12-15 17:25:36.097866
 collective.folderishtypes = 3.0.0
 collective.recipe.plonesite = 1.12.0
+pyyaml = 5.3.1 # without this volto is not building locally
diff --git a/news/5109.feature b/news/5109.feature
@@ -0,0 +1 @@
+Add external className to slate Link view. @iFlameing
diff --git a/packages/generator-volto/CHANGELOG.md b/packages/generator-volto/CHANGELOG.md
@@ -8,6 +8,13 @@
 
 <!-- towncrier release notes start -->
 
+## 7.0.0-alpha.6 (2023-09-14)
+
+### Bugfix
+
+- Fix addon i18n local command when executed outside the scope of a Volto project. @sneridagh [#5181](https://github.com/plone/volto/issues/5181)
+
+
 ## 7.0.0-alpha.5 (2023-09-13)
 
 ### Feature

diff --git a/packages/generator-volto/generators/addon/templates/babel.config.js b/packages/generator-volto/generators/addon/templates/babel.config.js
@@ -1,6 +1,6 @@
 module.exports = function (api) {
   api.cache(true);
-  const presets = ['razzle/babel'];
+  const presets = ['razzle'];
   const plugins = [
     [
       'react-intl', // React Intl extractor, required for the whole i18n infrastructure to work

diff --git a/packages/generator-volto/news/5181.bugfix b/packages/generator-volto/news/5181.bugfix
@@ -0,0 +1 @@
+Fix addon i18n local command when executed outside the scope of a Volto project. @sneridagh
diff --git a/packages/generator-volto/package.json b/packages/generator-volto/package.json
@@ -10,7 +10,7 @@
     }
   ],
   "license": "MIT",
-  "version": "7.0.0-alpha.5",
+  "version": "7.0.0-alpha.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/plone/generator-volto.git"

diff --git a/packages/volto-slate/src/editor/plugins/Link/render.jsx b/packages/volto-slate/src/editor/plugins/Link/render.jsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import cx from 'classnames';
 import { UniversalLink } from '@plone/volto/components';
 import config from '@plone/volto/registry';
 import { isInternalURL, flattenToAppURL } from '@plone/volto/helpers';
@@ -20,18 +21,16 @@ const ViewLink = ({ url, target, download, children }) => {
 
 export const LinkElement = (props) => {
   const { attributes, children, element, mode = 'edit' } = props;
+  const isInternalUrl = isInternalURL(element.data?.url);
+  const linkUrl = element.data?.url;
 
   return mode === 'view' ? (
     <ViewLink {...(element.data || {})}>{children}</ViewLink>
   ) : (
     <a
       {...attributes}
-      className="slate-editor-link"
-      href={
-        isInternalURL(element.data?.url)
-          ? flattenToAppURL(element.data?.url)
-          : element.data?.url
-      }
+      className={cx('slate-editor-link', { external: !isInternalUrl })}
+      href={isInternalUrl ? flattenToAppURL(linkUrl) : linkUrl}
       onClick={(e) => e.preventDefault()}
     >
       {Array.isArray(children)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add external className to slate Link view. @iFlameing
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix addon i18n local command when executed outside the scope of a Volto project. @sneridagh