Merge pull request #6 from eAdded/HeadSSR

Head ssr
aniketfuryrocks · Aug 3, 2020 · f31cd70 · f31cd70
2 parents d1f73b0 + 23e9e72
commit f31cd70
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "firejsx",
   "main": "FireJSX.js",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "license": "GPL-3.0-or-later",
   "description": "The React Framework for SSB, SSR and Serverless technologies",
   "keywords": [

diff --git a/src/GlobalsSetter.ts b/src/GlobalsSetter.ts
@@ -1,3 +1,3 @@
 global.FireJSX = {
-    version: "0.9.4"
+    version: "0.9.5"
 }
diff --git a/src/architects/StaticArchitect.ts b/src/architects/StaticArchitect.ts
@@ -1,6 +1,5 @@
 import {join} from "path"
 import Page from "../classes/Page";
-import {Helmet} from "react-helmet"
 
 export interface StaticConfig {
     lib: string,
@@ -81,9 +80,9 @@ export default class {
         ) : ""
         //helmet
         if (this.config.ssr) {
-            const helmet = Helmet.renderStatic();
+            const helmet = global.__FIREJSX_HELMET__.renderStatic();
             for (let helmetKey in helmet)
-                head += helmet[helmetKey].toString()
+                head = helmet[helmetKey].toString() + head
         }
         //concat every thing
         return "<!doctype html>" +

diff --git a/src/architects/WebpackArchitect.ts b/src/architects/WebpackArchitect.ts
@@ -36,8 +36,8 @@ export default class {
                 publicPath: `${this.$.prefix}/${this.$.lib}/`,
                 path: `${this.$.outDir}/${this.$.lib}/`,
                 //hot
-                hotUpdateMainFilename: 'hot/[hash].hot.json',
-                hotUpdateChunkFilename: 'hot/[hash].hot.js'
+                hotUpdateMainFilename: `${this.$.lib}/[hash].hot.json`,
+                hotUpdateChunkFilename: `${this.$.lib}/[hash].hot.js`
             },
             externals: {
                 react: "React",

diff --git a/src/components/Head.js b/src/components/Head.js
@@ -1,2 +1 @@
-import {Helmet} from "react-helmet"
-export default Helmet
+export default window.__FIREJSX_HELMET__
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
@@ -28,6 +28,14 @@ declare module NodeJS {
         React?: any,
         ReactDOM?: any,
         ReactDOMServer?: any,
+        __FIREJSX_HELMET__: {
+            renderStatic: () => {
+                [Key: string]: {
+                    toString: () => string
+                }
+            },
+            canUseDOM: boolean
+        }
     }
 }
 

diff --git a/src/web/externalGroupFull.js b/src/web/externalGroupFull.js
@@ -1,3 +1,5 @@
 global.React = require("react");
 global.ReactDOM = require("react-dom")
-global.ReactDOMServer = require("react-dom/server")
+global.ReactDOMServer = require("react-dom/server")
+global.__FIREJSX_HELMET__ = require("react-helmet").Helmet
+global.__FIREJSX_HELMET__.canUseDOM = false
diff --git a/src/web/externalGroupSemi.js b/src/web/externalGroupSemi.js
@@ -1,3 +1,4 @@
 window.React = require("react");
 window.ReactDOM = require("react-dom")
+window.__FIREJSX_HELMET__ = require("react-helmet").Helmet
 require("./LinkApi.js")
diff --git a/test/src/pages/about/index.jsx b/test/src/pages/about/index.jsx
@@ -12,6 +12,7 @@ Wrap(() => {
         <div>
             <Head>
                 <title>About</title>
+                <meta name={"asd"}/>
             </Head>
             <Loader effect={React.useEffect}>
                 <LoadingBar/>