diff --git a/.babelrc b/.babelrc
index 7dd5e9d..08b1fac 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,3 +1,4 @@
{
- "presets": ["@babel/preset-react"]
+ "presets": ["@babel/preset-react"],
+ "plugins": ["@babel/plugin-transform-modules-commonjs"]
}
diff --git a/.nvmrc b/.nvmrc
index 48082f7..b1bd38b 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-12
+13
diff --git a/browser/app.jsx b/browser/app.jsx
index 5c6e47d..8d0317b 100644
--- a/browser/app.jsx
+++ b/browser/app.jsx
@@ -1,16 +1,23 @@
-const React = require('react')
+import React from 'react'
+import PropTypes from 'prop-types'
+
+export default class App extends React.Component {
+ static get propTypes() {
+ return {
+ apiUrl: PropTypes.string,
+ }
+ }
-module.exports = class App extends React.Component {
constructor(props) {
- super(props);
- this.state = {user: ''};
+ super(props)
+ this.state = {user: ''}
- this.handleNameChange = this.handleNameChange.bind(this);
- this.fetchTodos = this.fetchTodos.bind(this);
+ this.handleNameChange = this.handleNameChange.bind(this)
+ this.fetchTodos = this.fetchTodos.bind(this)
}
handleNameChange(event) {
- this.setState({user: event.target.value});
+ this.setState({user: event.target.value})
}
async fetchTodos(event) {
@@ -33,7 +40,7 @@ module.exports = class App extends React.Component {
return this.state.todos
?
<>
- {this.state.user}'s TODOs
+ {this.state.user}'s TODOs
{this.state.todos.map((todo, n) => - {todo.title}
)}
diff --git a/browser/index.jsx b/browser/index.jsx
index fd00232..742995d 100644
--- a/browser/index.jsx
+++ b/browser/index.jsx
@@ -2,4 +2,4 @@ import React from 'react'
import ReactDOM from 'react-dom'
import App from './app'
-ReactDOM.render(, document.body)
+ReactDOM.render(, document.querySelector('main'))
diff --git a/package.json b/package.json
index 90e800d..6ad548e 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"start": "./scripts/start.sh",
"postinstall": "electron-rebuild",
"dev": "nf start",
- "test": "electron-mocha -r @babel/register --color --renderer ./test/*Spec.js",
+ "test": "electron-mocha -r @babel/register --no-timeout --color --renderer ./test/*Spec.js",
"lint": "eslint $(git ls-files | grep -E '\\.js$')",
"build": "webpack",
"heroku-postbuild": "npm run build",
@@ -12,26 +12,27 @@
},
"dependencies": {
"@babel/core": "latest",
- "@babel/preset-react": "^7.0.0",
+ "@babel/preset-react": "latest",
"babel-loader": "latest",
- "electron-rebuild": "^1.8.4",
- "eslint-plugin-react": "^7.13.0",
+ "electron-rebuild": "latest",
+ "eslint-plugin-react": "latest",
"express": "latest",
"morgan": "latest",
- "react": "^16.8.6",
- "react-dom": "^16.8.6",
- "sqlite3": "^4.0.8",
+ "react": "latest",
+ "react-dom": "latest",
+ "sqlite3": "latest",
"webpack": "latest",
"webpack-cli": "latest",
"webpack-manifest-plugin": "latest"
},
"devDependencies": {
- "@babel/register": "^7.4.4",
+ "@babel/plugin-transform-modules-commonjs": "^7.7.5",
+ "@babel/register": "latest",
"browser-monkey": "latest",
"chai": "latest",
"chokidar": "latest",
- "electron": "^4",
- "electron-mocha": "^7",
+ "electron": "latest",
+ "electron-mocha": "latest",
"eslint": "latest",
"foreman": "latest",
"mocha": "latest",
diff --git a/server/app.js b/server/app.js
index 4ecf5c9..6d3a5df 100644
--- a/server/app.js
+++ b/server/app.js
@@ -1,6 +1,5 @@
const http = require('http')
const express = require('express')
-const morgan = require('morgan')
const loadManifest = require('./loadManifest')
const sqlite3 = require('sqlite3')
const LiveReload = require('./liveReload')
@@ -18,6 +17,7 @@ function renderIndexHtml () {
TODOs
+
${scripts.map(url => ``).join('\n')}