@commercetools-frontend/application-cli 2.0.0 → 2.1.1

package/README.md

@@ -30,28 +30,28 @@ The environments to compile the deployments for must be specified in a `storage-
  * @type {import('@commercetools-frontend/application-cli').TStorageBucketsConfig}
  */
 module.exports = {
-  'merchant-center-north-america': ['gcp-production-us'],
-  'merchant-center-asia': ['gcp-production-au'],
+  'merchant-center-north-america': {
+    cloudEnvironment: 'ctp_production_gcp_us-central1_v1',
+    bucketEnvironment: 'ctp-gcp-production-us',
+  },
 };
 ```
 
-The above configuration would compile for two environments in `gcp-production-us` and `gcp-production-au` each for their respective region. Yielding a `/deployments` folder for the application with the following structure:
+The above configuration would compile for one environment in `gcp-production-us` with its respective region. Yielding a `/deployments` folder for the application with the following structure:
 
 ```txt
-- public
-- gcp-production-us
-   - application.html
-   - upload-index.sh
-- gcp-production-au
-   - application.html
-   - upload-index.sh
-- upload-assets-merchant-center-north-america.sh
-- upload-assets-merchant-center-asia.sh
+- gs
+  - gcp-production-us
+     - application.html
+     - upload-index.sh
+  - upload-assets-merchant-center-north-america.sh
+  - upload-assets-merchant-center-asia.sh
 ```
 
-1. The `upload-index.sh` and `upload-assets-<bucket>.sh` scripts are generated pre-configured bash scripts for uploading the `application.html` and static assets to the respective storage bucket using `gcloud storage`.
-2. The `public` folder contains shared static assets for all environments.
-3. The `application.html` references the static assets from its respective environment's bucket
+1. The `gs` folder signals that these files will be uploaded to Google Storage which is the default storage provider
+2. The `upload-index.sh` and `upload-assets-<bucket>.sh` scripts are generated pre-configured bash scripts for uploading the `application.html` and static assets to the respective storage bucket using `gcloud storage`.
+3. The `public` folder contains shared static assets for all environments.
+4. The `application.html` references the static assets from its respective environment's bucket
 
 Depending on the environment you are deploying to, you need to:
 
@@ -60,25 +60,30 @@ Depending on the environment you are deploying to, you need to:
 
 Additionally, when specifying the `--dotenv-folder` option, you can specify a dotenv file for each environment (for example `.env.gcp-production-eu`) and a single `.env.production` dotenv file. These files are then loaded when compiling the application for the respective environment.
 
-The configuration also supports an expanded version in which each cloud environment can be linked to another bucket environment:
+The configuration also using a `defineBucketConfig` helper function to opt into defaults for bucket region and their environments:
 
 ```js
-/**
- * @type {import('@commercetools-frontend/application-cli').TStorageBucketsConfig}
- */
-module.exports = {
-  'merchant-center-europe': [
-    {
-      cloudEnvironment: 'ctp_production_aws_eu-central-1_v1',
-      bucketEnvironment: 'ctp-aws-production-fra',
-    },
-  ],
-};
+const {
+  defineStorageBucketsConfig,
+} = require('@commercetools-frontend/application-cli');
+
+module.exports = defineStorageBucketsConfig();
 ```
 
-Given the configuration above the cloud environment `ctp_production_aws_eu-central-1_v1` will be uploaded to the `merchant-center-europe` bucket region within the `ctp-aws-production-fra` folder as the bucket environment.
+Given the configuration above upload scripts and `application.html` files would be generated for all default bucket regions and cloud environments. These can then be picked up by the CircleCI Orb for upload.
+
+If you need to disable certain bucket regions or cloud environments, you can use the `options` parameter of `defineBucketConfig`:
+
+You can disable existing bucket regions or environments:
 
-This is useful as cloud and bucket environments do not fall in the same lifecycle. A Kubernetes cluster is versioned and may have to change (e.g. be updated) without that needing to be reflected in the respective bucket environment. Also two cloud environments (e.g. in different versions) can be served from one bucket environment if needed.
+```js
+module.exports =  defineStorageBucketsConfig({
+  options: {
+    disabledBucketRegions: ['merchant-center-north-america']
+    disabledEnvironments: ['vw_production_aws_eu-central-1_v1']
+  },
+});
+```
 
 ### Command: `compile-menu`
 

package/cli/dist/commercetools-frontend-application-cli-cli.cjs.dev.js

@@ -17,12 +17,13 @@ var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instan
 var _Object$entries = require('@babel/runtime-corejs3/core-js-stable/object/entries');
 var _Set = require('@babel/runtime-corejs3/core-js-stable/set');
 var _flatInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/flat');
-var fs = require('fs');
-var path = require('path');
+var fs = require('node:fs');
+var path$1 = require('node:path');
 var listr2 = require('listr2');
 var execa = require('execa');
 var cosmiconfig = require('cosmiconfig');
 var findRoot = require('@manypkg/find-root');
+var path = require('path');
 var _possibleConstructorReturn = require('@babel/runtime-corejs3/helpers/possibleConstructorReturn');
 var _get = require('@babel/runtime-corejs3/helpers/get');
 var _getPrototypeOf = require('@babel/runtime-corejs3/helpers/getPrototypeOf');
@@ -30,13 +31,16 @@ var _inherits = require('@babel/runtime-corejs3/helpers/inherits');
 var _classCallCheck = require('@babel/runtime-corejs3/helpers/classCallCheck');
 var _createClass = require('@babel/runtime-corejs3/helpers/createClass');
 var _Reflect$construct = require('@babel/runtime-corejs3/core-js-stable/reflect/construct');
+var fs$1 = require('fs');
 var dotenv = require('dotenv');
 var _findInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/find');
 var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/stringify');
 var applicationConfig = require('@commercetools-frontend/application-config');
 var l10n = require('@commercetools-frontend/l10n');
+var storageBucketsConfig = require('../../dist/storage-buckets-config-478b8585.cjs.dev.js');
 var _sliceInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/slice');
 var jsonschema = require('jsonschema');
+require('ts-deepmerge');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -53,9 +57,11 @@ var _Object$entries__default = /*#__PURE__*/_interopDefault(_Object$entries);
 var _Set__default = /*#__PURE__*/_interopDefault(_Set);
 var _flatInstanceProperty__default = /*#__PURE__*/_interopDefault(_flatInstanceProperty);
 var fs__default = /*#__PURE__*/_interopDefault(fs);
-var path__default = /*#__PURE__*/_interopDefault(path);
+var path__default$1 = /*#__PURE__*/_interopDefault(path$1);
 var execa__default = /*#__PURE__*/_interopDefault(execa);
+var path__default = /*#__PURE__*/_interopDefault(path);
 var _Reflect$construct__default = /*#__PURE__*/_interopDefault(_Reflect$construct);
+var fs__default$1 = /*#__PURE__*/_interopDefault(fs$1);
 var dotenv__default = /*#__PURE__*/_interopDefault(dotenv);
 var _findInstanceProperty__default = /*#__PURE__*/_interopDefault(_findInstanceProperty);
 var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
@@ -341,7 +347,7 @@ function loadDotenvFiles(_ref) {
   }
 
   // Check if the given path exists.
-  if (!fs__default["default"].existsSync(dotenvPath)) {
+  if (!fs__default$1["default"].existsSync(dotenvPath)) {
     throw new Error(`The dotenv folder path does not exist: "${dotenvPath}".`);
   }
 
@@ -369,14 +375,14 @@ function loadDotenvFiles(_ref) {
 
 function ownKeys$2(e, r) { var t = _Object$keys__default["default"](e); if (_Object$getOwnPropertySymbols__default["default"]) { var o = _Object$getOwnPropertySymbols__default["default"](e); r && (o = _filterInstanceProperty__default["default"](o).call(o, function (r) { return _Object$getOwnPropertyDescriptor__default["default"](e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var _context4, _context5; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context4 = ownKeys$2(Object(t), !0)).call(_context4, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context5 = ownKeys$2(Object(t))).call(_context5, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
-const buckedConfigExplorer = cosmiconfig.cosmiconfig('storage-buckets', {
+const storageBucketConfigExplorer = cosmiconfig.cosmiconfig('storage-buckets', {
   searchStrategy: 'project'
 });
 function writeUploadScriptFile(_ref) {
   let fileName = _ref.fileName,
     fileContent = _ref.fileContent,
     filePath = _ref.filePath;
-  fs__default["default"].writeFileSync(path__default["default"].join(filePath, fileName), fileContent, {
+  fs__default["default"].writeFileSync(path__default$1["default"].join(filePath, fileName), fileContent, {
     // Make the script executable
     mode: 0o755,
     encoding: 'utf8'
@@ -398,12 +404,12 @@ async function compileApplicationAssets(_ref2) {
     assetsPath: paths.assetsPath,
     skipMenu: cliFlags.skipMenu
   });
-  const parsedApplicationAssetsUploadScriptFile = path__default["default"].parse(cliFlags.applicationAssetsUploadScriptOutFile);
+  const parsedApplicationAssetsUploadScriptFile = path__default$1["default"].parse(cliFlags.applicationAssetsUploadScriptOutFile);
   const applicationAssetsUploadScriptFileName = `${parsedApplicationAssetsUploadScriptFile.name}-${bucketRegion}${parsedApplicationAssetsUploadScriptFile.ext}`;
   writeUploadScriptFile({
     fileName: applicationAssetsUploadScriptFileName,
     fileContent: applicationAssetsUploadScriptContent,
-    filePath: path__default["default"].join(paths.deploymentsPath, storageProvider.getTag())
+    filePath: path__default$1["default"].join(paths.deploymentsPath, storageProvider.getTag())
   });
 }
 async function compileEnvironmentApplicationIndexes(_ref3) {
@@ -414,7 +420,7 @@ async function compileEnvironmentApplicationIndexes(_ref3) {
     bucketRegion = _ref3.bucketRegion,
     cloudEnvironment = _ref3.cloudEnvironment,
     bucketEnvironment = _ref3.bucketEnvironment;
-  const cloudEnvironmentDeploymentPath = path__default["default"].join(paths.deploymentsPath, storageProvider.getTag(), cloudEnvironment);
+  const cloudEnvironmentDeploymentPath = path__default$1["default"].join(paths.deploymentsPath, storageProvider.getTag(), cloudEnvironment);
   // Ensure the folder exists
   const createDeploymentsFolderResult = await execa__default["default"]('mkdir', ['-p', cloudEnvironmentDeploymentPath], {
     encoding: 'utf8'
@@ -489,7 +495,7 @@ async function compileEnvironmentApplicationIndexes(_ref3) {
   });
 
   // Move the compiled `index.html` to the deployments folder of the related cloud environment.
-  const moveResult = await execa__default["default"]('mv', [path__default["default"].join(paths.publicAssetsPath, 'index.html'), path__default["default"].join(cloudEnvironmentDeploymentPath, cliFlags.applicationIndexOutFile)]);
+  const moveResult = await execa__default["default"]('mv', [path__default$1["default"].join(paths.publicAssetsPath, 'index.html'), path__default$1["default"].join(cloudEnvironmentDeploymentPath, cliFlags.applicationIndexOutFile)]);
   if (moveResult.failed) {
     throw new Error(moveResult.stderr);
   }
@@ -499,9 +505,9 @@ async function command$3(cliFlags, cwd) {
   let cloudEnvironmentsGroupedByBucketRegions;
   try {
     // This is the list of the supported cloud environments and their related bucket location.
-    cloudEnvironmentsGroupedByBucketRegions = await buckedConfigExplorer.search();
+    cloudEnvironmentsGroupedByBucketRegions = await storageBucketConfigExplorer.search();
   } catch (e) {
-    throw new Error('Failed loading a storage bucket configuration. Create a cosmiconfig for `storage-buckets` for example `storage-buckets.config.cjs`.');
+    throw new Error('Failed to load a storage bucket configuration. Create a cosmiconfig for `storage-buckets` for example `storage-buckets.config.cjs`.');
   }
   if (!cloudEnvironmentsGroupedByBucketRegions) {
     throw new Error('Failed loading a storage bucket configuration');
@@ -517,7 +523,7 @@ async function command$3(cliFlags, cwd) {
   const paths = {
     publicAssetsPath: resolveInApplication('public', cwd),
     deploymentsPath: resolveInApplication('deployments', cwd),
-    dotenvPath: cliFlags.dotenvFolder && path__default["default"].join(monorepoRoot.rootDir, cliFlags.dotenvFolder),
+    dotenvPath: cliFlags.dotenvFolder && path__default$1["default"].join(monorepoRoot.rootDir, cliFlags.dotenvFolder),
     assetsPath
   };
   const defaultStorageProviders = ['gs'];
@@ -541,7 +547,7 @@ async function command$3(cliFlags, cwd) {
               cliFlags,
               storageProvider,
               uploadScriptsGenerator,
-              bucketRegion,
+              bucketRegion: bucketRegion,
               paths
             })
           };
@@ -565,7 +571,7 @@ async function command$3(cliFlags, cwd) {
                       storageProvider,
                       uploadScriptsGenerator,
                       paths,
-                      bucketRegion,
+                      bucketRegion: bucketRegion,
                       cloudEnvironment,
                       bucketEnvironment
                     });
@@ -664,28 +670,17 @@ const mapApplicationMenuConfigToGraqhQLMenuJson = config => {
     shouldRenderDivider: menuLinks.shouldRenderDivider ?? false
   };
 };
-
-// During the migration to the Naming Convention Record for Cloud Environments
-// we need to gracefully use the non-compliant and compliant environment names
-// for staging to avoid a breaking release of the CLI.
-const doesCloudEnvironmentExist = _ref => {
-  let dotenvPath = _ref.dotenvPath,
-    cloudEnvironment = _ref.cloudEnvironment;
-  return fs__default["default"].existsSync(path__default["default"].join(dotenvPath ?? '', cloudEnvironment));
-};
 async function command$2(cliFlags, cwd) {
   const applicationDirectory = getApplicationDirectory(cwd);
   const monorepoRoot = findRoot.findRootSync(cwd);
   const dotenvPath = cliFlags.dotenvFolder && path__default["default"].join(monorepoRoot.rootDir, cliFlags.dotenvFolder);
+
+  // The env itself is not important for the menu. However, the application config
+  // uses environment placeholders and therefore we need to provide the variables for it.
+  const cloudEnvironment = storageBucketsConfig.clusterContexts['ctp_staging_gcp_europe-west1_v1'];
   const processEnv = _objectSpread$1(_objectSpread$1({}, loadDotenvFiles({
     dotenvPath,
-    // The env itself is not important for the menu. However, the application config
-    // uses environment placeholders and therefore we need to provide the variables for it.
-    // TODO: Remove after all repositories migrated to NCR.
-    cloudEnvironment: doesCloudEnvironmentExist({
-      dotenvPath,
-      cloudEnvironment: '.env.ctp_staging_gcp_europe-west1_v1'
-    }) ? 'ctp_staging_gcp_europe-west1_v1' : 'ctp-gcp-staging'
+    cloudEnvironment
   })), {}, {
     // Again, make sure that the environment is "development", otherwise
     // the menu config won't be available.
@@ -701,7 +696,7 @@ async function command$2(cliFlags, cwd) {
   });
   const applicationMenu = mapApplicationMenuConfigToGraqhQLMenuJson(applicationRuntimeConfig);
   const formattedJson = _JSON$stringify__default["default"](applicationMenu, null, 2);
-  fs__default["default"].writeFileSync(path__default["default"].join(applicationDirectory, 'menu.json'), formattedJson, {
+  fs__default$1["default"].writeFileSync(path__default["default"].join(applicationDirectory, 'menu.json'), formattedJson, {
     encoding: 'utf8'
   });
 }
@@ -734,7 +729,7 @@ async function command$1(cliFlags) {
   // Logging to stdout which is from where it will be picked
   // up by the caller (a bash script).
   if (cliFlags.outFile) {
-    fs__default["default"].writeFileSync(cliFlags.outFile, formattedJson, {
+    fs__default$1["default"].writeFileSync(cliFlags.outFile, formattedJson, {
       encoding: 'utf8'
     });
   } else {
@@ -855,14 +850,14 @@ async function command(cliFlags) {
   const menuJsonPath = cliFlags.inputFile;
   const isAppbarMenu = cliFlags.navigation === 'top';
   if (!menuJsonPath) throw new Error(`--input-file cannot be empty. please provide the path of compiled menu.json`);
-  if (!fs__default["default"].existsSync(menuJsonPath)) throw new Error(`The menu.json file doesn't exist: ${menuJsonPath}`);
-  const menuJson = fs__default["default"].readFileSync(menuJsonPath, 'utf-8');
+  if (!fs__default$1["default"].existsSync(menuJsonPath)) throw new Error(`The menu.json file doesn't exist: ${menuJsonPath}`);
+  const menuJson = fs__default$1["default"].readFileSync(menuJsonPath, 'utf-8');
   return validateMenu(JSON.parse(menuJson), isAppbarMenu ? appbarMenuSchema : navbarMenuSchema);
 }
 
 var pkgJson = {
 	name: "@commercetools-frontend/application-cli",
-	version: "2.0.0",
+	version: "2.1.1",
 	description: "Internal CLI to manage Merchant Center application deployments across various environments.",
 	keywords: [
 		"commercetools",
@@ -885,11 +880,11 @@ var pkgJson = {
 	},
 	dependencies: {
 		"@babel/core": "^7.22.11",
-		"@babel/runtime": "^7.21.0",
 		"@babel/runtime-corejs3": "^7.21.0",
-		"@commercetools-frontend/application-config": "22.16.0",
-		"@commercetools-frontend/constants": "22.16.0",
-		"@commercetools-frontend/l10n": "22.16.0",
+		"@babel/runtime": "^7.21.0",
+		"@commercetools-frontend/application-config": "22.17.0",
+		"@commercetools-frontend/constants": "22.17.0",
+		"@commercetools-frontend/l10n": "22.17.0",
 		"@manypkg/find-root": "2.2.1",
 		cac: "^6.7.14",
 		cosmiconfig: "9.0.0",
@@ -897,7 +892,8 @@ var pkgJson = {
 		execa: "5.1.1",
 		jsonschema: "^1.4.1",
 		listr2: "8.0.1",
-		"node-fetch": "2.7.0"
+		"node-fetch": "2.7.0",
+		"ts-deepmerge": "7.0.0"
 	},
 	devDependencies: {
 		"@tsconfig/node20": "20.1.2",

package/cli/dist/commercetools-frontend-application-cli-cli.cjs.prod.js

@@ -17,12 +17,13 @@ var _mapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instan
 var _Object$entries = require('@babel/runtime-corejs3/core-js-stable/object/entries');
 var _Set = require('@babel/runtime-corejs3/core-js-stable/set');
 var _flatInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/flat');
-var fs = require('fs');
-var path = require('path');
+var fs = require('node:fs');
+var path$1 = require('node:path');
 var listr2 = require('listr2');
 var execa = require('execa');
 var cosmiconfig = require('cosmiconfig');
 var findRoot = require('@manypkg/find-root');
+var path = require('path');
 var _possibleConstructorReturn = require('@babel/runtime-corejs3/helpers/possibleConstructorReturn');
 var _get = require('@babel/runtime-corejs3/helpers/get');
 var _getPrototypeOf = require('@babel/runtime-corejs3/helpers/getPrototypeOf');
@@ -30,13 +31,16 @@ var _inherits = require('@babel/runtime-corejs3/helpers/inherits');
 var _classCallCheck = require('@babel/runtime-corejs3/helpers/classCallCheck');
 var _createClass = require('@babel/runtime-corejs3/helpers/createClass');
 var _Reflect$construct = require('@babel/runtime-corejs3/core-js-stable/reflect/construct');
+var fs$1 = require('fs');
 var dotenv = require('dotenv');
 var _findInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/find');
 var _JSON$stringify = require('@babel/runtime-corejs3/core-js-stable/json/stringify');
 var applicationConfig = require('@commercetools-frontend/application-config');
 var l10n = require('@commercetools-frontend/l10n');
+var storageBucketsConfig = require('../../dist/storage-buckets-config-0b3808a3.cjs.prod.js');
 var _sliceInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/slice');
 var jsonschema = require('jsonschema');
+require('ts-deepmerge');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -53,9 +57,11 @@ var _Object$entries__default = /*#__PURE__*/_interopDefault(_Object$entries);
 var _Set__default = /*#__PURE__*/_interopDefault(_Set);
 var _flatInstanceProperty__default = /*#__PURE__*/_interopDefault(_flatInstanceProperty);
 var fs__default = /*#__PURE__*/_interopDefault(fs);
-var path__default = /*#__PURE__*/_interopDefault(path);
+var path__default$1 = /*#__PURE__*/_interopDefault(path$1);
 var execa__default = /*#__PURE__*/_interopDefault(execa);
+var path__default = /*#__PURE__*/_interopDefault(path);
 var _Reflect$construct__default = /*#__PURE__*/_interopDefault(_Reflect$construct);
+var fs__default$1 = /*#__PURE__*/_interopDefault(fs$1);
 var dotenv__default = /*#__PURE__*/_interopDefault(dotenv);
 var _findInstanceProperty__default = /*#__PURE__*/_interopDefault(_findInstanceProperty);
 var _JSON$stringify__default = /*#__PURE__*/_interopDefault(_JSON$stringify);
@@ -341,7 +347,7 @@ function loadDotenvFiles(_ref) {
   }
 
   // Check if the given path exists.
-  if (!fs__default["default"].existsSync(dotenvPath)) {
+  if (!fs__default$1["default"].existsSync(dotenvPath)) {
     throw new Error(`The dotenv folder path does not exist: "${dotenvPath}".`);
   }
 
@@ -369,14 +375,14 @@ function loadDotenvFiles(_ref) {
 
 function ownKeys$2(e, r) { var t = _Object$keys__default["default"](e); if (_Object$getOwnPropertySymbols__default["default"]) { var o = _Object$getOwnPropertySymbols__default["default"](e); r && (o = _filterInstanceProperty__default["default"](o).call(o, function (r) { return _Object$getOwnPropertyDescriptor__default["default"](e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$2(e) { for (var r = 1; r < arguments.length; r++) { var _context4, _context5; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty__default["default"](_context4 = ownKeys$2(Object(t), !0)).call(_context4, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors__default["default"] ? _Object$defineProperties__default["default"](e, _Object$getOwnPropertyDescriptors__default["default"](t)) : _forEachInstanceProperty__default["default"](_context5 = ownKeys$2(Object(t))).call(_context5, function (r) { _Object$defineProperty__default["default"](e, r, _Object$getOwnPropertyDescriptor__default["default"](t, r)); }); } return e; }
-const buckedConfigExplorer = cosmiconfig.cosmiconfig('storage-buckets', {
+const storageBucketConfigExplorer = cosmiconfig.cosmiconfig('storage-buckets', {
   searchStrategy: 'project'
 });
 function writeUploadScriptFile(_ref) {
   let fileName = _ref.fileName,
     fileContent = _ref.fileContent,
     filePath = _ref.filePath;
-  fs__default["default"].writeFileSync(path__default["default"].join(filePath, fileName), fileContent, {
+  fs__default["default"].writeFileSync(path__default$1["default"].join(filePath, fileName), fileContent, {
     // Make the script executable
     mode: 0o755,
     encoding: 'utf8'
@@ -398,12 +404,12 @@ async function compileApplicationAssets(_ref2) {
     assetsPath: paths.assetsPath,
     skipMenu: cliFlags.skipMenu
   });
-  const parsedApplicationAssetsUploadScriptFile = path__default["default"].parse(cliFlags.applicationAssetsUploadScriptOutFile);
+  const parsedApplicationAssetsUploadScriptFile = path__default$1["default"].parse(cliFlags.applicationAssetsUploadScriptOutFile);
   const applicationAssetsUploadScriptFileName = `${parsedApplicationAssetsUploadScriptFile.name}-${bucketRegion}${parsedApplicationAssetsUploadScriptFile.ext}`;
   writeUploadScriptFile({
     fileName: applicationAssetsUploadScriptFileName,
     fileContent: applicationAssetsUploadScriptContent,
-    filePath: path__default["default"].join(paths.deploymentsPath, storageProvider.getTag())
+    filePath: path__default$1["default"].join(paths.deploymentsPath, storageProvider.getTag())
   });
 }
 async function compileEnvironmentApplicationIndexes(_ref3) {
@@ -414,7 +420,7 @@ async function compileEnvironmentApplicationIndexes(_ref3) {
     bucketRegion = _ref3.bucketRegion,
     cloudEnvironment = _ref3.cloudEnvironment,
     bucketEnvironment = _ref3.bucketEnvironment;
-  const cloudEnvironmentDeploymentPath = path__default["default"].join(paths.deploymentsPath, storageProvider.getTag(), cloudEnvironment);
+  const cloudEnvironmentDeploymentPath = path__default$1["default"].join(paths.deploymentsPath, storageProvider.getTag(), cloudEnvironment);
   // Ensure the folder exists
   const createDeploymentsFolderResult = await execa__default["default"]('mkdir', ['-p', cloudEnvironmentDeploymentPath], {
     encoding: 'utf8'
@@ -489,7 +495,7 @@ async function compileEnvironmentApplicationIndexes(_ref3) {
   });
 
   // Move the compiled `index.html` to the deployments folder of the related cloud environment.
-  const moveResult = await execa__default["default"]('mv', [path__default["default"].join(paths.publicAssetsPath, 'index.html'), path__default["default"].join(cloudEnvironmentDeploymentPath, cliFlags.applicationIndexOutFile)]);
+  const moveResult = await execa__default["default"]('mv', [path__default$1["default"].join(paths.publicAssetsPath, 'index.html'), path__default$1["default"].join(cloudEnvironmentDeploymentPath, cliFlags.applicationIndexOutFile)]);
   if (moveResult.failed) {
     throw new Error(moveResult.stderr);
   }
@@ -499,9 +505,9 @@ async function command$3(cliFlags, cwd) {
   let cloudEnvironmentsGroupedByBucketRegions;
   try {
     // This is the list of the supported cloud environments and their related bucket location.
-    cloudEnvironmentsGroupedByBucketRegions = await buckedConfigExplorer.search();
+    cloudEnvironmentsGroupedByBucketRegions = await storageBucketConfigExplorer.search();
   } catch (e) {
-    throw new Error('Failed loading a storage bucket configuration. Create a cosmiconfig for `storage-buckets` for example `storage-buckets.config.cjs`.');
+    throw new Error('Failed to load a storage bucket configuration. Create a cosmiconfig for `storage-buckets` for example `storage-buckets.config.cjs`.');
   }
   if (!cloudEnvironmentsGroupedByBucketRegions) {
     throw new Error('Failed loading a storage bucket configuration');
@@ -517,7 +523,7 @@ async function command$3(cliFlags, cwd) {
   const paths = {
     publicAssetsPath: resolveInApplication('public', cwd),
     deploymentsPath: resolveInApplication('deployments', cwd),
-    dotenvPath: cliFlags.dotenvFolder && path__default["default"].join(monorepoRoot.rootDir, cliFlags.dotenvFolder),
+    dotenvPath: cliFlags.dotenvFolder && path__default$1["default"].join(monorepoRoot.rootDir, cliFlags.dotenvFolder),
     assetsPath
   };
   const defaultStorageProviders = ['gs'];
@@ -541,7 +547,7 @@ async function command$3(cliFlags, cwd) {
               cliFlags,
               storageProvider,
               uploadScriptsGenerator,
-              bucketRegion,
+              bucketRegion: bucketRegion,
               paths
             })
           };
@@ -565,7 +571,7 @@ async function command$3(cliFlags, cwd) {
                       storageProvider,
                       uploadScriptsGenerator,
                       paths,
-                      bucketRegion,
+                      bucketRegion: bucketRegion,
                       cloudEnvironment,
                       bucketEnvironment
                     });
@@ -664,28 +670,17 @@ const mapApplicationMenuConfigToGraqhQLMenuJson = config => {
     shouldRenderDivider: menuLinks.shouldRenderDivider ?? false
   };
 };
-
-// During the migration to the Naming Convention Record for Cloud Environments
-// we need to gracefully use the non-compliant and compliant environment names
-// for staging to avoid a breaking release of the CLI.
-const doesCloudEnvironmentExist = _ref => {
-  let dotenvPath = _ref.dotenvPath,
-    cloudEnvironment = _ref.cloudEnvironment;
-  return fs__default["default"].existsSync(path__default["default"].join(dotenvPath ?? '', cloudEnvironment));
-};
 async function command$2(cliFlags, cwd) {
   const applicationDirectory = getApplicationDirectory(cwd);
   const monorepoRoot = findRoot.findRootSync(cwd);
   const dotenvPath = cliFlags.dotenvFolder && path__default["default"].join(monorepoRoot.rootDir, cliFlags.dotenvFolder);
+
+  // The env itself is not important for the menu. However, the application config
+  // uses environment placeholders and therefore we need to provide the variables for it.
+  const cloudEnvironment = storageBucketsConfig.clusterContexts['ctp_staging_gcp_europe-west1_v1'];
   const processEnv = _objectSpread$1(_objectSpread$1({}, loadDotenvFiles({
     dotenvPath,
-    // The env itself is not important for the menu. However, the application config
-    // uses environment placeholders and therefore we need to provide the variables for it.
-    // TODO: Remove after all repositories migrated to NCR.
-    cloudEnvironment: doesCloudEnvironmentExist({
-      dotenvPath,
-      cloudEnvironment: '.env.ctp_staging_gcp_europe-west1_v1'
-    }) ? 'ctp_staging_gcp_europe-west1_v1' : 'ctp-gcp-staging'
+    cloudEnvironment
   })), {}, {
     // Again, make sure that the environment is "development", otherwise
     // the menu config won't be available.
@@ -701,7 +696,7 @@ async function command$2(cliFlags, cwd) {
   });
   const applicationMenu = mapApplicationMenuConfigToGraqhQLMenuJson(applicationRuntimeConfig);
   const formattedJson = _JSON$stringify__default["default"](applicationMenu, null, 2);
-  fs__default["default"].writeFileSync(path__default["default"].join(applicationDirectory, 'menu.json'), formattedJson, {
+  fs__default$1["default"].writeFileSync(path__default["default"].join(applicationDirectory, 'menu.json'), formattedJson, {
     encoding: 'utf8'
   });
 }
@@ -734,7 +729,7 @@ async function command$1(cliFlags) {
   // Logging to stdout which is from where it will be picked
   // up by the caller (a bash script).
   if (cliFlags.outFile) {
-    fs__default["default"].writeFileSync(cliFlags.outFile, formattedJson, {
+    fs__default$1["default"].writeFileSync(cliFlags.outFile, formattedJson, {
       encoding: 'utf8'
     });
   } else {
@@ -855,14 +850,14 @@ async function command(cliFlags) {
   const menuJsonPath = cliFlags.inputFile;
   const isAppbarMenu = cliFlags.navigation === 'top';
   if (!menuJsonPath) throw new Error(`--input-file cannot be empty. please provide the path of compiled menu.json`);
-  if (!fs__default["default"].existsSync(menuJsonPath)) throw new Error(`The menu.json file doesn't exist: ${menuJsonPath}`);
-  const menuJson = fs__default["default"].readFileSync(menuJsonPath, 'utf-8');
+  if (!fs__default$1["default"].existsSync(menuJsonPath)) throw new Error(`The menu.json file doesn't exist: ${menuJsonPath}`);
+  const menuJson = fs__default$1["default"].readFileSync(menuJsonPath, 'utf-8');
   return validateMenu(JSON.parse(menuJson), isAppbarMenu ? appbarMenuSchema : navbarMenuSchema);
 }
 
 var pkgJson = {
 	name: "@commercetools-frontend/application-cli",
-	version: "2.0.0",
+	version: "2.1.1",
 	description: "Internal CLI to manage Merchant Center application deployments across various environments.",
 	keywords: [
 		"commercetools",
@@ -885,11 +880,11 @@ var pkgJson = {
 	},
 	dependencies: {
 		"@babel/core": "^7.22.11",
-		"@babel/runtime": "^7.21.0",
 		"@babel/runtime-corejs3": "^7.21.0",
-		"@commercetools-frontend/application-config": "22.16.0",
-		"@commercetools-frontend/constants": "22.16.0",
-		"@commercetools-frontend/l10n": "22.16.0",
+		"@babel/runtime": "^7.21.0",
+		"@commercetools-frontend/application-config": "22.17.0",
+		"@commercetools-frontend/constants": "22.17.0",
+		"@commercetools-frontend/l10n": "22.17.0",
 		"@manypkg/find-root": "2.2.1",
 		cac: "^6.7.14",
 		cosmiconfig: "9.0.0",
@@ -897,7 +892,8 @@ var pkgJson = {
 		execa: "5.1.1",
 		jsonschema: "^1.4.1",
 		listr2: "8.0.1",
-		"node-fetch": "2.7.0"
+		"node-fetch": "2.7.0",
+		"ts-deepmerge": "7.0.0"
 	},
 	devDependencies: {
 		"@tsconfig/node20": "20.1.2",