@magnolia/cli-jumpstart-plugin 1.1.5 → 1.2.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.2.1 (2026-06-30)
+* Fix jumpstart failing to download Magnolia bundles after the Nexus 3.88.0 upgrade to SQL search ([MGNLCLI-486](https://magnolia-cms.atlassian.net/browse/MGNLCLI-486))
+
+## 1.2.0 (2026-05-15)
+* Install Magnolia CLI as a devDependency in jumpstarted projects ([MGNLCLI-440](https://magnolia-cms.atlassian.net/browse/MGNLCLI-440))
+* Add resolver for US and AP nexus regions ([MGNLCLI-442](https://magnolia-cms.atlassian.net/browse/MGNLCLI-442))
+* Add `--apache-tomcat` flag to override the Tomcat version ([MGNLCLI-480](https://magnolia-cms.atlassian.net/browse/MGNLCLI-480))
+* Enable New UI Forms opt-in flags by default for 6.4.x jumpstart ([MGNLCLI-484](https://magnolia-cms.atlassian.net/browse/MGNLCLI-484))
+
 ## 1.1.5 (2025-10-02)
 * Update dependencies ([MGNLCLI-436](https://magnolia-cms.atlassian.net/browse/MGNLCLI-436))
 

package/dist/jumpstart-plugin.js

@@ -22,7 +22,7 @@ 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 { askForCredentials, copyDownloadedFile, extractMagnoliaVersion, handleLightModulesFolder, handleLightModulesPathInTemplate, initializeNodeProject, } from './lib/helper.js';
 import { compileCustomPrompts, evaluateCustomPrompts, } from './lib/extensions.js';
 import { addConfigProps } from './lib/config-helper.js';
 import { installAdditionalPlugins } from './lib/config-helper.js';
@@ -52,6 +52,7 @@ export default class JumpstartPlugin extends PluginTemplate {
             new Option('-s, --snapshot', i18nInstance.t('option-snapshot-description')),
             new Option('-t, --template <name>', i18nInstance.t('option-template-description')),
             new Option('-pt, --project-templates <source>', i18nInstance.t('option-projectTemplates-description')),
+            new Option('-at, --apache-tomcat <version>', i18nInstance.t('option-tomcatVersion-description')),
         ];
     }
     executePostCommands(bundle, file) {
@@ -125,7 +126,7 @@ export default class JumpstartPlugin extends PluginTemplate {
                     throw new CreateError(e.message);
                 }
             }
-            yield handleLightModulesFolder();
+            yield handleLightModulesFolder(extractMagnoliaVersion(template.bundles));
             yield initializeNodeProject();
             if (template.plugins) {
                 yield installAdditionalPlugins(template.plugins);

package/dist/lib/download.d.ts

@@ -1,4 +1,15 @@
 import { Bundle, Credentials, PluginOptions } from '../types/types.js';
+export declare const isMagnoliaBundle: (bundle: Bundle) => boolean;
+export declare const getTomcatVersionLine: (magnoliaVersion: string) => string;
+export declare const isVersionLine: (spec: string) => boolean;
+export declare const normalizeVersionLine: (spec: string) => string;
+export declare const matchesVersionLine: (version: string | undefined, line: string) => boolean;
+export declare const isReleaseVersion: (version: string | undefined) => boolean;
+export declare const constructMavenSearchUrl: (bundle: Bundle, options: PluginOptions, isTomcatExcluded?: boolean) => {
+    url: URL;
+    modifiedBundle: Bundle;
+};
+export declare const findItemFromResponse: (response: any, version?: string, versionLine?: string) => any;
 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

@@ -18,7 +18,21 @@ import { CreateError, prependNumbersToChoices, } from '@magnolia/cli-helper/gene
 import { HttpsProxyAgent } from 'https-proxy-agent';
 import { HttpProxyAgent } from 'http-proxy-agent';
 let discoveredMagnoliaVersion = null;
-const constructMavenSearchUrl = (bundle, options, isTomcatExcluded = false) => {
+export const isMagnoliaBundle = (bundle) => {
+    return (bundle.url.includes('maven.groupId=info.magnolia') &&
+        !bundle.url.includes('magnolia-tomcat-barebone'));
+};
+export const getTomcatVersionLine = (magnoliaVersion) => {
+    const [major, minor] = magnoliaVersion
+        .split('.')
+        .map((part) => parseInt(part, 10));
+    return major > 6 || (major === 6 && minor >= 4) ? '2' : '1';
+};
+export const isVersionLine = (spec) => spec.includes('*') || /^\d+(\.\d+)?$/.test(spec);
+export const normalizeVersionLine = (spec) => spec.replace(/\*+$/, '').replace(/\.+$/, '');
+export const matchesVersionLine = (version, line) => !!version && (version === line || version.startsWith(`${line}.`));
+export const isReleaseVersion = (version) => !!version && /^\d+(\.\d+)*$/.test(version);
+export const constructMavenSearchUrl = (bundle, options, isTomcatExcluded = false) => {
     const bundleCopy = Object.assign({}, bundle);
     const url = new URL(bundleCopy.url);
     url.searchParams.set('prerelease', 'false');
@@ -51,14 +65,31 @@ const constructMavenSearchUrl = (bundle, options, isTomcatExcluded = false) => {
             bundleCopy.version.toLowerCase() !== 'alpha' &&
             bundleCopy.version.toLowerCase() !== 'beta' &&
             bundleCopy.version.toLowerCase() !== 'rc') {
-            url.searchParams.set('maven.baseVersion', options.snapshot
-                ? bundleCopy.version + '-SNAPSHOT'
-                : bundleCopy.version);
+            if (!options.snapshot && isVersionLine(bundleCopy.version)) {
+                const line = normalizeVersionLine(bundleCopy.version);
+                bundleCopy.versionLine = line;
+                if (line.length >= 3) {
+                    url.searchParams.set('maven.baseVersion', `${line}*`);
+                }
+            }
+            else {
+                url.searchParams.set('maven.baseVersion', options.snapshot
+                    ? bundleCopy.version + '-SNAPSHOT'
+                    : bundleCopy.version);
+            }
         }
     }
     return { url, modifiedBundle: bundleCopy };
 };
-const findItemFromResponse = (response, version) => {
+export const findItemFromResponse = (response, version, versionLine) => {
+    var _a, _b;
+    if (versionLine) {
+        return ((_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.items) !== null && _b !== void 0 ? _b : []).find((item) => {
+            var _a, _b;
+            return matchesVersionLine((_a = item === null || item === void 0 ? void 0 : item.maven2) === null || _a === void 0 ? void 0 : _a.version, versionLine) &&
+                isReleaseVersion((_b = item === null || item === void 0 ? void 0 : item.maven2) === null || _b === void 0 ? void 0 : _b.version);
+        });
+    }
     let item = response.data.items[0];
     if ((version === null || version === void 0 ? void 0 : version.toLowerCase()) === 'latest') {
         item = response.data.items.find((item) => {
@@ -130,7 +161,7 @@ const fetchMavenArtifact = (bundle_1, options_1, credentials_1, ...args_1) => __
         resolvedCredentials.password) {
         authProfiles[profileKey] = resolvedCredentials;
     }
-    const item = findItemFromResponse(response, modifiedBundle.version);
+    const item = findItemFromResponse(response, modifiedBundle.version, modifiedBundle.versionLine);
     return { item, modifiedBundle };
 });
 const getMagnoliaVersionFromBundle = (bundle, options, credentials, authProfiles) => __awaiter(void 0, void 0, void 0, function* () {
@@ -150,6 +181,10 @@ const modifyTomcatBundleUrl = (bundle, allBundles, credentials, options, authPro
     if (!bundle.url.includes('magnolia-tomcat-barebone')) {
         return bundle;
     }
+    if (options === null || options === void 0 ? void 0 : options.apacheTomcat) {
+        bundle.version = options.apacheTomcat;
+        return bundle;
+    }
     if (discoveredMagnoliaVersion) {
         return updateTomcatBundleUrl(bundle, discoveredMagnoliaVersion);
     }
@@ -171,21 +206,9 @@ const modifyTomcatBundleUrl = (bundle, allBundles, credentials, options, authPro
     }
     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}`;
+        bundle.versionLine = getTomcatVersionLine(magnoliaVersion);
     }
     return bundle;
 };
@@ -198,7 +221,9 @@ export const downloadBundle = (bundle, credentials, dest, options, allBundles, a
             downloadUrl = yield selectTag(url, credentials);
         }
         else if (url.includes('https://nexus.magnolia-cms.com/service/rest/v1/search') ||
-            url.includes('https://nexus.magnolia-cms.cn/service/rest/v1/search')) {
+            url.includes('https://nexus.magnolia-cms.cn/service/rest/v1/search') ||
+            url.includes('http://nexus.us.magnolia-cms.com/service/rest/v1/search') ||
+            url.includes('https://nexus.ap.magnolia-cms.com/service/rest/v1/search')) {
             logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-download-preparing', {
                 url,
             }));
@@ -269,7 +294,10 @@ export const getDownloadUrl = (bundle, credentials, options, authProfiles) => __
         const { item, modifiedBundle } = yield fetchMavenArtifact(bundle, options, credentials, true, authProfiles);
         bundle.version = modifiedBundle.version;
         if (!item) {
-            throw new Error(i18nInstance.t('error-no-artifact-available', {
+            const isTomcatBundle = bundle.url.includes('magnolia-tomcat-barebone');
+            throw new Error(i18nInstance.t(isTomcatBundle
+                ? 'error-no-tomcat-artifact-available'
+                : 'error-no-artifact-available', {
                 version: bundle.version,
             }));
         }

package/dist/lib/helper.d.ts

@@ -1,5 +1,10 @@
 import { Bundle, Credentials } from '../types/types.js';
-export declare const handleLightModulesFolder: () => Promise<void>;
+export declare const isMagnoliaSixFourVersion: (version: string | null | undefined) => boolean;
+export declare const extractMagnoliaVersion: (bundles: Array<Bundle> | undefined) => string | null;
+export declare const buildWebAppMagnoliaProperties: (webAppPath: string, lightModulesRelativePath: string, magnoliaVersion: string | null | undefined) => {
+    [key: string]: string;
+};
+export declare const handleLightModulesFolder: (magnoliaVersion?: string | null) => 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[];

package/dist/lib/helper.js

@@ -15,13 +15,43 @@ import { execa } from 'execa';
 import path from 'path';
 import fs from 'fs-extra';
 import { findExtractedApacheTomcatDir } from './extract.js';
+import { isMagnoliaBundle } from './download.js';
 import walk from 'walk';
 import { i18nInstance, logger } from '../jumpstart-plugin.js';
 import inquirer from 'inquirer';
 import { CreateError } from '@magnolia/cli-helper/general-utils';
 import { getRelativePathToMGNLConfig } from '@magnolia/cli-helper';
 import chalk from 'chalk';
-export const handleLightModulesFolder = () => __awaiter(void 0, void 0, void 0, function* () {
+export const isMagnoliaSixFourVersion = (version) => {
+    if (!version)
+        return false;
+    const parts = version.split('.');
+    return parseInt(parts[0]) === 6 && parseInt(parts[1]) === 4;
+};
+export const extractMagnoliaVersion = (bundles) => {
+    var _a;
+    const magnoliaBundle = (bundles || []).find(isMagnoliaBundle);
+    return (_a = magnoliaBundle === null || magnoliaBundle === void 0 ? void 0 : magnoliaBundle.version) !== null && _a !== void 0 ? _a : null;
+};
+export const buildWebAppMagnoliaProperties = (webAppPath, lightModulesRelativePath, magnoliaVersion) => {
+    const props = {
+        'magnolia.resources.dir': '${magnolia.home}/' + lightModulesRelativePath,
+        'magnolia.update.auto': 'true',
+    };
+    if (webAppPath.endsWith('magnoliaAuthor')) {
+        props['magnolia.develop'] = 'true';
+        props['magnolia.graphql.introspection.enabled'] = 'true';
+        props['magnolia.personalization.rest.allowVariants'] = 'true';
+        if (isMagnoliaSixFourVersion(magnoliaVersion)) {
+            props['magnolia.warp.forms.vaadin.actions'] = 'true';
+            props['magnolia.warp.forms.tabs.enabled'] = 'true';
+            props['magnolia.warp.forms.field.codeField'] = 'true';
+            props['magnolia.warp.forms.field.hiddenField'] = 'true';
+        }
+    }
+    return props;
+};
+export const handleLightModulesFolder = (magnoliaVersion) => __awaiter(void 0, void 0, void 0, function* () {
     // eslint-disable-next-line no-console
     console.log(chalk.cyanBright('==========================================='));
     let lightModulesPath;
@@ -59,15 +89,7 @@ export const handleLightModulesFolder = () => __awaiter(void 0, void 0, void 0,
         const lightModulesPathToMagnoliaHomeRelPath = process.platform === 'win32'
             ? path.relative(webApp, lightModulesPath).replace(/\\/g, '/')
             : path.relative(webApp, lightModulesPath);
-        const props = {
-            'magnolia.resources.dir': '${magnolia.home}/' + lightModulesPathToMagnoliaHomeRelPath,
-            'magnolia.update.auto': 'true',
-        };
-        if (webApp.endsWith('magnoliaAuthor')) {
-            props['magnolia.develop'] = 'true';
-            props['magnolia.graphql.introspection.enabled'] = 'true';
-            props['magnolia.personalization.rest.allowVariants'] = 'true';
-        }
+        const props = buildWebAppMagnoliaProperties(webApp, lightModulesPathToMagnoliaHomeRelPath, magnoliaVersion);
         const webAppPropertiesFilePath = path.join(webApp, 'WEB-INF', 'config', 'default', 'magnolia.properties');
         editProperties(webAppPropertiesFilePath, props);
     }
@@ -164,7 +186,10 @@ export const installPackage = (packageManager, packageReference, packageName) =>
         packageName: packageName,
     }));
     try {
-        yield execa(packageManager, [packageManager === 'npm' ? 'install' : 'add', packageReference], {
+        const installArgs = packageManager === 'npm'
+            ? ['install', '--save-dev', packageReference]
+            : ['add', '--dev', packageReference];
+        yield execa(packageManager, installArgs, {
             buffer: true,
             cwd: process.cwd(),
         });
@@ -198,7 +223,9 @@ export const askForCredentials = (bundle) => __awaiter(void 0, void 0, void 0, f
         bundle: bundle,
     }));
     if (bundle.startsWith('https://nexus.magnolia-cms.com') ||
-        bundle.startsWith('https://nexus.magnolia-cms.cn')) {
+        bundle.startsWith('https://nexus.magnolia-cms.cn') ||
+        bundle.startsWith('http://nexus.us.magnolia-cms.com') ||
+        bundle.startsWith('http://nexus.ap.magnolia-cms.com')) {
         logger === null || logger === void 0 ? void 0 : logger.warn(i18nInstance.t('info-use-nexus-token'));
     }
     return inquirer.prompt([

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

@@ -4,6 +4,7 @@
 	"option-projectTemplates-description": "specify the source to load project templates from",
 	"option-magnolia-description": "set the Magnolia version; defaults to the latest stable version",
 	"option-snapshot-description": "download the latest snapshot version of the specified or latest stable webapp",
+	"option-tomcatVersion-description": "override the Apache Tomcat version; defaults to the version determined by the Magnolia version",
 
 	"info-enter-credentials": "Enter the credentials for \"{{bundle}}\"",
 	"info-use-nexus-token": [
@@ -50,6 +51,7 @@
 		"Please search the web on \"unable to get local issuer certificate\" for more information"
 	],
 	"error-no-artifact-available": "No Magnolia bundle with version \"{{version}}\" is available",
+	"error-no-tomcat-artifact-available": "No Apache Tomcat (\"magnolia-tomcat-barebone\") with version \"{{version}}\" is available",
 	"error-while-getting-projectTemplates": "An error occurred while getting \"projectTemplates\":",
 	"error-no-projectTemplates-from-url": "Cannot fetch remote projectTemplates file located at: \"{{url}}\"; are you connected to the internet? does it point to a JSON file?",
 	"error-no-projectTemplates-from-path": "Cannot read projectTemplates from a local file located at: \"{{path}}\"; is it a JSON file?",

package/dist/lib/pj-helper.js

@@ -22,7 +22,8 @@ export const handlePackageJSON = () => __awaiter(void 0, void 0, void 0, functio
 });
 export const modifyPackageJSON = (pjPath) => __awaiter(void 0, void 0, void 0, function* () {
     let pj = JSON.parse(fs.readFileSync(pjPath, 'utf8'));
-    let isMgnlCliInstalled = (pj === null || pj === void 0 ? void 0 : pj.dependencies) && (pj === null || pj === void 0 ? void 0 : pj.dependencies['@magnolia/cli']);
+    let isMgnlCliInstalled = ((pj === null || pj === void 0 ? void 0 : pj.dependencies) && (pj === null || pj === void 0 ? void 0 : pj.dependencies['@magnolia/cli'])) ||
+        ((pj === null || pj === void 0 ? void 0 : pj.devDependencies) && (pj === null || pj === void 0 ? void 0 : pj.devDependencies['@magnolia/cli']));
     if (!isMgnlCliInstalled) {
         isMgnlCliInstalled = yield installCLI();
         if (isMgnlCliInstalled) {

package/dist/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@magnolia/cli-jumpstart-plugin",
-	"version": "1.1.5",
+	"version": "1.2.1",
 	"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": {

package/dist/types/types.d.ts

@@ -3,6 +3,7 @@ export interface PluginOptions {
     projectTemplates: string;
     magnolia?: string;
     snapshot?: boolean;
+    apacheTomcat?: string;
 }
 export interface Bundle {
     url: string;
@@ -13,6 +14,7 @@ export interface Bundle {
     downloadDest?: string;
     name?: string;
     version?: string;
+    versionLine?: string;
     alternative: {
         groupId: string;
         artifactId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@magnolia/cli-jumpstart-plugin",
-	"version": "1.1.5",
+	"version": "1.2.1",
 	"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": {