Skip to content

Commit 0b304c4

Browse files
rarajes2rarajes2
authored
fix: cleanup and using mobx-react-lite (#356)
1 parent 473cd4f commit 0b304c4

File tree

12 files changed

+44
-45
lines changed

12 files changed

+44
-45
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"test:unit": "yarn run test:tooling && yarn run test:cc-widgets",
4343
"test:tooling": "jest --coverage",
4444
"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",
45-
"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",
45+
"build": "yarn workspaces foreach --all --topological --parallel --exclude webex-widgets --exclude @webex/web-component-samples-app --exclude @webex/react-samples-app run build:src",
4646
"samples:build": "yarn workspace @webex/react-samples-app build:src && yarn workspace @webex/web-component-samples-app build:src",
4747
"samples:serve": "open docs/index.html && yarn workspace @webex/react-samples-app serve",
4848
"samples:serve-react": "yarn workspace @webex/react-samples-app serve",

‎packages/contact-center/cc-widgets/package.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"clean": "rm -rf dist && rm -rf node_modules",
1919
"clean:dist": "rm -rf dist",
2020
"build": "yarn run -T tsc",
21-
"build:src": "webpack",
21+
"build:src": "yarn run clean:dist && webpack",
2222
"build:watch": "webpack --watch",
2323
"test:unit": "jest"
2424
},
@@ -45,7 +45,6 @@
4545
"file-loader": "6.2.0",
4646
"jest": "29.7.0",
4747
"jest-environment-jsdom": "29.7.0",
48-
"mobx-react": "9.1.1",
4948
"os-browserify": "^0.3.0",
5049
"process": "^0.11.10",
5150
"querystring-es3": "^0.2.1",
@@ -66,7 +65,10 @@
6665
"testMatch": [
6766
"**/tests/**/*.ts",
6867
"**/tests/**/*.tsx"
69-
]
68+
],
69+
"moduleNameMapper": {
70+
"^.+\\.(css|less|scss)$": "babel-jest"
71+
}
7072
},
7173
"stableVersion": "1.28.0-ccwidgets.6"
7274
}

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

+6-3
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
"clean": "rm -rf dist && rm -rf node_modules",
1515
"clean:dist": "rm -rf dist",
1616
"build": "yarn run -T tsc",
17-
"build:src": "webpack",
17+
"build:src": "yarn run clean:dist && webpack",
1818
"build:watch": "webpack --watch",
1919
"test:unit": "jest"
2020
},
2121
"dependencies": {
2222
"@webex/cc-store": "workspace:*",
23-
"mobx-react": "9.1.1"
23+
"mobx-react-lite": "^4.1.0"
2424
},
2525
"devDependencies": {
2626
"@babel/core": "7.25.2",
@@ -53,7 +53,10 @@
5353
"**/tests/**/*.ts",
5454
"**/tests/**/*.tsx"
5555
],
56-
"verbose": true
56+
"verbose": true,
57+
"moduleNameMapper": {
58+
"^.+\\.(css|less|scss)$": "babel-jest"
59+
}
5760
},
5861
"stableVersion": "1.28.0-ccwidgets.6"
5962
}

‎packages/contact-center/station-login/src/station-login/index.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import store from '@webex/cc-store';
3-
import {observer} from 'mobx-react';
3+
import {observer} from 'mobx-react-lite';
44

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

13-
console.log('StationLogin: Teams >>', teams);
14-
console.log('StationLogin: Login Options >>', loginOptions);
15-
1613
const props = {
1714
...result,
1815
teams,

‎packages/contact-center/store/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"clean": "rm -rf dist && rm -rf node_modules",
1616
"clean:dist": "rm -rf dist",
1717
"build": "yarn run -T tsc",
18-
"build:src": "webpack",
18+
"build:src": "yarn run clean:dist && webpack",
1919
"build:watch": "webpack --watch",
2020
"test:unit": "jest"
2121
},

‎packages/contact-center/task/package.json

+13-5
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
"package.json"
1212
],
1313
"scripts": {
14+
"clean": "rm -rf dist && rm -rf node_modules",
15+
"clean:dist": "rm -rf dist",
1416
"build": "yarn run -T tsc",
15-
"build:src": "webpack && yarn run build",
17+
"build:src": "yarn run clean:dist && webpack",
1618
"build:watch": "webpack --watch",
1719
"test:unit": "jest --coverage"
1820
},
1921
"dependencies": {
2022
"@webex/cc-store": "workspace:*",
21-
"react": "18.3.1",
22-
"react-dom": "18.3.1",
23-
"typescript": "5.6.3",
23+
"mobx-react-lite": "^4.1.0",
2424
"webex": "3.7.0-wxcc.5"
2525
},
2626
"devDependencies": {
@@ -39,16 +39,24 @@
3939
"jest": "29.7.0",
4040
"jest-environment-jsdom": "29.7.0",
4141
"ts-loader": "9.5.1",
42+
"typescript": "5.6.3",
4243
"webpack": "5.94.0",
4344
"webpack-cli": "5.1.4",
4445
"webpack-merge": "6.0.1"
4546
},
47+
"peerDependencies": {
48+
"react": ">=18.3.1",
49+
"react-dom": ">=18.3.1"
50+
},
4651
"jest": {
4752
"testEnvironment": "jsdom",
4853
"testMatch": [
4954
"**/tests/**/*.ts",
5055
"**/tests/**/*.tsx"
51-
]
56+
],
57+
"moduleNameMapper": {
58+
"^.+\\.(css|less|scss)$": "babel-jest"
59+
}
5260
},
5361
"stableVersion": "1.28.0-ccwidgets.6"
5462
}

‎packages/contact-center/task/src/IncomingTask/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import {observer} from 'mobx-react';
2+
import {observer} from 'mobx-react-lite';
33

44
import store from '@webex/cc-store';
55
import {useIncomingTask} from '../helper';

‎packages/contact-center/task/src/TaskList/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import store from '@webex/cc-store';
3-
import {observer} from 'mobx-react';
3+
import {observer} from 'mobx-react-lite';
44

55
import TaskListPresentational from './task-list.presentational';
66
import {useTaskList} from '../helper';

‎packages/contact-center/task/webpack.config.js

+5
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,9 @@ module.exports = merge(baseConfig, {
99
filename: 'index.js', // Set the output filename to index.js
1010
libraryTarget: 'commonjs2',
1111
},
12+
externals: {
13+
react: 'react',
14+
'react-dom': 'react-dom',
15+
'@webex/cc-store': '@webex/cc-store',
16+
}
1217
});

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
"clean": "rm -rf dist && rm -rf node_modules",
1515
"clean:dist": "rm -rf dist",
1616
"build": "yarn run -T tsc",
17-
"build:src": "webpack",
17+
"build:src": "yarn run clean:dist && webpack",
1818
"build:watch": "webpack --watch",
1919
"test:unit": "jest"
2020
},
2121
"dependencies": {
2222
"@webex/cc-store": "workspace:*",
23-
"mobx-react": "9.1.1",
23+
"mobx-react-lite": "^4.1.0",
2424
"typescript": "5.6.3"
2525
},
2626
"devDependencies": {

‎packages/contact-center/user-state/src/user-state/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import store from '@webex/cc-store';
3-
import {observer} from 'mobx-react';
3+
import {observer} from 'mobx-react-lite';
44

55
import {useUserState} from '../helper';
66
import UserStatePresentational from './user-state.presentational';

‎yarn.lock

+7-23
Original file line numberDiff line numberDiff line change
@@ -5396,7 +5396,7 @@ __metadata:
53965396
file-loader: "npm:6.2.0"
53975397
jest: "npm:29.7.0"
53985398
jest-environment-jsdom: "npm:29.7.0"
5399-
mobx-react: "npm:9.1.1"
5399+
mobx-react-lite: "npm:^4.1.0"
54005400
ts-loader: "npm:9.5.1"
54015401
typescript: "npm:5.6.3"
54025402
webpack: "npm:5.94.0"
@@ -5455,14 +5455,16 @@ __metadata:
54555455
file-loader: "npm:6.2.0"
54565456
jest: "npm:29.7.0"
54575457
jest-environment-jsdom: "npm:29.7.0"
5458-
react: "npm:18.3.1"
5459-
react-dom: "npm:18.3.1"
5458+
mobx-react-lite: "npm:^4.1.0"
54605459
ts-loader: "npm:9.5.1"
54615460
typescript: "npm:5.6.3"
54625461
webex: "npm:3.7.0-wxcc.5"
54635462
webpack: "npm:5.94.0"
54645463
webpack-cli: "npm:5.1.4"
54655464
webpack-merge: "npm:6.0.1"
5465+
peerDependencies:
5466+
react: ">=18.3.1"
5467+
react-dom: ">=18.3.1"
54665468
languageName: unknown
54675469
linkType: soft
54685470

@@ -5485,7 +5487,7 @@ __metadata:
54855487
file-loader: "npm:6.2.0"
54865488
jest: "npm:29.7.0"
54875489
jest-environment-jsdom: "npm:29.7.0"
5488-
mobx-react: "npm:9.1.1"
5490+
mobx-react-lite: "npm:^4.1.0"
54895491
ts-loader: "npm:9.5.1"
54905492
typescript: "npm:5.6.3"
54915493
webpack: "npm:5.94.0"
@@ -5521,7 +5523,6 @@ __metadata:
55215523
file-loader: "npm:6.2.0"
55225524
jest: "npm:29.7.0"
55235525
jest-environment-jsdom: "npm:29.7.0"
5524-
mobx-react: "npm:9.1.1"
55255526
os-browserify: "npm:^0.3.0"
55265527
process: "npm:^0.11.10"
55275528
querystring-es3: "npm:^0.2.1"
@@ -19106,7 +19107,7 @@ __metadata:
1910619107
languageName: node
1910719108
linkType: hard
1910819109

19109-
"mobx-react-lite@npm:^4.0.7":
19110+
"mobx-react-lite@npm:^4.1.0":
1911019111
version: 4.1.0
1911119112
resolution: "mobx-react-lite@npm:4.1.0"
1911219113
dependencies:
@@ -19123,23 +19124,6 @@ __metadata:
1912319124
languageName: node
1912419125
linkType: hard
1912519126

19126-
"mobx-react@npm:9.1.1":
19127-
version: 9.1.1
19128-
resolution: "mobx-react@npm:9.1.1"
19129-
dependencies:
19130-
mobx-react-lite: "npm:^4.0.7"
19131-
peerDependencies:
19132-
mobx: ^6.9.0
19133-
react: ^16.8.0 || ^17 || ^18
19134-
peerDependenciesMeta:
19135-
react-dom:
19136-
optional: true
19137-
react-native:
19138-
optional: true
19139-
checksum: 10c0/77ced87e1657c949e73ff0386ce50b90c53ef4ced36c9cca53dfad693a3e13bc5690c513b855eb486c558191d7a05ee953e73c593054e915ee016fc4516310f8
19140-
languageName: node
19141-
linkType: hard
19142-
1914319127
"mobx@npm:6.13.5":
1914419128
version: 6.13.5
1914519129
resolution: "mobx@npm:6.13.5"

0 commit comments

Comments
 (0)