diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1ea893639..308577fe1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -169,10 +169,9 @@ jobs: - name: Build web to deploy to github page if: runner.os != 'windows' run: | - rm -rf dist || true + rm -rf dist cp -Rf webpack.config.gh-pages.js webpack.config.js npm run build - cp dist/index.html dist/index.php - name: Deploy build/dist folder to github pages uses: s0/git-publish-subdir-action@develop diff --git a/src/App.tsx b/src/App.tsx index ec6e2f172..519624832 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,6 +1,6 @@ import classnames from "classnames"; import * as React from "react"; -import { Link, NavLink, Redirect, Route, Switch } from "react-router-dom"; +import { Link, NavLink, Redirect, Route, Switch, HashRouter } from "react-router-dom"; import { CoverageType, Pokemon } from "./data"; import ScreenDefense from "./ScreenDefense"; import ScreenInfo from "./ScreenInfo"; @@ -49,12 +49,14 @@ export default function App() {