diff --git a/package.json b/package.json index 3cf701865..a78e68e49 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/packages/contact-center/cc-widgets/package.json b/packages/contact-center/cc-widgets/package.json index 5b635e3da..8c20c1ed1 100644 --- a/packages/contact-center/cc-widgets/package.json +++ b/packages/contact-center/cc-widgets/package.json @@ -18,7 +18,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" }, @@ -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", @@ -66,7 +65,10 @@ "testMatch": [ "**/tests/**/*.ts", "**/tests/**/*.tsx" - ] + ], + "moduleNameMapper": { + "^.+\\.(css|less|scss)$": "babel-jest" + } }, "stableVersion": "1.28.0-ccwidgets.6" } diff --git a/packages/contact-center/station-login/package.json b/packages/contact-center/station-login/package.json index 7c5a5f844..3a83d3a7b 100644 --- a/packages/contact-center/station-login/package.json +++ b/packages/contact-center/station-login/package.json @@ -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", @@ -53,7 +53,10 @@ "**/tests/**/*.ts", "**/tests/**/*.tsx" ], - "verbose": true + "verbose": true, + "moduleNameMapper": { + "^.+\\.(css|less|scss)$": "babel-jest" + } }, "stableVersion": "1.28.0-ccwidgets.6" } diff --git a/packages/contact-center/station-login/src/station-login/index.tsx b/packages/contact-center/station-login/src/station-login/index.tsx index 6d2f87cfe..e2a205a77 100644 --- a/packages/contact-center/station-login/src/station-login/index.tsx +++ b/packages/contact-center/station-login/src/station-login/index.tsx @@ -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'; @@ -10,9 +10,6 @@ const StationLogin: React.FunctionComponent = 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, diff --git a/packages/contact-center/store/package.json b/packages/contact-center/store/package.json index 3bbc3b97c..4d2f4333d 100644 --- a/packages/contact-center/store/package.json +++ b/packages/contact-center/store/package.json @@ -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" }, diff --git a/packages/contact-center/task/package.json b/packages/contact-center/task/package.json index bd210641d..06f95ec4b 100644 --- a/packages/contact-center/task/package.json +++ b/packages/contact-center/task/package.json @@ -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": { @@ -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" } diff --git a/packages/contact-center/task/src/IncomingTask/index.tsx b/packages/contact-center/task/src/IncomingTask/index.tsx index 4fb33b11f..819c42470 100644 --- a/packages/contact-center/task/src/IncomingTask/index.tsx +++ b/packages/contact-center/task/src/IncomingTask/index.tsx @@ -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'; diff --git a/packages/contact-center/task/src/TaskList/index.tsx b/packages/contact-center/task/src/TaskList/index.tsx index f2ce7d013..7830393b3 100644 --- a/packages/contact-center/task/src/TaskList/index.tsx +++ b/packages/contact-center/task/src/TaskList/index.tsx @@ -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'; diff --git a/packages/contact-center/task/webpack.config.js b/packages/contact-center/task/webpack.config.js index 247cf2783..e020d5491 100644 --- a/packages/contact-center/task/webpack.config.js +++ b/packages/contact-center/task/webpack.config.js @@ -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', + } }); diff --git a/packages/contact-center/user-state/package.json b/packages/contact-center/user-state/package.json index fd5d97f99..d392d21b1 100644 --- a/packages/contact-center/user-state/package.json +++ b/packages/contact-center/user-state/package.json @@ -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": { diff --git a/packages/contact-center/user-state/src/user-state/index.tsx b/packages/contact-center/user-state/src/user-state/index.tsx index 56c6d55ea..0fba12c61 100644 --- a/packages/contact-center/user-state/src/user-state/index.tsx +++ b/packages/contact-center/user-state/src/user-state/index.tsx @@ -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'; diff --git a/yarn.lock b/yarn.lock index a5a964bfe..98bc9d1b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" @@ -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 @@ -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" @@ -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" @@ -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: @@ -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"