create-sitecore-jss 22.2.0-canary.6 → 22.2.0-canary.7

package/dist/bin.js

@@ -43,7 +43,7 @@ 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 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.
@@ -84,16 +84,17 @@ const getDestinations = (args, templates) => __awaiter(void 0, void 0, void 0, f
             : 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));
+    const proxyApp = templates.find((template) => template.match(helpers_1.proxyAppMatcher));
     if (proxyApp) {
-        const defaultProxyDestination = proxyApp && `${process.cwd()}${path_1.sep}${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 (proxyAppDestination === destination) {
+        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 {

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.writeJsonFile = exports.openJsonFile = 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,6 +8,8 @@ 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, "openJsonFile", { enumerable: true, get: function () { return helpers_1.openJsonFile; } });

package/dist/common/processes/next.js

@@ -16,10 +16,10 @@ 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* () {
     console.log(chalk_1.default.red('                 -/oyhdmNNNNmdhyo/-                '));
     console.log(chalk_1.default.red('             :sdMMMMMMMMMMMMMMMMMMMMds:            '));
     console.log(chalk_1.default.red('          :yNMMMMMMMMMMMMMMMMMMMMMMMMMMNy:         '));
@@ -51,7 +51,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(`JSS application(s) ${chalk_1.default.green(appNames.join(', '))} is ready!`);
     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,21 @@ 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,
+        } });
+    // 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;
 /**
  * Handles each template file and applies ejs renderer, also:
  * * determines files for copy
@@ -196,19 +211,14 @@ const transform = (templatePath, answers, options = {}) => __awaiter(void 0, voi
     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)) {
+    if (templatePath.match(/.*node-.+-proxy$/g) && answers.proxyAppDestination) {
         destination = answers.proxyAppDestination;
     }
     const destinationPath = path_1.default.resolve(destination || 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, destination);
     // 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,18 +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',

package/dist/common/prompts/sxp.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sxpPrompts = void 0;
+/**
+ * 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}.dev.local`,
+        when: (answers) => {
+            if (answers.yes && !answers.hostName) {
+                answers.hostName = `${answers.appName}.dev.local`;
+            }
+            return !answers.hostName;
+        },
+    },
+];

package/dist/common/utils/helpers.js

@@ -12,11 +12,21 @@ 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 = 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.getDefaultProxyDestination = exports.proxyAppMatcher = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(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;
 /**
  * Determines whether you are in a dev environment.
  * It's `true` if you are inside the monorepo

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,8 @@ 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;
+            // App names can be multiple if the base template requires to setup additional standalone app (e.g. XM Cloud proxy)
+            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 +82,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',
@@ -22,5 +22,5 @@ exports.prompts = [
             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;
@@ -42,7 +46,9 @@ class AngularSxpInitializer {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             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 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

@@ -34,6 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importStar(require("path"));
 const common_1 = require("../../common");
+const helpers_1 = require("../../common/utils/helpers");
 class AngularXmCloudInitializer {
     get isBase() {
         return false;
@@ -42,12 +43,21 @@ class AngularXmCloudInitializer {
         var _a, _b;
         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');
+            }
+            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 });
             const templatePath = path_1.default.resolve(__dirname, '../../templates/angular-xmcloud');
             yield (0, common_1.transform)(templatePath, mergedArgs);
             const response = {
                 nextSteps: [],
                 appName: args.appName || common_1.DEFAULT_APPNAME,
+                initializers: addInitializers,
             };
             return response;
         });

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/react/prompts.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prompts = void 0;
 const common_1 = require("../../common");
-exports.prompts = [...common_1.clientAppPrompts, ...common_1.styleguidePrompts];
+exports.prompts = [...common_1.clientAppPrompts, ...common_1.sxpPrompts, ...common_1.styleguidePrompts];

package/dist/initializers/react-native/prompts.js

@@ -4,5 +4,6 @@ exports.prompts = void 0;
 const common_1 = require("../../common");
 exports.prompts = [
     ...common_1.clientAppPrompts.filter((p) => p.name !== 'fetchWith'),
+    ...common_1.sxpPrompts,
     ...common_1.styleguidePrompts,
 ];

package/dist/initializers/vue/prompts.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prompts = void 0;
 const common_1 = require("../../common");
-exports.prompts = [...common_1.clientAppPrompts, ...common_1.styleguidePrompts];
+exports.prompts = [...common_1.clientAppPrompts, ...common_1.sxpPrompts, ...common_1.styleguidePrompts];

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

@@ -5,4 +5,4 @@
 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=<%- proxyAppDestination %>/dist
+PROXY_BUILD_PATH=<%- helper.relativeProxyAppDestination %>dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-sitecore-jss",
-  "version": "22.2.0-canary.6",
+  "version": "22.2.0-canary.7",
   "description": "Sitecore JSS initializer",
   "bin": "./dist/index.js",
   "scripts": {
@@ -63,5 +63,5 @@
     "ts-node": "^10.9.1",
     "typescript": "~4.9.5"
   },
-  "gitHead": "081499ff4ca4c753b0762c4b700529c7514ac774"
+  "gitHead": "237c6c99e1a13e30447f09ce710e543b2b999096"
 }