Skip to content

Commit a06c894

Browse files
committed
Switch to react-snap, enable inlineCSS
1 parent 9bc63e8 commit a06c894

File tree

3 files changed

+195
-280
lines changed

3 files changed

+195
-280
lines changed

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"private": true,
55
"devDependencies": {
66
"react-scripts": "1.0.17",
7+
"react-snap": "^1.1.1",
78
"standard": "^10.0.3",
89
"sw-precache": "^5.2.0",
910
"uglifyjs": "^2.4.11"
@@ -15,16 +16,18 @@
1516
"react-helmet": "^5.2.0",
1617
"react-router-dom": "^4.2.2",
1718
"react-scripts": "1.0.17",
18-
"react-snapshot": "^1.3.0",
1919
"styled-components": "^2.2.3"
2020
},
2121
"scripts": {
2222
"start": "react-scripts start",
23-
"build": "react-scripts build && react-snapshot && yarn run generate-sw && yarn run generate-appcache",
23+
"build": "react-scripts build && react-snap && yarn run generate-sw && yarn run generate-appcache",
2424
"test": "react-scripts test --env=jsdom",
2525
"eject": "react-scripts eject",
2626
"deploy": "npm run build && firebase deploy",
2727
"generate-sw": "sw-precache --root=build --config scripts/sw-precache-config.js && uglifyjs build/service-worker.js -o build/service-worker.js",
2828
"generate-appcache": "node scripts/generate-appcache"
29+
},
30+
"reactSnap": {
31+
"inlineCss": true
2932
}
3033
}

src/index.js

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
import React from 'react'
2-
import { render } from 'react-snapshot'
2+
import { hydrate, render } from "react-dom";
33
import App from './App'
44
import './index.css'
55
import registerServiceWorker from './registerServiceWorker';
66

7-
const rootEl = document.getElementById('root')
8-
render(<App />, rootEl)
7+
const rootElement = document.getElementById("root");
98

10-
if (module.hot) {
11-
module.hot.accept('./App', () => {
12-
const NextApp = require('./App').default
13-
render(<NextApp />, rootEl)
14-
})
9+
if (rootElement.hasChildNodes()) {
10+
// some bug prevents to do hydrate, will figure out later
11+
// hydrate(<App />, rootElement);
12+
render(<App />, rootElement);
13+
} else {
14+
render(<App />, rootElement);
15+
16+
if (module.hot) {
17+
module.hot.accept('./App', () => {
18+
const NextApp = require('./App').default
19+
render(<NextApp />, rootElement)
20+
})
21+
}
1522
}
1623

1724
registerServiceWorker();

0 commit comments

Comments
 (0)