Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merging dev into master branch #347

Merged
merged 31 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
b3cbfce
updated electron app and tests still working
k-villano Oct 16, 2023
d2ed466
Merge pull request #1 from oslabs-beta/group/packages2
k-villano Oct 16, 2023
ca6cb00
updated jest all tests passing except one, deleted types/jest from pa…
k-villano Oct 17, 2023
7e80c1b
updated jest config jest 29 is functional protoParser test xed out
k-villano Oct 18, 2023
d650d94
Merge pull request #2 from oslabs-beta/group/packages2
k-villano Oct 18, 2023
d34d3a4
removed jest-electron modules due to breaking change in jest update
bhsauro Oct 18, 2023
d1a6f68
moved chai, @testing-library/react, and jest-environment-jsdom to dev…
bhsauro Oct 18, 2023
7e30f1a
updated chai (patch), chai-http (minor), and mocha (major) /no breaki…
bhsauro Oct 18, 2023
741b988
all test libraries (except for istanbul) updated
bhsauro Oct 18, 2023
e7b388b
Merge pull request #3 from oslabs-beta/brooke/testpkgs
bhsauro Oct 18, 2023
cbd2436
working on dev tools
k-villano Oct 18, 2023
4118467
included react dev tools with older version that works
k-villano Oct 18, 2023
4319b8e
reslved merge conflits react dev tools working
k-villano Oct 18, 2023
372ae6e
Merge pull request #4 from oslabs-beta/group/packages2
k-villano Oct 18, 2023
2b32116
update react dev tools to include rbuild folder
k-villano Oct 19, 2023
588f2ab
Merge pull request #5 from oslabs-beta/katya/vm
k-villano Oct 19, 2023
c96abd8
adding instructions for testing GRPC to docs
levinjn01 Oct 19, 2023
a57be1a
Merge pull request #6 from oslabs-beta/jeff/soap
levinjn01 Oct 19, 2023
16aec5f
created new test file for graphQLControllerTests, implemented test fo…
bhsauro Oct 30, 2023
db6554e
added handleError and handleResponse tests
bhsauro Oct 31, 2023
f1ed42f
finished cleanup of graphQL unit tests
bhsauro Oct 31, 2023
bade5f0
Merge pull request #7 from oslabs-beta/brooke/unittests
bhsauro Oct 31, 2023
c4e2cfc
added assertion testing to http2 functionality
k-villano Oct 31, 2023
2b76893
Merge branch 'dev' into katya/replacevm
k-villano Oct 31, 2023
f6be548
Merge pull request #8 from oslabs-beta/katya/replacevm
k-villano Oct 31, 2023
c8562e6
exploritory buttons removed and github button modified
AArCruz Nov 1, 2023
839f291
Merge pull request #9 from oslabs-beta/AArCruz/buttons
k-villano Nov 1, 2023
4798cb8
wrote http collection tests
bhsauro Nov 1, 2023
d665203
merged in dev
bhsauro Nov 1, 2023
e0357cb
Merge pull request #10 from oslabs-beta/brooke/featuretests
bhsauro Nov 1, 2023
5f9ae85
Update DEV-README.md
k-villano Nov 1, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added ReactDevToolsWebExtDep/icons/128-deadcode.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/128-development.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/128-disabled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/128-outdated.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/128-production.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/128-restricted.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/128-unminified.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/16-deadcode.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/16-development.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/16-disabled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/16-outdated.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/16-production.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/16-restricted.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/16-unminified.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/32-deadcode.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/32-development.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/32-disabled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/32-outdated.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/32-production.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/32-restricted.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/32-unminified.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/48-deadcode.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/48-development.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/48-disabled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/48-outdated.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ReactDevToolsWebExtDep/icons/48-production.png
Binary file added ReactDevToolsWebExtDep/icons/48-restricted.png
Binary file added ReactDevToolsWebExtDep/icons/48-unminified.png
1 change: 1 addition & 0 deletions ReactDevToolsWebExtDep/icons/deadcode.svg
1 change: 1 addition & 0 deletions ReactDevToolsWebExtDep/icons/development.svg
1 change: 1 addition & 0 deletions ReactDevToolsWebExtDep/icons/disabled.svg
1 change: 1 addition & 0 deletions ReactDevToolsWebExtDep/icons/outdated.svg
1 change: 1 addition & 0 deletions ReactDevToolsWebExtDep/icons/production.svg
1 change: 1 addition & 0 deletions ReactDevToolsWebExtDep/icons/restricted.svg
9 changes: 9 additions & 0 deletions ReactDevToolsWebExtDep/main.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<script src="./rbuild/main.js"></script>
</head>
<body>
</body>
</html>
55 changes: 55 additions & 0 deletions ReactDevToolsWebExtDep/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"manifest_version": 2,
"name": "React Developer Tools",
"description": "Adds React debugging tools to the Firefox Developer Tools.\n\nCreated from revision f7d56173f on 1/27/2023.",
"version": "4.27.1",
"version_name": "4.27.1 (1/27/2023)",
"minimum_chrome_version": "60",
"icons": {
"16": "icons/16-production.png",
"32": "icons/32-production.png",
"48": "icons/48-production.png",
"128": "icons/128-production.png"
},
"browser_action": {
"default_icon": {
"16": "icons/16-disabled.png",
"32": "icons/32-disabled.png",
"48": "icons/48-disabled.png",
"128": "icons/128-disabled.png"
},
"default_popup": "popups/disabled.html",
"browser_style": true
},
"devtools_page": "main.html",
"content_security_policy": "script-src 'self' 'unsafe-eval' blob:; object-src 'self'",
"web_accessible_resources": [
"main.html",
"panel.html",
"rbuild/react_devtools_backend.js",
"rbuild/proxy.js",
"rbuild/renderer.js",
"rbuild/installHook.js"
],
"background": {
"scripts": [
"rbuild/background.js"
]
},
"permissions": [
"file:///*",
"http://*/*",
"https://*/*"
],
"content_scripts": [
{
"matches": [
"<all_urls>"
],
"js": [
"rbuild/prepareInjection.js"
],
"run_at": "document_start"
}
]
}
32 changes: 32 additions & 0 deletions ReactDevToolsWebExtDep/panel.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<!doctype html>
<html style="display: flex">
<head>
<meta charset="utf8">
<style>
html {
display: flex;
}
body {
margin: 0;
padding: 0;
flex: 1;
display: flex;
}
#container {
display: flex;
flex: 1;
width: 100%;
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
}
</style>
</head>
<body>
<!-- main react mount point -->
<div id="container">Unable to find React on the page.</div>
<script src="./rbuild/panel.js"></script>
</body>
</html>
28 changes: 28 additions & 0 deletions ReactDevToolsWebExtDep/popups/deadcode.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<script src="shared.js"></script>
<link rel="stylesheet" href="shared.css" />
<style>
html, body {
min-width: 460px;
min-height: 133px;
}

hr {
width: 100%;
}
</style>
<p>
<b>This page includes an extra development build of React. &#x1f6a7;</b>
</p>
<p>
The React build on this page includes both development and production versions because dead code elimination has not been applied correctly.
<br />
<br />
This makes its size larger, and causes React to run slower.
<br />
<br />
Make sure to <a href="https://reactjs.org/docs/optimizing-performance.html#use-the-production-build">set up dead code elimination</a> before deployment.
</p>
<hr />
<p>
Open the developer tools, and "Components" and "Profiler" tabs will appear to the right.
</p>
24 changes: 24 additions & 0 deletions ReactDevToolsWebExtDep/popups/development.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<script src="shared.js"></script>
<link rel="stylesheet" href="shared.css" />
<style>
html, body {
min-width: 460px;
min-height: 101px;
}

hr {
width: 100%;
}
</style>
<p>
<b>This page is using the development build of React. &#x1f6a7;</b>
</p>
<p>
Note that the development build is not suitable for production.
<br />
Make sure to <a href="https://reactjs.org/docs/optimizing-performance.html#use-the-production-build">use the production build</a> before deployment.
</p>
<hr />
<p>
Open the developer tools, and "Components" and "Profiler" tabs will appear to the right.
</p>
17 changes: 17 additions & 0 deletions ReactDevToolsWebExtDep/popups/disabled.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<script src="shared.js"></script>
<link rel="stylesheet" href="shared.css" />
<style>
html, body {
min-width: 410px;
min-height: 33px;
}

hr {
width: 100%;
}
</style>
<p>
<b>This page doesn&rsquo;t appear to be using React.</b>
<br />
If this seems wrong, follow the <a href="https://github.com/facebook/react/tree/main/packages/react-devtools#the-react-tab-doesnt-show-up">troubleshooting instructions</a>.
</p>
25 changes: 25 additions & 0 deletions ReactDevToolsWebExtDep/popups/outdated.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<script src="shared.js"></script>
<link rel="stylesheet" href="shared.css" />
<style>
html, body {
min-width: 460px;
min-height: 117px;
}

hr {
width: 100%;
}
</style>
<p>
<b>This page is using an outdated version of React. &#8987;</b>
</p>
<p>
We recommend updating React to ensure that you receive important bugfixes and performance improvements.
<br />
<br />
You can find the upgrade instructions on the <a href="https://reactjs.org/blog/">React blog</a>.
</p>
<hr />
<p>
Open the developer tools, and "Components" and "Profiler" tabs will appear to the right.
</p>
17 changes: 17 additions & 0 deletions ReactDevToolsWebExtDep/popups/production.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<script src="shared.js"></script>
<link rel="stylesheet" href="shared.css" />
<style>
html, body {
min-width: 460px;
min-height: 39px;
}

hr {
width: 100%;
}
</style>
<p>
<b>This page is using the production build of React. &#x2705;</b>
<br />
Open the developer tools, and "Components" and "Profiler" tabs will appear to the right.
</p>
14 changes: 14 additions & 0 deletions ReactDevToolsWebExtDep/popups/restricted.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<script src="shared.js"></script>
<link rel="stylesheet" href="shared.css" />
<style>
html, body {
min-width: 286px;
min-height: 33px;
}

</style>
<p>
<b>This is a restricted browser page.</b>
<br />
React devtools cannot access this page.
</p>
7 changes: 7 additions & 0 deletions ReactDevToolsWebExtDep/popups/shared.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
html, body {
font-size: 14px;
}

body {
margin: 8px;
}
25 changes: 25 additions & 0 deletions ReactDevToolsWebExtDep/popups/shared.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/* globals chrome */

'use strict';

document.addEventListener('DOMContentLoaded', function() {
// Make links work
const links = document.getElementsByTagName('a');
for (let i = 0; i < links.length; i++) {
(function() {
const ln = links[i];
const location = ln.href;
ln.onclick = function() {
chrome.tabs.create({active: true, url: location});
return false;
};
})();
}

// Work around https://bugs.chromium.org/p/chromium/issues/detail?id=428044
document.body.style.opacity = 0;
document.body.style.transition = 'opacity ease-out .4s';
requestAnimationFrame(function() {
document.body.style.opacity = 1;
});
});
31 changes: 31 additions & 0 deletions ReactDevToolsWebExtDep/popups/unminified.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<script src="shared.js"></script>
<style>
html, body {
font-size: 14px;
min-width: 460px;
min-height: 133px;
}

body {
margin: 8px;
}

hr {
width: 100%;
}
</style>
<p>
<b>This page is using an unminified build of React. &#x1f6a7;</b>
</p>
<p>
The React build on this page appears to be unminified.
<br />
This makes its size larger, and causes React to run slower.
<br />
<br />
Make sure to <a href="https://reactjs.org/docs/optimizing-performance.html#use-the-production-build">set up minification</a> before deployment.
</p>
<hr />
<p>
Open the developer tools, and "Components" and "Profiler" tabs will appear to the right.
</p>
Loading