Skip to content

Commit c9df053

Browse files
author
ming.xie
committed
Head修改,增加manifest.json,处理控制台的错误
1 parent 3efdb7d commit c9df053

File tree

10 files changed

+61
-51
lines changed

10 files changed

+61
-51
lines changed

‎next.config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// next.config.js
2-
const withLess = require('@zeit/next-less')
2+
const withLess = require('@zeit/next-less');
3+
34
module.exports = withLess({
45
cssModules: true,
56
cssLoaderOptions: {

‎pages/_document.js

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,22 @@
11
import React from 'react';
22
import Document, { Main, NextScript } from 'next/document';
33
import Head from 'next/head';
4-
import { Helmet } from "react-helmet";
54

65
export default class MyDocument extends Document {
76
render() {
8-
const helmet = Helmet.renderStatic();
9-
const htmlAttrs = helmet.htmlAttributes.toComponent();
10-
const bodyAttrs = helmet.bodyAttributes.toComponent();
117
// console.log(this.props.buildManifest.pages, '----------------------->>>>>>>>>>>');
128
return (
13-
<html lang="zh-cn" {...htmlAttrs}>
14-
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,minimal-ui" />
15-
<link rel="manifest" href="static/manifest.json" />
16-
<link rel="icon" href="static/img/favicon.ico" />
17-
<link rel="stylesheet" href="/static/css/antd.min.css" />
9+
<html lang="zh-cn">
1810
<Head>
11+
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no,minimal-ui" />
1912
<title>Next_Project</title>
2013
</Head>
21-
{helmet.title.toComponent()}
22-
{helmet.meta.toComponent()}
23-
{helmet.link.toComponent()}
24-
<body {...bodyAttrs}>
14+
<link rel="manifest" href="/static/manifest.json" />
15+
<link rel="icon" href="/static/manifest/icon/favicon-32x32.png" />
16+
<link rel="stylesheet" href="/static/css/antd.min.css" />
17+
<body>
2518
<Main />
2619
</body>
27-
{helmet.script.toComponent()}
2820
<NextScript />
2921
</html>
3022
)

‎pages/demo.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import ChildPage from '../components/ChildPage';
2-
import { Helmet } from "react-helmet";
2+
import Head from 'next/head';
33

44
export default () => (
5-
<React.Fragment>
6-
<Helmet>
7-
<meta name="description" content="Helmet application" />
8-
<title>Child-Next-React</title>
9-
</Helmet>
10-
<ChildPage />
11-
</React.Fragment>);
5+
<React.Fragment>
6+
<Head>
7+
<meta name="description" content="Helmet application" />
8+
<title>Child-Next-React</title>
9+
</Head>
10+
<ChildPage />
11+
</React.Fragment>);

‎pages/index.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import HomePage from '../components/HomePage';
2-
import { Helmet } from "react-helmet";
2+
import Head from 'next/head';
33

44
export default () => (
5-
<React.Fragment>
6-
<Helmet>
7-
<meta name="description" content="Helmet application" />
8-
<title>Home-Next-React</title>
9-
</Helmet>
10-
<HomePage />
11-
</React.Fragment>
5+
<React.Fragment>
6+
<Head>
7+
<meta name="description" content="Helmet application" />
8+
<title>Home-Next-React</title>
9+
</Head>
10+
<HomePage />
11+
</React.Fragment>
1212
);

‎pages/nestedRouter/link1/index.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import { Helmet } from "react-helmet";
1+
import Head from 'next/head';
22

33
export default () => (
4-
<React.Fragment>
5-
<Helmet>
6-
<meta name="description" content="嵌套路由1" />
7-
<title>嵌套路由1</title>
8-
</Helmet>
9-
嵌套路由1
10-
</React.Fragment>);
4+
<React.Fragment>
5+
<Head>
6+
<meta name="description" content="嵌套路由1" />
7+
<title>嵌套路由1</title>
8+
</Head>
9+
嵌套路由1
10+
</React.Fragment>
11+
);

‎pages/nestedRouter/link2/index.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import { Helmet } from "react-helmet";
1+
import Head from 'next/head';
22

33
export default () => (
4-
<React.Fragment>
5-
<Helmet>
6-
<meta name="description" content="嵌套路由2" />
7-
<title>嵌套路由2</title>
8-
</Helmet>
9-
嵌套路由2
10-
</React.Fragment>);
4+
<React.Fragment>
5+
<Head>
6+
<meta name="description" content="2嵌套路由2" />
7+
<title>嵌套路由2</title>
8+
</Head>
9+
嵌套路由2
10+
</React.Fragment>
11+
);

‎pages/netWork.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { Component } from 'react';
2-
import Helmet from 'react-helmet';
2+
import Head from 'next/head';
33

44
export default class NetWork extends Component {
55
componentDidMount() {
@@ -8,10 +8,10 @@ export default class NetWork extends Component {
88
render() {
99
return (
1010
<React.Fragment>
11-
<Helmet>
11+
<Head>
1212
<title>My Title</title>
1313
<script src="https://d3js.org/d3.v5.min.js"></script>
14-
</Helmet>
14+
</Head>
1515
</React.Fragment>
1616
);
1717
}

‎static/manifest.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"name": "name at package.json",
3+
"short_name": "short name of name at package.json",
4+
"icons": [
5+
{
6+
"src": "manifest/icon/favicon-32x32.png",
7+
"sizes": "32x32",
8+
"type": "image/png"
9+
}
10+
],
11+
"start_url": "/",
12+
"display": "standalone",
13+
"background_color": "#EFEFEF",
14+
"theme_color": "#EFEFEF"
15+
}

‎static/manifest/icon/favicon-32x32.png

880 Bytes
Loading

‎yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3775,7 +3775,7 @@ lodash.throttle@^4.0.0:
37753775
resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
37763776
integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
37773777

3778-
lodash@^4.16.5, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5:
3778+
lodash@>=4.17.11, lodash@^4.16.5, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5:
37793779
version "4.17.11"
37803780
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
37813781
integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==

0 commit comments

Comments
 (0)