-
-
Notifications
You must be signed in to change notification settings - Fork 141
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #351 from oslabs-beta/master
feat: Swell v1.18
- Loading branch information
Showing
119 changed files
with
2,665 additions
and
1,568 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Large diffs are not rendered by default.
Oops, something went wrong.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,17 @@ | ||
<!DOCTYPE html> | ||
<html lang="en"> | ||
<head> | ||
<meta charset="UTF-8" /> | ||
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
<title>Swell</title> | ||
</head> | ||
|
||
<body></body> | ||
</html> | ||
|
||
<head> | ||
<meta charset="UTF-8" /> | ||
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
<title> | ||
<%= htmlWebpackPlugin.options.title %> | ||
</title> | ||
</head> | ||
|
||
<body> | ||
<div id="root"></div> | ||
|
||
</body> | ||
|
||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
{ | ||
"name": "swell", | ||
"version": "1.17.0", | ||
"version": "1.18.0", | ||
"description": "Swell", | ||
"main": "main.js", | ||
"repository": "https://github.com/open-source-labs/Swell", | ||
"scripts": { | ||
"report": "istanbul report --dir ./test/coverage/total-coverage html", | ||
"test": "webpack --mode=production --config ./webpack.production.js && cross-env process.env.NODE_ENV=test nyc --report-dir ./test/coverage/mocha-coverage --reporter json --reporter text --reporter html mocha --timeout 3000 --exit", | ||
"test": "jest && webpack --mode=production --config ./webpack.production.js && cross-env process.env.NODE_ENV=test nyc --report-dir ./test/coverage/mocha-coverage --reporter json --reporter text --reporter html mocha --timeout 15000 --exit", | ||
"server-sse": "node ./test/SSE_HTTP1_server.js", | ||
"server-gql": "node ./test/graphqlServer.mjs", | ||
"server-grpc": "node ./test/grpcServer.js", | ||
|
@@ -16,7 +16,7 @@ | |
"server-websocket": "node ./test/websocketServer.js", | ||
"server-webrtc": "node ./test/webrtcWSServer.js", | ||
"test-jest": "jest", | ||
"test-mocha": "webpack --mode=production --config ./webpack.production.js && cross-env process.env.NODE_ENV=test mocha --timeout 3000 --exit", | ||
"test-mocha": "webpack --mode=production --config ./webpack.production.js && cross-env process.env.NODE_ENV=test nyc --report-dir ./test/coverage/mocha-coverage --reporter json --reporter text --reporter html mocha --timeout 15000 --exit", | ||
"test-mocha-zero": "webpack --mode=production --config ./webpack.production.js && cross-env process.env.NODE_ENV=test mocha --timeout 0 --exit", | ||
"format": "prettier --write \"**/*.+(js|jsx| tsx| json|css|md)\"", | ||
"lint": "eslint .", | ||
|
@@ -97,8 +97,9 @@ | |
"dependencies": { | ||
"@apollo/client": "^3.5.0", | ||
"@apollo/server": "^4.6.0", | ||
"@emotion/react": "^11.11.1", | ||
"@emotion/styled": "^11.11.0", | ||
"@emotion/cache": "^11.11.0", | ||
"@emotion/react": "^11.11.4", | ||
"@emotion/styled": "^11.11.5", | ||
"@graphql-tools/schema": "^8.3.10", | ||
"@grpc/grpc-js": "^1.6.7", | ||
"@grpc/proto-loader": "^0.6.9", | ||
|
@@ -115,6 +116,7 @@ | |
"bulma": "^0.9.3", | ||
"bulma-checkradio": "^2.1.3", | ||
"bulma-switch": "^2.0.4", | ||
"chai": "^4.3.10", | ||
"classnames": "^2.3.1", | ||
"cookie-parser": "^1.4.6", | ||
"cors": "^2.8.5", | ||
|
@@ -127,10 +129,11 @@ | |
"electron-devtools-installer": "^3.2.0", | ||
"electron-log": "^4.4.6", | ||
"electron-updater": "^5.3.0", | ||
"esm": "^3.2.25", | ||
"eventsource": "^2.0.1", | ||
"express": "^4.18.0", | ||
"express-sse": "^0.5.3", | ||
"fs": "0.0.1-security", | ||
"fs": "^0.0.1-security", | ||
"fs-extra": "^10.1.0", | ||
"graphql": "^16.4.0", | ||
"graphql-tag": "^2.12.6", | ||
|
@@ -184,6 +187,7 @@ | |
"@testing-library/jest-dom": "^6.1.4", | ||
"@testing-library/react": "^14.0.0", | ||
"@types/cookie": "^0.5.1", | ||
"@types/cookie-parser": "^1.4.7", | ||
"@types/node": "^17.0.28", | ||
"@types/react": "^18.0.8", | ||
"@types/react-dom": "^18.0.0", | ||
|
@@ -196,7 +200,6 @@ | |
"@typescript-eslint/eslint-plugin": "^5.21.0", | ||
"@typescript-eslint/parser": "^5.21.0", | ||
"babel-loader": "^8.2.5", | ||
"chai": "^4.3.10", | ||
"chai-http": "^4.4.0", | ||
"concurrently": "^8.0.1", | ||
"cross-env": "^7.0.3", | ||
|
@@ -227,12 +230,13 @@ | |
"postcss-pxtorem": "^6.0.0", | ||
"prettier": "^2.6.2", | ||
"prettier-eslint": "^14.0.1", | ||
"redux-mock-store": "^1.5.4", | ||
"sass-loader": "^12.6.0", | ||
"source-map-loader": "^3.0.1", | ||
"style-loader": "^3.3.1", | ||
"ts-migrate": "^0.1.28", | ||
"ts-node": "^10.9.1", | ||
"typescript": "^4.6.3", | ||
"ts-node": "^10.9.2", | ||
"typescript": "^4.9.5", | ||
"url-loader": "^4.1.1", | ||
"webpack": "^5.72.0", | ||
"webpack-bundle-analyzer": "^4.5.0", | ||
|
@@ -247,6 +251,31 @@ | |
"url": "http://www.getswell.io" | ||
}, | ||
"contributors": [ | ||
{ | ||
"name": "Carter Sarkela", | ||
"email": "[email protected]", | ||
"url": "https://github.com/CarterSarkela" | ||
}, | ||
{ | ||
"name": "Karol Krzywon", | ||
"email": "[email protected]", | ||
"url": "https://github.com/kkrzywon" | ||
}, | ||
{ | ||
"name": "Howard Sun", | ||
"email": "[email protected]", | ||
"url": "https://github.com/howardCodeGit" | ||
}, | ||
{ | ||
"name": "Michael Underbrink", | ||
"email": "[email protected]", | ||
"url": "https://github.com/MUnderbrink90" | ||
}, | ||
{ | ||
"name": "Adeeb Bayat", | ||
"email": "[email protected]", | ||
"url": "https://github.com/adeebbayat" | ||
}, | ||
{ | ||
"name": "Chris Suzukida", | ||
"email": "[email protected]", | ||
|
@@ -543,3 +572,4 @@ | |
} | ||
] | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -266,4 +266,4 @@ | |
display: flex; | ||
align-content: center; | ||
flex-direction: column; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import * as React from 'react'; | ||
import { useState } from 'react'; | ||
|
||
function Versions(): JSX.Element { | ||
const [versions] = useState(window.api.versions); | ||
|
||
return ( | ||
<ul className="versions"> | ||
<li className="electron-version">Electron v{versions.electron}</li> | ||
<li className="chrome-version">Chromium v{versions.chrome}</li> | ||
<li className="node-version">Node v{versions.node}</li> | ||
</ul> | ||
); | ||
} | ||
|
||
export default Versions; | ||
|
Oops, something went wrong.