@magnolia/cli-jumpstart-plugin 1.0.0-preview.5 → 1.0.0-preview.6

package/README.md

@@ -43,7 +43,7 @@ magnolia-cli jumpstart --template "headless/minimal-headless-spa-demos/dx-core"
 
 **Project templates list:**
 
-The **jumpstart** plugin relies on a list of predefined project templates stored in an external [repository](https://git.magnolia-cms.com/projects/SERVICES/repos/cli-project-templates/raw/projectTemplates.json). 
+The **jumpstart** plugin relies on a list of predefined project templates stored in an external [repository](https://bitbucket.org/magnolia-cms/cli-project-templates/raw/HEAD/projectTemplates.json). 
 You can specify your own project templates list with the *--project-templates-path* command:
 
 ```bash

package/dist/jumpstart-plugin.d.ts

@@ -20,6 +20,8 @@ export default class JumpstartPlugin extends PluginTemplate {
     promptTemplateSelection(templates: Array<Template>, names?: string[]): Promise<TemplateWithoutChildren | undefined>;
     findTemplateByIdentifier(identifier: string): TemplateWithoutChildren | undefined;
     chooseTemplate(options: PluginOptions): Promise<void>;
+    private isFlag;
+    private checkFlagsArguments;
     init(winstonLogger: Logger): Promise<void>;
     start(options: PluginOptions): Promise<void>;
     stop(): Promise<void>;

package/dist/jumpstart-plugin.js

@@ -119,7 +119,7 @@ export default class JumpstartPlugin extends PluginTemplate {
                     this.projectTemplates = requireFn(path.resolve(options.projectTemplatesPath)).projectTemplates;
                 }
                 else {
-                    const res = yield axios.get("https://bitbucket.org/magnolia-cms/project-templates/raw/HEAD/projectTemplates.json");
+                    const res = yield axios.get("https://bitbucket.org/magnolia-cms/cli-project-templates/raw/HEAD/projectTemplates.json");
                     this.projectTemplates = res.data.projectTemplates;
                 }
             }
@@ -193,6 +193,19 @@ export default class JumpstartPlugin extends PluginTemplate {
             }
         });
     }
+    isFlag(value) {
+        return this.options.some(it => it.long === value || it.short === value);
+    }
+    checkFlagsArguments(options) {
+        Object.keys(options).forEach(key => {
+            const value = options[key];
+            if (this.isFlag(value)) {
+                const optionLong = "--" + key.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+                const option = this.options.find(it => it.long === optionLong);
+                throw new Error(i18nInstance.t('error-option-param-is-flag', { option: option === null || option === void 0 ? void 0 : option.flags, value: value }));
+            }
+        });
+    }
     init(winstonLogger) {
         return __awaiter(this, void 0, void 0, function* () {
             logger = winstonLogger;
@@ -201,6 +214,7 @@ export default class JumpstartPlugin extends PluginTemplate {
     start(options) {
         return __awaiter(this, void 0, void 0, function* () {
             logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t("info-jumpstart_started"));
+            this.checkFlagsArguments(options);
             yield this.setProjectTemplates(options);
             yield this.chooseTemplate(options);
         });

package/dist/lib/config-helper.js

@@ -108,7 +108,7 @@ function createMgnlConfigFile() {
         : '';
     const mgnlConfigSufix = `
     // Here you can add plugins you want to use with MGNL CLI
-    commands: []
+    plugins: []
     };`;
     const mgnlConfigContent = mgnlConfigPrefix + logger + mgnlConfigSufix;
     writeConfigContent(mgnlConfigContent);
@@ -117,7 +117,7 @@ function createSimpleMgnlConfigFile() {
     const mgnlConfigContent = `
     export default {
     // Here you can add plugins you want to use with MGNL CLI
-    commands: []
+    plugins: []
     };`;
     writeConfigContent(mgnlConfigContent);
 }

package/dist/lib/download.js

@@ -85,7 +85,7 @@ export const downloadBundle = (bundle, credentials, dest, options) => __awaiter(
     }
 });
 export const getDownloadUrl = (bundle, credentials, options) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const opts = {
         method: 'get',
         responseType: 'json',
@@ -105,9 +105,13 @@ export const getDownloadUrl = (bundle, credentials, options) => __awaiter(void 0
             }
             if (options.magnoliaVersion) {
                 bundle.version = options.magnoliaVersion;
+                if (bundle.version.startsWith('6.3') && bundle.alternative) {
+                    url.searchParams.set('maven.groupId', bundle.alternative.groupId);
+                    url.searchParams.set('maven.artifactId', bundle.alternative.artifactId);
+                }
             }
             if (bundle.version.toLowerCase() !== "latest" && bundle.version.toLowerCase() !== "alpha" && bundle.version.toLowerCase() !== "beta") {
-                url.searchParams.set('maven.baseVersion', bundle.version);
+                url.searchParams.set('maven.baseVersion', options.snapshot ? bundle.version + "-SNAPSHOT" : bundle.version);
             }
         }
         const response = yield axios.get(url.toString(), opts);
@@ -137,6 +141,7 @@ export const getDownloadUrl = (bundle, credentials, options) => __awaiter(void 0
         if (!item) {
             throw new Error(i18nInstance.t('error-download-no-artifact-available', { version: bundle.version, interpolation: { escapeValue: false } }));
         }
+        bundle.version = (_e = (_d = item === null || item === void 0 ? void 0 : item.maven2) === null || _d === void 0 ? void 0 : _d.version) !== null && _e !== void 0 ? _e : bundle.version;
         let downloadUrl = item.downloadUrl;
         downloadUrl = downloadUrl === null || downloadUrl === void 0 ? void 0 : downloadUrl.split('/magnolia.');
         downloadUrl = downloadUrl && `${downloadUrl[0]}/${params.get('repository')}${item.path}`;
@@ -153,7 +158,7 @@ export const getDownloadUrl = (bundle, credentials, options) => __awaiter(void 0
     }
 });
 export const selectTag = (url, credentials) => __awaiter(void 0, void 0, void 0, function* () {
-    var _d;
+    var _f;
     const opts = {
         method: 'get',
         headers: {
@@ -164,7 +169,7 @@ export const selectTag = (url, credentials) => __awaiter(void 0, void 0, void 0,
         opts.auth = credentials;
     }
     const res = yield axios.get(url, opts);
-    if (!((_d = res.data) === null || _d === void 0 ? void 0 : _d.values) || res.data.values.length <= 0) {
+    if (!((_f = res.data) === null || _f === void 0 ? void 0 : _f.values) || res.data.values.length <= 0) {
         throw new Error(i18nInstance.t("error-download-no-tags"));
     }
     const { tag } = yield inquirer

package/dist/lib/extract.js

@@ -14,6 +14,7 @@ import fs from "fs-extra";
 import { PostCommands } from "../types/types.js";
 import url from "url";
 import { i18nInstance, logger } from "../jumpstart-plugin.js";
+import { handleMicroprofileConfig } from "./handleMicroprofileConfig.js";
 export const extract = (bundle, file, command) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t("info-extract-extracting"));
@@ -37,6 +38,7 @@ export const extract = (bundle, file, command) => __awaiter(void 0, void 0, void
             sourceFolder = firstDir ? path.join(unzipFolder, firstDir) : unzipFolder;
         }
         fs.copySync(sourceFolder, dest, { overwrite: true });
+        yield handleMicroprofileConfig(bundle, dest);
     }
     fs.rmSync(unzipFolder, { recursive: true, force: true });
     fs.rmSync(path.dirname(file), { recursive: true, force: true });

package/dist/lib/handleMicroprofileConfig.d.ts

@@ -0,0 +1,3 @@
+import { Bundle } from "../types/types";
+export declare const handleMicroprofileConfig: (bundle: Bundle, dest: string) => Promise<void>;
+export declare function convertObjectToProperties(obj: any): any[];

package/dist/lib/handleMicroprofileConfig.js

@@ -0,0 +1,61 @@
+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());
+    });
+};
+import fs from "fs";
+import path from "path";
+import { getMicroprofileConfigLocation } from "./helper.js";
+import { i18nInstance, logger } from "../jumpstart-plugin.js";
+export const handleMicroprofileConfig = (bundle, dest) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    if (!((_a = bundle.version) === null || _a === void 0 ? void 0 : _a.startsWith("6.3")))
+        return;
+    const tomcatPath = path.join(path.resolve(dest), '../../');
+    const webappName = path.basename(dest);
+    const pathToMicroprofileConfig = getMicroprofileConfigLocation(tomcatPath, webappName);
+    processMicroprofileConfigFile(pathToMicroprofileConfig);
+});
+export function convertObjectToProperties(obj) {
+    const props = [];
+    Object.keys(obj).forEach((key) => {
+        const val = obj[key];
+        if (val && typeof val === 'object' && !Array.isArray(val)) {
+            const children = convertObjectToProperties(val);
+            for (const child of children) {
+                props.push(key + '.' + child);
+            }
+        }
+        else {
+            props.push(key + '=' + val);
+        }
+    });
+    return props;
+}
+function createMicroprofileConfigFile(file) {
+    const microprofileConfig = {
+        magnolia: {
+            publishing: {
+                'receivers[0]': {
+                    name: 'magnoliaPublic8080',
+                    url: 'http://localhost:8080/magnoliaPublic',
+                    enabled: true
+                }
+            }
+        }
+    };
+    logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('create-microprofile--info-creating-file', { file }));
+    return fs.writeFileSync(file, convertObjectToProperties(microprofileConfig).join('\n'), 'utf8');
+}
+function processMicroprofileConfigFile(file) {
+    if (fs.existsSync(file)) {
+        logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('create-microprofile--info-file-exists-skipping'));
+    }
+    else {
+        createMicroprofileConfigFile(file);
+    }
+}

package/dist/lib/helper.d.ts

@@ -10,3 +10,5 @@ export declare const isValidURL: (str: string) => boolean;
 export declare const extractRepoName: (gitUrl: string) => string | null;
 export declare const determinePackageManager: (baseDirectory?: string) => "yarn" | "npm";
 export declare const askForCredentials: () => Promise<Credentials>;
+export declare function getWebAppConfigDefaultFolderLocation(tomcatFolder: string, instance: string): string;
+export declare function getMicroprofileConfigLocation(tomcatFolder: string, instance: string): string;

package/dist/lib/helper.js

@@ -235,3 +235,9 @@ export const askForCredentials = () => __awaiter(void 0, void 0, void 0, functio
         }
     ]);
 });
+export function getWebAppConfigDefaultFolderLocation(tomcatFolder, instance) {
+    return path.join(tomcatFolder, 'webapps', instance, 'WEB-INF', 'config', 'default');
+}
+export function getMicroprofileConfigLocation(tomcatFolder, instance) {
+    return path.join(getWebAppConfigDefaultFolderLocation(tomcatFolder, instance), 'microprofile-config.properties');
+}

package/dist/lib/locales/en/translation.json

@@ -60,6 +60,7 @@
   "error-helper-webapp-props-update-error": "An error occurred while updating 'magnolia.properties': {{errorMsg}}",
   "error-helper-lm-not-found": "light-modules was not found",
   "error-helper-fail-to-install-package": "Failed to install {{packageName}}",
+  "error-option-param-is-flag": "option \"{{option}}\" argument missing. Provided value: \"{{value}}\" is a flag",
 
   "ora-updating-mgnl-config": "Updating mgnl.config.js",
   "ora-adding-shared-vars": "Adding variables to mgnl.config.js",
@@ -69,5 +70,8 @@
   "ora-creating-pj": "Creating package.json",
   "ora-installing-package": "Installing {{packageName}}",
 
-  "install-plugin-with-args-text": "\twith following args: {{pluginArgs}}\n"
+  "install-plugin-with-args-text": "\twith following args: {{pluginArgs}}\n",
+
+  "create-microprofile--info-file-exists-skipping": "File microprofile-config.properties already exists. Skipping...",
+  "create-microprofile--info-creating-file": "Creating microprofile-config.properties at {{file}}"
 }

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magnolia/cli-jumpstart-plugin",
-  "version": "1.0.0-preview.5",
+  "version": "1.0.0-preview.6",
   "description": "Plugin to set up new projects using predefined templates and bundles. Easily select and configure project templates, and let the plugin handle bundle downloads, extraction, and post-command execution.",
   "main": "dist/index.js",
   "scripts": {

package/dist/types/types.d.ts

@@ -13,6 +13,10 @@ export interface Bundle {
     downloadDest?: string;
     name?: string;
     version?: string;
+    alternative: {
+        groupId: string;
+        artifactId: string;
+    };
 }
 export interface TemplateBase {
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magnolia/cli-jumpstart-plugin",
-  "version": "1.0.0-preview.5",
+  "version": "1.0.0-preview.6",
   "description": "Plugin to set up new projects using predefined templates and bundles. Easily select and configure project templates, and let the plugin handle bundle downloads, extraction, and post-command execution.",
   "main": "dist/index.js",
   "scripts": {