@commercetools-frontend/application-cli 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commercetools-frontend/application-cli",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Internal CLI to manage Merchant Center application deployments across various environments.",
   "keywords": [
     "commercetools",
@@ -20,18 +20,18 @@
     "README.md"
   ],
   "dependencies": {
-    "@commercetools-frontend/application-config": "21.0.0",
+    "@commercetools-frontend/application-config": "21.20.4",
     "@manypkg/find-root": "1.1.0",
     "@manypkg/get-packages": "1.1.3",
-    "cosmiconfig": "7.0.1",
-    "dotenv": "10.0.0",
-    "execa": "5.1.1",
+    "cosmiconfig": "8.0.0",
+    "dotenv": "16.0.3",
+    "execa": "6.1.0",
     "listr": "0.14.3",
     "listr-verbose-renderer": "0.6.0",
     "lodash.lowerfirst": "4.3.1",
     "mri": "1.2.0",
     "node-fetch": "2.6.7",
-    "prettier": "2.5.1",
+    "prettier": "2.8.0",
     "prompts": "2.4.2",
     "rcfile": "1.0.3"
   },

package/src/commands/compile-deployments.js

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import Listr from 'listr';
-import execa from 'execa';
+import { execa } from 'execa';
 import { cosmiconfig } from 'cosmiconfig';
 import { findRootSync } from '@manypkg/find-root';
 import ListrVerboseRenderer from 'listr-verbose-renderer';
@@ -124,32 +124,42 @@ async function compileEnvironmentApplicationIndexes({
     applicationName: cliFlags['application-name'],
   });
 
+  const environmentVariablesForCompilation = {
+    ...loadDotenvFiles({
+      dotenvPath: paths.dotenvPath,
+      cloudEnvironment,
+    }),
+    // The trailing slash is important to indicate to the CSP directive that all the resources
+    // under that path should be allowed.
+    MC_CDN_URL: `${cdnUrl}/`,
+    ...(cliFlags['mc-url']
+      ? {
+          MC_URL: cliFlags['mc-url'],
+        }
+      : {}),
+    ...(cliFlags['mc-api-url']
+      ? {
+          MC_API_URL: cliFlags['mc-api-url'],
+        }
+      : {}),
+    // Will be used by the Application Kit for Sentry and exposed on `window.app.revision`.
+    REVISION: cliFlags['build-revision'],
+  };
+
+  /// Sentry and GTM is disabled on branch deployments
+  if (cliFlags['pr-number']) {
+    process.env.TRACKING_SENTRY = null;
+    process.env.TRACKING_GTM = null;
+    environmentVariablesForCompilation.TRACKING_SENTRY = null;
+    environmentVariablesForCompilation.TRACKING_GTM = null;
+  }
+
   // Compile the application using the loaded environment values
   const compileResult = await execa('mc-scripts', ['compile-html'], {
     encoding: 'utf8',
     preferLocal: true,
     extendEnv: true,
-    env: {
-      ...loadDotenvFiles({
-        dotenvPath: paths.dotenvPath,
-        cloudEnvironment,
-      }),
-      // The trailing slash is important to indicate to the CSP directive that all the resources
-      // under that path should be allowed.
-      MC_CDN_URL: `${cdnUrl}/`,
-      ...(cliFlags['mc-url']
-        ? {
-            MC_URL: cliFlags['mc-url'],
-          }
-        : {}),
-      ...(cliFlags['mc-api-url']
-        ? {
-            MC_API_URL: cliFlags['mc-api-url'],
-          }
-        : {}),
-      // Will be used by the Application Kit for Sentry and exposed on `window.app.revision`.
-      REVISION: cliFlags['build-revision'],
-    },
+    env: environmentVariablesForCompilation,
   });
 
   if (compileResult.failed) {

package/src/commands/compile-menu.js

@@ -66,18 +66,8 @@ const mapApplicationMenuConfigToGraqhQLMenuJson = (config) => {
     actionRights: menuLinks.actionRights ?? null,
     dataFences: menuLinks.dataFences ?? null,
     submenu: menuLinks.submenuLinks.map((submenuLink) => ({
-      key: `${entryPointUriPath}-${submenuLink.uriPath}`,
-      // The `uriPath` of each submenu link is supposed to be defined relative
-      // to the entry point URI path.
-      // However, when rendering the link, we need to provide the full uri path.
-      // Special case when the value is `/`: it means that the link is supposed to be
-      // treated the same as the entry point uri path. In this case, the return value
-      // should not contain any unnecessary trailing slash and therefore we return the
-      // main value `entryPointUriPath`.
-      uriPath:
-        submenuLink.uriPath === '/'
-          ? entryPointUriPath
-          : `${entryPointUriPath}/${submenuLink.uriPath}`,
+      key: submenuLink.uriPath.replace('/', '-'),
+      uriPath: submenuLink.uriPath,
       labelAllLocales: mapLabelAllLocalesWithDefaults(
         submenuLink.labelAllLocales,
         submenuLink.defaultLabel

package/src/utils/create-application-assets-upload-script.js

@@ -45,16 +45,6 @@ gsutil \\
   cp -z json \\
   ${assetsPath}/menu.json \\
   ${bucketUrl}
-
-if [[ -f "${assetsPath}/public/licenses.csv" ]]; then
-  echo "Uploading licenses.csv to bucket ${bucketUrl}"
-  gsutil \\
-    -h "Content-Type: text/csv" \\
-    -h "Cache-Control: private, max-age=0, no-transform" \\
-    cp -z csv \\
-    ${assetsPath}/public/licenses.csv \\
-    ${bucketUrl}
-fi
 `;
 
   return uploadScriptContent;