@strapi/strapi 4.10.0-beta.1 → 4.10.0

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

@@ -0,0 +1,14 @@
+'use strict';
+
+const { getLocalScript } = require('../../../utils/helpers');
+
+/**
+ * `$ strapi telemetry:enable`
+ * @param {import('../../../../types/core/commands').AddCommandOptions} options
+ */
+module.exports = ({ command }) => {
+  command
+    .command('telemetry:enable')
+    .description('Enable anonymous telemetry and metadata sending to Strapi analytics')
+    .action(getLocalScript('telemetry/enable'));
+};

package/lib/commands/actions/templates/generate/command.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const { getLocalScript } = require('../../../utils/helpers');
+
+/**
+ *`$ strapi templates:generate <directory>`
+ * @param {import('../../../../types/core/commands').AddCommandOptions} options
+ */
+module.exports = ({ command }) => {
+  command
+    .command('templates:generate <directory>')
+    .description('Generate template from Strapi project')
+    .action(getLocalScript('templates/generate'));
+};

package/lib/commands/{transfer/transfer.js → actions/transfer/action.js}

@@ -22,8 +22,8 @@ const {
   exitMessageText,
   abortTransfer,
   getTransferTelemetryPayload,
-} = require('./utils');
-const { exitWith } = require('../utils/helpers');
+} = require('../../utils/data-transfer');
+const { exitWith } = require('../../utils/helpers');
 
 /**
  * @typedef TransferCommandOptions Options given to the CLI transfer command

package/lib/commands/actions/transfer/command.js

@@ -0,0 +1,115 @@
+'use strict';
+
+const inquirer = require('inquirer');
+const { Option } = require('commander');
+const { confirmMessage, forceOption, parseURL } = require('../../utils/commander');
+const {
+  getLocalScript,
+  exitWith,
+  assertUrlHasProtocol,
+  ifOptions,
+} = require('../../utils/helpers');
+const {
+  excludeOption,
+  onlyOption,
+  throttleOption,
+  validateExcludeOnly,
+} = require('../../utils/data-transfer');
+
+/**
+ * `$ strapi transfer`
+ * @param {import('../../../types/core/commands').AddCommandOptions} options
+ */
+module.exports = ({ command }) => {
+  command
+    .command('transfer')
+    .description('Transfer data from one source to another')
+    .allowExcessArguments(false)
+    .addOption(
+      new Option(
+        '--from <sourceURL>',
+        `URL of the remote Strapi instance to get data from`
+      ).argParser(parseURL)
+    )
+    .addOption(new Option('--from-token <token>', `Transfer token for the remote Strapi source`))
+    .addOption(
+      new Option(
+        '--to <destinationURL>',
+        `URL of the remote Strapi instance to send data to`
+      ).argParser(parseURL)
+    )
+    .addOption(new Option('--to-token <token>', `Transfer token for the remote Strapi destination`))
+    .addOption(forceOption)
+    .addOption(excludeOption)
+    .addOption(onlyOption)
+    .addOption(throttleOption)
+    .hook('preAction', validateExcludeOnly)
+    .hook(
+      'preAction',
+      ifOptions(
+        (opts) => !(opts.from || opts.to) || (opts.from && opts.to),
+        () =>
+          exitWith(
+            1,
+            'Exactly one remote source (from) or destination (to) option must be provided'
+          )
+      )
+    )
+    // If --from is used, validate the URL and token
+    .hook(
+      'preAction',
+      ifOptions(
+        (opts) => opts.from,
+        async (thisCommand) => {
+          assertUrlHasProtocol(thisCommand.opts().from, ['https:', 'http:']);
+          if (!thisCommand.opts().fromToken) {
+            const answers = await inquirer.prompt([
+              {
+                type: 'password',
+                message: 'Please enter your transfer token for the remote Strapi source',
+                name: 'fromToken',
+              },
+            ]);
+            if (!answers.fromToken?.length) {
+              exitWith(1, 'No token provided for remote source, aborting transfer.');
+            }
+            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);
+        }
+      )
+    )
+    // If --to is used, validate the URL, token, and confirm restore
+    .hook(
+      'preAction',
+      ifOptions(
+        (opts) => opts.to,
+        async (thisCommand) => {
+          assertUrlHasProtocol(thisCommand.opts().to, ['https:', 'http:']);
+          if (!thisCommand.opts().toToken) {
+            const answers = await inquirer.prompt([
+              {
+                type: 'password',
+                message: 'Please enter your transfer token for the remote Strapi destination',
+                name: 'toToken',
+              },
+            ]);
+            if (!answers.toToken?.length) {
+              exitWith(1, 'No token provided for remote destination, aborting transfer.');
+            }
+            thisCommand.opts().toToken = answers.toToken;
+          }
+
+          await confirmMessage(
+            'The transfer will delete all the remote Strapi assets and its database. Are you sure you want to proceed?',
+            { failMessage: 'Transfer process aborted' }
+          )(thisCommand);
+        }
+      )
+    )
+    .action(getLocalScript('transfer'));
+};

package/lib/commands/{ts/generate-types.js → actions/ts/generate-types/action.js}

@@ -2,9 +2,9 @@
 
 const tsUtils = require('@strapi/typescript-utils');
 
-const strapi = require('../../index');
+const strapi = require('../../../../index');
 
-module.exports = async function ({ outDir, file, verbose, silent }) {
+module.exports = async ({ outDir, file, verbose, silent }) => {
   if (verbose && silent) {
     console.error('You cannot enable verbose and silent flags at the same time, exiting...');
     process.exit(1);

package/lib/commands/actions/ts/generate-types/command.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const { getLocalScript } = require('../../../utils/helpers');
+
+/**
+ * `$ strapi ts:generate-types`
+ * @param {import('../../../../types/core/commands').AddCommandOptions} options
+ */
+module.exports = ({ command }) => {
+  command
+    .command('ts:generate-types')
+    .description(`Generate TypeScript typings for your schemas`)
+    .option(
+      '-o, --out-dir <outDir>',
+      'Specify a relative directory in which the schemas definitions will be generated'
+    )
+    .option('-f, --file <file>', 'Specify a filename to store the schemas definitions')
+    .option('--verbose', `Display more information about the types generation`, false)
+    .option('-s, --silent', `Run the generation silently, without any output`, false)
+    .action(getLocalScript('ts/generate-types'));
+};

package/lib/commands/{uninstall.js → actions/uninstall/action.js}

@@ -5,7 +5,7 @@ const { existsSync, removeSync } = require('fs-extra');
 const ora = require('ora');
 const execa = require('execa');
 const inquirer = require('inquirer');
-const findPackagePath = require('../load/package-path');
+const findPackagePath = require('../../../load/package-path');
 
 module.exports = async (plugins, { deleteFiles }) => {
   const answers = await inquirer.prompt([

package/lib/commands/actions/uninstall/command.js

@@ -0,0 +1,15 @@
+'use strict';
+
+const { getLocalScript } = require('../../utils/helpers');
+
+/**
+ * `$ strapi uninstall`
+ * @param {import('../../../types/core/commands').AddCommandOptions} options
+ */
+module.exports = ({ command }) => {
+  command
+    .command('uninstall [plugins...]')
+    .description('Uninstall a Strapi plugin')
+    .option('-d, --delete-files', 'Delete files', false)
+    .action(getLocalScript('uninstall'));
+};

package/lib/commands/actions/version/command.js

@@ -0,0 +1,19 @@
+'use strict';
+
+/**
+ * `$ strapi version`
+ * @param {import('../../../types/core/commands').AddCommandOptions} options
+ */
+module.exports = ({ command }) => {
+  // load the Strapi package.json to get version and other information
+  const packageJSON = require('../../../../package.json');
+
+  command.version(packageJSON.version, '-v, --version', 'Output the version number');
+  command
+    .command('version')
+    .description('Output the version of Strapi')
+    .action(() => {
+      process.stdout.write(`${packageJSON.version}\n`);
+      process.exit(0);
+    });
+};

package/lib/commands/{watchAdmin.js → actions/watch-admin/action.js}

@@ -3,11 +3,11 @@
 const strapiAdmin = require('@strapi/admin');
 const { getConfigUrls, getAbsoluteServerUrl } = require('@strapi/utils');
 
-const getEnabledPlugins = require('../core/loaders/plugins/get-enabled-plugins');
-const addSlash = require('../utils/addSlash');
-const strapi = require('../index');
+const getEnabledPlugins = require('../../../core/loaders/plugins/get-enabled-plugins');
+const addSlash = require('../../../utils/addSlash');
+const strapi = require('../../../index');
 
-module.exports = async function ({ browser }) {
+module.exports = async ({ browser }) => {
   const appContext = await strapi.compile();
 
   const strapiInstance = strapi({

package/lib/commands/actions/watch-admin/command.js

@@ -0,0 +1,15 @@
+'use strict';
+
+const { getLocalScript } = require('../../utils/helpers');
+
+/**
+ * `$ strapi watch-admin`
+ * @param {import('../../../types/core/commands').AddCommandOptions} options
+ */
+module.exports = ({ command }) => {
+  command
+    .command('watch-admin')
+    .option('--browser <name>', 'Open the browser', true)
+    .description('Start the admin development server')
+    .action(getLocalScript('watch-admin'));
+};

package/lib/commands/index.js

@@ -0,0 +1,66 @@
+'use strict';
+
+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'),
+  'configuration/dump': require('./actions/configuration/dump/command'),
+  'configuration/restore': require('./actions/configuration/restore/command'),
+  console: require('./actions/console/command'),
+  'content-types/list': require('./actions/content-types/list/command'),
+  'controllers/list': require('./actions/controllers/list/command'),
+  develop: require('./actions/develop/command'),
+  export: require('./actions/export/command'),
+  generate: require('./actions/generate/command'),
+  'hooks/list': require('./actions/hooks/list/command'),
+  import: require('./actions/import/command'),
+  install: require('./actions/install/command'),
+  'middlewares/list': require('./actions/middlewares/list/command'),
+  new: require('./actions/new/command'),
+  'policies/list': require('./actions/policies/list/command'),
+  report: require('./actions/report/command'),
+  'routes/list': require('./actions/routes/list/command'),
+  'services/list': require('./actions/services/list/command'),
+  start: require('./actions/start/command'),
+  'telemetry/disable': require('./actions/telemetry/disable/command'),
+  'telemetry/enable': require('./actions/telemetry/enable/command'),
+  'templates/generate': require('./actions/templates/generate/command'),
+  transfer: require('./actions/transfer/command'),
+  'ts/generate-types': require('./actions/ts/generate-types/command'),
+  uninstall: require('./actions/uninstall/command'),
+  version: require('./actions/version/command'),
+  'watch-admin': require('./actions/watch-admin/command'),
+};
+
+const buildStrapiCommand = (argv, command = new Command()) => {
+  // Initial program setup
+  command.storeOptionsAsProperties(false).allowUnknownOption(true);
+
+  // Help command
+  command.helpOption('-h, --help', 'Display help for command');
+  command.addHelpCommand('help [command]', 'Display help for command');
+
+  // Load all commands
+  Object.keys(strapiCommands).forEach((name) => {
+    try {
+      // Add this command to the Commander command object
+      strapiCommands[name]({ command, argv });
+    } catch (e) {
+      console.error(`Failed to load command ${name}`, e);
+    }
+  });
+
+  return command;
+};
+
+const runStrapiCommand = async (argv = process.argv, command = new Command()) => {
+  await buildStrapiCommand(argv, command).parseAsync(argv);
+};
+
+module.exports = {
+  runStrapiCommand,
+  buildStrapiCommand,
+  strapiCommands,
+};

package/lib/commands/{transfer/utils.js → utils/data-transfer.js}

@@ -12,9 +12,9 @@ const {
   createLogger,
 } = require('@strapi/logger');
 const ora = require('ora');
-const { readableBytes, exitWith } = require('../utils/helpers');
+const { readableBytes, exitWith } = require('./helpers');
 const strapi = require('../../index');
-const { getParseListWithChoices, parseInteger } = require('../utils/commander');
+const { getParseListWithChoices, parseInteger } = require('./commander');
 
 const exitMessageText = (process, error = false) => {
   const processCapitalized = process[0].toUpperCase() + process.slice(1);

package/lib/commands/utils/helpers.js

@@ -4,8 +4,10 @@
  * Helper functions for the Strapi CLI
  */
 
-const chalk = require('chalk');
+const { yellow, red, green } = require('chalk');
 const { isString, isArray } = require('lodash/fp');
+const resolveCwd = require('resolve-cwd');
+const { has } = require('lodash/fp');
 
 const bytesPerKb = 1024;
 const sizes = ['B ', 'KB', 'MB', 'GB', 'TB', 'PB'];
@@ -46,9 +48,9 @@ const exitWith = (code, message = undefined, options = {}) => {
 
   const log = (message) => {
     if (code === 0) {
-      logger.log(chalk.green(message));
+      logger.log(green(message));
     } else {
-      logger.error(chalk.red(message));
+      logger.error(red(message));
     }
   };
 
@@ -107,9 +109,58 @@ const ifOptions = (conditionCallback, isMetCallback = () => {}, isNotMetCallback
   };
 };
 
+const assertCwdContainsStrapiProject = (name) => {
+  const logErrorAndExit = () => {
+    console.log(
+      `You need to run ${yellow(
+        `strapi ${name}`
+      )} in a Strapi project. Make sure you are in the right directory.`
+    );
+    process.exit(1);
+  };
+
+  try {
+    const pkgJSON = require(`${process.cwd()}/package.json`);
+    if (!has('dependencies.@strapi/strapi', pkgJSON)) {
+      logErrorAndExit(name);
+    }
+  } catch (err) {
+    logErrorAndExit(name);
+  }
+};
+
+const getLocalScript =
+  (name) =>
+  (...args) => {
+    assertCwdContainsStrapiProject(name);
+
+    const cmdPath = resolveCwd.silent(`@strapi/strapi/lib/commands/actions/${name}/action`);
+    if (!cmdPath) {
+      console.log(
+        `Error loading the local ${yellow(
+          name
+        )} command. Strapi might not be installed in your "node_modules". You may need to run "yarn install".`
+      );
+      process.exit(1);
+    }
+
+    const script = require(cmdPath);
+
+    Promise.resolve()
+      .then(() => {
+        return script(...args);
+      })
+      .catch((error) => {
+        console.error(error);
+        process.exit(1);
+      });
+  };
+
 module.exports = {
   exitWith,
   assertUrlHasProtocol,
   ifOptions,
   readableBytes,
+  getLocalScript,
+  assertCwdContainsStrapiProject,
 };

package/lib/core/registries/custom-fields.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { has } = require('lodash/fp');
+const { has, isPlainObject } = require('lodash/fp');
 
 const ALLOWED_TYPES = [
   'biginteger',
@@ -44,7 +44,7 @@ const customFieldsRegistry = (strapi) => {
           throw new Error(`Custom fields require a 'name' and 'type' key`);
         }
 
-        const { name, plugin, type } = cf;
+        const { name, plugin, type, inputSize } = cf;
         if (!ALLOWED_TYPES.includes(type)) {
           throw new Error(
             `Custom field type: '${type}' is not a valid Strapi type or it can't be used with a Custom Field`
@@ -56,6 +56,23 @@ const customFieldsRegistry = (strapi) => {
           throw new Error(`Custom field name: '${name}' is not a valid object key`);
         }
 
+        // Validate inputSize when provided
+        if (inputSize) {
+          if (
+            !isPlainObject(inputSize) ||
+            !has('default', inputSize) ||
+            !has('isResizable', inputSize)
+          ) {
+            throw new Error(`inputSize should be an object with 'default' and 'isResizable' keys`);
+          }
+          if (![4, 6, 8, 12].includes(inputSize.default)) {
+            throw new Error('Custom fields require a valid default input size');
+          }
+          if (typeof inputSize.isResizable !== 'boolean') {
+            throw new Error('Custom fields should specify if their input is resizable');
+          }
+        }
+
         // When no plugin is specified, or it isn't found in Strapi, default to global
         const uid = strapi.plugin(plugin) ? `plugin::${plugin}.${name}` : `global::${name}`;
 

package/lib/services/metrics/sender.js

@@ -4,7 +4,6 @@ const os = require('os');
 const path = require('path');
 const _ = require('lodash');
 const isDocker = require('is-docker');
-const fetch = require('node-fetch');
 const ciEnv = require('ci-info');
 const { isUsingTypeScriptSync } = require('@strapi/typescript-utils');
 const { env } = require('@strapi/utils');
@@ -82,7 +81,7 @@ module.exports = (strapi) => {
     };
 
     try {
-      const res = await fetch(`${ANALYTICS_URI}/api/v2/track`, reqParams);
+      const res = await strapi.fetch(`${ANALYTICS_URI}/api/v2/track`, reqParams);
       return res.ok;
     } catch (err) {
       return false;

package/lib/services/webhook-runner.js

@@ -6,7 +6,6 @@
 
 const debug = require('debug')('strapi:webhook');
 const _ = require('lodash');
-const fetch = require('node-fetch');
 
 const WorkerQueue = require('./worker-queue');
 
@@ -15,12 +14,13 @@ const defaultConfiguration = {
 };
 
 class WebhookRunner {
-  constructor({ eventHub, logger, configuration = {} }) {
-    debug('Initialized webhook runer');
+  constructor({ eventHub, logger, configuration = {}, fetch }) {
+    debug('Initialized webhook runner');
     this.eventHub = eventHub;
     this.logger = logger;
     this.webhooksMap = new Map();
     this.listeners = new Map();
+    this.fetch = fetch;
 
     if (typeof configuration !== 'object') {
       throw new Error(
@@ -76,7 +76,7 @@ class WebhookRunner {
   run(webhook, event, info = {}) {
     const { url, headers } = webhook;
 
-    return fetch(url, {
+    return this.fetch(url, {
       method: 'post',
       body: JSON.stringify({
         event,

package/lib/types/core/commands/index.d.ts

@@ -0,0 +1,6 @@
+import { Command } from 'commander';
+
+export type AddCommandOptions = {
+  command: Command;
+  argv: Record<number, string>;
+};

package/lib/utils/fetch.js

@@ -0,0 +1,23 @@
+'use strict';
+
+const nodeFetch = require('node-fetch');
+const HttpsProxyAgent = require('https-proxy-agent');
+
+function createStrapiFetch(strapi) {
+  function fetch(url, options) {
+    return nodeFetch(url, {
+      ...(fetch.agent ? { agent: fetch.agent } : {}),
+      ...options,
+    });
+  }
+
+  const { globalProxy: proxy } = strapi.config.get('server');
+
+  if (proxy) {
+    fetch.agent = new HttpsProxyAgent(proxy);
+  }
+
+  return fetch;
+}
+
+module.exports = createStrapiFetch;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "4.10.0-beta.1",
+  "version": "4.10.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",
@@ -81,19 +81,19 @@
   "dependencies": {
     "@koa/cors": "3.4.3",
     "@koa/router": "10.1.1",
-    "@strapi/admin": "4.10.0-beta.1",
-    "@strapi/data-transfer": "4.10.0-beta.1",
-    "@strapi/database": "4.10.0-beta.1",
-    "@strapi/generate-new": "4.10.0-beta.1",
-    "@strapi/generators": "4.10.0-beta.1",
-    "@strapi/logger": "4.10.0-beta.1",
-    "@strapi/permissions": "4.10.0-beta.1",
-    "@strapi/plugin-content-manager": "4.10.0-beta.1",
-    "@strapi/plugin-content-type-builder": "4.10.0-beta.1",
-    "@strapi/plugin-email": "4.10.0-beta.1",
-    "@strapi/plugin-upload": "4.10.0-beta.1",
-    "@strapi/typescript-utils": "4.10.0-beta.1",
-    "@strapi/utils": "4.10.0-beta.1",
+    "@strapi/admin": "4.10.0",
+    "@strapi/data-transfer": "4.10.0",
+    "@strapi/database": "4.10.0",
+    "@strapi/generate-new": "4.10.0",
+    "@strapi/generators": "4.10.0",
+    "@strapi/logger": "4.10.0",
+    "@strapi/permissions": "4.10.0",
+    "@strapi/plugin-content-manager": "4.10.0",
+    "@strapi/plugin-content-type-builder": "4.10.0",
+    "@strapi/plugin-email": "4.10.0",
+    "@strapi/plugin-upload": "4.10.0",
+    "@strapi/typescript-utils": "4.10.0",
+    "@strapi/utils": "4.10.0",
     "bcryptjs": "2.4.3",
     "boxen": "5.1.2",
     "chalk": "4.1.2",
@@ -109,6 +109,7 @@
     "fs-extra": "10.0.0",
     "glob": "7.2.0",
     "http-errors": "1.8.1",
+    "https-proxy-agent": "5.0.1",
     "inquirer": "8.2.5",
     "is-docker": "2.2.1",
     "koa": "2.13.4",
@@ -136,11 +137,11 @@
   },
   "devDependencies": {
     "supertest": "6.3.3",
-    "typescript": "4.6.2"
+    "typescript": "5.0.4"
   },
   "engines": {
     "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "95d581b31bee464af42e5d8db408fa578d8532c7"
+  "gitHead": "9b5519778faaedfb837879f9c6f7e28fdfd6750d"
 }

package/lib/commands/build.js

@@ -1,18 +0,0 @@
-'use strict';
-
-const strapi = require('..');
-const { buildAdmin } = require('./builders');
-
-/**
- * `$ strapi build`
- */
-module.exports = async ({ optimization, forceBuild = true }) => {
-  const { appDir, distDir } = await strapi.compile();
-
-  await buildAdmin({
-    forceBuild,
-    optimization,
-    buildDestDir: distDir,
-    srcDir: appDir,
-  });
-};