create-sitecore-jss 22.2.0-canary.83 → 22.3.0-canary.1

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

@@ -0,0 +1,80 @@
+"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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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, _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 = [];
+            // 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, 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;
+        });
+    }
+}
+exports.default = AngularXmCloudInitializer;

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');

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

@@ -41,7 +41,7 @@ class NextjsStyleguideInitializer {
     init(args) {
         var _a, _b, _c, _d, _e, _f;
         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-styleguide-tracking');
             yield (0, common_1.transform)(templatePath, mergedArgs);

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

@@ -41,7 +41,7 @@ class NextjsSxaInitializer {
     init(args) {
         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 pkg = (0, common_1.openJsonFile)(`${args.destination}${path_1.sep}package.json`);
             // TODO: prompts for SXA
             // const answers = await prompt<StyleguideAnswer>(styleguidePrompts, args);
             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 });

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

@@ -42,7 +42,7 @@ class NextjsXMCloudInitializer {
     init(args) {
         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 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-xmcloud');
             yield (0, common_1.transform)(templatePath, mergedArgs);

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

@@ -0,0 +1,33 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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 = __importDefault(require("path"));
+const common_1 = require("../../common");
+class AngularXmCloudInitializer {
+    get isBase() {
+        return true;
+    }
+    init(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const templatePath = path_1.default.resolve(__dirname, '../../templates/node-xmcloud-proxy');
+            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',
+            };
+            return response;
+        });
+    }
+}
+exports.default = AngularXmCloudInitializer;

package/dist/initializers/react/index.js

@@ -52,7 +52,7 @@ class ReactInitializer {
             yield (0, common_1.transform)(templatePath, mergedArgs);
             const isDev = (0, common_1.isDevEnvironment)(args.destination);
             const pkgPath = path_1.default.resolve(`${args.destination}${path_1.sep}package.json`);
-            const pkg = (0, common_1.openPackageJson)(pkgPath);
+            const pkg = (0, common_1.openJsonFile)(pkgPath);
             if (isDev) {
                 Object.entries(pkg.scripts).forEach(([key, value]) => {
                     // Can't rewire `eject` script
@@ -61,14 +61,14 @@ class ReactInitializer {
                     // It's required to start each command using `react-app-rewired`, to solve duplicate `react` issue
                     pkg.scripts[key] = value.replace('react-scripts', 'react-app-rewired');
                 });
-                (0, common_1.writePackageJson)(pkg, pkgPath);
+                (0, common_1.writeJsonFile)(pkg, pkgPath);
             }
             else {
                 // Don't need to rewire anything if we are not in the dev env
                 delete pkg.devDependencies['react-app-rewired'];
                 // Remove webpack overrides
                 (0, common_1.removeFile)(path_1.default.resolve(`${args.destination}${path_1.sep}config-overrides.js`));
-                (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/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/.env

@@ -1,3 +1,5 @@
+# ====== Sitecore Preview / Delivery Edge ======
+
 # Your Sitecore API key is needed to build the app. Typically, the API key is
 # defined in `scjssconfig.json` (as `sitecore.apiKey`). This file may not exist
 # when building locally (if you've never run `jss setup`), or when building in a
@@ -17,6 +19,8 @@ SITECORE_API_HOST=
 # the resolved Sitecore API hostname + the `graphQLEndpointPath` defined in your `package.json`.
 GRAPH_QL_ENDPOINT=
 
+# ==============================================
+
 # Your Sitecore site name.
 # Uses your `package.json` config `appName` if empty.
 SITECORE_SITE_NAME=
@@ -24,9 +28,6 @@ SITECORE_SITE_NAME=
 # Your default app language.
 DEFAULT_LANGUAGE=
 
-# The way in which layout and dictionary data is fetched from Sitecore
-FETCH_WITH=<%- fetchWith %>
-
 # Sitecore JSS npm packages utilize the debug module for debug logging.
 # https://www.npmjs.com/package/debug
 # Set the DEBUG environment variable to 'sitecore-jss:*' to see all logs:

package/dist/templates/angular/.eslintrc

@@ -20,6 +20,7 @@
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
       "rules": {
+        "@angular-eslint/no-host-metadata-property": "off",
         "@angular-eslint/component-selector": [
           "error",
           {

package/dist/templates/angular/README.md

@@ -3,51 +3,11 @@
 <!---
 @TODO: Update to next version docs before release
 -->
-[Documentation (Experience Platform)](https://doc.sitecore.com/xp/en/developers/hd/22/sitecore-headless-development/sitecore-javascript-rendering-sdk--jss--for-angular.html)
-
-
-## App setup
-
-1. `npm install`
-1. `npm install -g @sitecore-jss/sitecore-jss-cli`
-1. `jss setup`
-
-> This setup is optional to get started with development, as it assumes you have Sitecore installed.
->
-> If you answer "yes", you would need to provide the path to your Sitecore installation's "Website" folder.
-
-## Development server
-
-Run `jss start`.
-
-The app will be built and webpack server will be started. So it's expected that the browser will open with `http://localhost:3000` and familiar default welcome content is rendered.
-
-The app will automatically reload if you change any of the source files.
-
-When running the development server, it automatically sets up a sitecore mock server configures a proxy that forwards all requests to `/sitecore` to that sitecore mock server. Check `proxy.conf.js` to see mock server and proxy implementation.
-
-### Congratulations!
 
-The app is now running in dev mode sourcing data from local files and is not connected to Sitecore in any way.
-
-## App deployment
-
-### Pre-requisites
-
-1. Sitecore instance has JSS packages installed.
-1. Sitecore is configured for this JSS app.
-
-### Steps
-
-Run `jss deploy package`.
-
-This step will:
-
-* Run the production bundle of your app.
-* Generate the app manifest.
-* Generate a package with the manifest and production bundle.
-* Install the package over HTTP on your Sitecore instance.
+[Documentation (Experience Platform)](https://doc.sitecore.com/xp/en/developers/hd/22/sitecore-headless-development/sitecore-javascript-rendering-sdk--jss--for-angular.html)
 
-## Further help
+<!---
+@TODO: Verify the link for angular xmcloud when documentation is ready
+-->
 
-To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
+[Documentation (XM Cloud)](https://doc.sitecore.com/xmc/en/developers/xm-cloud/sitecore-javascript-rendering-sdk--jss--for-angular.html)

package/dist/templates/angular/angular.json

@@ -49,12 +49,7 @@
               ],
               "baseHref": "/",
               "aot": true,
-              "//": [
-                "You might want to adjust the optimization entry to workaround a bug with bootstrap warnings caused by Angular",
-                "The warnings may occur during build and when running connected mode. Check below for possible fixes.",
-                "https://github.com/ng-bootstrap/ng-bootstrap/issues/4306"
-              ],
-              "optimization": "true",
+              "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
               "namedChunks": false,

package/dist/templates/angular/gitignore

@@ -9,10 +9,15 @@ scjssconfig.json
 /dist-server
 /tmp
 /out-tsc
+/.angular
 
 # dependencies
 /node_modules
 
+# local env files
+.env.local
+.env.*.local
+
 # IDEs and editors
 /.idea
 .project

package/dist/templates/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%- appName %>",
-  "version": "22.2.0-canary",
+  "version": "22.3.0-canary",
   "description": "Application utilizing Sitecore JavaScript Services and Angular (angular-cli).",
   "config": {
     "appName": "<%- appName %>",
@@ -15,18 +15,15 @@
   },
   "scripts": {
     "ng": "ng",
-    "lint:yml": "ts-node ./scripts/lint-yml.ts",
-    "lint": "ng lint <%- appName %> --fix && npm run lint:yml",
+    "lint": "ng lint <%- appName %> --fix",
     "e2e": "ng e2e",
     "jss": "jss",
-    "start": "cross-env-shell JSS_MODE=disconnected \"npm-run-all --serial bootstrap --parallel start:angular start:proxy start:watch-components\"",
     "start:connected": "npm-run-all --serial bootstrap start:angular start:watch-components",
-    "build": "npm-run-all --serial bootstrap --serial build:client build:server",
-    "scaffold": "ng generate @sitecore-jss/sitecore-jss-angular-schematics:jss-component",
+    "build": "npm-run-all --serial bootstrap build:client build:server",
+    "scaffold": "ng generate @sitecore-jss/sitecore-jss-angular-schematics:jss-component --no-manifest",
     "start:angular": "ng serve -o",
-    "start:proxy": "ts-node --project src/tsconfig.webpack-server.json scripts/disconnected-mode-proxy.ts",
-    "start:watch-components": "ts-node --project src/tsconfig.webpack-server.json scripts/generate-component-factory.ts --watch",
-    "build:client": "cross-env-shell ng build --base-href $npm_package_config_sitecoreDistPath/browser/ --output-path=$npm_package_config_buildArtifactsPath/browser/",
+    "start:watch-components": "ts-node --project src/tsconfig.webpack-server.json scripts/generate-component-factory/index.ts --watch",
+    "build:client": "cross-env-shell ng build --configuration=production --base-href $npm_package_config_sitecoreDistPath/browser/ --output-path=$npm_package_config_buildArtifactsPath/browser/",
     "build:server": "cross-env-shell ng run <%- appName %>:server:production --output-path=$npm_package_config_buildArtifactsPath",
     "postbuild:server": "move-cli ./dist/main.js ./dist/server.bundle.js",
     "bootstrap": "ts-node --project src/tsconfig.webpack-server.json scripts/bootstrap.ts",
@@ -60,13 +57,12 @@
     "@apollo/client": "^3.3.12",
     "@ngx-translate/core": "~15.0.0",
     "@ngx-translate/http-loader": "~8.0.0",
-    "@sitecore-jss/sitecore-jss-angular": "~22.2.0-canary",
+    "@sitecore-jss/sitecore-jss-angular": "~22.3.0-canary",
     "apollo-angular": "~6.0.0",
     "bootstrap": "^5.3.3",
     "core-js": "~3.37.1",
     "graphql": "15.5.0",
     "graphql-tag": "~2.11.0",
-    "lodash": "^4.17.21",
     "rxjs": "~7.8.1",
     "tslib": "^2.6.3",
     "zone.js": "~0.14.7"
@@ -82,33 +78,26 @@
     "@angular/cli": "~17.3.8",
     "@angular/compiler-cli": "~17.3.11",
     "@angular/language-service": "~17.3.11",
-    "@sitecore-jss/sitecore-jss-angular-schematics": "~22.2.0-canary",
-    "@sitecore-jss/sitecore-jss-cli": "~22.2.0-canary",
-    "@sitecore-jss/sitecore-jss-dev-tools": "~22.2.0-canary",
-    "@types/isomorphic-fetch": "0.0.35",
+    "@sitecore-jss/sitecore-jss-angular-schematics": "~22.3.0-canary",
+    "@sitecore-jss/sitecore-jss-cli": "~22.3.0-canary",
+    "@sitecore-jss/sitecore-jss-dev-tools": "~22.3.0-canary",
     "@types/jasmine": "~3.6.7",
     "@types/jasminewd2": "~2.0.8",
     "@types/node": "~20.14.10",
     "@typescript-eslint/eslint-plugin": "^7.16.0",
     "@typescript-eslint/parser": "^7.16.0",
-    "body-parser": "~1.20.2",
     "chalk": "~4.1.0",
     "chokidar": "^3.5.2",
     "codelyzer": "~6.0.1",
     "constant-case": "^3.0.4",
-    "cookie-parser": "~1.4.5",
     "cross-env": "~7.0.3",
     "del-cli": "^5.0.0",
     "dotenv": "^16.0.0",
     "dotenv-webpack": "^7.1.0",
-    "enhanced-resolve": "5.7.0",
     "eslint": "^8.56.0",
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-jsdoc": "48.7.0",
     "eslint-plugin-prefer-arrow": "1.2.3",
-    "express": "~4.17.1",
-    "fs-extra": "~9.1.0",
-    "isomorphic-fetch": "^3.0.0",
     "jasmine-core": "~3.7.1",
     "jasmine-spec-reporter": "~6.0.0",
     "karma": "^6.3.2",
@@ -121,7 +110,6 @@
     "npm-run-all": "~4.1.5",
     "protractor": "^7.0.0",
     "ts-node": "~10.9.2",
-    "typescript": "~5.2.2",
-    "yaml-lint": "^1.2.4"
+    "typescript": "~5.2.2"
   }
 }

package/dist/templates/angular/proxy.conf.js

@@ -1,28 +1,10 @@
 /*
-  When the app runs in disconnected mode, and Sitecore is not present, we need to give
-  the app copies of the Sitecore APIs it depends on (layout service, dictionary service, content service)
-  to talk to so that the app can run using the locally defined disconnected data.
-
-  When the app runs in connected mode, Sitecore is present and some of the requests should be
+  When the app runs in connected mode, some of the requests should be
   proxied to the Sitecore API
-
-  This is accomplished by spinning up a small Express server that mocks the APIs, and then
-  telling angular-cli to proxy requests to the API paths to this express instance.
-
-  See /scripts/disconnected-mode-proxy.ts for the proxy API server configuration.
 */
-const constants = require('@sitecore-jss/sitecore-jss-angular/cjs').constants;
 const environment = require('./src/environments/environment.js').environment;
 
-const port = 3043;
-
-const PROXY_CONFIG = process.env.JSS_MODE === constants.JSS_MODE.DISCONNECTED ? [
-  {
-    context: ['/data', '/sitecore'],
-    target: `http://localhost:${port}`,
-    secure: false,
-  },
-] : [
+const PROXY_CONFIG = [
   {
     context: [
       // API endpoints
@@ -30,12 +12,12 @@ const PROXY_CONFIG = process.env.JSS_MODE === constants.JSS_MODE.DISCONNECTED ?
       // media items
       '/-',
       // visitor identification
-      '/layouts'
+      '/layouts',
     ],
     target: environment.sitecoreApiHost,
     secure: false,
-    changeOrigin: true
-  }
+    changeOrigin: true,
+  },
 ];
 
 module.exports = PROXY_CONFIG;

package/dist/templates/angular/scripts/bootstrap.ts

@@ -1,8 +1,4 @@
 import 'dotenv/config';
-import { constants } from '@sitecore-jss/sitecore-jss-angular/cjs';
-import { generateConfig } from './generate-config';
-const projects = require('../angular.json').projects;
-const chalk = require('chalk');
 
 /*
   BOOTSTRAPPING
@@ -11,30 +7,15 @@ const chalk = require('chalk');
   and the global config module.
 */
 
-const disconnected = process.env.JSS_MODE === constants.JSS_MODE.DISCONNECTED;
-
-if (disconnected && process.env.FETCH_WITH === constants.FETCH_WITH.GRAPHQL) {
-  throw new Error(chalk.red("GraphQL requests to Dictionary and Layout services are not supported in disconnected mode."))
-}
+/*
+   PLUGINS GENERATION
+*/
+require('./generate-plugins');
 
 /*
   CONFIG GENERATION
-  Generates the /src/environments/environment.js file which contains runtime configuration
-  that the app can import and use.
-
-  This is generated rather than using Angular environments because of the need to set config params
-  based on build arguments, which env files don't directly allow.
 */
-function writeConfig(configOverride: { production: boolean, sitecoreApiHost?: string }, outputPath?: string) {
-  if (disconnected) {
-    configOverride.sitecoreApiHost = `http://localhost:${projects['<%- appName %>'].architect.serve.options.port}`;
-  }
-
-  generateConfig(configOverride, outputPath);
-}
-
-writeConfig({ production: false });
-writeConfig({ production: true }, 'src/environments/environment.prod.js');
+require('./generate-config');
 
 /*
   COMPONENT FACTORY GENERATION

package/dist/templates/angular/scripts/config/index.ts

@@ -0,0 +1,28 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const plugins = require('scripts/temp/config-plugins');
+import { JssConfig } from 'lib/config';
+
+export interface ConfigPlugin {
+  /**
+   * Detect order when the plugin should be called, e.g. 0 - will be called first (can be a plugin which data is required for other plugins)
+   */
+  order: number;
+  /**
+   * A function which will be called during config generation
+   * @param {JssConfig} config Current (accumulated) config
+   */
+  exec(config: JssConfig): Promise<JssConfig>;
+}
+
+export class JssConfigFactory {
+  public async create(defaultConfig: JssConfig = {}): Promise<JssConfig> {
+    return (Object.values(plugins) as ConfigPlugin[])
+      .sort((p1, p2) => p1.order - p2.order)
+      .reduce(
+        (promise, plugin) => promise.then((config) => plugin.exec(config)),
+        Promise.resolve(defaultConfig)
+      );
+  }
+}
+
+export const jssConfigFactory = new JssConfigFactory();

package/dist/templates/angular/scripts/config/plugins/computed.ts

@@ -0,0 +1,21 @@
+import { JssConfig } from 'lib/config';
+import { ConfigPlugin } from '..';
+
+/**
+ * This plugin will set computed config props.
+ * The "graphQLEndpoint" is an example of making a _computed_ config setting
+ * based on other config settings.
+ */
+class ComputedPlugin implements ConfigPlugin {
+  // should come after other plugins (but before fallback)
+  order = 10;
+
+  async exec(config: JssConfig) {
+    return Object.assign({}, config, {
+      graphQLEndpoint:
+        config.graphQLEndpoint || `${config.sitecoreApiHost}${config.graphQLEndpointPath}`,
+    });
+  }
+}
+
+export const computedPlugin = new ComputedPlugin();

package/dist/templates/angular/scripts/config/plugins/fallback.ts

@@ -0,0 +1,22 @@
+import { JssConfig } from 'lib/config';
+import { ConfigPlugin } from '..';
+
+/**
+ * This config will set fallback values for properties that were left empty
+ * If neither env, nor other places had a proper value, this will ensure a fallback is set
+ */
+class FallbackPlugin implements ConfigPlugin {
+  // should always come last
+  order = 100;
+
+  async exec(config: JssConfig) {
+    return Object.assign({}, config, {
+      defaultLanguage: config.defaultLanguage || 'en',
+      <% if (!locals.xmcloud) { -%>
+      layoutServiceConfigurationName: config.layoutServiceConfigurationName || 'default',
+      <% } -%>
+    });
+  }
+}
+
+export const fallbackPlugin = new FallbackPlugin();