@strapi/strapi 4.10.1 → 4.10.2

package/lib/commands/actions/{build → build-command}/command.js

@@ -11,5 +11,5 @@ module.exports = ({ command }) => {
     .command('build')
     .option('--no-optimization', 'Build the admin app without optimizing assets')
     .description('Build the strapi admin app')
-    .action(getLocalScript('build'));
+    .action(getLocalScript('build-command')); // build-command dir to avoid problems with 'build' being commonly ignored
 };

package/lib/commands/actions/develop/action.js

@@ -106,12 +106,30 @@ const primaryProcess = async ({ distDir, appDir, build, isTSProject, watchAdmin,
   cluster.fork();
 };
 
-const workerProcess = ({ appDir, distDir, watchAdmin, polling, isTSProject }) => {
-  const strapiInstance = strapi({
+const workerProcess = async ({ appDir, distDir, watchAdmin, polling, isTSProject }) => {
+  const strapiInstance = await strapi({
     distDir,
     autoReload: true,
     serveAdminPanel: !watchAdmin,
-  });
+  }).load();
+
+  /**
+   * TypeScript automatic type generation upon dev server restart
+   * Its implementation, configuration and behavior can change in future releases
+   * @experimental
+   */
+  const shouldGenerateTypeScriptTypes = strapiInstance.config.get('typescript.autogenerate', false);
+
+  if (shouldGenerateTypeScriptTypes) {
+    // This is run in an uncaught promise on purpose so that it doesn't block Strapi startup
+    // NOTE: We should probably add some configuration options to manage the file structure output or the verbosity level
+    tsUtils.generators.generateSchemasDefinitions({
+      strapi: strapiInstance,
+      outDir: appDir,
+      verbose: false,
+      silent: true,
+    });
+  }
 
   const adminWatchIgnoreFiles = strapiInstance.config.get('admin.watchIgnoreFiles', []);
   watchFileChanges({
@@ -179,6 +197,7 @@ function watchFileChanges({ appDir, strapiInstance, watchIgnoreFiles, polling })
       '**/*.db*',
       '**/exports/**',
       '**/dist/**',
+      '**/*.d.ts',
       ...watchIgnoreFiles,
     ],
   });

package/lib/commands/actions/telemetry/enable/action.js

@@ -4,7 +4,7 @@ const { resolve } = require('path');
 const fse = require('fs-extra');
 const chalk = require('chalk');
 const fetch = require('node-fetch');
-const { v4: uuidv4 } = require('uuid');
+const { randomUUID } = require('crypto');
 const machineID = require('../../../../utils/machine-id');
 
 const readPackageJSON = async (path) => {
@@ -36,7 +36,7 @@ const generateNewPackageJSON = (packageObj) => {
     return {
       ...packageObj,
       strapi: {
-        uuid: uuidv4(),
+        uuid: randomUUID(),
         telemetryDisabled: false,
       },
     };
@@ -45,7 +45,7 @@ const generateNewPackageJSON = (packageObj) => {
     ...packageObj,
     strapi: {
       ...packageObj.strapi,
-      uuid: packageObj.strapi.uuid ? packageObj.strapi.uuid : uuidv4(),
+      uuid: packageObj.strapi.uuid ? packageObj.strapi.uuid : randomUUID(),
       telemetryDisabled: false,
     },
   };

package/lib/commands/index.js

@@ -5,7 +5,7 @@ const { Command } = require('commander');
 const strapiCommands = {
   'admin/create-user': require('./actions/admin/create-user/command'),
   'admin/reset-user-password': require('./actions/admin/reset-user-password/command'),
-  build: require('./actions/build/command'),
+  build: require('./actions/build-command/command'), // in 'build-command' to avoid problems with 'build' being commonly ignored
   'configuration/dump': require('./actions/configuration/dump/command'),
   'configuration/restore': require('./actions/configuration/restore/command'),
   console: require('./actions/console/command'),

package/lib/core/loaders/apis.js

@@ -5,6 +5,7 @@ const { existsSync } = require('fs-extra');
 const _ = require('lodash');
 const fse = require('fs-extra');
 const { isKebabCase, importDefault } = require('@strapi/utils');
+const { isEmpty } = require('lodash/fp');
 
 const DEFAULT_CONTENT_TYPE = {
   schema: {},
@@ -115,6 +116,10 @@ const loadContentTypes = async (dir) => {
     const contentTypeName = normalizeName(fd.name);
     const contentType = await loadDir(join(dir, fd.name));
 
+    if (isEmpty(contentType) || isEmpty(contentType.schema)) {
+      throw new Error(`Could not load content type found at ${dir}`);
+    }
+
     contentTypes[normalizeName(contentTypeName)] = _.defaults(contentType, DEFAULT_CONTENT_TYPE);
   }
 

package/lib/utils/machine-id.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.10.1",
+  "version": "4.10.2",
   "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",
@@ -81,19 +81,19 @@
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.10.1",
-    "@strapi/data-transfer": "4.10.1",
-    "@strapi/database": "4.10.1",
-    "@strapi/generate-new": "4.10.1",
-    "@strapi/generators": "4.10.1",
-    "@strapi/logger": "4.10.1",
-    "@strapi/permissions": "4.10.1",
-    "@strapi/plugin-content-manager": "4.10.1",
-    "@strapi/plugin-content-type-builder": "4.10.1",
-    "@strapi/plugin-email": "4.10.1",
-    "@strapi/plugin-upload": "4.10.1",
-    "@strapi/typescript-utils": "4.10.1",
-    "@strapi/utils": "4.10.1",
+    "@strapi/admin": "4.10.2",
+    "@strapi/data-transfer": "4.10.2",
+    "@strapi/database": "4.10.2",
+    "@strapi/generate-new": "4.10.2",
+    "@strapi/generators": "4.10.2",
+    "@strapi/logger": "4.10.2",
+    "@strapi/permissions": "4.10.2",
+    "@strapi/plugin-content-manager": "4.10.2",
+    "@strapi/plugin-content-type-builder": "4.10.2",
+    "@strapi/plugin-email": "4.10.2",
+    "@strapi/plugin-upload": "4.10.2",
+    "@strapi/typescript-utils": "4.10.2",
+    "@strapi/utils": "4.10.2",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -132,8 +132,7 @@
     "qs": "6.11.1",
     "resolve-cwd": "3.0.0",
     "semver": "7.3.8",
-    "statuses": "2.0.1",
-    "uuid": "^8.3.2"
+    "statuses": "2.0.1"
   },
   "devDependencies": {
     "supertest": "6.3.3",
@@ -143,5 +142,5 @@
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "23b531cef55c1583ea7d526b2baf2340a3129dad"
+  "gitHead": "a02b19866a3bcc1f30c2395698afae6e9c3e0515"
 }