@plone/volto 16.16.0 → 17.0.0-alpha.1

package/src/components/manage/Controlpanels/VersionOverview.jsx

@@ -7,14 +7,8 @@ import React from 'react';
 import { FormattedMessage } from 'react-intl';
 import { isEmpty } from 'lodash';
 
-import {
-  version as voltoVersion,
-  name as voltoName,
-} from '../../../../package.json';
-import {
-  version as projectVersion,
-  name as projectName,
-} from '@root/../package.json';
+import voltoPackageJson from '../../../../package.json';
+import projectPackageJson from '@root/../package.json';
 
 import { defineMessages, useIntl } from 'react-intl';
 import config from '@plone/volto/registry';
@@ -26,6 +20,8 @@ const messages = defineMessages({
   },
 });
 
+const voltoVersion = voltoPackageJson.version;
+
 const VersionOverview = ({
   cmf_version,
   debug_mode,
@@ -37,7 +33,7 @@ const VersionOverview = ({
 }) => {
   const intl = useIntl();
   const { addonsInfo } = config.settings;
-  const isProject = voltoName !== projectName;
+  const isProject = voltoPackageJson.name !== projectPackageJson.name;
 
   return (
     <>
@@ -50,7 +46,7 @@ const VersionOverview = ({
       >
         {isProject ? (
           <li>
-            {projectName} {projectVersion}
+            {projectPackageJson.name} {projectPackageJson.version}
           </li>
         ) : null}
         {voltoVersion && <li>Volto {voltoVersion}</li>}

package/src/components/manage/Diff/DiffField.jsx

@@ -61,12 +61,12 @@ const DiffField = ({
         break;
       case 'datetime':
         parts = diffWords(
-          new Intl.DateTimeFormat(language, readable_date_format).format(
-            new Date(one),
-          ),
-          new Intl.DateTimeFormat(language, readable_date_format).format(
-            new Date(two),
-          ),
+          new Intl.DateTimeFormat(language, readable_date_format)
+            .format(new Date(one))
+            .replace('\u202F', ' '),
+          new Intl.DateTimeFormat(language, readable_date_format)
+            .format(new Date(two))
+            .replace('\u202F', ' '),
         );
         break;
       case 'json':

package/src/components/theme/FormattedDate/FormattedDate.jsx

@@ -23,9 +23,9 @@ const FormattedDate = ({
     <time
       className={className}
       dateTime={date}
-      title={new Intl.DateTimeFormat(language, long_date_format).format(
-        new Date(toDate(date)),
-      )}
+      title={new Intl.DateTimeFormat(language, long_date_format)
+        .format(new Date(toDate(date)))
+        .replace('\u202F', ' ')}
     >
       {children
         ? children(

package/src/express-middleware/sitemap.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { generateSitemap } from '@plone/volto/helpers';
+import { generateSitemap } from '@plone/volto/helpers/Sitemap/Sitemap';
 
 export const sitemap = function (req, res, next) {
   generateSitemap(req).then((sitemap) => {

package/src/helpers/Blocks/Blocks.test.js

@@ -744,6 +744,56 @@ describe('Blocks', () => {
         },
       });
     });
+
+    it('Sets data according to schema default values, keeps existing data', () => {
+      const schema = {
+        properties: {
+          style: {
+            widget: 'object',
+            schema: {
+              title: 'Style',
+              fieldsets: [
+                {
+                  id: 'default',
+                  fields: ['color', 'theme'],
+                  title: 'Default',
+                },
+              ],
+              properties: {
+                color: {
+                  title: 'Color',
+                  default: 'red',
+                },
+                theme: {
+                  title: 'Theme',
+                  default: 'primary',
+                },
+              },
+              required: [],
+            },
+          },
+        },
+      };
+
+      expect(
+        applySchemaDefaults({
+          schema,
+          data: {
+            '@type': 'slider',
+            style: {
+              theme: 'secondary',
+            },
+          },
+          intl: {},
+        }),
+      ).toEqual({
+        '@type': 'slider',
+        style: {
+          color: 'red',
+          theme: 'secondary',
+        },
+      });
+    });
   });
 
   describe('applyBlockDefaults', () => {

package/src/helpers/Utils/Date.js

@@ -48,7 +48,9 @@ export function formatDate({
     : short_date_format;
 
   const formatter = new Intl.DateTimeFormat(locale, format);
-  return formatToParts ? formatter.formatToParts(date) : formatter.format(date);
+  return formatToParts
+    ? formatter.formatToParts(date)
+    : formatter.format(date).replace('\u202F', ' ');
 }
 
 export function formatRelativeDate({
@@ -93,5 +95,5 @@ export function formatRelativeDate({
     ? ''
     : formatToParts
     ? formatter.formatToParts(v, tag)
-    : formatter.format(v, tag); // use "now" ?
+    : formatter.format(v, tag).replace('\u202F', ' '); // use "now" ?
 }

package/src/helpers/Utils/Date.test.js

@@ -192,6 +192,8 @@ describe('formatRelativeDate helper', () => {
   it('can use alternate style narrow', () => {
     const now = Date.now();
     const d = new Date(now + 3 * MONTH);
-    expect(formatRelativeDate({ date: d, style: 'narrow' })).toBe('in 3 mo.');
+    expect(['in 3 mo.', 'in 3mo']).toContain(
+      formatRelativeDate({ date: d, style: 'narrow' }),
+    );
   });
 });

package/src/helpers/index.js

@@ -30,7 +30,6 @@ export {
   removeProtocol,
   URLUtils,
 } from '@plone/volto/helpers/Url/Url';
-export { generateSitemap } from '@plone/volto/helpers/Sitemap/Sitemap';
 export { generateRobots } from '@plone/volto/helpers/Robots/Robots';
 export {
   nestContent,

package/theme/themes/pastanaga/extras/blocks.less

@@ -482,7 +482,6 @@ body.has-toolbar.has-sidebar-collapsed .ui.wrapper > .ui.inner.block.full {
     border: none !important;
     background: white !important;
     border-radius: 50% !important;
-    transform: translateX(-50%);
   }
 
   &:not(.new-add-block) {
@@ -712,20 +711,12 @@ body.has-toolbar.has-sidebar-collapsed .ui.wrapper > .ui.inner.block.full {
 }
 
 .blocks-chooser {
-  position: absolute;
-  z-index: 10;
-  top: 100%;
-  left: 50%;
   width: 310px;
   padding: 4px;
   background-color: rgba(255, 255, 255, 0.975);
   border-radius: 2px;
   box-shadow: 0 0 8px rgba(0, 0, 0, 0.1), 0 2px 4px rgba(0, 0, 0, 0.05);
 
-  &.new-add-block {
-    transform: translate(-50%, 22px);
-  }
-
   &:not(.new-add-block) {
     top: -12px;
     left: -9px;

package/webpack-plugins/webpack-relative-resolver.js

@@ -1,7 +1,9 @@
 const path = require('path');
 
 class RelativeResolverPlugin {
-  constructor(registry) {
+  constructor(registry, source, target) {
+    this.source = source || 'resolve';
+    this.target = target || 'resolve';
     this.registry = registry;
     this.voltoPaths = Object.assign(
       { '@plone/volto/': `${registry.voltoPath}/src` },
@@ -33,24 +35,36 @@ class RelativeResolverPlugin {
   }
 
   apply(resolver) {
-    resolver.plugin('resolve', (request, callback) => {
-      if (
-        request.request.startsWith('.') &&
-        request.context &&
-        request.context.issuer &&
-        this.isAddon(request)
-      ) {
-        const normalizedResourceName = this.getResolvePath(request);
-        const nextRequest = Object.assign({}, request, {
-          request: normalizedResourceName,
-          path: this.registry.projectRootPath,
-        });
-
-        resolver.doResolve('resolve', nextRequest, '', callback);
-      } else {
-        callback();
-      }
-    });
+    var target = resolver.ensureHook(this.target);
+    resolver
+      .getHook(this.source)
+      .tapAsync(
+        'RelativeResolverPlugin',
+        (request, resolveContext, callback) => {
+          if (
+            request.request.startsWith('.') &&
+            request.context &&
+            request.context.issuer &&
+            this.isAddon(request)
+          ) {
+            const normalizedResourceName = this.getResolvePath(request);
+            const nextRequest = Object.assign({}, request, {
+              request: normalizedResourceName,
+              path: this.registry.projectRootPath,
+            });
+
+            return resolver.doResolve(
+              target,
+              nextRequest,
+              null,
+              resolveContext,
+              callback,
+            );
+          } else {
+            callback();
+          }
+        },
+      );
   }
 }
 

package/webpack-plugins/webpack-root-resolver.js

@@ -1,23 +1,34 @@
 const path = require('path');
 
 class RootResolverPlugin {
+  constructor(source, target) {
+    this.source = source || 'resolve';
+    this.target = target || 'resolve';
+  }
+
   apply(resolver) {
-    resolver.plugin('resolve', function RelativeBackResolver(
-      request,
-      callback,
-    ) {
-      if (request.request.startsWith('~/../')) {
-        const resourcePath = request.request.substr(5);
+    var target = resolver.ensureHook(this.target);
+    resolver
+      .getHook(this.source)
+      .tapAsync('RootResolverPlugin', (request, resolveContext, callback) => {
+        if (request.request.startsWith('~/../')) {
+          const resourcePath = request.request.substr(5);
 
-        const nextRequest = Object.assign({}, request, {
-          request: path.resolve(`./${resourcePath}`),
-        });
+          const nextRequest = Object.assign({}, request, {
+            request: path.resolve(`./${resourcePath}`),
+          });
 
-        resolver.doResolve('resolve', nextRequest, '', callback);
-      } else {
-        callback();
-      }
-    });
+          resolver.doResolve(
+            target,
+            nextRequest,
+            null,
+            resolveContext,
+            callback,
+          );
+        } else {
+          callback();
+        }
+      });
   }
 }
 

package/webpack-plugins/webpack-svg-plugin.js

@@ -16,10 +16,17 @@ module.exports = {
           loader: 'svgo-loader',
           options: {
             plugins: [
-              { removeTitle: true },
-              { convertPathData: false },
-              { removeUselessStrokeAndFill: true },
-              { removeViewBox: false },
+              {
+                name: 'preset-default',
+                params: {
+                  overrides: {
+                    convertPathData: false,
+                    removeViewBox: false,
+                  },
+                },
+              },
+              'removeTitle',
+              'removeUselessStrokeAndFill',
             ],
           },
         },