Skip to content

Commit bb3bea7

Browse files
authored
fix(meetings): address version resolution (#664)
1 parent 354e58e commit bb3bea7

6 files changed

Lines changed: 310 additions & 697 deletions

File tree

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@
1111
],
1212
"packageManager": "yarn@4.5.1",
1313
"devDependencies": {
14+
"@babel/plugin-transform-runtime": "^7.29.0",
1415
"@babel/preset-typescript": "7.25.9",
1516
"@playwright/test": "^1.51.1",
1617
"@semantic-release/changelog": "^6.0.3",
1718
"@semantic-release/exec": "^6.0.3",
1819
"@semantic-release/git": "^10.0.1",
1920
"@semantic-release/github": "^11.0.1",
2021
"@testing-library/react-hooks": "^8.0.1",
22+
"@types/babel__plugin-transform-runtime": "^7.9.5",
2123
"@webex/cli-tools": "0.0.0-next.2",
2224
"@webex/package-tools": "0.0.0-next.6",
2325
"babel-jest": "^29.7.0",
@@ -70,4 +72,4 @@
7072
"prepare": "husky",
7173
"package-tools": "webex-package-tools"
7274
}
73-
}
75+
}

packages/@webex/widgets/package.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
"engines": {
55
"node": ">=20.13.1"
66
},
7+
"installConfig": {
8+
"hoistingLimits": "dependencies"
9+
},
710
"main": "dist/webexWidgets.mjs",
811
"module": "dist/webexWidgets.mjs",
912
"scripts": {
@@ -53,8 +56,11 @@
5356
"@babel/plugin-transform-runtime": "^7.16.0",
5457
"@babel/preset-env": "^7.8.4",
5558
"@babel/preset-react": "^7.8.3",
59+
"@babel/register": "^7.25.9",
5660
"@commitlint/cli": "^8.3.5",
5761
"@commitlint/config-conventional": "^8.3.4",
62+
"@momentum-ui/core": "19.16.0",
63+
"@momentum-ui/icons": "8.28.5",
5864
"@momentum-ui/react": "^23.21.4",
5965
"@semantic-release/changelog": "^6.0.0",
6066
"@semantic-release/git": "^10.0.0",
@@ -117,7 +123,7 @@
117123
"prop-types": "^15.7.2",
118124
"react": "18.3.1",
119125
"react-dom": "18.3.1",
120-
"webex": "2.60.2"
126+
"webex": "2.60.4"
121127
},
122128
"babel": {
123129
"presets": [

packages/@webex/widgets/webpack.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ module.exports = function(env, argv) {
7474
use: [isDemo ? 'style-loader' : MiniCssExtractPlugin.loader, 'css-loader'],
7575
include: [
7676
resolveMonorepoRoot('node_modules/@momentum-ui'),
77-
resolveMonorepoRoot('node_modules/@webex/components'),
78-
path.resolve(__dirname, 'packages'),
77+
path.resolve(__dirname, 'node_modules/@webex/components'),
78+
path.resolve(__dirname, 'node_modules/@momentum-ui'),
7979
],
8080
},
8181
{

widgets-samples/samples-meeting-app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
"serve": "webpack serve --mode development"
1010
},
1111
"dependencies": {
12+
"@momentum-ui/react": "^23.21.4",
1213
"@webex/widgets": "workspace:*",
1314
"prop-types": "^15.7.2",
1415
"react": "18.3.1",
15-
"react-dom": "18.3.1",
16-
"webex": "2.60.2"
16+
"react-dom": "18.3.1"
1717
},
1818
"devDependencies": {
1919
"@babel/core": "^7.25.2",

widgets-samples/samples-meeting-app/webpack.config.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ const {CleanWebpackPlugin} = require('clean-webpack-plugin');
44
const HtmlWebpackPlugin = require('html-webpack-plugin');
55
const {version} = require('./package.json');
66

7+
const widgetsDir = path.dirname(require.resolve('@webex/widgets/package.json'));
8+
79
module.exports = function(env, argv) {
810
return {
911
cache: true,
@@ -18,6 +20,13 @@ module.exports = function(env, argv) {
1820
devtool: argv.mode === 'production' ? 'source-map' : 'inline-source-map',
1921
resolve: {
2022
extensions: ['.js', '.jsx'],
23+
alias: {
24+
react: path.dirname(require.resolve('react/package.json', { paths: [widgetsDir] })),
25+
'react-dom': path.dirname(require.resolve('react-dom/package.json', { paths: [widgetsDir] })),
26+
'prop-types': path.dirname(require.resolve('prop-types/package.json', { paths: [widgetsDir] })),
27+
webex: path.dirname(require.resolve('webex/package', { paths: [widgetsDir] })),
28+
'@webex/common': path.dirname(require.resolve('@webex/common/package.json', { paths: [widgetsDir] })),
29+
},
2130
fallback: {
2231
"buffer": require.resolve("buffer/"),
2332
"crypto": require.resolve("crypto-browserify"),

0 commit comments

Comments
 (0)