create-sitecore-jss 22.2.0-canary.5 → 22.2.0-canary.51

package/dist/bin.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.main = exports.promptDestination = exports.getDestinations = exports.parseArgs = void 0;
+exports.main = exports.promptDestination = exports.getDestination = exports.parseArgs = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importStar(require("path"));
 const chalk_1 = __importDefault(require("chalk"));
@@ -43,7 +43,6 @@ const inquirer_1 = __importDefault(require("inquirer"));
 const init_runner_1 = require("./init-runner");
 const minimist_1 = __importDefault(require("minimist"));
 const common_1 = require("./common");
-const proxyAppMatcher = /node-.+-proxy/g;
 const parseArgs = () => {
     // parse any command line arguments passed into `init sitecore-jss`
     // to pass to the generator prompts and skip them.
@@ -71,7 +70,7 @@ const parseArgs = () => {
     return args;
 };
 exports.parseArgs = parseArgs;
-const getDestinations = (args, templates) => __awaiter(void 0, void 0, void 0, function* () {
+const getDestination = (args, templates) => __awaiter(void 0, void 0, void 0, function* () {
     if (templates.length === 0) {
         throw new Error('Unable to get destinations, provided templates are empty');
     }
@@ -83,29 +82,9 @@ const getDestinations = (args, templates) => __awaiter(void 0, void 0, void 0, f
             ? defaultBaseDestination
             : yield (0, exports.promptDestination)('Where would you like your new app created?', defaultBaseDestination);
     }
-    // work with node-proxy destination if needed
-    const proxyApp = templates.find((template) => template.match(proxyAppMatcher));
-    if (proxyApp) {
-        const defaultProxyDestination = proxyApp && `${process.cwd()}${path_1.sep}${proxyApp}`;
-        let proxyAppDestination = args.proxyAppDestination;
-        if (!proxyAppDestination) {
-            proxyAppDestination = args.yes
-                ? defaultProxyDestination
-                : yield (0, exports.promptDestination)('Where would you like your proxy app created?', defaultProxyDestination);
-        }
-        while (proxyAppDestination === destination) {
-            proxyAppDestination = yield (0, exports.promptDestination)('Proxy app and base app cannot be located in the same folder. Please input another path for proxy', defaultProxyDestination);
-        }
-        return {
-            destination,
-            proxyAppDestination,
-        };
-    }
-    return {
-        destination,
-    };
+    return destination;
 });
-exports.getDestinations = getDestinations;
+exports.getDestination = getDestination;
 const promptDestination = (prompt, defaultDestination) => __awaiter(void 0, void 0, void 0, function* () {
     return (yield inquirer_1.default.prompt({
         type: 'input',
@@ -152,24 +131,20 @@ const main = (args) => __awaiter(void 0, void 0, void 0, function* () {
         });
         templates.push(answer.template);
     }
-    const destinations = yield (0, exports.getDestinations)(args, templates);
-    for (const destination of [destinations.destination, destinations.proxyAppDestination]) {
-        if (!destination)
-            continue;
-        if (!args.force && fs_1.default.existsSync(destination) && fs_1.default.readdirSync(destination).length > 0) {
-            const answer = yield inquirer_1.default.prompt({
-                type: 'confirm',
-                name: 'continue',
-                message: `Directory '${destination}' not empty. Are you sure you want to continue?`,
-            });
-            if (!answer.continue) {
-                process.exit();
-            }
-        }
-        else {
-            args.force = true;
+    const destination = yield (0, exports.getDestination)(args, templates);
+    if (!args.force && fs_1.default.existsSync(destination) && fs_1.default.readdirSync(destination).length > 0) {
+        const answer = yield inquirer_1.default.prompt({
+            type: 'confirm',
+            name: 'continue',
+            message: `Directory '${destination}' not empty. Are you sure you want to continue?`,
+        });
+        if (!answer.continue) {
+            process.exit();
         }
     }
+    else {
+        args.force = true;
+    }
     if (!args.yes) {
         if (args.prePushHook === null) {
             const answer = yield inquirer_1.default.prompt({
@@ -187,7 +162,7 @@ const main = (args) => __awaiter(void 0, void 0, void 0, function* () {
         }
     }
     try {
-        yield (0, init_runner_1.initRunner)(templates.slice(), Object.assign(Object.assign(Object.assign({}, args), destinations), { templates }));
+        yield (0, init_runner_1.initRunner)(templates.slice(), Object.assign(Object.assign({}, args), { destination, templates }));
     }
     catch (error) {
         console.log(chalk_1.default.red('An error occurred: ', error));

package/dist/common/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.installPrePushHook = exports.lintFix = exports.installPackages = exports.nextSteps = exports.transform = exports.removeFile = exports.saveConfiguration = exports.getBaseTemplates = exports.getAllTemplates = exports.writePackageJson = exports.openPackageJson = exports.isDevEnvironment = exports.styleguidePrompts = exports.missingAddonMsg = exports.incompatibleAddonsMsg = exports.DEFAULT_APPNAME = exports.clientAppPrompts = void 0;
+exports.installPrePushHook = exports.lintFix = exports.installPackages = exports.nextSteps = exports.transform = exports.removeFile = exports.saveConfiguration = exports.getBaseTemplates = exports.getAllTemplates = exports.writeJsonFile = exports.openJsonFile = exports.isDevEnvironment = exports.sxpPrompts = exports.styleguidePrompts = exports.missingAddonMsg = exports.incompatibleAddonsMsg = exports.DEFAULT_APPNAME = exports.clientAppPrompts = void 0;
 var base_1 = require("./prompts/base");
 Object.defineProperty(exports, "clientAppPrompts", { enumerable: true, get: function () { return base_1.clientAppPrompts; } });
 Object.defineProperty(exports, "DEFAULT_APPNAME", { enumerable: true, get: function () { return base_1.DEFAULT_APPNAME; } });
@@ -8,10 +8,12 @@ Object.defineProperty(exports, "incompatibleAddonsMsg", { enumerable: true, get:
 Object.defineProperty(exports, "missingAddonMsg", { enumerable: true, get: function () { return base_1.missingAddonMsg; } });
 var styleguide_1 = require("./prompts/styleguide");
 Object.defineProperty(exports, "styleguidePrompts", { enumerable: true, get: function () { return styleguide_1.styleguidePrompts; } });
+var sxp_1 = require("./prompts/sxp");
+Object.defineProperty(exports, "sxpPrompts", { enumerable: true, get: function () { return sxp_1.sxpPrompts; } });
 var helpers_1 = require("./utils/helpers");
 Object.defineProperty(exports, "isDevEnvironment", { enumerable: true, get: function () { return helpers_1.isDevEnvironment; } });
-Object.defineProperty(exports, "openPackageJson", { enumerable: true, get: function () { return helpers_1.openPackageJson; } });
-Object.defineProperty(exports, "writePackageJson", { enumerable: true, get: function () { return helpers_1.writePackageJson; } });
+Object.defineProperty(exports, "openJsonFile", { enumerable: true, get: function () { return helpers_1.openJsonFile; } });
+Object.defineProperty(exports, "writeJsonFile", { enumerable: true, get: function () { return helpers_1.writeJsonFile; } });
 Object.defineProperty(exports, "getAllTemplates", { enumerable: true, get: function () { return helpers_1.getAllTemplates; } });
 Object.defineProperty(exports, "getBaseTemplates", { enumerable: true, get: function () { return helpers_1.getBaseTemplates; } });
 Object.defineProperty(exports, "saveConfiguration", { enumerable: true, get: function () { return helpers_1.saveConfiguration; } });

package/dist/common/processes/install.js

@@ -85,5 +85,5 @@ const installPrePushHook = (destination, silent) => __awaiter(void 0, void 0, vo
 exports.installPrePushHook = installPrePushHook;
 const getPackageJson = (projectFolder) => {
     const packagePath = path_1.default.join(projectFolder, 'package.json');
-    return (0, helpers_1.openPackageJson)(packagePath);
+    return (0, helpers_1.openJsonFile)(packagePath);
 };

package/dist/common/processes/next.js

@@ -16,10 +16,13 @@ exports.nextSteps = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 /**
  * Logs app creation completion message and next steps
- * @param {string} appName application name for the new app
+ * @param {string[]} appNames application name(s) for the new app
  * @param {string[]} nextStepsArr next steps to be performed after app is created
  */
-const nextSteps = (appName, nextStepsArr) => __awaiter(void 0, void 0, void 0, function* () {
+const nextSteps = (appNames, nextStepsArr) => __awaiter(void 0, void 0, void 0, function* () {
+    const successMessage = appNames.length > 1
+        ? `JSS applications ${chalk_1.default.green(appNames.join(', '))} are ready!`
+        : `JSS application ${chalk_1.default.green(appNames[0])} is ready!`;
     console.log(chalk_1.default.red('                 -/oyhdmNNNNmdhyo/-                '));
     console.log(chalk_1.default.red('             :sdMMMMMMMMMMMMMMMMMMMMds:            '));
     console.log(chalk_1.default.red('          :yNMMMMMMMMMMMMMMMMMMMMMMMMMMNy:         '));
@@ -51,7 +54,7 @@ const nextSteps = (appName, nextStepsArr) => __awaiter(void 0, void 0, void 0, f
     console.log(chalk_1.default.white('                 / // /\\ \\_\\ \\  '));
     console.log(chalk_1.default.white('                 \\___/___/___/'));
     console.log();
-    console.log(`JSS application ${chalk_1.default.green(appName)} is ready!`);
+    console.log(successMessage);
     console.log();
     console.log(chalk_1.default.yellow('Next steps:'));
     nextStepsArr.forEach((step) => {

package/dist/common/processes/transform.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transform = exports.diffAndWriteFiles = exports.diffFiles = exports.mergeEnv = exports.merge = exports.transformFilename = void 0;
+exports.transform = exports.populateEjsData = exports.diffAndWriteFiles = exports.diffFiles = exports.mergeEnv = exports.merge = exports.transformFilename = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const glob_1 = __importDefault(require("glob"));
@@ -180,6 +180,16 @@ const diffAndWriteFiles = ({ rendered, pathToNewFile, answers, }) => __awaiter(v
     }
 });
 exports.diffAndWriteFiles = diffAndWriteFiles;
+const populateEjsData = (answers, destination) => {
+    // pass in helper to answers object
+    const ejsData = Object.assign(Object.assign({}, answers), { helper: {
+            isDev: (0, helpers_1.isDevEnvironment)(destination || answers.destination),
+            getPascalCaseName: helpers_1.getPascalCaseName,
+            getAppPrefix: helpers_1.getAppPrefix,
+        } });
+    return ejsData;
+};
+exports.populateEjsData = populateEjsData;
 /**
  * Handles each template file and applies ejs renderer, also:
  * * determines files for copy
@@ -194,21 +204,11 @@ exports.diffAndWriteFiles = diffAndWriteFiles;
  */
 const transform = (templatePath, answers, options = {}) => __awaiter(void 0, void 0, void 0, function* () {
     const { isFileForCopy, isFileForSkip, fileForCopyRegExp = FILE_FOR_COPY_REGEXP } = options;
-    let destination = undefined;
-    // allow proxy app to be installed separately alongside base app
-    if (templatePath.match(/.*node-.+-proxy$/g)) {
-        destination = answers.proxyAppDestination;
-    }
-    const destinationPath = path_1.default.resolve(destination || answers.destination);
+    const destinationPath = path_1.default.resolve(answers.destination);
     if (!answers.appPrefix) {
         answers.appPrefix = false;
     }
-    // pass in helper to answers object
-    const ejsData = Object.assign(Object.assign({}, answers), { helper: {
-            isDev: (0, helpers_1.isDevEnvironment)(destination || answers.destination),
-            getPascalCaseName: helpers_1.getPascalCaseName,
-            getAppPrefix: helpers_1.getAppPrefix,
-        } });
+    const ejsData = (0, exports.populateEjsData)(answers);
     // the templates to be run through ejs render or copied directly
     const files = glob_1.default.sync('**/*', { cwd: templatePath, dot: true, nodir: true });
     for (const file of files) {
@@ -233,13 +233,13 @@ const transform = (templatePath, answers, options = {}) => __awaiter(void 0, voi
                 fs_extra_1.default.copySync(pathToTemplate, pathToNewFile);
                 continue;
             }
-            if (file.endsWith('package.json') && fs_extra_1.default.existsSync(pathToNewFile)) {
-                // we treat package.json a bit differently
-                // read the current package.json and the template package.json (rendered with ejs)
-                const currentPkg = (0, helpers_1.openPackageJson)(pathToNewFile);
-                const templatePkg = JSON.parse(yield (0, ejs_1.renderFile)(path_1.default.resolve(pathToTemplate), ejsData));
+            if (file.endsWith('.json') && fs_extra_1.default.existsSync(pathToNewFile)) {
+                // we treat a .json a bit differently
+                // read the current .json and the template .json (rendered with ejs)
+                const currentJson = (0, helpers_1.openJsonFile)(pathToNewFile);
+                const templateJson = JSON.parse(yield (0, ejs_1.renderFile)(path_1.default.resolve(pathToTemplate), ejsData));
                 // merge them and set the result to str which will then go through diff
-                const merged = (0, exports.merge)(currentPkg, templatePkg);
+                const merged = (0, exports.merge)(currentJson, templateJson);
                 str = JSON.stringify(merged, null, 2);
             }
             if (file.endsWith('.env') && fs_extra_1.default.existsSync(pathToNewFile)) {

package/dist/common/prompts/base.js

@@ -38,31 +38,6 @@ exports.clientAppPrompts = [
             return !answers.appName;
         },
     },
-    {
-        type: 'input',
-        name: 'hostName',
-        message: 'What is your Sitecore hostname (used if deployed to Sitecore)?',
-        default: (answers) => `${answers.appName}.dev.local`,
-        when: (answers) => {
-            if (answers.yes && !answers.hostName) {
-                answers.hostName = `${answers.appName}.dev.local`;
-            }
-            return !answers.hostName;
-        },
-    },
-    {
-        type: 'list',
-        name: 'fetchWith',
-        message: 'How would you like to fetch Layout and Dictionary data?',
-        choices: Object.values(FetchWith),
-        default: exports.DEFAULT_FETCHWITH,
-        when: (answers) => {
-            if (answers.yes && !answers.fetchWith) {
-                answers.fetchWith = exports.DEFAULT_FETCHWITH;
-            }
-            return !answers.fetchWith;
-        },
-    },
 ];
 const missingAddonMsg = (source, missingAddon) => chalk_1.default.yellow(`Warning: ${source} add-on cannot be used without the ${missingAddon} add-on. This may cause unexpected results.`);
 exports.missingAddonMsg = missingAddonMsg;

package/dist/common/prompts/proxy.js

@@ -0,0 +1,35 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.proxyPrompts = exports.FALLBACK_PROXYNAME = void 0;
+const helpers_1 = require("../utils/helpers");
+const path_1 = __importDefault(require("path"));
+exports.FALLBACK_PROXYNAME = 'sitecore-jss-proxy-app';
+/**
+ * Set of CLI prompts for an SXP app
+ */
+exports.proxyPrompts = [
+    {
+        type: 'input',
+        name: 'proxyAppDestination',
+        message: 'Where would you like your proxy app created?',
+        default: (answers) => {
+            // default proxy destination should be under same root as main app
+            return (0, helpers_1.getDefaultProxyDestination)(answers.destination, answers.proxyName || exports.FALLBACK_PROXYNAME);
+        },
+        when: (answers) => {
+            if (answers.yes && !answers.proxyAppDestination) {
+                answers.proxyAppDestination = (0, helpers_1.getDefaultProxyDestination)(answers.destination, answers.proxyName || exports.FALLBACK_PROXYNAME);
+            }
+            return !answers.proxyAppDestination;
+        },
+        validate: (input, answers) => {
+            if (path_1.default.resolve(input) === path_1.default.resolve(answers.destination)) {
+                return 'Paths for main app and proxy cannot match. Please choose another destination';
+            }
+            return true;
+        },
+    },
+];

package/dist/common/prompts/sxp.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sxpPrompts = void 0;
+const base_1 = require("./base");
+/**
+ * Set of CLI prompts for an SXP app
+ */
+exports.sxpPrompts = [
+    {
+        type: 'input',
+        name: 'hostName',
+        message: 'What is your Sitecore hostname (used if deployed to Sitecore)?',
+        default: (answers) => `${answers.appName || base_1.DEFAULT_APPNAME}.dev.local`,
+        when: (answers) => {
+            if (answers.yes && !answers.hostName) {
+                answers.hostName = `${answers.appName || base_1.DEFAULT_APPNAME}.dev.local`;
+            }
+            return !answers.hostName;
+        },
+    },
+    {
+        type: 'list',
+        name: 'fetchWith',
+        message: 'How would you like to fetch Layout and Dictionary data?',
+        choices: Object.values(base_1.FetchWith),
+        default: base_1.DEFAULT_FETCHWITH,
+        when: (answers) => {
+            if (answers.yes && !answers.fetchWith) {
+                answers.fetchWith = base_1.DEFAULT_FETCHWITH;
+            }
+            return !answers.fetchWith;
+        },
+    },
+];

package/dist/common/utils/helpers.js

@@ -35,11 +35,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeFile = exports.writeFileToPath = exports.getAppPrefix = exports.getBaseTemplates = exports.getAllTemplates = exports.sortKeys = exports.saveConfiguration = exports.writePackageJson = exports.openPackageJson = exports.getPascalCaseName = exports.isDevEnvironment = void 0;
+exports.removeFile = exports.writeFileToPath = exports.getAppPrefix = exports.getBaseTemplates = exports.getAllTemplates = exports.sortKeys = exports.saveConfiguration = exports.writeJsonFile = exports.openJsonFile = exports.getPascalCaseName = exports.isDevEnvironment = exports.getRelativeProxyDestination = exports.getDefaultProxyDestination = exports.proxyAppMatcher = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importStar(require("path"));
 const InitializerFactory_1 = require("../../InitializerFactory");
+// matched for proxy templates
+exports.proxyAppMatcher = /node-headless.+|node-xmcloud.+/g;
+/**
+ * Returns the default path for proxy app initialized alongside main JSS tempalates.
+ * @param {string} mainAppDestination target destination for main app
+ * @param {string} proxyName name of for the proxy app folder
+ * @returns {string} target path for proxy app
+ */
+const getDefaultProxyDestination = (mainAppDestination, proxyName) => path_1.default.join(mainAppDestination, '..', proxyName);
+exports.getDefaultProxyDestination = getDefaultProxyDestination;
+const getRelativeProxyDestination = (mainDestination, proxyDestination) => `${path_1.default.relative(path_1.default.resolve(mainDestination), path_1.default.resolve(proxyDestination))}${path_1.sep}`;
+exports.getRelativeProxyDestination = getRelativeProxyDestination;
 /**
  * Determines whether you are in a dev environment.
  * It's `true` if you are inside the monorepo
@@ -61,46 +73,44 @@ const getPascalCaseName = (name) => {
 };
 exports.getPascalCaseName = getPascalCaseName;
 /**
- * Provides `package.json` data
- * @param {string} [pkgPath] path to `package.json`. Default is './package.json'.
- * @returns `package.json` data
+ * Provides json data from a file
+ * @param {string} jsonFilePath path to the .json file.
+ * @returns json data
  */
-const openPackageJson = (pkgPath) => {
-    const filePath = path_1.default.resolve(pkgPath !== null && pkgPath !== void 0 ? pkgPath : `.${path_1.sep}package.json`);
+const openJsonFile = (jsonFilePath) => {
     try {
-        const data = fs_1.default.readFileSync(filePath, 'utf8');
+        const data = fs_1.default.readFileSync(jsonFilePath, 'utf8');
         return data ? JSON.parse(data) : undefined;
     }
     catch (error) {
-        console.log(chalk_1.default.red(`The following error occurred while trying to read ${filePath}:`));
+        console.log(chalk_1.default.red(`The following error occurred while trying to read ${jsonFilePath}:`));
         console.log(chalk_1.default.red(error));
     }
 };
-exports.openPackageJson = openPackageJson;
+exports.openJsonFile = openJsonFile;
 /**
- * Creates `package.json` file and inserts provided data
- * @param {Object} data data to be written into package.json
- * @param {string} [pkgPath] a path to a file. Default is './package.json'.
+ * Creates a .json file and inserts provided data
+ * @param {Object} data data to be written into the .json file
+ * @param {string} jsonFilePath a path to a file.
  */
-const writePackageJson = (data, pkgPath) => {
-    const filePath = path_1.default.resolve(pkgPath !== null && pkgPath !== void 0 ? pkgPath : `.${path_1.sep}package.json`);
+const writeJsonFile = (data, jsonFilePath) => {
     try {
-        fs_1.default.writeFileSync(filePath, JSON.stringify(data, null, 2), { encoding: 'utf8' });
+        fs_1.default.writeFileSync(jsonFilePath, JSON.stringify(data, null, 2), { encoding: 'utf8' });
     }
     catch (error) {
-        console.log(chalk_1.default.red(`The following error occurred while trying to write ${filePath}:`));
+        console.log(chalk_1.default.red(`The following error occurred while trying to write ${jsonFilePath}:`));
         console.log(chalk_1.default.red(error));
     }
 };
-exports.writePackageJson = writePackageJson;
+exports.writeJsonFile = writeJsonFile;
 /**
  * Save configuration params to the package.json
  * @param {string[]} templates templates applied to the sample
  * @param {string} [pkgPath] path to the package.json
  */
 const saveConfiguration = (templates, pkgPath) => {
-    const pkg = (0, exports.openPackageJson)(pkgPath);
-    (0, exports.writePackageJson)(Object.assign(Object.assign({}, pkg), { config: Object.assign(Object.assign({}, pkg.config), { templates }) }), pkgPath);
+    const pkg = (0, exports.openJsonFile)(pkgPath);
+    (0, exports.writeJsonFile)(Object.assign(Object.assign({}, pkg), { config: Object.assign(Object.assign({}, pkg.config), { templates }) }), pkgPath);
 };
 exports.saveConfiguration = saveConfiguration;
 const sortKeys = (obj) => {

package/dist/init-runner.js

@@ -42,7 +42,7 @@ const common_1 = require("./common");
 const InitializerFactory_1 = require("./InitializerFactory");
 const initRunner = (initializers, args) => __awaiter(void 0, void 0, void 0, function* () {
     let nextStepsArr = [];
-    let appName;
+    const appNames = new Set([]);
     const initFactory = new InitializerFactory_1.InitializerFactory();
     const runner = (inits) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
@@ -53,7 +53,10 @@ const initRunner = (initializers, args) => __awaiter(void 0, void 0, void 0, fun
             }
             args.silent || console.log(chalk_1.default.cyan(`Initializing '${init}'...`));
             const response = yield initializer.init(args);
-            appName = response.appName;
+            // We can have multiple appNames if base template requires to setup an additional standalone app (e.g. XM Cloud proxy)
+            if (initializer.isBase) {
+                appNames.add(response.appName);
+            }
             nextStepsArr = [...nextStepsArr, ...((_a = response.nextSteps) !== null && _a !== void 0 ? _a : [])];
             // process any returned initializers
             if (response.initializers && response.initializers.length > 0) {
@@ -81,7 +84,7 @@ const initRunner = (initializers, args) => __awaiter(void 0, void 0, void 0, fun
         }
     }
     if (!args.silent) {
-        (0, common_1.nextSteps)(appName || '', nextStepsArr);
+        (0, common_1.nextSteps)([...appNames], nextStepsArr);
     }
 });
 exports.initRunner = initRunner;

package/dist/initializers/angular/index.js

@@ -32,9 +32,6 @@ class AngularInitializer {
                 if (!args.templates.includes('angular-xmcloud')) {
                     addInitializers.push('angular-xmcloud');
                 }
-                if (!args.templates.includes('node-xmcloud-proxy')) {
-                    addInitializers.push('node-xmcloud-proxy');
-                }
             }
             else {
                 // invoke default non-XMC init

package/dist/initializers/angular/prompts.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.prompts = void 0;
 const common_1 = require("../../common");
 exports.prompts = [
-    ...common_1.clientAppPrompts,
+    // XMCloud answer defines init behavior. Prompt must go first
     {
         type: 'confirm',
         name: 'xmcloud',
@@ -11,16 +11,16 @@ exports.prompts = [
         default: false,
         when: (answers) => {
             // don't prompt if --yes or angular-xmcloud template was specified
-            if (answers.yes) {
-                return false;
-            }
-            else if (answers.templates.includes('angular-xmcloud') &&
+            if (answers.templates.includes('angular-xmcloud') &&
                 !answers.templates.includes('angular-sxp')) {
                 answers.xmcloud = true;
                 return false;
             }
+            if (answers.yes) {
+                return false;
+            }
             return true;
         },
     },
-    ...common_1.styleguidePrompts,
+    ...common_1.clientAppPrompts,
 ];

package/dist/initializers/angular-sxp/index.js

@@ -31,9 +31,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importStar(require("path"));
 const common_1 = require("../../common");
+const inquirer_1 = __importDefault(require("inquirer"));
 class AngularSxpInitializer {
     get isBase() {
         return false;
@@ -41,8 +45,10 @@ class AngularSxpInitializer {
     init(args) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const pkg = (0, common_1.openPackageJson)(`${args.destination}${path_1.sep}package.json`);
-            const mergedArgs = Object.assign(Object.assign({}, args), { appName: args.appName || ((_a = pkg === null || pkg === void 0 ? void 0 : pkg.config) === null || _a === void 0 ? void 0 : _a.appName) || common_1.DEFAULT_APPNAME, appPrefix: args.appPrefix || ((_b = pkg === null || pkg === void 0 ? void 0 : pkg.config) === null || _b === void 0 ? void 0 : _b.prefix) || false });
+            const pkg = (0, common_1.openJsonFile)(`${args.destination}${path_1.sep}package.json`);
+            const answers = yield inquirer_1.default.prompt(common_1.sxpPrompts, args);
+            const styleguideAnswers = yield inquirer_1.default.prompt(common_1.styleguidePrompts, args);
+            const mergedArgs = Object.assign(Object.assign(Object.assign(Object.assign({}, args), { appName: args.appName || ((_a = pkg === null || pkg === void 0 ? void 0 : pkg.config) === null || _a === void 0 ? void 0 : _a.appName) || common_1.DEFAULT_APPNAME, appPrefix: args.appPrefix || ((_b = pkg === null || pkg === void 0 ? void 0 : pkg.config) === null || _b === void 0 ? void 0 : _b.prefix) || false }), answers), styleguideAnswers);
             const templatePath = path_1.default.resolve(__dirname, '../../templates/angular-sxp');
             yield (0, common_1.transform)(templatePath, mergedArgs);
             const response = {

package/dist/initializers/angular-xmcloud/index.js

@@ -31,23 +31,47 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importStar(require("path"));
 const common_1 = require("../../common");
+const proxy_1 = require("../../common/prompts/proxy");
+const inquirer_1 = __importDefault(require("inquirer"));
+const helpers_1 = require("../../common/utils/helpers");
 class AngularXmCloudInitializer {
     get isBase() {
         return false;
     }
     init(args) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
-            const pkg = (0, common_1.openPackageJson)(`${args.destination}${path_1.sep}package.json`);
-            const mergedArgs = Object.assign(Object.assign({}, args), { appName: args.appName || ((_a = pkg === null || pkg === void 0 ? void 0 : pkg.config) === null || _a === void 0 ? void 0 : _a.appName) || common_1.DEFAULT_APPNAME, appPrefix: args.appPrefix || ((_b = pkg === null || pkg === void 0 ? void 0 : pkg.config) === null || _b === void 0 ? void 0 : _b.prefix) || false });
+            const pkg = (0, common_1.openJsonFile)(`${args.destination}${path_1.sep}package.json`);
+            const addInitializers = [];
+            // angular-xmcloud requires node-xmcloud-proxy
+            if (!args.templates.includes('node-xmcloud-proxy')) {
+                addInitializers.push('node-xmcloud-proxy');
+            }
+            // ensure args.proxyAppDestination is populated
+            const promptArgs = {
+                yes: args.yes,
+                destination: args.destination,
+                proxyName: 'node-xmcloud-proxy',
+                proxyAppDestination: args.proxyAppDestination,
+            };
+            const proxyDetails = yield inquirer_1.default.prompt(proxy_1.proxyPrompts, promptArgs);
+            args.proxyAppDestination = proxyDetails.proxyAppDestination;
+            const finalArgs = Object.assign(Object.assign(Object.assign(Object.assign({}, args), { appName: args.appName || ((_a = pkg === null || pkg === void 0 ? void 0 : pkg.config) === null || _a === void 0 ? void 0 : _a.appName) || common_1.DEFAULT_APPNAME, appPrefix: args.appPrefix || ((_b = pkg === null || pkg === void 0 ? void 0 : pkg.config) === null || _b === void 0 ? void 0 : _b.prefix) || false }), proxyDetails), { relativeProxyAppDestination: (0, helpers_1.getRelativeProxyDestination)(args.destination, args.proxyAppDestination) });
             const templatePath = path_1.default.resolve(__dirname, '../../templates/angular-xmcloud');
-            yield (0, common_1.transform)(templatePath, mergedArgs);
+            yield (0, common_1.transform)(templatePath, finalArgs);
+            if (args.templates.includes('angular-sxp') || ((_d = (_c = pkg.config) === null || _c === void 0 ? void 0 : _c.templates) === null || _d === void 0 ? void 0 : _d.includes('angular-sxp'))) {
+                console.log((0, common_1.incompatibleAddonsMsg)('angular-xmcloud', 'angular-sxp'));
+            }
             const response = {
                 nextSteps: [],
                 appName: args.appName || common_1.DEFAULT_APPNAME,
+                initializers: addInitializers,
             };
             return response;
         });

package/dist/initializers/nextjs/index.js

@@ -105,9 +105,9 @@ class NextjsInitializer {
             }
             if (!addInitializers.includes('nextjs-styleguide') &&
                 !args.templates.includes('nextjs-styleguide')) {
-                const pkg = (0, common_1.openPackageJson)(pkgPath);
+                const pkg = (0, common_1.openJsonFile)(pkgPath);
                 pkg.scripts.bootstrap = pkg.scripts.bootstrap.replace(' && graphql-let', '');
-                (0, common_1.writePackageJson)(pkg, pkgPath);
+                (0, common_1.writeJsonFile)(pkg, pkgPath);
             }
             const response = {
                 nextSteps: [`* Connect to Sitecore with ${chalk_1.default.green('jss setup')} (optional)`],

package/dist/initializers/nextjs/prompts.js

@@ -12,8 +12,10 @@ var Prerender;
     Prerender["SSR"] = "SSR";
 })(Prerender = exports.Prerender || (exports.Prerender = {}));
 const DEFAULT_PRERENDER = Prerender.SSG;
+// still need sxp prompts here until sitecore/config is no longer added to xmc app
 exports.prompts = [
     ...common_1.clientAppPrompts,
+    ...common_1.sxpPrompts,
     {
         type: 'list',
         name: 'prerender',

package/dist/initializers/nextjs/remove-dev-dependencies.js

@@ -10,10 +10,10 @@ const common_1 = require("../../common");
 const removeDevDependencies = (projectPath) => {
     // remove `next-transpile-modules` dependency
     const packagePath = path_1.default.join(projectPath, 'package.json');
-    const pkg = (0, common_1.openPackageJson)(packagePath);
+    const pkg = (0, common_1.openJsonFile)(packagePath);
     if (pkg === null || pkg === void 0 ? void 0 : pkg.devDependencies['next-transpile-modules']) {
         delete pkg.devDependencies['next-transpile-modules'];
-        (0, common_1.writePackageJson)(pkg, packagePath);
+        (0, common_1.writeJsonFile)(pkg, packagePath);
     }
     // remove monorepo next.config.js plugin
     const monorepoPlugin = path_1.default.join(projectPath, 'src/lib/next-config/plugins/monorepo.js');

package/dist/initializers/nextjs-multisite/index.js

@@ -41,7 +41,7 @@ class NextjsMultisiteInitializer {
     init(args) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const pkg = (0, common_1.openPackageJson)(`${args.destination}${path_1.sep}package.json`);
+            const pkg = (0, common_1.openJsonFile)(`${args.destination}${path_1.sep}package.json`);
             const mergedArgs = Object.assign(Object.assign({}, args), { appName: args.appName || ((_a = pkg === null || pkg === void 0 ? void 0 : pkg.config) === null || _a === void 0 ? void 0 : _a.appName) || common_1.DEFAULT_APPNAME, appPrefix: args.appPrefix || ((_b = pkg === null || pkg === void 0 ? void 0 : pkg.config) === null || _b === void 0 ? void 0 : _b.prefix) || false });
             const templatePath = path_1.default.resolve(__dirname, '../../templates/nextjs-multisite');
             yield (0, common_1.transform)(templatePath, mergedArgs);

package/dist/initializers/nextjs-styleguide/index.js

@@ -46,7 +46,7 @@ class NextjsStyleguideInitializer {
     init(args) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const pkg = (0, common_1.openPackageJson)(`${args.destination}${path_1.sep}package.json`);
+            const pkg = (0, common_1.openJsonFile)(`${args.destination}${path_1.sep}package.json`);
             const answers = yield inquirer_1.default.prompt(common_1.styleguidePrompts, args);
             const mergedArgs = Object.assign(Object.assign(Object.assign({}, args), { appName: args.appName || ((_a = pkg === null || pkg === void 0 ? void 0 : pkg.config) === null || _a === void 0 ? void 0 : _a.appName) || common_1.DEFAULT_APPNAME, appPrefix: args.appPrefix || ((_b = pkg === null || pkg === void 0 ? void 0 : pkg.config) === null || _b === void 0 ? void 0 : _b.prefix) || false }), answers);
             const templatePath = path_1.default.resolve(__dirname, '../../templates/nextjs-styleguide');