From 70eec366f9b44f7faeba98a89b4035e4a57802ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20No=C3=ABl?= <petersg83@gmail.com>
Date: Fri, 3 Sep 2021 09:32:01 +0200
Subject: [PATCH] make email, upload, CM and CTB plugins internal

---
 examples/getstarted/package.json                  |  6 +-----
 .../core/loaders/plugins/get-enabled-plugins.js   | 15 +++++++++++++--
 packages/core/strapi/package.json                 |  4 ++++
 packages/generators/app/lib/index.js              |  4 ----
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/examples/getstarted/package.json b/examples/getstarted/package.json
index 4031a6ead4..c6460a56f7 100644
--- a/examples/getstarted/package.json
+++ b/examples/getstarted/package.json
@@ -13,13 +13,9 @@
   },
   "dependencies": {
     "@strapi/admin": "3.6.8",
-    "@strapi/plugin-content-manager": "3.6.8",
-    "@strapi/plugin-content-type-builder": "3.6.8",
     "@strapi/plugin-documentation": "3.6.8",
-    "@strapi/plugin-email": "3.6.8",
     "@strapi/plugin-graphql": "3.6.8",
     "@strapi/plugin-i18n": "3.6.8",
-    "@strapi/plugin-upload": "3.6.8",
     "@strapi/plugin-users-permissions": "3.6.8",
     "@strapi/provider-email-mailgun": "3.6.8",
     "@strapi/provider-upload-aws-s3": "3.6.8",
@@ -40,4 +36,4 @@
     "npm": ">=6.0.0"
   },
   "license": "SEE LICENSE IN LICENSE"
-}
\ No newline at end of file
+}
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 c28851b478..1ad50833b5 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
@@ -3,11 +3,17 @@
 const { dirname, join } = require('path');
 const { statSync, existsSync } = require('fs');
 const _ = require('lodash');
-const { get, has, pick, pickBy, defaultsDeep, map, prop, pipe } = require('lodash/fp');
+const { get, has, pick, pickBy, defaultsDeep, map, prop, pipe, keys } = require('lodash/fp');
 const { isKebabCase } = require('@strapi/utils');
 const loadConfigFile = require('../../app-configuration/load-config-file');
 
 const isStrapiPlugin = info => get('strapi.kind', info) === 'plugin';
+const INTERNAL_PLUGINS = [
+  '@strapi/plugin-content-manager',
+  '@strapi/plugin-content-type-builder',
+  '@strapi/plugin-email',
+  '@strapi/plugin-upload',
+];
 
 const validatePluginName = pluginName => {
   if (!isKebabCase(pluginName)) {
@@ -42,8 +48,13 @@ const toDetailedDeclaration = declaration => {
 };
 
 const getEnabledPlugins = async strapi => {
+  const projectDependencies = [
+    ...keys(strapi.config.get('info.dependencies', {})),
+    ...INTERNAL_PLUGINS,
+  ];
+
   const installedPlugins = {};
-  for (const dep in strapi.config.get('info.dependencies', {})) {
+  for (const dep of projectDependencies) {
     const packagePath = join(dep, 'package.json');
     const packageInfo = require(packagePath);
 
diff --git a/packages/core/strapi/package.json b/packages/core/strapi/package.json
index 035bd65a67..83b26d71d7 100644
--- a/packages/core/strapi/package.json
+++ b/packages/core/strapi/package.json
@@ -19,6 +19,10 @@
     "@strapi/generators": "3.6.8",
     "@strapi/generate-new": "3.6.8",
     "@strapi/logger": "3.6.8",
+    "@strapi/plugin-content-manager": "3.6.8",
+    "@strapi/plugin-content-type-builder": "3.6.8",
+    "@strapi/plugin-email": "3.6.8",
+    "@strapi/plugin-upload": "3.6.8",
     "@strapi/utils": "3.6.8",
     "async": "^2.1.2",
     "boom": "^7.3.0",
diff --git a/packages/generators/app/lib/index.js b/packages/generators/app/lib/index.js
index 60482ef1a4..3857b53949 100644
--- a/packages/generators/app/lib/index.js
+++ b/packages/generators/app/lib/index.js
@@ -52,11 +52,7 @@ module.exports = (projectDirectory, cliArguments) => {
       '@strapi/strapi',
       '@strapi/admin',
       '@strapi/utils',
-      '@strapi/plugin-content-type-builder',
-      '@strapi/plugin-content-manager',
       '@strapi/plugin-users-permissions',
-      '@strapi/plugin-email',
-      '@strapi/plugin-upload',
       '@strapi/plugin-i18n',
     ],
     additionalsDependencies: {},