From 6b93a97ac754785f7894c17263d3b4fd5272454a Mon Sep 17 00:00:00 2001
From: Alexandre Bodin <bodin.alex@gmail.com>
Date: Thu, 20 Mar 2025 08:55:54 +0100
Subject: [PATCH] chore: apply feedback, improve warnings

---
 nx.json                                       |  4 +--
 packages/core/admin/admin/src/StrapiApp.tsx   |  2 --
 .../Settings/pages/Webhooks/CreatePage.tsx    |  6 +----
 packages/core/admin/rollup.config.mjs         |  8 ------
 rollup.utils.mjs                              | 27 +++++++++++++++++++
 5 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/nx.json b/nx.json
index f67f92a946..11c0ebdc1b 100644
--- a/nx.json
+++ b/nx.json
@@ -2,6 +2,7 @@
   "namedInputs": {
     "default": ["{projectRoot}/**/*"],
     "production": [
+      "{workspaceRoot}/rollup.utils.mjs",
       "!{projectRoot}/**/*.test.ts",
       "!{projectRoot}/**/*.test.js",
       "!{projectRoot}/**/*.test.api.js",
@@ -12,8 +13,7 @@
       "!{projectRoot}/jest.config.front.js",
       "!{projectRoot}/tsconfig.eslint.json",
       "!{projectRoot}/.eslintignore",
-      "!{projectRoot}/.eslintrc.js",
-      "!{projectRoot}/rollup.config.mjs"
+      "!{projectRoot}/.eslintrc.js"
     ]
   },
   "cli": {
diff --git a/packages/core/admin/admin/src/StrapiApp.tsx b/packages/core/admin/admin/src/StrapiApp.tsx
index 297be565e9..d398d14402 100644
--- a/packages/core/admin/admin/src/StrapiApp.tsx
+++ b/packages/core/admin/admin/src/StrapiApp.tsx
@@ -330,8 +330,6 @@ class StrapiApp {
         try {
           const { default: data } = await import(`./translations/${locale}.js`);
 
-          console.log(data);
-
           return { data, locale };
         } catch {
           try {
diff --git a/packages/core/admin/admin/src/pages/Settings/pages/Webhooks/CreatePage.tsx b/packages/core/admin/admin/src/pages/Settings/pages/Webhooks/CreatePage.tsx
index 5cd4b3dc23..7b4d02c801 100644
--- a/packages/core/admin/admin/src/pages/Settings/pages/Webhooks/CreatePage.tsx
+++ b/packages/core/admin/admin/src/pages/Settings/pages/Webhooks/CreatePage.tsx
@@ -1,11 +1,7 @@
-import { lazy } from 'react';
-
 import { Page } from '../../../../components/PageHelpers';
 import { useTypedSelector } from '../../../../core/store/hooks';
 
-// import { EditPage } from './EditPage';
-
-const EditPage = lazy(() => import('./EditPage').then((module) => ({ default: module.EditPage })));
+import { EditPage } from './EditPage';
 
 const ProtectedCreatePage = () => {
   const permissions = useTypedSelector(
diff --git a/packages/core/admin/rollup.config.mjs b/packages/core/admin/rollup.config.mjs
index 61210b6ed6..5539607a4d 100644
--- a/packages/core/admin/rollup.config.mjs
+++ b/packages/core/admin/rollup.config.mjs
@@ -22,13 +22,5 @@ export default defineConfig([
       test: './admin/tests/index.ts',
     },
     outDir: './dist/admin',
-    onwarn(warning, warn) {
-      // Suppress the "default is never used" warning for React
-      if (warning.code === 'UNUSED_EXTERNAL_IMPORT' && warning.exporter === 'react') {
-        return;
-      }
-
-      warn(warning); // Log other warnings
-    },
   }),
 ]);
diff --git a/rollup.utils.mjs b/rollup.utils.mjs
index f6a4867d85..e1ebb13244 100644
--- a/rollup.utils.mjs
+++ b/rollup.utils.mjs
@@ -42,6 +42,14 @@ const basePlugins = () => [
   dynamicImportVars({}),
 ];
 
+const isInput = (id, input) => {
+  if (typeof input === 'string') {
+    return id.includes(path.resolve(input));
+  }
+
+  return Object.values(input).some((i) => id.includes(path.resolve(i)));
+};
+
 const baseConfig = (opts = {}) => {
   const { rootDir, outDir = './dist', input = './src/index.ts', ...rest } = opts;
 
@@ -50,6 +58,25 @@ const baseConfig = (opts = {}) => {
     external: isExernal,
     output: baseOutput({ outDir, rootDir }),
     plugins: basePlugins(),
+    onwarn(warning, warn) {
+      if (warning.code === 'MIXED_EXPORTS') {
+        // json files are always mixed exports
+        if (warning?.id?.endsWith('.json')) {
+          return;
+        }
+
+        // we only care about mixed exports in our input files
+        if (warning.id && !isInput(warning.id, input)) {
+          return;
+        }
+      }
+
+      if (warning.code === 'UNUSED_EXTERNAL_IMPORT' && warning.exporter === 'react') {
+        return;
+      }
+
+      warn(warning);
+    },
     ...rest,
   });
 };