@comet/upgrade 1.19.0 → 1.21.0

package/lib/index.js

@@ -1,36 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-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 };
 };
@@ -43,52 +11,50 @@ 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* () {
-        const targetVersionArg = process.argv[2];
-        if (targetVersionArg === undefined) {
-            console.error("Missing target version! Usage: npx @comet/upgrade <version>");
-            process.exit(-1);
-        }
-        const isUpgradeScript = targetVersionArg.endsWith(".ts");
-        if (isUpgradeScript) {
-            if (fs_1.default.existsSync(path_1.default.join(__dirname, targetVersionArg.replace(/\.ts$/, ".js")))) {
-                yield runUpgradeScript(targetVersionArg.replace(/\.ts$/, ".js"));
-            }
-            else {
-                console.error(`Can't find upgrade script '${targetVersionArg}'`);
-                process.exit(-1);
-            }
-            return;
-        }
-        const targetVersion = semver_1.default.coerce(targetVersionArg, { includePrerelease: true });
-        if (!targetVersion) {
-            console.error("Can't parse version number. Example usage: npx @comet/upgrade v4");
-            process.exit(-1);
+async function main() {
+    const targetVersionArg = process.argv[2];
+    if (targetVersionArg === undefined) {
+        console.error("Missing target version! Usage: npx @comet/upgrade <version>");
+        process.exit(-1);
+    }
+    const isUpgradeScript = targetVersionArg.endsWith(".ts");
+    if (isUpgradeScript) {
+        if (fs_1.default.existsSync(path_1.default.join(__dirname, targetVersionArg.replace(/\.ts$/, ".js")))) {
+            await runUpgradeScript(targetVersionArg.replace(/\.ts$/, ".js"));
+            await runEslintFix();
         }
-        const targetVersionFolder = `v${targetVersion.major}`;
-        const scriptsFolder = path_1.default.join(__dirname, targetVersionFolder);
-        if (!fs_1.default.existsSync(scriptsFolder)) {
-            console.error(`Can't find upgrade scripts for target version '${targetVersionFolder}'`);
-            listTargetVersions();
+        else {
+            console.error(`Can't find upgrade script '${targetVersionArg}'`);
             process.exit(-1);
         }
-        const currentVersion = getCurrentVersion();
-        console.info(`Upgrading from v${currentVersion} to v${targetVersion}`);
-        console.info("Updating dependencies");
-        yield updateDependencies(targetVersion);
-        yield runUpgradeScripts(targetVersionFolder);
-        yield runEslintFix();
-    });
+        return;
+    }
+    const targetVersion = semver_1.default.coerce(targetVersionArg, { includePrerelease: true });
+    if (!targetVersion) {
+        console.error("Can't parse version number. Example usage: npx @comet/upgrade v4");
+        process.exit(-1);
+    }
+    const targetVersionFolder = `v${targetVersion.major}`;
+    const scriptsFolder = path_1.default.join(__dirname, targetVersionFolder);
+    if (!fs_1.default.existsSync(scriptsFolder)) {
+        console.error(`Can't find upgrade scripts for target version '${targetVersionFolder}'`);
+        listTargetVersions();
+        process.exit(-1);
+    }
+    const currentVersion = getCurrentVersion();
+    console.info(`Upgrading from v${currentVersion} to v${targetVersion}`);
+    console.info("Updating dependencies");
+    await updateDependencies(targetVersion);
+    await runUpgradeScripts(targetVersionFolder);
+    await runEslintFix();
 }
 function getCurrentVersion() {
-    var _a;
     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);
     }
     const packageJson = JSON.parse(fs_1.default.readFileSync("admin/package.json").toString());
-    const versionRange = (_a = packageJson.dependencies) === null || _a === void 0 ? void 0 : _a["@comet/admin"];
+    const versionRange = packageJson.dependencies?.["@comet/admin"];
     if (versionRange === undefined) {
         console.error(`Package '@comet/admin' isn't listed as a dependency. Is this a Comet DXP project?`);
         process.exit(-1);
@@ -102,86 +68,79 @@ function getCurrentVersion() {
     const version = versionMatches[0];
     return semver_1.default.major(version);
 }
-function updateDependencies(targetVersion) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const packages = {
-            api: ["@comet/blocks-api", "@comet/cms-api"],
-            admin: [
-                "@comet/admin",
-                "@comet/admin-color-picker",
-                "@comet/admin-date-time",
-                "@comet/admin-icons",
-                "@comet/admin-react-select",
-                "@comet/admin-rte",
-                "@comet/admin-theme",
-                "@comet/blocks-admin",
-                "@comet/cms-admin",
-            ],
-            site: ["@comet/cms-site"],
-        };
-        for (const microservice of microservices) {
-            if (!microserviceExists(microservice)) {
-                console.warn(`File '${microservice}/package.json' doesn't exist. Skipping microservice`);
-                continue;
-            }
-            const packageJson = JSON.parse(fs_1.default.readFileSync(`${microservice}/package.json`).toString());
-            const dependencies = packages[microservice].filter((packageName) => { var _a; return ((_a = packageJson.dependencies) === null || _a === void 0 ? void 0 : _a[packageName]) !== undefined; });
-            const devDependencies = ["@comet/cli", "@comet/eslint-config"].filter((packageName) => { var _a; return ((_a = packageJson.devDependencies) === null || _a === void 0 ? void 0 : _a[packageName]) !== undefined; });
-            if (dependencies.length === 0 && devDependencies.length === 0) {
-                console.warn(`Microservice '${microservice}' has no Comet DXP dependencies. Skipping install`);
-                continue;
-            }
-            yield (0, execute_command_util_1.executeCommand)("npm", [
-                "install",
-                "--prefix",
-                microservice,
-                "--no-audit",
-                "--loglevel",
-                "error",
-                targetVersion.prerelease.length > 0 ? "--save-exact" : "",
-                ...dependencies.map((dependency) => `${dependency}@${targetVersion.version}`),
-                ...devDependencies.map((dependency) => `${dependency}@${targetVersion.version}`),
-            ]);
+async function updateDependencies(targetVersion) {
+    const packages = {
+        api: ["@comet/blocks-api", "@comet/cms-api"],
+        admin: [
+            "@comet/admin",
+            "@comet/admin-color-picker",
+            "@comet/admin-date-time",
+            "@comet/admin-icons",
+            "@comet/admin-react-select",
+            "@comet/admin-rte",
+            "@comet/admin-theme",
+            "@comet/blocks-admin",
+            "@comet/cms-admin",
+        ],
+        site: ["@comet/cms-site"],
+    };
+    for (const microservice of microservices) {
+        if (!microserviceExists(microservice)) {
+            console.warn(`File '${microservice}/package.json' doesn't exist. Skipping microservice`);
+            continue;
         }
-    });
-}
-function runUpgradeScripts(targetVersionFolder) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const scriptsFolder = path_1.default.join(__dirname, targetVersionFolder);
-        for (const fileName of fs_1.default.readdirSync(scriptsFolder)) {
-            yield runUpgradeScript(path_1.default.join(targetVersionFolder, fileName));
+        const packageJson = JSON.parse(fs_1.default.readFileSync(`${microservice}/package.json`).toString());
+        const dependencies = packages[microservice].filter((packageName) => packageJson.dependencies?.[packageName] !== undefined);
+        const devDependencies = ["@comet/cli", "@comet/eslint-config", "@comet/eslint-plugin"].filter((packageName) => packageJson.devDependencies?.[packageName] !== undefined);
+        if (dependencies.length === 0 && devDependencies.length === 0) {
+            console.warn(`Microservice '${microservice}' has no Comet DXP dependencies. Skipping install`);
+            continue;
         }
-    });
+        await (0, execute_command_util_1.executeCommand)("npm", [
+            "install",
+            "--prefix",
+            microservice,
+            "--no-audit",
+            "--loglevel",
+            "error",
+            targetVersion.prerelease.length > 0 ? "--save-exact" : "",
+            ...dependencies.map((dependency) => `${dependency}@${targetVersion.version}`),
+            ...devDependencies.map((dependency) => `${dependency}@${targetVersion.version}`),
+        ]);
+    }
 }
-function runUpgradeScript(script) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const upgradeScript = yield (_a = path_1.default.join(__dirname, script), Promise.resolve().then(() => __importStar(require(_a))));
-        try {
-            yield upgradeScript.default();
+async function runUpgradeScripts(targetVersionFolder) {
+    const scriptsFolder = path_1.default.join(__dirname, targetVersionFolder);
+    for (const fileName of fs_1.default.readdirSync(scriptsFolder)) {
+        await runUpgradeScript(path_1.default.join(targetVersionFolder, fileName));
+    }
+}
+async function runUpgradeScript(script) {
+    const upgradeScript = await import(path_1.default.join(__dirname, script));
+    try {
+        // Need default.default because of ESM interoperability with CommonJS.
+        // See https://www.typescriptlang.org/docs/handbook/modules/reference.html#node16-nodenext.
+        await upgradeScript.default.default();
+    }
+    catch (error) {
+        console.error(`Script '${script}' failed to execute. See original error below`);
+        console.error(error);
+    }
+}
+async function runEslintFix() {
+    console.info("Fixing ESLint errors");
+    for (const microservice of microservices) {
+        if (!microserviceExists(microservice)) {
+            continue;
         }
-        catch (error) {
-            console.error(`Script '${script}' failed to execute. See original error below`);
-            console.error(error);
+        try {
+            await (0, execute_command_util_1.executeCommand)("npm", ["run", "--prefix", microservice, "--no-audit", "--loglevel", "error", "lint:eslint", "--", "--fix"]);
         }
-    });
-}
-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 (0, execute_command_util_1.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);
-            }
+        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");

package/lib/util/format-code.util.js

@@ -1,22 +1,10 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatCode = void 0;
 const eslint_1 = require("eslint");
-function formatCode(code, filePath) {
-    var _a, _b, _c, _d;
-    return __awaiter(this, void 0, void 0, function* () {
-        const eslint = new eslint_1.ESLint({ cwd: process.cwd(), fix: true });
-        const lintResult = yield eslint.lintText(code, { filePath });
-        return (_d = (_b = (_a = lintResult[0]) === null || _a === void 0 ? void 0 : _a.output) !== null && _b !== void 0 ? _b : (_c = lintResult[0]) === null || _c === void 0 ? void 0 : _c.source) !== null && _d !== void 0 ? _d : code;
-    });
+async function formatCode(code, filePath) {
+    const eslint = new eslint_1.ESLint({ cwd: process.cwd(), fix: true });
+    const lintResult = await eslint.lintText(code, { filePath });
+    return lintResult[0]?.output ?? lintResult[0]?.source ?? code;
 }
 exports.formatCode = formatCode;

package/lib/util/update-dependency-version.util.js

@@ -1,26 +1,15 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateDependencyVersion = void 0;
 const promises_1 = require("fs/promises");
 const format_code_util_1 = require("./format-code.util");
-function updateDependencyVersion(packageJsonPath, packageName, newVersion) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const fileContent = (yield (0, promises_1.readFile)(packageJsonPath)).toString();
-        const packageJson = JSON.parse(fileContent);
-        if (packageJson.dependencies && packageJson.dependencies[packageName]) {
-            packageJson.dependencies[packageName] = newVersion;
-        }
-        const updatedContent = JSON.stringify(packageJson, null, 4);
-        yield (0, promises_1.writeFile)(packageJsonPath, yield (0, format_code_util_1.formatCode)(updatedContent, packageJsonPath));
-    });
+async function updateDependencyVersion(packageJsonPath, packageName, newVersion) {
+    const fileContent = (await (0, promises_1.readFile)(packageJsonPath)).toString();
+    const packageJson = JSON.parse(fileContent);
+    if (packageJson.dependencies && packageJson.dependencies[packageName]) {
+        packageJson.dependencies[packageName] = newVersion;
+    }
+    const updatedContent = JSON.stringify(packageJson, null, 4);
+    await (0, promises_1.writeFile)(packageJsonPath, await (0, format_code_util_1.formatCode)(updatedContent, packageJsonPath));
 }
 exports.updateDependencyVersion = updateDependencyVersion;

package/lib/v4/remove-clear-types-script.js

@@ -1,13 +1,4 @@
 "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 };
 };
@@ -17,23 +8,21 @@ const prettier_1 = __importDefault(require("prettier"));
 /**
  * Removes unnecessary clear:types script before GraphQL code generation that interferes with block code generation.
  */
-function removeClearTypesScript() {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!fs_1.default.existsSync("site/package.json")) {
-            return;
-        }
-        const sitePackageJson = JSON.parse(fs_1.default.readFileSync("site/package.json").toString());
-        if (sitePackageJson.scripts["clear:types"]) {
-            delete sitePackageJson.scripts["clear:types"];
-        }
-        if (sitePackageJson.scripts["gql:types"]) {
-            sitePackageJson.scripts["gql:types"] = sitePackageJson.scripts["gql:types"].replace("npm run clear:types && ", "");
-        }
-        if (sitePackageJson.scripts["gql:watch"]) {
-            sitePackageJson.scripts["gql:watch"] = sitePackageJson.scripts["gql:watch"].replace("npm run clear:types && ", "");
-        }
-        const prettierConfig = yield prettier_1.default.resolveConfig(process.cwd());
-        fs_1.default.writeFileSync("site/package.json", prettier_1.default.format(JSON.stringify(sitePackageJson), Object.assign(Object.assign({}, prettierConfig), { parser: "json" })));
-    });
+async function removeClearTypesScript() {
+    if (!fs_1.default.existsSync("site/package.json")) {
+        return;
+    }
+    const sitePackageJson = JSON.parse(fs_1.default.readFileSync("site/package.json").toString());
+    if (sitePackageJson.scripts["clear:types"]) {
+        delete sitePackageJson.scripts["clear:types"];
+    }
+    if (sitePackageJson.scripts["gql:types"]) {
+        sitePackageJson.scripts["gql:types"] = sitePackageJson.scripts["gql:types"].replace("npm run clear:types && ", "");
+    }
+    if (sitePackageJson.scripts["gql:watch"]) {
+        sitePackageJson.scripts["gql:watch"] = sitePackageJson.scripts["gql:watch"].replace("npm run clear:types && ", "");
+    }
+    const prettierConfig = await prettier_1.default.resolveConfig(process.cwd());
+    fs_1.default.writeFileSync("site/package.json", prettier_1.default.format(JSON.stringify(sitePackageJson), { ...prettierConfig, parser: "json" }));
 }
 exports.default = removeClearTypesScript;

package/lib/v6/rename-build-runtime.js

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const promises_1 = require("fs/promises");
 const glob_1 = require("glob");
@@ -15,17 +6,15 @@ const format_code_util_1 = require("../util/format-code.util");
 /**
  * Renames BuildRuntime component to JobRuntime.
  */
-function renameBuildRuntime() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const files = glob_1.glob.sync(["admin/src/**/*.tsx"]);
-        for (const filePath of files) {
-            let fileContent = (yield (0, promises_1.readFile)(filePath)).toString();
-            if (!fileContent.includes("BuildRuntime")) {
-                continue;
-            }
-            fileContent = fileContent.replace(/BuildRuntime/g, "JobRuntime");
-            yield (0, promises_1.writeFile)(filePath, yield (0, format_code_util_1.formatCode)(fileContent, filePath));
+async function renameBuildRuntime() {
+    const files = glob_1.glob.sync(["admin/src/**/*.tsx"]);
+    for (const filePath of files) {
+        let fileContent = (await (0, promises_1.readFile)(filePath)).toString();
+        if (!fileContent.includes("BuildRuntime")) {
+            continue;
         }
-    });
+        fileContent = fileContent.replace(/BuildRuntime/g, "JobRuntime");
+        await (0, promises_1.writeFile)(filePath, await (0, format_code_util_1.formatCode)(fileContent, filePath));
+    }
 }
 exports.default = renameBuildRuntime;

package/lib/v6/rename-job-status-enum.js

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const promises_1 = require("fs/promises");
 const glob_1 = require("glob");
@@ -15,18 +6,16 @@ const format_code_util_1 = require("../util/format-code.util");
 /**
  * Renames JobStatus enum to KubernetesJobStatus.
  */
-function renameJobStatusEnum() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const files = glob_1.glob.sync(["api/src/**/*.ts"]);
-        for (const filePath of files) {
-            let fileContent = (yield (0, promises_1.readFile)(filePath)).toString();
-            // Some of our projects have a custom JobStatus enum, so we need to check for that.
-            if (!/import { .*JobStatus.*} from "@comet\/cms-api";/.test(fileContent)) {
-                continue;
-            }
-            fileContent = fileContent.replace(/JobStatus/g, "KubernetesJobStatus");
-            yield (0, promises_1.writeFile)(filePath, yield (0, format_code_util_1.formatCode)(fileContent, filePath));
+async function renameJobStatusEnum() {
+    const files = glob_1.glob.sync(["api/src/**/*.ts"]);
+    for (const filePath of files) {
+        let fileContent = (await (0, promises_1.readFile)(filePath)).toString();
+        // Some of our projects have a custom JobStatus enum, so we need to check for that.
+        if (!/import { .*JobStatus.*} from "@comet\/cms-api";/.test(fileContent)) {
+            continue;
         }
-    });
+        fileContent = fileContent.replace(/JobStatus/g, "KubernetesJobStatus");
+        await (0, promises_1.writeFile)(filePath, await (0, format_code_util_1.formatCode)(fileContent, filePath));
+    }
 }
 exports.default = renameJobStatusEnum;

package/lib/v6/rename-subject-entity-decorator.js

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const promises_1 = require("fs/promises");
 const glob_1 = require("glob");
@@ -15,17 +6,15 @@ const format_code_util_1 = require("../util/format-code.util");
 /**
  * Renames @SubjectEntity() decorator to @AffectedEntity().
  */
-function renameSubjectEntityDecorator() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const files = glob_1.glob.sync(["api/src/**/*.ts"]);
-        for (const filePath of files) {
-            let fileContent = (yield (0, promises_1.readFile)(filePath)).toString();
-            if (!fileContent.includes("SubjectEntity")) {
-                continue;
-            }
-            fileContent = fileContent.replace(/SubjectEntity/g, "AffectedEntity");
-            yield (0, promises_1.writeFile)(filePath, yield (0, format_code_util_1.formatCode)(fileContent, filePath));
+async function renameSubjectEntityDecorator() {
+    const files = glob_1.glob.sync(["api/src/**/*.ts"]);
+    for (const filePath of files) {
+        let fileContent = (await (0, promises_1.readFile)(filePath)).toString();
+        if (!fileContent.includes("SubjectEntity")) {
+            continue;
         }
-    });
+        fileContent = fileContent.replace(/SubjectEntity/g, "AffectedEntity");
+        await (0, promises_1.writeFile)(filePath, await (0, format_code_util_1.formatCode)(fileContent, filePath));
+    }
 }
 exports.default = renameSubjectEntityDecorator;

package/lib/v7/add-site-preview-secret.js

@@ -22,15 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-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 };
 };
@@ -38,14 +29,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const crypto = __importStar(require("node:crypto"));
 const ts_morph_1 = require("ts-morph");
-function addSitePreviewSecret() {
-    return __awaiter(this, void 0, void 0, function* () {
-        updateApiFiles1();
-        updateApiFiles2();
-        updateApiFiles3();
-        updateDotEnvFile();
-        updateValuesTplFile();
-    });
+async function addSitePreviewSecret() {
+    updateApiFiles1();
+    updateApiFiles2();
+    updateApiFiles3();
+    updateDotEnvFile();
+    updateValuesTplFile();
 }
 exports.default = addSitePreviewSecret;
 function updateApiFiles1() {
@@ -65,39 +54,41 @@ function updateApiFiles1() {
     sourceFile.saveSync();
     console.log("  finished");
 }
-function updateApiFiles2() {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        console.log("Add sitePreviewSecret to api/src/config/config.ts ...");
-        const project = new ts_morph_1.Project({ tsConfigFilePath: "./api/tsconfig.json" });
-        const sourceFile = project.getSourceFile("api/src/config/config.ts");
-        if (!sourceFile) {
-            console.error("  Could not file file, make sure to add sitePreviewSecret: envVars.SITE_PREVIEW_SECRET");
-            return;
-        }
-        (_b = (_a = sourceFile
-            .getFunction("createConfig")) === null || _a === void 0 ? void 0 : _a.getBody()) === null || _b === void 0 ? void 0 : _b.getDescendantsOfKind(ts_morph_1.SyntaxKind.ReturnStatement)[0].getChildrenOfKind(ts_morph_1.SyntaxKind.ObjectLiteralExpression)[0].addProperty("sitePreviewSecret: envVars.SITE_PREVIEW_SECRET,");
-        sourceFile.saveSync();
-        console.log("  finished");
-    });
+async function updateApiFiles2() {
+    console.log("Add sitePreviewSecret to api/src/config/config.ts ...");
+    const project = new ts_morph_1.Project({ tsConfigFilePath: "./api/tsconfig.json" });
+    const sourceFile = project.getSourceFile("api/src/config/config.ts");
+    if (!sourceFile) {
+        console.error("  Could not file file, make sure to add sitePreviewSecret: envVars.SITE_PREVIEW_SECRET");
+        return;
+    }
+    sourceFile
+        .getFunction("createConfig")
+        ?.getBody()
+        ?.getDescendantsOfKind(ts_morph_1.SyntaxKind.ReturnStatement)[0]
+        .getChildrenOfKind(ts_morph_1.SyntaxKind.ObjectLiteralExpression)[0]
+        .addProperty("sitePreviewSecret: envVars.SITE_PREVIEW_SECRET,");
+    sourceFile.saveSync();
+    console.log("  finished");
 }
-function updateApiFiles3() {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        console.log("Add sitePreviewSecret to api/src/app.module.ts ...");
-        const project = new ts_morph_1.Project({ tsConfigFilePath: "./api/tsconfig.json" });
-        const sourceFile = project.getSourceFile("api/src/app.module.ts");
-        if (!sourceFile) {
-            console.error("  Could not file file, make sure to add sitePreviewSecret to PageTreeModule");
-            return;
-        }
-        (_b = (_a = sourceFile
-            .getClassOrThrow("AppModule")
-            .getMethodOrThrow("forRoot")
-            .getBody()) === null || _a === void 0 ? void 0 : _a.getDescendantsOfKind(ts_morph_1.SyntaxKind.CallExpression).find((call) => call.getText().includes("PageTreeModule.forRoot"))) === null || _b === void 0 ? void 0 : _b.getChildrenOfKind(ts_morph_1.SyntaxKind.ObjectLiteralExpression)[0].addProperty("sitePreviewSecret: config.sitePreviewSecret,");
-        sourceFile.saveSync();
-        console.log("  finished");
-    });
+async function updateApiFiles3() {
+    console.log("Add sitePreviewSecret to api/src/app.module.ts ...");
+    const project = new ts_morph_1.Project({ tsConfigFilePath: "./api/tsconfig.json" });
+    const sourceFile = project.getSourceFile("api/src/app.module.ts");
+    if (!sourceFile) {
+        console.error("  Could not file file, make sure to add sitePreviewSecret to PageTreeModule");
+        return;
+    }
+    sourceFile
+        .getClassOrThrow("AppModule")
+        .getMethodOrThrow("forRoot")
+        .getBody()
+        ?.getDescendantsOfKind(ts_morph_1.SyntaxKind.CallExpression)
+        .find((call) => call.getText().includes("PageTreeModule.forRoot"))
+        ?.getChildrenOfKind(ts_morph_1.SyntaxKind.ObjectLiteralExpression)[0]
+        .addProperty("sitePreviewSecret: config.sitePreviewSecret,");
+    sourceFile.saveSync();
+    console.log("  finished");
 }
 function updateDotEnvFile() {
     console.log("Update .env");

package/lib/v7/hide-graphql-field-suggestions.js

@@ -1,50 +1,41 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const ts_morph_1 = require("ts-morph");
 /**
  * Adds the `formatError` property to `GraphQLModule` options to hide `GraphQL` field suggestions for non dev environments.
  */
-function hideGraphqlFieldSuggestions() {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const project = new ts_morph_1.Project({ tsConfigFilePath: "./api/tsconfig.json" });
-        const sourceFile = project.getSourceFile("api/src/app.module.ts");
-        if (!sourceFile)
-            throw new Error("app.module.ts not found");
-        // Add the required import statements
-        sourceFile.addImportDeclaration({
-            namedImports: ["ValidationError"],
-            moduleSpecifier: "apollo-server-express",
-        });
-        sourceFile.addImportDeclaration({
-            namedImports: ["ApolloDriverConfig"],
-            moduleSpecifier: "@nestjs/apollo",
-        });
-        // Get the forRoot method within AppModule
-        const forRootMethod = sourceFile.getClassOrThrow("AppModule").getMethodOrThrow("forRoot");
-        // Get the GraphQLModule.forRootAsync call within the forRoot method
-        const graphqlForRootCall = (_a = forRootMethod
-            .getBody()) === null || _a === void 0 ? void 0 : _a.getDescendantsOfKind(ts_morph_1.SyntaxKind.CallExpression).find((call) => call.getText().includes("GraphQLModule.forRootAsync"));
-        if (!graphqlForRootCall)
-            throw new Error("GraphQLModule.forRootAsync call not found within forRoot method.");
-        // Add the generic type ApolloDriverConfig to the GraphQLModule.forRootAsync call
-        if (!forRootMethod.getFullText().includes("GraphQLModule.forRootAsync<ApolloDriverConfig>")) {
-            const expression = graphqlForRootCall.getExpression();
-            if (!expression)
-                throw new Error("Expression not found within GraphQLModule.forRootAsync call.");
-            const expressionText = expression.getText();
-            expression.replaceWithText(expressionText.replace(`${expressionText}`, `${expressionText}<ApolloDriverConfig>`));
-        }
-        const formatErrorImplText = `
+async function hideGraphqlFieldSuggestions() {
+    const project = new ts_morph_1.Project({ tsConfigFilePath: "./api/tsconfig.json" });
+    const sourceFile = project.getSourceFile("api/src/app.module.ts");
+    if (!sourceFile)
+        throw new Error("app.module.ts not found");
+    // Add the required import statements
+    sourceFile.addImportDeclaration({
+        namedImports: ["ValidationError"],
+        moduleSpecifier: "apollo-server-express",
+    });
+    sourceFile.addImportDeclaration({
+        namedImports: ["ApolloDriverConfig"],
+        moduleSpecifier: "@nestjs/apollo",
+    });
+    // Get the forRoot method within AppModule
+    const forRootMethod = sourceFile.getClassOrThrow("AppModule").getMethodOrThrow("forRoot");
+    // Get the GraphQLModule.forRootAsync call within the forRoot method
+    const graphqlForRootCall = forRootMethod
+        .getBody()
+        ?.getDescendantsOfKind(ts_morph_1.SyntaxKind.CallExpression)
+        .find((call) => call.getText().includes("GraphQLModule.forRootAsync"));
+    if (!graphqlForRootCall)
+        throw new Error("GraphQLModule.forRootAsync call not found within forRoot method.");
+    // Add the generic type ApolloDriverConfig to the GraphQLModule.forRootAsync call
+    if (!forRootMethod.getFullText().includes("GraphQLModule.forRootAsync<ApolloDriverConfig>")) {
+        const expression = graphqlForRootCall.getExpression();
+        if (!expression)
+            throw new Error("Expression not found within GraphQLModule.forRootAsync call.");
+        const expressionText = expression.getText();
+        expression.replaceWithText(expressionText.replace(`${expressionText}`, `${expressionText}<ApolloDriverConfig>`));
+    }
+    const formatErrorImplText = `
         (error) => {
             if (process.env.NODE_ENV !== "development") {
                 if (error instanceof ValidationError) {
@@ -53,22 +44,21 @@ function hideGraphqlFieldSuggestions() {
             }
             return error;
         }`;
-        // return if property formatError already exists
-        if (graphqlForRootCall.getArguments().find((arg) => arg.getText().includes("formatError"))) {
-            throw new Error(`formatError property already exists in GraphQLModule.forRootAsync options. To be sure GraphQl field suggestions are disabled for non dev environments, please check if the implementation already contains: ${formatErrorImplText}`);
-        }
-        // Find the useFactory function within the GraphQLModule.forRootAsync call
-        const useFactoryFunction = graphqlForRootCall.getFirstDescendantByKindOrThrow(ts_morph_1.SyntaxKind.ArrowFunction, "useFactory function not found within GraphQLModule.forRootAsync call.");
-        if (!useFactoryFunction.getParent().getText().includes("useFactory"))
-            throw new Error("useFactory function not found within GraphQLModule.forRootAsync call.");
-        // Find the object literal being returned by the useFactory function
-        const returnObjectLiteral = useFactoryFunction.getFirstDescendantByKindOrThrow(ts_morph_1.SyntaxKind.ObjectLiteralExpression, "Object literal not found within useFactory function.");
-        // Add your formatError to GraphQLModule.forRootAsync options
-        returnObjectLiteral.addPropertyAssignment({
-            name: "formatError",
-            initializer: formatErrorImplText,
-        });
-        sourceFile.saveSync();
+    // return if property formatError already exists
+    if (graphqlForRootCall.getArguments().find((arg) => arg.getText().includes("formatError"))) {
+        throw new Error(`formatError property already exists in GraphQLModule.forRootAsync options. To be sure GraphQl field suggestions are disabled for non dev environments, please check if the implementation already contains: ${formatErrorImplText}`);
+    }
+    // Find the useFactory function within the GraphQLModule.forRootAsync call
+    const useFactoryFunction = graphqlForRootCall.getFirstDescendantByKindOrThrow(ts_morph_1.SyntaxKind.ArrowFunction, "useFactory function not found within GraphQLModule.forRootAsync call.");
+    if (!useFactoryFunction.getParent().getText().includes("useFactory"))
+        throw new Error("useFactory function not found within GraphQLModule.forRootAsync call.");
+    // Find the object literal being returned by the useFactory function
+    const returnObjectLiteral = useFactoryFunction.getFirstDescendantByKindOrThrow(ts_morph_1.SyntaxKind.ObjectLiteralExpression, "Object literal not found within useFactory function.");
+    // Add your formatError to GraphQLModule.forRootAsync options
+    returnObjectLiteral.addPropertyAssignment({
+        name: "formatError",
+        initializer: formatErrorImplText,
     });
+    sourceFile.saveSync();
 }
 exports.default = hideGraphqlFieldSuggestions;

package/lib/v7/import-admin-theme-types.js

@@ -1,13 +1,4 @@
 "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 };
 };
@@ -18,21 +9,19 @@ 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}
+async function importAdminThemeTypes() {
+    const filePath = "admin/src/vendors.d.ts";
+    const typeReference = '/// <reference types="@comet/admin-theme" />';
+    let fileContent = "";
+    if (fs_1.default.existsSync(filePath)) {
+        fileContent = (await (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));
-    });
+    await (0, promises_1.writeFile)(filePath, await (0, format_code_util_1.formatCode)(fileContent, filePath));
 }
 exports.default = importAdminThemeTypes;

package/lib/v7/rename-date-filter-to-date-time-filter.js

@@ -1,29 +1,18 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const promises_1 = require("fs/promises");
 const glob_1 = require("glob");
 const format_code_util_1 = require("../util/format-code.util");
 // Renames DateFilter to DateTimeFilter
-function renameDateFilterToDateTimeFilter() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const files = glob_1.glob.sync(["api/src/**/*.ts"]);
-        for (const filePath of files) {
-            let fileContent = (yield (0, promises_1.readFile)(filePath)).toString();
-            if (!fileContent.includes("DateFilter")) {
-                continue;
-            }
-            fileContent = fileContent.replace(/DateFilter/g, "DateTimeFilter");
-            yield (0, promises_1.writeFile)(filePath, yield (0, format_code_util_1.formatCode)(fileContent, filePath));
+async function renameDateFilterToDateTimeFilter() {
+    const files = glob_1.glob.sync(["api/src/**/*.ts"]);
+    for (const filePath of files) {
+        let fileContent = (await (0, promises_1.readFile)(filePath)).toString();
+        if (!fileContent.includes("DateFilter")) {
+            continue;
         }
-    });
+        fileContent = fileContent.replace(/DateFilter/g, "DateTimeFilter");
+        await (0, promises_1.writeFile)(filePath, await (0, format_code_util_1.formatCode)(fileContent, filePath));
+    }
 }
 exports.default = renameDateFilterToDateTimeFilter;

package/lib/v7/replace-gridcoldef-import.js

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const promises_1 = require("fs/promises");
 const glob_1 = require("glob");
@@ -15,33 +6,31 @@ const ts_morph_1 = require("ts-morph");
 /**
  * Replaces the import of `GridColDef` from `@mui/x-data-grid*` with `GridColDef` from `@comet/admin`.
  */
-function replaceGridColDefImport() {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const files = glob_1.glob.sync(["admin/src/**/*.ts", "admin/src/**/*.tsx"]);
-        const project = new ts_morph_1.Project({ tsConfigFilePath: "./admin/tsconfig.json" });
-        for (const filePath of files) {
-            const fileContent = (yield (0, promises_1.readFile)(filePath)).toString();
-            if (!fileContent.includes("GridColDef")) {
-                continue;
-            }
-            const sourceFile = project.getSourceFile(filePath);
-            if (!sourceFile) {
-                throw new Error(`Can't get source file for ${filePath}`);
-            }
-            const dataGridImport = sourceFile.getImportDeclaration((declaration) => declaration.getModuleSpecifierValue().includes("@mui/x-data-grid"));
-            if (!dataGridImport) {
-                continue;
-            }
-            (_a = dataGridImport
-                .getNamedImports()
-                .find((namedImport) => namedImport.getText() === "GridColDef")) === null || _a === void 0 ? void 0 : _a.remove();
-            sourceFile.addImportDeclaration({
-                namedImports: ["GridColDef"],
-                moduleSpecifier: "@comet/admin",
-            });
-            sourceFile.saveSync();
+async function replaceGridColDefImport() {
+    const files = glob_1.glob.sync(["admin/src/**/*.ts", "admin/src/**/*.tsx"]);
+    const project = new ts_morph_1.Project({ tsConfigFilePath: "./admin/tsconfig.json" });
+    for (const filePath of files) {
+        const fileContent = (await (0, promises_1.readFile)(filePath)).toString();
+        if (!fileContent.includes("GridColDef")) {
+            continue;
         }
-    });
+        const sourceFile = project.getSourceFile(filePath);
+        if (!sourceFile) {
+            throw new Error(`Can't get source file for ${filePath}`);
+        }
+        const dataGridImport = sourceFile.getImportDeclaration((declaration) => declaration.getModuleSpecifierValue().includes("@mui/x-data-grid"));
+        if (!dataGridImport) {
+            continue;
+        }
+        dataGridImport
+            .getNamedImports()
+            .find((namedImport) => namedImport.getText() === "GridColDef")
+            ?.remove();
+        sourceFile.addImportDeclaration({
+            namedImports: ["GridColDef"],
+            moduleSpecifier: "@comet/admin",
+        });
+        sourceFile.saveSync();
+    }
 }
 exports.default = replaceGridColDefImport;

package/lib/v7/replace-roboto-with-roboto-flex.js

@@ -1,13 +1,4 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const promises_1 = require("fs/promises");
 const execute_command_util_1 = require("../util/execute-command.util");
@@ -15,35 +6,33 @@ const format_code_util_1 = require("../util/format-code.util");
 /**
  * Replaces the old font package "Roboto" with the new "Roboto Flex"
  */
-function replaceRobotoWithRobotoFlex() {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield replacePackageInPackageJson();
-        yield removeOldPackageImports();
-        yield addNewPackageImport();
-        yield (0, execute_command_util_1.executeCommand)("npm", ["install", "--prefix", "admin", "--no-audit", "--loglevel", "error"]);
-    });
+async function replaceRobotoWithRobotoFlex() {
+    await replacePackageInPackageJson();
+    await removeOldPackageImports();
+    await addNewPackageImport();
+    await (0, execute_command_util_1.executeCommand)("npm", ["install", "--prefix", "admin", "--no-audit", "--loglevel", "error"]);
 }
 exports.default = replaceRobotoWithRobotoFlex;
-const replacePackageInPackageJson = () => __awaiter(void 0, void 0, void 0, function* () {
+const replacePackageInPackageJson = async () => {
     const filePath = "admin/package.json";
-    let fileContent = (yield (0, promises_1.readFile)(filePath)).toString();
+    let fileContent = (await (0, promises_1.readFile)(filePath)).toString();
     const searchString = "@fontsource/roboto";
     const re = new RegExp(`^.*${searchString}.*$`, "gm");
     fileContent = fileContent.replace(re, '    "@fontsource-variable/roboto-flex": "^5.0.0",');
-    yield (0, promises_1.writeFile)(filePath, yield (0, format_code_util_1.formatCode)(fileContent, filePath));
-});
-const removeOldPackageImports = () => __awaiter(void 0, void 0, void 0, function* () {
+    await (0, promises_1.writeFile)(filePath, await (0, format_code_util_1.formatCode)(fileContent, filePath));
+};
+const removeOldPackageImports = async () => {
     const filePath = "admin/src/App.tsx";
-    let fileContent = (yield (0, promises_1.readFile)(filePath)).toString();
+    let fileContent = (await (0, promises_1.readFile)(filePath)).toString();
     const searchString = 'import "@fontsource/roboto';
     const re = new RegExp(`^.*${searchString}.*$`, "gm");
     fileContent = fileContent.replace(re, "");
-    yield (0, promises_1.writeFile)(filePath, yield (0, format_code_util_1.formatCode)(fileContent, filePath));
-});
-const addNewPackageImport = () => __awaiter(void 0, void 0, void 0, function* () {
+    await (0, promises_1.writeFile)(filePath, await (0, format_code_util_1.formatCode)(fileContent, filePath));
+};
+const addNewPackageImport = async () => {
     const filePath = "admin/src/App.tsx";
-    let fileContent = (yield (0, promises_1.readFile)(filePath)).toString();
+    let fileContent = (await (0, promises_1.readFile)(filePath)).toString();
     fileContent = `import "@fontsource-variable/roboto-flex/full.css";
     ${fileContent}`;
-    yield (0, promises_1.writeFile)(filePath, yield (0, format_code_util_1.formatCode)(fileContent, filePath));
-});
+    await (0, promises_1.writeFile)(filePath, await (0, format_code_util_1.formatCode)(fileContent, filePath));
+};

package/lib/v7/use-graphql-scalars.js

@@ -1,41 +1,30 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const promises_1 = require("fs/promises");
 const glob_1 = require("glob");
 const execute_command_util_1 = require("../util/execute-command.util");
 const format_code_util_1 = require("../util/format-code.util");
-function useGraphqlScalars() {
-    return __awaiter(this, void 0, void 0, function* () {
-        // replace graphql-type-json with graphql-scalars in api/package.json
-        const packageJson = yield (0, promises_1.readFile)(`api/package.json`);
-        if (!packageJson.includes("graphql-type-json")) {
-            // if not found, it was not used in the project, so we can skip this migration
-            console.log("graphql-type-json not found in api/package.json. Skipping migration.");
-            return;
+async function useGraphqlScalars() {
+    // replace graphql-type-json with graphql-scalars in api/package.json
+    const packageJson = await (0, promises_1.readFile)(`api/package.json`);
+    if (!packageJson.includes("graphql-type-json")) {
+        // if not found, it was not used in the project, so we can skip this migration
+        console.log("graphql-type-json not found in api/package.json. Skipping migration.");
+        return;
+    }
+    await (0, execute_command_util_1.executeCommand)("npm", ["uninstall", "--prefix", "api", "--no-audit", "--loglevel", "error", "graphql-type-json"]);
+    await (0, execute_command_util_1.executeCommand)("npm", ["install", "--prefix", "api", "--no-audit", "--loglevel", "error", "graphql-scalars"]);
+    // replace graphql-type-json with graphql-scalars in all api files
+    // before: import { GraphQLJSONObject } from "graphql-type-json";
+    // after: import { GraphQLJSONObject } from "graphql-scalars";
+    const files = glob_1.glob.sync(["api/src/**/*.ts"]);
+    for (const filePath of files) {
+        let fileContent = (await (0, promises_1.readFile)(filePath)).toString();
+        if (!fileContent.includes("graphql-type-json")) {
+            continue;
         }
-        yield (0, execute_command_util_1.executeCommand)("npm", ["uninstall", "--prefix", "api", "--no-audit", "--loglevel", "error", "graphql-type-json"]);
-        yield (0, execute_command_util_1.executeCommand)("npm", ["install", "--prefix", "api", "--no-audit", "--loglevel", "error", "graphql-scalars"]);
-        // replace graphql-type-json with graphql-scalars in all api files
-        // before: import { GraphQLJSONObject } from "graphql-type-json";
-        // after: import { GraphQLJSONObject } from "graphql-scalars";
-        const files = glob_1.glob.sync(["api/src/**/*.ts"]);
-        for (const filePath of files) {
-            let fileContent = (yield (0, promises_1.readFile)(filePath)).toString();
-            if (!fileContent.includes("graphql-type-json")) {
-                continue;
-            }
-            fileContent = fileContent.replace(/graphql-type-json/g, "graphql-scalars");
-            yield (0, promises_1.writeFile)(filePath, yield (0, format_code_util_1.formatCode)(fileContent, filePath));
-        }
-    });
+        fileContent = fileContent.replace(/graphql-type-json/g, "graphql-scalars");
+        await (0, promises_1.writeFile)(filePath, await (0, format_code_util_1.formatCode)(fileContent, filePath));
+    }
 }
 exports.default = useGraphqlScalars;

package/lib/v8/mui-upgrade.js

@@ -1,33 +1,22 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = require("fs");
 const execute_command_util_1 = require("../util/execute-command.util");
 const update_dependency_version_util_1 = require("../util/update-dependency-version.util");
 const adminPackageJsonPath = "admin/package.json";
-function updateMuiVersion() {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (!(0, fs_1.existsSync)(adminPackageJsonPath)) {
-            return;
-        }
-        yield (0, update_dependency_version_util_1.updateDependencyVersion)(adminPackageJsonPath, "@mui/material", "^6.0.0");
-        yield (0, update_dependency_version_util_1.updateDependencyVersion)(adminPackageJsonPath, "@mui/system", "^6.0.0");
-        yield (0, update_dependency_version_util_1.updateDependencyVersion)(adminPackageJsonPath, "@mui/utils", "^6.0.0");
-        yield (0, update_dependency_version_util_1.updateDependencyVersion)(adminPackageJsonPath, "@mui/icons-material", "^6.0.0");
-        yield (0, update_dependency_version_util_1.updateDependencyVersion)(adminPackageJsonPath, "@mui/lab", "^6.0.0-beta.10");
-        yield (0, execute_command_util_1.executeCommand)("npm", ["install", "--prefix", "admin", "--no-audit", "--loglevel", "error"]);
-        yield (0, execute_command_util_1.executeCommand)("npx", ["@mui/codemod@latest", "v6.0.0/list-item-button-prop", "admin/src"]);
-        yield (0, execute_command_util_1.executeCommand)("npx", ["@mui/codemod@latest", "v6.0.0/styled", "admin/src"]);
-        yield (0, execute_command_util_1.executeCommand)("npx", ["@mui/codemod@latest", "v6.0.0/sx-prop", "admin/src"]);
-        yield (0, execute_command_util_1.executeCommand)("npx", ["@mui/codemod@latest", "v6.0.0/theme-v6", "admin/src/theme.ts"]);
-    });
+async function updateMuiVersion() {
+    if (!(0, fs_1.existsSync)(adminPackageJsonPath)) {
+        return;
+    }
+    await (0, update_dependency_version_util_1.updateDependencyVersion)(adminPackageJsonPath, "@mui/material", "^6.0.0");
+    await (0, update_dependency_version_util_1.updateDependencyVersion)(adminPackageJsonPath, "@mui/system", "^6.0.0");
+    await (0, update_dependency_version_util_1.updateDependencyVersion)(adminPackageJsonPath, "@mui/utils", "^6.0.0");
+    await (0, update_dependency_version_util_1.updateDependencyVersion)(adminPackageJsonPath, "@mui/icons-material", "^6.0.0");
+    await (0, update_dependency_version_util_1.updateDependencyVersion)(adminPackageJsonPath, "@mui/lab", "^6.0.0-beta.10");
+    await (0, execute_command_util_1.executeCommand)("npm", ["install", "--prefix", "admin", "--no-audit", "--loglevel", "error"]);
+    await (0, execute_command_util_1.executeCommand)("npx", ["@mui/codemod@latest", "v6.0.0/list-item-button-prop", "admin/src"]);
+    await (0, execute_command_util_1.executeCommand)("npx", ["@mui/codemod@latest", "v6.0.0/styled", "admin/src"]);
+    await (0, execute_command_util_1.executeCommand)("npx", ["@mui/codemod@latest", "v6.0.0/sx-prop", "admin/src"]);
+    await (0, execute_command_util_1.executeCommand)("npx", ["@mui/codemod@latest", "v6.0.0/theme-v6", "admin/src/theme.ts"]);
 }
 exports.default = updateMuiVersion;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@comet/upgrade",
-    "version": "1.19.0",
+    "version": "1.21.0",
     "description": "Upgrade scripts for Comet DXP",
     "homepage": "https://github.com/vivid-planet/comet-upgrade#readme",
     "bugs": {
@@ -36,6 +36,7 @@
     },
     "devDependencies": {
         "@comet/eslint-config": "^3.2.1",
+        "@tsconfig/node20": "^20.1.4",
         "@types/node": "^20.0.0",
         "@types/prettier": "^2.7.1",
         "@types/semver": "^7.5.8",
@@ -43,7 +44,7 @@
         "lint-staged": "^13.1.0",
         "npm-run-all": "^4.1.5",
         "rimraf": "^3.0.2",
-        "typescript": "^4.9.4"
+        "typescript": "~5.1.0"
     },
     "engines": {
         "node": "20"