Update the template

kriasoft · Apr 26, 2018 · 7657c2a · 7657c2a
1 parent 459c58a
commit 7657c2a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/packages/react-app-tools/package.json b/packages/react-app-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-app-tools",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Build and test tooling for web application development with Node.js and React.",
   "repository": "kriasoft/react-app",
   "author": "Kriasoft <hello@kriasoft.com> (https://www.kriasoft.com)",
@@ -39,8 +39,8 @@
     "react-app": "./bin/react-app.js"
   },
   "dependencies": {
-    "@babel/core": "7.0.0-beta.38",
-    "@babel/runtime": "7.0.0-beta.38",
+    "@babel/core": "7.0.0-beta.41",
+    "@babel/runtime": "7.0.0-beta.41",
     "autoprefixer": "7.2.5",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "8.2.1",

diff --git a/packages/react-app-tools/scripts/init.js b/packages/react-app-tools/scripts/init.js
@@ -92,10 +92,9 @@ module.exports = function(
 
   // Setup the script rules
   appPackage.scripts = {
-    start: 'react-scripts start',
-    build: 'react-scripts build',
-    test: 'react-scripts test --env=jsdom',
-    eject: 'react-scripts eject',
+    start: 'react-app start',
+    build: 'react-app build',
+    test: 'react-app test --env=jsdom',
   };
 
   appPackage.browserslist = defaultBrowsers;

diff --git a/packages/react-app-tools/template/src/app.browser.js b/packages/react-app-tools/template/src/app.browser.js
@@ -4,7 +4,7 @@ import './index.css';
 import App from './components/App';
 import * as serviceWorker from './serviceWorker';
 
-ReactDOM.render(<App />, document.getElementById('root'));
+ReactDOM.hydrate(<App />, document.getElementById('root'));
 
 // If you want your app to work offline and load faster, you can change
 // unregister() to register() below. Note this comes with some pitfalls.

diff --git a/packages/react-app-tools/template/src/app.node.js b/packages/react-app-tools/template/src/app.node.js
@@ -1,8 +1,7 @@
-const path = require('path');
 const express = require('express');
 const React = require('react');
 const ReactDOMServer = require('react-dom/server');
-const App = require('./components/App');
+const App = require('./components/App').default;
 const assets = require('./assets.json');
 
 const app = express();
@@ -12,7 +11,7 @@ app.get('*', (req, res) => {
     <html>
       <body>
         <div id="root">${ReactDOMServer.renderToString(<App />)}</div>
-        ${assets.map(src => `<script src="${src}"></script>`)}
+        ${assets.main.map(src => `<script src="${src}"></script>`)}
       </body>
     </html>
   `);