@magnolia/cli-jumpstart-plugin 1.0.1 → 1.0.3

package/dist/lib/download.js

@@ -7,25 +7,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import path from "path";
-import fs from "fs-extra";
-import ProgressBar from "progress";
-import inquirer from "inquirer";
-import { i18nInstance, logger } from "../jumpstart-plugin.js";
-import { askForCredentials } from "./helper.js";
-import axios from "axios";
-import { CreateError } from "@magnolia/cli-helper/general-utils";
+import path from 'path';
+import fs from 'fs-extra';
+import ProgressBar from 'progress';
+import inquirer from 'inquirer';
+import { i18nInstance, logger } from '../jumpstart-plugin.js';
+import { askForCredentials } from './helper.js';
+import axios from 'axios';
+import { CreateError, prependNumbersToChoices, } from '@magnolia/cli-helper/general-utils';
+import { HttpsProxyAgent } from 'https-proxy-agent';
+import { HttpProxyAgent } from 'http-proxy-agent';
 export const downloadBundle = (bundle, credentials, dest, options) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        let url = bundle.url;
-        const downloadDest = dest ? dest : "./download-" + new Date().getTime();
+        const url = bundle.url;
+        const downloadDest = dest ? dest : './download-' + new Date().getTime();
         let downloadUrl;
-        if (path.parse(url).name === "tags") {
+        if (path.parse(url).name === 'tags') {
             downloadUrl = yield selectTag(url, credentials);
         }
-        else if (url.includes('https://nexus.magnolia-cms.com/service/rest/v1/search')) {
-            logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t("info-download-preparing", {
-                url
+        else if (url.includes('https://nexus.magnolia-cms.com/service/rest/v1/search') ||
+            url.includes('https://nexus.magnolia-cms.cn/service/rest/v1/search')) {
+            logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-download-preparing', {
+                url,
             }));
             downloadUrl = yield getDownloadUrl(bundle, credentials, options);
         }
@@ -36,22 +39,21 @@ export const downloadBundle = (bundle, credentials, dest, options) => __awaiter(
             method: 'get',
             responseType: 'stream',
         };
-        if (credentials && credentials.username && credentials.password) {
-            opts.auth = credentials;
-        }
         if (downloadDest) {
             yield fs.ensureDir(downloadDest);
         }
-        const tempDownload = path.join(downloadDest, bundle.name ? bundle.name : 'temp-' + new Date().getTime());
+        const parsedUrl = new URL(downloadUrl);
+        const filename = path.basename(parsedUrl.pathname);
+        const tempDownload = path.join(downloadDest, bundle.name || filename || 'temp-' + new Date().getTime());
         const target = fs.createWriteStream(tempDownload);
-        logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t("info-download-starting", {
-            downloadUrl: downloadUrl
+        logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-download-starting', {
+            downloadUrl: downloadUrl,
         }));
         const res = yield get(downloadUrl, opts, credentials, bundle.name || bundle.url);
         if (res.status !== 200) {
-            throw new Error(i18nInstance.t("error-download-fail-status", {
+            throw new Error(i18nInstance.t('error-download-fail-status', {
                 downloadUrl: downloadUrl,
-                status: res.status
+                status: res.status,
             }));
         }
         if (res.headers['content-length']) {
@@ -60,7 +62,7 @@ export const downloadBundle = (bundle, credentials, dest, options) => __awaiter(
                 complete: '=',
                 incomplete: ' ',
                 width: 20,
-                total: len
+                total: len,
             });
             res.data.on('data', (chunk) => {
                 bar.tick(chunk.length);
@@ -82,7 +84,9 @@ export const downloadBundle = (bundle, credentials, dest, options) => __awaiter(
         });
     }
     catch (error) {
-        logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t('error-while-downloading-bundle', { url: bundle.url }));
+        logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t('error-while-downloading-bundle', {
+            url: bundle.url,
+        }));
         throw new CreateError(error.message);
     }
 });
@@ -92,79 +96,94 @@ export const getDownloadUrl = (bundle, credentials, options) => __awaiter(void 0
         method: 'get',
         responseType: 'json',
         headers: {
-            Accept: 'application/json'
-        }
+            Accept: 'application/json',
+        },
     };
-    if (credentials && credentials.username && credentials.password) {
-        opts.auth = credentials;
-    }
     try {
         const url = new URL(bundle.url);
-        url.searchParams.set('prerelease', "false");
+        url.searchParams.set('prerelease', 'false');
         if (bundle.version) {
-            if (options.snapshot || bundle.version.toLowerCase().includes("snapshot")) {
-                url.searchParams.set('prerelease', "true");
-                if (options.magnolia === undefined && !bundle.version.match(/^\d/)) {
-                    options.magnolia = "6.3";
+            if (options.snapshot ||
+                bundle.version.toLowerCase().includes('snapshot')) {
+                url.searchParams.set('prerelease', 'true');
+                if (options.magnolia === undefined &&
+                    !bundle.version.match(/^\d/)) {
+                    options.magnolia = '6.3';
                 }
             }
             if (options.magnolia) {
                 bundle.version = options.magnolia;
-                if ((bundle.version.startsWith('6.3') || bundle.version.includes('alpha') || bundle.version.includes('beta') || bundle.version.includes('rc')) && 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" && bundle.version.toLowerCase() !== "rc") {
-                url.searchParams.set('maven.baseVersion', options.snapshot ? bundle.version + "-SNAPSHOT" : bundle.version);
+            if ((bundle.version.startsWith('latest') ||
+                bundle.version.startsWith('6.3') ||
+                bundle.version.includes('alpha') ||
+                bundle.version.includes('beta') ||
+                bundle.version.includes('rc')) &&
+                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' &&
+                bundle.version.toLowerCase() !== 'rc') {
+                url.searchParams.set('maven.baseVersion', options.snapshot
+                    ? bundle.version + '-SNAPSHOT'
+                    : bundle.version);
             }
         }
-        let response = yield get(url.toString(), opts, credentials, bundle.name || bundle.url);
-        const params = new URLSearchParams(bundle.url.split("?")[1]);
+        const response = (yield get(url.toString(), opts, credentials, bundle.name || bundle.url));
+        const params = new URLSearchParams(bundle.url.split('?')[1]);
         let item = response.data.items[0];
-        if (((_a = bundle.version) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "latest") {
+        if (((_a = bundle.version) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'latest') {
             item = response.data.items.find((item) => {
                 var _a;
                 const itemVersion = (_a = item === null || item === void 0 ? void 0 : item.maven2) === null || _a === void 0 ? void 0 : _a.version;
-                return !(itemVersion === null || itemVersion === void 0 ? void 0 : itemVersion.includes("-alpha")) && !(itemVersion === null || itemVersion === void 0 ? void 0 : itemVersion.includes("-beta")) && !(itemVersion === null || itemVersion === void 0 ? void 0 : itemVersion.includes("-rc"));
+                return (!(itemVersion === null || itemVersion === void 0 ? void 0 : itemVersion.includes('-alpha')) &&
+                    !(itemVersion === null || itemVersion === void 0 ? void 0 : itemVersion.includes('-beta')) &&
+                    !(itemVersion === null || itemVersion === void 0 ? void 0 : itemVersion.includes('-rc')));
             });
         }
-        else if (((_b = bundle.version) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === "alpha") {
+        else if (((_b = bundle.version) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'alpha') {
             item = response.data.items.find((item) => {
                 var _a;
                 const itemVersion = (_a = item === null || item === void 0 ? void 0 : item.maven2) === null || _a === void 0 ? void 0 : _a.version;
-                return itemVersion === null || itemVersion === void 0 ? void 0 : itemVersion.includes("-alpha");
+                return itemVersion === null || itemVersion === void 0 ? void 0 : itemVersion.includes('-alpha');
             });
         }
-        else if (((_c = bundle.version) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === "beta") {
+        else if (((_c = bundle.version) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === 'beta') {
             item = response.data.items.find((item) => {
                 var _a;
                 const itemVersion = (_a = item === null || item === void 0 ? void 0 : item.maven2) === null || _a === void 0 ? void 0 : _a.version;
-                return itemVersion === null || itemVersion === void 0 ? void 0 : itemVersion.includes("-beta");
+                return itemVersion === null || itemVersion === void 0 ? void 0 : itemVersion.includes('-beta');
             });
         }
-        else if (((_d = bundle.version) === null || _d === void 0 ? void 0 : _d.toLowerCase()) === "rc") {
+        else if (((_d = bundle.version) === null || _d === void 0 ? void 0 : _d.toLowerCase()) === 'rc') {
             item = response.data.items.find((item) => {
                 var _a;
                 const itemVersion = (_a = item === null || item === void 0 ? void 0 : item.maven2) === null || _a === void 0 ? void 0 : _a.version;
-                return itemVersion === null || itemVersion === void 0 ? void 0 : itemVersion.includes("-rc");
+                return itemVersion === null || itemVersion === void 0 ? void 0 : itemVersion.includes('-rc');
             });
         }
         if (!item) {
-            throw new Error(i18nInstance.t('error-no-artifact-available', { version: bundle.version }));
+            throw new Error(i18nInstance.t('error-no-artifact-available', {
+                version: bundle.version,
+            }));
         }
         bundle.version = (_f = (_e = item === null || item === void 0 ? void 0 : item.maven2) === null || _e === void 0 ? void 0 : _e.version) !== null && _f !== void 0 ? _f : 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}`;
+        downloadUrl =
+            downloadUrl &&
+                `${downloadUrl[0]}/${params.get('repository')}${item.path}`;
         return downloadUrl;
     }
     catch (error) {
         if (error.code === 'UNABLE_TO_GET_ISSUER_CERT_LOCALLY') {
-            logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t("error-problem-accessing-url", {
-                url: bundle.url
+            logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t('error-problem-accessing-url', {
+                url: bundle.url,
             }));
-            logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t("error-unable-to-get-local-issuer-certificate"));
+            logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t('error-unable-to-get-local-issuer-certificate'));
         }
         throw new CreateError(error.message);
     }
@@ -174,24 +193,23 @@ export const selectTag = (url, credentials) => __awaiter(void 0, void 0, void 0,
     const opts = {
         method: 'get',
         headers: {
-            Accept: 'application/json'
-        }
+            Accept: 'application/json',
+        },
     };
-    if (credentials && credentials.username && credentials.password) {
-        opts.auth = credentials;
-    }
-    const res = yield get(url, opts, credentials);
+    const res = (yield get(url, opts, credentials));
     if (!((_a = res.data) === null || _a === void 0 ? void 0 : _a.values) || res.data.values.length <= 0) {
-        throw new CreateError(i18nInstance.t("error-no-tags"));
+        throw new CreateError(i18nInstance.t('error-no-tags'));
     }
-    const { tag } = yield inquirer
-        .prompt([
+    const { tag } = yield inquirer.prompt([
         {
-            type: 'rawlist',
+            type: 'list',
             name: 'tag',
             message: i18nInstance.t('inquirer-prompt-select-tag'),
-            choices: res.data.values.map((tag) => ({ name: tag.displayId, value: "archive?at=" + tag.id }))
-        }
+            choices: prependNumbersToChoices(res.data.values.map((tag) => ({
+                name: tag.displayId,
+                value: 'archive?at=' + tag.id,
+            }))),
+        },
     ]);
     return url.slice(0, url.length - 4) + tag;
 });
@@ -201,12 +219,16 @@ function get(url, opts, credentials, bundleName) {
         if (bundleName === undefined) {
             bundleName = url;
         }
+        if (credentials) {
+            opts.auth = credentials;
+        }
+        opts = setProxyOpts(opts);
         const handleAuthFail = () => __awaiter(this, void 0, void 0, function* () {
+            logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t('error-auth-fail', { url }));
             if (credentials) {
-                logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t("error-auth-fail", { url }));
-                const newCredentials = yield askForCredentials(bundleName);
-                credentials.username = (newCredentials === null || newCredentials === void 0 ? void 0 : newCredentials.username) || "";
-                credentials.password = (newCredentials === null || newCredentials === void 0 ? void 0 : newCredentials.password) || "";
+                opts.auth = yield askForCredentials(bundleName);
+                credentials.username = opts.auth.username;
+                credentials.password = opts.auth.password;
             }
         });
         while (true) {
@@ -231,3 +253,14 @@ function get(url, opts, credentials, bundleName) {
         return res;
     });
 }
+const setProxyOpts = (opts) => {
+    const httpsproxy = process.env.https_proxy || process.env.HTTPS_PROXY;
+    const httpproxy = process.env.http_proxy || process.env.HTTP_PROXY;
+    if (httpsproxy) {
+        return Object.assign(Object.assign({}, opts), { httpsAgent: new HttpsProxyAgent(httpsproxy), proxy: false });
+    }
+    else if (httpproxy) {
+        return Object.assign(Object.assign({}, opts), { httpAgent: new HttpProxyAgent(httpproxy), proxy: false });
+    }
+    return opts;
+};

package/dist/lib/extensions.d.ts

@@ -1,5 +1,7 @@
 export declare const evaluateCustomPrompts: (extensionsPath: string) => Promise<{
-    answers: import("inquirer").Answers;
+    answers: {
+        [x: string]: any;
+    };
     executePostCommands: (context: any) => Promise<void>;
 } | undefined>;
 export declare const compileCustomPrompts: (answers: any, pattern?: string) => Promise<void>;

package/dist/lib/extensions.js

@@ -7,17 +7,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import fs from "fs-extra";
-import path from "path";
-import inquirer from "inquirer";
-import { execa } from "execa";
+import fs from 'fs-extra';
+import path from 'path';
+import inquirer from 'inquirer';
+import { execa } from 'execa';
 import { parse } from 'yaml';
-import { i18nInstance, logger } from "../jumpstart-plugin.js";
-import ora from "ora";
-import { determinePackageManager } from "./helper.js";
-import { pathToFileURL } from "url";
-import { globSync } from "glob";
-import _ from "underscore";
+import { i18nInstance, logger } from '../jumpstart-plugin.js';
+import ora from 'ora';
+import { determinePackageManager } from './helper.js';
+import { pathToFileURL } from 'url';
+import { globSync } from 'glob';
+import _ from 'underscore';
 function pause(milliSeconds) {
     return __awaiter(this, void 0, void 0, function* () {
         return new Promise((resolve) => {
@@ -29,8 +29,8 @@ function pause(milliSeconds) {
 }
 function callExtensionFunction(func_1, context_1, name_1) {
     return __awaiter(this, arguments, void 0, function* (func, context, name, delay = 200, retry = 0, maxRetry = 0) {
-        logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t("info-extensions-calling-fn", {
-            name: name
+        logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-extensions-calling-fn', {
+            name: name,
         }));
         try {
             yield func(context);
@@ -39,11 +39,11 @@ function callExtensionFunction(func_1, context_1, name_1) {
             if (retry === maxRetry) {
                 throw error;
             }
-            logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t("error-extensions-calling-fn-retry", {
+            logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t('error-extensions-calling-fn-retry', {
                 name: name,
                 retry: retry,
                 maxRetry: maxRetry,
-                delay: delay
+                delay: delay,
             }));
             yield pause(delay);
             yield callExtensionFunction(func, context, name, delay, retry + 1, maxRetry);
@@ -52,19 +52,14 @@ function callExtensionFunction(func_1, context_1, name_1) {
 }
 function executePostCommands() {
     return __awaiter(this, arguments, void 0, function* (cmds = [], extensions, context) {
-        for (let cmd of cmds) {
+        for (const cmd of cmds) {
             const func = extensions[cmd.function];
             if (func) {
-                try {
-                    yield callExtensionFunction(func, context, cmd.function, cmd.delay, 0, cmd.retry);
-                }
-                catch (e) {
-                    throw e;
-                }
+                yield callExtensionFunction(func, context, cmd.function, cmd.delay, 0, cmd.retry);
             }
             else {
-                logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t("error-extensions-fn-not-found", {
-                    function: cmd.function
+                logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t('error-extensions-fn-not-found', {
+                    function: cmd.function,
                 }));
             }
         }
@@ -79,45 +74,38 @@ export const evaluateCustomPrompts = (extensionsPath) => __awaiter(void 0, void
     const baseDir = path.parse(extensionsPath).dir;
     const packageJson = path.join(baseDir, 'package.json');
     if (fs.existsSync(packageJson)) {
-        const npmISpinner = ora().start(i18nInstance.t("ora-start-installing-ext-dep"));
+        const npmISpinner = ora().start(i18nInstance.t('ora-start-installing-ext-dep'));
         const packageManager = determinePackageManager(baseDir);
         try {
-            yield execa(packageManager, ["install"], {
+            yield execa(packageManager, ['install'], {
                 buffer: true,
-                cwd: baseDir
+                cwd: baseDir,
             });
-            npmISpinner.succeed(i18nInstance.t("ora-succeed-extensions-install-done"));
+            npmISpinner.succeed(i18nInstance.t('ora-succeed-extensions-install-done'));
         }
         catch (e) {
-            npmISpinner.fail(i18nInstance.t("ora-fail-pm-install", {
-                packageManager: packageManager, errorMsg: e.message
+            npmISpinner.fail(i18nInstance.t('ora-fail-pm-install', {
+                packageManager: packageManager,
+                errorMsg: e.message,
             }));
             return;
         }
     }
-    try {
-        const extensions = doc.extend ? yield import(pathToFileURL(path.join(baseDir, doc.extend)).href) : null;
-        return {
-            answers: doc.prompts ? yield inquirer.prompt(doc.prompts) : {},
-            executePostCommands: (context) => __awaiter(void 0, void 0, void 0, function* () { var _a; return yield executePostCommands((_a = doc === null || doc === void 0 ? void 0 : doc.commands) === null || _a === void 0 ? void 0 : _a.post, extensions, context); })
-        };
-    }
-    catch (error) {
-        throw error;
-    }
+    const extensions = doc.extend
+        ? yield import(pathToFileURL(path.join(baseDir, doc.extend)).href)
+        : null;
+    return {
+        answers: doc.prompts ? yield inquirer.prompt(doc.prompts) : {},
+        executePostCommands: (context) => __awaiter(void 0, void 0, void 0, function* () { var _a; return yield executePostCommands((_a = doc === null || doc === void 0 ? void 0 : doc.commands) === null || _a === void 0 ? void 0 : _a.post, extensions, context); }),
+    };
 });
 export const compileCustomPrompts = (answers_1, ...args_1) => __awaiter(void 0, [answers_1, ...args_1], void 0, function* (answers, pattern = '**/**/**/*.{yaml,tsx,ts,js,jsx,vue,md,json}') {
-    const init = globSync(pattern, { ignore: 'node_modules/**' }).map(itm => path.join(process.cwd(), itm));
+    const init = globSync(pattern, { ignore: 'node_modules/**' }).map((itm) => path.join(process.cwd(), itm));
     const pkg = JSON.parse(fs.readFileSync(path.join(process.cwd(), './package.json'), 'utf8'));
     pkg.answers = answers;
     for (const item of init) {
-        try {
-            const file = fs.readFileSync(item, 'utf8');
-            const doc = _.template(file)(pkg);
-            fs.outputFileSync(item, doc, 'utf8');
-        }
-        catch (e) {
-            throw e;
-        }
+        const file = fs.readFileSync(item, 'utf8');
+        const doc = _.template(file)(pkg);
+        fs.outputFileSync(item, doc, 'utf8');
     }
 });

package/dist/lib/extract.d.ts

@@ -1,4 +1,4 @@
-import { Bundle } from "../types/types.js";
+import { Bundle } from '../types/types.js';
 export declare const extract: (bundle: Bundle, file: string, command: string) => Promise<void>;
 export declare const extractApacheTomcat: (dest: string, unzipFolder: string) => Promise<void>;
 export declare const findExtractedApacheTomcatDir: (p: string) => Promise<unknown>;

package/dist/lib/extract.js

@@ -7,50 +7,66 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import decompress from "decompress";
-import path from "path";
-import walk from "walk";
-import fs from "fs-extra";
-import { PostCommands } from "../types/types.js";
-import url from "url";
-import { i18nInstance } from "../jumpstart-plugin.js";
-import { handleMicroprofileConfig } from "./handleMicroprofileConfig.js";
-import ora from "ora";
-import { CreateError } from "@magnolia/cli-helper/general-utils";
+import decompress from 'decompress';
+import path from 'path';
+import walk from 'walk';
+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';
+import ora from 'ora';
+import { CreateError } from '@magnolia/cli-helper/general-utils';
 export const extract = (bundle, file, command) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    const spinner = ora().start(i18nInstance.t("ora-start-extracting"));
-    let { dest = "./" } = bundle;
-    const unzipFolder = "temp-" + new Date().getTime();
-    yield decompress(file, unzipFolder);
-    if (command === PostCommands.ExtractAndOverride) {
-        fs.rmSync(dest, { recursive: true, force: true });
-    }
-    const artifactId = (_a = url.parse(bundle.url, true)) === null || _a === void 0 ? void 0 : _a.query['maven.artifactId'];
-    if (artifactId === 'magnolia-tomcat-barebone') {
-        dest = path.join(dest, 'apache-tomcat');
-        yield extractApacheTomcat(dest, unzipFolder);
-        spinner.succeed(i18nInstance.t('ora-succeed-extracted-to', { path: path.resolve(dest) }));
-    }
-    else {
-        let sourceFolder = unzipFolder;
-        if (command === PostCommands.ExtractAndUnfold) {
-            const firstDir = fs.readdirSync(unzipFolder).find(item => {
-                const itemPath = path.join(unzipFolder, item);
-                return fs.statSync(itemPath).isDirectory();
-            });
-            sourceFolder = firstDir ? path.join(unzipFolder, firstDir) : unzipFolder;
+    const spinner = ora().start(i18nInstance.t('ora-start-extracting'));
+    let { dest = './' } = bundle;
+    try {
+        const unzipFolder = 'temp-' + new Date().getTime();
+        yield decompress(file, unzipFolder);
+        if (command === PostCommands.ExtractAndOverride) {
+            fs.rmSync(dest, { recursive: true, force: true });
         }
-        fs.copySync(sourceFolder, dest, { overwrite: true });
-        spinner.succeed(i18nInstance.t('ora-succeed-extracted-to', { path: path.resolve(dest) }));
-        yield handleMicroprofileConfig(bundle, dest);
+        const artifactId = (_a = url.parse(bundle.url, true)) === null || _a === void 0 ? void 0 : _a.query['maven.artifactId'];
+        if (artifactId === 'magnolia-tomcat-barebone') {
+            dest = path.join(dest, 'apache-tomcat');
+            yield extractApacheTomcat(dest, unzipFolder);
+            spinner.succeed(i18nInstance.t('ora-succeed-extracted-to', {
+                path: path.resolve(dest),
+            }));
+        }
+        else {
+            let sourceFolder = unzipFolder;
+            if (command === PostCommands.ExtractAndUnfold) {
+                const firstDir = fs.readdirSync(unzipFolder).find((item) => {
+                    const itemPath = path.join(unzipFolder, item);
+                    return fs.statSync(itemPath).isDirectory();
+                });
+                sourceFolder = firstDir
+                    ? path.join(unzipFolder, firstDir)
+                    : unzipFolder;
+            }
+            fs.copySync(sourceFolder, dest, { overwrite: true });
+            spinner.succeed(i18nInstance.t('ora-succeed-extracted-to', {
+                path: path.resolve(dest),
+            }));
+            yield handleMicroprofileConfig(bundle, dest);
+        }
+        fs.rmSync(unzipFolder, { recursive: true, force: true });
+        fs.rmSync(path.dirname(file), { recursive: true, force: true });
+    }
+    catch (e) {
+        spinner.stop();
+        logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t('error-extraction-fail', { error: e.message }));
+        process.exit(1);
     }
-    fs.rmSync(unzipFolder, { recursive: true, force: true });
-    fs.rmSync(path.dirname(file), { recursive: true, force: true });
 });
 export const extractApacheTomcat = (dest, unzipFolder) => __awaiter(void 0, void 0, void 0, function* () {
     const apacheTomcatDir = yield findExtractedApacheTomcatDir(unzipFolder);
-    fs.rmSync(path.join(apacheTomcatDir, 'webapps', 'magnoliaAuthor'), { recursive: true, force: true });
+    fs.rmSync(path.join(apacheTomcatDir, 'webapps', 'magnoliaAuthor'), {
+        recursive: true,
+        force: true,
+    });
     fs.copySync(apacheTomcatDir, dest, { overwrite: false });
 });
 export const findExtractedApacheTomcatDir = (p) => {
@@ -63,7 +79,7 @@ export const findExtractedApacheTomcatDir = (p) => {
             next();
         });
         walker.on('end', function () {
-            return reject(new CreateError(i18nInstance.t("error-apache-tomcat-not-found")));
+            return reject(new CreateError(i18nInstance.t('error-apache-tomcat-not-found')));
         });
     });
 };

package/dist/lib/handleMicroprofileConfig.d.ts

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

package/dist/lib/handleMicroprofileConfig.js

@@ -7,13 +7,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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";
+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")))
+    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);
@@ -43,10 +43,10 @@ function createMicroprofileConfigFile(file) {
                 'receivers[0]': {
                     name: 'magnoliaPublic8080',
                     url: 'http://localhost:8080/magnoliaPublic',
-                    enabled: true
-                }
-            }
-        }
+                    enabled: true,
+                },
+            },
+        },
     };
     fs.writeFileSync(file, convertObjectToProperties(microprofileConfig).join('\n'), 'utf8');
     logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-created-microprofile', { file }));

package/dist/lib/helper.d.ts

@@ -1,5 +1,6 @@
-import { Credentials } from "../types/types.js";
+import { Bundle, Credentials } from '../types/types.js';
 export declare const handleLightModulesFolder: () => Promise<void>;
+export declare const handleLightModulesPathInTemplate: (template: any) => Promise<void>;
 export declare const findLightModulesFolder: (p: string) => Promise<unknown>;
 export declare const findWebAppsList: (apacheTomcatPath: string) => string[];
 export declare const initializeNodeProject: () => Promise<void>;
@@ -9,3 +10,4 @@ export declare const determinePackageManager: (baseDirectory?: string) => "yarn"
 export declare const askForCredentials: (bundle: string) => Promise<Credentials>;
 export declare function getWebAppConfigDefaultFolderLocation(tomcatFolder: string, instance: string): string;
 export declare function getMicroprofileConfigLocation(tomcatFolder: string, instance: string): string;
+export declare function copyDownloadedFile(bundle: Bundle, file: string): boolean;