added server defaults #58 and fixed upgraded pkgs

alidcast · Jul 20, 2018 · 6285c13 · 6285c13
1 parent b0f3d67
commit 6285c13
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/packages/rogue-app/lib/server/app.ts b/packages/rogue-app/lib/server/app.ts
@@ -5,13 +5,17 @@ import appMiddleware from './appMiddleware'
 type MiddlewareArgs = Function/*handler*/ | [string/*route*/, Function/*handler*/]
 type Middlewares = Array<MiddlewareArgs>
 
+const defaults = {
+  bundleUrl: 'bundle.js'
+}
+
 export default class App {
   app: any 
   preMiddlewares: Middlewares
   postMiddlewares: Middlewares
   initialized: boolean 
 
-  constructor (App: React.ComponentType<any>, { bundleUrl }) {
+  constructor (App: React.ComponentType<any>, { bundleUrl } = defaults) {
     this.app = connect() 
     this.preMiddlewares = []
     this.postMiddlewares = [appMiddleware(App, bundleUrl)]

diff --git a/packages/rogue-app/lib/server/toHtml.ts b/packages/rogue-app/lib/server/toHtml.ts
@@ -22,7 +22,7 @@ export default function toHtml ({
     </head>
     <body ${helmet.bodyAttributes.toString()}>
       <div id="${APP_ID}">${markup}</div>
-      <script src="${bundleUrl || 'bundle.js'}" defer></script>
+      <script src="${bundleUrl}" defer></script>
       <script>window.${DATA_KEY} = ${serialize(data)};</script>
       ${(bodyTags || []).join('/n')}
     </body>

diff --git a/packages/rogue-app/package.json b/packages/rogue-app/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@roguejs/app",
-	"version": "0.6.10",
+	"version": "0.6.11",
 	"description": "A SSR experience for React that is quick and invisible",
 	"repository": "https://github.com/alidcastano/rogue/blob/master/packages/rogue-app",
 	"author": "Alid Castano",

diff --git a/packages/rogue-cli/package.json b/packages/rogue-cli/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@roguejs/cli",
-	"version": "0.6.0",
+	"version": "0.6.11",
 	"repository": "https://github.com/alidcastano/rogue/tree/master/packages/rogue-cli",
 	"author": "Alid Castano",
 	"license": "MIT",

diff --git a/packages/rogue-hocs/package.json b/packages/rogue-hocs/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@roguejs/hocs",
-	"version": "0.6.8",
+	"version": "0.6.11",
 	"repository": "https://github.com/alidcastano/rogue/tree/master/packages/rogue-hocs",
 	"author": "Alid Castano",
 	"license": "MIT",

diff --git a/packages/rogue-hocs/styled-components/index.js b/packages/rogue-hocs/styled-components/index.js
@@ -14,7 +14,7 @@ const withStyles = (theme = {}) => App => {
 
   RogueStyledProvider.getInitialProps = async function (ctx) {
     const sheet = new ServerStyleSheet()
-    sheet.collectStyles(ctx.app.Component)
+    sheet.collectStyles(ctx.app.routable(App))
     ctx.app.headTags.push(sheet.getStyleTags())
 
     let props = {}