@configuratorware/configurator-admingui 1.35.3 → 1.36.0-beta.0

package/Components/FormFragments/MonacoEditor.js

@@ -73,7 +73,7 @@ var MonacoEditor = (0, _withStyles["default"])({
     var editor;
     Promise.resolve().then(function () {
       return _interopRequireWildcard(require('monaco-editor/esm/vs/editor/editor.api'));
-    }).then(function () {
+    }).then(function (monaco) {
       if (ref.current) {
         editor = monaco.editor.create(ref.current, {
           value: value,

package/Screens/Client/Reducers/Reducer.js

@@ -25,12 +25,6 @@ var initialState = _objectSpread({}, (0, _Reducer.getDefaultEntityState)({
       identifier: true
     }
   },
-  email: {
-    value: '',
-    constraints: {
-      presence: true
-    }
-  },
   users: {
     value: [],
     schema: {

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@configuratorware/configurator-admingui",
-  "version": "1.35.3",
+  "version": "1.36.0-beta.0",
   "license": "UNLICENSED",
   "private": false,
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@hot-loader/react-dom": "^16.14.0",
+    "@hot-loader/react-dom": "^17.0.2",
     "@material-ui/core": "^3.9.4",
     "@material-ui/icons": "^3.0.2",
     "@tweenjs/tween.js": "^17.6.0",
@@ -15,21 +15,21 @@
     "css-element-queries": "^1.2.3",
     "downshift": "^3.4.8",
     "lodash": "^4.17.21",
-    "monaco-editor": "^0.20.0",
-    "monaco-editor-webpack-plugin": "^1.9.1",
+    "monaco-editor": "^0.33.0",
+    "monaco-editor-webpack-plugin": "^7.0.1",
     "prop-types": "^15.7.2",
     "qs": "^6.10.1",
-    "react": "^16.14.0",
-    "react-dom": "^16.14.0",
-    "react-file-drop": "^0.2.8",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-file-drop": "^3.1.5",
     "react-hot-loader": "^4.13.0",
     "react-i18nify": "^1.11.18",
     "react-mde": "^11.5.0",
     "react-redux": "^7.2.4",
     "react-redux-i18n": "^1.9.3",
     "react-router": "^3.2.6",
-    "react-sortable-hoc": "^1.11.0",
-    "redhotmagma-visualization": "1.35.3",
+    "react-sortable-hoc": "^2.0.0",
+    "redhotmagma-visualization": "1.36.0-beta.0",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",
@@ -39,23 +39,17 @@
     "validate.js": "^0.12.0"
   },
   "peerDependencies": {
-    "@babel/cli": "^7.2.3",
-    "@babel/core": "^7.2.2",
-    "@babel/plugin-proposal-class-properties": "^7.2.3",
-    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/preset-env": "^7.2.3",
-    "@babel/preset-react": "^7.0.0",
     "babel-loader": "^8.0.5",
-    "babel-plugin-module-resolver": "^4.1.0",
-    "css-loader": "^2.1.0",
-    "file-loader": "^3.0.1",
-    "mini-css-extract-plugin": "^0.5.0",
-    "node-sass": "^4.11.0",
+    "css-loader": "^5.2.7",
+    "css-minimizer-webpack-plugin": "^4.0.0",
+    "file-loader": "^6.2.0",
+    "mini-css-extract-plugin": "^2.1.0",
     "optimize-css-assets-webpack-plugin": "^5.0.1",
-    "sass-loader": "^7.1.0",
-    "style-loader": "^0.23.1",
-    "terser-webpack-plugin": "^1.2.1",
-    "url-loader": "^1.1.2"
+    "sass": "^1.53.0",
+    "sass-loader": "^13.0.2",
+    "style-loader": "^2.0.0",
+    "terser-webpack-plugin": "^5.1.4",
+    "url-loader": "^4.1.1"
   },
   "scripts": {
     "copy-public": "node ./scripts/cpFavicon.js",

package/scripts/getDefaultWebpackConfig.js

@@ -23,11 +23,19 @@ const moduleRules = [
     },
     {
         test: /\.(png|jpg|gif|svg)$/,
-        loader: 'url-loader?limit=16384&name=images/[name].[hash].[ext]',
+        loader: 'url-loader',
+        options: {
+            limit: 16384,
+            name: 'images/[name].[hash].[ext]',
+        },
     },
     {
         test: /\.ttf$/,
-        loader: 'url-loader?limit=16384&name=fonts/[name].[hash].[ext]',
+        loader: 'url-loader',
+        options: {
+            limit: 16384,
+            name: 'fonts/[name].[hash].[ext]',
+        },
     },
 ];
 
@@ -65,7 +73,7 @@ function getDevConfig(dirname, options = {}) {
             filename: 'bundle.js',
             publicPath: '/',
         },
-        devtool: 'cheap-module-eval-source-map',
+        devtool: 'eval-cheap-module-source-map',
         devServer: {
             hot: true,
             contentBase: BUILD_DIR,
@@ -104,7 +112,10 @@ function getDevConfig(dirname, options = {}) {
             'react/lib/ExecutionEnvironment': true,
             'react/lib/ReactContext': true,
         },
-        plugins: [new webpack.HotModuleReplacementPlugin(), new webpack.NamedModulesPlugin(), monaco],
+        optimization: {
+            moduleIds: 'named',
+        },
+        plugins: [new webpack.HotModuleReplacementPlugin(), monaco],
     };
 }
 
@@ -112,17 +123,17 @@ function importPluginsForBuild() {
     try {
         const TerserPlugin = require('terser-webpack-plugin');
         const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-        const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
+        const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
         return {
             TerserPlugin,
             MiniCssExtractPlugin,
-            OptimizeCSSAssetsPlugin,
+            CssMinimizerPlugin,
         };
     } catch (e) {
         const packages = [
             'terser-webpack-plugin',
             'mini-css-extract-plugin',
-            'optimize-css-assets-webpack-plugin',
+            'css-minimizer-webpack-plugin',
         ];
         console.error(
             'To use the build script, please install the following packages: ' + packages.join(', ')
@@ -135,14 +146,14 @@ function getProdConfig(dirname) {
     const BUILD_DIR = path.resolve(dirname, 'public');
     const APP_DIR = path.resolve(dirname, 'src');
 
-    const { TerserPlugin, MiniCssExtractPlugin, OptimizeCSSAssetsPlugin } = importPluginsForBuild();
+    const { TerserPlugin, MiniCssExtractPlugin, CssMinimizerPlugin } = importPluginsForBuild();
 
     const extractSass = new MiniCssExtractPlugin({
         filename: 'bundle.css',
         chunkFilename: 'bundle.[name].css',
     });
 
-    const optimizeCss = new OptimizeCSSAssetsPlugin({});
+    const optimizeCss = new CssMinimizerPlugin();
 
     const minimizer = new TerserPlugin({
         extractComments: true,
@@ -188,9 +199,9 @@ function getProdConfig(dirname) {
             ],
             noParse: moduleNoParse,
         },
-        plugins: [env, extractSass, optimizeCss, monaco],
+        plugins: [env, extractSass, monaco],
         optimization: {
-            minimizer: [minimizer],
+            minimizer: [minimizer, optimizeCss],
         },
     };
 }

package/src/Components/FormFragments/MonacoEditor.js

@@ -27,7 +27,7 @@ const MonacoEditor = withStyles({
     useEffect(() => {
         let editor;
         import('monaco-editor/esm/vs/editor/editor.api')
-            .then(() => {
+            .then((monaco) => {
                 if (ref.current) {
                     editor = monaco.editor.create(ref.current, {
                         value,

package/src/Screens/Client/Reducers/Reducer.js

@@ -7,7 +7,6 @@ const initialState = {
         {
             id: null,
             identifier: { value: '', constraints: { identifier: true } },
-            email: { value: '', constraints: { presence: true } },
             users: {
                 value: [],
                 schema: {