@strapi/strapi 4.14.0-beta.0 → 4.15.0-alpha.0

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

@@ -1,68 +0,0 @@
-'use strict';
-
-const { join } = require('path');
-const { existsSync, removeSync } = require('fs-extra');
-const ora = require('ora');
-const execa = require('execa');
-const inquirer = require('inquirer');
-const findPackagePath = require('../../../load/package-path');
-
-module.exports = async (plugins, { deleteFiles }) => {
-  const answers = await inquirer.prompt([
-    {
-      type: 'confirm',
-      name: 'deleteFiles',
-      message: `Do you want to delete the plugin generated files in the extensions folder ?`,
-      default: true,
-      when: !deleteFiles,
-    },
-  ]);
-
-  const loader = ora();
-  const dir = process.cwd();
-
-  const pluginArgs = plugins.map((name) => `@strapi/plugin-${name}`);
-
-  try {
-    // verify should rebuild before removing the pacakge
-    let shouldRebuild = false;
-    for (const name of plugins) {
-      const pkgPath = findPackagePath(`@strapi/plugin-${name}`);
-      if (existsSync(join(pkgPath, 'admin', 'src', 'index.js'))) {
-        shouldRebuild = true;
-      }
-    }
-
-    loader.start(`Uninstalling dependencies`);
-
-    const useYarn = existsSync(join(dir, 'yarn.lock'));
-    if (useYarn) {
-      await execa('yarn', ['remove', ...pluginArgs]);
-    } else {
-      await execa('npm', ['remove', ...pluginArgs]);
-    }
-
-    loader.succeed();
-
-    if (deleteFiles === true || answers.deleteFiles === true) {
-      loader.start('Deleting old files');
-      for (const name of plugins) {
-        const pluginDir = join(dir, 'extensions', name);
-        if (existsSync(pluginDir)) {
-          removeSync(pluginDir);
-        }
-      }
-      loader.succeed();
-    }
-
-    if (shouldRebuild) {
-      loader.start(`Rebuilding admin UI`);
-      await execa('npm', ['run', 'build']);
-      loader.succeed();
-    }
-  } catch (err) {
-    loader.clear();
-    console.error(err.message);
-    process.exit(1);
-  }
-};

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

@@ -1,15 +0,0 @@
-'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

@@ -1,19 +0,0 @@
-'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/actions/watch-admin/action.js

@@ -1,40 +0,0 @@
-'use strict';
-
-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');
-
-module.exports = async ({ browser }) => {
-  const appContext = await strapi.compile();
-
-  const strapiInstance = strapi({
-    ...appContext,
-    autoReload: true,
-    serveAdminPanel: false,
-  });
-
-  const plugins = await getEnabledPlugins(strapiInstance, { client: true });
-
-  const { adminPath } = getConfigUrls(strapiInstance.config, true);
-
-  const adminPort = strapiInstance.config.get('admin.port', 8000);
-  const adminHost = strapiInstance.config.get('admin.host', 'localhost');
-
-  const backendURL = getAbsoluteServerUrl(strapiInstance.config, true);
-
-  strapiAdmin.watchAdmin({
-    appDir: appContext.appDir,
-    buildDestDir: appContext.distDir,
-    plugins,
-    port: adminPort,
-    host: adminHost,
-    browser,
-    options: {
-      backend: backendURL,
-      adminPath: addSlash(adminPath),
-    },
-  });
-};

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

@@ -1,15 +0,0 @@
-'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/builders/admin.js

@@ -1,57 +0,0 @@
-'use strict';
-
-const { green } = require('chalk');
-
-const strapiAdmin = require('@strapi/admin');
-const { getConfigUrls } = require('@strapi/utils');
-
-const ee = require('../../utils/ee');
-const addSlash = require('../../utils/addSlash');
-const strapi = require('../../index');
-const getEnabledPlugins = require('../../core/loaders/plugins/get-enabled-plugins');
-
-module.exports = async ({ buildDestDir, forceBuild = true, optimization, srcDir }) => {
-  const strapiInstance = strapi({
-    // Directories
-    appDir: srcDir,
-    distDir: buildDestDir,
-    // Options
-    autoReload: true,
-    serveAdminPanel: false,
-  });
-
-  const plugins = await getEnabledPlugins(strapiInstance, { client: true });
-
-  const env = strapiInstance.config.get('environment');
-  const { serverUrl, adminPath } = getConfigUrls(strapiInstance.config, true);
-
-  console.log(`Building your admin UI with ${green(env)} configuration...`);
-
-  // Always remove the .cache and build folders
-  await strapiAdmin.clean({ appDir: srcDir, buildDestDir });
-
-  ee.init(srcDir);
-
-  return strapiAdmin
-    .build({
-      appDir: srcDir,
-      buildDestDir,
-      // front end build env is always production for now
-      env: 'production',
-      forceBuild,
-      plugins,
-      optimize: optimization,
-      options: {
-        backend: serverUrl,
-        adminPath: addSlash(adminPath),
-        telemetryIsDisabled: strapiInstance.telemetry.isDisabled,
-      },
-    })
-    .then(() => {
-      console.log('Admin UI built successfully');
-    })
-    .catch((err) => {
-      console.error(err);
-      process.exit(1);
-    });
-};

package/lib/commands/builders/index.js

@@ -1,9 +0,0 @@
-'use strict';
-
-const buildAdmin = require('./admin');
-const buildTypeScript = require('./typescript');
-
-module.exports = {
-  buildAdmin,
-  buildTypeScript,
-};

package/lib/commands/builders/packages.js

@@ -1,252 +0,0 @@
-'use strict';
-
-const path = require('path');
-const browserslistToEsbuild = require('browserslist-to-esbuild');
-
-const { parseExports } = require('../utils/pkg');
-
-/**
- * @typedef {Object} BuildContextArgs
- * @property {string} cwd
- * @property {import('../utils/pkg').ExtMap} extMap
- * @property {import('../utils/logger').Logger} logger
- * @property {import('../utils/pkg').PackageJson} pkg
- */
-
-/**
- * @typedef {Object} Targets
- * @property {string[]} node
- * @property {string[]} web
- * @property {string[]} *
- */
-
-/**
- * @typedef {Object} BuildContext
- * @property {string} cwd
- * @property {import('../utils/pkg').Export[]} exports
- * @property {string[]} external
- * @property {import('../utils/pkg').ExtMap} extMap
- * @property {import('../utils/logger').Logger} logger
- * @property {import('../utils/pkg').PackageJson} pkg
- * @property {Targets} targets
- */
-
-const DEFAULT_BROWSERS_LIST_CONFIG = [
-  'last 3 major versions',
-  'Firefox ESR',
-  'last 2 Opera  versions',
-  'not dead',
-  'node 16.0.0',
-];
-
-/**
- * @description Create a build context for the pipeline we're creating,
- * this is shared among tasks so they all use the same settings for core pieces
- * such as a target, distPath, externals etc.
- *
- * @type {(args: BuildContextArgs) => Promise<BuildContext>}
- */
-const createBuildContext = async ({ cwd, extMap, logger, pkg }) => {
-  const targets = {
-    '*': browserslistToEsbuild(pkg.browserslist ?? DEFAULT_BROWSERS_LIST_CONFIG),
-    node: browserslistToEsbuild(['node 16.0.0']),
-    web: ['esnext'],
-  };
-
-  const exports = parseExports({ extMap, pkg }).reduce((acc, x) => {
-    const { _path: exportPath, ...exportEntry } = x;
-
-    return { ...acc, [exportPath]: exportEntry };
-  }, {});
-
-  const external = [
-    ...(pkg.dependencies ? Object.keys(pkg.dependencies) : []),
-    ...(pkg.peerDependencies ? Object.keys(pkg.peerDependencies) : []),
-  ];
-
-  const outputPaths = Object.values(exports)
-    .flatMap((exportEntry) => {
-      return [exportEntry.import, exportEntry.require].filter(Boolean);
-    })
-    .map((p) => path.resolve(cwd, p));
-
-  const distPath = findCommonDirPath(outputPaths);
-
-  if (distPath === cwd) {
-    throw new Error(
-      'all output files must share a common parent directory which is not the root package directory'
-    );
-  }
-
-  if (!distPath) {
-    throw new Error("could not detect 'dist' path");
-  }
-
-  return {
-    logger,
-    cwd,
-    pkg,
-    exports,
-    external,
-    distPath,
-    targets,
-    extMap,
-  };
-};
-
-/**
- * @type {(containerPath: string, itemPath: string) => boolean}
- */
-const pathContains = (containerPath, itemPath) => {
-  return !path.relative(containerPath, itemPath).startsWith('..');
-};
-
-/**
- * @type {(filePaths: string[]) => string | undefined}
- */
-const findCommonDirPath = (filePaths) => {
-  /**
-   * @type {string | undefined}
-   */
-  let commonPath;
-
-  for (const filePath of filePaths) {
-    let dirPath = path.dirname(filePath);
-
-    if (!commonPath) {
-      commonPath = dirPath;
-      // eslint-disable-next-line no-continue
-      continue;
-    }
-
-    while (dirPath !== commonPath) {
-      dirPath = path.dirname(dirPath);
-
-      if (dirPath === commonPath) {
-        break;
-      }
-
-      if (pathContains(dirPath, commonPath)) {
-        commonPath = dirPath;
-        break;
-      }
-
-      if (dirPath === '.') return undefined;
-    }
-  }
-
-  return commonPath;
-};
-
-/**
- * @typedef {import('./tasks/vite').ViteTask | import('./tasks/dts').DtsTask} BuildTask
- */
-
-/**
- * @description Create the build tasks for the pipeline, this
- * comes from the exports map we've created in the build context.
- * But handles each export line uniquely with space to add more
- * as the standard develops.
- *
- * @type {(args: BuildContext) => Promise<BuildTask[]>}
- */
-const createBuildTasks = async (ctx) => {
-  /**
-   * @type {BuildTask[]}
-   */
-  const tasks = [];
-
-  /**
-   * @type {import('./tasks/dts').DtsTask}
-   */
-  const dtsTask = {
-    type: 'build:dts',
-    entries: [],
-  };
-
-  /**
-   * @type {Record<string, import('./tasks/vite').ViteTask>}
-   */
-  const viteTasks = {};
-
-  const createViteTask = (format, runtime, { output, ...restEntry }) => {
-    const buildId = `${format}:${output}`;
-
-    if (viteTasks[buildId]) {
-      viteTasks[buildId].entries.push(restEntry);
-
-      if (output !== viteTasks[buildId].output) {
-        ctx.logger.warn(
-          'Multiple entries with different outputs for the same format are not supported. The first output will be used.'
-        );
-      }
-    } else {
-      viteTasks[buildId] = {
-        type: 'build:js',
-        format,
-        output,
-        runtime,
-        entries: [restEntry],
-      };
-    }
-  };
-
-  const exps = Object.entries(ctx.exports).map(([exportPath, exportEntry]) => ({
-    ...exportEntry,
-    _path: exportPath,
-  }));
-
-  for (const exp of exps) {
-    if (exp.types) {
-      const importId = path.join(ctx.pkg.name, exp._path);
-
-      dtsTask.entries.push({
-        importId,
-        exportPath: exp._path,
-        sourcePath: exp.source,
-        targetPath: exp.types,
-      });
-    }
-
-    /**
-     * @type {keyof Target}
-     */
-    // eslint-disable-next-line no-nested-ternary
-    const runtime = exp._path.includes('strapi-admin')
-      ? 'web'
-      : exp._path.includes('strapi-server')
-      ? 'node'
-      : '*';
-
-    if (exp.require) {
-      /**
-       * register CJS task
-       */
-      createViteTask('cjs', runtime, {
-        path: exp._path,
-        entry: exp.source,
-        output: exp.require,
-      });
-    }
-
-    if (exp.import) {
-      /**
-       * register ESM task
-       */
-      createViteTask('es', runtime, {
-        path: exp._path,
-        entry: exp.source,
-        output: exp.import,
-      });
-    }
-  }
-
-  tasks.push(dtsTask, ...Object.values(viteTasks));
-
-  return tasks;
-};
-
-module.exports = {
-  createBuildContext,
-  createBuildTasks,
-};

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

@@ -1,199 +0,0 @@
-'use strict';
-
-const path = require('path');
-const chalk = require('chalk');
-const ora = require('ora');
-const ts = require('typescript');
-
-/**
- * @description Load a tsconfig.json file and return the parsed config
- *
- * @internal
- *
- * @type {(args: { cwd: string; path: string }) => Promise<ts.ParsedCommandLine>)}
- */
-const loadTsConfig = async ({ cwd, path }) => {
-  const configPath = ts.findConfigFile(cwd, ts.sys.fileExists, path);
-
-  if (!configPath) {
-    throw new TSConfigNotFoundError(`could not find a valid '${path}'`);
-  }
-
-  const configFile = ts.readConfigFile(configPath, ts.sys.readFile);
-
-  return ts.parseJsonConfigFileContent(configFile.config, ts.sys, cwd);
-};
-
-class TSConfigNotFoundError extends Error {
-  // eslint-disable-next-line no-useless-constructor
-  constructor(message, options) {
-    super(message, options);
-  }
-
-  get code() {
-    return 'TS_CONFIG_NOT_FOUND';
-  }
-}
-
-/**
- * @description
- *
- * @internal
- *
- * @type {(args: { cwd: string; logger: import('../../utils/logger').Logger; outDir: string; tsconfig: ts.ParsedCommandLine }) => Promise<void>}
- */
-const buildTypes = ({ cwd, logger, outDir, tsconfig }) => {
-  const compilerOptions = {
-    ...tsconfig.options,
-    declaration: true,
-    declarationDir: outDir,
-    emitDeclarationOnly: true,
-    noEmit: false,
-    outDir,
-  };
-
-  const program = ts.createProgram(tsconfig.fileNames, compilerOptions);
-
-  const emitResult = program.emit();
-
-  const allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
-
-  for (const diagnostic of allDiagnostics) {
-    if (diagnostic.file && diagnostic.start) {
-      const { line, character } = ts.getLineAndCharacterOfPosition(
-        diagnostic.file,
-        diagnostic.start
-      );
-      const message = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
-
-      const file = path.relative(cwd, diagnostic.file.fileName);
-
-      const output = [
-        `${chalk.cyan(file)}:${chalk.cyan(line + 1)}:${chalk.cyan(character + 1)} - `,
-        `${chalk.gray(`TS${diagnostic.code}:`)} ${message}`,
-      ].join('');
-
-      if (diagnostic.category === ts.DiagnosticCategory.Error) {
-        logger.error(output);
-      }
-
-      if (diagnostic.category === ts.DiagnosticCategory.Warning) {
-        logger.warn(output);
-      }
-
-      if (diagnostic.category === ts.DiagnosticCategory.Message) {
-        logger.info(output);
-      }
-
-      if (diagnostic.category === ts.DiagnosticCategory.Suggestion) {
-        logger.info(output);
-      }
-    } else {
-      logger.info(ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n'));
-    }
-  }
-
-  if (emitResult.emitSkipped) {
-    const errors = allDiagnostics.filter((diag) => diag.category === ts.DiagnosticCategory.Error);
-
-    if (errors.length) {
-      throw new Error('Failed to compile TypeScript definitions');
-    }
-  }
-};
-
-/**
- * @typedef {Object} DtsTaskEntry
- * @property {string} exportPath
- * @property {string} sourcePath
- * @property {string} targetPath
- */
-
-/**
- * @typedef {Object} DtsTask
- * @property {"build:dts"} type
- * @property {DtsTaskEntry[]} entries
- */
-
-/**
- * @type {import('./index').TaskHandler<DtsTask>}
- */
-const dtsTask = {
-  _spinner: null,
-  print(ctx, task) {
-    const entries = [
-      '   entries:',
-      ...task.entries.map((entry) =>
-        [
-          `    – `,
-          chalk.green(`${entry.importId} `),
-          `${chalk.cyan(entry.sourcePath)} ${chalk.gray('→')} ${chalk.cyan(entry.targetPath)}`,
-        ].join('')
-      ),
-      '',
-    ];
-
-    this._spinner = ora(`Building type files:\n`).start();
-
-    ctx.logger.log([...entries].join('\n'));
-  },
-  async run(ctx, task) {
-    try {
-      await Promise.all(
-        task.entries.map(async (entry) => {
-          const config = await loadTsConfig({
-            /**
-             * TODO: this will not scale and assumes all project sourcePaths are `src/index.ts`
-             * so we can go back to the "root" of the project...
-             */
-            cwd: path.join(ctx.cwd, entry.sourcePath, '..', '..'),
-            path: 'tsconfig.build.json',
-          }).catch((err) => {
-            if (err instanceof TSConfigNotFoundError) {
-              return undefined;
-            }
-
-            throw err;
-          });
-
-          if (config) {
-            ctx.logger.debug(`TS config for '${entry.sourcePath}': \n`, config);
-          } else {
-            ctx.logger.warn(
-              `You've added a types entry but no tsconfig.json was found for ${entry.targetPath}. Skipping...`
-            );
-
-            return;
-          }
-
-          const { outDir } = config.raw.compilerOptions;
-
-          if (!outDir) {
-            throw new Error("tsconfig.json is missing 'compilerOptions.outDir'");
-          }
-
-          await buildTypes({
-            cwd: ctx.cwd,
-            logger: ctx.logger,
-            outDir: path.relative(ctx.cwd, outDir),
-            tsconfig: config,
-          });
-        })
-      );
-
-      await this.success(ctx, task);
-    } catch (err) {
-      this.fail(ctx, task, err);
-    }
-  },
-  async success() {
-    this._spinner.succeed('Built type files');
-  },
-  async fail(ctx, task, err) {
-    this._spinner.fail('Failed to build type files');
-
-    throw err;
-  },
-};
-
-module.exports = { dtsTask };

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

@@ -1,29 +0,0 @@
-'use strict';
-
-const { dtsTask } = require('./dts');
-const { viteTask } = require('./vite');
-
-/**
- * @template Task
- * @param {Task}
- * @returns {Task}
- *
- * @typedef {Object} TaskHandler
- * @property {(ctx: import("../packages").BuildContext, task: Task) => import('ora').Ora} print
- * @property {(ctx: import("../packages").BuildContext, task: Task) => Promise<void>} run
- * @property {(ctx: import("../packages").BuildContext, task: Task) => Promise<void>} success
- * @property {(ctx: import("../packages").BuildContext, task: Task, err: unknown) => Promise<void>} fail
- * @property {import('ora').Ora | null} _spinner
- */
-
-/**
- * @type {{ "build:js": TaskHandler<import("./vite").ViteTask>; "build:dts": TaskHandler<import("./dts").DtsTask>; }}}
- */
-const buildTaskHandlers = {
-  'build:js': viteTask,
-  'build:dts': dtsTask,
-};
-
-module.exports = {
-  buildTaskHandlers,
-};