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

package/dist/lib/download.js

@@ -9,22 +9,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import path from "path";
 import fs from "fs-extra";
-import axios from "axios";
 import ProgressBar from "progress";
 import inquirer from "inquirer";
 import { i18nInstance, logger } from "../jumpstart-plugin.js";
+import { askForCredentials } from "./helper.js";
+import axios from "axios";
 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();
         let downloadUrl;
-        logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t("info-download-preparing", {
-            url
-        }));
         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
+            }));
             downloadUrl = yield getDownloadUrl(bundle, credentials, options);
         }
         else {
@@ -45,16 +46,16 @@ export const downloadBundle = (bundle, credentials, dest, options) => __awaiter(
         logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t("info-download-starting", {
             downloadUrl: downloadUrl
         }));
-        const res = yield axios.get(downloadUrl, opts);
+        const res = yield get(downloadUrl, opts, credentials, bundle.name || bundle.url);
         if (res.status !== 200) {
-            throw new Error(i18nInstance.t("info-download-status-error", {
+            throw new Error(i18nInstance.t("error-download-fail-status", {
                 downloadUrl: downloadUrl,
                 status: res.status
             }));
         }
         if (res.headers['content-length']) {
             const len = parseInt(res.headers['content-length'], 10);
-            const bar = new ProgressBar('Downloading [:bar] :percent :etas', {
+            const bar = new ProgressBar(`${i18nInstance.t('progress-bar-downloading')} [:bar] :percent :etas`, {
                 complete: '=',
                 incomplete: ' ',
                 width: 20,
@@ -67,7 +68,6 @@ export const downloadBundle = (bundle, credentials, dest, options) => __awaiter(
         res.data.pipe(target);
         return new Promise((resolve) => {
             target.on('finish', () => {
-                logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t("info-download-finished"));
                 resolve(path.join('.', tempDownload));
             });
             target.on('error', (error) => {
@@ -81,11 +81,12 @@ 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 }));
         throw new Error(error);
     }
 });
 export const getDownloadUrl = (bundle, credentials, options) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const opts = {
         method: 'get',
         responseType: 'json',
@@ -102,26 +103,29 @@ export const getDownloadUrl = (bundle, credentials, options) => __awaiter(void 0
         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.2";
+                }
             }
-            if (options.magnoliaVersion) {
-                bundle.version = options.magnoliaVersion;
-                if (bundle.version.startsWith('6.3') && bundle.alternative) {
+            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") {
+            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);
             }
         }
-        const response = yield axios.get(url.toString(), opts);
+        let 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") {
             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"));
+                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") {
@@ -138,10 +142,17 @@ export const getDownloadUrl = (bundle, credentials, options) => __awaiter(void 0
                 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") {
+            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");
+            });
+        }
         if (!item) {
-            throw new Error(i18nInstance.t('error-download-no-artifact-available', { version: bundle.version, interpolation: { escapeValue: false } }));
+            throw new Error(i18nInstance.t('error-no-artifact-available', { version: bundle.version }));
         }
-        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;
+        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}`;
@@ -149,16 +160,16 @@ export const getDownloadUrl = (bundle, credentials, options) => __awaiter(void 0
     }
     catch (error) {
         if (error.code === 'UNABLE_TO_GET_ISSUER_CERT_LOCALLY') {
-            logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t("error-download-problem-accessing-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-download-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 Error(error.message);
     }
 });
 export const selectTag = (url, credentials) => __awaiter(void 0, void 0, void 0, function* () {
-    var _f;
+    var _g;
     const opts = {
         method: 'get',
         headers: {
@@ -168,18 +179,54 @@ export const selectTag = (url, credentials) => __awaiter(void 0, void 0, void 0,
     if (credentials && credentials.username && credentials.password) {
         opts.auth = credentials;
     }
-    const res = yield axios.get(url, opts);
-    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 res = yield get(url, opts, credentials);
+    if (!((_g = res.data) === null || _g === void 0 ? void 0 : _g.values) || res.data.values.length <= 0) {
+        throw new Error(i18nInstance.t("error-no-tags"));
     }
     const { tag } = yield inquirer
         .prompt([
         {
             type: 'rawlist',
             name: 'tag',
-            message: 'Please select a tag',
+            message: i18nInstance.t('inquirer-prompt-select-tag'),
             choices: res.data.values.map((tag) => ({ name: tag.displayId, value: "archive?at=" + tag.id }))
         }
     ]);
     return url.slice(0, url.length - 4) + tag;
 });
+function get(url, opts, credentials, bundleName) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let res;
+        if (bundleName === undefined) {
+            bundleName = url;
+        }
+        const handleAuthFail = () => __awaiter(this, void 0, void 0, function* () {
+            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) || "";
+            }
+        });
+        while (true) {
+            try {
+                res = yield axios.get(url, opts);
+                if (res.status === 401 && credentials) {
+                    yield handleAuthFail();
+                }
+                else {
+                    break;
+                }
+            }
+            catch (e) {
+                if (e.response.status === 401 && credentials) {
+                    yield handleAuthFail();
+                }
+                else {
+                    throw Error(e);
+                }
+            }
+        }
+        return res;
+    });
+}

package/dist/lib/extensions.js

@@ -79,23 +79,21 @@ 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-installing-ext-dep"));
+        const npmISpinner = ora().start(i18nInstance.t("ora-start-installing-ext-dep"));
         const packageManager = determinePackageManager(baseDir);
         try {
             yield execa(packageManager, ["install"], {
                 buffer: true,
                 cwd: baseDir
             });
+            npmISpinner.succeed(i18nInstance.t("ora-succeed-extensions-install-done"));
         }
         catch (e) {
-            npmISpinner.stop();
-            logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t("error-extensions-install-fail", {
-                packageManager: packageManager
+            npmISpinner.fail(i18nInstance.t("ora-fail-pm-install", {
+                packageManager: packageManager, errorMsg: e.message
             }));
             return;
         }
-        npmISpinner.stop();
-        logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t("info-extensions-install-done"));
     }
     try {
         const extensions = doc.extend ? yield import(pathToFileURL(path.join(baseDir, doc.extend)).href) : null;

package/dist/lib/extract.js

@@ -13,12 +13,13 @@ 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 { i18nInstance } from "../jumpstart-plugin.js";
 import { handleMicroprofileConfig } from "./handleMicroprofileConfig.js";
+import ora from "ora";
 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"));
-    const { dest = "./", type } = bundle;
+    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) {
@@ -26,7 +27,9 @@ export const extract = (bundle, file, command) => __awaiter(void 0, void 0, void
     }
     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;
@@ -38,6 +41,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 });
+        spinner.succeed(i18nInstance.t('ora-succeed-extracted-to', { path: path.resolve(dest) }));
         yield handleMicroprofileConfig(bundle, dest);
     }
     fs.rmSync(unzipFolder, { recursive: true, force: true });
@@ -46,7 +50,7 @@ export const extract = (bundle, file, command) => __awaiter(void 0, void 0, void
 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.copySync(apacheTomcatDir, path.join(dest, "apache-tomcat"), { overwrite: false });
+    fs.copySync(apacheTomcatDir, dest, { overwrite: false });
 });
 export const findExtractedApacheTomcatDir = (p) => {
     return new Promise((resolve, reject) => {
@@ -58,7 +62,7 @@ export const findExtractedApacheTomcatDir = (p) => {
             next();
         });
         walker.on('end', function () {
-            return reject(new Error(i18nInstance.t("error-extract-apache-tomcat-not-found")));
+            return reject(new Error(i18nInstance.t("error-apache-tomcat-not-found")));
         });
     });
 };

package/dist/lib/handleMicroprofileConfig.js

@@ -48,12 +48,12 @@ function createMicroprofileConfigFile(file) {
             }
         }
     };
-    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');
+    fs.writeFileSync(file, convertObjectToProperties(microprofileConfig).join('\n'), 'utf8');
+    logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-created-microprofile', { file }));
 }
 function processMicroprofileConfigFile(file) {
     if (fs.existsSync(file)) {
-        logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('create-microprofile--info-file-exists-skipping'));
+        logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-microprofile-exists'));
     }
     else {
         createMicroprofileConfigFile(file);

package/dist/lib/helper.d.ts

@@ -5,10 +5,9 @@ export declare const handleLightModulesFolder: () => Promise<void>;
 export declare const findLightModulesFolder: (p: string) => Promise<unknown>;
 export declare const findWebAppsList: (apacheTomcatPath: string) => string[];
 export declare const initializeNodeProject: () => Promise<void>;
-export declare const installPackage: (packageManager: string, packageReference: string, packageName?: string, credentials?: Credentials) => Promise<boolean>;
-export declare const isValidURL: (str: string) => boolean;
-export declare const extractRepoName: (gitUrl: string) => string | null;
+export declare const installCLI: () => Promise<boolean>;
+export declare const installPackage: (packageManager: string, packageReference: string, packageName?: string) => Promise<boolean>;
 export declare const determinePackageManager: (baseDirectory?: string) => "yarn" | "npm";
-export declare const askForCredentials: () => Promise<Credentials>;
+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;

package/dist/lib/helper.js

@@ -57,22 +57,21 @@ export const handleLightModulesFolder = () => __awaiter(void 0, void 0, void 0,
     let lightModulesPath;
     try {
         lightModulesPath = (yield findLightModulesFolder(process.cwd()));
-        logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t("info-helper-found-lm", {
+        logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t("info-found-lm", {
             lightModulesPath: lightModulesPath
         }));
     }
     catch (e) {
-        logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t("info-helper-no-lm-found"));
         lightModulesPath = path.join(process.cwd(), 'light-modules');
         try {
             fs.mkdirSync(lightModulesPath, { recursive: true });
-            logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t("info-helper-lm-created", {
+            logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t("info-lm-created", {
                 lightModulesPath: lightModulesPath
             }));
         }
         catch (error) {
-            logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t("error-helper-lm-create-fail", {
-                errorMsg: error instanceof Error ? error.message : ""
+            logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t("error-lm-create-fail", {
+                errorMsg: error.message
             }));
             return;
         }
@@ -82,8 +81,8 @@ export const handleLightModulesFolder = () => __awaiter(void 0, void 0, void 0,
         apacheTomcatPath = yield findExtractedApacheTomcatDir(process.cwd());
     }
     catch (error) {
-        logger === null || logger === void 0 ? void 0 : logger.warn(i18nInstance.t("warn-helper-cannot-modify-webapp", {
-            errorMsg: error instanceof Error ? error.message : ""
+        logger === null || logger === void 0 ? void 0 : logger.warn(i18nInstance.t("warn-cannot-modify-webapp", {
+            errorMsg: error.message
         }));
         return;
     }
@@ -103,7 +102,7 @@ export const handleLightModulesFolder = () => __awaiter(void 0, void 0, void 0,
 });
 const editProperties = (filePath, props) => {
     if (!fs.existsSync(filePath)) {
-        logger === null || logger === void 0 ? void 0 : logger.warn(i18nInstance.t("warn-helper-webapp-props-not-exist", {
+        logger === null || logger === void 0 ? void 0 : logger.warn(i18nInstance.t("warn-webapp-props-not-exist", {
             filePath: filePath
         }));
         return;
@@ -113,7 +112,7 @@ const editProperties = (filePath, props) => {
     try {
         fs.writeFileSync(filePath, replacedContent);
         Object.keys(props).forEach((key) => {
-            logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t("info-helper-webapp-prop-setting", {
+            logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t("info-webapp-prop-setting", {
                 key: key,
                 propsKey: props[key],
                 filePath: filePath
@@ -121,8 +120,8 @@ const editProperties = (filePath, props) => {
         });
     }
     catch (error) {
-        logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t("error-helper-webapp-props-update-error", {
-            errorMsg: error instanceof Error ? error.message : ""
+        logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t("error-webapp-props-update-error", {
+            errorMsg: error.message, path: filePath
         }));
     }
 };
@@ -144,7 +143,7 @@ export const findLightModulesFolder = (p) => {
             next();
         });
         walker.on('end', function () {
-            return reject(new Error(i18nInstance.t("error-helper-lm-not-found")));
+            return reject(new Error(i18nInstance.t("error-lm-not-found")));
         });
     });
 };
@@ -164,17 +163,14 @@ export const initializeNodeProject = () => __awaiter(void 0, void 0, void 0, fun
     yield handlePackageJSON();
     yield handleMGNLConfigFile();
 });
-export const installPackage = (packageManager, packageReference, packageName, credentials) => __awaiter(void 0, void 0, void 0, function* () {
+export const installCLI = () => __awaiter(void 0, void 0, void 0, function* () {
+    return yield installPackage(determinePackageManager(), "@magnolia/cli@preview", "mgnl-cli");
+});
+export const installPackage = (packageManager, packageReference, packageName) => __awaiter(void 0, void 0, void 0, function* () {
     if (!packageName) {
         packageName = packageReference;
     }
-    if (packageReference.startsWith("git+https://git.magnolia-cms.com")) {
-        if (credentials === undefined) {
-            credentials = yield askForCredentials();
-        }
-        packageReference = packageReference.replace("git+https://git.magnolia-cms.com", `git+https://${credentials.username}:${credentials.password}@git.magnolia-cms.com`);
-    }
-    const spinner = ora().start(i18nInstance.t("ora-installing-package", {
+    const spinner = ora().start(i18nInstance.t("ora-start-installing-package", {
         packageName: packageName
     }));
     try {
@@ -182,33 +178,18 @@ export const installPackage = (packageManager, packageReference, packageName, cr
             buffer: true,
             cwd: process.cwd()
         });
-        spinner.stop();
-        logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t("info-helper-package-installed", {
+        spinner.succeed(i18nInstance.t("ora-succeed-package-installed", {
             packageName: packageName
         }));
         return true;
     }
     catch (error) {
-        spinner.stop();
-        logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t("error-helper-fail-to-install-package", {
-            packageName: packageName
+        spinner.fail(i18nInstance.t("ora-fail-installing-package", {
+            packageName: packageName, errorMsg: error.message
         }));
         return false;
     }
 });
-export const isValidURL = (str) => {
-    try {
-        new URL(str);
-        return true;
-    }
-    catch (_) {
-        return false;
-    }
-};
-export const extractRepoName = (gitUrl) => {
-    const match = gitUrl.match(/\/([^/]+?)(?:\.git)?$/);
-    return match ? match[1] : null;
-};
 export const determinePackageManager = (baseDirectory = process.cwd()) => {
     const yarnLockPath = path.join(baseDirectory, 'yarn.lock');
     const packageLockPath = path.join(baseDirectory, 'package-lock.json');
@@ -221,7 +202,10 @@ export const determinePackageManager = (baseDirectory = process.cwd()) => {
     // Default to npm
     return 'npm';
 };
-export const askForCredentials = () => __awaiter(void 0, void 0, void 0, function* () {
+export const askForCredentials = (bundle) => __awaiter(void 0, void 0, void 0, function* () {
+    logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t("info-enter-credentials", {
+        bundle: bundle
+    }));
     return inquirer.prompt([
         {
             type: 'input',

package/dist/lib/install.js

@@ -11,19 +11,18 @@ import { PostCommands } from "../types/types.js";
 import path from "path";
 import { execa } from "execa";
 import ora from 'ora';
-import { i18nInstance, logger } from "../jumpstart-plugin.js";
+import { i18nInstance } from "../jumpstart-plugin.js";
 export const installDependencies = (bundle, command) => __awaiter(void 0, void 0, void 0, function* () {
-    const spinner = ora(i18nInstance.t("ora-installing-dep")).start();
+    const pm = command === PostCommands.YarnInstall ? 'yarn' : 'npm';
+    const spinner = ora().start(i18nInstance.t("ora-start-running-pm-install", { packageManager: pm }));
     try {
-        yield execa(command === PostCommands.YarnInstall ? 'yarn' : 'npm', ['install'], {
+        yield execa(pm, ['install'], {
             buffer: true,
             cwd: path.join(process.cwd(), bundle.dest ? bundle.dest : "./")
         });
-        spinner.stop();
-        logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t("info-install-dep"));
+        spinner.succeed(i18nInstance.t('ora-succeed-pm-install', { packageManager: pm }));
     }
     catch (e) {
-        spinner.stop();
-        logger === null || logger === void 0 ? void 0 : logger.error(i18nInstance.t("error-install-dep-fail"));
+        spinner.fail(i18nInstance.t("ora-fail-pm-install", { packageManager: pm, errorMsg: e.message }));
     }
 });