@webiny/project 0.0.0-unstable.6f45466a1d → 0.0.0-unstable.7be00a75a9

package/services/InstallExtensionService/InstallExtensionService.js

@@ -1,10 +1,10 @@
 import os from "os";
 import path from "path";
 import fs from "fs";
-import fsAsync from "fs/promises";
-import loadJsonFile from "load-json-file";
+import promises from "fs/promises";
+import { loadJsonFileSync } from "load-json-file";
 import { createImplementation } from "@webiny/di";
-import { InstallExtensionService, GetProjectVersionService, GetProjectService } from "../../abstractions/index.js";
+import { GetProjectService, GetProjectVersionService, InstallExtensionService } from "../../abstractions/index.js";
 import { downloadFolderFromS3 } from "./downloadFolderFromS3.js";
 import { mergePackageJson } from "./mergePackageJson.js";
 import { updateWebinyConfig } from "./updateWebinyConfig.js";
@@ -13,117 +13,88 @@ const S3_BUCKET_NAME = "webiny-examples";
 const S3_BUCKET_REGION = "us-east-1";
 const FOLDER_NAME_IS_VERSION_REGEX = /^\d+\.\d+\.x$/;
 const WEBINY_DEV_VERSION = "0.0.0";
-const getVersionFromVersionFolders = async (versionFoldersList, currentWebinyVersion) => {
-  const availableVersions = versionFoldersList.filter(v => v.match(FOLDER_NAME_IS_VERSION_REGEX)).map(v => v.replace(/\.x$/, ".0")).sort();
-  let versionToUse = "";
-
-  // When developing Webiny, we want to use the latest version.
-  if (currentWebinyVersion === WEBINY_DEV_VERSION) {
-    versionToUse = availableVersions[availableVersions.length - 1];
-  } else {
-    for (const availableVersion of availableVersions) {
-      if (currentWebinyVersion >= availableVersion) {
-        versionToUse = availableVersion;
-      } else {
-        break;
-      }
-    }
-  }
-  return versionToUse.replace(/\.0$/, ".x");
+const getVersionFromVersionFolders = async (versionFoldersList, currentWebinyVersion)=>{
+    const availableVersions = versionFoldersList.filter((v)=>v.match(FOLDER_NAME_IS_VERSION_REGEX)).map((v)=>v.replace(/\.x$/, ".0")).sort();
+    let versionToUse = "";
+    if (currentWebinyVersion.startsWith(WEBINY_DEV_VERSION)) versionToUse = availableVersions[availableVersions.length - 1];
+    else for (const availableVersion of availableVersions)if (currentWebinyVersion >= availableVersion) versionToUse = availableVersion;
+    else break;
+    return versionToUse.replace(/\.0$/, ".x");
 };
 class DefaultInstallExtensionService {
-  constructor(getProjectVersion, getProject) {
-    this.getProjectVersion = getProjectVersion;
-    this.getProject = getProject;
-  }
-  async execute(source) {
-    const currentWebinyVersion = this.getProjectVersion.execute();
-    const project = this.getProject.execute();
-    const projectRoot = project.paths.rootFolder.toString();
-    const randomId = String(Date.now());
-    const downloadFolderPath = path.join(os.tmpdir(), `wby-ext-${randomId}`);
-    await downloadFolderFromS3({
-      bucketName: S3_BUCKET_NAME,
-      bucketRegion: S3_BUCKET_REGION,
-      bucketFolderKey: source,
-      downloadFolderPath
-    });
-    let extensionsFolderToCopyPath = path.join(downloadFolderPath, "extensions");
-    let extensionJsonPath = path.join(downloadFolderPath, "extension.json");
-
-    // If we have `extensions` folder in the root of the downloaded extension,
-    // it means the extension is not versioned, and we can just copy it.
-    const extensionsFolderExistsInRoot = fs.existsSync(extensionsFolderToCopyPath);
-    const versionedExtension = !extensionsFolderExistsInRoot;
-    if (versionedExtension) {
-      // If we have `x.x.x` folders in the root of the downloaded
-      // extension, we need to find the right version to use.
-
-      // This can be `5.40.x`, `6.0.x`, etc.
-      const versionFolders = await fsAsync.readdir(downloadFolderPath);
-      const versionToUse = await getVersionFromVersionFolders(versionFolders, currentWebinyVersion);
-      extensionsFolderToCopyPath = path.join(downloadFolderPath, versionToUse, "extensions");
-      const subExtensionJsonPath = path.join(downloadFolderPath, versionToUse, "extension.json");
-      if (fs.existsSync(subExtensionJsonPath)) {
-        extensionJsonPath = subExtensionJsonPath;
-      }
+    constructor(getProjectVersion, getProject){
+        this.getProjectVersion = getProjectVersion;
+        this.getProject = getProject;
     }
-
-    // Read and parse extension.json.
-    const extensionJsonExists = fs.existsSync(extensionJsonPath);
-    const extensionJson = extensionJsonExists ? await loadJsonFile(extensionJsonPath) : {
-      name: "unknown",
-      type: "admin"
-    };
-
-    // Ensure the extensions root folder exists.
-    const targetExtensionsFolder = path.join(projectRoot, EXTENSIONS_ROOT_FOLDER);
-    if (!fs.existsSync(targetExtensionsFolder)) {
-      fs.mkdirSync(targetExtensionsFolder, {
-        recursive: true
-      });
+    async execute(source) {
+        const currentWebinyVersion = this.getProjectVersion.execute();
+        const project = this.getProject.execute();
+        const projectRoot = project.paths.rootFolder.toString();
+        const randomId = String(Date.now());
+        const downloadFolderPath = path.join(os.tmpdir(), `wby-ext-${randomId}`);
+        const isLocalPath = source.startsWith("../") || source.startsWith("./") || source.startsWith("/");
+        if (isLocalPath) {
+            const resolvedPath = path.isAbsolute(source) ? source : path.resolve(projectRoot, source);
+            await promises.cp(resolvedPath, downloadFolderPath, {
+                recursive: true
+            });
+        } else await downloadFolderFromS3({
+            bucketName: S3_BUCKET_NAME,
+            bucketRegion: S3_BUCKET_REGION,
+            bucketFolderKey: source,
+            downloadFolderPath
+        });
+        let extensionsFolderToCopyPath = path.join(downloadFolderPath, "extensions");
+        let extensionJsonPath = path.join(downloadFolderPath, "extension.json");
+        const extensionsFolderExistsInRoot = fs.existsSync(extensionsFolderToCopyPath);
+        const versionedExtension = !extensionsFolderExistsInRoot;
+        if (versionedExtension) {
+            const versionFolders = await promises.readdir(downloadFolderPath);
+            const versionToUse = await getVersionFromVersionFolders(versionFolders, currentWebinyVersion);
+            extensionsFolderToCopyPath = path.join(downloadFolderPath, versionToUse, "extensions");
+            const subExtensionJsonPath = path.join(downloadFolderPath, versionToUse, "extension.json");
+            if (fs.existsSync(subExtensionJsonPath)) extensionJsonPath = subExtensionJsonPath;
+        }
+        const extensionJsonExists = fs.existsSync(extensionJsonPath);
+        const extensionJson = extensionJsonExists ? loadJsonFileSync(extensionJsonPath) : {
+            name: "unknown",
+            type: "admin"
+        };
+        const targetExtensionsFolder = path.join(projectRoot, EXTENSIONS_ROOT_FOLDER);
+        if (!fs.existsSync(targetExtensionsFolder)) fs.mkdirSync(targetExtensionsFolder, {
+            recursive: true
+        });
+        await promises.cp(extensionsFolderToCopyPath, targetExtensionsFolder, {
+            recursive: true
+        });
+        const extensionsFolderNames = await promises.readdir(extensionsFolderToCopyPath);
+        const extensionPaths = extensionsFolderNames.map((name)=>path.join(EXTENSIONS_ROOT_FOLDER, name));
+        if (extensionJson.packageJson && Object.keys(extensionJson.packageJson).length > 0) await mergePackageJson({
+            projectRoot,
+            extensionPackageJson: extensionJson.packageJson
+        });
+        if (extensionJson.webinyConfigTsx) await updateWebinyConfig({
+            projectRoot,
+            webinyConfigTsx: extensionJson.webinyConfigTsx
+        });
+        const nextSteps = extensionJson.nextSteps?.messages || [];
+        const additionalNotes = extensionJson.additionalNotes?.messages || [];
+        return {
+            extensionName: extensionJson.name,
+            extensionPaths,
+            nextSteps,
+            additionalNotes
+        };
     }
-
-    // Copy the extensions folder contents.
-    await fsAsync.cp(extensionsFolderToCopyPath, targetExtensionsFolder, {
-      recursive: true
-    });
-
-    // Get the list of extensions that were copied.
-    const extensionsFolderNames = await fsAsync.readdir(extensionsFolderToCopyPath);
-    const extensionPaths = extensionsFolderNames.map(name => path.join(EXTENSIONS_ROOT_FOLDER, name));
-
-    // Merge package.json if provided.
-    if (extensionJson.packageJson && Object.keys(extensionJson.packageJson).length > 0) {
-      await mergePackageJson({
-        projectRoot,
-        extensionPackageJson: extensionJson.packageJson
-      });
-    }
-
-    // Update webiny.config.tsx if provided.
-    if (extensionJson.webinyConfigTsx) {
-      await updateWebinyConfig({
-        projectRoot,
-        webinyConfigTsx: extensionJson.webinyConfigTsx
-      });
-    }
-
-    // Extract next steps and additional notes.
-    const nextSteps = extensionJson.nextSteps?.messages || [];
-    const additionalNotes = extensionJson.additionalNotes?.messages || [];
-    return {
-      extensionName: extensionJson.name,
-      extensionPaths,
-      nextSteps,
-      additionalNotes
-    };
-  }
 }
-export const installExtensionService = createImplementation({
-  abstraction: InstallExtensionService,
-  implementation: DefaultInstallExtensionService,
-  dependencies: [GetProjectVersionService, GetProjectService]
+const installExtensionService = createImplementation({
+    abstraction: InstallExtensionService,
+    implementation: DefaultInstallExtensionService,
+    dependencies: [
+        GetProjectVersionService,
+        GetProjectService
+    ]
 });
+export { installExtensionService };
 
 //# sourceMappingURL=InstallExtensionService.js.map

package/services/InstallExtensionService/InstallExtensionService.js.map

@@ -1 +1 @@
-{"version":3,"names":["os","path","fs","fsAsync","loadJsonFile","createImplementation","InstallExtensionService","GetProjectVersionService","GetProjectService","downloadFolderFromS3","mergePackageJson","updateWebinyConfig","EXTENSIONS_ROOT_FOLDER","S3_BUCKET_NAME","S3_BUCKET_REGION","FOLDER_NAME_IS_VERSION_REGEX","WEBINY_DEV_VERSION","getVersionFromVersionFolders","versionFoldersList","currentWebinyVersion","availableVersions","filter","v","match","map","replace","sort","versionToUse","length","availableVersion","DefaultInstallExtensionService","constructor","getProjectVersion","getProject","execute","source","project","projectRoot","paths","rootFolder","toString","randomId","String","Date","now","downloadFolderPath","join","tmpdir","bucketName","bucketRegion","bucketFolderKey","extensionsFolderToCopyPath","extensionJsonPath","extensionsFolderExistsInRoot","existsSync","versionedExtension","versionFolders","readdir","subExtensionJsonPath","extensionJsonExists","extensionJson","name","type","targetExtensionsFolder","mkdirSync","recursive","cp","extensionsFolderNames","extensionPaths","packageJson","Object","keys","extensionPackageJson","webinyConfigTsx","nextSteps","messages","additionalNotes","extensionName","installExtensionService","abstraction","implementation","dependencies"],"sources":["InstallExtensionService.ts"],"sourcesContent":["import os from \"os\";\nimport path from \"path\";\nimport fs from \"fs\";\nimport fsAsync from \"fs/promises\";\nimport loadJsonFile from \"load-json-file\";\nimport { createImplementation } from \"@webiny/di\";\nimport {\n    InstallExtensionService,\n    GetProjectVersionService,\n    GetProjectService\n} from \"~/abstractions/index.js\";\nimport { downloadFolderFromS3 } from \"./downloadFolderFromS3.js\";\nimport { mergePackageJson } from \"./mergePackageJson.js\";\nimport { updateWebinyConfig } from \"./updateWebinyConfig.js\";\nimport type { ExtensionJson } from \"./types.js\";\n\nconst EXTENSIONS_ROOT_FOLDER = \"extensions\";\nconst S3_BUCKET_NAME = \"webiny-examples\";\nconst S3_BUCKET_REGION = \"us-east-1\";\nconst FOLDER_NAME_IS_VERSION_REGEX = /^\\d+\\.\\d+\\.x$/;\nconst WEBINY_DEV_VERSION = \"0.0.0\";\n\nconst getVersionFromVersionFolders = async (\n    versionFoldersList: string[],\n    currentWebinyVersion: string\n) => {\n    const availableVersions = versionFoldersList\n        .filter(v => v.match(FOLDER_NAME_IS_VERSION_REGEX))\n        .map(v => v.replace(/\\.x$/, \".0\"))\n        .sort();\n\n    let versionToUse = \"\";\n\n    // When developing Webiny, we want to use the latest version.\n    if (currentWebinyVersion === WEBINY_DEV_VERSION) {\n        versionToUse = availableVersions[availableVersions.length - 1];\n    } else {\n        for (const availableVersion of availableVersions) {\n            if (currentWebinyVersion >= availableVersion) {\n                versionToUse = availableVersion;\n            } else {\n                break;\n            }\n        }\n    }\n\n    return versionToUse.replace(/\\.0$/, \".x\");\n};\n\nclass DefaultInstallExtensionService implements InstallExtensionService.Interface {\n    constructor(\n        private getProjectVersion: GetProjectVersionService.Interface,\n        private getProject: GetProjectService.Interface\n    ) {}\n\n    async execute(source: string): Promise<InstallExtensionService.Result> {\n        const currentWebinyVersion = this.getProjectVersion.execute();\n        const project = this.getProject.execute();\n        const projectRoot = project.paths.rootFolder.toString();\n\n        const randomId = String(Date.now());\n        const downloadFolderPath = path.join(os.tmpdir(), `wby-ext-${randomId}`);\n\n        await downloadFolderFromS3({\n            bucketName: S3_BUCKET_NAME,\n            bucketRegion: S3_BUCKET_REGION,\n            bucketFolderKey: source,\n            downloadFolderPath\n        });\n\n        let extensionsFolderToCopyPath = path.join(downloadFolderPath, \"extensions\");\n        let extensionJsonPath = path.join(downloadFolderPath, \"extension.json\");\n\n        // If we have `extensions` folder in the root of the downloaded extension,\n        // it means the extension is not versioned, and we can just copy it.\n        const extensionsFolderExistsInRoot = fs.existsSync(extensionsFolderToCopyPath);\n        const versionedExtension = !extensionsFolderExistsInRoot;\n\n        if (versionedExtension) {\n            // If we have `x.x.x` folders in the root of the downloaded\n            // extension, we need to find the right version to use.\n\n            // This can be `5.40.x`, `6.0.x`, etc.\n            const versionFolders = await fsAsync.readdir(downloadFolderPath);\n\n            const versionToUse = await getVersionFromVersionFolders(\n                versionFolders,\n                currentWebinyVersion\n            );\n\n            extensionsFolderToCopyPath = path.join(downloadFolderPath, versionToUse, \"extensions\");\n            const subExtensionJsonPath = path.join(\n                downloadFolderPath,\n                versionToUse,\n                \"extension.json\"\n            );\n            if (fs.existsSync(subExtensionJsonPath)) {\n                extensionJsonPath = subExtensionJsonPath;\n            }\n        }\n\n        // Read and parse extension.json.\n        const extensionJsonExists = fs.existsSync(extensionJsonPath);\n        const extensionJson: ExtensionJson = extensionJsonExists\n            ? await loadJsonFile(extensionJsonPath)\n            : { name: \"unknown\", type: \"admin\" };\n\n        // Ensure the extensions root folder exists.\n        const targetExtensionsFolder = path.join(projectRoot, EXTENSIONS_ROOT_FOLDER);\n        if (!fs.existsSync(targetExtensionsFolder)) {\n            fs.mkdirSync(targetExtensionsFolder, { recursive: true });\n        }\n\n        // Copy the extensions folder contents.\n        await fsAsync.cp(extensionsFolderToCopyPath, targetExtensionsFolder, {\n            recursive: true\n        });\n\n        // Get the list of extensions that were copied.\n        const extensionsFolderNames = await fsAsync.readdir(extensionsFolderToCopyPath);\n        const extensionPaths = extensionsFolderNames.map(name =>\n            path.join(EXTENSIONS_ROOT_FOLDER, name)\n        );\n\n        // Merge package.json if provided.\n        if (extensionJson.packageJson && Object.keys(extensionJson.packageJson).length > 0) {\n            await mergePackageJson({\n                projectRoot,\n                extensionPackageJson: extensionJson.packageJson\n            });\n        }\n\n        // Update webiny.config.tsx if provided.\n        if (extensionJson.webinyConfigTsx) {\n            await updateWebinyConfig({\n                projectRoot,\n                webinyConfigTsx: extensionJson.webinyConfigTsx\n            });\n        }\n\n        // Extract next steps and additional notes.\n        const nextSteps = extensionJson.nextSteps?.messages || [];\n        const additionalNotes = extensionJson.additionalNotes?.messages || [];\n\n        return {\n            extensionName: extensionJson.name,\n            extensionPaths,\n            nextSteps,\n            additionalNotes\n        };\n    }\n}\n\nexport const installExtensionService = createImplementation({\n    abstraction: InstallExtensionService,\n    implementation: DefaultInstallExtensionService,\n    dependencies: [GetProjectVersionService, GetProjectService]\n});\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"services/InstallExtensionService/InstallExtensionService.js","sources":["../../../src/services/InstallExtensionService/InstallExtensionService.ts"],"sourcesContent":["import os from \"os\";\nimport path from \"path\";\nimport fs from \"fs\";\nimport fsAsync from \"fs/promises\";\nimport { loadJsonFileSync } from \"load-json-file\";\nimport { createImplementation } from \"@webiny/di\";\nimport {\n    GetProjectService,\n    GetProjectVersionService,\n    InstallExtensionService\n} from \"~/abstractions/index.js\";\nimport { downloadFolderFromS3 } from \"./downloadFolderFromS3.js\";\nimport { mergePackageJson } from \"./mergePackageJson.js\";\nimport { updateWebinyConfig } from \"./updateWebinyConfig.js\";\nimport type { ExtensionJson } from \"./types.js\";\n\nconst EXTENSIONS_ROOT_FOLDER = \"extensions\";\nconst S3_BUCKET_NAME = \"webiny-examples\";\nconst S3_BUCKET_REGION = \"us-east-1\";\nconst FOLDER_NAME_IS_VERSION_REGEX = /^\\d+\\.\\d+\\.x$/;\nconst WEBINY_DEV_VERSION = \"0.0.0\";\n\nconst getVersionFromVersionFolders = async (\n    versionFoldersList: string[],\n    currentWebinyVersion: string\n) => {\n    const availableVersions = versionFoldersList\n        .filter(v => v.match(FOLDER_NAME_IS_VERSION_REGEX))\n        .map(v => v.replace(/\\.x$/, \".0\"))\n        .sort();\n\n    let versionToUse = \"\";\n\n    // When developing Webiny, we want to use the latest version.\n    if (currentWebinyVersion.startsWith(WEBINY_DEV_VERSION)) {\n        versionToUse = availableVersions[availableVersions.length - 1];\n    } else {\n        for (const availableVersion of availableVersions) {\n            if (currentWebinyVersion >= availableVersion) {\n                versionToUse = availableVersion;\n            } else {\n                break;\n            }\n        }\n    }\n\n    return versionToUse.replace(/\\.0$/, \".x\");\n};\n\nclass DefaultInstallExtensionService implements InstallExtensionService.Interface {\n    constructor(\n        private getProjectVersion: GetProjectVersionService.Interface,\n        private getProject: GetProjectService.Interface\n    ) {}\n\n    async execute(source: string): Promise<InstallExtensionService.Result> {\n        const currentWebinyVersion = this.getProjectVersion.execute();\n        const project = this.getProject.execute();\n        const projectRoot = project.paths.rootFolder.toString();\n\n        const randomId = String(Date.now());\n        const downloadFolderPath = path.join(os.tmpdir(), `wby-ext-${randomId}`);\n\n        // Check if source is a local path\n        const isLocalPath =\n            source.startsWith(\"../\") || source.startsWith(\"./\") || source.startsWith(\"/\");\n\n        if (isLocalPath) {\n            // Resolve the local path relative to the project root\n            const resolvedPath = path.isAbsolute(source)\n                ? source\n                : path.resolve(projectRoot, source);\n\n            // Copy the local directory to the temporary download folder\n            await fsAsync.cp(resolvedPath, downloadFolderPath, {\n                recursive: true\n            });\n        } else {\n            // Download from S3\n            await downloadFolderFromS3({\n                bucketName: S3_BUCKET_NAME,\n                bucketRegion: S3_BUCKET_REGION,\n                bucketFolderKey: source,\n                downloadFolderPath\n            });\n        }\n\n        let extensionsFolderToCopyPath = path.join(downloadFolderPath, \"extensions\");\n        let extensionJsonPath = path.join(downloadFolderPath, \"extension.json\");\n\n        // If we have `extensions` folder in the root of the downloaded extension,\n        // it means the extension is not versioned, and we can just copy it.\n        const extensionsFolderExistsInRoot = fs.existsSync(extensionsFolderToCopyPath);\n        const versionedExtension = !extensionsFolderExistsInRoot;\n\n        if (versionedExtension) {\n            // If we have `x.x.x` folders in the root of the downloaded\n            // extension, we need to find the right version to use.\n\n            // This can be `5.40.x`, `6.0.x`, etc.\n            const versionFolders = await fsAsync.readdir(downloadFolderPath);\n\n            const versionToUse = await getVersionFromVersionFolders(\n                versionFolders,\n                currentWebinyVersion\n            );\n\n            extensionsFolderToCopyPath = path.join(downloadFolderPath, versionToUse, \"extensions\");\n            const subExtensionJsonPath = path.join(\n                downloadFolderPath,\n                versionToUse,\n                \"extension.json\"\n            );\n            if (fs.existsSync(subExtensionJsonPath)) {\n                extensionJsonPath = subExtensionJsonPath;\n            }\n        }\n\n        // Read and parse extension.json.\n        const extensionJsonExists = fs.existsSync(extensionJsonPath);\n        const extensionJson: ExtensionJson = extensionJsonExists\n            ? loadJsonFileSync(extensionJsonPath)\n            : { name: \"unknown\", type: \"admin\" };\n\n        // Ensure the extensions root folder exists.\n        const targetExtensionsFolder = path.join(projectRoot, EXTENSIONS_ROOT_FOLDER);\n        if (!fs.existsSync(targetExtensionsFolder)) {\n            fs.mkdirSync(targetExtensionsFolder, { recursive: true });\n        }\n\n        // Copy the extensions folder contents.\n        await fsAsync.cp(extensionsFolderToCopyPath, targetExtensionsFolder, {\n            recursive: true\n        });\n\n        // Get the list of extensions that were copied.\n        const extensionsFolderNames = await fsAsync.readdir(extensionsFolderToCopyPath);\n        const extensionPaths = extensionsFolderNames.map(name =>\n            path.join(EXTENSIONS_ROOT_FOLDER, name)\n        );\n\n        // Merge package.json if provided.\n        if (extensionJson.packageJson && Object.keys(extensionJson.packageJson).length > 0) {\n            await mergePackageJson({\n                projectRoot,\n                extensionPackageJson: extensionJson.packageJson\n            });\n        }\n\n        // Update webiny.config.tsx if provided.\n        if (extensionJson.webinyConfigTsx) {\n            await updateWebinyConfig({\n                projectRoot,\n                webinyConfigTsx: extensionJson.webinyConfigTsx\n            });\n        }\n\n        // Extract next steps and additional notes.\n        const nextSteps = extensionJson.nextSteps?.messages || [];\n        const additionalNotes = extensionJson.additionalNotes?.messages || [];\n\n        return {\n            extensionName: extensionJson.name,\n            extensionPaths,\n            nextSteps,\n            additionalNotes\n        };\n    }\n}\n\nexport const installExtensionService = createImplementation({\n    abstraction: InstallExtensionService,\n    implementation: DefaultInstallExtensionService,\n    dependencies: [GetProjectVersionService, GetProjectService]\n});\n"],"names":["EXTENSIONS_ROOT_FOLDER","S3_BUCKET_NAME","S3_BUCKET_REGION","FOLDER_NAME_IS_VERSION_REGEX","WEBINY_DEV_VERSION","getVersionFromVersionFolders","versionFoldersList","currentWebinyVersion","availableVersions","v","versionToUse","availableVersion","DefaultInstallExtensionService","getProjectVersion","getProject","source","project","projectRoot","randomId","String","Date","downloadFolderPath","path","os","isLocalPath","resolvedPath","fsAsync","downloadFolderFromS3","extensionsFolderToCopyPath","extensionJsonPath","extensionsFolderExistsInRoot","fs","versionedExtension","versionFolders","subExtensionJsonPath","extensionJsonExists","extensionJson","loadJsonFileSync","targetExtensionsFolder","extensionsFolderNames","extensionPaths","name","Object","mergePackageJson","updateWebinyConfig","nextSteps","additionalNotes","installExtensionService","createImplementation","InstallExtensionService","GetProjectVersionService","GetProjectService"],"mappings":"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"}

package/services/InstallExtensionService/downloadFolderFromS3.js

@@ -1,81 +1,53 @@
-import { S3Client, ListObjectsV2Command, GetObjectCommand } from "@webiny/aws-sdk/client-s3/index.js";
 import fs from "fs";
 import path from "path";
-export class NoObjectsFoundError extends Error {
-  code = "NO_OBJECTS_FOUND";
-  constructor(message) {
-    super(message);
-    this.name = "NoObjectsFoundError";
-  }
+class NoObjectsFoundError extends Error {
+    constructor(message){
+        super(message), this.code = "NO_OBJECTS_FOUND";
+        this.name = "NoObjectsFoundError";
+    }
 }
-export const downloadFolderFromS3 = async params => {
-  const {
-    bucketName,
-    bucketRegion,
-    bucketFolderKey,
-    downloadFolderPath
-  } = params;
-
-  // Prepend v6/ to the folder key
-  const s3FolderKey = `v6/${bucketFolderKey}`;
-
-  // Configure the S3 client
-  const s3Client = new S3Client({
-    region: bucketRegion
-  });
-
-  // List all objects in the specified S3 folder
-  const listObjects = async (bucket, folderKey) => {
-    const command = new ListObjectsV2Command({
-      Bucket: bucket,
-      Prefix: folderKey
-    });
-    const response = await s3Client.send(command);
-    return response.Contents;
-  };
-
-  // Download an individual file from S3
-  const downloadFile = async (bucket, key, localPath) => {
-    const command = new GetObjectCommand({
-      Bucket: bucket,
-      Key: key
-    });
-    const response = await s3Client.send(command);
-    return new Promise((resolve, reject) => {
-      const fileStream = fs.createWriteStream(localPath);
-      // @ts-expect-error Body is a stream
-      response.Body.pipe(fileStream);
-      // @ts-expect-error Body is a stream
-      response.Body.on("error", reject);
-      fileStream.on("finish", () => resolve());
-    });
-  };
-  const objects = (await listObjects(bucketName, s3FolderKey)) || [];
-  if (!objects.length) {
-    throw new NoObjectsFoundError(`No objects found in the specified S3 folder.`);
-  }
-  for (const object of objects) {
-    const s3Key = object.Key;
-    const relativePath = path.relative(s3FolderKey, s3Key);
-    const localFilePath = path.join(downloadFolderPath, relativePath);
-    if (s3Key.endsWith("/")) {
-      // It's a directory, create it if it doesn't exist.
-      if (!fs.existsSync(localFilePath)) {
-        fs.mkdirSync(localFilePath, {
-          recursive: true
-        });
-      }
-    } else {
-      // It's a file, download it.
-      const localDirPath = path.dirname(localFilePath);
-      if (!fs.existsSync(localDirPath)) {
-        fs.mkdirSync(localDirPath, {
-          recursive: true
-        });
-      }
-      await downloadFile(bucketName, s3Key, localFilePath);
+const downloadFolderFromS3 = async (params)=>{
+    const { bucketName, bucketRegion, bucketFolderKey, downloadFolderPath } = params;
+    const s3FolderKey = `v6/${bucketFolderKey}`;
+    const baseUrl = `https://${bucketName}.s3.${bucketRegion}.amazonaws.com`;
+    const listObjects = async ()=>{
+        const keys = [];
+        let continuationToken;
+        do {
+            let url = `${baseUrl}/?list-type=2&prefix=${encodeURIComponent(s3FolderKey)}`;
+            if (continuationToken) url += `&continuation-token=${encodeURIComponent(continuationToken)}`;
+            const response = await fetch(url);
+            if (!response.ok) throw new Error(`Failed to list objects: ${response.status} ${response.statusText}`);
+            const xml = await response.text();
+            for (const match of xml.matchAll(/<Key>([^<]+)<\/Key>/g))keys.push(match[1]);
+            const isTruncated = xml.includes("<IsTruncated>true</IsTruncated>");
+            continuationToken = isTruncated ? xml.match(/<NextContinuationToken>([^<]+)<\/NextContinuationToken>/)?.[1] : void 0;
+        }while (continuationToken)
+        return keys;
+    };
+    const downloadFile = async (key, localPath)=>{
+        const response = await fetch(`${baseUrl}/${key}`);
+        if (!response.ok) throw new Error(`Failed to download ${key}: ${response.status} ${response.statusText}`);
+        fs.writeFileSync(localPath, Buffer.from(await response.arrayBuffer()));
+    };
+    const keys = await listObjects();
+    if (!keys.length) throw new NoObjectsFoundError("No objects found in the specified S3 folder.");
+    for (const key of keys){
+        const relativePath = path.relative(s3FolderKey, key);
+        const localFilePath = path.join(downloadFolderPath, relativePath);
+        if (key.endsWith("/")) {
+            if (!fs.existsSync(localFilePath)) fs.mkdirSync(localFilePath, {
+                recursive: true
+            });
+        } else {
+            const localDirPath = path.dirname(localFilePath);
+            if (!fs.existsSync(localDirPath)) fs.mkdirSync(localDirPath, {
+                recursive: true
+            });
+            await downloadFile(key, localFilePath);
+        }
     }
-  }
 };
+export { NoObjectsFoundError, downloadFolderFromS3 };
 
 //# sourceMappingURL=downloadFolderFromS3.js.map

package/services/InstallExtensionService/downloadFolderFromS3.js.map

@@ -1 +1 @@
-{"version":3,"names":["S3Client","ListObjectsV2Command","GetObjectCommand","fs","path","NoObjectsFoundError","Error","code","constructor","message","name","downloadFolderFromS3","params","bucketName","bucketRegion","bucketFolderKey","downloadFolderPath","s3FolderKey","s3Client","region","listObjects","bucket","folderKey","command","Bucket","Prefix","response","send","Contents","downloadFile","key","localPath","Key","Promise","resolve","reject","fileStream","createWriteStream","Body","pipe","on","objects","length","object","s3Key","relativePath","relative","localFilePath","join","endsWith","existsSync","mkdirSync","recursive","localDirPath","dirname"],"sources":["downloadFolderFromS3.ts"],"sourcesContent":["import {\n    S3Client,\n    ListObjectsV2Command,\n    GetObjectCommand\n} from \"@webiny/aws-sdk/client-s3/index.js\";\nimport fs from \"fs\";\nimport path from \"path\";\n\ninterface DownloadFolderFromS3Params {\n    bucketName: string;\n    bucketRegion: string;\n    bucketFolderKey: string;\n    downloadFolderPath: string;\n}\n\nexport class NoObjectsFoundError extends Error {\n    code = \"NO_OBJECTS_FOUND\";\n    constructor(message: string) {\n        super(message);\n        this.name = \"NoObjectsFoundError\";\n    }\n}\n\nexport const downloadFolderFromS3 = async (params: DownloadFolderFromS3Params) => {\n    const { bucketName, bucketRegion, bucketFolderKey, downloadFolderPath } = params;\n\n    // Prepend v6/ to the folder key\n    const s3FolderKey = `v6/${bucketFolderKey}`;\n\n    // Configure the S3 client\n    const s3Client = new S3Client({ region: bucketRegion });\n\n    // List all objects in the specified S3 folder\n    const listObjects = async (bucket: string, folderKey: string) => {\n        const command = new ListObjectsV2Command({\n            Bucket: bucket,\n            Prefix: folderKey\n        });\n        const response = await s3Client.send(command);\n        return response.Contents;\n    };\n\n    // Download an individual file from S3\n    const downloadFile = async (bucket: string, key: string, localPath: string) => {\n        const command = new GetObjectCommand({\n            Bucket: bucket,\n            Key: key\n        });\n\n        const response = await s3Client.send(command);\n\n        return new Promise<void>((resolve, reject) => {\n            const fileStream = fs.createWriteStream(localPath);\n            // @ts-expect-error Body is a stream\n            response.Body.pipe(fileStream);\n            // @ts-expect-error Body is a stream\n            response.Body.on(\"error\", reject);\n            fileStream.on(\"finish\", () => resolve());\n        });\n    };\n\n    const objects = (await listObjects(bucketName, s3FolderKey)) || [];\n    if (!objects.length) {\n        throw new NoObjectsFoundError(`No objects found in the specified S3 folder.`);\n    }\n\n    for (const object of objects) {\n        const s3Key = object.Key!;\n        const relativePath = path.relative(s3FolderKey, s3Key);\n        const localFilePath = path.join(downloadFolderPath, relativePath);\n\n        if (s3Key.endsWith(\"/\")) {\n            // It's a directory, create it if it doesn't exist.\n            if (!fs.existsSync(localFilePath)) {\n                fs.mkdirSync(localFilePath, { recursive: true });\n            }\n        } else {\n            // It's a file, download it.\n            const localDirPath = path.dirname(localFilePath);\n            if (!fs.existsSync(localDirPath)) {\n                fs.mkdirSync(localDirPath, { recursive: true });\n            }\n\n            await downloadFile(bucketName, s3Key, localFilePath);\n        }\n    }\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"services/InstallExtensionService/downloadFolderFromS3.js","sources":["../../../src/services/InstallExtensionService/downloadFolderFromS3.ts"],"sourcesContent":["import fs from \"fs\";\nimport path from \"path\";\n\ninterface DownloadFolderFromS3Params {\n    bucketName: string;\n    bucketRegion: string;\n    bucketFolderKey: string;\n    downloadFolderPath: string;\n}\n\nexport class NoObjectsFoundError extends Error {\n    code = \"NO_OBJECTS_FOUND\";\n    constructor(message: string) {\n        super(message);\n        this.name = \"NoObjectsFoundError\";\n    }\n}\n\nexport const downloadFolderFromS3 = async (params: DownloadFolderFromS3Params) => {\n    const { bucketName, bucketRegion, bucketFolderKey, downloadFolderPath } = params;\n\n    const s3FolderKey = `v6/${bucketFolderKey}`;\n    const baseUrl = `https://${bucketName}.s3.${bucketRegion}.amazonaws.com`;\n\n    const listObjects = async (): Promise<string[]> => {\n        const keys: string[] = [];\n        let continuationToken: string | undefined;\n\n        do {\n            let url = `${baseUrl}/?list-type=2&prefix=${encodeURIComponent(s3FolderKey)}`;\n            if (continuationToken) {\n                url += `&continuation-token=${encodeURIComponent(continuationToken)}`;\n            }\n\n            const response = await fetch(url);\n            if (!response.ok) {\n                throw new Error(\n                    `Failed to list objects: ${response.status} ${response.statusText}`\n                );\n            }\n\n            const xml = await response.text();\n\n            for (const match of xml.matchAll(/<Key>([^<]+)<\\/Key>/g)) {\n                keys.push(match[1]);\n            }\n\n            const isTruncated = xml.includes(\"<IsTruncated>true</IsTruncated>\");\n            continuationToken = isTruncated\n                ? xml.match(/<NextContinuationToken>([^<]+)<\\/NextContinuationToken>/)?.[1]\n                : undefined;\n        } while (continuationToken);\n\n        return keys;\n    };\n\n    const downloadFile = async (key: string, localPath: string): Promise<void> => {\n        const response = await fetch(`${baseUrl}/${key}`);\n        if (!response.ok) {\n            throw new Error(`Failed to download ${key}: ${response.status} ${response.statusText}`);\n        }\n        fs.writeFileSync(localPath, Buffer.from(await response.arrayBuffer()));\n    };\n\n    const keys = await listObjects();\n    if (!keys.length) {\n        throw new NoObjectsFoundError(`No objects found in the specified S3 folder.`);\n    }\n\n    for (const key of keys) {\n        const relativePath = path.relative(s3FolderKey, key);\n        const localFilePath = path.join(downloadFolderPath, relativePath);\n\n        if (key.endsWith(\"/\")) {\n            if (!fs.existsSync(localFilePath)) {\n                fs.mkdirSync(localFilePath, { recursive: true });\n            }\n        } else {\n            const localDirPath = path.dirname(localFilePath);\n            if (!fs.existsSync(localDirPath)) {\n                fs.mkdirSync(localDirPath, { recursive: true });\n            }\n            await downloadFile(key, localFilePath);\n        }\n    }\n};\n"],"names":["NoObjectsFoundError","Error","message","downloadFolderFromS3","params","bucketName","bucketRegion","bucketFolderKey","downloadFolderPath","s3FolderKey","baseUrl","listObjects","keys","continuationToken","url","encodeURIComponent","response","fetch","xml","match","isTruncated","undefined","downloadFile","key","localPath","fs","Buffer","relativePath","path","localFilePath","localDirPath"],"mappings":";;AAUO,MAAMA,4BAA4BC;IAErC,YAAYC,OAAe,CAAE;QACzB,KAAK,CAACA,UAAAA,IAAAA,CAFV,IAAI,GAAG;QAGH,IAAI,CAAC,IAAI,GAAG;IAChB;AACJ;AAEO,MAAMC,uBAAuB,OAAOC;IACvC,MAAM,EAAEC,UAAU,EAAEC,YAAY,EAAEC,eAAe,EAAEC,kBAAkB,EAAE,GAAGJ;IAE1E,MAAMK,cAAc,CAAC,GAAG,EAAEF,iBAAiB;IAC3C,MAAMG,UAAU,CAAC,QAAQ,EAAEL,WAAW,IAAI,EAAEC,aAAa,cAAc,CAAC;IAExE,MAAMK,cAAc;QAChB,MAAMC,OAAiB,EAAE;QACzB,IAAIC;QAEJ,GAAG;YACC,IAAIC,MAAM,GAAGJ,QAAQ,qBAAqB,EAAEK,mBAAmBN,cAAc;YAC7E,IAAII,mBACAC,OAAO,CAAC,oBAAoB,EAAEC,mBAAmBF,oBAAoB;YAGzE,MAAMG,WAAW,MAAMC,MAAMH;YAC7B,IAAI,CAACE,SAAS,EAAE,EACZ,MAAM,IAAIf,MACN,CAAC,wBAAwB,EAAEe,SAAS,MAAM,CAAC,CAAC,EAAEA,SAAS,UAAU,EAAE;YAI3E,MAAME,MAAM,MAAMF,SAAS,IAAI;YAE/B,KAAK,MAAMG,SAASD,IAAI,QAAQ,CAAC,wBAC7BN,KAAK,IAAI,CAACO,KAAK,CAAC,EAAE;YAGtB,MAAMC,cAAcF,IAAI,QAAQ,CAAC;YACjCL,oBAAoBO,cACdF,IAAI,KAAK,CAAC,4DAA4D,CAAC,EAAE,GACzEG;QACV,QAASR,kBAAmB;QAE5B,OAAOD;IACX;IAEA,MAAMU,eAAe,OAAOC,KAAaC;QACrC,MAAMR,WAAW,MAAMC,MAAM,GAAGP,QAAQ,CAAC,EAAEa,KAAK;QAChD,IAAI,CAACP,SAAS,EAAE,EACZ,MAAM,IAAIf,MAAM,CAAC,mBAAmB,EAAEsB,IAAI,EAAE,EAAEP,SAAS,MAAM,CAAC,CAAC,EAAEA,SAAS,UAAU,EAAE;QAE1FS,GAAG,aAAa,CAACD,WAAWE,OAAO,IAAI,CAAC,MAAMV,SAAS,WAAW;IACtE;IAEA,MAAMJ,OAAO,MAAMD;IACnB,IAAI,CAACC,KAAK,MAAM,EACZ,MAAM,IAAIZ,oBAAoB;IAGlC,KAAK,MAAMuB,OAAOX,KAAM;QACpB,MAAMe,eAAeC,KAAK,QAAQ,CAACnB,aAAac;QAChD,MAAMM,gBAAgBD,KAAK,IAAI,CAACpB,oBAAoBmB;QAEpD,IAAIJ,IAAI,QAAQ,CAAC,MACb;YAAA,IAAI,CAACE,GAAG,UAAU,CAACI,gBACfJ,GAAG,SAAS,CAACI,eAAe;gBAAE,WAAW;YAAK;QAClD,OACG;YACH,MAAMC,eAAeF,KAAK,OAAO,CAACC;YAClC,IAAI,CAACJ,GAAG,UAAU,CAACK,eACfL,GAAG,SAAS,CAACK,cAAc;gBAAE,WAAW;YAAK;YAEjD,MAAMR,aAAaC,KAAKM;QAC5B;IACJ;AACJ"}

package/services/InstallExtensionService/index.js

@@ -1,3 +1 @@
 export * from "./InstallExtensionService.js";
-
-//# sourceMappingURL=index.js.map

package/services/InstallExtensionService/mergePackageJson.js

@@ -1,31 +1,21 @@
-import loadJson from "load-json-file";
-import writeJson from "write-json-file";
+import { loadJsonFileSync } from "load-json-file";
+import { writeJsonFileSync } from "write-json-file";
 import deepmerge from "deepmerge";
-/**
- * Merge extension package.json properties into the project's root package.json.
- */
-export const mergePackageJson = async params => {
-  const {
-    projectRoot,
-    extensionPackageJson
-  } = params;
-  const packageJsonPath = `${projectRoot}/package.json`;
-
-  // Load the current package.json
-  const currentPackageJson = await loadJson(packageJsonPath);
-
-  // Merge the extension's package.json into the current one
-  // Use deepmerge to combine arrays and objects properly
-  const mergedPackageJson = deepmerge(currentPackageJson, extensionPackageJson, {
-    // For arrays, concatenate and remove duplicates
-    arrayMerge: (target, source) => {
-      const combined = [...target, ...source];
-      return Array.from(new Set(combined));
-    }
-  });
-
-  // Write the merged package.json back
-  await writeJson(packageJsonPath, mergedPackageJson);
+const mergePackageJson = async (params)=>{
+    const { projectRoot, extensionPackageJson } = params;
+    const packageJsonPath = `${projectRoot}/package.json`;
+    const currentPackageJson = await loadJsonFileSync(packageJsonPath);
+    const mergedPackageJson = deepmerge(currentPackageJson, extensionPackageJson, {
+        arrayMerge: (target, source)=>{
+            const combined = [
+                ...target,
+                ...source
+            ];
+            return Array.from(new Set(combined));
+        }
+    });
+    return writeJsonFileSync(packageJsonPath, mergedPackageJson);
 };
+export { mergePackageJson };
 
 //# sourceMappingURL=mergePackageJson.js.map

package/services/InstallExtensionService/mergePackageJson.js.map

@@ -1 +1 @@
-{"version":3,"names":["loadJson","writeJson","deepmerge","mergePackageJson","params","projectRoot","extensionPackageJson","packageJsonPath","currentPackageJson","mergedPackageJson","arrayMerge","target","source","combined","Array","from","Set"],"sources":["mergePackageJson.ts"],"sourcesContent":["import loadJson from \"load-json-file\";\nimport writeJson from \"write-json-file\";\nimport deepmerge from \"deepmerge\";\n\ninterface MergePackageJsonParams {\n    projectRoot: string;\n    extensionPackageJson: Record<string, any>;\n}\n\n/**\n * Merge extension package.json properties into the project's root package.json.\n */\nexport const mergePackageJson = async (params: MergePackageJsonParams): Promise<void> => {\n    const { projectRoot, extensionPackageJson } = params;\n\n    const packageJsonPath = `${projectRoot}/package.json`;\n\n    // Load the current package.json\n    const currentPackageJson = await loadJson<Record<string, any>>(packageJsonPath);\n\n    // Merge the extension's package.json into the current one\n    // Use deepmerge to combine arrays and objects properly\n    const mergedPackageJson = deepmerge(currentPackageJson, extensionPackageJson, {\n        // For arrays, concatenate and remove duplicates\n        arrayMerge: (target, source) => {\n            const combined = [...target, ...source];\n            return Array.from(new Set(combined));\n        }\n    });\n\n    // Write the merged package.json back\n    await writeJson(packageJsonPath, mergedPackageJson);\n};\n"],"mappings":"AAAA,OAAOA,QAAQ,MAAM,gBAAgB;AACrC,OAAOC,SAAS,MAAM,iBAAiB;AACvC,OAAOC,SAAS,MAAM,WAAW;AAOjC;AACA;AACA;AACA,OAAO,MAAMC,gBAAgB,GAAG,MAAOC,MAA8B,IAAoB;EACrF,MAAM;IAAEC,WAAW;IAAEC;EAAqB,CAAC,GAAGF,MAAM;EAEpD,MAAMG,eAAe,GAAG,GAAGF,WAAW,eAAe;;EAErD;EACA,MAAMG,kBAAkB,GAAG,MAAMR,QAAQ,CAAsBO,eAAe,CAAC;;EAE/E;EACA;EACA,MAAME,iBAAiB,GAAGP,SAAS,CAACM,kBAAkB,EAAEF,oBAAoB,EAAE;IAC1E;IACAI,UAAU,EAAEA,CAACC,MAAM,EAAEC,MAAM,KAAK;MAC5B,MAAMC,QAAQ,GAAG,CAAC,GAAGF,MAAM,EAAE,GAAGC,MAAM,CAAC;MACvC,OAAOE,KAAK,CAACC,IAAI,CAAC,IAAIC,GAAG,CAACH,QAAQ,CAAC,CAAC;IACxC;EACJ,CAAC,CAAC;;EAEF;EACA,MAAMZ,SAAS,CAACM,eAAe,EAAEE,iBAAiB,CAAC;AACvD,CAAC","ignoreList":[]}
+{"version":3,"file":"services/InstallExtensionService/mergePackageJson.js","sources":["../../../src/services/InstallExtensionService/mergePackageJson.ts"],"sourcesContent":["import { loadJsonFileSync } from \"load-json-file\";\nimport { writeJsonFileSync } from \"write-json-file\";\nimport deepmerge from \"deepmerge\";\n\ninterface MergePackageJsonParams {\n    projectRoot: string;\n    extensionPackageJson: Record<string, any>;\n}\n\n/**\n * Merge extension package.json properties into the project's root package.json.\n */\nexport const mergePackageJson = async (params: MergePackageJsonParams): Promise<void> => {\n    const { projectRoot, extensionPackageJson } = params;\n\n    const packageJsonPath = `${projectRoot}/package.json`;\n\n    // Load the current package.json\n    const currentPackageJson = await loadJsonFileSync<Record<string, any>>(packageJsonPath);\n\n    // Merge the extension's package.json into the current one\n    // Use deepmerge to combine arrays and objects properly\n    const mergedPackageJson = deepmerge(currentPackageJson, extensionPackageJson, {\n        // For arrays, concatenate and remove duplicates\n        arrayMerge: (target, source) => {\n            const combined = [...target, ...source];\n            return Array.from(new Set(combined));\n        }\n    });\n\n    // Write the merged package.json back\n    return writeJsonFileSync(packageJsonPath, mergedPackageJson);\n};\n"],"names":["mergePackageJson","params","projectRoot","extensionPackageJson","packageJsonPath","currentPackageJson","loadJsonFileSync","mergedPackageJson","deepmerge","target","source","combined","Array","Set","writeJsonFileSync"],"mappings":";;;AAYO,MAAMA,mBAAmB,OAAOC;IACnC,MAAM,EAAEC,WAAW,EAAEC,oBAAoB,EAAE,GAAGF;IAE9C,MAAMG,kBAAkB,GAAGF,YAAY,aAAa,CAAC;IAGrD,MAAMG,qBAAqB,MAAMC,iBAAsCF;IAIvE,MAAMG,oBAAoBC,UAAUH,oBAAoBF,sBAAsB;QAE1E,YAAY,CAACM,QAAQC;YACjB,MAAMC,WAAW;mBAAIF;mBAAWC;aAAO;YACvC,OAAOE,MAAM,IAAI,CAAC,IAAIC,IAAIF;QAC9B;IACJ;IAGA,OAAOG,kBAAkBV,iBAAiBG;AAC9C"}

package/services/InstallExtensionService/types.d.ts

@@ -38,6 +38,10 @@ export interface ExtensionWebinyConfigTsx {
      * Component to render in the Extensions component.
      */
     component?: ExtensionComponent;
+    /**
+     * Multiple components to render in the Extensions component.
+     */
+    components?: ExtensionComponent[];
 }
 export interface ExtensionImport {
     /**

package/services/InstallExtensionService/types.js

@@ -1,3 +0,0 @@
-export {};
-
-//# sourceMappingURL=types.js.map