@strapi/upgrade 0.0.0-experimental.f75e3c6d67cc47c64ab37479efdbb7b43be50b78 → 0.0.0-experimental.f9cac24ba3b2f6acb12d0fb5669106e5a134174e

package/dist/index.mjs

@@ -6,7 +6,7 @@ import { packageManager } from "@strapi/utils";
 import { cloneDeep, get, has, merge, set, omit, isEqual, groupBy, size } from "lodash/fp";
 import fse from "fs-extra";
 import assert from "node:assert";
-import { glob } from "glob";
+import fastglob from "fast-glob";
 import { run } from "jscodeshift/src/Runner";
 import { register } from "esbuild-register/dist/node";
 import CliTable3 from "cli-table3";
@@ -277,7 +277,9 @@ class FileScanner {
     this.cwd = cwd;
   }
   scan(patterns) {
-    const filenames = glob.sync(patterns, { cwd: this.cwd });
+    const filenames = fastglob.sync(patterns, {
+      cwd: this.cwd
+    });
     return filenames.map((filename) => path$1.join(this.cwd, filename));
   }
 }
@@ -326,7 +328,11 @@ const transformJSON = async (codemodPath, paths, config) => {
     timeElapsed: "",
     stats: {}
   };
-  const esbuildOptions = { extensions: [".js", ".mjs", ".ts"] };
+  const esbuildOptions = {
+    extensions: [".js", ".mjs", ".ts"],
+    hookIgnoreNodeModules: false,
+    hookMatcher: isEqual(codemodPath)
+  };
   const { unregister } = register(esbuildOptions);
   const module = require(codemodPath);
   unregister();
@@ -371,8 +377,10 @@ const index$b = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   jsonRunnerFactory
 }, Symbol.toStringTag, { value: "Module" }));
 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",
@@ -381,22 +389,19 @@ 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`;
 const constants$3 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  PROJECT_DEFAULT_ALLOWED_EXTENSIONS,
-  PROJECT_DEFAULT_ALLOWED_ROOT_PATHS,
-  PROJECT_DEFAULT_CODE_EXTENSIONS,
-  PROJECT_DEFAULT_JSON_EXTENSIONS,
-  PROJECT_DEFAULT_PATTERNS,
+  PROJECT_ALLOWED_EXTENSIONS,
+  PROJECT_APP_ALLOWED_ROOT_PATHS,
+  PROJECT_CODE_EXTENSIONS,
+  PROJECT_JSON_EXTENSIONS,
   PROJECT_PACKAGE_JSON,
+  PROJECT_PLUGIN_ALLOWED_ROOT_PATHS,
+  PROJECT_PLUGIN_ROOT_FILES,
   SCOPED_STRAPI_PACKAGE_PREFIX,
   STRAPI_DEPENDENCY_NAME
 }, Symbol.toStringTag, { value: "Module" }));
@@ -406,11 +411,13 @@ class Project {
   files;
   packageJSONPath;
   packageJSON;
-  constructor(cwd) {
+  paths;
+  constructor(cwd, config) {
     if (!fse.pathExistsSync(cwd)) {
       throw new Error(`ENOENT: no such file or directory, access '${cwd}'`);
     }
     this.cwd = cwd;
+    this.paths = config.paths;
     this.refresh();
   }
   getFilesByExtensions(extensions) {
@@ -438,12 +445,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, {
@@ -451,7 +454,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,
@@ -472,23 +475,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() {
@@ -543,6 +555,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$1.join(cwd, PROJECT_PACKAGE_JSON);
@@ -557,10 +593,7 @@ const isPlugin = (cwd) => {
 };
 const projectFactory = (cwd) => {
   fse.accessSync(cwd);
-  if (isPlugin(cwd)) {
-    return new PluginProject(cwd);
-  }
-  return new AppProject(cwd);
+  return isPlugin(cwd) ? new PluginProject(cwd) : new AppProject(cwd);
 };
 const isPluginProject = (project) => {
   return project instanceof PluginProject;
@@ -613,6 +646,9 @@ const version = (version2) => {
 const codemodUID = (uid) => {
   return chalk.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.cyan(type);
 const versionRange = (range) => chalk.italic.yellow(range.raw);
 const transform = (transformFilePath) => chalk.cyan(transformFilePath);
@@ -679,6 +715,7 @@ const index$8 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   durationMs,
   highlight,
   path,
+  projectDetails,
   projectType,
   reports,
   transform,
@@ -1214,6 +1251,7 @@ const upgrade = async (options) => {
   const { logger, codemodsTarget } = options;
   const cwd = path$1.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".`
@@ -1268,7 +1306,7 @@ const runCodemods = 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;
@@ -1289,7 +1327,7 @@ const listCodemods = 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();