create-sitecore-jss 22.2.0-canary.14 → 22.2.0-canary.16

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 helpers_1 = require("./common/utils/helpers");
 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,30 +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(helpers_1.proxyAppMatcher));
-    if (proxyApp) {
-        // put the proxy alongside main app by default
-        const defaultProxyDestination = (0, helpers_1.getDefaultProxyDestination)(destination, 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 (path_1.default.resolve(proxyAppDestination) === path_1.default.resolve(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',
@@ -153,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({
@@ -188,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/processes/next.js

@@ -51,7 +51,7 @@ const nextSteps = (appNames, nextStepsArr) => __awaiter(void 0, void 0, void 0,
     console.log(chalk_1.default.white('                 / // /\\ \\_\\ \\  '));
     console.log(chalk_1.default.white('                 \\___/___/___/'));
     console.log();
-    console.log(`JSS application(s) ${chalk_1.default.green(appNames.join(', '))} is ready!`);
+    console.log(`JSS application(s) ${chalk_1.default.green(appNames.join(', '))} ${appNames.length > 1 ? 'are' : 'is'} ready!`);
     console.log();
     console.log(chalk_1.default.yellow('Next steps:'));
     nextStepsArr.forEach((step) => {

package/dist/common/processes/transform.js

@@ -187,11 +187,6 @@ const populateEjsData = (answers, destination) => {
             getPascalCaseName: helpers_1.getPascalCaseName,
             getAppPrefix: helpers_1.getAppPrefix,
         } });
-    // When SPA application and XM Cloud proxy is used we need to calculate relative path between SPA app and proxy to apply that in EJS template
-    // Absolute path can't be used across all the machines
-    if (answers.proxyAppDestination) {
-        ejsData.helper.relativeProxyAppDestination = `${path_1.default.relative(path_1.default.resolve(answers.destination), path_1.default.resolve(answers.proxyAppDestination))}${path_1.sep}`;
-    }
     return ejsData;
 };
 exports.populateEjsData = populateEjsData;
@@ -209,16 +204,11 @@ exports.populateEjsData = populateEjsData;
  */
 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) && answers.proxyAppDestination) {
-        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;
     }
-    const ejsData = (0, exports.populateEjsData)(answers, destination);
+    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) {

package/dist/common/prompts/base.js

@@ -38,19 +38,6 @@ exports.clientAppPrompts = [
             return !answers.appName;
         },
     },
-    {
-        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

@@ -1,6 +1,7 @@
 "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
  */
@@ -9,12 +10,25 @@ exports.sxpPrompts = [
         type: 'input',
         name: 'hostName',
         message: 'What is your Sitecore hostname (used if deployed to Sitecore)?',
-        default: (answers) => `${answers.appName}.dev.local`,
+        default: (answers) => `${answers.appName || base_1.DEFAULT_APPNAME}.dev.local`,
         when: (answers) => {
             if (answers.yes && !answers.hostName) {
-                answers.hostName = `${answers.appName}.dev.local`;
+                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

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -12,10 +35,10 @@ 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.writeJsonFile = exports.openJsonFile = exports.getPascalCaseName = exports.isDevEnvironment = exports.getDefaultProxyDestination = exports.proxyAppMatcher = 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 = __importDefault(require("path"));
+const path_1 = __importStar(require("path"));
 const InitializerFactory_1 = require("../../InitializerFactory");
 // matched for proxy templates
 exports.proxyAppMatcher = /node-headless.+|node-xmcloud.+/g;
@@ -27,6 +50,8 @@ exports.proxyAppMatcher = /node-headless.+|node-xmcloud.+/g;
  */
 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

package/dist/init-runner.js

@@ -53,8 +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);
-            // App names can be multiple if the base template requires to setup additional standalone app (e.g. XM Cloud proxy)
-            appNames.add(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) {

package/dist/initializers/angular/prompts.js

@@ -11,14 +11,14 @@ 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;
         },
     },

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

@@ -31,29 +31,42 @@ 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.openJsonFile)(`${args.destination}${path_1.sep}package.json`);
             const addInitializers = [];
-            // when installing proxy alongside main app, have a separate path ready
-            if (!args.proxyAppDestination) {
-                args.proxyAppDestination = (0, helpers_1.getDefaultProxyDestination)(args.destination, 'node-xmcloud-proxy');
-            }
+            // angular-xmcloud requires node-xmcloud-proxy
             if (!args.templates.includes('node-xmcloud-proxy')) {
                 addInitializers.push('node-xmcloud-proxy');
             }
-            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 });
+            // ensure args.proxyAppDestination is populated
+            const promptArgs = {
+                yes: args.yes,
+                destination: args.destination,
+                proxyName: 'node-xmcloud-proxy',
+            };
+            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,

package/dist/initializers/node-xmcloud-proxy/index.js

@@ -21,7 +21,8 @@ class AngularXmCloudInitializer {
     init(args) {
         return __awaiter(this, void 0, void 0, function* () {
             const templatePath = path_1.default.resolve(__dirname, '../../templates/node-xmcloud-proxy');
-            yield (0, common_1.transform)(templatePath, args);
+            const modifiedArgs = Object.assign(Object.assign({}, args), { destination: args.proxyAppDestination || args.destination });
+            yield (0, common_1.transform)(templatePath, modifiedArgs);
             const response = {
                 appName: 'node-xmcloud-proxy',
             };

package/dist/templates/angular-xmcloud/.env

@@ -11,4 +11,4 @@ SITECORE_EDGE_CONTEXT_ID=
 PROXY_HOST=http://localhost:3001
 
 # Your XM Cloud Proxy server path is needed to build the app. The build output will be copied to the proxy server path.
-PROXY_BUILD_PATH=<%- helper.relativeProxyAppDestination %>dist
+PROXY_BUILD_PATH=<%- locals.relativeProxyAppDestination.replace(/\\/g, '\\\\') %>dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-sitecore-jss",
-  "version": "22.2.0-canary.14",
+  "version": "22.2.0-canary.16",
   "description": "Sitecore JSS initializer",
   "bin": "./dist/index.js",
   "scripts": {
@@ -63,5 +63,5 @@
     "ts-node": "^10.9.1",
     "typescript": "~4.9.5"
   },
-  "gitHead": "0788968fec7449213571b74aa538f754ddd08e4d"
+  "gitHead": "40fde917c5ffee0244d997612cc638496fd26f10"
 }