@strapi/strapi 4.9.0-beta.2 → 4.9.0

package/.eslintignore

@@ -0,0 +1,2 @@
+node_modules/
+.eslintrc.js

package/.eslintrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  root: true,
+  extends: ['custom/back'],
+};

package/bin/strapi.js

@@ -322,6 +322,11 @@ program
           }
           thisCommand.opts().fromToken = answers.fromToken;
         }
+
+        await confirmMessage(
+          'The transfer will delete all the local Strapi assets and its database. Are you sure you want to proceed?',
+          { failMessage: 'Transfer process aborted' }
+        )(thisCommand);
       }
     )
   )
@@ -347,7 +352,7 @@ program
         }
 
         await confirmMessage(
-          'The transfer will delete all data in the remote database and media files. Are you sure you want to proceed?',
+          'The transfer will delete all the remote Strapi assets and its database. Are you sure you want to proceed?',
           { failMessage: 'Transfer process aborted' }
         )(thisCommand);
       }
@@ -451,7 +456,7 @@ program
   .hook(
     'preAction',
     confirmMessage(
-      'The import will delete all data in your database and media files. Are you sure you want to proceed?',
+      'The import will delete all assets and data in your database. Are you sure you want to proceed?',
       { failMessage: 'Import process aborted' }
     )
   )

package/ee/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { pick } = require('lodash/fp');
+const { pick, isEqual } = require('lodash/fp');
 
 const { readLicense, verifyLicense, fetchLicense, LicenseCheckError } = require('./license');
 const { shiftCronExpression } = require('../lib/utils/cron');
@@ -13,10 +13,31 @@ const ee = {
 };
 
 const disable = (message) => {
+  // Prevent emitting ee.disable if it was already disabled
+  const shouldEmitEvent = ee.enabled !== false;
+
   ee.logger?.warn(`${message} Switching to CE.`);
   // Only keep the license key for potential re-enabling during a later check
   ee.licenseInfo = pick('licenseKey', ee.licenseInfo);
+
   ee.enabled = false;
+
+  if (shouldEmitEvent) {
+    // Notify EE features that they should be disabled
+    strapi.eventHub.emit('ee.disable');
+  }
+};
+
+const enable = () => {
+  // Prevent emitting ee.enable if it was already enabled
+  const shouldEmitEvent = ee.enabled !== true;
+
+  ee.enabled = true;
+
+  if (shouldEmitEvent) {
+    // Notify EE features that they should be disabled
+    strapi.eventHub.emit('ee.enable');
+  }
 };
 
 let initialized = false;
@@ -41,7 +62,7 @@ const init = (licenseDir, logger) => {
 
     if (license) {
       ee.licenseInfo = verifyLicense(license);
-      ee.enabled = true;
+      enable();
     }
   } catch (error) {
     disable(error.message);
@@ -89,8 +110,22 @@ const onlineUpdate = async ({ strapi }) => {
 
     if (license) {
       try {
-        ee.licenseInfo = verifyLicense(license);
+        // Verify license and check if its info changed
+        const newLicenseInfo = verifyLicense(license);
+        const licenseInfoChanged =
+          !isEqual(newLicenseInfo.features, ee.licenseInfo.features) ||
+          newLicenseInfo.seats !== ee.licenseInfo.seats ||
+          newLicenseInfo.type !== ee.licenseInfo.type;
+
+        // Store the new license info
+        ee.licenseInfo = newLicenseInfo;
+        const wasEnabled = ee.enabled;
         validateInfo();
+
+        // Notify EE features
+        if (licenseInfoChanged && wasEnabled) {
+          strapi.eventHub.emit('ee.update');
+        }
       } catch (error) {
         disable(error.message);
       }
@@ -125,7 +160,7 @@ const validateInfo = () => {
     return disable('License expired.');
   }
 
-  ee.enabled = true;
+  enable();
 };
 
 const checkLicense = async ({ strapi }) => {

package/ee/license.js

@@ -10,7 +10,9 @@ const machineId = require('../lib/utils/machine-id');
 const DEFAULT_FEATURES = {
   bronze: [],
   silver: [],
-  gold: ['sso', { name: 'audit-logs', options: { retentionDays: 90 } }],
+  // Set a null retention duration to allow the user to override it
+  // The default of 90 days is set in the audit logs service
+  gold: ['sso', { name: 'audit-logs', options: { retentionDays: null } }],
 };
 
 const publicKey = fs.readFileSync(join(__dirname, 'resources/key.pub'));

package/lib/core/loaders/plugins/index.js

@@ -2,7 +2,7 @@
 
 const { join } = require('path');
 const fse = require('fs-extra');
-const { defaultsDeep, getOr, get } = require('lodash/fp');
+const { defaultsDeep, defaults, getOr, get } = require('lodash/fp');
 const { env } = require('@strapi/utils');
 const loadConfigFile = require('../../app-configuration/load-config-file');
 const loadFiles = require('../../../load/load-files');
@@ -101,7 +101,12 @@ const loadPlugins = async (strapi) => {
     }
 
     const pluginServer = loadConfigFile(serverEntrypointPath);
-    plugins[pluginName] = defaultsDeep(defaultPlugin, pluginServer);
+    plugins[pluginName] = {
+      ...defaultPlugin,
+      ...pluginServer,
+      config: defaults(defaultPlugin.config, pluginServer.config),
+      routes: pluginServer.routes ?? defaultPlugin.routes,
+    };
   }
 
   // TODO: validate plugin format

package/lib/core-api/controller/collection-type.js

@@ -22,7 +22,6 @@ const createCollectionTypeController = ({ contentType }) => {
       const sanitizedQuery = await this.sanitizeQuery(ctx);
       const { results, pagination } = await strapi.service(uid).find(sanitizedQuery);
       const sanitizedResults = await this.sanitizeOutput(results, ctx);
-
       return this.transformResponse(sanitizedResults, { pagination });
     },
 

package/lib/core-api/controller/index.js

@@ -18,7 +18,7 @@ const createController = ({ contentType }) => {
       return transformResponse(data, meta, { contentType });
     },
 
-    sanitizeOutput(data, ctx) {
+    async sanitizeOutput(data, ctx) {
       const auth = getAuthFromKoaContext(ctx);
 
       return sanitize.contentAPI.output(data, contentType, { auth });

package/lib/factories.js

@@ -45,13 +45,12 @@ const createCoreService = (uid, cfg = {}) => {
 };
 
 const createCoreRouter = (uid, cfg = {}) => {
-  const { prefix, config = {}, only, except } = cfg;
+  const { prefix, config = {}, only, except, type } = cfg;
   let routes;
 
   return {
-    get prefix() {
-      return prefix;
-    },
+    type,
+    prefix,
     get routes() {
       if (!routes) {
         const contentType = strapi.contentType(uid);

package/lib/middlewares/logger.js

@@ -1,21 +1,5 @@
 'use strict';
 
-/* eslint-disable no-nested-ternary */
-
-const chalk = require('chalk');
-
-const codeToColor = (code) => {
-  return code >= 500
-    ? chalk.red(code)
-    : code >= 400
-    ? chalk.yellow(code)
-    : code >= 300
-    ? chalk.cyan(code)
-    : code >= 200
-    ? chalk.green(code)
-    : code;
-};
-
 /**
  * @type {import('./').MiddlewareFactory}
  */
@@ -25,6 +9,6 @@ module.exports = (_, { strapi }) => {
     await next();
     const delta = Math.ceil(Date.now() - start);
 
-    strapi.log.http(`${ctx.method} ${ctx.url} (${delta} ms) ${codeToColor(ctx.status)}`);
+    strapi.log.http(`${ctx.method} ${ctx.url} (${delta} ms) ${ctx.status}`);
   };
 };

package/lib/services/errors.js

@@ -1,8 +1,14 @@
 'use strict';
 
 const createError = require('http-errors');
-const { NotFoundError, UnauthorizedError, ForbiddenError, PayloadTooLargeError, RateLimitError } =
-  require('@strapi/utils').errors;
+const {
+  NotFoundError,
+  UnauthorizedError,
+  ForbiddenError,
+  PayloadTooLargeError,
+  RateLimitError,
+  NotImplementedError,
+} = require('@strapi/utils').errors;
 
 const mapErrorsAndStatus = [
   {
@@ -25,6 +31,10 @@ const mapErrorsAndStatus = [
     classError: RateLimitError,
     status: 429,
   },
+  {
+    classError: NotImplementedError,
+    status: 501,
+  },
 ];
 
 const formatApplicationError = (error) => {

package/lib/services/event-hub.js

@@ -35,7 +35,12 @@ module.exports = function createEventHub() {
     },
 
     unsubscribe(subscriber) {
-      subscribers.splice(subscribers.indexOf(subscriber), 1);
+      const subscriberIndex = subscribers.indexOf(subscriber);
+
+      // Only remove the subscriber if it exists
+      if (subscriberIndex >= 0) {
+        subscribers.splice(subscriberIndex, 1);
+      }
     },
 
     on(eventName, listener) {

package/lib/services/metrics/index.js

@@ -17,6 +17,7 @@ const LIMITED_EVENTS = [
   'didSaveMediaWithCaption',
   'didDisableResponsiveDimensions',
   'didEnableResponsiveDimensions',
+  'didInitializePluginUpload',
 ];
 
 const createTelemetryInstance = (strapi) => {

package/lib/services/server/register-routes.js

@@ -69,7 +69,7 @@ const registerPluginRoutes = (strapi) => {
     } else {
       _.forEach(plugin.routes, (router) => {
         router.type = router.type || 'admin';
-        router.prefix = `/${pluginName}`;
+        router.prefix = router.prefix || `/${pluginName}`;
         router.routes.forEach((route) => {
           generateRouteScope(route);
           route.info = { pluginName };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.9.0-beta.2",
+  "version": "4.9.0",
   "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite",
   "keywords": [
     "strapi",
@@ -66,9 +66,7 @@
   ],
   "main": "./lib",
   "types": "./lib/index.d.ts",
-  "bin": {
-    "strapi": "./bin/strapi.js"
-  },
+  "bin": "./bin/strapi.js",
   "directories": {
     "lib": "./lib",
     "bin": "./bin",
@@ -76,24 +74,26 @@
   },
   "scripts": {
     "postinstall": "node lib/utils/success.js",
-    "test:unit": "jest --verbose"
+    "test:unit": "jest",
+    "test:unit:watch": "jest --watch",
+    "lint": "eslint ."
   },
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.9.0-beta.2",
-    "@strapi/data-transfer": "4.9.0-beta.2",
-    "@strapi/database": "4.9.0-beta.2",
-    "@strapi/generate-new": "4.9.0-beta.2",
-    "@strapi/generators": "4.9.0-beta.2",
-    "@strapi/logger": "4.9.0-beta.2",
-    "@strapi/permissions": "4.9.0-beta.2",
-    "@strapi/plugin-content-manager": "4.9.0-beta.2",
-    "@strapi/plugin-content-type-builder": "4.9.0-beta.2",
-    "@strapi/plugin-email": "4.9.0-beta.2",
-    "@strapi/plugin-upload": "4.9.0-beta.2",
-    "@strapi/typescript-utils": "4.9.0-beta.2",
-    "@strapi/utils": "4.9.0-beta.2",
+    "@strapi/admin": "4.9.0",
+    "@strapi/data-transfer": "4.9.0",
+    "@strapi/database": "4.9.0",
+    "@strapi/generate-new": "4.9.0",
+    "@strapi/generators": "4.9.0",
+    "@strapi/logger": "4.9.0",
+    "@strapi/permissions": "4.9.0",
+    "@strapi/plugin-content-manager": "4.9.0",
+    "@strapi/plugin-content-type-builder": "4.9.0",
+    "@strapi/plugin-email": "4.9.0",
+    "@strapi/plugin-upload": "4.9.0",
+    "@strapi/typescript-utils": "4.9.0",
+    "@strapi/utils": "4.9.0",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -128,7 +128,7 @@
     "open": "8.4.0",
     "ora": "5.4.1",
     "package-json": "7.0.0",
-    "qs": "6.11.0",
+    "qs": "6.11.1",
     "resolve-cwd": "3.0.0",
     "semver": "7.3.8",
     "statuses": "2.0.1",
@@ -142,5 +142,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "d893ead642592a15a95fefb71c544aaabe4db20b"
+  "gitHead": "ffe3f4621ccc968ce56fda9a8317ec30d4bad205"
 }