@comet/upgrade 1.4.0 → 1.6.0

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/lib/v7/import-admin-theme-types.js

@@ -0,0 +1,38 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = __importDefault(require("fs"));
+const promises_1 = require("fs/promises");
+const format_code_util_1 = require("../util/format-code.util");
+/**
+ * Imports types from `@comet/admin-theme` in vendors.d.ts to allow using custom theme variants and colors
+ */
+function importAdminThemeTypes() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const filePath = "admin/src/vendors.d.ts";
+        const typeReference = '/// <reference types="@comet/admin-theme" />';
+        let fileContent = "";
+        if (fs_1.default.existsSync(filePath)) {
+            fileContent = (yield (0, promises_1.readFile)(filePath)).toString();
+        }
+        if (fileContent.includes(typeReference)) {
+            return;
+        }
+        fileContent = `${typeReference}
+    
+    ${fileContent}`;
+        yield (0, promises_1.writeFile)(filePath, yield (0, format_code_util_1.formatCode)(fileContent, filePath));
+    });
+}
+exports.default = importAdminThemeTypes;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@comet/upgrade",
-    "version": "1.4.0",
+    "version": "1.6.0",
     "description": "Upgrade scripts for Comet DXP",
     "homepage": "https://github.com/vivid-planet/comet-upgrade#readme",
     "bugs": {