Skip to content

Commit

Permalink
Fix build process
Browse files Browse the repository at this point in the history
  • Loading branch information
pradel committed Jun 29, 2020
1 parent 2e2bb3a commit e81162a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"name": "blockstack-devtools",
"private": true,
"version": "0.0.1",
"productName": "blockstack-devtool",
"main": "electron/main.js",
"homepage": "./",
"scripts": {
"start": "export BROWSER=none && react-scripts start",
"start-electron": "export ELECTRON_START_URL=http://localhost:3000 && electron .",
"build": "react-scripts build",
"build": "rm -rf build dist && yarn build-react && yarn build-electron && yarn package",
"build-react": "react-scripts build",
"build-electron": "mkdir build/src && cp -r electron/. build/electron",
"package": "electron-builder build --mac --win -c.extraMetadata.main=build/electron/main.js -c.mac.identity=null --publish never",
"test": "react-scripts test",
Expand All @@ -23,7 +23,9 @@
"provider": "github",
"repo": "blockstack-devtool",
"owner": "pradel"
}
},
"productName": "blockstack-devtool",
"appId": "com.leopradel.blockstack-devtool"
},
"dependencies": {
"@blockstack/keychain": "0.6.0",
Expand All @@ -33,6 +35,7 @@
"@emotion/core": "10.0.28",
"@emotion/styled": "10.0.27",
"@reach/tooltip": "0.10.5",
"electron-store": "5.2.0",
"emotion-theming": "10.0.27",
"formik": "2.1.4",
"qrcode.react": "1.0.0",
Expand All @@ -50,7 +53,6 @@
"@types/react-router-dom": "5.1.5",
"electron": "9.0.5",
"electron-builder": "22.7.0",
"electron-store": "5.2.0",
"react-scripts": "3.4.1",
"typescript": "3.9.5"
},
Expand Down
6 changes: 3 additions & 3 deletions src/Router.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React from "react";
import { BrowserRouter, Switch, Route } from "react-router-dom";
import { HashRouter, Switch, Route } from "react-router-dom";
import { Accounts } from "./pages/Accounts";
import { Contracts } from "./pages/Contracts";

export const Router = () => {
return (
<BrowserRouter>
<HashRouter>
<Switch>
<Route path="/" exact>
<Accounts />
Expand All @@ -14,6 +14,6 @@ export const Router = () => {
<Contracts />
</Route>
</Switch>
</BrowserRouter>
</HashRouter>
);
};

0 comments on commit e81162a

Please sign in to comment.