@strapi/strapi 4.0.4 → 4.0.5

package/lib/commands/develop.js

@@ -22,7 +22,7 @@ module.exports = async function({ build, watchAdmin, polling, browser }) {
   const logger = createLogger(config.logger, {});
 
   try {
-    if (cluster.isMaster) {
+    if (cluster.isMaster || cluster.isPrimary) {
       const serveAdminPanel = getOr(true, 'admin.serveAdminPanel')(config);
 
       const buildExists = fs.existsSync(path.join(dir, 'build'));

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

@@ -55,17 +55,6 @@ const applyUserExtension = async plugins => {
   }
 };
 
-const formatContentTypes = plugins => {
-  for (const pluginName in plugins) {
-    const plugin = plugins[pluginName];
-    for (const contentTypeName in plugin.contentTypes) {
-      const ctSchema = plugin.contentTypes[contentTypeName].schema;
-      ctSchema.plugin = pluginName;
-      ctSchema.uid = `plugin::${pluginName}.${ctSchema.singularName}`;
-    }
-  }
-};
-
 const applyUserConfig = async plugins => {
   const userPluginsConfig = await getUserPluginsConfig();
 
@@ -111,7 +100,6 @@ const loadPlugins = async strapi => {
   // TODO: validate plugin format
   await applyUserConfig(plugins);
   await applyUserExtension(plugins);
-  formatContentTypes(plugins);
 
   for (const pluginName in plugins) {
     strapi.container.get('plugins').add(pluginName, plugins[pluginName]);

package/lib/services/metrics/sender.js

@@ -3,10 +3,10 @@
 const os = require('os');
 const _ = require('lodash');
 const isDocker = require('is-docker');
-const { machineIdSync } = require('node-machine-id');
 const fetch = require('node-fetch');
 const ciEnv = require('ci-info');
 const ee = require('../../utils/ee');
+const machineID = require('../../utils/machine-id');
 const stringifyDeep = require('./stringify-deep');
 
 const defaultQueryOpts = {
@@ -33,7 +33,7 @@ const addPackageJsonStrapiMetadata = (metadata, strapi) => {
  */
 module.exports = strapi => {
   const { uuid } = strapi.config;
-  const deviceId = machineIdSync();
+  const deviceId = machineID();
   const isEE = strapi.EE === true && ee.isEE === true;
 
   const anonymous_metadata = {

package/lib/services/server/policy.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const { propOr } = require('lodash/fp');
-const { ForbiddenError } = require('@strapi/utils').errors;
+const { PolicyError } = require('@strapi/utils').errors;
 const { policy: policyUtils } = require('@strapi/utils');
 
 const getPoliciesConfig = propOr([], 'config.policies');
@@ -17,7 +17,7 @@ const resolvePolicies = route => {
       const result = await handler(context, config, { strapi });
 
       if (![true, undefined].includes(result)) {
-        throw new ForbiddenError('Policies failed.');
+        throw new PolicyError();
       }
     }
 

package/lib/utils/machine-id.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const { machineIdSync } = require('node-machine-id');
+const uuid = require('uuid');
+
+module.exports = () => {
+  try {
+    const deviceId = machineIdSync();
+    return deviceId;
+  } catch (error) {
+    const deviceId = uuid();
+    return deviceId;
+  }
+};

package/lib/utils/success.js

@@ -5,7 +5,7 @@
  */
 
 const fetch = require('node-fetch');
-const { machineIdSync } = require('node-machine-id');
+const machineID = require('./machine-id');
 
 /*
  * No need to worry about this file, we only retrieve anonymous data here.
@@ -21,7 +21,7 @@ try {
       method: 'POST',
       body: JSON.stringify({
         event: 'didInstallStrapi',
-        deviceId: machineIdSync(),
+        deviceId: machineID(),
       }),
       headers: { 'Content-Type': 'application/json' },
     }).catch(() => {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "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",
@@ -80,16 +80,16 @@
   "dependencies": {
     "@koa/cors": "3.1.0",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.0.4",
-    "@strapi/database": "4.0.4",
-    "@strapi/generate-new": "4.0.4",
-    "@strapi/generators": "4.0.4",
-    "@strapi/logger": "4.0.4",
-    "@strapi/plugin-content-manager": "4.0.4",
-    "@strapi/plugin-content-type-builder": "4.0.4",
-    "@strapi/plugin-email": "4.0.4",
-    "@strapi/plugin-upload": "4.0.4",
-    "@strapi/utils": "4.0.4",
+    "@strapi/admin": "4.0.5",
+    "@strapi/database": "4.0.5",
+    "@strapi/generate-new": "4.0.5",
+    "@strapi/generators": "4.0.5",
+    "@strapi/logger": "4.0.5",
+    "@strapi/plugin-content-manager": "4.0.5",
+    "@strapi/plugin-content-type-builder": "4.0.5",
+    "@strapi/plugin-email": "4.0.5",
+    "@strapi/plugin-upload": "4.0.5",
+    "@strapi/utils": "4.0.5",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -126,7 +126,8 @@
     "qs": "6.10.1",
     "resolve-cwd": "3.0.0",
     "semver": "7.3.5",
-    "statuses": "2.0.1"
+    "statuses": "2.0.1",
+    "uuid": "^3.3.2"
   },
   "devDependencies": {
     "supertest": "^6.1.6"
@@ -135,5 +136,5 @@
     "node": ">=12.22.0 <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "d81919ac2272948b3f5d3b25a4cf8cc7b6994460"
+  "gitHead": "45020eee065af8917011cc43398f95c4c624d6ad"
 }