@plone/volto 19.0.0-alpha.3 → 19.0.0-alpha.30

package/types/helpers/Url/bulkFlattenToAppURL.d.ts

@@ -0,0 +1,5 @@
+/**
+ * The definitive flattenToAppURL function
+ * Flattens all the URLs in the response to the current app URL (or internalApiPath if set).
+ */
+export declare function bulkFlattenToAppURL<T>(data: T): T;

package/types/helpers/Utils/Utils.d.ts

@@ -35,6 +35,7 @@ export function normalizeString(str: string): string;
  */
 export function isInteractiveElement(element: node, interactiveElements?: string[]): boolean;
 export function safeWrapper(func: Function): (config: any) => any;
+export function getErrorMessage(error: object): string;
 export function getInitials(title: any, limit: any): string;
 export function getColor(name: any): any;
 export function parseDateTime(locale: string, value: string, format: string, moment: any): any | string;

package/types/reducers/blockTypes/blockTypes.d.ts

@@ -0,0 +1,16 @@
+export default function blockTypes(state?: {
+    error: any;
+    items: {};
+    loaded: boolean;
+    loading: boolean;
+}, action?: {}): {
+    error: any;
+    items: {};
+    loaded: boolean;
+    loading: boolean;
+} | {
+    error: any;
+    items: any;
+    loaded: boolean;
+    loading: boolean;
+};

package/types/reducers/index.d.ts

@@ -49,7 +49,9 @@ declare namespace reducers {
     export { userschema };
     export { site };
     export { navroot };
+    export { blockTypes };
 }
+import { intlReducer } from 'react-intl-redux';
 import reduxAsyncConnect from './asyncConnect/asyncConnect';
 import actions from '@plone/volto/reducers/actions/actions';
 import addons from '@plone/volto/reducers/addons/addons';
@@ -98,3 +100,4 @@ import transactions from './transactions/transactions';
 import userschema from './userschema/userschema';
 import site from './site/site';
 import navroot from './navroot/navroot';
+import blockTypes from './blockTypes/blockTypes';

package/types/routes.d.ts

@@ -12,22 +12,23 @@ export const multilingualRoutes: ({
     exact?: undefined;
 } | {
     path: string;
-    component: any;
+    component: () => import("react/jsx-runtime").JSX.Element;
     exact: boolean;
 })[];
 export const defaultRoutes: ({
     path: string;
     component: any;
     exact?: undefined;
+} | {
+    component: (props: any) => import("react/jsx-runtime").JSX.Element;
 } | {
     path: string;
     component: any;
     exact: boolean;
-} | {
-    component: (props: any) => import("react/jsx-runtime").JSX.Element;
 } | {
     path: string[];
     component: any;
+    exact?: undefined;
 })[];
 export default routes;
 /**
@@ -46,14 +47,15 @@ declare const routes: {
         path: string;
         component: any;
         exact?: undefined;
+    } | {
+        component: (props: any) => import("react/jsx-runtime").JSX.Element;
     } | {
         path: string;
         component: any;
         exact: boolean;
-    } | {
-        component: (props: any) => import("react/jsx-runtime").JSX.Element;
     } | {
         path: string[];
         component: any;
+        exact?: undefined;
     })[];
 }[];

package/types/start-client.d.ts

@@ -1,2 +1 @@
 export default function client(): void;
-export const history: import("history").History<unknown>;

package/vitest.config.mjs

@@ -12,66 +12,108 @@ const __dirname = path.dirname(__filename);
 
 const projectRoot = path.resolve(__dirname);
 
-export default defineConfig({
-  plugins: [
-    react(),
-    svgLoader({
-      svgoConfig: {
-        plugins: [
-          {
-            name: 'preset-default',
-            params: {
-              overrides: {
-                convertPathData: false,
-                removeViewBox: false,
-              },
+const sharedAliases = {
+  '@plone/volto': path.resolve(__dirname, 'src'),
+  '@plone/volto-slate': path.resolve(__dirname, '../volto-slate/src'),
+  '@root': path.resolve(__dirname, 'src'),
+  '@plone/components': path.resolve(__dirname, '../components/src'),
+  'promise-file-reader': require.resolve('promise-file-reader'),
+  'react-dropzone': require.resolve('react-dropzone'),
+  'prop-types': require.resolve('prop-types'),
+  'react-intl-redux': require.resolve('react-intl-redux'),
+};
+
+// volto-slate specific aliases 
+const voltoSlateAliases = {
+  ...sharedAliases,
+  'react-test-renderer': require.resolve('react-test-renderer'),
+  'redux': require.resolve('redux'), 
+};
+
+const sharedPlugins = [
+  react(),
+  svgLoader({
+    svgoConfig: {
+      plugins: [
+        {
+          name: 'preset-default',
+          params: {
+            overrides: {
+              convertPathData: false,
+              removeViewBox: false,
             },
           },
-          'removeTitle',
-          'removeUselessStrokeAndFill',
-        ],
-      },
-    }),
-  ],
-  resolve: {
-    alias: {
-      '@plone/volto': path.resolve(__dirname, 'src'),
-      '@plone/volto-slate': path.resolve(__dirname, '../volto-slate/src'),
-      '@root': path.resolve(__dirname, 'src'),
-      'promise-file-reader': require.resolve('promise-file-reader'),
-      'react-dropzone': require.resolve('react-dropzone'),
-      'prop-types': require.resolve('prop-types'),
+        },
+        'removeTitle',
+        'removeUselessStrokeAndFill',
+      ],
     },
+  }),
+];
+
+export default defineConfig({
+  plugins: sharedPlugins,
+  resolve: {
+    alias: sharedAliases,
   },
   test: {
-    isolate: true,
-    deps: {
-      moduleDirectories: ['node_modules'],
-    },
-    snapshotFormat: { printBasicPrototype: false },
-    globals: true,
-    environment: 'jsdom',
-    setupFiles: [
-      `${projectRoot}/test-setup-globals-vitest.js`,
-      `${projectRoot}/test-setup-config.jsx`,
-      `${projectRoot}/jest-setup-afterenv.js`,
-      `${projectRoot}/jest-addons-loader.js`,
+    projects: [
+      // Volto main project
+      {
+        test: {
+          name: 'volto',
+          root: '.',
+          isolate: true,
+          globals: true,
+          environment: 'jsdom',
+          setupFiles: [
+            `${projectRoot}/test-setup-globals.js`,
+            `${projectRoot}/test-setup-config.jsx`,
+            `${projectRoot}/test-addons-loader.js`,
+          ],
+          globalSetup: `${projectRoot}/global-test-setup.js`,
+        },
+        resolve: {
+          alias: sharedAliases,
+        },
+        plugins: sharedPlugins,
+      },
+      // volto-slate project
+      {
+        test: {
+          name: 'volto-slate',
+          root: '../volto-slate',
+          isolate: true,
+          globals: true,
+          environment: 'jsdom',
+          setupFiles: [
+            `${projectRoot}/test-setup-globals.js`,
+            `${projectRoot}/test-setup-config.jsx`,
+            `${projectRoot}/test-addons-loader.js`,
+          ],
+          globalSetup: `${projectRoot}/global-test-setup.js`,
+        },
+        resolve: {
+          alias: voltoSlateAliases,
+        },
+        plugins: sharedPlugins,
+      },
     ],
-    globalSetup: `${projectRoot}/global-test-setup.js`,
+    snapshotFormat: { printBasicPrototype: false },
     coverage: {
       provider: 'v8',
       reporter: ['text', 'json', 'html'],
       include: [
         'src/**/*.{test,spec}.{js,ts,jsx,tsx}',
         '__test__/**/*.{test,spec}.{js,ts,jsx,tsx}',
+        '../volto-slate/src/**/*.{test,spec}.{js,ts,jsx,tsx}',
       ],
       exclude: [
         'node_modules/**',
         '**/dist/**',
         '**/*.config.{js,ts}',
-        '**/jest-*.js',
       ],
     },
     css: true,
   },
-});
+});

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

@@ -143,7 +143,7 @@ module.exports = (userOptions = {}) => ({
           /packages\/volto\/theme/,
           /plone\.volto\/theme/,
           /node_modules\/semantic-ui-less/,
-          ...Object.values(registry.getResolveAliases()),
+          ...Object.values(registry.packages).map((p) => p.modulePath),
         ],
         use: isServer
           ? [

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

@@ -0,0 +1,172 @@
+/* Razzle SCSS Webpack Plugin `razzle-plugin-scss`
+    Forked from https://github.com/jaredpalmer/razzle/blob/master/packages/razzle-plugin-scss/index.js
+    version 4.2.18
+    See Volto's upgrade guide for more information:
+    https://6.docs.plone.org/volto/upgrade-guide/index.html
+*/
+
+const autoprefixer = require('autoprefixer');
+const merge = require('deepmerge');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const paths = require('@plone/razzle/config/paths');
+const postcssLoadConfig = require('postcss-load-config');
+
+const hasPostCssConfig = () => {
+  try {
+    return !!postcssLoadConfig.sync();
+  } catch (_error) {
+    return false;
+  }
+};
+
+module.exports = {
+  modifyWebpackConfig(opts) {
+    const isServer = opts.env.target !== 'web';
+    const constantEnv = opts.env.dev ? 'dev' : 'prod';
+
+    const razzleOptions = opts.options.razzleOptions;
+    const config = Object.assign({}, opts.webpackConfig);
+
+    const defaultOptions = {
+      postcss: {
+        dev: {
+          sourceMap: true,
+          ident: 'postcss',
+        },
+        prod: {
+          sourceMap: razzleOptions.enableSourceMaps,
+          ident: 'postcss',
+        },
+        plugins: [
+          [
+            autoprefixer,
+            {
+              overrideBrowserslist: opts.options.razzleOptions.browserslist || [
+                '>1%',
+                'last 4 versions',
+                'Firefox ESR',
+                'not ie < 9',
+              ],
+              flexbox: 'no-2009',
+            },
+          ],
+        ],
+      },
+      sass: {
+        dev: {
+          sassOptions: {
+            sourceMap: true,
+            includePaths: [paths.appNodeModules],
+            outputStyle: 'expanded',
+            silenceDeprecations: ['legacy-js-api', 'mixed-decls', 'import'],
+            quiet: true,
+            quietDeps: true,
+          },
+        },
+        prod: {
+          sassOptions: {
+            // XXX Source maps are required for the resolve-url-loader to properly
+            // function. Disable them in later stages if you do not want source maps.
+            sourceMap: true,
+            sourceMapContents: false,
+            includePaths: [paths.appNodeModules],
+            outputStyle: 'expanded',
+            silenceDeprecations: ['legacy-js-api', 'mixed-decls', 'import'],
+            quiet: true,
+            quietDeps: true,
+          },
+        },
+      },
+      css: {
+        dev: {
+          sourceMap: true,
+          importLoaders: 1,
+          modules: {
+            auto: true,
+            localIdentName: '[name]__[local]___[hash:base64:5]',
+          },
+        },
+        prod: {
+          sourceMap: razzleOptions.enableSourceMaps,
+          importLoaders: 1,
+          modules: {
+            auto: true,
+            localIdentName: '[name]__[local]___[hash:base64:5]',
+          },
+        },
+      },
+      style: {},
+      resolveUrl: {
+        dev: {},
+        prod: {},
+      },
+    };
+
+    const options = Object.assign(
+      {},
+      defaultOptions,
+      opts.options.pluginOptions,
+    );
+
+    const styleLoader = {
+      loader: require.resolve('style-loader'),
+      options: options.style,
+    };
+
+    const cssLoader = {
+      loader: require.resolve('css-loader'),
+      options: options.css[constantEnv],
+    };
+
+    const resolveUrlLoader = {
+      loader: require.resolve('resolve-url-loader'),
+      options: options.resolveUrl[constantEnv],
+    };
+
+    const postCssLoader = {
+      loader: require.resolve('postcss-loader'),
+      options: hasPostCssConfig()
+        ? undefined
+        : {
+            postcssOptions: Object.assign({}, options.postcss[constantEnv], {
+              plugins: options.postcss.plugins,
+            }),
+          },
+    };
+
+    const sassLoader = {
+      loader: require.resolve('sass-loader'),
+      options: options.sass[constantEnv],
+    };
+
+    config.module.rules = [
+      ...config.module.rules,
+      {
+        test: /\.(sa|sc)ss$/,
+        use: isServer
+          ? [
+              {
+                loader: require.resolve('css-loader'),
+                options: merge(options.css[constantEnv], {
+                  modules: {
+                    exportOnlyLocals: true,
+                  },
+                }),
+              },
+              resolveUrlLoader,
+              postCssLoader,
+              sassLoader,
+            ]
+          : [
+              opts.env.dev ? styleLoader : MiniCssExtractPlugin.loader,
+              cssLoader,
+              postCssLoader,
+              resolveUrlLoader,
+              sassLoader,
+            ],
+      },
+    ];
+
+    return config;
+  },
+};

package/jest-addons-loader.js

@@ -1,3 +0,0 @@
-export default (config) => {
-  return config;
-};

package/jest-extender-plugin.js

@@ -1,39 +0,0 @@
-// Extends the Volto test configuration by injecting the keys in `jest.config.js`
-const path = require('path');
-const fs = require('fs');
-const projectRootPath = path.resolve('.');
-
-module.exports = {
-  modifyJestConfig({
-    jestConfig: config,
-    webpackObject,
-    options: { razzleOptions, pluginOptions },
-    paths,
-  }) {
-    // If the RAZZLE_JEST_CONFIG env var exists,
-    // use it as the file with the Jest config overrides
-    if (process.env.RAZZLE_JEST_CONFIG) {
-      if (fs.existsSync(path.resolve(process.env.RAZZLE_JEST_CONFIG))) {
-        const jestConfigPath = path.resolve(process.env.RAZZLE_JEST_CONFIG);
-        const jestConfig = require(jestConfigPath);
-        config = { ...config, ...jestConfig };
-        return config;
-      }
-      if (
-        fs.existsSync(`${projectRootPath}/${process.env.RAZZLE_JEST_CONFIG}`)
-      ) {
-        const jestConfig = require(
-          `${projectRootPath}/${process.env.RAZZLE_JEST_CONFIG}`,
-        );
-        config = { ...config, ...jestConfig };
-      }
-      // if not, use the sensible default, `jest.config.js`
-    } else {
-      if (fs.existsSync(`${projectRootPath}/jest.config.js`)) {
-        const jestConfig = require(`${projectRootPath}/jest.config.js`);
-        config = { ...config, ...jestConfig };
-      }
-    }
-    return config;
-  },
-};

package/jest-setup-afterenv.js

@@ -1,2 +0,0 @@
-// Jest-crap setup after env T_T
-import '@testing-library/jest-dom';

package/jest-svgsystem-transform.js

@@ -1,10 +0,0 @@
-const path = require('path');
-
-module.exports = {
-  process(src, filename) {
-    if (filename.includes('src/icons')) {
-      return `module.exports = { attributes: { xmlns: '', viewBox: ''}}`;
-    }
-    return `module.exports = ${JSON.stringify(path.basename(filename))}`;
-  },
-};

package/package-why.json

@@ -1,34 +0,0 @@
-{
-  "scripts": {
-    "postinstall": "Description for `npm run postinstall` command",
-    "analyze": "Description for `npm run analyze` command",
-    "start": "Description for `npm run start` command",
-    "build": "Description for `npm run build` command",
-    "build:clean": "Description for `npm run build:clean` command",
-    "dist:clean": "Description for `npm run dist:clean` command",
-    "build:dist": "Description for `npm run build:dist` command",
-    "test": "Description for `npm run test` command",
-    "test:ci": "Description for `npm run test:ci` command",
-    "test:husky": "Description for `npm run test:husky` command",
-    "test:debug": "Description for `npm run test:debug` command",
-    "start:prod": "Description for `npm run start:prod` command",
-    "start:dist": "Description for `npm run start:dist` command",
-    "prettier": "Description for `npm run prettier` command",
-    "prettier:fix": "Description for `npm run prettier:fix` command",
-    "stylelint": "Description for `npm run stylelint` command",
-    "stylelint:overrides": "Description for `npm run stylelint:overrides` command",
-    "stylelint:fix": "Description for `npm run stylelint:fix` command",
-    "lint": "Description for `npm run lint` command",
-    "lint:fix": "Description for `npm run lint:fix` command",
-    "i18n": "Description for `npm run i18n` command",
-    "i18n:ci": "Description for `npm run i18n:ci` command",
-    "stylelint:patches": "Description for `npm run stylelint:patches` command",
-    "patches": "Description for `npm run patches` command",
-    "dry-release": "Description for `npm run dry-release` command",
-    "release": "Description for `npm run release` command",
-    "release-major-alpha": "Description for `npm run release-major-alpha` command",
-    "release-alpha": "Description for `npm run release-alpha` command",
-    "storybook": "Description for `npm run storybook` command",
-    "build-storybook": "Description for `npm run build-storybook` command"
-  }
-}

package/patches/patchit.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-patch --quiet -p0 -N node_modules/razzle/config/createJestConfig.js < patches/razzle-jest.patch

package/patches/razzle-jest.patch

@@ -1,10 +0,0 @@
---- /Users/sneridagh/Development/plone/volto/node_modules/razzle/config/createJestConfig.js	2020-11-07 16:11:14.489360747 +0100
-+++ /Users/sneridagh/Development/plone/volto/node_modules/razzle/config/createJestConfigNew.js	2020-11-07 16:13:44.816817775 +0100
-@@ -84,6 +84,7 @@
-       'mapCoverage',
-       'moduleDirectories',
-       'moduleFileExtensions',
-+      'modulePathIgnorePatterns',
-       'moduleNameMapper',
-       'modulePaths',
-       'snapshotSerializers',

package/src/components/manage/Contents/__mocks__/index.vitest.tsx

@@ -1,5 +0,0 @@
-export const Contents = vi.fn(() => <div className="Contents" />);
-
-export const ContentsRenameModal = vi.fn(() => (
-  <div className="ContentsRenameModal" />
-));

package/src/components/manage/Form/__mocks__/index.vitest.tsx

@@ -1,73 +0,0 @@
-import type { JSONSchema } from '@plone/types';
-import type { Ref } from 'react';
-import { forwardRef } from 'react';
-
-const cleanupSchema = (schema: JSONSchema | null): JSONSchema | null => {
-  if (!schema || !schema.properties) return schema;
-  return {
-    ...schema,
-    properties: Object.entries(schema.properties).reduce<Record<string, any>>(
-      (acc, [key, value]) => {
-        acc[key] = {
-          ...value,
-          description:
-            typeof value.description === 'string'
-              ? value.description
-              : undefined,
-        };
-        return acc;
-      },
-      {},
-    ),
-  };
-};
-
-export const Field = vi.fn((props) => (
-  <div className="Field" id={props.id}>
-    {props.title}
-  </div>
-));
-
-export const InlineForm = vi.fn((props) => (
-  <div
-    id="InlineForm"
-    data-schema={JSON.stringify(cleanupSchema(props.schema), null, 2)}
-  />
-));
-
-export const ModalForm = vi.fn((props) => (
-  <div
-    id="ModalForm"
-    data-schema={JSON.stringify(cleanupSchema(props.schema), null, 2)}
-  />
-));
-
-export const UndoToolbar = vi.fn(() => <div id="UndoToolbar" />);
-
-export const BlocksToolbar = vi.fn(() => <div id="BlocksToolbar" />);
-
-export const BlockDataForm = vi.fn((props) => (
-  <div
-    id="BlockDataForm"
-    data-schema={JSON.stringify(cleanupSchema(props.schema), null, 2)}
-  />
-));
-
-export const BlocksForm = vi.fn((props) => (
-  <div
-    id="BlocksForm"
-    data-schema={JSON.stringify(cleanupSchema(props.schema), null, 2)}
-  />
-));
-
-const MockForm = forwardRef(
-  (props: { schema: JSONSchema | null }, ref: Ref<any>) => (
-    <div
-      id="Form"
-      data-schema={JSON.stringify(cleanupSchema(props.schema), null, 2)}
-      ref={ref}
-    />
-  ),
-);
-
-export const Form = vi.fn((props) => <MockForm {...props} />);

package/src/components/manage/Sidebar/SidebarPortal.jsx

@@ -1,47 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { createPortal } from 'react-dom';
-
-/**
- * Portal that wraps Sidebar components
- * @param {React.ReactNode} children Sidebar content
- * @param {bool} selected Sidebar needs to know when the related block is selected
- * @param {string} tab Element id where to insert sidebar content, default: sidebar-properties
- * @returns {string} Rendered sidebar
- */
-const SidebarPortal = ({ children, selected, tab = 'sidebar-properties' }) => {
-  const [isClient, setIsClient] = React.useState(null);
-
-  React.useEffect(() => setIsClient(true), []);
-
-  return (
-    <>
-      {isClient &&
-        selected &&
-        createPortal(
-          <div role="form" style={{ height: '100%' }}>
-            <div
-              style={{ height: '100%' }}
-              role="presentation"
-              onClick={(e) => {
-                e.stopPropagation();
-              }}
-              onKeyDown={(e) => {
-                e.stopPropagation();
-              }}
-            >
-              {children}
-            </div>
-          </div>,
-          document.getElementById(tab),
-        )}
-    </>
-  );
-};
-
-SidebarPortal.propTypes = {
-  children: PropTypes.any,
-  selected: PropTypes.bool.isRequired,
-};
-
-export default SidebarPortal;