Skip to content

fix: cleanup and using mobx-react-lite #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rarajes2 merged 1 commit into from
Jan 10, 2025
Merged

fix: cleanup and using mobx-react-lite #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"test:unit": "yarn run test:tooling && yarn run test:cc-widgets",
"test:tooling": "jest --coverage",
"test:cc-widgets": "yarn workspaces foreach --all --parallel --exclude webex-widgets --exclude @webex/web-component-samples-app --exclude @webex/react-samples-app run test:unit",
"build": " yarn run clean:dist && yarn workspaces foreach --all --topological --parallel --exclude webex-widgets --exclude @webex/web-component-samples-app --exclude @webex/react-samples-app run build:src",
"build": "yarn workspaces foreach --all --topological --parallel --exclude webex-widgets --exclude @webex/web-component-samples-app --exclude @webex/react-samples-app run build:src",
"samples:build": "yarn workspace @webex/react-samples-app build:src && yarn workspace @webex/web-component-samples-app build:src",
"samples:serve": "open docs/index.html && yarn workspace @webex/react-samples-app serve",
"samples:serve-react": "yarn workspace @webex/react-samples-app serve",
Expand Down
8 changes: 5 additions & 3 deletions packages/contact-center/cc-widgets/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"clean": "rm -rf dist && rm -rf node_modules",
"clean:dist": "rm -rf dist",
"build": "yarn run -T tsc",

@Shreyas281299 Shreyas281299 Jan 10, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we still using this build command?

@rarajes2 rarajes2 Jan 10, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not using but keeping it if we need to test something. If we don't use it for quite some time, we can remove this.

"build:src": "webpack",
"build:src": "yarn run clean:dist && webpack",
"build:watch": "webpack --watch",
"test:unit": "jest"
},
Expand All @@ -45,7 +45,6 @@
"file-loader": "6.2.0",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"mobx-react": "9.1.1",
"os-browserify": "^0.3.0",
"process": "^0.11.10",
"querystring-es3": "^0.2.1",
Expand All @@ -66,7 +65,10 @@
"testMatch": [
"**/tests/**/*.ts",
"**/tests/**/*.tsx"
]
],
"moduleNameMapper": {
"^.+\\.(css|less|scss)$": "babel-jest"
}
},
"stableVersion": "1.28.0-ccwidgets.6"
}
9 changes: 6 additions & 3 deletions packages/contact-center/station-login/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"clean": "rm -rf dist && rm -rf node_modules",
"clean:dist": "rm -rf dist",
"build": "yarn run -T tsc",
"build:src": "webpack",
"build:src": "yarn run clean:dist && webpack",
"build:watch": "webpack --watch",
"test:unit": "jest"
},
"dependencies": {
"@webex/cc-store": "workspace:*",
"mobx-react": "9.1.1"
"mobx-react-lite": "^4.1.0"
},
"devDependencies": {
"@babel/core": "7.25.2",
Expand Down Expand Up @@ -53,7 +53,10 @@
"**/tests/**/*.ts",
"**/tests/**/*.tsx"
],
"verbose": true
"verbose": true,
"moduleNameMapper": {
"^.+\\.(css|less|scss)$": "babel-jest"
}
},
"stableVersion": "1.28.0-ccwidgets.6"
}
5 changes: 1 addition & 4 deletions packages/contact-center/station-login/src/station-login/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import store from '@webex/cc-store';
import {observer} from 'mobx-react';
import {observer} from 'mobx-react-lite';

import StationLoginPresentational from './station-login.presentational';
import {useStationLogin} from '../helper';
Expand All @@ -10,9 +10,6 @@ const StationLogin: React.FunctionComponent<StationLoginProps> = observer(({onLo
const {cc, teams, loginOptions} = store;
const result = useStationLogin({cc, onLogin, onLogout});

console.log('StationLogin: Teams >>', teams);
console.log('StationLogin: Login Options >>', loginOptions);

const props = {
...result,
teams,
Expand Down
2 changes: 1 addition & 1 deletion packages/contact-center/store/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"clean": "rm -rf dist && rm -rf node_modules",
"clean:dist": "rm -rf dist",
"build": "yarn run -T tsc",
"build:src": "webpack",
"build:src": "yarn run clean:dist && webpack",
"build:watch": "webpack --watch",
"test:unit": "jest"
},
Expand Down
18 changes: 13 additions & 5 deletions packages/contact-center/task/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
"package.json"
],
"scripts": {
"clean": "rm -rf dist && rm -rf node_modules",
"clean:dist": "rm -rf dist",
"build": "yarn run -T tsc",
"build:src": "webpack && yarn run build",
"build:src": "yarn run clean:dist && webpack",
"build:watch": "webpack --watch",
"test:unit": "jest --coverage"
},
"dependencies": {
"@webex/cc-store": "workspace:*",
"react": "18.3.1",
"react-dom": "18.3.1",
"typescript": "5.6.3",
"mobx-react-lite": "^4.1.0",
"webex": "3.7.0-wxcc.5"
},
"devDependencies": {
Expand All @@ -39,16 +39,24 @@
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"ts-loader": "9.5.1",
"typescript": "5.6.3",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "6.0.1"
},
"peerDependencies": {
"react": ">=18.3.1",
"react-dom": ">=18.3.1"
},
"jest": {
"testEnvironment": "jsdom",
"testMatch": [
"**/tests/**/*.ts",
"**/tests/**/*.tsx"
]
],
"moduleNameMapper": {
"^.+\\.(css|less|scss)$": "babel-jest"
}
},
"stableVersion": "1.28.0-ccwidgets.6"
}
2 changes: 1 addition & 1 deletion packages/contact-center/task/src/IncomingTask/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import {observer} from 'mobx-react';
import {observer} from 'mobx-react-lite';

import store from '@webex/cc-store';
import {useIncomingTask} from '../helper';
Expand Down
2 changes: 1 addition & 1 deletion packages/contact-center/task/src/TaskList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import store from '@webex/cc-store';
import {observer} from 'mobx-react';
import {observer} from 'mobx-react-lite';

import TaskListPresentational from './task-list.presentational';
import {useTaskList} from '../helper';
Expand Down
5 changes: 5 additions & 0 deletions packages/contact-center/task/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,9 @@ module.exports = merge(baseConfig, {
filename: 'index.js', // Set the output filename to index.js
libraryTarget: 'commonjs2',
},
externals: {
react: 'react',
'react-dom': 'react-dom',
'@webex/cc-store': '@webex/cc-store',
}
Comment on lines +12 to +16

@coderabbitai coderabbitai Bot Jan 10, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Add missing peer dependencies for webpack externals

The following externals need to be added as peer dependencies in package.json:

  • react
  • react-dom
  • @webex/cc-store
🔗 Analysis chain

Verify peer dependencies match externals configuration.

Ensure that the package.json peer dependencies align with the webpack externals configuration.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check if package.json peer dependencies match webpack externals

# Get peer dependencies from package.json
echo "Checking peer dependencies in package.json:"
cat package.json | jq '.peerDependencies'

# Verify that all externals are listed as peer dependencies
echo -e "\nChecking for potential mismatches between externals and peer dependencies:"
for dep in "react" "react-dom" "@webex/cc-store"; do
  if ! cat package.json | jq -e ".peerDependencies.\"$dep\""; then
    echo "Warning: External '$dep' is not listed in peer dependencies"
  fi
done

Length of output: 1094

});
4 changes: 2 additions & 2 deletions packages/contact-center/user-state/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"clean": "rm -rf dist && rm -rf node_modules",
"clean:dist": "rm -rf dist",
"build": "yarn run -T tsc",
"build:src": "webpack",
"build:src": "yarn run clean:dist && webpack",
"build:watch": "webpack --watch",
"test:unit": "jest"
},
"dependencies": {
"@webex/cc-store": "workspace:*",
"mobx-react": "9.1.1",
"mobx-react-lite": "^4.1.0",
"typescript": "5.6.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/contact-center/user-state/src/user-state/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import store from '@webex/cc-store';
import {observer} from 'mobx-react';
import {observer} from 'mobx-react-lite';

import {useUserState} from '../helper';
import UserStatePresentational from './user-state.presentational';
Expand Down
30 changes: 7 additions & 23 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5396,7 +5396,7 @@ __metadata:
file-loader: "npm:6.2.0"
jest: "npm:29.7.0"
jest-environment-jsdom: "npm:29.7.0"
mobx-react: "npm:9.1.1"
mobx-react-lite: "npm:^4.1.0"
ts-loader: "npm:9.5.1"
typescript: "npm:5.6.3"
webpack: "npm:5.94.0"
Expand Down Expand Up @@ -5455,14 +5455,16 @@ __metadata:
file-loader: "npm:6.2.0"
jest: "npm:29.7.0"
jest-environment-jsdom: "npm:29.7.0"
react: "npm:18.3.1"
react-dom: "npm:18.3.1"
mobx-react-lite: "npm:^4.1.0"
ts-loader: "npm:9.5.1"
typescript: "npm:5.6.3"
webex: "npm:3.7.0-wxcc.5"
webpack: "npm:5.94.0"
webpack-cli: "npm:5.1.4"
webpack-merge: "npm:6.0.1"
peerDependencies:
react: ">=18.3.1"
react-dom: ">=18.3.1"
languageName: unknown
linkType: soft

Expand All @@ -5485,7 +5487,7 @@ __metadata:
file-loader: "npm:6.2.0"
jest: "npm:29.7.0"
jest-environment-jsdom: "npm:29.7.0"
mobx-react: "npm:9.1.1"
mobx-react-lite: "npm:^4.1.0"
ts-loader: "npm:9.5.1"
typescript: "npm:5.6.3"
webpack: "npm:5.94.0"
Expand Down Expand Up @@ -5521,7 +5523,6 @@ __metadata:
file-loader: "npm:6.2.0"
jest: "npm:29.7.0"
jest-environment-jsdom: "npm:29.7.0"
mobx-react: "npm:9.1.1"
os-browserify: "npm:^0.3.0"
process: "npm:^0.11.10"
querystring-es3: "npm:^0.2.1"
Expand Down Expand Up @@ -19106,7 +19107,7 @@ __metadata:
languageName: node
linkType: hard

"mobx-react-lite@npm:^4.0.7":
"mobx-react-lite@npm:^4.1.0":
version: 4.1.0
resolution: "mobx-react-lite@npm:4.1.0"
dependencies:
Expand All @@ -19123,23 +19124,6 @@ __metadata:
languageName: node
linkType: hard

"mobx-react@npm:9.1.1":
version: 9.1.1
resolution: "mobx-react@npm:9.1.1"
dependencies:
mobx-react-lite: "npm:^4.0.7"
peerDependencies:
mobx: ^6.9.0
react: ^16.8.0 || ^17 || ^18
peerDependenciesMeta:
react-dom:
optional: true
react-native:
optional: true
checksum: 10c0/77ced87e1657c949e73ff0386ce50b90c53ef4ced36c9cca53dfad693a3e13bc5690c513b855eb486c558191d7a05ee953e73c593054e915ee016fc4516310f8
languageName: node
linkType: hard

"mobx@npm:6.13.5":
version: 6.13.5
resolution: "mobx@npm:6.13.5"
Expand Down