Merge pull request #65 from eea/develop

update to volto 17, ref #278618

.dockerignore

@@ -0,0 +1,25 @@
+# Folders
+.git
+.yarn/cache
+.storybook
+build
+cache
+locales/*.json
+node_modules
+omelette
+
+# Files
+.env
+*.log
+.dockerignore
+.editorconfig
+.eslintignore
+.eslintrc.js
+.gitignore
+.gitmodules
+.prettierignore
+bootstrap
+cypress*.json
+docker-compose.yml
+Dockerfile
+Jenkinsfile

.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
@@ -28,7 +26,6 @@ indent_size = 4
 [*.{html,dtml,pt,zpt,xml,zcml,js,jsx,json,less,css,yaml,yml}]
 # 2 space indentation
 indent_size = 2
-max_line_length = 80
 
 [{Makefile,.gitmodules}]
 # Tab indentation (no size specified, but view as 4 spaces)

.eslintignore

@@ -1,3 +1,5 @@
 src/addons/**/node_modules
 src/addons/**/cypress
 src/addons/**/build
+
+!src/addons/volto-bise-frontend-2

.eslintrc.js

@@ -27,7 +27,9 @@ const addonAliases = Object.keys(reg.packages).map((o) => [
   reg.packages[o].modulePath,
 ]);
 
-module.exports = {
+const addonExtenders = reg.getEslintExtenders().map((m) => require(m));
+
+const defaultConfig = {
   extends: `${voltoPath}/.eslintrc`,
   settings: {
     'import/resolver': {
@@ -40,11 +42,18 @@ module.exports = {
           ['@root', `${__dirname}/src`],
           ['~', `${__dirname}/src`],
         ],
-        extensions: ['.js', '.jsx', '.json'],
+        extensions: ['.js', '.jsx', '.ts', '.tsx', '.json'],
       },
       'babel-plugin-root-import': {
         rootPathSuffix: 'src',
       },
     },
   },
 };
+
+const config = addonExtenders.reduce(
+  (acc, extender) => extender.modify(acc),
+  defaultConfig,
+);
+
+module.exports = config;

.gitignore

@@ -84,11 +84,13 @@ public/critical.css
 src/addons/*
 /cache
 
-# yarn
+# yarn 3
 .pnp.*
 .yarn/*
 !.yarn/patches
 !.yarn/plugins
 !.yarn/releases
 !.yarn/sdks
-!.yarn/versions
+!.yarn/versions
+
+!src/addons/volto-bise-frontend-2

.nvmrc

@@ -0,0 +1 @@
+20.18.0

.prettierignore

@@ -1,2 +1,3 @@
 src/**/CHANGELOG.md
-src/**/README.md
+src/**/README.md
+!src/addons/volto-bise-frontend-2

.storybook/main.js

@@ -6,6 +6,7 @@ const fileLoaderFinder = makeLoaderFinder('file-loader');
 
 const projectRootPath = path.resolve('.');
 const lessPlugin = require('@plone/volto/webpack-plugins/webpack-less-plugin');
+const scssPlugin = require('razzle-plugin-scss');
 
 const createConfig = require('../node_modules/razzle/config/createConfigAsync.js');
 const razzleConfig = require(path.join(projectRootPath, 'razzle.config.js'));
@@ -20,10 +21,17 @@ const SVGLOADER = {
       loader: 'svgo-loader',
       options: {
         plugins: [
-          { removeTitle: true },
-          { convertPathData: false },
-          { removeUselessStrokeAndFill: true },
-          { removeViewBox: false },
+          {
+            name: 'preset-default',
+            params: {
+              overrides: {
+                convertPathData: false,
+                removeViewBox: false,
+              },
+            },
+          },
+          'removeTitle',
+          'removeUselessStrokeAndFill',
         ],
       },
     },
@@ -55,6 +63,9 @@ const defaultRazzleOptions = {
 };
 
 module.exports = {
+  core: {
+    builder: 'webpack5',
+  },
   stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
   addons: [
     '@storybook/addon-links',
@@ -93,11 +104,20 @@ module.exports = {
       options: {},
     });
 
-    // putting SVG loader on top, fix the fileloader manually (Volto plugin does not
-    // work) since it needs to go first
+    config = scssPlugin.modifyWebpackConfig({
+      env: { target: 'web', dev: 'dev' },
+      webpackConfig: config,
+      webpackObject: webpack,
+      options: { razzleOptions: {} },
+    });
+
+    // Put the SVG loader on top and prevent the asset/resource rule
+    // from processing the app's SVGs
     config.module.rules.unshift(SVGLOADER);
-    const fileLoader = config.module.rules.find(fileLoaderFinder);
-    fileLoader.exclude = [/\.(config|variables|overrides)$/, /icons\/.*\.svg$/];
+    const fileLoaderRule = config.module.rules.find((rule) =>
+      rule.test.test('.svg'),
+    );
+    fileLoaderRule.exclude = /icons\/.*\.svg$/;
 
     config.plugins.unshift(
       new webpack.DefinePlugin({
@@ -112,6 +132,7 @@ module.exports = {
       resolve: {
         ...config.resolve,
         alias: { ...config.resolve.alias, ...baseConfig.resolve.alias },
+        fallback: { ...config.resolve.fallback, zlib: false },
       },
     };