@commercetools-frontend/application-cli 2.2.0 → 2.3.1

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

@@ -17,7 +17,7 @@ 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 _flatMapInstanceProperty = require('@babel/runtime-corejs3/core-js-stable/instance/flat-map');
-var storageBucketsConfig = require('../../dist/storage-buckets-config-30d0f671.cjs.dev.js');
+var storageBucketsConfig = require('../../dist/storage-buckets-config-28a1d76e.cjs.dev.js');
 var fs = require('node:fs');
 var path$1 = require('node:path');
 var listr2 = require('listr2');
@@ -99,12 +99,12 @@ function _callSuper(_this, derived, args) {
   derived = _getPrototypeOf(derived);
   return _possibleConstructorReturn(_this, isNativeReflectConstruct() ? _Reflect$construct__default["default"](derived, args || [], _getPrototypeOf(_this).constructor) : derived.apply(_this, args));
 }
-var _bucketRegion = /*#__PURE__*/_classPrivateFieldLooseKey("bucketRegion");
+var _bucketRegion$1 = /*#__PURE__*/_classPrivateFieldLooseKey("bucketRegion");
 var _bucketEnvironment$1 = /*#__PURE__*/_classPrivateFieldLooseKey("bucketEnvironment");
 let StorageProvider = /*#__PURE__*/function () {
   function StorageProvider(config) {
     _classCallCheck(this, StorageProvider);
-    _Object$defineProperty__default["default"](this, _bucketRegion, {
+    _Object$defineProperty__default["default"](this, _bucketRegion$1, {
       writable: true,
       value: void 0
     });
@@ -112,7 +112,7 @@ let StorageProvider = /*#__PURE__*/function () {
       writable: true,
       value: void 0
     });
-    _classPrivateFieldLooseBase(this, _bucketRegion)[_bucketRegion] = config.bucketRegion;
+    _classPrivateFieldLooseBase(this, _bucketRegion$1)[_bucketRegion$1] = config.bucketRegion;
     _classPrivateFieldLooseBase(this, _bucketEnvironment$1)[_bucketEnvironment$1] = config.bucketEnvironment;
   }
   /**
@@ -141,18 +141,26 @@ let StorageProvider = /*#__PURE__*/function () {
       var _context;
       let applicationName = _ref.applicationName,
         bucketProtocol = _ref.bucketProtocol,
-        bucketNamespace = _ref.bucketNamespace;
-      const assetsBucketUrl = _filterInstanceProperty__default["default"](_context = [_classPrivateFieldLooseBase(this, _bucketRegion)[_bucketRegion], bucketNamespace, applicationName]).call(_context, Boolean).join('/');
+        bucketNamespace = _ref.bucketNamespace,
+        tag = _ref.tag;
+      if (!_classPrivateFieldLooseBase(this, _bucketRegion$1)[_bucketRegion$1]) {
+        throw new Error("'bucketRegion' is not defined. Required to determine 'assetsBucketUrl'.");
+      }
+      const storageProvider = storageBucketsConfig.storageProviders[tag];
+      const assetBuketUrl = storageProvider.urls.bucket?.[_classPrivateFieldLooseBase(this, _bucketRegion$1)[_bucketRegion$1]] ?? _classPrivateFieldLooseBase(this, _bucketRegion$1)[_bucketRegion$1];
+      const assetsBucketUrl = _filterInstanceProperty__default["default"](_context = [assetBuketUrl, bucketNamespace, applicationName]).call(_context, Boolean).join('/');
       return `${bucketProtocol}${assetsBucketUrl}`;
     }
   }, {
     key: "getApplicationIndexBucketUrl",
     value: function getApplicationIndexBucketUrl(_ref2) {
-      let prNumber = _ref2.prNumber,
+      let tag = _ref2.tag,
+        prNumber = _ref2.prNumber,
         applicationName = _ref2.applicationName,
         bucketProtocol = _ref2.bucketProtocol,
         bucketNamespace = _ref2.bucketNamespace;
       const applicationAssetsBucketUrl = this.getAssetsBucketUrl({
+        tag,
         applicationName,
         prNumber,
         bucketProtocol,
@@ -167,40 +175,41 @@ let StorageProvider = /*#__PURE__*/function () {
       var _context2;
       let applicationName = _ref3.applicationName,
         prNumber = _ref3.prNumber,
-        publicBaseUrl = _ref3.publicBaseUrl;
-      return _filterInstanceProperty__default["default"](_context2 = [publicBaseUrl, _classPrivateFieldLooseBase(this, _bucketRegion)[_bucketRegion], this.getBucketNamespace(prNumber), applicationName]).call(_context2, Boolean).join('/');
+        publicBaseUrl = _ref3.publicBaseUrl,
+        excludeBucketRegion = _ref3.excludeBucketRegion;
+      return _filterInstanceProperty__default["default"](_context2 = [publicBaseUrl, excludeBucketRegion ? null : _classPrivateFieldLooseBase(this, _bucketRegion$1)[_bucketRegion$1], this.getBucketNamespace(prNumber), applicationName]).call(_context2, Boolean).join('/');
     }
   }, {
     key: "getPublicBaseUrl",
     value: function getPublicBaseUrl(tag) {
       if (!_classPrivateFieldLooseBase(this, _bucketEnvironment$1)[_bucketEnvironment$1]) {
-        throw new Error("'bucketEnvironment is not defined. Required to determine 'publicBaseUrl'.");
+        throw new Error("'bucketEnvironment' is not defined. Required to determine 'publicBaseUrl'.");
       }
       const storageProvider = storageBucketsConfig.storageProviders[tag];
-      const publicBaseUrl = storageProvider.urls[_classPrivateFieldLooseBase(this, _bucketEnvironment$1)[_bucketEnvironment$1]] ?? storageProvider.urls.default;
+      const publicBaseUrl = storageProvider.urls.public[_classPrivateFieldLooseBase(this, _bucketEnvironment$1)[_bucketEnvironment$1]] ?? storageProvider.urls.public.default;
       return publicBaseUrl;
     }
   }]);
   return StorageProvider;
 }();
-var _bucketRegion2 = /*#__PURE__*/_classPrivateFieldLooseKey("bucketRegion");
-var _bucketEnvironment2 = /*#__PURE__*/_classPrivateFieldLooseKey("bucketEnvironment");
+var _bucketRegion2$1 = /*#__PURE__*/_classPrivateFieldLooseKey("bucketRegion");
+var _bucketEnvironment2$1 = /*#__PURE__*/_classPrivateFieldLooseKey("bucketEnvironment");
 let GoogleStorageProvider = /*#__PURE__*/function (_StorageProvider) {
   _inherits(GoogleStorageProvider, _StorageProvider);
   function GoogleStorageProvider(config) {
     var _this;
     _classCallCheck(this, GoogleStorageProvider);
     _this = _callSuper(this, GoogleStorageProvider, [config]);
-    _Object$defineProperty__default["default"](_assertThisInitialized(_this), _bucketRegion2, {
+    _Object$defineProperty__default["default"](_assertThisInitialized(_this), _bucketRegion2$1, {
       writable: true,
       value: void 0
     });
-    _Object$defineProperty__default["default"](_assertThisInitialized(_this), _bucketEnvironment2, {
+    _Object$defineProperty__default["default"](_assertThisInitialized(_this), _bucketEnvironment2$1, {
       writable: true,
       value: void 0
     });
-    _classPrivateFieldLooseBase(_assertThisInitialized(_this), _bucketRegion2)[_bucketRegion2] = config.bucketRegion;
-    _classPrivateFieldLooseBase(_assertThisInitialized(_this), _bucketEnvironment2)[_bucketEnvironment2] = config.bucketEnvironment;
+    _classPrivateFieldLooseBase(_assertThisInitialized(_this), _bucketRegion2$1)[_bucketRegion2$1] = config.bucketRegion;
+    _classPrivateFieldLooseBase(_assertThisInitialized(_this), _bucketEnvironment2$1)[_bucketEnvironment2$1] = config.bucketEnvironment;
     return _this;
   }
   _createClass(GoogleStorageProvider, [{
@@ -211,12 +220,12 @@ let GoogleStorageProvider = /*#__PURE__*/function (_StorageProvider) {
   }, {
     key: "getBucketRegion",
     value: function getBucketRegion() {
-      return _classPrivateFieldLooseBase(this, _bucketRegion2)[_bucketRegion2];
+      return _classPrivateFieldLooseBase(this, _bucketRegion2$1)[_bucketRegion2$1];
     }
   }, {
     key: "getBucketEnvironment",
     value: function getBucketEnvironment() {
-      return _classPrivateFieldLooseBase(this, _bucketEnvironment2)[_bucketEnvironment2];
+      return _classPrivateFieldLooseBase(this, _bucketEnvironment2$1)[_bucketEnvironment2$1];
     }
   }, {
     key: "getProtocol",
@@ -239,6 +248,7 @@ let GoogleStorageProvider = /*#__PURE__*/function (_StorageProvider) {
     key: "getAssetsBucketUrl",
     value: function getAssetsBucketUrl(config) {
       return _get(_getPrototypeOf(GoogleStorageProvider.prototype), "getAssetsBucketUrl", this).call(this, _objectSpread$4({
+        tag: this.getTag(),
         bucketProtocol: this.getProtocol(),
         bucketNamespace: _get(_getPrototypeOf(GoogleStorageProvider.prototype), "getBucketNamespace", this).call(this, config.prNumber)
       }, config));
@@ -247,23 +257,101 @@ let GoogleStorageProvider = /*#__PURE__*/function (_StorageProvider) {
     key: "getApplicationIndexBucketUrl",
     value: function getApplicationIndexBucketUrl(config) {
       return _get(_getPrototypeOf(GoogleStorageProvider.prototype), "getApplicationIndexBucketUrl", this).call(this, _objectSpread$4({
+        tag: this.getTag(),
         bucketProtocol: this.getProtocol(),
         bucketNamespace: _get(_getPrototypeOf(GoogleStorageProvider.prototype), "getBucketNamespace", this).call(this, config.prNumber)
       }, config));
     }
   }]);
   return GoogleStorageProvider;
-}(StorageProvider); // TODO: to be implemented.
+}(StorageProvider);
+var _bucketRegion3 = /*#__PURE__*/_classPrivateFieldLooseKey("bucketRegion");
+var _bucketEnvironment3 = /*#__PURE__*/_classPrivateFieldLooseKey("bucketEnvironment");
+let AwsStorageProvider = /*#__PURE__*/function (_StorageProvider2) {
+  _inherits(AwsStorageProvider, _StorageProvider2);
+  function AwsStorageProvider(config) {
+    var _this2;
+    _classCallCheck(this, AwsStorageProvider);
+    _this2 = _callSuper(this, AwsStorageProvider, [config]);
+    _Object$defineProperty__default["default"](_assertThisInitialized(_this2), _bucketRegion3, {
+      writable: true,
+      value: void 0
+    });
+    _Object$defineProperty__default["default"](_assertThisInitialized(_this2), _bucketEnvironment3, {
+      writable: true,
+      value: void 0
+    });
+    _classPrivateFieldLooseBase(_assertThisInitialized(_this2), _bucketRegion3)[_bucketRegion3] = config.bucketRegion;
+    _classPrivateFieldLooseBase(_assertThisInitialized(_this2), _bucketEnvironment3)[_bucketEnvironment3] = config.bucketEnvironment;
+    return _this2;
+  }
+  _createClass(AwsStorageProvider, [{
+    key: "getTag",
+    value: function getTag() {
+      return 's3';
+    }
+  }, {
+    key: "getBucketRegion",
+    value: function getBucketRegion() {
+      return _classPrivateFieldLooseBase(this, _bucketRegion3)[_bucketRegion3];
+    }
+  }, {
+    key: "getBucketEnvironment",
+    value: function getBucketEnvironment() {
+      return _classPrivateFieldLooseBase(this, _bucketEnvironment3)[_bucketEnvironment3];
+    }
+  }, {
+    key: "getProtocol",
+    value: function getProtocol() {
+      return 's3://';
+    }
+  }, {
+    key: "getPublicBaseUrl",
+    value: function getPublicBaseUrl() {
+      return _get(_getPrototypeOf(AwsStorageProvider.prototype), "getPublicBaseUrl", this).call(this, this.getTag());
+    }
+  }, {
+    key: "getCdnUrl",
+    value: function getCdnUrl(config) {
+      return _get(_getPrototypeOf(AwsStorageProvider.prototype), "getCdnUrl", this).call(this, _objectSpread$4({
+        publicBaseUrl: this.getPublicBaseUrl(),
+        excludeBucketRegion: true
+      }, config));
+    }
+  }, {
+    key: "getAssetsBucketUrl",
+    value: function getAssetsBucketUrl(config) {
+      return _get(_getPrototypeOf(AwsStorageProvider.prototype), "getAssetsBucketUrl", this).call(this, _objectSpread$4({
+        tag: this.getTag(),
+        bucketProtocol: this.getProtocol(),
+        bucketNamespace: _get(_getPrototypeOf(AwsStorageProvider.prototype), "getBucketNamespace", this).call(this, config.prNumber)
+      }, config));
+    }
+  }, {
+    key: "getApplicationIndexBucketUrl",
+    value: function getApplicationIndexBucketUrl(config) {
+      return _get(_getPrototypeOf(AwsStorageProvider.prototype), "getApplicationIndexBucketUrl", this).call(this, _objectSpread$4({
+        tag: this.getTag(),
+        bucketProtocol: this.getProtocol(),
+        bucketNamespace: _get(_getPrototypeOf(AwsStorageProvider.prototype), "getBucketNamespace", this).call(this, config.prNumber)
+      }, config));
+    }
+  }]);
+  return AwsStorageProvider;
+}(StorageProvider);
 function getStorageProvider(storageProvider, config) {
   switch (storageProvider) {
     case 'gs':
       return new GoogleStorageProvider(config);
+    case 's3':
+      return new AwsStorageProvider(config);
     default:
       throw new Error(`Storage provider ${storageProvider} not supported`);
   }
 }
 
 var _bucketEnvironment = /*#__PURE__*/_classPrivateFieldLooseKey("bucketEnvironment");
+var _bucketRegion = /*#__PURE__*/_classPrivateFieldLooseKey("bucketRegion");
 let GoogleStorageUploadScriptsGenerator = /*#__PURE__*/function () {
   function GoogleStorageUploadScriptsGenerator(config) {
     _classCallCheck(this, GoogleStorageUploadScriptsGenerator);
@@ -271,6 +359,11 @@ let GoogleStorageUploadScriptsGenerator = /*#__PURE__*/function () {
       writable: true,
       value: void 0
     });
+    _Object$defineProperty__default["default"](this, _bucketRegion, {
+      writable: true,
+      value: void 0
+    });
+    _classPrivateFieldLooseBase(this, _bucketRegion)[_bucketRegion] = config.bucketRegion;
     _classPrivateFieldLooseBase(this, _bucketEnvironment)[_bucketEnvironment] = config.bucketEnvironment;
   }
   _createClass(GoogleStorageUploadScriptsGenerator, [{
@@ -388,11 +481,129 @@ fi
     }
   }]);
   return GoogleStorageUploadScriptsGenerator;
-}(); // TODO: To be implemented.
+}();
+var _bucketEnvironment2 = /*#__PURE__*/_classPrivateFieldLooseKey("bucketEnvironment");
+var _bucketRegion2 = /*#__PURE__*/_classPrivateFieldLooseKey("bucketRegion");
+let AwsStorageUploadScriptsGenerator = /*#__PURE__*/function () {
+  function AwsStorageUploadScriptsGenerator(config) {
+    _classCallCheck(this, AwsStorageUploadScriptsGenerator);
+    _Object$defineProperty__default["default"](this, _bucketEnvironment2, {
+      writable: true,
+      value: void 0
+    });
+    _Object$defineProperty__default["default"](this, _bucketRegion2, {
+      writable: true,
+      value: void 0
+    });
+    _classPrivateFieldLooseBase(this, _bucketRegion2)[_bucketRegion2] = config.bucketRegion;
+    _classPrivateFieldLooseBase(this, _bucketEnvironment2)[_bucketEnvironment2] = config.bucketEnvironment;
+  }
+  _createClass(AwsStorageUploadScriptsGenerator, [{
+    key: "getApplicationIndexUploadScript",
+    value: function getApplicationIndexUploadScript(_ref3) {
+      let packageManagerName = _ref3.packageManagerName,
+        bucketUrl = _ref3.bucketUrl,
+        cdnUrl = _ref3.cdnUrl,
+        buildRevision = _ref3.buildRevision,
+        buildNumber = _ref3.buildNumber,
+        applicationIndexOutFile = _ref3.applicationIndexOutFile;
+      return `
+    #!/usr/bin/env bash
+
+    echo "Uploading static assets to Amazon S3 bucket ${bucketUrl}"
+
+    set -e
+
+    aws s3 cp "$(dirname "$0")/${applicationIndexOutFile}" \\
+      "${bucketUrl}/" \\
+      --content-type="text/html" \\
+      --cache-control="public,max-age=0,no-transform" \\
+      --profile ${_classPrivateFieldLooseBase(this, _bucketRegion2)[_bucketRegion2]}
+
+    echo "Creating version.json and uploading it to bucket ${bucketUrl}"
+
+    NODE_ENV=production ${packageManagerName} application-cli create-version \\
+      --version-url=${cdnUrl}/${_classPrivateFieldLooseBase(this, _bucketEnvironment2)[_bucketEnvironment2]}/version.json \\
+      --build-revision=${buildRevision} \\
+      --build-number=${buildNumber} \\
+      --out-file=$(dirname "$0")/version.json
+
+    aws s3 cp "$(dirname "$0")" \\
+      "${bucketUrl}/" \\
+      --exclude "*" \\
+      --include "version.json" \\
+      --content-type="application/json" \\
+      --cache-control="public,max-age=0,no-transform" \\
+      --profile ${_classPrivateFieldLooseBase(this, _bucketRegion2)[_bucketRegion2]}
+`;
+    }
+  }, {
+    key: "getProductionBundlesUploadScript",
+    value: function getProductionBundlesUploadScript(_ref4) {
+      let bucketUrl = _ref4.bucketUrl,
+        assetsPath = _ref4.assetsPath,
+        skipMenu = _ref4.skipMenu;
+      return `
+#!/usr/bin/env bash
+
+echo "Uploading static assets to Amazon S3 bucket ${bucketUrl}"
+
+set -e
+
+# NOTE:
+#   The sync command on the AWS CLI is different to the -n option on the gcloud CLI.
+#   Sync will only upload files that are not already in the bucket, but it will skip existing ones
+#   that have been changed locally.
+#   The -n option on the gcloud CLI will skip uploading existing files and prevents them to be overwritten.
+#   https://docs.aws.amazon.com/cli/latest/reference/s3/sync.html
+#   https://cloud.google.com/sdk/gcloud/reference/storage/cp
+#
+#   Compression (gzip) is enabled on CloudFront by default. Hence compression does happing while uploading.
+#   https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/ServingCompressedFiles.html#compressed-content-cloudfront-configuring
+aws s3 sync ${assetsPath}/public \\
+  "${bucketUrl}" \\
+  --exclude "*" \\
+  --include "*.css" \\
+  --include "*.js" \\
+  --include "*.js.map" \\
+  --include "*.html" \\
+  --cache-control="public,max-age=31536000,no-transform" \\
+  --profile ${_classPrivateFieldLooseBase(this, _bucketRegion2)[_bucketRegion2]}
+
+# We need to upload the PNG and HTML files separately because we want them
+# to be able to overwrite the existing files (if any). For instance, the
+# file or the favicons.
+aws s3 cp ${assetsPath}/public \\
+  "${bucketUrl}" \\
+  --recursive \\
+  --exclude "*" \\
+  --include "*.png" \\
+  --include "robots.txt" \\
+  --cache-control="public,max-age=31536000,no-transform" \\
+  --profile ${_classPrivateFieldLooseBase(this, _bucketRegion2)[_bucketRegion2]}
+
+if ${skipMenu}; then
+  echo "Skipping menu.json upload"
+else
+  echo "Uploading menu.json to bucket ${bucketUrl}"
+
+  aws s3 cp ${assetsPath}/menu.json \\
+    "${bucketUrl}/" \\
+    --content-type="application/json" \\
+    --cache-control="public,max-age=0,no-transform" \\
+    --profile ${_classPrivateFieldLooseBase(this, _bucketRegion2)[_bucketRegion2]}
+fi
+`;
+    }
+  }]);
+  return AwsStorageUploadScriptsGenerator;
+}();
 function getUploadScriptsGenerator(storageProvider, config) {
   switch (storageProvider) {
     case 'gs':
       return new GoogleStorageUploadScriptsGenerator(config);
+    case 's3':
+      return new AwsStorageUploadScriptsGenerator(config);
     default:
       throw new Error(`Storage provider ${storageProvider} not supported`);
   }
@@ -580,7 +791,9 @@ async function command$3(cliFlags, cwd) {
         // for all storage providers once per region.
         const allStorageProvidersForBucketRegion = [...new _Set__default["default"](_flatMapInstanceProperty__default["default"](bucketEnvironmentConfigs).call(bucketEnvironmentConfigs, bucketEnvironmentConfig => bucketEnvironmentConfig.storageProviders || defaultStorageProviders))];
         const allApplicationAssetTasks = _mapInstanceProperty__default["default"](allStorageProvidersForBucketRegion).call(allStorageProvidersForBucketRegion, storageProviderTag => {
-          const uploadScriptsGeneratorConfig = {};
+          const uploadScriptsGeneratorConfig = {
+            bucketRegion: bucketRegion
+          };
           const storageProviderConfig = {
             bucketRegion: bucketRegion
           };
@@ -903,7 +1116,7 @@ async function command(cliFlags) {
 
 var pkgJson = {
 	name: "@commercetools-frontend/application-cli",
-	version: "2.2.0",
+	version: "2.3.1",
 	description: "Internal CLI to manage Merchant Center application deployments across various environments.",
 	keywords: [
 		"commercetools",
@@ -926,11 +1139,11 @@ var pkgJson = {
 	},
 	dependencies: {
 		"@babel/core": "^7.22.11",
-		"@babel/runtime-corejs3": "^7.21.0",
 		"@babel/runtime": "^7.21.0",
-		"@commercetools-frontend/application-config": "22.19.0",
-		"@commercetools-frontend/constants": "22.19.0",
-		"@commercetools-frontend/l10n": "22.19.0",
+		"@babel/runtime-corejs3": "^7.21.0",
+		"@commercetools-frontend/application-config": "22.22.0",
+		"@commercetools-frontend/constants": "22.22.0",
+		"@commercetools-frontend/l10n": "22.22.0",
 		"@manypkg/find-root": "2.2.1",
 		cac: "^6.7.14",
 		cosmiconfig: "9.0.0",
@@ -943,7 +1156,7 @@ var pkgJson = {
 	},
 	devDependencies: {
 		"@tsconfig/node20": "20.1.2",
-		"@types/node": "20.11.25",
+		"@types/node": "20.12.2",
 		typescript: "5.2.2"
 	},
 	engines: {