@strapi/upgrade 5.0.0-rc.9 → 5.0.0

package/dist/cli.js

@@ -10,7 +10,7 @@ const utils = require("@strapi/utils");
 const fp = require("lodash/fp");
 const fse = require("fs-extra");
 const assert = require("node:assert");
-const glob = require("glob");
+const fastglob = require("fast-glob");
 const Runner = require("jscodeshift/src/Runner");
 const node = require("esbuild-register/dist/node");
 const CliTable3 = require("cli-table3");
@@ -23,6 +23,7 @@ const path__default = /* @__PURE__ */ _interopDefault(path$1);
 const simpleGit__default = /* @__PURE__ */ _interopDefault(simpleGit);
 const fse__default = /* @__PURE__ */ _interopDefault(fse);
 const assert__default = /* @__PURE__ */ _interopDefault(assert);
+const fastglob__default = /* @__PURE__ */ _interopDefault(fastglob);
 const CliTable3__default = /* @__PURE__ */ _interopDefault(CliTable3);
 class Logger {
   isDebug;
@@ -339,7 +340,9 @@ class FileScanner {
     this.cwd = cwd;
   }
   scan(patterns) {
-    const filenames = glob.glob.sync(patterns, { cwd: this.cwd });
+    const filenames = fastglob__default.default.sync(patterns, {
+      cwd: this.cwd
+    });
     return filenames.map((filename) => path__default.default.join(this.cwd, filename));
   }
 }
@@ -425,8 +428,10 @@ const jsonRunnerFactory = (paths, configuration) => {
   return new JSONRunner(paths, configuration);
 };
 const PROJECT_PACKAGE_JSON = "package.json";
-const PROJECT_DEFAULT_ALLOWED_ROOT_PATHS = ["src", "config", "public"];
-const PROJECT_DEFAULT_CODE_EXTENSIONS = [
+const PROJECT_APP_ALLOWED_ROOT_PATHS = ["src", "config", "public"];
+const PROJECT_PLUGIN_ALLOWED_ROOT_PATHS = ["admin", "server"];
+const PROJECT_PLUGIN_ROOT_FILES = ["strapi-admin.js", "strapi-server.js"];
+const PROJECT_CODE_EXTENSIONS = [
   // Source files
   "js",
   "mjs",
@@ -435,12 +440,8 @@ const PROJECT_DEFAULT_CODE_EXTENSIONS = [
   "jsx",
   "tsx"
 ];
-const PROJECT_DEFAULT_JSON_EXTENSIONS = ["json"];
-const PROJECT_DEFAULT_ALLOWED_EXTENSIONS = [
-  ...PROJECT_DEFAULT_CODE_EXTENSIONS,
-  ...PROJECT_DEFAULT_JSON_EXTENSIONS
-];
-const PROJECT_DEFAULT_PATTERNS = ["package.json"];
+const PROJECT_JSON_EXTENSIONS = ["json"];
+const PROJECT_ALLOWED_EXTENSIONS = [...PROJECT_CODE_EXTENSIONS, ...PROJECT_JSON_EXTENSIONS];
 const SCOPED_STRAPI_PACKAGE_PREFIX = "@strapi/";
 const STRAPI_DEPENDENCY_NAME = `${SCOPED_STRAPI_PACKAGE_PREFIX}strapi`;
 class Project {
@@ -449,11 +450,13 @@ class Project {
   files;
   packageJSONPath;
   packageJSON;
-  constructor(cwd) {
+  paths;
+  constructor(cwd, config) {
     if (!fse__default.default.pathExistsSync(cwd)) {
       throw new Error(`ENOENT: no such file or directory, access '${cwd}'`);
     }
     this.cwd = cwd;
+    this.paths = config.paths;
     this.refresh();
   }
   getFilesByExtensions(extensions) {
@@ -481,12 +484,8 @@ class Project {
     return reports2;
   }
   createProjectCodemodsRunners(dry = false) {
-    const jsonExtensions = PROJECT_DEFAULT_JSON_EXTENSIONS.map(
-      (ext) => `.${ext}`
-    );
-    const codeExtensions = PROJECT_DEFAULT_CODE_EXTENSIONS.map(
-      (ext) => `.${ext}`
-    );
+    const jsonExtensions = PROJECT_JSON_EXTENSIONS.map((ext) => `.${ext}`);
+    const codeExtensions = PROJECT_CODE_EXTENSIONS.map((ext) => `.${ext}`);
     const jsonFiles = this.getFilesByExtensions(jsonExtensions);
     const codeFiles = this.getFilesByExtensions(codeExtensions);
     const codeRunner = codeRunnerFactory(codeFiles, {
@@ -494,7 +493,7 @@ class Project {
       parser: "ts",
       runInBand: true,
       babel: true,
-      extensions: PROJECT_DEFAULT_CODE_EXTENSIONS.join(","),
+      extensions: PROJECT_CODE_EXTENSIONS.join(","),
       // Don't output any log coming from the runner
       print: false,
       silent: true,
@@ -515,23 +514,32 @@ class Project {
     this.packageJSON = JSON.parse(packageJSONBuffer.toString());
   }
   refreshProjectFiles() {
-    const allowedRootPaths = formatGlobCollectionPattern(
-      PROJECT_DEFAULT_ALLOWED_ROOT_PATHS
-    );
-    const allowedExtensions = formatGlobCollectionPattern(
-      PROJECT_DEFAULT_ALLOWED_EXTENSIONS
-    );
-    const projectFilesPattern = `./${allowedRootPaths}/**/*.${allowedExtensions}`;
-    const patterns = [projectFilesPattern, ...PROJECT_DEFAULT_PATTERNS];
     const scanner = fileScannerFactory(this.cwd);
-    this.files = scanner.scan(patterns);
+    this.files = scanner.scan(this.paths);
   }
 }
 class AppProject extends Project {
   strapiVersion;
   type = "application";
+  /**
+   * Returns an array of allowed file paths for a Strapi application
+   *
+   * The resulting paths include app default files and the root package.json file.
+   */
+  static get paths() {
+    const allowedRootPaths = formatGlobCollectionPattern(PROJECT_APP_ALLOWED_ROOT_PATHS);
+    const allowedExtensions = formatGlobCollectionPattern(PROJECT_ALLOWED_EXTENSIONS);
+    return [
+      // App default files
+      `./${allowedRootPaths}/**/*.${allowedExtensions}`,
+      `!./**/node_modules/**/*`,
+      `!./**/dist/**/*`,
+      // Root package.json file
+      PROJECT_PACKAGE_JSON
+    ];
+  }
   constructor(cwd) {
-    super(cwd);
+    super(cwd, { paths: AppProject.paths });
     this.refreshStrapiVersion();
   }
   refresh() {
@@ -586,6 +594,30 @@ const formatGlobCollectionPattern = (collection) => {
 };
 class PluginProject extends Project {
   type = "plugin";
+  /**
+   * Returns an array of allowed file paths for a Strapi plugin
+   *
+   * The resulting paths include plugin default files, the root package.json file, and plugin-specific files.
+   */
+  static get paths() {
+    const allowedRootPaths = formatGlobCollectionPattern(
+      PROJECT_PLUGIN_ALLOWED_ROOT_PATHS
+    );
+    const allowedExtensions = formatGlobCollectionPattern(PROJECT_ALLOWED_EXTENSIONS);
+    return [
+      // Plugin default files
+      `./${allowedRootPaths}/**/*.${allowedExtensions}`,
+      `!./**/node_modules/**/*`,
+      `!./**/dist/**/*`,
+      // Root package.json file
+      PROJECT_PACKAGE_JSON,
+      // Plugin root files
+      ...PROJECT_PLUGIN_ROOT_FILES
+    ];
+  }
+  constructor(cwd) {
+    super(cwd, { paths: PluginProject.paths });
+  }
 }
 const isPlugin = (cwd) => {
   const packageJSONPath = path__default.default.join(cwd, PROJECT_PACKAGE_JSON);
@@ -600,10 +632,7 @@ const isPlugin = (cwd) => {
 };
 const projectFactory = (cwd) => {
   fse__default.default.accessSync(cwd);
-  if (isPlugin(cwd)) {
-    return new PluginProject(cwd);
-  }
-  return new AppProject(cwd);
+  return isPlugin(cwd) ? new PluginProject(cwd) : new AppProject(cwd);
 };
 const isApplicationProject = (project) => {
   return project instanceof AppProject;
@@ -629,6 +658,9 @@ const version$1 = (version2) => {
 const codemodUID = (uid) => {
   return chalk__default.default.bold.cyan(uid);
 };
+const projectDetails = (project) => {
+  return `Project: TYPE=${projectType(project.type)}; CWD=${path(project.cwd)}; PATHS=${project.paths.map(path)}`;
+};
 const projectType = (type) => chalk__default.default.cyan(type);
 const versionRange = (range) => chalk__default.default.italic.yellow(range.raw);
 const highlight = (arg) => chalk__default.default.bold.underline(arg);
@@ -1184,6 +1216,7 @@ const upgrade$1 = async (options) => {
   const { logger, codemodsTarget } = options;
   const cwd = path__default.default.resolve(options.cwd ?? process.cwd());
   const project = projectFactory(cwd);
+  logger.debug(projectDetails(project));
   if (!isApplicationProject(project)) {
     throw new Error(
       `The "${options.target}" upgrade can only be run on a Strapi project; for plugins, please use "codemods".`
@@ -1238,7 +1271,7 @@ const runCodemods$1 = async (options) => {
   const cwd = resolvePath(options.cwd);
   const project = projectFactory(cwd);
   const range = findRangeFromTarget(project, options.target);
-  logger.debug(`Project: ${projectType(project.type)} found in ${path(cwd)}`);
+  logger.debug(projectDetails(project));
   logger.debug(`Range: set to ${versionRange(range)}`);
   const codemodRunner = codemodRunnerFactory(project, range).dry(options.dry ?? false).onSelectCodemods(options.selectCodemods ?? null).setLogger(logger);
   let report;
@@ -1259,7 +1292,7 @@ const listCodemods$1 = async (options) => {
   const cwd = resolvePath(options.cwd);
   const project = projectFactory(cwd);
   const range = findRangeFromTarget(project, target);
-  logger.debug(`Project: ${projectType(project.type)} found in ${path(cwd)}`);
+  logger.debug(projectDetails(project));
   logger.debug(`Range: set to ${versionRange(range)}`);
   const repo = codemodRepositoryFactory();
   repo.refresh();
@@ -1444,7 +1477,7 @@ When executed on a Strapi plugin project, it shows every codemods.
     return listCodemods(options);
   });
 };
-const version = "5.0.0-rc.9";
+const version = "5.0.0";
 register$1(commander.program);
 register(commander.program);
 commander.program.usage("<command> [options]").on("command:*", ([invalidCmd]) => {