@comet/upgrade 1.23.0 → 1.25.0

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

@@ -29,12 +29,15 @@ 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");
+const execute_command_util_1 = require("../util/execute-command.util");
 async function addSitePreviewSecret() {
     updateApiFiles1();
     updateApiFiles2();
     updateApiFiles3();
     updateDotEnvFile();
     updateValuesTplFile();
+    updateChart();
+    await executeHelmDependencyUpdate();
 }
 exports.default = addSitePreviewSecret;
 function updateApiFiles1() {
@@ -146,3 +149,37 @@ function updateValuesTplFile() {
     fs_1.default.writeFileSync(valuesFileName, content);
     console.log("  finished.");
 }
+function updateChart() {
+    const filename = "deployment/helm/Chart.yaml";
+    console.log(`Update ${filename}`);
+    if (!fs_1.default.existsSync(filename)) {
+        console.error("  could not find file, please make sure to remove authproxy-preview and execute helm dependency update.");
+        return;
+    }
+    const file = fs_1.default.readFileSync(filename, "utf8");
+    const lines = file.split(/\n/);
+    let startingLine = 0;
+    let isAuthproxyPreview = false;
+    lines.forEach((line, index) => {
+        const match1 = line.match(/-.*oauth2-proxy/);
+        if (match1) {
+            startingLine = index;
+        }
+        const match2 = line.match(/alias.*authproxy-preview/);
+        if (match2) {
+            isAuthproxyPreview = true;
+        }
+        const match3 = line.match(/- .*/);
+        if (match3 && isAuthproxyPreview) {
+            lines.splice(startingLine, index - startingLine);
+            isAuthproxyPreview = false;
+        }
+    });
+    const content = lines.join("\n").replace(/oauth2-proxy-preview/g, "site");
+    fs_1.default.writeFileSync(filename, content);
+    console.log("  finished.");
+}
+async function executeHelmDependencyUpdate() {
+    console.log('Execute "helm dependency update deployment/helm" ...');
+    await (0, execute_command_util_1.executeCommand)("helm", ["dependency", "update", "deployment/helm"]);
+}

package/lib/v8/merge-blocks-api-into-cms-api.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const promises_1 = require("fs/promises");
+const glob_1 = require("glob");
+const ts_morph_1 = require("ts-morph");
+const renamedExports = {
+    getMostSignificantPreviewImageUrlTemplate: "getMostSignificantPreviewImageUrlTemplateFromBlock",
+    getPreviewImageUrlTemplates: "getPreviewImageUrlTemplatesFromBlock",
+    getSearchText: "getSearchTextFromBlock",
+    inputToData: "blockInputToData",
+    TransformResponse: "TransformBlockResponse",
+    TransformResponseArray: "TransformBlockResponseArray",
+    transformToSave: "transformToBlockSave",
+    transformToSaveIndex: "transformToBlockSaveIndex",
+    TraversableTransformResponse: "TraversableTransformBlockResponse",
+    TraversableTransformResponseArray: "TraversableTransformBlockResponseArray",
+    typesafeMigrationPipe: "typeSafeBlockMigrationPipe",
+};
+async function mergeBlocksApiIntoCmsApi() {
+    const project = new ts_morph_1.Project({ tsConfigFilePath: "./api/tsconfig.json" });
+    const files = glob_1.glob.sync(["api/src/**/*.ts"]);
+    for (const filePath of files) {
+        const sourceFile = project.getSourceFile(filePath);
+        if (!sourceFile) {
+            throw new Error(`Can't get source file for ${filePath}`);
+        }
+        const blocksApiImport = sourceFile.getImportDeclaration((declaration) => declaration.getModuleSpecifierValue().includes("@comet/blocks-api"));
+        if (!blocksApiImport) {
+            continue;
+        }
+        const blocksApiImports = blocksApiImport.getNamedImports().map((namedImport) => namedImport.getText());
+        const importsToRename = Object.entries(renamedExports).filter(([oldExport]) => blocksApiImports.includes(oldExport));
+        blocksApiImport.remove();
+        const cmsApiImport = sourceFile.getImportDeclaration((declaration) => declaration.getModuleSpecifierValue().includes("@comet/cms-api"));
+        if (cmsApiImport) {
+            cmsApiImport.addNamedImports(blocksApiImports);
+        }
+        else {
+            sourceFile.addImportDeclaration({
+                namedImports: blocksApiImports,
+                moduleSpecifier: "@comet/cms-api",
+            });
+        }
+        await sourceFile.save();
+        let fileContent = (await (0, promises_1.readFile)(filePath)).toString();
+        for (const [oldExport, newExport] of importsToRename) {
+            fileContent = fileContent.replaceAll(oldExport, newExport);
+        }
+        await (0, promises_1.writeFile)(filePath, fileContent);
+    }
+}
+exports.default = mergeBlocksApiIntoCmsApi;

package/package.json

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