Merge pull request #10 from IzumiSy/upgrade_choo_version

IzumiSy · web-flow · commit 81384c45735c · 2017-10-18T17:51:42.000+09:00
Upgrade choo version to 6
diff --git a/README.md b/README.md
@@ -2,8 +2,6 @@
 
 The default template for [choo-cli](https://github.com/trainyard/choo-cli)
 
-> Updated to work with choo 4
-
 ## Create a new template
 
 To create a new template
diff --git a/_app/README.md b/_app/README.md
@@ -7,7 +7,6 @@ applications and reusability.
 assets/        images and fonts, if you have any
 elements/      standalone application-specific elements
 lib/           generalized components, should be moved out of project later
-models/        choo models
 pages/         views that are directly mounted on the router
 scripts/       shell scripts, to be interfaced with through `npm scripts`
 client.js      main application entry; programmatic manifest file
@@ -22,11 +21,6 @@ Pages
 $ choo generate page my-page
 ```
 
-Models
-```bash
-$ choo generate model my-model
-```
-
 Elements
 ```bash
 $ choo generate element my-element
diff --git a/_app/_choo.yaml b/_app/_choo.yaml
@@ -9,9 +9,6 @@ generators:
   element:
     src: .generators/element.js
     target: elements
-  model:
-    src: .generators/model.js
-    target: models
 required:
   - _choo.yaml
   - _gitignore
diff --git a/_app/_package.json b/_app/_package.json
@@ -13,7 +13,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "choo": "^4.1.0"
+    "choo": "^6.1.0"
   },
   "devDependencies": {
     "bankai": "^9.0.0-rc7",
diff --git a/_app/client.js b/_app/client.js
@@ -1,10 +1,12 @@
 const choo = require('choo')
 const app = choo()
 
-app.model(require('./models/app'))
-
-app.router(['/', require('./pages/home')])
-
-const tree = app.start()
-
-document.body.appendChild(tree)
+app.use(require('./stores/home'))
+app.route('/', require('./pages/home'))
+
+// Support for Server-Side Rendering
+if (module.parent) {
+  module.exports = app
+} else {
+  app.mount('body')
+}
diff --git a/_app/models/README.md b/_app/models/README.md
diff --git a/_app/models/app.js b/_app/models/app.js
diff --git a/_app/pages/home.js b/_app/pages/home.js
@@ -1,17 +1,17 @@
 const html = require('choo/html')
 
-module.exports = function (state, prev, send) {
+module.exports = function (state, emit) {
   return html`
-    <main>
+    <body>
       <h1>Hello, World!</h1>
       <p>If you are seeing this, then the generator works!</p>
       <h2>Demo</h2>
       <h3>${state.title}</h3>
-      <input type="text" oninput=${update} />
-    </main>
+      <input type="text" oninput=${update} value=${state.title} />
+    </body>
   `
 
   function update (e) {
-    send('update', { value: e.target.value })
+    emit('update', { value: e.target.value })
   }
 }
diff --git a/_app/stores/home.js b/_app/stores/home.js
@@ -0,0 +1,8 @@
+module.exports = function (state, emitter) {
+  state.title = ''
+
+  emitter.on('update', function({ value }) {
+    state.title = value
+    emitter.emit('render')
+  })
+}
diff --git a/_generators/model.js b/_generators/model.js
