@strapi/admin 4.15.5-alpha.2 → 4.15.5-alpha.4

package/dist/_chunks/{index-62b7bdbe.js → index-1a74fa41.js}

@@ -21,6 +21,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
+const EE = require("@strapi/strapi/dist/utils/ee");
 const tsUtils = require("@strapi/typescript-utils");
 const os = require("node:os");
 const fs = require("node:fs/promises");
@@ -30,6 +31,16 @@ const semver = require("semver");
 const resolveFrom = require("resolve-from");
 const execa = require("execa");
 const readPkgUp = require("read-pkg-up");
+const perf_hooks = require("perf_hooks");
+const browserslist = require("browserslist");
+const strapiFactory = require("@strapi/strapi");
+const utils = require("@strapi/utils");
+const dotenv = require("dotenv");
+const node = require("esbuild-register/dist/node");
+const fs$1 = require("node:fs");
+const camelCase = require("lodash/camelCase");
+const boxen = require("boxen");
+const chalk = require("chalk");
 const outdent = require("outdent");
 const prettier = require("prettier");
 const react = require("react");
@@ -46,17 +57,6 @@ const crypto = require("node:crypto");
 const ReactRefreshWebpackPlugin = require("@pmmmwh/react-refresh-webpack-plugin");
 const path$1 = require("path");
 const findRoot = require("find-root");
-const node = require("esbuild-register/dist/node");
-const boxen = require("boxen");
-const chalk = require("chalk");
-const browserslist = require("browserslist");
-const strapiFactory = require("@strapi/strapi");
-const utils = require("@strapi/utils");
-const dotenv = require("dotenv");
-const fs$1 = require("node:fs");
-const camelCase = require("lodash/camelCase");
-const EE = require("@strapi/strapi/dist/utils/ee");
-const perf_hooks = require("perf_hooks");
 const chokidar = require("chokidar");
 const cluster = require("node:cluster");
 const node_util = require("node:util");
@@ -81,6 +81,7 @@ function _interopNamespace(e) {
   n.default = e;
   return Object.freeze(n);
 }
+const EE__default = /* @__PURE__ */ _interopDefault(EE);
 const tsUtils__namespace = /* @__PURE__ */ _interopNamespace(tsUtils);
 const os__default = /* @__PURE__ */ _interopDefault(os);
 const fs__default = /* @__PURE__ */ _interopDefault(fs);
@@ -90,6 +91,13 @@ const semver__default = /* @__PURE__ */ _interopDefault(semver);
 const resolveFrom__default = /* @__PURE__ */ _interopDefault(resolveFrom);
 const execa__default = /* @__PURE__ */ _interopDefault(execa);
 const readPkgUp__default = /* @__PURE__ */ _interopDefault(readPkgUp);
+const browserslist__default = /* @__PURE__ */ _interopDefault(browserslist);
+const strapiFactory__default = /* @__PURE__ */ _interopDefault(strapiFactory);
+const dotenv__default = /* @__PURE__ */ _interopDefault(dotenv);
+const fs__default$1 = /* @__PURE__ */ _interopDefault(fs$1);
+const camelCase__default = /* @__PURE__ */ _interopDefault(camelCase);
+const boxen__default = /* @__PURE__ */ _interopDefault(boxen);
+const chalk__default = /* @__PURE__ */ _interopDefault(chalk);
 const outdent__default = /* @__PURE__ */ _interopDefault(outdent);
 const webpack__default = /* @__PURE__ */ _interopDefault(webpack);
 const browserslistToEsbuild__default = /* @__PURE__ */ _interopDefault(browserslistToEsbuild);
@@ -100,21 +108,13 @@ const crypto__default = /* @__PURE__ */ _interopDefault(crypto);
 const ReactRefreshWebpackPlugin__default = /* @__PURE__ */ _interopDefault(ReactRefreshWebpackPlugin);
 const path__default$1 = /* @__PURE__ */ _interopDefault(path$1);
 const findRoot__default = /* @__PURE__ */ _interopDefault(findRoot);
-const boxen__default = /* @__PURE__ */ _interopDefault(boxen);
-const chalk__default = /* @__PURE__ */ _interopDefault(chalk);
-const browserslist__default = /* @__PURE__ */ _interopDefault(browserslist);
-const strapiFactory__default = /* @__PURE__ */ _interopDefault(strapiFactory);
-const dotenv__default = /* @__PURE__ */ _interopDefault(dotenv);
-const fs__default$1 = /* @__PURE__ */ _interopDefault(fs$1);
-const camelCase__default = /* @__PURE__ */ _interopDefault(camelCase);
-const EE__default = /* @__PURE__ */ _interopDefault(EE);
 const chokidar__default = /* @__PURE__ */ _interopDefault(chokidar);
 const cluster__default = /* @__PURE__ */ _interopDefault(cluster);
 const webpackDevMiddleware__default = /* @__PURE__ */ _interopDefault(webpackDevMiddleware);
 const webpackHotMiddleware__default = /* @__PURE__ */ _interopDefault(webpackHotMiddleware);
 const build$2 = ({ command, ctx }) => {
   command.command("build").option("-d, --debug", "Enable debugging mode with verbose logs", false).option("--ignore-prompts", "Ignore all prompts", false).option("--minify", "Minify the output", true).option("--no-optimization", "[deprecated]: use minify instead").option("--silent", "Don't log anything", false).option("--sourcemap", "Produce sourcemaps", false).option("--stats", "Print build statistics to the console", false).description("Build the strapi admin app").action(async (options) => {
-    const { build: build2 } = await Promise.resolve().then(() => require("./build-b285bccd.js"));
+    const { build: build2 } = await Promise.resolve().then(() => require("./build-df2f219f.js"));
     return build2({ ...options, ...ctx });
   });
 };
@@ -126,7 +126,7 @@ const develop$1 = ({ command, ctx }) => {
     "--watch-admin",
     "[deprecated]: there is now middleware for watching, it is no longer a separate process"
   ).option("--browser <name>", "[deprecated]: use open instead").option("--open", "Open the admin in your browser", true).description("Start your Strapi application in development mode").action(async (options) => {
-    const { develop: develop2 } = await Promise.resolve().then(() => require("./develop-9765d7ba.js"));
+    const { develop: develop2 } = await Promise.resolve().then(() => require("./develop-4d25a6e0.js"));
     return develop2({ ...options, ...ctx });
   });
 };
@@ -300,6 +300,265 @@ const installDependencies = async (install, { cwd, logger }) => {
     throw new Error("Package installation failed");
   }
 };
+function getTimer() {
+  const timings = {};
+  const startTimes = {};
+  function start(name) {
+    if (typeof startTimes[name] !== "undefined") {
+      throw new Error(`Timer "${name}" already started, cannot overwrite`);
+    }
+    startTimes[name] = perf_hooks.performance.now();
+  }
+  function end(name) {
+    if (typeof startTimes[name] === "undefined") {
+      throw new Error(`Timer "${name}" never started, cannot end`);
+    }
+    timings[name] = perf_hooks.performance.now() - startTimes[name];
+    return timings[name];
+  }
+  return { start, end, getTimings: () => timings };
+}
+const prettyTime = (timeInMs) => {
+  return Math.ceil(timeInMs) + "ms";
+};
+const pathExists = async (path2) => {
+  try {
+    await fs.access(path2);
+    return true;
+  } catch (error) {
+    return false;
+  }
+};
+const loadFile = async (path2) => {
+  if (await pathExists(path2)) {
+    const esbuildOptions = {
+      extensions: [".js", ".mjs", ".ts"]
+    };
+    const { unregister } = node.register(esbuildOptions);
+    const mod = require(path2);
+    unregister();
+    const file = mod?.default || mod || void 0;
+    return file;
+  }
+  return void 0;
+};
+const convertSystemPathToModulePath = (sysPath) => {
+  if (process.platform === "win32") {
+    return sysPath.split(path__default.default.sep).join(path__default.default.posix.sep);
+  } else {
+    return sysPath;
+  }
+};
+const convertModulePathToSystemPath = (modulePath) => {
+  if (process.platform === "win32") {
+    return modulePath.split(path__default.default.posix.sep).join(path__default.default.sep);
+  } else {
+    return modulePath;
+  }
+};
+const loadEnv = async (cwd) => {
+  const pathToEnv = path__default.default.resolve(cwd, ".env");
+  if (await pathExists(pathToEnv)) {
+    dotenv__default.default.config({ path: pathToEnv });
+  }
+};
+const getStrapiAdminEnvVars = (defaultEnv) => {
+  return Object.keys(process.env).filter((key) => key.toUpperCase().startsWith("STRAPI_ADMIN_")).reduce((acc, key) => {
+    acc[key] = process.env[key];
+    return acc;
+  }, defaultEnv);
+};
+const isError = (err) => err instanceof Error;
+const handleUnexpectedError = (err) => {
+  console.error(
+    chalk__default.default.red(
+      `[ERROR] `,
+      "There seems to be an unexpected error, try again with --debug for more information",
+      os__default.default.EOL
+    )
+  );
+  if (isError(err) && err.stack) {
+    console.log(
+      chalk__default.default.red(
+        boxen__default.default(err.stack, {
+          padding: 1,
+          align: "left"
+        })
+      )
+    );
+  }
+  process.exit(1);
+};
+const validatePackageHasStrapi = (pkg) => "strapi" in pkg && typeof pkg.strapi === "object" && !Array.isArray(pkg.strapi) && pkg.strapi !== null;
+const validatePackageIsPlugin = (pkg) => validatePackageHasStrapi(pkg) && pkg.strapi.kind === "plugin";
+const getEnabledPlugins = async ({
+  cwd,
+  logger,
+  runtimeDir,
+  strapi
+}) => {
+  const plugins = {};
+  const deps = strapi.config.get("info.dependencies", {});
+  logger.debug("Dependencies from user's project", os__default.default.EOL, deps);
+  for (const dep of Object.keys(deps)) {
+    const pkg = await getModule(dep, cwd);
+    if (pkg && validatePackageIsPlugin(pkg)) {
+      const name = pkg.strapi.name || pkg.name;
+      if (!name) {
+        throw Error(
+          "You're trying to import a plugin that doesn't have a name – check the package.json of that plugin!"
+        );
+      }
+      plugins[name] = {
+        name,
+        importName: camelCase__default.default(name),
+        type: "module",
+        modulePath: dep
+      };
+    }
+  }
+  const userPluginsFile = await loadUserPluginsFile(strapi.dirs.app.config);
+  logger.debug("User's plugins file", os__default.default.EOL, userPluginsFile);
+  for (const [userPluginName, userPluginConfig] of Object.entries(userPluginsFile)) {
+    if (userPluginConfig.enabled && userPluginConfig.resolve) {
+      const sysPath = convertModulePathToSystemPath(userPluginConfig.resolve);
+      plugins[userPluginName] = {
+        name: userPluginName,
+        importName: camelCase__default.default(userPluginName),
+        type: "local",
+        /**
+         * User plugin paths are resolved from the entry point
+         * of the app, because that's how you import them.
+         */
+        modulePath: convertSystemPathToModulePath(path__default.default.relative(runtimeDir, sysPath)),
+        path: sysPath
+      };
+    }
+  }
+  return plugins;
+};
+const PLUGIN_CONFIGS = ["plugins.js", "plugins.mjs", "plugins.ts"];
+const loadUserPluginsFile = async (root) => {
+  for (const file of PLUGIN_CONFIGS) {
+    const filePath = path__default.default.join(root, file);
+    const configFile = await loadFile(filePath);
+    if (configFile) {
+      return typeof configFile === "function" ? configFile({ env: utils.env }) : configFile;
+    }
+  }
+  return {};
+};
+const getMapOfPluginsWithAdmin = (plugins) => Object.values(plugins).filter((plugin) => {
+  if (!plugin) {
+    return false;
+  }
+  try {
+    const isLocalPluginWithLegacyAdminFile = plugin.path && fs__default$1.default.existsSync(path__default.default.join(plugin.path, "strapi-admin.js"));
+    if (!isLocalPluginWithLegacyAdminFile) {
+      const isModuleWithFE = require.resolve(`${plugin.modulePath}/strapi-admin`);
+      return isModuleWithFE;
+    }
+    return isLocalPluginWithLegacyAdminFile;
+  } catch (err) {
+    if (isError(err) && "code" in err && err.code === "MODULE_NOT_FOUND") {
+      return false;
+    }
+    throw err;
+  }
+}).map((plugin) => ({
+  ...plugin,
+  modulePath: `${plugin.modulePath}/strapi-admin`
+}));
+const ADMIN_APP_FILES = ["app.js", "app.mjs", "app.ts", "app.jsx", "app.tsx"];
+const loadUserAppFile = async ({
+  runtimeDir,
+  appDir
+}) => {
+  for (const file of ADMIN_APP_FILES) {
+    const filePath = path__default.default.join(appDir, "src", "admin", file);
+    if (await pathExists(filePath)) {
+      return {
+        path: filePath,
+        modulePath: convertSystemPathToModulePath(path__default.default.relative(runtimeDir, filePath))
+      };
+    }
+  }
+  return void 0;
+};
+const DEFAULT_BROWSERSLIST = [
+  "last 3 major versions",
+  "Firefox ESR",
+  "last 2 Opera versions",
+  "not dead"
+];
+const createBuildContext = async ({
+  cwd,
+  logger,
+  tsconfig,
+  strapi,
+  options = {}
+}) => {
+  const strapiInstance = strapi ?? strapiFactory__default.default({
+    // Directories
+    appDir: cwd,
+    distDir: tsconfig?.config.options.outDir ?? "",
+    // Options
+    autoReload: true,
+    serveAdminPanel: false
+  });
+  const { serverUrl, adminPath } = utils.getConfigUrls(strapiInstance.config, true);
+  const appDir = strapiInstance.dirs.app.root;
+  await loadEnv(cwd);
+  const env = getStrapiAdminEnvVars({
+    ADMIN_PATH: adminPath,
+    STRAPI_ADMIN_BACKEND_URL: serverUrl,
+    STRAPI_TELEMETRY_DISABLED: String(strapiInstance.telemetry.isDisabled)
+  });
+  const envKeys = Object.keys(env);
+  if (envKeys.length > 0) {
+    logger.info(
+      [
+        "Including the following ENV variables as part of the JS bundle:",
+        ...envKeys.map((key) => `    - ${key}`)
+      ].join(os__default.default.EOL)
+    );
+  }
+  const distPath = path__default.default.join(strapiInstance.dirs.dist.root, "build");
+  const distDir = path__default.default.relative(cwd, distPath);
+  try {
+    logger.debug(`Cleaning dist folder: ${distPath}`);
+    await fs__default.default.rm(distPath, { recursive: true, force: true });
+    logger.debug("Cleaned dist folder");
+  } catch {
+    logger.debug("There was no dist folder to clean");
+  }
+  const runtimeDir = path__default.default.join(cwd, ".strapi", "client");
+  const entry = path__default.default.relative(cwd, path__default.default.join(runtimeDir, "app.js"));
+  const plugins = await getEnabledPlugins({ cwd, logger, runtimeDir, strapi: strapiInstance });
+  logger.debug("Enabled plugins", os__default.default.EOL, plugins);
+  const pluginsWithFront = getMapOfPluginsWithAdmin(plugins);
+  logger.debug("Enabled plugins with FE", os__default.default.EOL, plugins);
+  const target = browserslist__default.default.loadConfig({ path: cwd }) ?? DEFAULT_BROWSERSLIST;
+  const customisations = await loadUserAppFile({ appDir, runtimeDir });
+  const buildContext = {
+    appDir,
+    basePath: `${adminPath}/`,
+    customisations,
+    cwd,
+    distDir,
+    distPath,
+    entry,
+    env,
+    logger,
+    options,
+    plugins: pluginsWithFront,
+    runtimeDir,
+    strapi: strapiInstance,
+    target,
+    tsconfig
+  };
+  return buildContext;
+};
 const styles = `
 .strapi--root {
   position: absolute;
@@ -359,7 +618,7 @@ const DefaultDocument = () => {
 };
 const getEntryModule = (ctx) => {
   const pluginsObject = ctx.plugins.map(({ name, importName }) => `'${name}': ${importName}`).join(",\n");
-  const pluginsImport = ctx.plugins.map(({ importName, path: path2 }) => `import ${importName} from '${path2}';`).join("\n");
+  const pluginsImport = ctx.plugins.map(({ importName, modulePath }) => `import ${importName} from '${modulePath}';`).join("\n");
   return outdent__default.default`
         /**
          * This file was automatically generated by Strapi.
@@ -368,15 +627,12 @@ const getEntryModule = (ctx) => {
         ${pluginsImport}
         import { renderAdmin } from "@strapi/strapi/admin"
 
-        ${ctx.customisations?.path ? `import customisations from '${path__default.default.relative(
-    ctx.runtimeDir,
-    ctx.customisations.path
-  )}'` : ""}
+        ${ctx.customisations?.modulePath ? `import customisations from '${ctx.customisations.modulePath}'` : ""}
 
         renderAdmin(
           document.getElementById("strapi"),
           {
-            ${ctx.customisations?.path ? "customisations," : ""}
+            ${ctx.customisations?.modulePath ? "customisations," : ""}
             plugins: {
         ${pluginsObject}
             }
@@ -491,27 +747,6 @@ async function loadStrapiMonorepo(cwd) {
   }
   return void 0;
 }
-const pathExists = async (path2) => {
-  try {
-    await fs.access(path2);
-    return true;
-  } catch (error) {
-    return false;
-  }
-};
-const loadFile = async (path2) => {
-  if (await pathExists(path2)) {
-    const esbuildOptions = {
-      extensions: [".js", ".mjs", ".ts"]
-    };
-    const { unregister } = node.register(esbuildOptions);
-    const mod = require(path2);
-    unregister();
-    const file = mod?.default || mod || void 0;
-    return file;
-  }
-  return void 0;
-};
 const resolveBaseConfig = async (ctx) => {
   const monorepo = await loadStrapiMonorepo(ctx.cwd);
   const target = browserslistToEsbuild__default.default(ctx.target);
@@ -714,27 +949,6 @@ const mergeConfigWithUserConfig = async (config, ctx) => {
   }
   return config;
 };
-const isError = (err) => err instanceof Error;
-const handleUnexpectedError = (err) => {
-  console.error(
-    chalk__default.default.red(
-      `[ERROR] `,
-      "There seems to be an unexpected error, try again with --debug for more information",
-      os__default.default.EOL
-    )
-  );
-  if (isError(err) && err.stack) {
-    console.log(
-      chalk__default.default.red(
-        boxen__default.default(err.stack, {
-          padding: 1,
-          align: "left"
-        })
-      )
-    );
-  }
-  process.exit(1);
-};
 const build$1 = async (ctx) => new Promise(async (resolve, reject) => {
   const config = await resolveProductionConfig(ctx);
   const finalConfig = await mergeConfigWithUserConfig(config, ctx);
@@ -765,205 +979,6 @@ const build$1 = async (ctx) => new Promise(async (resolve, reject) => {
     }
   });
 });
-const loadEnv = async (cwd) => {
-  const pathToEnv = path__default.default.resolve(cwd, ".env");
-  if (await pathExists(pathToEnv)) {
-    dotenv__default.default.config({ path: pathToEnv });
-  }
-};
-const getStrapiAdminEnvVars = (defaultEnv) => {
-  return Object.keys(process.env).filter((key) => key.toUpperCase().startsWith("STRAPI_ADMIN_")).reduce((acc, key) => {
-    acc[key] = process.env[key];
-    return acc;
-  }, defaultEnv);
-};
-const validatePackageHasStrapi = (pkg) => "strapi" in pkg && typeof pkg.strapi === "object" && !Array.isArray(pkg.strapi) && pkg.strapi !== null;
-const validatePackageIsPlugin = (pkg) => validatePackageHasStrapi(pkg) && pkg.strapi.kind === "plugin";
-const getEnabledPlugins = async ({
-  strapi,
-  cwd,
-  logger
-}) => {
-  const plugins = {};
-  const deps = strapi.config.get("info.dependencies", {});
-  logger.debug("Dependencies from user's project", os__default.default.EOL, deps);
-  for (const dep of Object.keys(deps)) {
-    const pkg = await getModule(dep, cwd);
-    if (pkg && validatePackageIsPlugin(pkg)) {
-      const name = pkg.strapi.name || pkg.name;
-      if (!name) {
-        throw Error(
-          "You're trying to import a plugin that doesn't have a name – check the package.json of that plugin!"
-        );
-      }
-      plugins[name] = {
-        name,
-        pathToPlugin: dep
-      };
-    }
-  }
-  const userPluginsFile = await loadUserPluginsFile(strapi.dirs.app.config);
-  logger.debug("User's plugins file", os__default.default.EOL, userPluginsFile);
-  for (const [userPluginName, userPluginConfig] of Object.entries(userPluginsFile)) {
-    if (userPluginConfig.enabled && userPluginConfig.resolve) {
-      plugins[userPluginName] = {
-        name: userPluginName,
-        isLocal: true,
-        /**
-         * User plugin paths are resolved from the entry point
-         * of the app, because that's how you import them.
-         */
-        pathToPlugin: userPluginConfig.resolve
-      };
-    }
-  }
-  return plugins;
-};
-const PLUGIN_CONFIGS = ["plugins.js", "plugins.mjs", "plugins.ts"];
-const loadUserPluginsFile = async (root) => {
-  for (const file of PLUGIN_CONFIGS) {
-    const filePath = path__default.default.join(root, file);
-    const configFile = await loadFile(filePath);
-    if (configFile) {
-      return typeof configFile === "function" ? configFile({ env: utils.env }) : configFile;
-    }
-  }
-  return {};
-};
-const getMapOfPluginsWithAdmin = (plugins, { runtimeDir }) => Object.values(plugins).filter((plugin) => {
-  if (!plugin) {
-    return false;
-  }
-  try {
-    const isLocalPluginWithLegacyAdminFile = fs__default$1.default.existsSync(
-      //@ts-ignore
-      path__default.default.resolve(`${plugin.pathToPlugin}/strapi-admin.js`)
-    );
-    if (!isLocalPluginWithLegacyAdminFile) {
-      let pathToPlugin = plugin.pathToPlugin;
-      if (process.platform === "win32") {
-        pathToPlugin = pathToPlugin.split(path__default.default.sep).join(path__default.default.posix.sep);
-      }
-      const isModuleWithFE = require.resolve(`${pathToPlugin}/strapi-admin`);
-      return isModuleWithFE;
-    }
-    return isLocalPluginWithLegacyAdminFile;
-  } catch (err) {
-    if (isError(err) && "code" in err && err.code === "MODULE_NOT_FOUND") {
-      return false;
-    }
-    throw err;
-  }
-}).map((plugin) => {
-  const systemPath = plugin.isLocal ? path__default.default.relative(runtimeDir, plugin.pathToPlugin.split("/").join(path__default.default.sep)) : void 0;
-  const modulePath = systemPath ? systemPath.split(path__default.default.sep).join("/") : void 0;
-  return {
-    path: !plugin.isLocal ? `${plugin.pathToPlugin}/strapi-admin` : `${modulePath}/strapi-admin`,
-    name: plugin.name,
-    importName: camelCase__default.default(plugin.name)
-  };
-});
-const ADMIN_APP_FILES = ["app.js", "app.mjs", "app.ts", "app.jsx", "app.tsx"];
-const loadUserAppFile = async (appDir) => {
-  for (const file of ADMIN_APP_FILES) {
-    const filePath = path__default.default.join(appDir, "src", "admin", file);
-    if (fs__default$1.default.existsSync(filePath)) {
-      return { path: filePath };
-    }
-  }
-  return void 0;
-};
-const DEFAULT_BROWSERSLIST = [
-  "last 3 major versions",
-  "Firefox ESR",
-  "last 2 Opera versions",
-  "not dead"
-];
-const createBuildContext = async ({
-  cwd,
-  logger,
-  tsconfig,
-  strapi,
-  options = {}
-}) => {
-  const strapiInstance = strapi ?? strapiFactory__default.default({
-    // Directories
-    appDir: cwd,
-    distDir: tsconfig?.config.options.outDir ?? "",
-    // Options
-    autoReload: true,
-    serveAdminPanel: false
-  });
-  const { serverUrl, adminPath } = utils.getConfigUrls(strapiInstance.config, true);
-  await loadEnv(cwd);
-  const env = getStrapiAdminEnvVars({
-    ADMIN_PATH: adminPath,
-    STRAPI_ADMIN_BACKEND_URL: serverUrl,
-    STRAPI_TELEMETRY_DISABLED: String(strapiInstance.telemetry.isDisabled)
-  });
-  const envKeys = Object.keys(env);
-  if (envKeys.length > 0) {
-    logger.info(
-      [
-        "Including the following ENV variables as part of the JS bundle:",
-        ...envKeys.map((key) => `    - ${key}`)
-      ].join(os__default.default.EOL)
-    );
-  }
-  const distPath = path__default.default.join(strapiInstance.dirs.dist.root, "build");
-  const distDir = path__default.default.relative(cwd, distPath);
-  try {
-    logger.debug(`Cleaning dist folder: ${distPath}`);
-    await fs__default.default.rm(distPath, { recursive: true, force: true });
-    logger.debug("Cleaned dist folder");
-  } catch {
-    logger.debug("There was no dist folder to clean");
-  }
-  const runtimeDir = path__default.default.join(cwd, ".strapi", "client");
-  const entry = path__default.default.relative(cwd, path__default.default.join(runtimeDir, "app.js"));
-  const plugins = await getEnabledPlugins({ cwd, logger, strapi: strapiInstance });
-  logger.debug("Enabled plugins", os__default.default.EOL, plugins);
-  const pluginsWithFront = getMapOfPluginsWithAdmin(plugins, { runtimeDir });
-  logger.debug("Enabled plugins with FE", os__default.default.EOL, plugins);
-  const target = browserslist__default.default.loadConfig({ path: cwd }) ?? DEFAULT_BROWSERSLIST;
-  const customisations = await loadUserAppFile(strapiInstance.dirs.app.root);
-  const buildContext = {
-    appDir: strapiInstance.dirs.app.root,
-    basePath: `${adminPath}/`,
-    customisations,
-    cwd,
-    distDir,
-    distPath,
-    entry,
-    env,
-    logger,
-    options,
-    plugins: pluginsWithFront,
-    runtimeDir,
-    strapi: strapiInstance,
-    target,
-    tsconfig
-  };
-  return buildContext;
-};
-function getTimer() {
-  const timings = {};
-  const startTimes = {};
-  function start(name) {
-    if (typeof startTimes[name] !== "undefined") {
-      throw new Error(`Timer "${name}" already started, cannot overwrite`);
-    }
-    startTimes[name] = perf_hooks.performance.now();
-  }
-  function end(name) {
-    if (typeof startTimes[name] === "undefined") {
-      throw new Error(`Timer "${name}" never started, cannot end`);
-    }
-    timings[name] = perf_hooks.performance.now() - startTimes[name];
-    return timings[name];
-  }
-  return { start, end, getTimings: () => timings };
-}
 const build = async ({ logger, cwd, tsconfig, ignorePrompts, ...options }) => {
   const timer = getTimer();
   const { didInstall } = await checkRequiredDependencies({ cwd, logger, ignorePrompts }).catch(
@@ -980,7 +995,7 @@ const build = async ({ logger, cwd, tsconfig, ignorePrompts, ...options }) => {
     const compilingTsSpinner = logger.spinner(`Compiling TS`).start();
     tsUtils__namespace.compile(cwd, { configOptions: { ignoreDiagnostics: false } });
     const compilingDuration = timer.end("compilingTS");
-    compilingTsSpinner.text = `Compiling TS (${compilingDuration}ms)`;
+    compilingTsSpinner.text = `Compiling TS (${prettyTime(compilingDuration)})`;
     compilingTsSpinner.succeed();
   }
   timer.start("createBuildContext");
@@ -993,7 +1008,7 @@ const build = async ({ logger, cwd, tsconfig, ignorePrompts, ...options }) => {
     options
   });
   const contextDuration = timer.end("createBuildContext");
-  contextSpinner.text = `Building build context (${contextDuration}ms)`;
+  contextSpinner.text = `Building build context (${prettyTime(contextDuration)})`;
   contextSpinner.succeed();
   timer.start("buildAdmin");
   const buildingSpinner = logger.spinner(`Building admin panel`).start();
@@ -1003,7 +1018,7 @@ const build = async ({ logger, cwd, tsconfig, ignorePrompts, ...options }) => {
     await writeStaticClientFiles(ctx);
     await build$1(ctx);
     const buildDuration = timer.end("buildAdmin");
-    buildingSpinner.text = `Building admin panel (${buildDuration}ms)`;
+    buildingSpinner.text = `Building admin panel (${prettyTime(buildDuration)})`;
     buildingSpinner.succeed();
   } catch (err) {
     buildingSpinner.fail();
@@ -1091,6 +1106,35 @@ const watch = async (ctx) => {
     });
   });
 };
+const cleanupDistDirectory = async ({
+  tsconfig,
+  logger,
+  timer
+}) => {
+  const distDir = tsconfig?.config?.options?.outDir;
+  if (!distDir || // we don't have a dist dir
+  await fs__default.default.access(distDir).then(() => false).catch(() => true)) {
+    return;
+  }
+  const timerName = "cleaningDist" + Date.now();
+  timer.start(timerName);
+  const cleaningSpinner = logger.spinner(`Cleaning dist dir ${distDir}`).start();
+  try {
+    const dirContent = await fs__default.default.readdir(distDir);
+    const validFilenames = dirContent.filter((filename) => filename !== "build");
+    for (const filename of validFilenames) {
+      await fs__default.default.rm(path__default.default.resolve(distDir, filename), { recursive: true });
+    }
+  } catch (err) {
+    const generatingDuration2 = timer.end(timerName);
+    cleaningSpinner.text = `Error cleaning dist dir: ${err} (${prettyTime(generatingDuration2)})`;
+    cleaningSpinner?.fail();
+    return;
+  }
+  const generatingDuration = timer.end(timerName);
+  cleaningSpinner.text = `Cleaning dist dir (${prettyTime(generatingDuration)})`;
+  cleaningSpinner?.succeed();
+};
 const develop = async ({
   cwd,
   polling,
@@ -1111,6 +1155,10 @@ const develop = async ({
     if (didInstall) {
       return;
     }
+    if (tsconfig?.config) {
+      await cleanupDistDirectory({ tsconfig, logger, timer });
+      await tsUtils__namespace.compile(cwd, { configOptions: { ignoreDiagnostics: true } });
+    }
     if (!watchAdmin) {
       timer.start("createBuildContext");
       const contextSpinner = logger.spinner(`Building build context`).start();
@@ -1122,7 +1170,7 @@ const develop = async ({
         options
       });
       const contextDuration = timer.end("createBuildContext");
-      contextSpinner.text = `Building build context (${contextDuration}ms)`;
+      contextSpinner.text = `Building build context (${prettyTime(contextDuration)})`;
       contextSpinner.succeed();
       timer.start("creatingAdmin");
       const adminSpinner = logger.spinner(`Creating admin`).start();
@@ -1130,12 +1178,16 @@ const develop = async ({
       await writeStaticClientFiles(ctx);
       await build$1(ctx);
       const adminDuration = timer.end("creatingAdmin");
-      adminSpinner.text = `Creating admin (${adminDuration}ms)`;
+      adminSpinner.text = `Creating admin (${prettyTime(adminDuration)})`;
       adminSpinner.succeed();
     }
     cluster__default.default.on("message", async (worker, message) => {
       switch (message) {
         case "reload": {
+          if (tsconfig?.config) {
+            await cleanupDistDirectory({ tsconfig, logger, timer });
+            await tsUtils__namespace.compile(cwd, { configOptions: { ignoreDiagnostics: true } });
+          }
           logger.debug("cluster has the reload message, sending the worker kill message");
           worker.send("kill");
           break;
@@ -1154,14 +1206,8 @@ const develop = async ({
     cluster__default.default.fork();
   }
   if (cluster__default.default.isWorker) {
-    if (tsconfig?.config) {
-      timer.start("compilingTS");
-      const compilingTsSpinner = logger.spinner(`Compiling TS`).start();
-      tsUtils__namespace.compile(cwd, { configOptions: { ignoreDiagnostics: false } });
-      const compilingDuration = timer.end("compilingTS");
-      compilingTsSpinner.text = `Compiling TS (${compilingDuration}ms)`;
-      compilingTsSpinner.succeed();
-    }
+    timer.start("loadStrapi");
+    const loadStrapiSpinner = logger.spinner(`Loading Strapi`).start();
     const strapi = strapiFactory__default.default({
       appDir: cwd,
       distDir: tsconfig?.config.options.outDir ?? "",
@@ -1181,7 +1227,7 @@ const develop = async ({
         options
       });
       const contextDuration = timer.end("createBuildContext");
-      contextSpinner.text = `Building build context (${contextDuration}ms)`;
+      contextSpinner.text = `Building build context (${prettyTime(contextDuration)})`;
       contextSpinner.succeed();
       timer.start("creatingAdmin");
       const adminSpinner = logger.spinner(`Creating admin`).start();
@@ -1189,10 +1235,13 @@ const develop = async ({
       await writeStaticClientFiles(ctx);
       webpackWatcher = await watch(ctx);
       const adminDuration = timer.end("creatingAdmin");
-      adminSpinner.text = `Creating admin (${adminDuration}ms)`;
+      adminSpinner.text = `Creating admin (${prettyTime(adminDuration)})`;
       adminSpinner.succeed();
     }
     const strapiInstance = await strapi.load();
+    const loadStrapiDuration = timer.end("loadStrapi");
+    loadStrapiSpinner.text = `Loading Strapi (${prettyTime(loadStrapiDuration)})`;
+    loadStrapiSpinner.succeed();
     timer.start("generatingTS");
     const generatingTsSpinner = logger.spinner(`Generating types`).start();
     await tsUtils__namespace.generators.generate({
@@ -1203,8 +1252,17 @@ const develop = async ({
       artifacts: { contentTypes: true, components: true }
     });
     const generatingDuration = timer.end("generatingTS");
-    generatingTsSpinner.text = `Generating types (${generatingDuration}ms)`;
+    generatingTsSpinner.text = `Generating types (${prettyTime(generatingDuration)})`;
     generatingTsSpinner.succeed();
+    if (tsconfig?.config) {
+      timer.start("compilingTS");
+      const compilingTsSpinner = logger.spinner(`Compiling TS`).start();
+      await cleanupDistDirectory({ tsconfig, logger, timer });
+      await tsUtils__namespace.compile(cwd, { configOptions: { ignoreDiagnostics: false } });
+      const compilingDuration = timer.end("compilingTS");
+      compilingTsSpinner.text = `Compiling TS (${prettyTime(compilingDuration)})`;
+      compilingTsSpinner.succeed();
+    }
     const restart = async () => {
       if (strapiInstance.reload.isWatching && !strapiInstance.reload.isReloading) {
         strapiInstance.reload.isReloading = true;
@@ -1272,4 +1330,4 @@ exports.build = build;
 exports.develop = develop;
 exports.handleUnexpectedError = handleUnexpectedError;
 exports.index = index;
-//# sourceMappingURL=index-62b7bdbe.js.map
+//# sourceMappingURL=index-1a74fa41.js.map