Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
101 changes: 50 additions & 51 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,91 +59,90 @@
"dependencies": {
"electron": "^9.0.4",
"prismjs": "^1.21.0",
"ws": "^7.3.1"
"ws": "^7.4.5"
},
"devDependencies": {
"@babel/core": "^7.11.5",
"@babel/plugin-proposal-class-properties": "^7.10.4",
"@babel/plugin-proposal-optional-chaining": "^7.11.0",
"@babel/preset-env": "^7.11.5",
"@babel/preset-react": "^7.10.4",
"@babel/preset-typescript": "^7.10.4",
"@fortawesome/fontawesome-svg-core": "^1.2.30",
"@fortawesome/free-solid-svg-icons": "^5.14.0",
"@fortawesome/react-fontawesome": "^0.1.11",
"@babel/core": "^7.13.16",
"@babel/plugin-proposal-class-properties": "^7.13.0",
"@babel/plugin-proposal-optional-chaining": "^7.13.12",
"@babel/preset-env": "^7.13.15",
"@babel/preset-react": "^7.13.13",
"@babel/preset-typescript": "^7.13.0",
"@fortawesome/fontawesome-svg-core": "^1.2.35",
"@fortawesome/free-solid-svg-icons": "^5.15.3",
"@fortawesome/react-fontawesome": "^0.1.14",
"@types/chrome": "0.0.122",
"@types/codemirror": "0.0.97",
"@types/d3-scale": "^2.2.0",
"@types/enzyme": "^3.10.5",
"@types/enzyme-adapter-react-16": "^1.0.6",
"@types/enzyme": "^3.10.8",
"@types/fast-json-stable-stringify": "^2.0.0",
"@types/graphql": "^14.5.0",
"@types/jest": "^26.0.13",
"@types/jest-environment-puppeteer": "^4.3.2",
"@types/jest-image-snapshot": "^4.1.0",
"@types/jest": "^26.0.23",
"@types/jest-environment-puppeteer": "^4.4.1",
"@types/jest-image-snapshot": "^4.3.0",
"@types/nanoid": "^2.1.0",
"@types/prismjs": "^1.16.1",
"@types/prismjs": "^1.16.5",
"@types/puppeteer": "^3.0.1",
"@types/react": "^16.9.49",
"@types/react-dom": "^16.9.8",
"@types/react-router": "^5.1.8",
"@types/react-router-dom": "^5.1.5",
"@types/resize-observer-browser": "^0.1.3",
"@types/semver": "^7.3.3",
"@types/styled-components": "^5.1.3",
"@types/ws": "^7.2.6",
"@typescript-eslint/eslint-plugin": "^4.3.0",
"@typescript-eslint/parser": "^4.3.0",
"@types/react": "^17.0.4",
"@types/react-dom": "^17.0.3",
"@types/react-router": "^5.1.13",
"@types/react-router-dom": "^5.1.7",
"@types/resize-observer-browser": "^0.1.5",
"@types/semver": "^7.3.5",
"@types/styled-components": "^5.1.9",
"@types/ws": "^7.4.1",
"@typescript-eslint/eslint-plugin": "^4.22.0",
"@typescript-eslint/parser": "^4.22.0",
"@urql/core": "^2.0.0",
"@urql/devtools": "https://pkg.csb.dev/FormidableLabs/urql-devtools-exchange/commit/89b2a7aa/@urql/devtools",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
"awesome-typescript-loader": "^5.2.1",
"babel-jest": "^26.3.0",
"babel-loader": "^8.1.0",
"babel-jest": "^26.6.3",
"babel-loader": "^8.2.2",
"babel-plugin-inline-react-svg": "andyrichardson/babel-plugin-inline-react-svg#refs",
"babel-plugin-styled-components": "^1.11.1",
"bestzip": "^2.1.7",
"babel-plugin-styled-components": "^1.12.0",
"bestzip": "^2.2.0",
"clean-webpack-plugin": "^3.0.0",
"codemirror": "^5.57.0",
"codemirror": "^5.61.0",
"codemirror-graphql": "^0.12.1",
"concurrently": "^5.3.0",
"copy-webpack-plugin": "^6.1.0",
"csp-html-webpack-plugin": "^4.0.0",
"css-loader": "^3.6.0",
"d3-scale": "^3.2.2",
"d3-scale": "^3.3.0",
"dotenv": "^8.2.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.4",
"enzyme-to-json": "^3.5.0",
"eslint": "^7.8.1",
"enzyme-to-json": "^3.6.2",
"eslint": "^7.25.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-react": "^7.20.6",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-react": "^7.23.2",
"fast-json-stable-stringify": "^2.1.0",
"graphql": "^14.7.0",
"graphql-tag": "^2.11.0",
"html-webpack-plugin": "^4.4.1",
"husky": "^4.2.5",
"identity-obj-proxy": "^3.0.0",
"jest": "^26.4.2",
"jest-image-snapshot": "^4.2.0",
"jest-styled-components": "^7.0.3",
"lint-staged": "^10.3.0",
"nanoid": "^3.1.12",
"jest": "^26.6.3",
"jest-image-snapshot": "^4.4.1",
"jest-styled-components": "^7.0.4",
"lint-staged": "^10.5.4",
"nanoid": "^3.1.22",
"polished": "^3.6.6",
"prettier": "^2.1.1",
"prettier": "^2.2.1",
"puppeteer": "^3.3.0",
"react": "^16.13.1",
"react-cosmos": "5.4.0",
"react-dom": "^16.13.1",
"react": "^17.0.2",
"react-cosmos": "5.6.2",
"react-dom": "^17.0.2",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-spring": "^8.0.27",
"semver": "^7.3.2",
"react-spring": "^9.1.2",
"semver": "^7.3.5",
"style-loader": "^1.2.1",
"styled-components": "^5.1.1",
"styled-components": "^5.2.3",
"terser-webpack-plugin": "^4.2.2",
"ts-jest": "^26.3.0",
"typescript": "^4.0.3",
"ts-jest": "^26.5.5",
"typescript": "^4.2.4",
"web-ext": "^5.1.0",
"webpack": "^4.44.1",
"webpack-cli": "^3.3.12",
Expand Down
4 changes: 2 additions & 2 deletions src/panel/__snapshots__/App.test.tsx.snap
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`App on mount matches snapshot 1`] = `
<ThemeProvider
<Component
theme={
Object {
"blue": Object {
Expand Down Expand Up @@ -205,7 +205,7 @@ exports[`App on mount matches snapshot 1`] = `
</DevtoolsProvider>
</ErrorBoundary>
<GlobalStyle />
</ThemeProvider>
</Component>
`;

exports[`App routes on mount on connected matches snapshot 1`] = `
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

exports[`on mount matches snapshot 1`] = `
<Fragment>
<Memo(GlobalStyleComponent) />
<Memo(l) />
<Container>
<Logo />
<Header>
Expand Down
4 changes: 2 additions & 2 deletions src/panel/pages/explorer/hooks/useFlash.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const flashState = { background: "rgba(255, 255, 255, 1)" };

type Flash = () => void;

type UseFlashResponse = [React.CSSProperties, Flash];
type UseFlashResponse = [any, Flash];

/** Hook for flashing a screen element */
export const useFlash = (): UseFlashResponse => {
Expand All @@ -23,5 +23,5 @@ export const useFlash = (): UseFlashResponse => {
[setSpring]
);

return [props as React.CSSProperties, flash];
return [props, flash];
};
4 changes: 3 additions & 1 deletion src/setupTests.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import "jest-styled-components";
import { configure } from "enzyme";
import Adapter from "enzyme-adapter-react-16";
// @TODO: use the official adapter when its published.
// More info: https://github.com/enzymejs/enzyme/issues/2429
import Adapter from "@wojtekmaj/enzyme-adapter-react-17";
import puppeteer from "puppeteer";

process.env.BUILD_ENV = "extension";
Expand Down
Loading