@magnolia/cli-jumpstart-plugin 1.1.1 → 1.1.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.1.3 (2025-09-16)
+* Jumpstart should resolve template path before switching CWD ([MGNLCLI-421](https://magnolia-cms.atlassian.net/browse/MGNLCLI-421))
+
+## 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))

package/dist/jumpstart-plugin.d.ts

@@ -18,7 +18,7 @@ export default class JumpstartPlugin extends PluginTemplate {
     constructor();
     executePostCommands(bundle: Bundle, file: string): Promise<void>;
     handleTemplate(template: TemplateWithoutChildren, options: PluginOptions): Promise<void>;
-    setProjectTemplates(options: PluginOptions): Promise<void>;
+    setProjectTemplates(options: PluginOptions, originalCwd: string): Promise<void>;
     promptTemplateSelection(templates: Array<Template>, names?: string[]): Promise<TemplateWithoutChildren | undefined>;
     findTemplateByIdentifier(identifier: string): TemplateWithoutChildren | undefined;
     chooseTemplate(options: PluginOptions): Promise<void>;

package/dist/jumpstart-plugin.js

@@ -95,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, template.bundles || []);
+                    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);
                     }
@@ -128,7 +143,7 @@ export default class JumpstartPlugin extends PluginTemplate {
             }
         });
     }
-    setProjectTemplates(options) {
+    setProjectTemplates(options, originalCwd) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             let errorMsg;
@@ -139,8 +154,13 @@ export default class JumpstartPlugin extends PluginTemplate {
                     this.projectTemplates = res.data.projectTemplates;
                 }
                 else if (options.projectTemplates) {
-                    errorMsg = i18nInstance.t('error-no-projectTemplates-from-path', { path: options.projectTemplates });
-                    this.projectTemplates = requireFn(path.resolve(options.projectTemplates)).projectTemplates;
+                    const projectTemplatesPath = path.resolve(originalCwd, options.projectTemplates);
+                    if (!fs.existsSync(projectTemplatesPath)) {
+                        throw new CreateError(i18nInstance.t('error-projectTemplates-file-not-found', { path: projectTemplatesPath }));
+                    }
+                    errorMsg = i18nInstance.t('error-no-projectTemplates-from-path', { path: projectTemplatesPath });
+                    this.projectTemplates =
+                        requireFn(projectTemplatesPath).projectTemplates;
                 }
                 else {
                     errorMsg = i18nInstance.t('error-no-projectTemplates-from-default');
@@ -149,7 +169,10 @@ export default class JumpstartPlugin extends PluginTemplate {
                 }
             }
             catch (e) {
-                if (errorMsg) {
+                if (e instanceof CreateError) {
+                    throw e;
+                }
+                else if (errorMsg) {
                     throw new CreateError(errorMsg + `\n${e.message}`);
                 }
                 else {
@@ -332,7 +355,7 @@ export default class JumpstartPlugin extends PluginTemplate {
                 process.chdir(targetDir);
             }
             try {
-                yield this.setProjectTemplates(options);
+                yield this.setProjectTemplates(options, originalCwd);
                 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'));

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, allBundles?: Bundle[]) => 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

@@ -92,7 +92,7 @@ const findItemFromResponse = (response, version) => {
     }
     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) {
+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',
@@ -101,14 +101,42 @@ const fetchMavenArtifact = (bundle_1, options_1, credentials_1, ...args_1) => __
         },
     };
     const { url, modifiedBundle } = constructMavenSearchUrl(bundle, options, isTomcatExcluded);
-    const response = (yield get(url.toString(), opts, credentials, modifiedBundle.name || modifiedBundle.url));
+    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) => __awaiter(void 0, void 0, void 0, function* () {
+const getMagnoliaVersionFromBundle = (bundle, options, credentials, authProfiles) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     try {
-        const { item } = yield fetchMavenArtifact(bundle, options, credentials);
+        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;
         }
@@ -118,7 +146,7 @@ const getMagnoliaVersionFromBundle = (bundle, options, credentials) => __awaiter
         return null;
     }
 });
-const modifyTomcatBundleUrl = (bundle, allBundles, credentials, options) => __awaiter(void 0, void 0, void 0, function* () {
+const modifyTomcatBundleUrl = (bundle, allBundles, credentials, options, authProfiles) => __awaiter(void 0, void 0, void 0, function* () {
     if (!bundle.url.includes('magnolia-tomcat-barebone')) {
         return bundle;
     }
@@ -128,7 +156,7 @@ const modifyTomcatBundleUrl = (bundle, allBundles, credentials, options) => __aw
     if (allBundles && options) {
         for (const otherBundle of allBundles) {
             if (isMagnoliaBundle(otherBundle)) {
-                const magnoliaVersion = yield getMagnoliaVersionFromBundle(otherBundle, options, credentials);
+                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,
@@ -161,7 +189,7 @@ const updateTomcatBundleUrl = (bundle, magnoliaVersion) => {
     }
     return bundle;
 };
-export const downloadBundle = (bundle, credentials, dest, options, allBundles) => __awaiter(void 0, void 0, void 0, function* () {
+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();
@@ -174,8 +202,8 @@ export const downloadBundle = (bundle, credentials, dest, options, allBundles) =
             logger === null || logger === void 0 ? void 0 : logger.info(i18nInstance.t('info-download-preparing', {
                 url,
             }));
-            const modifiedBundle = yield modifyTomcatBundleUrl(bundle, allBundles, credentials, options);
-            downloadUrl = yield getDownloadUrl(modifiedBundle, credentials, options);
+            const modifiedBundle = yield modifyTomcatBundleUrl(bundle, allBundles, credentials, options, authProfiles);
+            downloadUrl = yield getDownloadUrl(modifiedBundle, credentials, options, authProfiles);
         }
         else {
             downloadUrl = url;
@@ -235,10 +263,10 @@ export const downloadBundle = (bundle, credentials, dest, options, allBundles) =
         throw new CreateError(error.message);
     }
 });
-export const getDownloadUrl = (bundle, credentials, options) => __awaiter(void 0, void 0, void 0, function* () {
+export const getDownloadUrl = (bundle, credentials, options, authProfiles) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c;
     try {
-        const { item, modifiedBundle } = yield fetchMavenArtifact(bundle, options, credentials, true);
+        const { item, modifiedBundle } = yield fetchMavenArtifact(bundle, options, credentials, true, authProfiles);
         const params = new URLSearchParams(bundle.url.split('?')[1]);
         bundle.version = modifiedBundle.version;
         if (!item) {

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

@@ -53,6 +53,7 @@
 	"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?",
+	"error-projectTemplates-file-not-found": "ProjectTemplates file not found at: \"{{path}}\"; please check the file path and ensure the file exists",
 	"error-no-projectTemplates-from-default": "Cannot fetch default projectTemplates; are you connected to the internet?",
 	"error-extensions-calling-fn-retry": "Error calling function: \"{{name}}\"; {{retry}}/{{maxRetry}}; waiting {{delay}}ms before retry",
 	"error-extensions-fn-not-found": "\"{{function}}\" function not found",

package/dist/package.json

@@ -1,12 +1,12 @@
 {
 	"name": "@magnolia/cli-jumpstart-plugin",
-	"version": "1.1.1",
+	"version": "1.1.3",
 	"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": {
 		"prepare": "husky || true",
-		"test": "npm run build && node --experimental-vm-modules node_modules/jest/bin/jest.js",
-		"build": "npm run lint && tsc && cpy package.json dist && cpy lib/locales dist",
+		"test": "npm run lint && npm run build && node --experimental-vm-modules node_modules/jest/bin/jest.js",
+		"build": "tsc && cpy package.json dist && cpy lib/locales dist",
 		"depcheck": "depcheck",
 		"lint": "eslint .",
 		"lint:fix": "npm run lint -- --fix",
@@ -25,6 +25,7 @@
 	"devDependencies": {
 		"@jest/globals": "^29.7.0",
 		"@types/decompress": "^4.2.7",
+		"@types/filenamify": "^2.0.1",
 		"@types/fs-extra": "^11.0.4",
 		"@types/inquirer": "^9.0.7",
 		"@types/js-beautify": "^1.14.3",

package/package.json

@@ -1,12 +1,12 @@
 {
 	"name": "@magnolia/cli-jumpstart-plugin",
-	"version": "1.1.1",
+	"version": "1.1.3",
 	"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": {
 		"prepare": "husky || true",
-		"test": "npm run build && node --experimental-vm-modules node_modules/jest/bin/jest.js",
-		"build": "npm run lint && tsc && cpy package.json dist && cpy lib/locales dist",
+		"test": "npm run lint && npm run build && node --experimental-vm-modules node_modules/jest/bin/jest.js",
+		"build": "tsc && cpy package.json dist && cpy lib/locales dist",
 		"depcheck": "depcheck",
 		"lint": "eslint .",
 		"lint:fix": "npm run lint -- --fix",
@@ -25,6 +25,7 @@
 	"devDependencies": {
 		"@jest/globals": "^29.7.0",
 		"@types/decompress": "^4.2.7",
+		"@types/filenamify": "^2.0.1",
 		"@types/fs-extra": "^11.0.4",
 		"@types/inquirer": "^9.0.7",
 		"@types/js-beautify": "^1.14.3",