fix(release): check-pipeline-after-comments (#325)

Co-authored-by: Shreyas Sharma <shreysh2@cisco.com>

Author: Shreyas281299

.circleci/config.yml

@@ -112,7 +112,6 @@ jobs:
 # execute the jobs in an orderly manner
 workflows:
   setup_test_release:
-  # Runs on PRs and pushes to master
     jobs:
       - install
       - linter:
@@ -149,4 +148,4 @@ workflows:
             - unit_tests
           filters:
             branches:
-              only: eft
+              only: feat/cc-widgets

.releaserc

@@ -2,8 +2,8 @@
   "branches": [
     "master",
     {
-      "name": "eft",
-      "prerelease": "eft"
+      "name": "feat/cc-widgets",
+      "prerelease": "wxcc"
     }
   ],
   "plugins": [

CHANGELOG.md

@@ -1,7 +1,7 @@
 {
   "name": "@webex/cc-station-login",
   "description": "Webex Contact Center Widgets: Station Login",
-  "version": "1.28.0-eft.7",
+  "version": "1.0.0",
   "main": "dist/index.js",
   "publishConfig": {
     "access": "public"
@@ -49,8 +49,6 @@
     "testMatch": [
       "**/tests/**/*.ts",
       "**/tests/**/*.tsx"
-    ],
-    "passWithNoTests": true
-  },
-  "stableVersion": "1.28.0-eft.6"
+    ]
+  }
 }

packages/contact-center/CHANGELOG.md

@@ -1,6 +1,3 @@
-/*
- * StationLogin helper
- */
 export const useStationLogin = () => {
   return {name: 'StationLogin'};
 };

packages/contact-center/station-login/package.json

@@ -4,7 +4,6 @@
 export interface IStationLoginProps {
   /**
    * The name of the station.
-   *
    */
   name: string;
 

packages/contact-center/station-login/src/helper.ts

@@ -1,7 +1,7 @@
 {
   "name": "@webex/cc-store",
   "description": "Webex Contact Center Widgets: Widgets Store",
-  "version": "1.28.0-eft.7",
+  "version": "1.0.0",
   "main": "dist/index.js",
   "license": "MIT",
   "publishConfig": {
@@ -46,6 +46,5 @@
   "jest": {
     "testEnvironment": "jsdom",
     "passWithNoTests": true
-  },
-  "stableVersion": "1.28.0-eft.6"
+  }
 }

packages/contact-center/station-login/src/station-login/station-login.types.ts

@@ -1,9 +1,7 @@
 import {makeAutoObservable, observable} from 'mobx';
 
 import sdk from './sdk';
-/*
- * Store
- */
+
 class Store {
   loginState = '';
   isAvailable = false;

packages/contact-center/store/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@webex/cc-user-state",
   "description": "Webex Contact Center Widgets: User State",
-  "version": "1.28.0-eft.7",
+  "version": "1.0.0",
   "main": "dist/index.js",
   "publishConfig": {
     "access": "public"
@@ -47,6 +47,5 @@
   "jest": {
     "testEnvironment": "jsdom",
     "passWithNoTests": true
-  },
-  "stableVersion": "1.28.0-eft.6"
+  }
 }

packages/contact-center/store/src/store.ts

@@ -1,7 +1,3 @@
-/*
- * UserState helper
- */
-
 export const useUserState = () => {
   return {name: 'UserState'};
 };

packages/contact-center/user-state/package.json

@@ -2,9 +2,6 @@ import React from 'react';
 
 import {IUserState} from './use-state.types';
 
-/**
- * Presentational component for the User State.
- */
 const UserStatePresentational: React.FunctionComponent<IUserState> = (props) => {
   return (
     <>

packages/contact-center/user-state/src/helper.ts

@@ -3,11 +3,8 @@ const fs = require('fs');
 const path = require('path');
 
 // Function to remove the 'stableVersion' key
-function removeStableVersion(packageJsonPath) {
+function removeStableVersion(packageJsonPath, packageData) {
   try {
-    const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf-8');
-    const packageData = JSON.parse(packageJsonContent);
-
     if (packageData.hasOwnProperty('stableVersion')) {
       delete packageData.stableVersion;
       fs.writeFileSync(packageJsonPath, JSON.stringify(packageData, null, 2), 'utf-8');
@@ -16,7 +13,7 @@ function removeStableVersion(packageJsonPath) {
       console.log("'stableVersion' key does not exist in package.json.");
     }
   } catch (error) {
-    console.error("An error occurred while removing 'stableVersion':", error.message);
+    throw new Error("An error occurred while removing 'stableVersion':", error.message);
   }
 }
 
@@ -36,28 +33,42 @@ function versionAndPublish() {
   try {
     const ccFolder = fs
       .readdirSync(contactCenterPath, {withFileTypes: true})
-      .filter((dirent) => dirent.isDirectory())
-      .map((dirent) => dirent.name);
+      .filter((dirent) => {
+        return dirent.isDirectory();
+      })
+      .map((dirent) => {
+        try {
+          const packageJsonPath = path.join(contactCenterPath, dirent.name, 'package.json');
+          const packageData = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
+
+          console.log(`Removing stable version from package.json for ${dirent.name}`);
+          removeStableVersion(packageJsonPath, packageData);
+          return packageData.name;
+        } catch (error) {
+          throw new Error(`Error reading package.json in ${dirent.name}`, error);
+        }
+      });
     // Separate dependency workspaces and other workspaces
-    const dependencyWorkspaces = ccFolder.filter((fileName) => dependencies.includes(`@webex/cc-${fileName}`));
+    const dependencyWorkspaces = ccFolder.filter((fileName) => dependencies.includes(fileName));
 
-    const otherWorkspaces = ccFolder.filter((fileName) => !dependencies.includes(`@webex/cc-${fileName}`));
+    const otherWorkspaces = ccFolder.filter((fileName) => !dependencies.includes(fileName));
 
-    const publishWorkspace = (fileName) => {
-      const workspaceName = `@webex/cc-${fileName}`;
+    const publishWorkspace = (workspaceName) => {
       console.log(`Running publish script for ${workspaceName}: ${newVersion}`);
 
-      console.log(`Removing stable version from package.json for ${workspaceName}`);
-      const packageJsonPath = path.join(contactCenterPath, fileName, 'package.json');
-      removeStableVersion(packageJsonPath);
+      // ccFolder has names of all the packages like @webex/cc-store and the actual folder name is just store,
+      // thats why we need to remove '@webex/cc-' from the workspaceName to ge the path
+      const packageJsonPath = path.join(contactCenterPath, workspaceName.replace('@webex/cc-', ''), 'package.json');
 
       console.log(`Publishing new version for ${workspaceName}: ${newVersion}`);
 
       // Update version in the workspace
       execSync(`yarn workspace ${workspaceName} version ${newVersion}`, {stdio: 'inherit'});
 
       // Publish the package
-      execSync(`yarn workspace ${workspaceName} npm publish --tag ${branchName}`, {stdio: 'inherit'});
+      // execSync(`yarn workspace ${workspaceName} npm publish --tag ${branchName}`, {stdio: 'inherit'});
+
+      execSync(`yarn workspace ${workspaceName} pack`, {stdio: 'inherit'});
     };
 
     // Publish dependencies first

packages/contact-center/user-state/src/user-state/user-state.presentational.tsx

@@ -37,7 +37,7 @@ describe('versionAndPublish', () => {
 
   test('removes "stableVersion" key from package.json when it exists', () => {
     const packageJsonContent = JSON.stringify({
-      name: 'test-package',
+      name: 'test-workspace',
       version: '1.0.0',
       stableVersion: '1.0.0',
     });
@@ -49,20 +49,22 @@ describe('versionAndPublish', () => {
     process.argv = ['node', 'script.js', 'main', '1.3.3-test.1'];
     versionAndPublish();
 
-    const expectedPackageJsonContent = JSON.stringify({name: 'test-package', version: '1.0.0'}, null, 2);
+    const expectedPackageJsonContent = JSON.stringify({name: 'test-workspace', version: '1.0.0'}, null, 2);
 
     expect(mockFs.writeFileSync).toHaveBeenCalledWith(packageJsonPath, expectedPackageJsonContent, 'utf-8');
     expect(console.log).toHaveBeenCalledWith("'stableVersion' key removed successfully.");
   });
 
-  test('error occured while writting "stableVersion" key to', () => {
+  test('fails to write package.json after removing stableVersion', () => {
     const packageJsonContent = JSON.stringify({
-      name: 'test-package',
+      name: 'test-workspace',
       version: '1.0.0',
       stableVersion: '1.0.0',
     });
     jest.spyOn(fs, 'readdirSync').mockReturnValue([{name: 'test-workspace', isDirectory: () => true}]);
     jest.spyOn(fs.Dirent.prototype, 'isDirectory').mockReturnValue(true);
+
+    mockFs.readFileSync.mockReturnValue(packageJsonContent);
     mockFs.writeFileSync.mockImplementation(() => {
       throw new Error('Error while writing to file');
     });
@@ -71,14 +73,14 @@ describe('versionAndPublish', () => {
     versionAndPublish();
 
     expect(console.error).toHaveBeenCalledWith(
-      "An error occurred while removing 'stableVersion':",
-      '"undefined" is not valid JSON'
+      'Failed to process workspaces:',
+      'Error reading package.json in test-workspace'
     );
   });
 
   test('skips removing "stableVersion" if it does not exist', () => {
     const packageJsonContent = JSON.stringify({
-      name: 'test-package',
+      name: 'test-workspace',
       version: '1.0.0',
     });
     jest.spyOn(fs, 'readdirSync').mockReturnValue([{name: 'test-workspace', isDirectory: () => true}]);
@@ -94,15 +96,21 @@ describe('versionAndPublish', () => {
   });
 
   test('publishes dependencies first and other workspaces afterward', () => {
-    const contactCenterPath = './packages/contact-center';
-    const dependencies = ['@webex/cc-store'];
+    const packageJsonContent = JSON.stringify({
+      name: '@webex/cc-store',
+      version: '1.0.0',
+    });
+    const packageJsonContent2 = JSON.stringify({
+      name: '@webex/cc-station-login',
+      version: '1.0.0',
+    });
 
     mockFs.readdirSync.mockReturnValue([
       {name: 'store', isDirectory: () => true},
       {name: 'station-login', isDirectory: () => true},
     ]);
 
-    mockFs.readFileSync.mockReturnValue('{}');
+    mockFs.readFileSync.mockReturnValueOnce(packageJsonContent).mockReturnValueOnce(packageJsonContent2);
     mockFs.writeFileSync.mockImplementation(() => {});
 
     const mockExecSync = require('child_process').execSync;
@@ -113,23 +121,39 @@ describe('versionAndPublish', () => {
 
     versionAndPublish();
 
-    // Check the dependency workspace was published first
     expect(mockExecSync).toHaveBeenNthCalledWith(1, 'yarn workspace @webex/cc-store version 1.0.1', {stdio: 'inherit'});
-
     expect(mockExecSync).toHaveBeenNthCalledWith(2, 'yarn workspace @webex/cc-store npm publish --tag main', {
       stdio: 'inherit',
     });
 
-    // Check the non-dependency workspace was published afterward
     expect(mockExecSync).toHaveBeenNthCalledWith(3, 'yarn workspace @webex/cc-station-login version 1.0.1', {
       stdio: 'inherit',
     });
-
     expect(mockExecSync).toHaveBeenNthCalledWith(4, 'yarn workspace @webex/cc-station-login npm publish --tag main', {
       stdio: 'inherit',
     });
   });
 
+  test('error occurred while reading package.json data', () => {
+    mockFs.readdirSync.mockReturnValue([
+      {name: 'store', isDirectory: () => true},
+      {name: 'station-login', isDirectory: () => true},
+    ]);
+
+    mockFs.readFileSync.mockImplementation(() => {
+      throw new Error('Error while reading from file');
+    });
+
+    const mockExecSync = require('child_process').execSync;
+
+    const processArgvMock = ['node', 'script.js', 'main', '1.0.1'];
+    process.argv = processArgvMock;
+
+    versionAndPublish();
+    expect(console.error).toHaveBeenCalledWith('Failed to process workspaces:', 'Error reading package.json in store');
+    expect(mockExecSync).not.toHaveBeenCalled();
+  });
+
   it('should export versionAndPublish when required as a module', () => {
     jest.resetModules();
     // Simulate require.main !== module (require the module as a normal import)