Updated to Grind 0.7.0

Author: shnhrrsn

.travis.yml

@@ -2,5 +2,6 @@ language: node_js
 node_js:
   - "6"
   - "7"
+  - "8"
 sudo: false
 script: "bin/lint"

app/Bootstrap.js

@@ -15,14 +15,14 @@ const app = new Grind({
 })
 
 // Framework providers
-app.providers.push(AssetsProvider)
-app.providers.push(CacheProvider)
-app.providers.push(DatabaseProvider)
-app.providers.push(HtmlProvider)
-app.providers.push(OrmProvider)
-app.providers.push(ViewProvider)
+app.providers.add(AssetsProvider)
+app.providers.add(CacheProvider)
+app.providers.add(DatabaseProvider)
+app.providers.add(HtmlProvider)
+app.providers.add(OrmProvider)
+app.providers.add(ViewProvider)
 
 // App providers
-app.providers.push(RoutesProvider)
+app.providers.add(RoutesProvider)
 
 module.exports = app

app/Errors/ErrorHandler.js

@@ -24,7 +24,7 @@ export class ErrorHandler extends BaseErrorHandler {
 
 		return FS.exists(view).then(exists => {
 			if(!exists) {
-				if(code !== '500') {
+				if(Number.parseInt(code) !== 500) {
 					return this.renderView(req, res, err, info, 500)
 				} else {
 					return this.renderJson(req, res, err, info)

bin/build

@@ -4,7 +4,7 @@ source ${0%/*}/.init
 
 strip_babel() {
 	cp "$1" "$1-tmp"
-	cat "$1-tmp" | sed 's/babel-node/node/g' > "$1"
+	cat "$1-tmp" | sed "s/require('babel-register')//g" > "$1"
 	rm "$1-tmp"
 }
 
@@ -21,7 +21,8 @@ echo "Setting up bins"
 cp -R bin build/bin
 rm build/bin/build build/bin/lint
 
-strip_babel build/bin/cli
+strip_babel build/boot/Cli.js
+strip_babel build/boot/Http.js
 chmod +x build/bin/* build/bin/.init
 
 echo "Done"

bin/cli

@@ -16,15 +16,15 @@ NODE_VERSION=$(node -v)
 NODE_VERSION=$(echo ${NODE_VERSION#*v} | cut -d. -f1)
 
 FLAGS=""
-if [ "$NODE_VERSION" -gt "6" ]; then
+if [ "$NODE_VERSION" = "7" ]; then
 	FLAGS="--harmony-async-await"
 fi
 
 case $COMMAND in
-	watch) exec babel-node $FLAGS boot/Http.js --watch=app,config $@
+	watch) exec node $FLAGS boot/Http.js --watch=app,config $@
 		;;
-	serve) exec babel-node $FLAGS boot/Http.js $@
+	serve) exec node $FLAGS boot/Http.js $@
 		;;
-	*) IN_CLI=true CLI_BIN="$CLI_BIN" exec babel-node $FLAGS boot/Cli.js "$@"
+	*) IN_CLI=true CLI_BIN="$CLI_BIN" exec node $FLAGS boot/Cli.js "$@"
 		;;
 esac

bin/lint

@@ -2,4 +2,4 @@
 
 source ${0%/*}/.init
 
-eslint app config server
+eslint app boot config

boot/Cli.js

@@ -1,13 +1,20 @@
-import 'babel-polyfill'
-import 'grind-framework'
+//
+// WARNING: This file is *NOT* processed through babel
+//
 
-import { CliProvider } from 'grind-cli'
-import 'App/Providers/CommandsProvider'
+require('babel-register')
+require('babel-polyfill')
+require('grind-framework')
 
-const app = require('App/Bootstrap')
-app.providers.push(CliProvider, CommandsProvider)
+const { CliProvider, Runner } = require('grind-cli')
 
-app.boot().then(() => app.cli.run()).catch(err => {
+new Runner(() => {
+	const app = require('../app/Bootstrap')
+	const { CommandsProvider } = require('../app/Providers/CommandsProvider')
+	app.providers.add(CliProvider, CommandsProvider)
+
+	return app
+}).run().catch(err => {
 	Log.error('Boot Error', err)
 	process.exit(1)
 })

boot/Http.js

@@ -1,7 +1,13 @@
-import 'babel-polyfill'
-import { HttpServer } from 'grind-framework'
+//
+// WARNING: This file is *NOT* processed through babel
+//
 
-(new HttpServer(() => require('App/Bootstrap'))).start().catch(err => {
+require('babel-register')
+require('babel-polyfill')
+
+const { HttpServer } = require('grind-framework')
+
+new HttpServer(() => require('../app/Bootstrap')).start().catch(err => {
 	Log.error('Boot Error', err)
 	process.exit(1)
 })

package.json

@@ -1,32 +1,33 @@
 {
   "name": "grind-example-web",
-  "version": "0.7.0-beta.1",
+  "version": "0.7.0-beta.2",
   "private": true,
   "dependencies": {
-    "grind-core-frontend": "^0.7.0-beta.2",
-    "grind-db": "^0.6.0",
-    "grind-orm": "^0.6.0",
+    "grind-core-frontend": "^0.7.0",
+    "grind-db": "^0.7.0",
+    "grind-orm": "^0.7.0",
     "sqlite3": "^3.1.8"
   },
   "devDependencies": {
-    "autoprefixer": "^6.7.7",
+    "autoprefixer": "^7.1.2",
     "babel-cli": "^6.24.0",
     "babel-eslint": "^7.2.1",
     "babel-plugin-module-resolver": "^2.5.0",
     "babel-preset-es2015": "^6.24.0",
-    "babel-preset-grind": "^0.6.2",
+    "babel-preset-grind": "^0.7.0",
     "babel-preset-stage-1": "^6.22.0",
+    "babel-register": "^6.24.1",
     "babelify": "^7.3.0",
-    "browserify": "^14.1.0",
-    "clean-css": "^4.0.10",
+    "browserify": "^14.4.0",
+    "clean-css": "^4.1.7",
     "eslint": "^3.18.0",
     "eslint-config-grind": "^2.0.0",
     "eslint-plugin-import-auto-name": "^1.0.3",
-    "node-sass": "^4.5.1",
-    "normalize.css": "^5.0.0",
+    "node-sass": "^4.5.3",
+    "normalize.css": "^7.0.0",
     "ouch": "^1.0.0",
     "svgo": "^0.7.2",
-    "uglify-js": "^2.8.16"
+    "uglify-js": "^3.0.25"
   },
   "engines": {
     "node": ">=6.9"

resources/views/welcome.stone

@@ -4,7 +4,6 @@
 
 @scss('welcome')
 @scss('code')
-@style('https://raw.githubusercontent.com/tonsky/FiraCode/master/distr/fira_code.css')
 
 @section('content')
 	<div class="welcome">

storage/views/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore