@plone/volto 16.14.0 → 17.0.0-alpha.0

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/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',
             ],
           },
         },