@magnolia/cli-jumpstart-plugin 1.1.0 → 1.1.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.1.2 (2025-08-08)
+* Ask for credentials before checking for tomcat ([MGNLCLI-417](https://magnolia-cms.atlassian.net/browse/MGNLCLI-417))
+
+## 1.1.1 (2025-08-07)
+* Set allowVariants property for the magnoliaAuthor ([MGNLCLI-407](https://magnolia-cms.atlassian.net/browse/MGNLCLI-407))
+* Add optional [name] argument to jumpstart command ([MGNLCLI-408](https://magnolia-cms.atlassian.net/browse/MGNLCLI-408))
+* Download correct tomcat version ([MGNLCLI-413](https://magnolia-cms.atlassian.net/browse/MGNLCLI-413))
+
 ## 1.1.0 (2025-06-06)
 * Add support for named auth profiles in project templates for reusing credentials across bundles ([MGNLCLI-387](https://magnolia-cms.atlassian.net/browse/MGNLCLI-387))
 * Add support for 6.4 version ([MGNLCLI-389](https://magnolia-cms.atlassian.net/browse/MGNLCLI-389))

package/README.md

@@ -5,6 +5,15 @@ A plugin for [Magnolia CLI](https://docs.magnolia-cms.com/magnolia-cli) to downl
 Within the Magnolia CLI plugin system, this plugin is pre-installed and ready to be used.
 
 ## Usage
+```
+jumpstart [name] [options]
+```
+
+### Arguments
+| Argument | Description                                                                                     |
+|----------|-------------------------------------------------------------------------------------------------|
+| `name`   | Optional project directory name. If provided, the project will be created in this directory.   |
+
 ### Options
 
 | Short          | Long                           | Description                                                                   |
@@ -17,11 +26,17 @@ Within the Magnolia CLI plugin system, this plugin is pre-installed and ready to
 | `-h`           | `--help`                       | display help for command                                                      |
 
 ### Examples
-#### Jumpstart a project
+#### Jumpstart a project in current directory
 ```bash
 npx @magnolia/cli@latest jumpstart
 ```
-This command will prompt you with a list of available templates to choose from. Once you select a template, the CLI will download and configure the project with the latest Magnolia version (or with version associated with that template)
+This command will prompt you with a list of available templates to choose from. Once you select a template, the CLI will download and configure the project in the current working directory with the latest Magnolia version (or with version associated with that template).
+
+#### Jumpstart a project in a new directory
+```bash
+npx @magnolia/cli@latest jumpstart my-project
+```
+This command will create a new directory called `my-project` (if it doesn't exist) and set up the project inside it.
 
 #### Jumpstart a project with specific template
 ```bash
@@ -35,6 +50,12 @@ npx @magnolia/cli@latest jumpstart --template "standard-webapps/magnolia-communi
 ```
 This command will start downloading and configuring project based on "standard-webapps/magnolia-community-webapp" template with 6.2.11 Magnolia version.
 
+#### Jumpstart a project in a specific directory with template and version
+```bash
+npx @magnolia/cli@latest jumpstart my-magnolia-app --template "standard-webapps/magnolia-community-webapp" --magnolia "6.2.11"
+```
+This command will create the `my-magnolia-app` directory (if needed) and set up the project with the specified template and Magnolia version.
+
 ## Plugin Documentation
 For detailed documentation of the plugin, please refer to [Plugin Documentation](https://docs.magnolia-cms.com/magnolia-cli)
 

package/dist/jumpstart-plugin.d.ts

@@ -22,7 +22,10 @@ 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 extractProjectName;
+    validateAndGetDirectoryName(projectName?: string): Promise<string | undefined>;
+    handleProjectDirectory(projectName?: string): string;
     init(winstonLogger: Logger): Promise<void>;
-    start(options: PluginOptions): Promise<void>;
+    start(options: PluginOptions, args?: string[]): Promise<void>;
     stop(): Promise<void>;
 }

package/dist/jumpstart-plugin.js

@@ -13,12 +13,15 @@ import { createRequire } from 'module';
 const requireFn = createRequire(import.meta.url);
 const pkg = requireFn('./package.json');
 import inquirer from 'inquirer';
+import filenamify from 'filenamify';
 import axios from 'axios';
 import { extract } from './lib/extract.js';
 import { downloadBundle } from './lib/download.js';
 import { PostCommands, } from './types/types.js';
 import { installDependencies } from './lib/install.js';
 import path from 'path';
+import fs from 'fs-extra';
+import process from 'process';
 import { askForCredentials, copyDownloadedFile, handleLightModulesFolder, handleLightModulesPathInTemplate, initializeNodeProject, } from './lib/helper.js';
 import { compileCustomPrompts, evaluateCustomPrompts, } from './lib/extensions.js';
 import { addConfigProps } from './lib/config-helper.js';
@@ -40,7 +43,7 @@ export default class JumpstartPlugin extends PluginTemplate {
         super();
         this.name = 'jumpstart';
         this.version = pkg.version;
-        this.usage = '[options]';
+        this.usage = '[name] [options]';
         this.authProfiles = {};
         i18nInstance = initI18n(this.name, 'translation', path.join(__dirname, 'lib/locales'));
         this.description = i18nInstance.t('description');
@@ -92,13 +95,28 @@ export default class JumpstartPlugin extends PluginTemplate {
             }
             for (const bundle of template.bundles || []) {
                 try {
-                    const credentials = bundle.auth === true
-                        ? yield askForCredentials(bundle.name || bundle.url)
-                        : typeof bundle.auth === 'string'
-                            ? this.authProfiles[bundle.auth] ||
-                                (yield askForCredentials(bundle.auth))
-                            : this.credentials;
-                    const file = yield downloadBundle(bundle, credentials, undefined, options);
+                    let credentials = this.credentials;
+                    if (bundle.auth === true) {
+                        const key = bundle.url;
+                        if (this.authProfiles[key]) {
+                            credentials = this.authProfiles[key];
+                        }
+                        else {
+                            credentials = yield askForCredentials(key);
+                            this.authProfiles[key] = credentials;
+                        }
+                    }
+                    else if (typeof bundle.auth === 'string') {
+                        const key = bundle.auth;
+                        if (this.authProfiles[key]) {
+                            credentials = this.authProfiles[key];
+                        }
+                        else {
+                            credentials = yield askForCredentials(key);
+                            this.authProfiles[key] = credentials;
+                        }
+                    }
+                    const file = yield downloadBundle(bundle, credentials, undefined, options, template.bundles || [], this.authProfiles);
                     if (file) {
                         yield this.executePostCommands(bundle, file);
                     }
@@ -223,22 +241,125 @@ export default class JumpstartPlugin extends PluginTemplate {
             }
         });
     }
+    extractProjectName(args) {
+        if (!Array.isArray(args)) {
+            const argv = process.argv;
+            if (argv.length > 3) {
+                const jumpstartIndex = argv.findIndex((arg) => arg === 'jumpstart');
+                if (jumpstartIndex !== -1 && argv.length > jumpstartIndex + 1) {
+                    const nextArg = argv[jumpstartIndex + 1];
+                    if (nextArg && !nextArg.startsWith('-')) {
+                        return nextArg;
+                    }
+                }
+            }
+        }
+        else if (Array.isArray(args) && args.length > 0) {
+            return args[0];
+        }
+        return undefined;
+    }
+    validateAndGetDirectoryName(projectName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!projectName) {
+                return undefined;
+            }
+            const sanitizedName = filenamify(projectName, { replacement: '' });
+            if (sanitizedName !== projectName || sanitizedName.trim() === '') {
+                logger === null || logger === void 0 ? void 0 : logger.warn(i18nInstance.t('warn-invalid-directory-name', {
+                    name: projectName,
+                }));
+                const { validDirectoryName } = yield inquirer.prompt([
+                    {
+                        type: 'input',
+                        name: 'validDirectoryName',
+                        message: i18nInstance.t('prompt-enter-valid-directory-name'),
+                        validate: (input) => {
+                            if (!input || input.trim() === '') {
+                                return i18nInstance.t('error-directory-name-required');
+                            }
+                            const sanitized = filenamify(input, {
+                                replacement: '',
+                            });
+                            if (sanitized !== input || sanitized.trim() === '') {
+                                return i18nInstance.t('error-directory-name-invalid');
+                            }
+                            return true;
+                        },
+                        default: sanitizedName || 'my-magnolia-project',
+                    },
+                ]);
+                return validDirectoryName;
+            }
+            return projectName;
+        });
+    }
+    handleProjectDirectory(projectName) {
+        if (!projectName) {
+            logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-will-be-in-cwd'));
+            return process.cwd();
+        }
+        const targetDir = path.resolve(projectName);
+        const dirExists = fs.existsSync(targetDir);
+        if (!dirExists) {
+            fs.mkdirSync(targetDir, { recursive: true });
+            logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-directory-created', {
+                directory: projectName,
+            }));
+            logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-project-will-be-in-directory', {
+                directory: projectName,
+            }));
+        }
+        else {
+            const files = fs.readdirSync(targetDir);
+            if (files.length === 0) {
+                logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-directory-exists-empty', {
+                    directory: projectName,
+                }));
+                logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-project-will-be-in-directory', {
+                    directory: projectName,
+                }));
+            }
+            else {
+                logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-directory-exists-contains-files', {
+                    directory: projectName,
+                }));
+                logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-project-will-be-in-directory', {
+                    directory: projectName,
+                }));
+            }
+        }
+        return targetDir;
+    }
     init(winstonLogger) {
         return __awaiter(this, void 0, void 0, function* () {
             logger = winstonLogger;
         });
     }
-    start(options) {
+    start(options, args) {
         return __awaiter(this, void 0, void 0, function* () {
             checkFlagsValue(this.options, options);
-            logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-will-be-in-cwd'));
-            yield this.setProjectTemplates(options);
-            yield this.chooseTemplate(options);
-            logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-project-downloaded'));
-            logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-registered-commands'));
-            logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-start-project'));
-            logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-add-plugin-plugin'));
-            logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-refer-to-documentation'));
+            const projectName = this.extractProjectName(args);
+            const validatedProjectName = yield this.validateAndGetDirectoryName(projectName);
+            const targetDir = this.handleProjectDirectory(validatedProjectName);
+            const originalCwd = process.cwd();
+            if (targetDir !== originalCwd) {
+                process.chdir(targetDir);
+            }
+            try {
+                yield this.setProjectTemplates(options);
+                yield this.chooseTemplate(options);
+                logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-project-downloaded'));
+                logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-registered-commands'));
+                logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-start-project'));
+                logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-add-plugin-plugin'));
+                logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-refer-to-documentation'));
+            }
+            finally {
+                if (targetDir !== originalCwd) {
+                    process.chdir(originalCwd);
+                }
+            }
         });
     }
     stop() {

package/dist/lib/download.d.ts

@@ -1,4 +1,4 @@
 import { Bundle, Credentials, PluginOptions } from '../types/types.js';
-export declare const downloadBundle: (bundle: Bundle, credentials: Credentials, dest: string | undefined, options: PluginOptions) => Promise<string>;
-export declare const getDownloadUrl: (bundle: Bundle, credentials: Credentials, options: PluginOptions) => Promise<string>;
+export declare const downloadBundle: (bundle: Bundle, credentials: Credentials, dest: string | undefined, options: PluginOptions, allBundles?: Bundle[], authProfiles?: Record<string, Credentials>) => Promise<string>;
+export declare const getDownloadUrl: (bundle: Bundle, credentials: Credentials, options: PluginOptions, authProfiles?: Record<string, Credentials>) => Promise<string>;
 export declare const selectTag: (url: string, credentials: Credentials) => Promise<string>;

package/dist/lib/download.js

@@ -17,7 +17,179 @@ 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* () {
+let discoveredMagnoliaVersion = null;
+const constructMavenSearchUrl = (bundle, options, isTomcatExcluded = false) => {
+    const bundleCopy = Object.assign({}, bundle);
+    const url = new URL(bundleCopy.url);
+    url.searchParams.set('prerelease', 'false');
+    url.searchParams.set('maven.classifier', '');
+    if (bundleCopy.version) {
+        if (options.snapshot ||
+            bundleCopy.version.toLowerCase().includes('snapshot')) {
+            url.searchParams.set('prerelease', 'true');
+            if (options.magnolia === undefined &&
+                !bundleCopy.version.match(/^\d/)) {
+                options.magnolia = '6.3';
+            }
+        }
+        if (options.magnolia &&
+            (!isTomcatExcluded ||
+                !bundle.url.includes('magnolia-tomcat-barebone'))) {
+            bundleCopy.version = options.magnolia;
+        }
+        if ((bundleCopy.version.startsWith('latest') ||
+            bundleCopy.version.startsWith('6.3') ||
+            bundleCopy.version.startsWith('6.4') ||
+            bundleCopy.version.includes('alpha') ||
+            bundleCopy.version.includes('beta') ||
+            bundleCopy.version.includes('rc')) &&
+            bundleCopy.alternative) {
+            url.searchParams.set('maven.groupId', bundleCopy.alternative.groupId);
+            url.searchParams.set('maven.artifactId', bundleCopy.alternative.artifactId);
+        }
+        if (bundleCopy.version.toLowerCase() !== 'latest' &&
+            bundleCopy.version.toLowerCase() !== 'alpha' &&
+            bundleCopy.version.toLowerCase() !== 'beta' &&
+            bundleCopy.version.toLowerCase() !== 'rc') {
+            url.searchParams.set('maven.baseVersion', options.snapshot
+                ? bundleCopy.version + '-SNAPSHOT'
+                : bundleCopy.version);
+        }
+    }
+    return { url, modifiedBundle: bundleCopy };
+};
+const findItemFromResponse = (response, version) => {
+    let item = response.data.items[0];
+    if ((version === null || version === void 0 ? void 0 : version.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')));
+        });
+    }
+    else if ((version === null || version === void 0 ? void 0 : version.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');
+        });
+    }
+    else if ((version === null || version === void 0 ? void 0 : version.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');
+        });
+    }
+    else if ((version === null || version === void 0 ? void 0 : version.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 item;
+};
+const fetchMavenArtifact = (bundle_1, options_1, credentials_1, ...args_1) => __awaiter(void 0, [bundle_1, options_1, credentials_1, ...args_1], void 0, function* (bundle, options, credentials, isTomcatExcluded = false, authProfiles) {
+    const opts = {
+        method: 'get',
+        responseType: 'json',
+        headers: {
+            Accept: 'application/json',
+        },
+    };
+    const { url, modifiedBundle } = constructMavenSearchUrl(bundle, options, isTomcatExcluded);
+    let resolvedCredentials = credentials;
+    let profileKey;
+    if (bundle.auth === true) {
+        profileKey = modifiedBundle.url;
+        if (authProfiles && profileKey && authProfiles[profileKey]) {
+            resolvedCredentials = authProfiles[profileKey];
+        }
+        else {
+            const promptKey = profileKey || modifiedBundle.url;
+            resolvedCredentials = yield askForCredentials(promptKey);
+        }
+    }
+    else if (typeof bundle.auth === 'string') {
+        profileKey = bundle.auth;
+        if (authProfiles && authProfiles[profileKey]) {
+            resolvedCredentials = authProfiles[profileKey];
+        }
+        else {
+            resolvedCredentials = yield askForCredentials(profileKey);
+        }
+    }
+    const response = (yield get(url.toString(), opts, resolvedCredentials, modifiedBundle.name || modifiedBundle.url));
+    if (authProfiles &&
+        profileKey &&
+        resolvedCredentials &&
+        resolvedCredentials.username &&
+        resolvedCredentials.password) {
+        authProfiles[profileKey] = resolvedCredentials;
+    }
+    const item = findItemFromResponse(response, modifiedBundle.version);
+    return { item, modifiedBundle };
+});
+const getMagnoliaVersionFromBundle = (bundle, options, credentials, authProfiles) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    try {
+        const { item } = yield fetchMavenArtifact(bundle, options, credentials, false, authProfiles);
+        if ((_a = item === null || item === void 0 ? void 0 : item.maven2) === null || _a === void 0 ? void 0 : _a.version) {
+            return item.maven2.version;
+        }
+        return null;
+    }
+    catch (_b) {
+        return null;
+    }
+});
+const modifyTomcatBundleUrl = (bundle, allBundles, credentials, options, authProfiles) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!bundle.url.includes('magnolia-tomcat-barebone')) {
+        return bundle;
+    }
+    if (discoveredMagnoliaVersion) {
+        return updateTomcatBundleUrl(bundle, discoveredMagnoliaVersion);
+    }
+    if (allBundles && options) {
+        for (const otherBundle of allBundles) {
+            if (isMagnoliaBundle(otherBundle)) {
+                const magnoliaVersion = yield getMagnoliaVersionFromBundle(otherBundle, options, credentials, authProfiles);
+                if (magnoliaVersion === null) {
+                    throw new Error(i18nInstance.t('error-no-artifact-available', {
+                        version: options.magnolia || otherBundle.version,
+                    }));
+                }
+                if (magnoliaVersion) {
+                    discoveredMagnoliaVersion = magnoliaVersion;
+                    return updateTomcatBundleUrl(bundle, magnoliaVersion);
+                }
+            }
+        }
+    }
+    return bundle;
+});
+const isMagnoliaBundle = (bundle) => {
+    return (bundle.url.includes('maven.groupId=info.magnolia') &&
+        !bundle.url.includes('magnolia-tomcat-barebone'));
+};
+const updateTomcatBundleUrl = (bundle, magnoliaVersion) => {
+    const versionParts = magnoliaVersion.split('.');
+    const majorVersion = parseInt(versionParts[0]);
+    const minorVersion = parseInt(versionParts[1]);
+    let baseVersion = '1.*'; // Default for 6.3 and below
+    if (majorVersion > 6 || (majorVersion === 6 && minorVersion >= 4)) {
+        baseVersion = '2.*';
+    }
+    // Change the version only if the version isn't set in projectTemplates
+    if (!bundle.url.includes('maven.baseVersion=') || bundle.version) {
+        bundle.url = `${bundle.url}&maven.baseVersion=${baseVersion}`;
+    }
+    return bundle;
+};
+export const downloadBundle = (bundle, credentials, dest, options, allBundles, authProfiles) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const url = bundle.url;
         const downloadDest = dest ? dest : './download-' + new Date().getTime();
@@ -30,7 +202,8 @@ export const downloadBundle = (bundle, credentials, dest, options) => __awaiter(
             logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-download-preparing', {
                 url,
             }));
-            downloadUrl = yield getDownloadUrl(bundle, credentials, options);
+            const modifiedBundle = yield modifyTomcatBundleUrl(bundle, allBundles, credentials, options, authProfiles);
+            downloadUrl = yield getDownloadUrl(modifiedBundle, credentials, options, authProfiles);
         }
         else {
             downloadUrl = url;
@@ -90,89 +263,21 @@ export const downloadBundle = (bundle, credentials, dest, options) => __awaiter(
         throw new CreateError(error.message);
     }
 });
-export const getDownloadUrl = (bundle, credentials, options) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d, _e, _f;
-    const opts = {
-        method: 'get',
-        responseType: 'json',
-        headers: {
-            Accept: 'application/json',
-        },
-    };
+export const getDownloadUrl = (bundle, credentials, options, authProfiles) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c;
     try {
-        const url = new URL(bundle.url);
-        url.searchParams.set('prerelease', 'false');
-        url.searchParams.set('maven.classifier', '');
-        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.magnolia) {
-                bundle.version = options.magnolia;
-            }
-            if ((bundle.version.startsWith('latest') ||
-                bundle.version.startsWith('6.3') ||
-                bundle.version.startsWith('6.4') ||
-                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);
-            }
-        }
-        const response = (yield get(url.toString(), opts, credentials, bundle.name || bundle.url));
+        const { item, modifiedBundle } = yield fetchMavenArtifact(bundle, options, credentials, true, authProfiles);
         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')) &&
-                    !(itemVersion === null || itemVersion === void 0 ? void 0 : itemVersion.includes('-rc')));
-            });
-        }
-        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');
-            });
-        }
-        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');
-            });
-        }
-        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');
-            });
-        }
+        bundle.version = modifiedBundle.version;
         if (!item) {
             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;
+        bundle.version = (_b = (_a = item === null || item === void 0 ? void 0 : item.maven2) === null || _a === void 0 ? void 0 : _a.version) !== null && _b !== void 0 ? _b : bundle.version;
+        if (isMagnoliaBundle(bundle) && ((_c = item === null || item === void 0 ? void 0 : item.maven2) === null || _c === void 0 ? void 0 : _c.version)) {
+            discoveredMagnoliaVersion = item.maven2.version;
+        }
         let downloadUrl = item.downloadUrl;
         downloadUrl = downloadUrl === null || downloadUrl === void 0 ? void 0 : downloadUrl.split('/magnolia.');
         downloadUrl =

package/dist/lib/helper.js

@@ -66,6 +66,7 @@ export const handleLightModulesFolder = () => __awaiter(void 0, void 0, void 0,
         if (webApp.endsWith('magnoliaAuthor')) {
             props['magnolia.develop'] = 'true';
             props['magnolia.graphql.introspection.enabled'] = 'true';
+            props['magnolia.personalization.rest.allowVariants'] = 'true';
         }
         const webAppPropertiesFilePath = path.join(webApp, 'WEB-INF', 'config', 'default', 'magnolia.properties');
         editProperties(webAppPropertiesFilePath, props);

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

@@ -28,12 +28,17 @@
 	"info-refer-to-documentation": "For additional plugins and features, refer to the Magnolia CLI documentation: https://docs.magnolia-cms.com/magnolia-cli",
 	"info-file-downloaded-to": "Downloaded to {{path}}",
 	"info-will-be-in-cwd": "The project will be created in the current working directory",
+	"info-directory-created": "Directory '{{directory}}' was created",
+	"info-directory-exists-empty": "Directory '{{directory}}' exists and is empty",
+	"info-directory-exists-contains-files": "Directory '{{directory}}' exists and contains files",
+	"info-project-will-be-in-directory": "The project will be set up inside the '{{directory}}' directory",
 
 	"warn-install-plugins-manually": "Please install following plugins:\n{{installPluginsText}}and register them in \"mgnl.config.js\" file",
 	"warn-changed-type": "Changed 'type' property to \"module\" in \"package.json\"",
 	"warn-webapp-props-not-exist": "File \"{{filePath}}\" not found; skipping configuration",
 	"warn-cannot-modify-webapp": "An error occurred while modifying webapps:\n{{errorMsg}}",
 	"warn-cannot-parse-plugin-args": "The provided object:\n{{pluginArgs}}\nis not a valid JSON5 object; arguments will not be added to the plugin: \"{{plugin}}\"",
+	"warn-invalid-directory-name": "The directory name '{{name}}' contains invalid characters and cannot be used",
 
 	"error-no-tags": "No available tags found",
 	"error-problem-accessing-url": "A problem occurred while accessing: {{url}}",
@@ -63,9 +68,12 @@
 	"error-download-fail-status": "Download failed from: {{downloadUrl}}; expected status \"200\"; received: \"{{status}}\"",
 	"error-while-downloading-bundle": "An error occurred while downloading bundle from: {{url}}",
 	"error-auth-fail": "Authentication failed for {{url}}; received 401 status; verify your credentials and try again",
+	"error-directory-name-required": "Directory name is required",
+	"error-directory-name-invalid": "Directory name contains invalid characters. Please use only letters, numbers, hyphens, and underscores",
 
 	"inquirer-prompt-select-tag": "Choose a tag",
 	"inquirer-prompt-choose-template": "Choose a template",
+	"prompt-enter-valid-directory-name": "Please enter a valid directory name",
 
 	"ora-start-checking-add-plugin": "Looking for \"@magnolia/cli add-plugin\" command...",
 	"ora-start-extracting": "Extracting...",

package/dist/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@magnolia/cli-jumpstart-plugin",
-	"version": "1.1.0",
+	"version": "1.1.2",
 	"description": "A plugin for Magnolia CLI to download and set up a new headless or freemarker-based project with Magnolia webapp",
 	"main": "dist/index.js",
 	"scripts": {
@@ -54,6 +54,7 @@
 		"decompress": "^4.2.1",
 		"dotenv": "^16.4.7",
 		"execa": "^9.5.2",
+		"filenamify": "^6.0.0",
 		"fs-extra": "^11.3.0",
 		"glob": "^11.0.1",
 		"http-proxy-agent": "^7.0.2",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@magnolia/cli-jumpstart-plugin",
-	"version": "1.1.0",
+	"version": "1.1.2",
 	"description": "A plugin for Magnolia CLI to download and set up a new headless or freemarker-based project with Magnolia webapp",
 	"main": "dist/index.js",
 	"scripts": {
@@ -54,6 +54,7 @@
 		"decompress": "^4.2.1",
 		"dotenv": "^16.4.7",
 		"execa": "^9.5.2",
+		"filenamify": "^6.0.0",
 		"fs-extra": "^11.3.0",
 		"glob": "^11.0.1",
 		"http-proxy-agent": "^7.0.2",