Merge pull request #14280 from 5ika/main

Allow ESM module for custom middlewares

packages/core/strapi/lib/core/app-configuration/load-config-file.js

@@ -2,9 +2,7 @@
 
 const path = require('path');
 const fs = require('fs');
-const { templateConfiguration, env } = require('@strapi/utils');
-
-const importDefault = require('../../utils/import-default');
+const { templateConfiguration, env, importDefault } = require('@strapi/utils');
 
 const loadJsFile = (file) => {
   try {

packages/core/strapi/lib/core/loaders/apis.js

@@ -4,8 +4,7 @@ const { join, extname, basename } = require('path');
 const { existsSync } = require('fs-extra');
 const _ = require('lodash');
 const fse = require('fs-extra');
-const { isKebabCase } = require('@strapi/utils');
-const { importDefault } = require('../../utils');
+const { isKebabCase, importDefault } = require('@strapi/utils');
 
 const DEFAULT_CONTENT_TYPE = {
   schema: {},

packages/core/strapi/lib/core/loaders/middlewares.js

@@ -2,8 +2,7 @@
 
 const { join, extname, basename } = require('path');
 const fse = require('fs-extra');
-
-const { importDefault } = require('../../utils');
+const { importDefault } = require('@strapi/utils');
 
 // TODO:: allow folders with index.js inside for bigger policies
 module.exports = async function loadMiddlewares(strapi) {

packages/core/strapi/lib/core/loaders/policies.js

@@ -2,8 +2,7 @@
 
 const { join, extname, basename } = require('path');
 const fse = require('fs-extra');
-
-const { importDefault } = require('../../utils');
+const { importDefault } = require('@strapi/utils');
 
 // TODO:: allow folders with index.js inside for bigger policies
 module.exports = async function loadPolicies(strapi) {

packages/core/strapi/lib/core/loaders/src-index.js

@@ -2,9 +2,7 @@
 
 const { resolve } = require('path');
 const { statSync, existsSync } = require('fs');
-const { yup } = require('@strapi/utils');
-
-const { importDefault } = require('../../utils');
+const { yup, importDefault } = require('@strapi/utils');
 
 const srcSchema = yup
   .object()

packages/core/strapi/lib/services/server/middleware.js

@@ -2,6 +2,7 @@
 
 const path = require('path');
 const { propOr, isArray, isNil } = require('lodash/fp');
+const { importDefault } = require('@strapi/utils');
 
 const getMiddlewareConfig = propOr([], 'config.middlewares');
 
@@ -119,7 +120,7 @@ const resolveCustomMiddleware = (resolve, strapi) => {
   }
 
   try {
-    return require(modulePath);
+    return importDefault(modulePath);
   } catch (err) {
     throw new Error(`Could not load middleware "${modulePath}".`);
   }

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,
 };

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,
 };