diff --git a/components/structure.tsx b/components/structure.tsx index 82b757d..b44b5f6 100644 --- a/components/structure.tsx +++ b/components/structure.tsx @@ -1,7 +1,6 @@ import {CaretDownOutlined, UserOutlined} from '@ant-design/icons' import {MenuFoldOutlined, MenuUnfoldOutlined} from '@ant-design/icons/lib' import {Dropdown, Layout, Menu, PageHeader, Spin, Tag} from 'antd' -import getConfig from 'next/config' import Link from 'next/link' import {useRouter} from 'next/router' import React, {FunctionComponent} from 'react' @@ -9,8 +8,6 @@ import {sideMenu, SideMenuElement} from './sidemenu' import {useWindowSize} from './use.window.size' import {clearAuth} from './with.auth' -const { publicRuntimeConfig } = getConfig() - const { SubMenu, ItemGroup } = Menu const { Header, Content, Sider } = Layout @@ -200,7 +197,7 @@ const Structure: FunctionComponent = (props) => { marginTop: 40, }} > - Version: {publicRuntimeConfig.version} + Version: {process.env.version} diff --git a/next.config.js b/next.config.js index ab07baf..8f08565 100644 --- a/next.config.js +++ b/next.config.js @@ -4,8 +4,11 @@ const p = require('./package.json') const version = p.version; module.exports = withImages({ + poweredByHeader: false, publicRuntimeConfig: { endpoint: process.env.API_HOST || '/graphql', + }, + env: { version, } }) diff --git a/pages/_app.tsx b/pages/_app.tsx index 3654882..c7bbb1f 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -34,5 +34,11 @@ const App: React.FC = ({ Component, pageProps }) => { ) } -export default wrapper.withRedux(App) -// export default App +const WrappedApp = wrapper.withRedux(App) + +WrappedApp.getInitialProps = async (): Promise => { + // important for now to pass public runtime config to clients! + return {} +} + +export default WrappedApp