@applicaster/zapplicaster-cli 16.0.0-alpha.8716141508 → 16.0.0-alpha.9024462102

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapplicaster-cli",
-  "version": "16.0.0-alpha.8716141508",
+  "version": "16.0.0-alpha.9024462102",
   "description": "CLI Tool for the zapp app and Quick Brick project",
   "main": "index.js",
   "publishConfig": {
@@ -28,10 +28,10 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/zapp-react-dom-cli-template": "16.0.0-alpha.8716141508",
-    "@applicaster/zapp-react-native-android-tv-cli-template": "16.0.0-alpha.8716141508",
-    "@applicaster/zapp-react-native-cli-template": "16.0.0-alpha.8716141508",
-    "@applicaster/zapp-react-native-tvos-cli-template": "16.0.0-alpha.8716141508",
+    "@applicaster/zapp-react-dom-cli-template": "16.0.0-alpha.9024462102",
+    "@applicaster/zapp-react-native-android-tv-cli-template": "16.0.0-alpha.9024462102",
+    "@applicaster/zapp-react-native-cli-template": "16.0.0-alpha.9024462102",
+    "@applicaster/zapp-react-native-tvos-cli-template": "16.0.0-alpha.9024462102",
     "axios": "^0.28.0",
     "camelize": "^1.0.0",
     "chalk": "^2.3.2",

package/src/commands/prepareWorkspace/__tests__/__snapshots__/configurator.test.js.snap

@@ -8,6 +8,7 @@ exports[`configurator builds the configuration object 1`] = `
     "appVersionId": "APP_VERSION_ID",
     "assets_url": "https://assets-secure.applicaster.com/zapp/accounts/5ae06cef8fba0f00084bd3c6/apps/com.quickbricktest/apple_store/1.8/styles/assets_styles.json",
     "otherParam": "param",
+    "vidaa_client_partner_id": undefined,
   },
   "destinationPath": "development-app",
   "deviceTarget": undefined,
@@ -32,6 +33,7 @@ exports[`configurator sets a null path if none is provided and the cli doesn't r
     "appVersionId": "APP_VERSION_ID",
     "assets_url": "https://assets-secure.applicaster.com/zapp/accounts/5ae06cef8fba0f00084bd3c6/apps/com.quickbricktest/apple_store/1.8/styles/assets_styles.json",
     "otherParam": "param",
+    "vidaa_client_partner_id": undefined,
   },
   "destinationPath": null,
   "deviceTarget": undefined,

package/src/commands/prepareWorkspace/appBootstrapper.js

@@ -193,6 +193,15 @@ async function appBootstrapper(configuration) {
     .map(toDayJSLocaleMap)
     .filter((v) => v !== "en");
 
+  if (
+    configuration.buildParams.device_target === "vidaa" &&
+    !configuration.buildParams.vidaa_client_partner_id
+  ) {
+    logger.warn(
+      "In order to use the VIDAA SDK you will need to set vidaa_client_partner_id"
+    );
+  }
+
   configuration.excludedNodeModules = getExcludedNodeModules(plugins);
   const { filesToRender } = template.files;
 

package/src/commands/prepareWorkspace/configurator.js

@@ -9,6 +9,22 @@ const { getAppVersionParams } = require("../../zapp");
 const { resolveAppTemplate } = require("../../templates");
 const { isZappReactNativeRepo } = require("../../settings");
 
+function resolveVidaaClientPartnerId(buildParams = {}) {
+  const fromBuildParams = buildParams.vidaa_client_partner_id;
+
+  if (typeof fromBuildParams === "string" && fromBuildParams.trim()) {
+    return fromBuildParams.trim();
+  }
+
+  const fromEnv = process.env.vidaa_client_partner_id;
+
+  if (typeof fromEnv === "string" && fromEnv.trim()) {
+    return fromEnv.trim();
+  }
+
+  return undefined;
+}
+
 const store_map = {
   amazon: "amazon",
   google_play: "android",
@@ -78,6 +94,9 @@ async function configurator({ cliArgs, cliOptions }) {
 
   const buildParams = await getAppVersionParams(appVersionId);
 
+  buildParams.vidaa_client_partner_id =
+    resolveVidaaClientPartnerId(buildParams);
+
   delete buildParams.styles_url; // deprecated
 
   const platform = resolvePlatform(buildParams.assets_url);

package/src/commands/reloadConfig/__tests__/__snapshots__/reloadConfig.test.js.snap

@@ -0,0 +1,58 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`reloadConfig runs the reload config task 1`] = `
+[
+  [
+    "reload configuration",
+    "We're reloading the configuration for your app",
+  ],
+]
+`;
+
+exports[`reloadConfig runs the reload config task 2`] = `[]`;
+
+exports[`reloadConfig runs the reload config task 3`] = `[]`;
+
+exports[`reloadConfig runs the reload config task 4`] = `[]`;
+
+exports[`reloadConfig runs the reload config task 5`] = `
+[
+  [
+    "checking prerequisites...",
+  ],
+  [
+    "Gathering configuration",
+  ],
+  [
+    "Creating workspace",
+  ],
+  [
+    "Creating runtime URLs configuration file",
+  ],
+  [
+    "Retrieving configuration files",
+  ],
+]
+`;
+
+exports[`reloadConfig runs the reload config task 6`] = `
+[
+  [
+    "All good - moving on",
+  ],
+  [
+    "configuration retrieved",
+  ],
+  [
+    "Workspace created !",
+  ],
+  [
+    "Runtime configuration URLs file created",
+  ],
+  [
+    "Configuration files retrieved !",
+  ],
+]
+`;
+
+exports[`reloadConfig runs the reload config task 7`] = `[]`;

package/src/commands/reloadConfig/__tests__/reloadConfig.test.js

@@ -0,0 +1,86 @@
+const { reloadConfig } = require("../index");
+
+const appVersionId = "e7a17c6f-4113-41ac-9450-6281d22153a1";
+
+const options = {
+  appVersionId,
+  openSdk: true,
+  config: "some_file",
+};
+
+jest.mock("../../../logger", () => ({
+  welcome: jest.fn(),
+  log: jest.fn(),
+  error: jest.fn(),
+  warn: jest.fn(),
+  startStep: jest.fn(),
+  endStep: jest.fn(),
+  success: jest.fn(),
+}));
+
+jest.mock("../../prepareWorkspace/prerequisitesChecker.js", () => ({
+  prerequisitesChecker: jest.fn(() => true),
+}));
+
+const mockConfig = { appVersionId, buildParams: {} };
+
+jest.mock("../../prepareWorkspace/configurator.js", () => ({
+  configurator: jest.fn(() => mockConfig),
+}));
+
+jest.mock("../../prepareWorkspace/workspaceCreator.js", () => ({
+  workspaceCreator: jest.fn(),
+}));
+
+jest.mock("../../prepareWorkspace/configFilesRetriever.js", () => ({
+  configFilesRetriever: jest.fn(),
+}));
+
+jest.mock("../../prepareWorkspace/runtimeConfigurationUrlsCreator.js", () => ({
+  runtimeConfigurationUrlsCreator: jest.fn(),
+}));
+
+const {
+  prerequisitesChecker,
+} = require("../../prepareWorkspace/prerequisitesChecker");
+
+const { configurator } = require("../../prepareWorkspace/configurator");
+const { workspaceCreator } = require("../../prepareWorkspace/workspaceCreator");
+
+const {
+  configFilesRetriever,
+} = require("../../prepareWorkspace/configFilesRetriever");
+
+const {
+  runtimeConfigurationUrlsCreator,
+} = require("../../prepareWorkspace/runtimeConfigurationUrlsCreator");
+
+const logger = require("../../../logger");
+
+describe("reloadConfig", () => {
+  it("runs the reload config task", async () => {
+    await reloadConfig(appVersionId, options);
+
+    expect(logger.welcome.mock.calls).toMatchSnapshot();
+    expect(logger.log.mock.calls).toMatchSnapshot();
+    expect(logger.error.mock.calls).toMatchSnapshot();
+    expect(logger.warn.mock.calls).toMatchSnapshot();
+    expect(logger.startStep.mock.calls).toMatchSnapshot();
+    expect(logger.endStep.mock.calls).toMatchSnapshot();
+    expect(logger.success.mock.calls).toMatchSnapshot();
+
+    expect(prerequisitesChecker).toHaveBeenCalledWith({
+      cliArgs: [appVersionId],
+      cliOptions: options,
+    });
+
+    expect(configurator).toHaveBeenCalledWith({
+      cliArgs: [appVersionId],
+      cliOptions: options,
+    });
+
+    expect(workspaceCreator).toHaveBeenCalledWith(mockConfig);
+    expect(runtimeConfigurationUrlsCreator).toHaveBeenCalledWith(mockConfig);
+    expect(configFilesRetriever).toHaveBeenCalledWith(mockConfig);
+  });
+});

package/src/commands/reloadConfig/index.js

@@ -27,18 +27,18 @@ const reloadConfigTask = {
       error: "Could not create workspace",
       completion: "Workspace created !",
     },
-    {
-      start: "Retrieving configuration files",
-      run: configFilesRetriever,
-      error: "Could not retrieve configuration files",
-      completion: "Configuration files retrieved !",
-    },
     {
       start: "Creating runtime URLs configuration file",
       run: runtimeConfigurationUrlsCreator,
       error: "Could not create runtime_configuration_urls.json",
       completion: "Runtime configuration URLs file created",
     },
+    {
+      start: "Retrieving configuration files",
+      run: configFilesRetriever,
+      error: "Could not retrieve configuration files",
+      completion: "Configuration files retrieved !",
+    },
   ],
 };