version 0.2.0-alpha4

TomaszPilch · Dec 11, 2020 · 8b3d8d1 · 8b3d8d1
1 parent 66d86f5
commit 8b3d8d1
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -19,6 +19,14 @@ CLIENT_SECRET
 CLIENT_ID
 NODE_ENV
 LOCALE_PASS
+APP_TITLE
+```
+
+## Link
+
+```
+node .\scripts\prelink.js
+yarn link @bheui\components
 ```
 
 ## Created from BHE be v1

diff --git a/next.config.js b/next.config.js
@@ -8,6 +8,7 @@ module.exports = {
     localeSubpaths,
     apiUrl: process.env.API_URL,
     copyright: process.env.COPYRIGHT,
+    appTitle: process.env.APP_TITLE || 'DevX BE',
   },
   serverRuntimeConfig: {
     clientSecret: process.env.CLIENT_SECRET,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bhe-be-ui-v2",
-  "version": "0.2.0-alpha3",
+  "version": "0.2.0-alpha4",
   "private": true,
   "scripts": {
     "dev": "node server.js",
@@ -18,8 +18,8 @@
     }
   },
   "dependencies": {
-    "@bheui/components": "1.0.0-alpha12",
-    "@bheui/server-functions": "^0.1.2",
+    "@bheui/components": "1.0.0-alpha13",
+    "@bheui/server-functions": "^0.1.3",
     "@fluentui/react": "^7.153.3",
     "@uifabric/experiments": "^7.36.19",
     "@uifabric/fluent-theme": "^7.3.47",

diff --git a/pages/_app.jsx b/pages/_app.jsx
@@ -4,6 +4,8 @@ import Head from 'next/head'
 import App from 'next/app'
 import { Provider } from 'react-redux'
 import { initializeIcons } from '@uifabric/icons'
+import getConfig from 'next/config'
+
 import withReduxAndAxios from '@bheui/components/lib/components/WithReduxAndAxios'
 
 import '../src/styles/main.scss'
@@ -16,6 +18,8 @@ import createApis from '../src/store/createApis'
 type AppTypes = {}
 
 initializeIcons()
+
+const { publicRuntimeConfig } = getConfig()
 class MyApp extends App<AppTypes> {
   componentDidCatch(error, info) {
     console.error(error)
@@ -28,7 +32,7 @@ class MyApp extends App<AppTypes> {
     return (
       <>
         <Head>
-          <title>DevX NextJS starterpack</title>
+          <title>{publicRuntimeConfig.appTitle}</title>
         </Head>
         <Provider store={store}>
           <Component {...pageProps} router={router} setToken={setToken} t={t} />

diff --git a/scripts/postlink.js b/scripts/postlink.js
@@ -11,3 +11,9 @@ const runCommand = (cmd) => {
 runCommand('cd node_modules/react & yarn unlink')
 runCommand('cd node_modules/react-redux & yarn unlink')
 runCommand('cd node_modules/next & yarn unlink')
+runCommand('cd node_modules/@fluentui/react & yarn unlink')
+runCommand('cd node_modules/@uifabric/experiments & yarn unlink')
+runCommand('cd node_modules/office-ui-fabric-core & yarn unlink')
+runCommand('cd node_modules/office-ui-fabric-react & yarn unlink')
+runCommand('cd node_modules/react & yarn unlink')
+runCommand('cd node_modules/react-dom & yarn unlink')
diff --git a/scripts/prelink.js b/scripts/prelink.js
@@ -11,3 +11,9 @@ const runCommand = (cmd) => {
 runCommand('cd node_modules/react & yarn link')
 runCommand('cd node_modules/react-redux & yarn link')
 runCommand('cd node_modules/next & yarn link')
+runCommand('cd node_modules/@fluentui/react & yarn link')
+runCommand('cd node_modules/@uifabric/experiments & yarn link')
+runCommand('cd node_modules/office-ui-fabric-core & yarn link')
+runCommand('cd node_modules/office-ui-fabric-react & yarn link')
+runCommand('cd node_modules/react & yarn link')
+runCommand('cd node_modules/react-dom & yarn link')
diff --git a/server.js b/server.js
@@ -26,8 +26,8 @@ const renderPageOrContinue = (req, res, nextCl) => {
   return app.render(req, res, req.path, query)
 }
 
-app.prepare().then(() => {
-  processLocale()
+app.prepare().then(async () => {
+  await processLocale()
 
   const server = express()
   server.use(`/static`, express.static('public'))

diff --git a/yarn.lock b/yarn.lock
@@ -464,10 +464,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@bheui/components@1.0.0-alpha12":
-  version "1.0.0-alpha12"
-  resolved "https://registry.yarnpkg.com/@bheui/components/-/components-1.0.0-alpha12.tgz#5778267bf121f5072194b23aaf2a21ce144a7de9"
-  integrity sha512-k9d6FzgVjnB6WlKBDGXWXMIhiSP7gwvVO8TlDui51SeIHRaNA7aXzh4CDCGhxzIOKYiZuEaTnNizcqoHCMC/fg==
+"@bheui/components@1.0.0-alpha13":
+  version "1.0.0-alpha13"
+  resolved "https://registry.yarnpkg.com/@bheui/components/-/components-1.0.0-alpha13.tgz#22bcd80513be7d89b7541c10c6332dc902d001f7"
+  integrity sha512-fv29yr5Fm52OszkqjbXZxTtPBD7Peaj53vTUHKvC+eMQykz3IbU785ellUaml7asUHDX1G80BUpFMIAscI/7cw==
   dependencies:
     "@uppy/core" "^1.14.0"
     "@uppy/react" "^1.10.10"
@@ -489,10 +489,10 @@
     typescript "^4.0.5"
     uuid "^8.3.1"
 
-"@bheui/server-functions@^0.1.2":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@bheui/server-functions/-/server-functions-0.1.2.tgz#739d7c36ad0450b1daea3390df3af38b9ef9fb51"
-  integrity sha512-4fi9G3xI7jvPOCf2/G9luOgHDMyHU63+hAu10/1AMoR2pJp1AzwqaUVqESqcT63MIsxldYM05dbA6oK5lkdi0g==
+"@bheui/server-functions@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@bheui/server-functions/-/server-functions-0.1.3.tgz#d7b0b9e2a703c978dc78043c2cee5fbae1f28a79"
+  integrity sha512-8m5NE9PcuL3PUGiw5EZF2vd6VGnfKK1VmCY1vjQ/lrsCMtNH1a9lesxyapaGTuFf9NDci3HCq4RtKEUwAaaKTg==
   dependencies:
     ramda "^0.27.1"
     typescript "^4.1.2"