@strapi/strapi 4.14.0-beta.0 → 4.14.0

package/lib/commands/builders/tasks/vite.js

@@ -1,144 +0,0 @@
-'use strict';
-
-const path = require('path');
-const { build, createLogger } = require('vite');
-const react = require('@vitejs/plugin-react');
-const ora = require('ora');
-const chalk = require('chalk');
-
-/**
- * @internal
- *
- * @type {(ctx: import('../packages').BuildContext, task: ViteTask) => import('vite').UserConfig}
- */
-const resolveViteConfig = (ctx, task) => {
-  const { cwd, distPath, targets, external, extMap, pkg } = ctx;
-  const { entries, format, output, runtime } = task;
-  const outputExt = extMap[pkg.type || 'commonjs'][format];
-  const outDir = path.relative(cwd, distPath);
-
-  const customLogger = createLogger();
-  customLogger.warn = (msg) => ctx.logger.warn(msg);
-  customLogger.warnOnce = (msg) => ctx.logger.warn(msg);
-  customLogger.error = (msg) => ctx.logger.error(msg);
-
-  /**
-   * @type {import('vite').InlineConfig}
-   */
-  const config = {
-    configFile: false,
-    root: cwd,
-    mode: 'production',
-    logLevel: 'warn',
-    clearScreen: false,
-    customLogger,
-    build: {
-      sourcemap: true,
-      /**
-       * The task runner will clear this for us
-       */
-      emptyOutDir: false,
-      target: targets[runtime],
-      outDir,
-      lib: {
-        entry: entries.map((e) => e.entry),
-        formats: [format],
-        /**
-         * this enforces the file name to match what the output we've
-         * determined from the package.json exports.
-         */
-        fileName() {
-          return `${path.relative(outDir, output).replace(/\.[^/.]+$/, '')}${outputExt}`;
-        },
-      },
-      rollupOptions: {
-        external,
-        output: {
-          chunkFileNames() {
-            const parts = outputExt.split('.');
-
-            if (parts.length === 3) {
-              return `_chunks/[name]-[hash].${parts[2]}`;
-            }
-
-            return `_chunks/[name]-[hash]${outputExt}`;
-          },
-        },
-      },
-    },
-    /**
-     * We _could_ omit this, but we'd need to introduce the
-     * concept of a custom config for the scripts straight away
-     *
-     * and since this is isolated to the Strapi CLI, we can make
-     * some assumptions and add some weight until we move it outside.
-     */
-    plugins: runtime === 'node' ? [] : [react()],
-  };
-
-  return config;
-};
-
-/**
- * @typedef {Object} ViteTaskEntry
- * @property {string} path
- * @property {string} entry
- */
-
-/**
- * @typedef {Object} ViteTask
- * @property {"build:js"} type
- * @property {ViteTaskEntry[]} entries
- * @property {string} format
- * @property {string} output
- * @property {keyof import('../packages').Targets} runtime
- */
-
-/**
- * @type {import('./index').TaskHandler<ViteTask>}
- */
-const viteTask = {
-  _spinner: null,
-  print(ctx, task) {
-    const targetLines = [
-      '   target:',
-      ...ctx.targets[task.runtime].map((t) => chalk.cyan(`    - ${t}`)),
-    ];
-    const entries = [
-      '   entries:',
-      ...task.entries.map((entry) =>
-        [
-          `    – `,
-          chalk.green(`${path.join(ctx.pkg.name, entry.path)}: `),
-          `${chalk.cyan(entry.entry)} ${chalk.gray('→')} ${chalk.cyan(task.output)}`,
-        ].join('')
-      ),
-    ];
-
-    this._spinner = ora(`Building javascript files:\n`).start();
-
-    ctx.logger.log([`  format: ${task.format}`, ...targetLines, ...entries].join('\n'));
-  },
-  async run(ctx, task) {
-    try {
-      const config = resolveViteConfig(ctx, task);
-      ctx.logger.debug('Vite config: \n', config);
-      await build(config);
-      await this.success(ctx, task);
-    } catch (err) {
-      this.fail(ctx, task, err);
-    }
-  },
-  async success() {
-    this._spinner.succeed('Built javascript files');
-  },
-  async fail(ctx, task, err) {
-    this._spinner.fail('Failed to build javascript files');
-
-    throw err;
-  },
-};
-
-module.exports = {
-  viteTask,
-};

package/lib/commands/builders/typescript.js

@@ -1,32 +0,0 @@
-'use strict';
-
-const path = require('path');
-const fs = require('fs-extra');
-const tsUtils = require('@strapi/typescript-utils');
-
-const cleanupDistDirectory = async (distDir) => {
-  if (!(await fs.pathExists(distDir))) {
-    return;
-  }
-
-  const dirContent = await fs.readdir(distDir);
-  const validFilenames = dirContent
-    // Ignore the admin build folder
-    .filter((filename) => filename !== 'build');
-
-  for (const filename of validFilenames) {
-    await fs.remove(path.resolve(distDir, filename));
-  }
-};
-
-module.exports = async ({ srcDir, distDir, watch = false }) => {
-  const isTSProject = await tsUtils.isUsingTypeScript(srcDir);
-
-  if (!isTSProject) {
-    throw new Error(`tsconfig file not found in ${srcDir}`);
-  }
-
-  await cleanupDistDirectory(distDir);
-
-  return tsUtils.compile(srcDir, { watch });
-};

package/lib/commands/index.js

@@ -1,68 +0,0 @@
-'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/command'), // in 'build-command' to avoid problems with 'build' being commonly ignored
-  'components/list': require('./actions/components/list/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'),
-  'plugin/build': require('./actions/plugin/build-command/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/utils/commander.js

@@ -1,157 +0,0 @@
-'use strict';
-
-/**
- * This file includes hooks to use for commander.hook and argParsers for commander.argParser
- */
-
-const inquirer = require('inquirer');
-const { InvalidOptionArgumentError, Option } = require('commander');
-const { bold, green, cyan } = require('chalk');
-const { isNaN } = require('lodash/fp');
-const { exitWith } = require('./helpers');
-
-/**
- * argParser: Parse a comma-delimited string as an array
- */
-const parseList = (value) => {
-  let list;
-  try {
-    list = value.split(',').map((item) => item.trim()); // trim shouldn't be necessary but might help catch unexpected whitespace characters
-  } catch (e) {
-    exitWith(1, `Unrecognized input: ${value}`);
-  }
-  return list;
-};
-
-/**
- * Returns an argParser that returns a list
- */
-const getParseListWithChoices = (choices, errorMessage = 'Invalid options:') => {
-  return (value) => {
-    const list = parseList(value);
-    const invalid = list.filter((item) => {
-      return !choices.includes(item);
-    });
-
-    if (invalid.length > 0) {
-      exitWith(1, `${errorMessage}: ${invalid.join(',')}`);
-    }
-
-    return list;
-  };
-};
-
-/**
- * argParser: Parse a string as an integer
- */
-const parseInteger = (value) => {
-  // parseInt takes a string and a radix
-  const parsedValue = parseInt(value, 10);
-  if (isNaN(parsedValue)) {
-    throw new InvalidOptionArgumentError(`Not an integer: ${value}`);
-  }
-  return parsedValue;
-};
-
-/**
- * argParser: Parse a string as a URL object
- */
-const parseURL = (value) => {
-  try {
-    const url = new URL(value);
-    if (!url.host) {
-      throw new InvalidOptionArgumentError(`Could not parse url ${value}`);
-    }
-
-    return url;
-  } catch (e) {
-    throw new InvalidOptionArgumentError(`Could not parse url ${value}`);
-  }
-};
-
-/**
- * hook: if encrypt==true and key not provided, prompt for it
- */
-const promptEncryptionKey = async (thisCommand) => {
-  const opts = thisCommand.opts();
-
-  if (!opts.encrypt && opts.key) {
-    return exitWith(1, 'Key may not be present unless encryption is used');
-  }
-
-  // if encrypt==true but we have no key, prompt for it
-  if (opts.encrypt && !(opts.key && opts.key.length > 0)) {
-    try {
-      const answers = await inquirer.prompt([
-        {
-          type: 'password',
-          message: 'Please enter an encryption key',
-          name: 'key',
-          validate(key) {
-            if (key.length > 0) return true;
-
-            return 'Key must be present when using the encrypt option';
-          },
-        },
-      ]);
-      opts.key = answers.key;
-    } catch (e) {
-      return exitWith(1, 'Failed to get encryption key');
-    }
-    if (!opts.key) {
-      return exitWith(1, 'Failed to get encryption key');
-    }
-  }
-};
-
-/**
- * hook: require a confirmation message to be accepted unless forceOption (-f,--force) is used
- *
- * @param {string} message The message to confirm with user
- * @param {object} options Additional options
- * @param {string|undefined} options.failMessage The message to display when prompt is not confirmed
- */
-const getCommanderConfirmMessage = (message, { failMessage } = {}) => {
-  return async (command) => {
-    const confirmed = await confirmMessage(message, { force: command.opts().force });
-    if (!confirmed) {
-      exitWith(1, failMessage);
-    }
-  };
-};
-
-const confirmMessage = async (message, { force } = {}) => {
-  // if we have a force option, respond yes
-  if (force === true) {
-    // attempt to mimic the inquirer prompt exactly
-    console.log(`${green('?')} ${bold(message)} ${cyan('Yes')}`);
-    return true;
-  }
-
-  const answers = await inquirer.prompt([
-    {
-      type: 'confirm',
-      message,
-      name: `confirm`,
-      default: false,
-    },
-  ]);
-
-  return answers.confirm;
-};
-
-const forceOption = new Option(
-  '--force',
-  `Automatically answer "yes" to all prompts, including potentially destructive requests, and run non-interactively.`
-);
-
-module.exports = {
-  getParseListWithChoices,
-  parseList,
-  parseURL,
-  parseInteger,
-  promptEncryptionKey,
-  getCommanderConfirmMessage,
-  confirmMessage,
-  forceOption,
-};