@comet/upgrade 1.3.0 → 1.5.0

package/README.md

@@ -19,7 +19,7 @@ npx @comet/upgrade v4
 1. Start the development process:
 
     ```sh
-    yarn start
+    npm start
     ```
 
 2. Add a new script for the version you want to upgrade to, for instance, `src/v4/change-something.ts`.

package/lib/index.js

@@ -40,6 +40,10 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const semver_1 = __importDefault(require("semver"));
 const VERSION_NUMBER = /^v?\d+$/;
+const microservices = ["api", "admin", "site"];
+function microserviceExists(microservice) {
+    return fs_1.default.existsSync(`${microservice}/package.json`);
+}
 function main() {
     return __awaiter(this, void 0, void 0, function* () {
         let targetVersionArg = process.argv[2];
@@ -66,11 +70,12 @@ function main() {
         console.info("Updating dependencies");
         yield updateDependencies(targetVersion);
         yield runUpgradeScripts(targetVersion);
+        yield runEslintFix();
     });
 }
 function getCurrentVersion() {
     var _a;
-    if (!fs_1.default.existsSync("admin/package.json")) {
+    if (!microserviceExists("admin")) {
         console.error(`File 'admin/package.json' doesn't exist. Make sure to call the script in the root of your project`);
         process.exit(-1);
     }
@@ -91,7 +96,6 @@ function getCurrentVersion() {
 }
 function updateDependencies(targetVersion) {
     return __awaiter(this, void 0, void 0, function* () {
-        const microservices = ["api", "admin", "site"];
         const packages = {
             api: ["@comet/blocks-api", "@comet/cms-api"],
             admin: [
@@ -108,7 +112,7 @@ function updateDependencies(targetVersion) {
             site: ["@comet/cms-site"],
         };
         for (const microservice of microservices) {
-            if (!fs_1.default.existsSync(`${microservice}/package.json`)) {
+            if (!microserviceExists(microservice)) {
                 console.warn(`File '${microservice}/package.json' doesn't exist. Skipping microservice`);
                 continue;
             }
@@ -163,6 +167,23 @@ function runUpgradeScripts(targetVersion) {
         }
     });
 }
+function runEslintFix() {
+    return __awaiter(this, void 0, void 0, function* () {
+        console.info("Fixing ESLint errors");
+        for (const microservice of microservices) {
+            if (!microserviceExists(microservice)) {
+                continue;
+            }
+            try {
+                yield executeCommand("npm", ["run", "--prefix", microservice, "--no-audit", "--loglevel", "error", "lint:eslint", "--", "--fix"]);
+            }
+            catch (err) {
+                console.error(`Failed to fix ESLint errors in ${microservice}. See original error below`);
+                console.error(err);
+            }
+        }
+    });
+}
 function listTargetVersions() {
     console.info("Available target versions");
     const targetVersions = fs_1.default.readdirSync(__dirname).filter((entry) => entry.startsWith("v"));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@comet/upgrade",
-    "version": "1.3.0",
+    "version": "1.5.0",
     "description": "Upgrade scripts for Comet DXP",
     "homepage": "https://github.com/vivid-planet/comet-upgrade#readme",
     "bugs": {
@@ -19,13 +19,13 @@
         "lib/**/*.js"
     ],
     "scripts": {
-        "build": "yarn clean && tsc",
+        "build": "npm run clean && tsc",
         "clean": "rimraf lib/",
         "lint": "run-p lint:eslint lint:tsc",
         "lint:eslint": "eslint --max-warnings 0 src/",
         "lint:tsc": "tsc --noEmit",
         "prepare": "husky install",
-        "start": "yarn clean && tsc --watch"
+        "start": "npm run clean && tsc --watch"
     },
     "dependencies": {
         "eslint": "^8.56.0",
@@ -40,14 +40,12 @@
         "@types/semver": "^7.3.13",
         "husky": "^8.0.2",
         "lint-staged": "^13.1.0",
+        "npm-run-all": "^4.1.5",
         "rimraf": "^3.0.2",
-        "typescript": "^4.9.4",
-        "yarn-run-all": "^3.1.1"
+        "typescript": "^4.9.4"
     },
-    "packageManager": "yarn@3.3.0",
     "engines": {
-        "node": "20",
-        "yarn": "3"
+        "node": "20"
     },
     "publishConfig": {
         "access": "public",