@eclipse-che/che-devworkspace-generator 0.0.1-a00c266 → 0.0.1-b3f6c7c

package/lib/devfile/dev-container-component-inserter.js

@@ -0,0 +1,98 @@
+"use strict";
+/**********************************************************************
+ * Copyright (c) 2023 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+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 __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+exports.__esModule = true;
+exports.DevContainerComponentInserter = void 0;
+var inversify_1 = require("inversify");
+/**
+ * Adds a new component on empty devfile with specific name and image
+ */
+var DevContainerComponentInserter = /** @class */ (function () {
+    function DevContainerComponentInserter() {
+        this.DEFAULT_DEV_CONTAINER_IMAGE = 'quay.io/devfile/universal-developer-image:ubi8-latest';
+        this.DEFAULT_DEV_CONTAINER_NAME = 'dev';
+    }
+    DevContainerComponentInserter.prototype.insert = function (devfileContext, defaultComponentImage) {
+        return __awaiter(this, void 0, void 0, function () {
+            var devContainerImage, devContainerComponent;
+            return __generator(this, function (_a) {
+                if (!devfileContext.devWorkspace.spec) {
+                    devfileContext.devWorkspace.spec = {
+                        started: true
+                    };
+                }
+                if (!devfileContext.devWorkspace.spec.template) {
+                    devfileContext.devWorkspace.spec.template = {};
+                }
+                if (!devfileContext.devWorkspace.spec.template.components) {
+                    devfileContext.devWorkspace.spec.template.components = [];
+                }
+                devContainerImage = defaultComponentImage ? defaultComponentImage : this.DEFAULT_DEV_CONTAINER_IMAGE;
+                console.log("No container component has been found. A default container component with image " + devContainerImage + " will be added.");
+                devContainerComponent = {
+                    name: this.DEFAULT_DEV_CONTAINER_NAME,
+                    container: {
+                        image: devContainerImage
+                    }
+                };
+                devfileContext.devWorkspace.spec.template.components.push(devContainerComponent);
+                return [2 /*return*/];
+            });
+        });
+    };
+    DevContainerComponentInserter = __decorate([
+        (0, inversify_1.injectable)()
+    ], DevContainerComponentInserter);
+    return DevContainerComponentInserter;
+}());
+exports.DevContainerComponentInserter = DevContainerComponentInserter;
+//# sourceMappingURL=dev-container-component-inserter.js.map

package/lib/devfile/dev-container-component-inserter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dev-container-component-inserter.js","sourceRoot":"","sources":["../../src/devfile/dev-container-component-inserter.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIzE,uCAAuC;AAEvC;;GAEG;AAEH;IAAA;QACW,gCAA2B,GAAG,uDAAuD,CAAC;QACtF,+BAA0B,GAAG,KAAK,CAAC;IA4B9C,CAAC;IA1BO,8CAAM,GAAZ,UAAa,cAA8B,EAAE,qBAA8B;;;;gBACzE,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,IAAI,EAAE;oBACrC,cAAc,CAAC,YAAY,CAAC,IAAI,GAAG;wBACjC,OAAO,EAAE,IAAI;qBACd,CAAC;iBACH;gBACD,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE;oBAC9C,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;iBAChD;gBACD,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE;oBACzD,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,GAAG,EAAE,CAAC;iBAC3D;gBAEK,iBAAiB,GAAG,qBAAqB,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC;gBAC3G,OAAO,CAAC,GAAG,CACT,qFAAmF,iBAAiB,oBAAiB,CACtH,CAAC;gBACI,qBAAqB,GAA+C;oBACxE,IAAI,EAAE,IAAI,CAAC,0BAA0B;oBACrC,SAAS,EAAE;wBACT,KAAK,EAAE,iBAAiB;qBACzB;iBACF,CAAC;gBAEF,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;;;;KAClF;IA7BU,6BAA6B;QADzC,IAAA,sBAAU,GAAE;OACA,6BAA6B,CA8BzC;IAAD,oCAAC;CAAA,AA9BD,IA8BC;AA9BY,sEAA6B"}

package/lib/devfile/devfile-module.js

@@ -12,8 +12,10 @@ exports.devfileModule = void 0;
  ***********************************************************************/
 var inversify_1 = require("inversify");
 var dev_container_component_finder_1 = require("./dev-container-component-finder");
+var dev_container_component_inserter_1 = require("./dev-container-component-inserter");
 var devfileModule = new inversify_1.ContainerModule(function (bind) {
     bind(dev_container_component_finder_1.DevContainerComponentFinder).toSelf().inSingletonScope();
+    bind(dev_container_component_inserter_1.DevContainerComponentInserter).toSelf().inSingletonScope();
 });
 exports.devfileModule = devfileModule;
 //# sourceMappingURL=devfile-module.js.map

package/lib/devfile/devfile-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"devfile-module.js","sourceRoot":"","sources":["../../src/devfile/devfile-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;yEAQyE;AACzE,uCAAwD;AAExD,mFAA+E;AAE/E,IAAM,aAAa,GAAG,IAAI,2BAAe,CAAC,UAAC,IAAqB;IAC9D,IAAI,CAAC,4DAA2B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AAChE,CAAC,CAAC,CAAC;AAEM,sCAAa"}
+{"version":3,"file":"devfile-module.js","sourceRoot":"","sources":["../../src/devfile/devfile-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;yEAQyE;AACzE,uCAAwD;AAExD,mFAA+E;AAC/E,uFAAmF;AAEnF,IAAM,aAAa,GAAG,IAAI,2BAAe,CAAC,UAAC,IAAqB;IAC9D,IAAI,CAAC,4DAA2B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC9D,IAAI,CAAC,gEAA6B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AAClE,CAAC,CAAC,CAAC;AAEM,sCAAa"}

package/lib/generate.d.ts

@@ -9,8 +9,8 @@
  ***********************************************************************/
 import { DevfileContext } from './api/devfile-context';
 export declare class Generate {
-    static readonly MERGE_CONTRIBUTION = "controller.devfile.io/merge-contribution";
     private devContainerComponentFinder;
-    generate(devfileContent: string, editorContent: string, outputFile?: string): Promise<DevfileContext>;
-    generateContent(devfileContent: string, editorContent: string): Promise<DevfileContext>;
+    generate(devfileContent: string, editorContent: string, outputFile?: string, injectDefaultComponent?: string, defaultComponentImage?: string): Promise<DevfileContext>;
+    generateContent(devfileContent: string, editorContent: string, injectDefaultComponent?: string, defaultComponentImage?: string): Promise<DevfileContext>;
+    private createDevWorkspaceMetadata;
 }

package/lib/generate.js

@@ -78,13 +78,12 @@ var dev_container_component_finder_1 = require("./devfile/dev-container-componen
 var Generate = /** @class */ (function () {
     function Generate() {
     }
-    Generate_1 = Generate;
-    Generate.prototype.generate = function (devfileContent, editorContent, outputFile) {
+    Generate.prototype.generate = function (devfileContent, editorContent, outputFile, injectDefaultComponent, defaultComponentImage) {
         return __awaiter(this, void 0, void 0, function () {
             var context, allContentArray, generatedContent;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.generateContent(devfileContent, editorContent)];
+                    case 0: return [4 /*yield*/, this.generateContent(devfileContent, editorContent, injectDefaultComponent, defaultComponentImage)];
                     case 1:
                         context = _a.sent();
                         if (!outputFile) return [3 /*break*/, 3];
@@ -102,16 +101,16 @@ var Generate = /** @class */ (function () {
             });
         });
     };
-    Generate.prototype.generateContent = function (devfileContent, editorContent) {
+    Generate.prototype.generateContent = function (devfileContent, editorContent, injectDefaultComponent, defaultComponentImage) {
         return __awaiter(this, void 0, void 0, function () {
-            var devfile, suffix, editorDevfile, metadata, editorDevWorkspaceTemplate, devfileMetadata, devfileCopy, editorSpecContribution, devWorkspace, devWorkspaceTemplates, context, devContainer, devContainerAttributes;
+            var devfile, suffix, editorDevfile, metadata, editorDevWorkspaceTemplate, devfileMetadata, devfileCopy, editorSpecContribution, devWorkspace, devWorkspaceTemplates, context;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         devfile = jsYaml.load(devfileContent);
                         suffix = devfile.metadata.name || '';
                         editorDevfile = jsYaml.load(editorContent);
-                        metadata = editorDevfile.metadata;
+                        metadata = this.createDevWorkspaceMetadata(editorDevfile);
                         // add sufix
                         metadata.name = metadata.name + "-" + suffix;
                         delete editorDevfile.metadata;
@@ -122,7 +121,7 @@ var Generate = /** @class */ (function () {
                             metadata: metadata,
                             spec: editorDevfile
                         };
-                        devfileMetadata = devfile.metadata;
+                        devfileMetadata = this.createDevWorkspaceMetadata(devfile, true);
                         devfileCopy = Object.assign({}, devfile);
                         delete devfileCopy.schemaVersion;
                         delete devfileCopy.metadata;
@@ -138,6 +137,7 @@ var Generate = /** @class */ (function () {
                             metadata: devfileMetadata,
                             spec: {
                                 started: true,
+                                routingClass: 'che',
                                 template: devfileCopy,
                                 contributions: [editorSpecContribution]
                             }
@@ -149,29 +149,37 @@ var Generate = /** @class */ (function () {
                             devWorkspaceTemplates: devWorkspaceTemplates,
                             suffix: suffix
                         };
-                        return [4 /*yield*/, this.devContainerComponentFinder.find(context)];
+                        // find devContainer component, add a default one if not found
+                        return [4 /*yield*/, this.devContainerComponentFinder.find(context, injectDefaultComponent, defaultComponentImage)];
                     case 1:
-                        devContainer = _a.sent();
-                        devContainerAttributes = devContainer.attributes;
-                        if (!devContainerAttributes) {
-                            devContainerAttributes = {};
-                            devContainerAttributes[Generate_1.MERGE_CONTRIBUTION] = true;
-                            devContainer.attributes = devContainerAttributes;
-                        }
-                        else {
-                            devContainerAttributes[Generate_1.MERGE_CONTRIBUTION] = true;
-                        }
+                        // find devContainer component, add a default one if not found
+                        _a.sent();
                         return [2 /*return*/, context];
                 }
             });
         });
     };
-    var Generate_1;
-    Generate.MERGE_CONTRIBUTION = 'controller.devfile.io/merge-contribution';
+    Generate.prototype.createDevWorkspaceMetadata = function (devfile, addDevfileContent) {
+        if (addDevfileContent === void 0) { addDevfileContent = false; }
+        var devWorkspaceMetadata = {};
+        var devfileMetadata = devfile.metadata;
+        if (devfileMetadata.name) {
+            devWorkspaceMetadata.name = devfileMetadata.name;
+        }
+        if (devfileMetadata.generateName) {
+            devWorkspaceMetadata.generateName = devfileMetadata.generateName;
+        }
+        if (addDevfileContent) {
+            devWorkspaceMetadata.annotations = {
+                'che.eclipse.org/devfile': jsYaml.dump(devfile)
+            };
+        }
+        return devWorkspaceMetadata;
+    };
     __decorate([
         (0, inversify_1.inject)(dev_container_component_finder_1.DevContainerComponentFinder)
     ], Generate.prototype, "devContainerComponentFinder");
-    Generate = Generate_1 = __decorate([
+    Generate = __decorate([
         (0, inversify_1.injectable)()
     ], Generate);
     return Generate;

package/lib/generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate.js","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"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"}

package/lib/github/github-module.js

@@ -12,8 +12,10 @@ exports.githubModule = void 0;
  ***********************************************************************/
 var inversify_1 = require("inversify");
 var github_resolver_1 = require("./github-resolver");
+var types_1 = require("../types");
+var Resolver = types_1.TYPES.Resolver;
 var githubModule = new inversify_1.ContainerModule(function (bind) {
-    bind(github_resolver_1.GithubResolver).toSelf().inSingletonScope();
+    bind(Resolver).to(github_resolver_1.GithubResolver).inSingletonScope();
 });
 exports.githubModule = githubModule;
 //# sourceMappingURL=github-module.js.map

package/lib/github/github-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"github-module.js","sourceRoot":"","sources":["../../src/github/github-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;yEAQyE;AACzE,uCAAwD;AAExD,qDAAmD;AAEnD,IAAM,YAAY,GAAG,IAAI,2BAAe,CAAC,UAAC,IAAqB;IAC7D,IAAI,CAAC,gCAAc,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AACnD,CAAC,CAAC,CAAC;AAEM,oCAAY"}
+{"version":3,"file":"github-module.js","sourceRoot":"","sources":["../../src/github/github-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;yEAQyE;AACzE,uCAAwD;AAExD,qDAAmD;AACnD,kCAAiC;AAEzB,IAAA,QAAQ,GAAK,aAAK,SAAV,CAAW;AAE3B,IAAM,YAAY,GAAG,IAAI,2BAAe,CAAC,UAAC,IAAqB;IAC7D,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,gCAAc,CAAC,CAAC,gBAAgB,EAAE,CAAC;AACvD,CAAC,CAAC,CAAC;AAEM,oCAAY"}

package/lib/github/github-resolver.d.ts

@@ -7,12 +7,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  ***********************************************************************/
-import { GithubUrl } from './github-url';
-/**
- * Provides a github URL object allowing to interact
- */
-export declare class GithubResolver {
+import { Url } from '../resolve/url';
+import { Resolver } from '../resolve/resolver';
+export declare class GithubResolver implements Resolver {
     static readonly GITHUB_URL_PATTERN: RegExp;
-    resolve(link: string): GithubUrl;
-    getGroup(match: RegExpExecArray, groupName: string, defaultValue?: string): string;
+    isValid(url: string): boolean;
+    resolve(link: string): Url;
+    private getGroup;
 }

package/lib/github/github-resolver.js

@@ -18,23 +18,28 @@ exports.__esModule = true;
 exports.GithubResolver = void 0;
 var github_url_1 = require("./github-url");
 var inversify_1 = require("inversify");
-/**
- * Provides a github URL object allowing to interact
- */
 var GithubResolver = /** @class */ (function () {
     function GithubResolver() {
     }
     GithubResolver_1 = GithubResolver;
+    GithubResolver.prototype.isValid = function (url) {
+        return GithubResolver_1.GITHUB_URL_PATTERN.test(url);
+    };
     GithubResolver.prototype.resolve = function (link) {
         var match = GithubResolver_1.GITHUB_URL_PATTERN.exec(link);
         if (!match) {
             throw new Error("Invalid github URL: " + link);
         }
+        var scheme = this.getGroup(match, 'scheme');
+        var hostName = this.getGroup(match, 'host');
         var repoUser = this.getGroup(match, 'repoUser');
         var repoName = this.getGroup(match, 'repoName');
+        if (/^[\w-][\w.-]*?\.git$/.test(repoName)) {
+            repoName = repoName.substring(0, repoName.length - 4);
+        }
         var branchName = this.getGroup(match, 'branchName', 'HEAD');
         var subFolder = this.getGroup(match, 'subFolder');
-        return new github_url_1.GithubUrl(repoUser, repoName, branchName, subFolder);
+        return new github_url_1.GithubUrl(scheme, hostName, repoUser, repoName, branchName, subFolder);
     };
     GithubResolver.prototype.getGroup = function (match, groupName, defaultValue) {
         if (match.groups && match.groups[groupName]) {
@@ -44,7 +49,7 @@ var GithubResolver = /** @class */ (function () {
     };
     var GithubResolver_1;
     // eslint-disable-next-line max-len
-    GithubResolver.GITHUB_URL_PATTERN = /^(?:http)(?:s)?(?:\:\/\/)github\.com\/(?<repoUser>[^\/]+)\/(?<repoName>[^\/]+)((\/)|(?:\/(blob|tree)\/(?<branchName>[^\/]+)(?:\/(?<subFolder>.*))?))?$/;
+    GithubResolver.GITHUB_URL_PATTERN = /^(?<scheme>https?):\/\/(?<host>github(\..+)?\.[^\/]+)\/(?<repoUser>[^\/]+)\/(?<repoName>[^\/]+)((\/)|\/(blob|tree)\/(?<branchName>[^\/]+)(?:\/(?<subFolder>.*))?)?$/;
     GithubResolver = GithubResolver_1 = __decorate([
         (0, inversify_1.injectable)()
     ], GithubResolver);

package/lib/github/github-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"github-resolver.js","sourceRoot":"","sources":["../../src/github/github-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;;;;;;;AAEzE,2CAAyC;AACzC,uCAAuC;AAEvC;;GAEG;AAEH;IAAA;IAuBA,CAAC;uBAvBY,cAAc;IAKzB,gCAAO,GAAP,UAAQ,IAAY;QAClB,IAAM,KAAK,GAAG,gBAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,yBAAuB,IAAM,CAAC,CAAC;SAChD;QACD,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAClD,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAClD,IAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;QAC9D,IAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QACpD,OAAO,IAAI,sBAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;IAClE,CAAC;IAED,iCAAQ,GAAR,UAAS,KAAsB,EAAE,SAAiB,EAAE,YAAqB;QACvE,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;YAC3C,OAAO,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SAChC;QACD,OAAO,YAAY,IAAI,EAAE,CAAC;IAC5B,CAAC;;IArBD,mCAAmC;IACnB,iCAAkB,GAChC,wJAAyJ,CAAA;IAHhJ,cAAc;QAD1B,IAAA,sBAAU,GAAE;OACA,cAAc,CAuB1B;IAAD,qBAAC;CAAA,AAvBD,IAuBC;AAvBY,wCAAc"}
+{"version":3,"file":"github-resolver.js","sourceRoot":"","sources":["../../src/github/github-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;;;;;;;AAEzE,2CAAyC;AACzC,uCAAuC;AAKvC;IAAA;IAgCA,CAAC;uBAhCY,cAAc;IAKzB,gCAAO,GAAP,UAAQ,GAAW;QACjB,OAAO,gBAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrD,CAAC;IAED,gCAAO,GAAP,UAAQ,IAAY;QAClB,IAAM,KAAK,GAAG,gBAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,yBAAuB,IAAM,CAAC,CAAC;SAChD;QACD,IAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC9C,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC9C,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAClD,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAChD,IAAI,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACzC,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SACvD;QACD,IAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;QAC9D,IAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QACpD,OAAO,IAAI,sBAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;IACpF,CAAC;IAEO,iCAAQ,GAAhB,UAAiB,KAAsB,EAAE,SAAiB,EAAE,YAAqB;QAC/E,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;YAC3C,OAAO,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SAChC;QACD,OAAO,YAAY,IAAI,EAAE,CAAC;IAC5B,CAAC;;IA9BD,mCAAmC;IACnB,iCAAkB,GAChC,qKAAsK,CAAA;IAH7J,cAAc;QAD1B,IAAA,sBAAU,GAAE;OACA,cAAc,CAgC1B;IAAD,qBAAC;CAAA,AAhCD,IAgCC;AAhCY,wCAAc"}

package/lib/github/github-url.d.ts

@@ -7,16 +7,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  ***********************************************************************/
-/**
- * Provides helper methods on top of github URL to get for example raw content of get relative links
- */
-export declare class GithubUrl {
+import { Url } from '../resolve/url';
+export declare class GithubUrl implements Url {
+    private readonly scheme;
+    private readonly hostName;
     private readonly repoUser;
     private readonly repoName;
     private readonly branchName;
     private readonly subFolder;
-    static readonly RAW_LINK = "https://raw.githubusercontent.com";
-    constructor(repoUser: string, repoName: string, branchName: string, subFolder: string);
+    constructor(scheme: string, hostName: string, repoUser: string, repoName: string, branchName: string, subFolder: string);
     /**
      * Provides the raw link to the given path based on the current repository information
      */

package/lib/github/github-url.js

@@ -10,11 +10,10 @@
  ***********************************************************************/
 exports.__esModule = true;
 exports.GithubUrl = void 0;
-/**
- * Provides helper methods on top of github URL to get for example raw content of get relative links
- */
 var GithubUrl = /** @class */ (function () {
-    function GithubUrl(repoUser, repoName, branchName, subFolder) {
+    function GithubUrl(scheme, hostName, repoUser, repoName, branchName, subFolder) {
+        this.scheme = scheme;
+        this.hostName = hostName;
         this.repoUser = repoUser;
         this.repoName = repoName;
         this.branchName = branchName;
@@ -24,13 +23,14 @@ var GithubUrl = /** @class */ (function () {
      * Provides the raw link to the given path based on the current repository information
      */
     GithubUrl.prototype.getContentUrl = function (path) {
-        return GithubUrl.RAW_LINK + "/" + this.repoUser + "/" + this.repoName + "/" + this.branchName + "/" + path;
+        var hostName = this.hostName === 'github.com' ? 'githubusercontent.com' : this.hostName;
+        return this.scheme + "://raw." + hostName + "/" + this.repoUser + "/" + this.repoName + "/" + this.branchName + "/" + path;
     };
     GithubUrl.prototype.getUrl = function () {
-        return "https://github.com/" + this.repoUser + "/" + this.repoName + "/tree/" + this.branchName + "/" + this.subFolder;
+        return this.scheme + "://" + this.hostName + "/" + this.repoUser + "/" + this.repoName + "/tree/" + this.branchName + "/" + this.subFolder;
     };
     GithubUrl.prototype.getCloneUrl = function () {
-        return "https://github.com/" + this.repoUser + "/" + this.repoName + ".git";
+        return this.scheme + "://" + this.hostName + "/" + this.repoUser + "/" + this.repoName + ".git";
     };
     GithubUrl.prototype.getRepoName = function () {
         return this.repoName;
@@ -38,8 +38,6 @@ var GithubUrl = /** @class */ (function () {
     GithubUrl.prototype.getBranchName = function () {
         return this.branchName;
     };
-    // raw link
-    GithubUrl.RAW_LINK = 'https://raw.githubusercontent.com';
     return GithubUrl;
 }());
 exports.GithubUrl = GithubUrl;

package/lib/github/github-url.js.map

@@ -1 +1 @@
-{"version":3,"file":"github-url.js","sourceRoot":"","sources":["../../src/github/github-url.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;AAEzE;;GAEG;AACH;IAIE,mBACmB,QAAgB,EAChB,QAAgB,EAChB,UAAkB,EAClB,SAAiB;QAHjB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,eAAU,GAAV,UAAU,CAAQ;QAClB,cAAS,GAAT,SAAS,CAAQ;IACjC,CAAC;IAEJ;;OAEG;IACH,iCAAa,GAAb,UAAc,IAAY;QACxB,OAAU,SAAS,CAAC,QAAQ,SAAI,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,UAAU,SAAI,IAAM,CAAC;IAC9F,CAAC;IAED,0BAAM,GAAN;QACE,OAAO,wBAAsB,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,QAAQ,cAAS,IAAI,CAAC,UAAU,SAAI,IAAI,CAAC,SAAW,CAAC;IAC1G,CAAC;IAED,+BAAW,GAAX;QACE,OAAO,wBAAsB,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,QAAQ,SAAM,CAAC;IACpE,CAAC;IAED,+BAAW,GAAX;QACE,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,iCAAa,GAAb;QACE,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IA/BD,WAAW;IACK,kBAAQ,GAAG,mCAAmC,CAAC;IA+BjE,gBAAC;CAAA,AAjCD,IAiCC;AAjCY,8BAAS"}
+{"version":3,"file":"github-url.js","sourceRoot":"","sources":["../../src/github/github-url.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;AAIzE;IACE,mBACmB,MAAc,EACd,QAAgB,EAChB,QAAgB,EAChB,QAAgB,EAChB,UAAkB,EAClB,SAAiB;QALjB,WAAM,GAAN,MAAM,CAAQ;QACd,aAAQ,GAAR,QAAQ,CAAQ;QAChB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,eAAU,GAAV,UAAU,CAAQ;QAClB,cAAS,GAAT,SAAS,CAAQ;IACjC,CAAC;IAEJ;;OAEG;IACH,iCAAa,GAAb,UAAc,IAAY;QACxB,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC1F,OAAU,IAAI,CAAC,MAAM,eAAU,QAAQ,SAAI,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,UAAU,SAAI,IAAM,CAAC;IACzG,CAAC;IAED,0BAAM,GAAN;QACE,OAAU,IAAI,CAAC,MAAM,WAAM,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,QAAQ,cAAS,IAAI,CAAC,UAAU,SAAI,IAAI,CAAC,SAAW,CAAC;IACzH,CAAC;IAED,+BAAW,GAAX;QACE,OAAU,IAAI,CAAC,MAAM,WAAM,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,QAAQ,SAAM,CAAC;IACnF,CAAC;IAED,+BAAW,GAAX;QACE,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,iCAAa,GAAb;QACE,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IACH,gBAAC;AAAD,CAAC,AAjCD,IAiCC;AAjCY,8BAAS"}

package/lib/inversify/inversify-binding.js

@@ -51,7 +51,10 @@ var inversify_1 = require("inversify");
 var devfile_module_1 = require("../devfile/devfile-module");
 var fetch_module_1 = require("../fetch/fetch-module");
 var github_module_1 = require("../github/github-module");
+var resolve_module_1 = require("../resolve/resolve-module");
 var plugin_registry_module_1 = require("../plugin-registry/plugin-registry-module");
+var bitbucket_module_1 = require("../bitbucket/bitbucket-module");
+var bitbucket_server_module_1 = require("../bitbucket-server/bitbucket-server-module");
 /**
  * Manage all bindings for inversify
  */
@@ -65,6 +68,9 @@ var InversifyBinding = /** @class */ (function () {
                 this.container.load(devfile_module_1.devfileModule);
                 this.container.load(fetch_module_1.fetchModule);
                 this.container.load(github_module_1.githubModule);
+                this.container.load(bitbucket_module_1.bitbucketModule);
+                this.container.load(bitbucket_server_module_1.bitbucketServerModule);
+                this.container.load(resolve_module_1.resolveModule);
                 this.container.load(plugin_registry_module_1.pluginRegistryModule);
                 this.container.bind(Symbol["for"]('AxiosInstance')).toConstantValue(options.axiosInstance);
                 this.container.bind('string').toConstantValue(options.pluginRegistryUrl).whenTargetNamed('PLUGIN_REGISTRY_URL');

package/lib/inversify/inversify-binding.js.map

@@ -1 +1 @@
-{"version":3,"file":"inversify-binding.js","sourceRoot":"","sources":["../../src/inversify/inversify-binding.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;yEAQyE;AACzE,4BAA0B;AAG1B,uCAAsC;AACtC,4DAA0D;AAC1D,sDAAoD;AACpD,yDAAuD;AACvD,oFAAiF;AAEjF;;GAEG;AACH;IAAA;IAgBA,CAAC;IAbc,uCAAY,GAAzB,UAA0B,OAAgC;;;gBACxD,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;gBAEjC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,8BAAa,CAAC,CAAC;gBACnC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,0BAAW,CAAC,CAAC;gBACjC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,4BAAY,CAAC,CAAC;gBAClC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,6CAAoB,CAAC,CAAC;gBAE1C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAG,CAAA,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;gBACxF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC;gBAEhH,sBAAO,IAAI,CAAC,SAAS,EAAC;;;KACvB;IACH,uBAAC;AAAD,CAAC,AAhBD,IAgBC;AAhBY,4CAAgB"}
+{"version":3,"file":"inversify-binding.js","sourceRoot":"","sources":["../../src/inversify/inversify-binding.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;yEAQyE;AACzE,4BAA0B;AAG1B,uCAAsC;AACtC,4DAA0D;AAC1D,sDAAoD;AACpD,yDAAuD;AACvD,4DAA0D;AAC1D,oFAAiF;AACjF,kEAAgE;AAChE,uFAAoF;AAEpF;;GAEG;AACH;IAAA;IAmBA,CAAC;IAhBc,uCAAY,GAAzB,UAA0B,OAAgC;;;gBACxD,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAS,EAAE,CAAC;gBAEjC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,8BAAa,CAAC,CAAC;gBACnC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,0BAAW,CAAC,CAAC;gBACjC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,4BAAY,CAAC,CAAC;gBAClC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,kCAAe,CAAC,CAAC;gBACrC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,+CAAqB,CAAC,CAAC;gBAC3C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,8BAAa,CAAC,CAAC;gBACnC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,6CAAoB,CAAC,CAAC;gBAE1C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAG,CAAA,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;gBACxF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC;gBAEhH,sBAAO,IAAI,CAAC,SAAS,EAAC;;;KACvB;IACH,uBAAC;AAAD,CAAC,AAnBD,IAmBC;AAnBY,4CAAgB"}

package/lib/main.d.ts

@@ -20,12 +20,15 @@ export declare class Main {
         devfileContent?: string;
         outputFile?: string;
         editorPath?: string;
-        pluginRegistryUrl?: string;
+        editorContent?: string;
         editorEntry?: string;
+        pluginRegistryUrl?: string;
         projects: {
             name: string;
             location: string;
         }[];
+        injectDefaultComponent?: string;
+        defaultComponentImage?: string;
     }, axiosInstance: axios.AxiosInstance): Promise<DevfileContext>;
     replaceIfExistingProjects(devfileContent: string, projects: {
         name: string;

package/lib/main.js

@@ -68,11 +68,11 @@ exports.Main = void 0;
 var axios = __importStar(require("axios"));
 var fs = __importStar(require("fs-extra"));
 var generate_1 = require("./generate");
-var github_resolver_1 = require("./github/github-resolver");
 var jsYaml = __importStar(require("js-yaml"));
 var inversify_binding_1 = require("./inversify/inversify-binding");
 var url_fetcher_1 = require("./fetch/url-fetcher");
 var plugin_registry_resolver_1 = require("./plugin-registry/plugin-registry-resolver");
+var git_url_resolver_1 = require("./resolve/git-url-resolver");
 var Main = /** @class */ (function () {
     /**
      * Default constructor.
@@ -83,18 +83,20 @@ var Main = /** @class */ (function () {
     // Generates a devfile context object based on params
     Main.prototype.generateDevfileContext = function (params, axiosInstance) {
         return __awaiter(this, void 0, void 0, function () {
-            var devfilePath, devfileUrl, outputFile, editorPath, pluginRegistryUrl, editorEntry, projects, inversifyBinbding, container, devfileContent, editorContent, githubResolver, githubUrl, devfileParsed, editorDevfile, generate;
+            var pluginRegistryUrl, inversifyBinbding, container, devfileContent, editorContent, resolver, url, devfileParsed, editorDevfile, generate;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        devfilePath = params.devfilePath, devfileUrl = params.devfileUrl, outputFile = params.outputFile, editorPath = params.editorPath, pluginRegistryUrl = params.pluginRegistryUrl, editorEntry = params.editorEntry, projects = params.projects;
-                        if (!editorPath && !editorEntry) {
-                            throw new Error('missing editorPath or editorEntry');
+                        if (!params.editorPath && !params.editorEntry && !params.editorContent) {
+                            throw new Error('missing editorPath or editorEntry or editorContent');
                         }
-                        if (!devfilePath && !devfileUrl && !params.devfileContent) {
+                        if (!params.devfilePath && !params.devfileUrl && !params.devfileContent) {
                             throw new Error('missing devfilePath or devfileUrl or devfileContent');
                         }
-                        if (!pluginRegistryUrl) {
+                        if (params.pluginRegistryUrl) {
+                            pluginRegistryUrl = params.pluginRegistryUrl;
+                        }
+                        else {
                             pluginRegistryUrl = 'https://eclipse-che.github.io/che-plugin-registry/main/v3';
                             console.log("No plug-in registry url. Setting to " + pluginRegistryUrl);
                         }
@@ -106,10 +108,10 @@ var Main = /** @class */ (function () {
                     case 1:
                         container = _a.sent();
                         container.bind(generate_1.Generate).toSelf().inSingletonScope();
-                        if (!devfileUrl) return [3 /*break*/, 3];
-                        githubResolver = container.get(github_resolver_1.GithubResolver);
-                        githubUrl = githubResolver.resolve(devfileUrl);
-                        return [4 /*yield*/, container.get(url_fetcher_1.UrlFetcher).fetchText(githubUrl.getContentUrl('devfile.yaml'))];
+                        if (!params.devfileUrl) return [3 /*break*/, 3];
+                        resolver = container.get(git_url_resolver_1.GitUrlResolver);
+                        url = resolver.resolve(params.devfileUrl);
+                        return [4 /*yield*/, container.get(url_fetcher_1.UrlFetcher).fetchText(url.getContentUrl('devfile.yaml'))];
                     case 2:
                         // user devfile
                         devfileContent = _a.sent();
@@ -119,10 +121,10 @@ var Main = /** @class */ (function () {
                             // no, so add the current project being cloned
                             devfileParsed.projects = [
                                 {
-                                    name: githubUrl.getRepoName(),
+                                    name: url.getRepoName(),
                                     git: {
-                                        remotes: { origin: githubUrl.getCloneUrl() },
-                                        checkoutFrom: { revision: githubUrl.getBranchName() }
+                                        remotes: { origin: url.getCloneUrl() },
+                                        checkoutFrom: { revision: url.getBranchName() }
                                     }
                                 },
                             ];
@@ -131,8 +133,8 @@ var Main = /** @class */ (function () {
                         devfileContent = jsYaml.dump(devfileParsed);
                         return [3 /*break*/, 6];
                     case 3:
-                        if (!devfilePath) return [3 /*break*/, 5];
-                        return [4 /*yield*/, fs.readFile(devfilePath)];
+                        if (!params.devfilePath) return [3 /*break*/, 5];
+                        return [4 /*yield*/, fs.readFile(params.devfilePath)];
                     case 4:
                         devfileContent = _a.sent();
                         return [3 /*break*/, 6];
@@ -141,20 +143,24 @@ var Main = /** @class */ (function () {
                         _a.label = 6;
                     case 6:
                         // enhance projects
-                        devfileContent = this.replaceIfExistingProjects(devfileContent, projects);
-                        if (!editorEntry) return [3 /*break*/, 8];
-                        return [4 /*yield*/, container.get(plugin_registry_resolver_1.PluginRegistryResolver).loadDevfilePlugin(editorEntry)];
+                        devfileContent = this.replaceIfExistingProjects(devfileContent, params.projects);
+                        if (!params.editorContent) return [3 /*break*/, 7];
+                        editorContent = params.editorContent;
+                        return [3 /*break*/, 11];
                     case 7:
+                        if (!params.editorEntry) return [3 /*break*/, 9];
+                        return [4 /*yield*/, container.get(plugin_registry_resolver_1.PluginRegistryResolver).loadDevfilePlugin(params.editorEntry)];
+                    case 8:
                         editorDevfile = _a.sent();
                         editorContent = jsYaml.dump(editorDevfile);
-                        return [3 /*break*/, 10];
-                    case 8: return [4 /*yield*/, fs.readFile(editorPath)];
-                    case 9:
-                        editorContent = _a.sent();
-                        _a.label = 10;
+                        return [3 /*break*/, 11];
+                    case 9: return [4 /*yield*/, fs.readFile(params.editorPath)];
                     case 10:
+                        editorContent = _a.sent();
+                        _a.label = 11;
+                    case 11:
                         generate = container.get(generate_1.Generate);
-                        return [2 /*return*/, generate.generate(devfileContent, editorContent, outputFile)];
+                        return [2 /*return*/, generate.generate(devfileContent, editorContent, params.outputFile, params.injectDefaultComponent, params.defaultComponentImage)];
                 }
             });
         });
@@ -187,7 +193,7 @@ var Main = /** @class */ (function () {
     };
     Main.prototype.start = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var devfilePath, devfileUrl, outputFile, editorPath, pluginRegistryUrl, editorEntry, projects, args, error_1;
+            var devfilePath, devfileUrl, outputFile, editorPath, pluginRegistryUrl, editorEntry, injectDefaultComponent, defaultComponentImage, projects, args, error_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -218,6 +224,12 @@ var Main = /** @class */ (function () {
                                 location = location.replace('{{_INTERNAL_URL_}}', '{{ INTERNAL_URL }}');
                                 projects.push({ name: name, location: location });
                             }
+                            if (arg.startsWith('--injectDefaultComponent:')) {
+                                injectDefaultComponent = arg.substring('--injectDefaultComponent:'.length);
+                            }
+                            if (arg.startsWith('--defaultComponentImage:')) {
+                                defaultComponentImage = arg.substring('--defaultComponentImage:'.length);
+                            }
                         });
                         _a.label = 1;
                     case 1:
@@ -238,7 +250,9 @@ var Main = /** @class */ (function () {
                                 outputFile: outputFile,
                                 pluginRegistryUrl: pluginRegistryUrl,
                                 editorEntry: editorEntry,
-                                projects: projects
+                                projects: projects,
+                                injectDefaultComponent: injectDefaultComponent,
+                                defaultComponentImage: defaultComponentImage
                             }, axios["default"])];
                     case 2:
                         _a.sent();