Upgraded to grind 0.7.0 beta

shnhrrsn · shnhrrsn · commit 6e7d9ce6e663 · 2017-03-26T00:04:40.000-04:00
diff --git a/.babelrc b/.babelrc
@@ -2,10 +2,12 @@
 	"presets": [ "grind" ],
 	"plugins": [
 		[
-			"babel-plugin-module-alias", [
-				{ "src": "./app", "expose": "App" },
-				{ "src": "./boot", "expose": "Boot" }
-			]
+			"module-resolver", {
+				"alias": {
+					"App": "./app",
+					"Boot": "./boot"
+				}
+			}
 		]
 	]
 }
diff --git a/app/Bootstrap.js b/app/Bootstrap.js
@@ -1,4 +1,3 @@
-import 'babel-polyfill'
 import Grind from 'grind-framework'
 
 import { AssetsProvider } from 'grind-assets'
diff --git a/bin/.init b/bin/.init
@@ -19,6 +19,10 @@ pushd $NODE_ROOT > /dev/null
 NODE_ROOT="`pwd`"
 popd > /dev/null
 
+pushd $NODE_ROOT/.. > /dev/null
+export BASE_PATH="`pwd`"
+popd > /dev/null
+
 if [ -f "$NODE_ROOT/../.env" ];
 then
 	source "$NODE_ROOT/../.env"
diff --git a/bin/cli b/bin/cli
@@ -12,7 +12,13 @@ if [[ "$@" == *"--help"* ]]; then
     COMMAND="$COMMAND-help"
 fi
 
-FLAGS=$(node -e 'console.log(Number.parseFloat(process.version.substring(1)) >= 7 ? "--harmony-async-await" : "")')
+NODE_VERSION=$(node -v)
+NODE_VERSION=$(echo ${NODE_VERSION#*v} | cut -d. -f1)
+
+FLAGS=""
+if [ "$NODE_VERSION" -gt "6" ]; then
+	FLAGS="--harmony-async-await"
+fi
 
 case $COMMAND in
 	watch) exec babel-node $FLAGS boot/Http.js --watch=app,config $@
diff --git a/boot/Cli.js b/boot/Cli.js
@@ -1,3 +1,6 @@
+import 'babel-polyfill'
+import 'grind-framework'
+
 import { CliProvider } from 'grind-cli'
 import 'App/Providers/CommandsProvider'
 
diff --git a/boot/Http.js b/boot/Http.js
@@ -1,3 +1,4 @@
+import 'babel-polyfill'
 import { HttpServer } from 'grind-framework'
 
 (new HttpServer(() => require('App/Bootstrap'))).start().catch(err => {
diff --git a/config/assets.json b/config/assets.json
@@ -4,7 +4,6 @@
 
 		"scss": {
 			"includePaths": [
-				"{{ node_modules }}/bourbon/app/assets/stylesheets",
 				"{{ node_modules }}/normalize.css",
 			]
 		}
diff --git a/config/cache.json b/config/cache.json
@@ -4,13 +4,6 @@
 
 	"stores": {
 
-		"fs": {
-			"driver": "fs",
-			"max": 1000000000,
-			"ttl": 86400,
-			"path": "storage/cache"
-		},
-
 		"memory": {
 			"driver": "memory",
 			"max": 10000,
diff --git a/config/cookie.json b/config/cookie.json
@@ -0,0 +1,10 @@
+{
+
+	"secret": "change-me",
+	"domain": null,
+	"httpOnly": null,
+	"maxAge": null,
+	"path": "/",
+	"secure": false
+
+}
diff --git a/config/database.json b/config/database.json
@@ -4,10 +4,10 @@
 
 	"connections": {
 
-		"maria": {
-			"driver": "mariasql",
+		"mysql": {
+			"driver": "mysql",
 			"host": "localhost",
-			"db": "app-db-name",
+			"database": "app-db-name",
 			"user": "app-user",
 			"password": "app-password",
 			"charset": "utf8"
diff --git a/config/redis.json b/config/redis.json
@@ -0,0 +1,14 @@
+{
+
+	"default": "redis",
+
+	"connections": {
+
+		"redis": {
+			"host": "localhost",
+			"port": 6379
+		}
+
+	}
+
+}
diff --git a/config/routing.json b/config/routing.json
@@ -8,6 +8,8 @@
 				"extended": true
 			}
 		}
-	}
+	},
+
+	"middleware": [ "cookie", "session", "method-override" ]
 
 }
diff --git a/config/session.json b/config/session.json
@@ -0,0 +1,30 @@
+{
+
+	"default": "memory",
+
+	"stores": {
+
+		"memory": {
+			"driver": "memory"
+		},
+
+		"database": {
+			"driver": "database",
+			"connection": null
+		},
+
+		"redis": {
+			"driver": "redis",
+			"connection": null,
+			"ttl": 86400
+		}
+
+	},
+
+	"cookie": {
+		"name": "grind-session"
+	},
+
+	"flash": true
+
+}
diff --git a/config/view.json b/config/view.json
@@ -0,0 +1,5 @@
+{
+
+	"engine": "nunjucks"
+
+}
diff --git a/package.json b/package.json
@@ -3,33 +3,32 @@
   "version": "0.6.0",
   "private": true,
   "dependencies": {
-    "cache-manager": "^2.1.2",
-    "grind-core-frontend": "^0.6.0",
+    "grind-core-frontend": "^0.7.0-beta.2",
     "grind-db": "^0.6.0",
+    "grind-nunjucks": "^0.7.0-beta.2",
     "grind-orm": "^0.6.0",
-    "sqlite3": "^3.1.3"
+    "sqlite3": "^3.1.8"
   },
   "devDependencies": {
-    "autoprefixer": "^6.7.0",
-    "babel-cli": "^6.22.2",
-    "babel-eslint": "^6.1.2",
-    "babel-plugin-module-alias": "^1.2.0",
-    "babel-preset-env": "^1.1.8",
-    "babel-preset-es2015": "^6.13.2",
-    "babel-preset-grind": "^0.6.0",
+    "autoprefixer": "^6.7.7",
+    "babel-cli": "^6.24.0",
+    "babel-eslint": "^7.2.1",
+    "babel-plugin-module-resolver": "^2.5.0",
+    "babel-preset-env": "^1.2.2",
+    "babel-preset-es2015": "^6.24.0",
+    "babel-preset-grind": "^0.6.2",
     "babel-preset-stage-1": "^6.22.0",
     "babelify": "^7.3.0",
-    "bourbon": "^4.2.7",
-    "browserify": "^13.1.0",
-    "clean-css": "^3.4.19",
-    "eslint": "^3.3.1",
+    "browserify": "^14.1.0",
+    "clean-css": "^4.0.10",
+    "eslint": "^3.18.0",
     "eslint-config-grind": "^2.0.0",
     "eslint-plugin-import-auto-name": "^1.0.3",
-    "node-sass": "^3.8.0",
+    "node-sass": "^4.5.1",
     "normalize.css": "^5.0.0",
     "ouch": "^1.0.0",
-    "svgo": "^0.6.6",
-    "uglify-js": "^2.7.0"
+    "svgo": "^0.7.2",
+    "uglify-js": "^2.8.16"
   },
   "engines": {
     "node": ">=6.9"
diff --git a/resources/assets/scss/_common.scss b/resources/assets/scss/_common.scss
@@ -1,2 +1 @@
-@import 'bourbon';
 @import 'variables';

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,12 @@`
`2`	`2`	`"presets": [ "grind" ],`
`3`	`3`	`"plugins": [`
`4`	`4`	`[`
`5`		`- "babel-plugin-module-alias", [`
`6`		`- { "src": "./app", "expose": "App" },`
`7`		`- { "src": "./boot", "expose": "Boot" }`
`8`		`- ]`
	`5`	`+ "module-resolver", {`
	`6`	`+ "alias": {`
	`7`	`+ "App": "./app",`
	`8`	`+ "Boot": "./boot"`
	`9`	`+ }`
	`10`	`+ }`
`9`	`11`	`]`
`10`	`12`	`]`
`11`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import 'babel-polyfill'`
`2`	`1`	`import Grind from 'grind-framework'`
`3`	`2`
`4`	`3`	`import { AssetsProvider } from 'grind-assets'`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import 'babel-polyfill'`
`1`	`2`	`import { HttpServer } from 'grind-framework'`
`2`	`3`
`3`	`4`	`(new HttpServer(() => require('App/Bootstrap'))).start().catch(err => {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`"scss": {`
`6`	`6`	`"includePaths": [`
`7`		`- "{{ node_modules }}/bourbon/app/assets/stylesheets",`
`8`	`7`	`"{{ node_modules }}/normalize.css",`
`9`	`8`	`]`
`10`	`9`	`}`