Updated ejectIntegration to eject the same local configuration as the…

… ejectConfig does.

dist/cli/eject.js

@@ -70,14 +70,15 @@ exports.ejectConfig = ejectConfig;
  * @param handoff
  */
 var ejectIntegration = function (handoff) { return __awaiter(void 0, void 0, void 0, function () {
-    var config, integration, workingPath, integrationPath, localConfigPath, _a;
+    var config, integration, workingPath, integrationPath, localConfigPath, _a, localConfigBuffer, localConfig;
     var _b, _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
             case 0:
                 config = handoff.config;
                 if (!config.integration) {
                     console.log(chalk_1.default.red("Unable to eject integration as it is not defined."));
+                    return [2 /*return*/, handoff];
                 }
                 integration = config.integration.name;
                 // is the custom integration already being used?
@@ -104,8 +105,10 @@ var ejectIntegration = function (handoff) { return __awaiter(void 0, void 0, voi
                 _d.label = 2;
             case 2:
                 _a;
-                config.integration = { name: 'custom', version: '' };
-                fs_extra_1.default.writeFileSync(localConfigPath, "".concat(JSON.stringify(config, null, 2)));
+                localConfigBuffer = fs_extra_1.default.readFileSync(localConfigPath);
+                localConfig = JSON.parse(localConfigBuffer.toString());
+                localConfig.integration = { name: 'custom', version: '' };
+                fs_extra_1.default.writeFileSync(localConfigPath, "".concat(JSON.stringify(localConfig, null, 2)));
                 return [2 /*return*/, handoff];
         }
     });

dist/config.d.ts

@@ -1,4 +1,4 @@
-import { Config } from './types/config';
+import { ClientConfig, Config } from './types/config';
 export interface ImageStyle {
     name: string;
     style: string;
@@ -11,4 +11,4 @@ export declare const defaultConfig: () => Config;
  * Get the configuration formatted for the client, either from the root of the project or from the default config.
  * @returns Promise<Config>
  */
-export declare const getClientConfig: (configOverride?: any) => any;
+export declare const getClientConfig: (configOverride?: any) => ClientConfig;

dist/config.js

@@ -104,14 +104,15 @@ var getClientConfig = function (configOverride) {
     if (configOverride) {
         config = __assign(__assign({}, config), configOverride);
     }
-    var _a = __assign(__assign({}, (0, exports.defaultConfig)()), config), app = _a.app, figma = _a.figma, exportsOutputDirectory = _a.exportsOutputDirectory, sitesOutputDirectory = _a.sitesOutputDirectory, assets_zip_links = _a.assets_zip_links, use_legacy_definitions = _a.use_legacy_definitions;
+    var _a = __assign(__assign({}, (0, exports.defaultConfig)()), config), app = _a.app, figma = _a.figma, integration = _a.integration, exportsOutputDirectory = _a.exportsOutputDirectory, sitesOutputDirectory = _a.sitesOutputDirectory, assets_zip_links = _a.assets_zip_links, use_legacy_definitions = _a.use_legacy_definitions;
     return {
         app: app,
         figma: figma,
+        integration: integration,
         exportsOutputDirectory: exportsOutputDirectory,
         sitesOutputDirectory: sitesOutputDirectory,
         assets_zip_links: assets_zip_links !== null && assets_zip_links !== void 0 ? assets_zip_links : { icons: null, logos: null },
-        use_legacy_definitions: use_legacy_definitions
+        use_legacy_definitions: use_legacy_definitions,
     };
 };
 exports.getClientConfig = getClientConfig;

src/cli/eject.ts

@@ -4,6 +4,7 @@ import fs from 'fs-extra';
 import chalk from 'chalk';
 import { getPathToIntegration } from '../transformers/integration';
 import { getClientConfig } from '../config';
+import { ClientConfig } from 'handoff/types/config';
 
 /**
  * Eject the config to the working directory
@@ -31,6 +32,7 @@ export const ejectIntegration = async (handoff: Handoff) => {
 
   if (!config.integration) {
     console.log(chalk.red(`Unable to eject integration as it is not defined.`));
+    return handoff;
   }
 
   const integration = config.integration.name;
@@ -58,8 +60,12 @@ export const ejectIntegration = async (handoff: Handoff) => {
   // ensure local configuration is set up to support the ejected integration
   const localConfigPath = path.join(handoff.workingPath, 'handoff.config.json');
   !fs.existsSync(localConfigPath) && (await ejectConfig(handoff));
-  config.integration = { name: 'custom', version: '' };
-  fs.writeFileSync(localConfigPath, `${JSON.stringify(config, null, 2)}`);
+
+  // update (and re-write) the ejected configuration with custom integration
+  const localConfigBuffer = fs.readFileSync(localConfigPath);
+  const localConfig = JSON.parse(localConfigBuffer.toString()) as ClientConfig;
+  localConfig.integration = { name: 'custom', version: '' };
+  fs.writeFileSync(localConfigPath, `${JSON.stringify(localConfig, null, 2)}`);
 
   return handoff;
 };

src/config.ts

@@ -98,17 +98,18 @@ export const getClientConfig = (configOverride?: any): ClientConfig => {
     config = { ...config, ...configOverride };
   }
 
-  const { app, figma, exportsOutputDirectory, sitesOutputDirectory, assets_zip_links, use_legacy_definitions } = {
+  const { app, figma, integration, exportsOutputDirectory, sitesOutputDirectory, assets_zip_links, use_legacy_definitions } = {
     ...defaultConfig(),
     ...config,
   } as unknown as Config;
 
   return {
     app,
     figma,
+    integration,
     exportsOutputDirectory,
     sitesOutputDirectory,
     assets_zip_links: assets_zip_links ?? { icons: null, logos: null },
-    use_legacy_definitions
+    use_legacy_definitions,
   };
 };

src/types/config.d.ts

@@ -86,7 +86,10 @@ export interface Config {
   use_legacy_definitions?: boolean | null | undefined;
 }
 
-export type ClientConfig = Pick<Config, "app" | "figma" | "assets_zip_links", "use_legacy_definitions">;
+export type ClientConfig = Pick<
+  Config,
+  'app' | 'figma' | 'integration' | 'exportsOutputDirectory' | 'sitesOutputDirectory' | 'assets_zip_links' | 'use_legacy_definitions'
+>;
 
 declare const config: Config;