Skip to content

Commit edff139

Browse files
committed
feat(helmet): update helmet version
1 parent 11a2771 commit edff139

4 files changed

Lines changed: 7 additions & 9 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"@types/react": "^15.0.18",
5656
"@types/react-addons-test-utils": "^0.14.16",
5757
"@types/react-dom": "^0.14.20",
58-
"@types/react-helmet": "5.0.0",
58+
"@types/react-helmet": "^5.0.0",
5959
"@types/react-redux": "^4.4.38",
6060
"@types/react-router": "^3.0.3",
6161
"@types/react-router-redux": "^4.0.38",
@@ -125,7 +125,7 @@
125125
"isomorphic-fetch": "^2.2.1",
126126
"react": "~15.4.2",
127127
"react-dom": "~15.4.2",
128-
"react-helmet": "^4.0.0",
128+
"react-helmet": "^5.0.2",
129129
"react-redux": "^5.0.2",
130130
"react-router": "^3.0.2",
131131
"react-router-redux": "^4.0.7",

src/app/containers/App.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ const appConfig = require("../../../config/main");
33
import { Header } from "components";
44
import { normalize, setupPage } from "csstips";
55
import * as React from "react";
6-
import * as Helmet from "react-helmet";
7-
import {cssRaw, cssRule, style} from "typestyle";
6+
import { Helmet } from "react-helmet";
7+
import { cssRaw, cssRule, style } from "typestyle";
88

99
// Global style
1010
cssRaw(`@import url(https://fonts.googleapis.com/css?family=Roboto);`);
@@ -27,7 +27,7 @@ class App extends React.Component<any, any> {
2727
public render(): JSX.Element {
2828
return (
2929
<section className={Styles.container}>
30-
<Helmet {...appConfig.app} {...appConfig.app.head}/>
30+
<Helmet {...appConfig.app.head}/>
3131
<Header />
3232
{this.props.children}
3333
</section>

src/app/containers/Html.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from "react";
2-
import * as Helmet from "react-helmet";
2+
import { Helmet } from "react-helmet";
33
import { IStore } from "redux/IStore";
44
import { getStyles } from "typestyle";
55

@@ -11,7 +11,7 @@ interface IHtmlProps {
1111

1212
class Html extends React.Component<IHtmlProps, {}> {
1313
public render(): JSX.Element {
14-
const head = Helmet.rewind();
14+
const head = Helmet.renderStatic();
1515
const { markup, store } = this.props;
1616

1717
// Styles

src/index.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<!DOCTYPE html>
33
<html lang="en">
44
<head>
5-
<meta charset="UTF-8">
6-
<title>Crazy Factory</title>
75
</head>
86
<body>
97
<div id="app"></div>

0 commit comments

Comments
 (0)