From b019507e58c80f8f9331c5ebc5ec2f48aeae9981 Mon Sep 17 00:00:00 2001 From: Yuku Takahashi Date: Wed, 8 Dec 2021 23:10:09 +0900 Subject: [PATCH 1/3] Skip if dependency doesn't export package.json --- .../lib/core/loaders/plugins/get-enabled-plugins.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/core/strapi/lib/core/loaders/plugins/get-enabled-plugins.js b/packages/core/strapi/lib/core/loaders/plugins/get-enabled-plugins.js index 5318d43827..b3a91ac3ac 100644 --- a/packages/core/strapi/lib/core/loaders/plugins/get-enabled-plugins.js +++ b/packages/core/strapi/lib/core/loaders/plugins/get-enabled-plugins.js @@ -60,7 +60,13 @@ const getEnabledPlugins = async strapi => { const installedPlugins = {}; for (const dep in strapi.config.get('info.dependencies', {})) { const packagePath = join(dep, 'package.json'); - const packageInfo = require(packagePath); + let packageInfo + try { + packageInfo = require(packagePath); + } catch { + // Some packages, including firebase-admin, do not export package.json. + continue + } if (isStrapiPlugin(packageInfo)) { validatePluginName(packageInfo.strapi.name); From bcb2745733ac677bdec64aa3dec4eb6cda70cf31 Mon Sep 17 00:00:00 2001 From: Yuku Takahashi Date: Sat, 11 Dec 2021 00:27:32 +0900 Subject: [PATCH 2/3] Apply suggestions from code review --- .../strapi/lib/core/loaders/plugins/get-enabled-plugins.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/strapi/lib/core/loaders/plugins/get-enabled-plugins.js b/packages/core/strapi/lib/core/loaders/plugins/get-enabled-plugins.js index b3a91ac3ac..c66bdf20cd 100644 --- a/packages/core/strapi/lib/core/loaders/plugins/get-enabled-plugins.js +++ b/packages/core/strapi/lib/core/loaders/plugins/get-enabled-plugins.js @@ -60,12 +60,12 @@ const getEnabledPlugins = async strapi => { const installedPlugins = {}; for (const dep in strapi.config.get('info.dependencies', {})) { const packagePath = join(dep, 'package.json'); - let packageInfo + let packageInfo; try { packageInfo = require(packagePath); } catch { // Some packages, including firebase-admin, do not export package.json. - continue + continue; } if (isStrapiPlugin(packageInfo)) { From 13435d25d05a7d2a4030b525f16bc682955b06e4 Mon Sep 17 00:00:00 2001 From: Yuku Takahashi Date: Tue, 14 Dec 2021 08:42:35 +0900 Subject: [PATCH 3/3] Remove unnecessary comment Co-authored-by: Alexandre BODIN --- .../core/strapi/lib/core/loaders/plugins/get-enabled-plugins.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/core/strapi/lib/core/loaders/plugins/get-enabled-plugins.js b/packages/core/strapi/lib/core/loaders/plugins/get-enabled-plugins.js index c66bdf20cd..dae50a0f0e 100644 --- a/packages/core/strapi/lib/core/loaders/plugins/get-enabled-plugins.js +++ b/packages/core/strapi/lib/core/loaders/plugins/get-enabled-plugins.js @@ -64,7 +64,6 @@ const getEnabledPlugins = async strapi => { try { packageInfo = require(packagePath); } catch { - // Some packages, including firebase-admin, do not export package.json. continue; }