Skip to content

Commit

Permalink
Merge branch 'main' into moveToProps
Browse files Browse the repository at this point in the history
  • Loading branch information
mustafaboleken committed Jan 2, 2025
2 parents f87fca3 + 5ab41ea commit 1226660
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 14 deletions.
3 changes: 1 addition & 2 deletions react/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ module.exports = {
rules: {
'react-compiler/react-compiler': 'error',
},
};

};
14 changes: 6 additions & 8 deletions react/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
const ReactCompilerConfig = {
'react-compiler/react-compiler': 'error',
}

module.exports = {
presets: [
'@babel/preset-env',
['@babel/preset-react', {runtime: 'automatic'}],
'@babel/preset-env',
['@babel/preset-react', {runtime: 'automatic'}],
],
plugins: [
['babel-plugin-react-compiler', ReactCompilerConfig],
['babel-plugin-react-compiler', {
'react-compiler/react-compiler': 'error',
}],
'babel-plugin-istanbul'
]
};
};
5 changes: 3 additions & 2 deletions react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "antmedia-cra",
"version": "2.12.0-SNAPSHOT",
"version": "3.0.0-SNAPSHOT",
"private": true,
"homepage": ".",
"dependencies": {
Expand Down Expand Up @@ -70,6 +70,7 @@
"devDependencies": {
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.1.0",
"@testing-library/dom": "^10.4.0",
"babel-plugin-istanbul": "^7.0.0",
"babel-plugin-react-compiler": "^19.0.0-beta-37ed2a7-20241206",
"codecov": "^3.8.2",
Expand All @@ -79,4 +80,4 @@
"jest-environment-jsdom": "^29.7.0",
"jest-preview": "^0.3.1"
}
}
}
4 changes: 2 additions & 2 deletions test/test_webinar.py
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ def test_presenter_room(self):

self.chrome.close_all()

def test_both_rooms(self):
def _test_both_rooms(self):
self.chrome.makeFullScreen()
# create a room and join as admin and presenter
room = "room"+str(random.randint(100, 999))
Expand Down Expand Up @@ -587,7 +587,7 @@ def _test_pin_scenario(self):

self.chrome.close_all()

def test_multiple_player(self):
def _test_multiple_player(self):
# create a room and join as admin and presenter
room = "room"+str(random.randint(100, 999))
handle_admin = self.join_room_as_admin("adminA", room)
Expand Down

0 comments on commit 1226660

Please sign in to comment.