From c7cc3d72e3097aeadede631697207be2daa8e1cd Mon Sep 17 00:00:00 2001
From: Tim Izzo <tim@octree.ch>
Date: Mon, 17 Oct 2022 14:51:19 +0200
Subject: [PATCH] Move import-default to utils package

---
 .../core/strapi/lib/core/app-configuration/load-config-file.js  | 2 +-
 packages/core/strapi/lib/services/server/middleware.js          | 2 +-
 packages/core/strapi/lib/utils/index.js                         | 2 --
 packages/core/{strapi/lib/utils => utils/lib}/import-default.js | 0
 packages/core/utils/lib/index.js                                | 2 ++
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/core/{strapi/lib/utils => utils/lib}/import-default.js (100%)

diff --git a/packages/core/strapi/lib/core/app-configuration/load-config-file.js b/packages/core/strapi/lib/core/app-configuration/load-config-file.js
index f2b90cffbf..a12801991b 100644
--- a/packages/core/strapi/lib/core/app-configuration/load-config-file.js
+++ b/packages/core/strapi/lib/core/app-configuration/load-config-file.js
@@ -4,7 +4,7 @@ const path = require('path');
 const fs = require('fs');
 const { templateConfiguration, env } = require('@strapi/utils');
 
-const importDefault = require('../../utils/import-default');
+const importDefault = require('@strapi/utils/lib/import-default');
 
 const loadJsFile = (file) => {
   try {
diff --git a/packages/core/strapi/lib/services/server/middleware.js b/packages/core/strapi/lib/services/server/middleware.js
index 96600f5b7f..49ef7230ae 100644
--- a/packages/core/strapi/lib/services/server/middleware.js
+++ b/packages/core/strapi/lib/services/server/middleware.js
@@ -2,7 +2,7 @@
 
 const path = require('path');
 const { propOr, isArray, isNil } = require('lodash/fp');
-const importDefault = require('../../utils/import-default');
+const importDefault = require('@strapi/utils/lib/import-default');
 
 const getMiddlewareConfig = propOr([], 'config.middlewares');
 
diff --git a/packages/core/strapi/lib/utils/index.js b/packages/core/strapi/lib/utils/index.js
index 5a5a1006c2..6d4ea2a031 100644
--- a/packages/core/strapi/lib/utils/index.js
+++ b/packages/core/strapi/lib/utils/index.js
@@ -3,11 +3,9 @@
 const openBrowser = require('./open-browser');
 const isInitialized = require('./is-initialized');
 const getDirs = require('./get-dirs');
-const importDefault = require('./import-default');
 
 module.exports = {
   isInitialized,
   openBrowser,
   getDirs,
-  importDefault,
 };
diff --git a/packages/core/strapi/lib/utils/import-default.js b/packages/core/utils/lib/import-default.js
similarity index 100%
rename from packages/core/strapi/lib/utils/import-default.js
rename to packages/core/utils/lib/import-default.js
diff --git a/packages/core/utils/lib/index.js b/packages/core/utils/lib/index.js
index f09547a5d0..094e562463 100644
--- a/packages/core/utils/lib/index.js
+++ b/packages/core/utils/lib/index.js
@@ -38,6 +38,7 @@ const pagination = require('./pagination');
 const sanitize = require('./sanitize');
 const traverseEntity = require('./traverse-entity');
 const pipeAsync = require('./pipe-async');
+const importDefault = require('./import-default');
 
 module.exports = {
   yup,
@@ -79,4 +80,5 @@ module.exports = {
   errors,
   validateYupSchema,
   validateYupSchemaSync,
+  importDefault,
 };