@strapi/admin 4.12.0-beta.0 → 4.12.0-beta.3

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/pages/CreateView/CreateView.js

@@ -4,6 +4,7 @@ import { Button, Flex, Loader } from '@strapi/design-system';
 import { useAPIErrorHandler, useFetchClient, useNotification } from '@strapi/helper-plugin';
 import { Check } from '@strapi/icons';
 import { useFormik, Form, FormikProvider } from 'formik';
+import set from 'lodash/set';
 import { useIntl } from 'react-intl';
 import { useMutation } from 'react-query';
 import { useDispatch, useSelector } from 'react-redux';
@@ -20,7 +21,7 @@ import { WorkflowAttributes } from '../../components/WorkflowAttributes';
 import { REDUX_NAMESPACE } from '../../constants';
 import { useReviewWorkflows } from '../../hooks/useReviewWorkflows';
 import { reducer, initialState } from '../../reducer';
-import { getWorkflowValidationSchema } from '../../utils/getWorkflowValidationSchema';
+import { validateWorkflow } from '../../utils/validateWorkflow';
 
 export function ReviewWorkflowsCreateView() {
   const { formatMessage } = useIntl();
@@ -38,6 +39,7 @@ export function ReviewWorkflowsCreateView() {
   const [showLimitModal, setShowLimitModal] = React.useState(false);
   const { isLoading: isLicenseLoading, getFeature } = useLicenseLimits();
   const { meta, isLoading: isWorkflowLoading } = useReviewWorkflows();
+  const [initialErrors, setInitialErrors] = React.useState(null);
 
   const { mutateAsync, isLoading } = useMutation(
     async ({ workflow }) => {
@@ -70,10 +72,33 @@ export function ReviewWorkflowsCreateView() {
 
       return workflow;
     } catch (error) {
-      toggleNotification({
-        type: 'warning',
-        message: formatAPIError(error),
-      });
+      // TODO: the current implementation of `formatAPIError` prints all error messages of all details,
+      // which get's hairy when we have duplicated-name errors, because the same error message is printed
+      // several times. What we want instead in these scenarios is to print only the error summary and
+      // display the individual error messages for each field. This is a workaround, until we change the
+      // implementation of `formatAPIError`.
+      if (
+        error.response.data?.error?.name === 'ValidationError' &&
+        error.response.data?.error?.details?.errors?.length > 0
+      ) {
+        toggleNotification({
+          type: 'warning',
+          message: error.response.data.error.message,
+        });
+
+        setInitialErrors(
+          error.response.data?.error?.details?.errors.reduce((acc, error) => {
+            set(acc, error.path, error.message);
+
+            return acc;
+          }, {})
+        );
+      } else {
+        toggleNotification({
+          type: 'warning',
+          message: formatAPIError(error),
+        });
+      }
 
       return null;
     }
@@ -83,6 +108,7 @@ export function ReviewWorkflowsCreateView() {
 
   const formik = useFormik({
     enableReinitialize: true,
+    initialErrors,
     initialValues: currentWorkflow,
     async onSubmit() {
       /**
@@ -91,7 +117,7 @@ export function ReviewWorkflowsCreateView() {
        * update, because it would throw an API error.
        */
 
-      if (limits?.workflows && meta?.workflowCount >= limits.workflows) {
+      if (limits?.workflows && meta?.workflowCount >= parseInt(limits.workflows, 10)) {
         setShowLimitModal('workflow');
 
         /**
@@ -101,14 +127,16 @@ export function ReviewWorkflowsCreateView() {
          */
       } else if (
         limits?.stagesPerWorkflow &&
-        currentWorkflow.stages.length >= limits.stagesPerWorkflow
+        currentWorkflow.stages.length >= parseInt(limits.stagesPerWorkflow, 10)
       ) {
         setShowLimitModal('stage');
       } else {
         submitForm();
       }
     },
-    validationSchema: getWorkflowValidationSchema({ formatMessage }),
+    validate(values) {
+      return validateWorkflow({ values, formatMessage });
+    },
   });
 
   useInjectReducer(REDUX_NAMESPACE, reducer);
@@ -132,11 +160,11 @@ export function ReviewWorkflowsCreateView() {
 
   React.useEffect(() => {
     if (!isWorkflowLoading && !isLicenseLoading) {
-      if (limits.workflows && meta?.workflowsTotal >= limits.workflows) {
+      if (limits.workflows && meta?.workflowsTotal >= parseInt(limits.workflows, 10)) {
         setShowLimitModal('workflow');
       } else if (
         limits.stagesPerWorkflow &&
-        currentWorkflow.stages.length >= limits.stagesPerWorkflow
+        currentWorkflow.stages.length >= parseInt(limits.stagesPerWorkflow, 10)
       ) {
         setShowLimitModal('stage');
       }

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/pages/EditView/EditView.js

@@ -9,6 +9,7 @@ import {
 } from '@strapi/helper-plugin';
 import { Check } from '@strapi/icons';
 import { useFormik, Form, FormikProvider } from 'formik';
+import set from 'lodash/set';
 import { useIntl } from 'react-intl';
 import { useMutation } from 'react-query';
 import { useSelector, useDispatch } from 'react-redux';
@@ -25,7 +26,7 @@ import { WorkflowAttributes } from '../../components/WorkflowAttributes';
 import { REDUX_NAMESPACE } from '../../constants';
 import { useReviewWorkflows } from '../../hooks/useReviewWorkflows';
 import { reducer, initialState } from '../../reducer';
-import { getWorkflowValidationSchema } from '../../utils/getWorkflowValidationSchema';
+import { validateWorkflow } from '../../utils/validateWorkflow';
 
 export function ReviewWorkflowsEditView() {
   const { workflowId } = useParams();
@@ -55,6 +56,7 @@ export function ReviewWorkflowsEditView() {
   const [isConfirmDeleteDialogOpen, setIsConfirmDeleteDialogOpen] = React.useState(false);
   const { getFeature, isLoading: isLicenseLoading } = useLicenseLimits();
   const [showLimitModal, setShowLimitModal] = React.useState(false);
+  const [initialErrors, setInitialErrors] = React.useState(null);
 
   const { mutateAsync, isLoading } = useMutation(
     async ({ workflow }) => {
@@ -77,15 +79,41 @@ export function ReviewWorkflowsEditView() {
   );
 
   const updateWorkflow = async (workflow) => {
+    // reset the error messages
+    setInitialErrors(null);
+
     try {
       const res = await mutateAsync({ workflow });
 
       return res;
     } catch (error) {
-      toggleNotification({
-        type: 'warning',
-        message: formatAPIError(error),
-      });
+      // TODO: the current implementation of `formatAPIError` prints all error messages of all details,
+      // which get's hairy when we have duplicated-name errors, because the same error message is printed
+      // several times. What we want instead in these scenarios is to print only the error summary and
+      // display the individual error messages for each field. This is a workaround, until we change the
+      // implementation of `formatAPIError`.
+      if (
+        error.response.data?.error?.name === 'ValidationError' &&
+        error.response.data?.error?.details?.errors?.length > 0
+      ) {
+        toggleNotification({
+          type: 'warning',
+          message: error.response.data.error.message,
+        });
+
+        setInitialErrors(
+          error.response.data?.error?.details?.errors.reduce((acc, error) => {
+            set(acc, error.path, error.message);
+
+            return acc;
+          }, {})
+        );
+      } else {
+        toggleNotification({
+          type: 'warning',
+          message: formatAPIError(error),
+        });
+      }
 
       return null;
     }
@@ -108,15 +136,36 @@ export function ReviewWorkflowsEditView() {
 
   const formik = useFormik({
     enableReinitialize: true,
+    initialErrors,
     initialValues: currentWorkflow,
     async onSubmit() {
       if (currentWorkflowHasDeletedServerStages) {
         setIsConfirmDeleteDialogOpen(true);
+      } else if (limits?.workflows && meta?.workflowCount > parseInt(limits.workflows, 10)) {
+        /**
+         * If the current license has a limit, check if the total count of workflows
+         * exceeds that limit and display the limits modal instead of sending the
+         * update, because it would throw an API error.
+         */
+        setShowLimitModal('workflow');
+
+        /**
+         * If the current license has a limit, check if the total count of stages
+         * exceeds that limit and display the limits modal instead of sending the
+         * update, because it would throw an API error.
+         */
+      } else if (
+        limits?.stagesPerWorkflow &&
+        currentWorkflow.stages.length > parseInt(limits.stagesPerWorkflow, 10)
+      ) {
+        setShowLimitModal('stage');
       } else {
         submitForm();
       }
     },
-    validationSchema: getWorkflowValidationSchema({ formatMessage }),
+    validate(values) {
+      return validateWorkflow({ values, formatMessage });
+    },
   });
 
   useInjectReducer(REDUX_NAMESPACE, reducer);
@@ -142,11 +191,11 @@ export function ReviewWorkflowsEditView() {
 
   React.useEffect(() => {
     if (!isWorkflowLoading && !isLicenseLoading) {
-      if (limits?.workflows && meta?.workflowCount >= limits.workflows) {
+      if (limits?.workflows && meta?.workflowCount > parseInt(limits.workflows, 10)) {
         setShowLimitModal('workflow');
       } else if (
         limits?.stagesPerWorkflow &&
-        currentWorkflow.stages.length >= limits.stagesPerWorkflow
+        currentWorkflow.stages.length > parseInt(limits.stagesPerWorkflow, 10)
       ) {
         setShowLimitModal('stage');
       }

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/pages/ListView/ListView.js

@@ -148,7 +148,7 @@ export function ReviewWorkflowsListView() {
 
   React.useEffect(() => {
     if (!isLoading && !isLicenseLoading) {
-      if (limits?.workflows && meta?.workflowCount >= limits.workflows) {
+      if (limits?.workflows && meta?.workflowCount >= parseInt(limits.workflows, 10)) {
         setShowLimitModal(true);
       }
     }
@@ -180,7 +180,7 @@ export function ReviewWorkflowsListView() {
                * current hard-limit of 200 they will see an error thrown by the API.
                */
 
-              if (limits?.workflows && meta?.workflowCount >= limits.workflows) {
+              if (limits?.workflows && meta?.workflowCount >= parseInt(limits.workflows, 10)) {
                 event.preventDefault();
                 setShowLimitModal(true);
               } else {
@@ -230,7 +230,7 @@ export function ReviewWorkflowsListView() {
                    * current hard-limit of 200 they will see an error thrown by the API.
                    */
 
-                  if (limits?.workflows && meta?.workflowCount >= limits.workflows) {
+                  if (limits?.workflows && meta?.workflowCount >= parseInt(limits.workflows, 10)) {
                     setShowLimitModal(true);
                   } else {
                     push('/settings/review-workflows/create');

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/utils/{getWorkflowValidationSchema.js → validateWorkflow.js}

@@ -1,7 +1,8 @@
+import set from 'lodash/set';
 import * as yup from 'yup';
 
-export function getWorkflowValidationSchema({ formatMessage }) {
-  return yup.object({
+export async function validateWorkflow({ values, formatMessage }) {
+  const schema = yup.object({
     contentTypes: yup.array().of(yup.string()),
     name: yup
       .string()
@@ -32,6 +33,20 @@ export function getWorkflowValidationSchema({ formatMessage }) {
                 id: 'Settings.review-workflows.validation.stage.max-length',
                 defaultMessage: 'Name can not be longer than 255 characters',
               })
+            )
+            .test(
+              'unique-name',
+              formatMessage({
+                id: 'Settings.review-workflows.validation.stage.duplicate',
+                defaultMessage: 'Stage name must be unique',
+              }),
+              function (stageName) {
+                const {
+                  options: { context },
+                } = this;
+
+                return context.stages.filter((stage) => stage.name === stageName).length === 1;
+              }
             ),
           color: yup
             .string()
@@ -46,4 +61,20 @@ export function getWorkflowValidationSchema({ formatMessage }) {
       )
       .min(1),
   });
+
+  try {
+    await schema.validate(values, { abortEarly: false, context: values });
+
+    return true;
+  } catch (error) {
+    let errors = {};
+
+    if (error instanceof yup.ValidationError) {
+      error.inner.forEach((error) => {
+        set(errors, error.path, error.message);
+      });
+    }
+
+    return errors;
+  }
 }

package/ee/admin/pages/SettingsPage/pages/Users/ListPage/CreateAction/index.js

@@ -8,7 +8,7 @@ import { useIntl } from 'react-intl';
 
 import { useLicenseLimits } from '../../../../../../hooks';
 
-const CreateAction = ({ onClick }) => {
+export const CreateActionEE = ({ onClick }) => {
   const { formatMessage } = useIntl();
   const {
     license: { permittedSeats, shouldStopCreate },
@@ -54,8 +54,6 @@ const CreateAction = ({ onClick }) => {
   );
 };
 
-CreateAction.propTypes = {
+CreateActionEE.propTypes = {
   onClick: PropTypes.func.isRequired,
 };
-
-export default CreateAction;

package/ee/admin/pages/SettingsPage/pages/Users/ListPage/index.js

@@ -0,0 +1,13 @@
+import * as React from 'react';
+
+// eslint-disable-next-line import/no-cycle
+import { UserListPageCE } from '../../../../../../../admin/src/pages/SettingsPage/pages/Users/ListPage';
+import { useLicenseLimitNotification } from '../../../../../hooks';
+
+function UserListPageEE() {
+  useLicenseLimitNotification();
+
+  return <UserListPageCE />;
+}
+
+export { UserListPageEE };

package/ee/admin/pages/SettingsPage/pages/Users/components/MagicLink/index.js

@@ -7,7 +7,7 @@ import basename from '../../../../../../../../admin/src/core/utils/basename';
 import MagicLinkWrapper from '../../../../../../../../admin/src/pages/SettingsPage/pages/Users/components/MagicLink/MagicLinkWrapper';
 
 // FIXME replace with parts compo when ready
-const MagicLink = ({ registrationToken }) => {
+export const MagicLinkEE = ({ registrationToken }) => {
   const { formatMessage } = useIntl();
 
   if (registrationToken) {
@@ -34,12 +34,10 @@ const MagicLink = ({ registrationToken }) => {
   );
 };
 
-MagicLink.defaultProps = {
+MagicLinkEE.defaultProps = {
   registrationToken: '',
 };
 
-MagicLink.propTypes = {
+MagicLinkEE.propTypes = {
   registrationToken: PropTypes.string,
 };
-
-export default MagicLink;

package/ee/admin/pages/SettingsPage/pages/Webhooks/EditView/components/EventTable/index.js

@@ -1,3 +1 @@
-import { EventTableEE } from './EventTableEE';
-
-export default EventTableEE;
+export * from './EventTableEE';

package/ee/server/constants/default-stages.json

@@ -9,7 +9,7 @@
   },
   {
     "name": "In progress",
-    "color": "#FF4945"
+    "color": "#EE5E52"
   },
   {
     "name": "Reviewed",

package/ee/server/constants/workflows.js

@@ -14,5 +14,6 @@ module.exports = {
       'You’ve reached the limit of workflows in your plan. Delete a workflow or contact Sales to enable more workflows.',
     STAGES_LIMIT:
       'You’ve reached the limit of stages for this workflow in your plan. Try deleting some stages or contact Sales to enable more stages.',
+    DUPLICATED_STAGE_NAME: 'Stage names must be unique.',
   },
 };

package/ee/server/services/review-workflows/validation.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const { uniq } = require('lodash/fp');
 const { ValidationError } = require('@strapi/utils').errors;
 const { getService } = require('../../utils');
 const { ERRORS, MAX_WORKFLOWS, MAX_STAGES_PER_WORKFLOW } = require('../../constants/workflows');
@@ -32,6 +33,11 @@ module.exports = ({ strapi }) => {
       if (stages.length > this.limits.stagesPerWorkflow) {
         throw new ValidationError(ERRORS.STAGES_LIMIT);
       }
+      // Validate stage names are not duplicated
+      const stageNames = stages.map((stage) => stage.name);
+      if (uniq(stageNames).length !== stageNames.length) {
+        throw new ValidationError(ERRORS.DUPLICATED_STAGE_NAME);
+      }
     },
 
     async validateWorkflowCountStages(workflowId, countAddedStages = 0) {

package/ee/server/validation/review-workflows.js

@@ -1,5 +1,7 @@
 'use strict';
 
+/* eslint-disable func-names */
+
 const { yup, validateYupSchema } = require('@strapi/utils');
 const { hasStageAttribute } = require('../utils/review-workflows');
 
@@ -42,10 +44,11 @@ const validateContentTypes = yup.array().of(
 );
 
 const validateWorkflowCreateSchema = yup.object().shape({
-  name: yup.string().max(255).required(),
+  name: yup.string().max(255).min(1, 'Workflow name can not be empty').required(),
   stages: yup
     .array()
     .of(stageObject)
+    .uniqueProperty('name', 'Stage name must be unique')
     .min(1, 'Can not create a workflow without stages')
     .max(200, 'Can not have more than 200 stages')
     .required('Can not create a workflow without stages'),
@@ -53,10 +56,11 @@ const validateWorkflowCreateSchema = yup.object().shape({
 });
 
 const validateWorkflowUpdateSchema = yup.object().shape({
-  name: yup.string().max(255),
+  name: yup.string().max(255).min(1, 'Workflow name can not be empty'),
   stages: yup
     .array()
     .of(stageObject)
+    .uniqueProperty('name', 'Stage name must be unique')
     .min(1, 'Can not update a workflow without stages')
     .max(200, 'Can not have more than 200 stages'),
   contentTypes: validateContentTypes,

package/index.js

@@ -30,12 +30,6 @@ async function build({ appDir, buildDestDir, env, forceBuild, optimize, options,
   const entry = path.resolve(cacheDir, 'admin', 'src');
   const dest = path.resolve(buildDestDir, 'build');
 
-  // Roots for the @strapi/babel-plugin-switch-ee-ce
-  const roots = {
-    eeRoot: path.resolve(cacheDir, 'ee', 'admin'),
-    ceRoot: path.resolve(cacheDir, 'admin', 'src'),
-  };
-
   const pluginsPath = Object.keys(plugins).map((pluginName) => plugins[pluginName].pathToPlugin);
 
   // Either use the tsconfig file from the generated app or the one inside the .cache folder
@@ -53,7 +47,6 @@ async function build({ appDir, buildDestDir, env, forceBuild, optimize, options,
     optimize,
     options,
     pluginsPath,
-    roots,
     tsConfigFilePath,
   });
 
@@ -105,12 +98,6 @@ async function watchAdmin({ appDir, browser, buildDestDir, host, options, plugin
   const dest = path.join(buildDestDir, 'build');
   const env = 'development';
 
-  // Roots for the @strapi/babel-plugin-switch-ee-ce
-  const roots = {
-    eeRoot: path.resolve(cacheDir, 'ee', 'admin'),
-    ceRoot: path.resolve(cacheDir, 'admin', 'src'),
-  };
-
   const pluginsPath = Object.keys(plugins).map((pluginName) => plugins[pluginName].pathToPlugin);
 
   // Either use the tsconfig file from the generated app or the one inside the .cache folder
@@ -127,7 +114,6 @@ async function watchAdmin({ appDir, browser, buildDestDir, host, options, plugin
     env,
     options,
     pluginsPath,
-    roots,
     devServer: {
       port,
       client: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.12.0-beta.0",
+  "version": "4.12.0-beta.3",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -40,25 +40,17 @@
     "lint": "run -T eslint ."
   },
   "dependencies": {
-    "@babel/core": "^7.20.12",
-    "@babel/plugin-transform-runtime": "^7.19.6",
-    "@babel/preset-env": "^7.20.2",
-    "@babel/preset-react": "^7.18.6",
-    "@babel/runtime": "^7.20.13",
     "@casl/ability": "^5.4.3",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@strapi/babel-plugin-switch-ee-ce": "4.12.0-beta.0",
-    "@strapi/data-transfer": "4.12.0-beta.0",
-    "@strapi/design-system": "1.8.1",
-    "@strapi/helper-plugin": "4.12.0-beta.0",
-    "@strapi/icons": "1.8.1",
-    "@strapi/permissions": "4.12.0-beta.0",
-    "@strapi/provider-audit-logs-local": "4.12.0-beta.0",
-    "@strapi/typescript-utils": "4.12.0-beta.0",
-    "@strapi/utils": "4.12.0-beta.0",
+    "@strapi/data-transfer": "4.12.0-beta.3",
+    "@strapi/design-system": "1.8.2",
+    "@strapi/helper-plugin": "4.12.0-beta.3",
+    "@strapi/icons": "1.8.2",
+    "@strapi/permissions": "4.12.0-beta.3",
+    "@strapi/provider-audit-logs-local": "4.12.0-beta.3",
+    "@strapi/typescript-utils": "4.12.0-beta.3",
+    "@strapi/utils": "4.12.0-beta.3",
     "axios": "1.4.0",
-    "babel-loader": "^9.1.2",
-    "babel-plugin-styled-components": "2.1.1",
     "bcryptjs": "2.4.3",
     "browserslist": "^4.17.3",
     "browserslist-to-esbuild": "1.2.0",
@@ -116,7 +108,7 @@
     "react-intl": "6.4.1",
     "react-is": "^18.2.0",
     "react-query": "3.39.3",
-    "react-redux": "8.0.5",
+    "react-redux": "8.1.1",
     "react-refresh": "0.14.0",
     "react-router-dom": "5.3.4",
     "react-select": "5.7.0",
@@ -125,7 +117,7 @@
     "reselect": "^4.1.7",
     "rimraf": "3.0.2",
     "sanitize-html": "2.10.0",
-    "semver": "7.5.1",
+    "semver": "7.5.2",
     "sift": "16.0.1",
     "style-loader": "3.3.1",
     "styled-components": "5.3.3",
@@ -162,5 +154,5 @@
       }
     }
   },
-  "gitHead": "b965b428a445bdbc81fb4b70120237f2d48e7647"
+  "gitHead": "e8f4408751727a0104775a23cfa96d4741b1f21b"
 }

package/webpack.alias.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const path = require('path');
 const findRoot = require('find-root');
 
 const aliasExactMatch = [
@@ -38,6 +37,4 @@ module.exports = {
     acc[`${moduleName}$`] = findRoot(require.resolve(moduleName));
     return acc;
   }, {}),
-
-  ee_else_ce: path.resolve(__dirname),
 };

package/webpack.config.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const path = require('path');
-const fse = require('fs-extra');
 const webpack = require('webpack');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const ForkTsCheckerPlugin = require('fork-ts-checker-webpack-plugin');
@@ -16,8 +15,6 @@ const alias = require('./webpack.alias');
 const getClientEnvironment = require('./env');
 const createPluginsExcludePath = require('./utils/create-plugins-exclude-path');
 
-const EE_REGEX = /from.* ['"]ee_else_ce\//;
-
 module.exports = ({
   cacheDir,
   dest,
@@ -30,10 +27,6 @@ module.exports = ({
     adminPath: '/admin/',
     features: [],
   },
-  roots = {
-    eeRoot: './ee/admin',
-    ceRoot: './admin/src',
-  },
   tsConfigFilePath,
 }) => {
   const isProduction = env === 'production';
@@ -99,74 +92,7 @@ module.exports = ({
         },
         {
           test: /\.m?jsx?$/,
-          include: cacheDir,
-          oneOf: [
-            // Use babel-loader for files that distinct the ee and ce code
-            // These files have an import Something from 'ee_else_ce/
-            {
-              test(filePath) {
-                if (!filePath) {
-                  return false;
-                }
-
-                try {
-                  const fileContent = fse.readFileSync(filePath).toString();
-
-                  if (fileContent.match(/from.* ['"]ee_else_ce\//)) {
-                    return true;
-                  }
-
-                  return EE_REGEX.test(fileContent);
-                } catch (e) {
-                  return false;
-                }
-              },
-              use: {
-                loader: require.resolve('babel-loader'),
-                options: {
-                  cacheDirectory: true,
-                  cacheCompression: isProduction,
-                  compact: isProduction,
-                  presets: [
-                    require.resolve('@babel/preset-env'),
-                    require.resolve('@babel/preset-react'),
-                  ],
-                  plugins: [
-                    [
-                      require.resolve('@strapi/babel-plugin-switch-ee-ce'),
-                      {
-                        // Imported this tells the custom plugin where to look for the ee folder
-                        roots,
-                      },
-                    ],
-
-                    [
-                      require.resolve('@babel/plugin-transform-runtime'),
-                      {
-                        helpers: true,
-                        regenerator: true,
-                      },
-                    ],
-                    [require.resolve('babel-plugin-styled-components'), { pure: true }],
-                  ],
-                },
-              },
-            },
-            // Use esbuild-loader for the other files
-            {
-              use: {
-                loader: require.resolve('esbuild-loader'),
-                options: {
-                  loader: 'jsx',
-                  target: buildTarget,
-                },
-              },
-            },
-          ],
-        },
-        {
-          test: /\.m?jsx?$/,
-          include: pluginsPath,
+          include: [cacheDir, ...pluginsPath],
           use: {
             loader: require.resolve('esbuild-loader'),
             options: {