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

package/LICENSE

@@ -2,9 +2,23 @@ Copyright (c) 2015-present Strapi Solutions SAS
 
 Portions of the Strapi software are licensed as follows:
 
-- All software that resides under an "ee/" directory (the “EE Software”), if that directory exists, is licensed under the license defined in "ee/LICENSE".
+* All software that resides under an "ee/" directory (the “EE Software”), if that directory exists, is licensed under the license defined below.
 
-- All software outside of the above-mentioned directories or restrictions above is available under the "MIT Expat" license as set forth below.
+Enterprise License
+
+If you or the company you represent has entered into a written agreement referencing the Enterprise Edition of the Strapi source code available at
+https://github.com/strapi/strapi, then such agreement applies to your use of the Enterprise Edition of the Strapi Software. If you or the company you
+represent is using the Enterprise Edition of the Strapi Software in connection with a subscription to our cloud offering, then the agreement you have
+agreed to with respect to our cloud offering and the licenses included in such agreement apply to your use of the Enterprise Edition of the Strapi Software.
+Otherwise, the Strapi Enterprise Software License Agreement (found here https://strapi.io/enterprise-terms) applies to your use of the Enterprise Edition of the Strapi Software.
+
+BY ACCESSING OR USING THE ENTERPRISE EDITION OF THE STRAPI SOFTWARE, YOU ARE AGREEING TO BE BOUND BY THE RELEVANT REFERENCED AGREEMENT.
+IF YOU ARE NOT AUTHORIZED TO ACCEPT THESE TERMS ON BEHALF OF THE COMPANY YOU REPRESENT OR IF YOU DO NOT AGREE TO ALL OF THE RELEVANT TERMS AND CONDITIONS REFERENCED AND YOU
+HAVE NOT OTHERWISE EXECUTED A WRITTEN AGREEMENT WITH STRAPI, YOU ARE NOT AUTHORIZED TO ACCESS OR USE OR ALLOW ANY USER TO ACCESS OR USE ANY PART OF
+THE ENTERPRISE EDITION OF THE STRAPI SOFTWARE.  YOUR ACCESS RIGHTS ARE CONDITIONAL ON YOUR CONSENT TO THE RELEVANT REFERENCED TERMS TO THE EXCLUSION OF ALL OTHER TERMS;
+IF THE RELEVANT REFERENCED TERMS ARE CONSIDERED AN OFFER BY YOU, ACCEPTANCE IS EXPRESSLY LIMITED TO THE RELEVANT REFERENCED TERMS.
+
+* All software outside of the above-mentioned directories or restrictions above is available under the "MIT Expat" license as set forth below.
 
 MIT Expat License
 
@@ -18,5 +32,6 @@ furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -39,7 +39,7 @@ Data migrations are not handled by the upgrade tool.
 
 For Strapi v4, no data migrations will be allowed and no support is planned (except in extenuating circumstances eg, a critical security issue somehow relating to the database shape)
 
-For Strapi v5, automated data migrations can be added in the `packages/core/database` package of the `v5/main` branch of this repo.
+For Strapi v5, automated data migrations can be added in the `packages/core/database` package of the `develop` branch of this repo.
 
 ## Usage
 

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));
   }
 }
@@ -380,7 +383,11 @@ const transformJSON = async (codemodPath, paths, config) => {
     timeElapsed: "",
     stats: {}
   };
-  const esbuildOptions = { extensions: [".js", ".mjs", ".ts"] };
+  const esbuildOptions = {
+    extensions: [".js", ".mjs", ".ts"],
+    hookIgnoreNodeModules: false,
+    hookMatcher: fp.isEqual(codemodPath)
+  };
   const { unregister } = node.register(esbuildOptions);
   const module = require(codemodPath);
   unregister();
@@ -421,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",
@@ -431,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 {
@@ -445,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) {
@@ -477,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, {
@@ -490,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,
@@ -511,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() {
@@ -582,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);
@@ -596,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;
@@ -625,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);
@@ -1180,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".`
@@ -1234,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;
@@ -1255,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();
@@ -1440,7 +1477,7 @@ When executed on a Strapi plugin project, it shows every codemods.
     return listCodemods(options);
   });
 };
-const version = "0.0.0-experimental.f75e3c6d67cc47c64ab37479efdbb7b43be50b78";
+const version = "0.0.0-experimental.f9cac24ba3b2f6acb12d0fb5669106e5a134174e";
 register$1(commander.program);
 register(commander.program);
 commander.program.usage("<command> [options]").on("command:*", ([invalidCmd]) => {