@adonisjs/framework
Advanced tools
Comparing version 5.0.12 to 5.0.13
123
BACKERS.md
@@ -5,33 +5,96 @@ # Backers | ||
## Premium backers ($25 or more) | ||
- [Sameer](https://www.patreon.com/user?u=8327309) | ||
- [Romain Lanz](https://www.patreon.com/user/creators?u=4218845) | ||
- [Evgeniy Rumin](https://www.patreon.com/user/creators?u=6770621) | ||
- Chris Sevilleja [scotch.io](https://scotch.io/) | ||
#### [allen joslin](https://www.patreon.com/user/creators?u=6657042) | ||
- $10/month | ||
- $190 Lifetime support | ||
## Backers | ||
- Webber Wang - [codelabstudios.com](https://codelabstudios.com/) | ||
- Zizaco - [zizaco.net](zizaco.net) | ||
- [Thomas Steinmetz](https://www.patreon.com/user?u=2961383) | ||
- [Roger Marsh](https://www.patreon.com/user/creators?u=9134639) | ||
- [Ming Shum](https://www.patreon.com/user/creators?u=11678279) | ||
- [Mikhail Poddubsky](https://www.patreon.com/user/creators?u=7820122) | ||
- [Mikey Stengel](https://www.patreon.com/user/creators?u=9717033) | ||
- [Mateo San Román](https://www.patreon.com/Mateosanroman/creators) | ||
- Marshall Moore - [chapterandver.se](http://www.chapterandver.se/) | ||
- [Mark](https://www.patreon.com/user?u=9724251) | ||
- [Joe Sweeney](https://www.patreon.com/user?u=7402412) | ||
- [Jay Sebastian](https://www.patreon.com/user/creators?u=11374124) | ||
- [Ivar de Pieterman](https://www.patreon.com/user/creators?u=4435751) | ||
- Mourad GHAFIRI - [chanseeds.com](https://www.chanseeds.com/) | ||
- [George Borrelli](https://www.patreon.com/user/creators?u=10150936) | ||
- [Esteban Sotillo](https://www.patreon.com/user?u=12242198) | ||
- [Devonne Burger](https://www.patreon.com/user/creators?u=8405531) | ||
- [Charles Jackson](https://www.patreon.com/user/creators?u=13278016) | ||
- [allen joslin](https://www.patreon.com/user/creators?u=6657042) | ||
#### [Charles Jackson](https://www.patreon.com/user/creators?u=13278016) | ||
- $10/month | ||
- $50 Lifetime support | ||
## Former backers | ||
- Diana Espino [dianaespino.com](https://dianaespino.com/) | ||
- Danitt - [danitt.com](http://danitt.com/) | ||
- Casey A. Childers - [caseychilders.com](http://caseychilders.com/) | ||
- Hans-Helge Bürger - [hanshelgebuerger.de](http://hanshelgebuerger.de) | ||
#### [Chris Sevilleja](https://www.patreon.com/user/creators?u=5065314) | ||
- $100/month | ||
- $600 Lifetime support | ||
#### [Cảnh Kiều](https://www.patreon.com/user/creators?u=9849921) | ||
- $10/month | ||
- $20 Lifetime support | ||
#### [Esteban Sotillo](https://www.patreon.com/user/creators?u=12242198) | ||
- $10/month | ||
- $60 Lifetime support | ||
#### [Evgeniy Rumin](https://www.patreon.com/user/creators?u=6770621) | ||
- $25/month | ||
- $285 Lifetime support | ||
#### [George Borrelli](https://www.patreon.com/user/creators?u=10150936) | ||
- $10/month | ||
- $100 Lifetime support | ||
#### [Ivar de Pieterman](https://www.patreon.com/user/creators?u=4435751) | ||
- $10/month | ||
- $260 Lifetime support | ||
#### [James Bailey](https://www.patreon.com/user/creators?u=163894) | ||
- $10/month | ||
- $240 Lifetime support | ||
#### [Jay Sebastian](https://www.patreon.com/user/creators?u=11374124) | ||
- $10/month | ||
- $90 Lifetime support | ||
#### [Joe Sweeney](https://www.patreon.com/user/creators?u=7402412) | ||
- $10/month | ||
- $100 Lifetime support | ||
#### [João Pedro Barros](https://www.patreon.com/user/creators?u=15876534) | ||
- $25/month | ||
- $25 Lifetime support | ||
#### [Mark](https://www.patreon.com/user/creators?u=9724251) | ||
- $10/month | ||
- $2,160 Lifetime support | ||
#### [Marshall Moore](https://www.patreon.com/user/creators?u=453179) | ||
- $10/month | ||
- $270 Lifetime support | ||
#### [Mikey Stengel](https://www.patreon.com/user/creators?u=9717033) | ||
- $10/month | ||
- $120 Lifetime support | ||
#### [Mikhail Poddubsky](https://www.patreon.com/user/creators?u=7820122) | ||
- $10/month | ||
- $170 Lifetime support | ||
#### [Ming Shum](https://www.patreon.com/user/creators?u=11678279) | ||
- $10/month | ||
- $80 Lifetime support | ||
#### [Nathan Hipps](https://www.patreon.com/user/creators?u=15606228) | ||
- $10/month | ||
- $10 Lifetime support | ||
#### [Roger Marsh](https://www.patreon.com/user/creators?u=9134639) | ||
- $20/month | ||
- $165 Lifetime support | ||
#### [Romain Lanz](https://www.patreon.com/user/creators?u=4218845) | ||
- $25/month | ||
- $600 Lifetime support | ||
#### [Sameer](https://www.patreon.com/user/creators?u=8327309) | ||
- $25/month | ||
- $325 Lifetime support | ||
#### [Thomas Steinmetz](https://www.patreon.com/user/creators?u=2961383) | ||
- $15/month | ||
- $270 Lifetime support | ||
#### [Yakaz.com](https://www.patreon.com/user/creators?u=16406163) | ||
- $500/month | ||
- $0 Lifetime support | ||
#### [Zizaco Zizuini](https://www.patreon.com/user/creators?u=3622459) | ||
- $10/month | ||
- $180 Lifetime support |
@@ -0,1 +1,20 @@ | ||
<a name="5.0.13"></a> | ||
## [5.0.13](https://github.com/adonisjs/adonis-framework/compare/v5.0.12...v5.0.13) (2019-02-16) | ||
### Bug Fixes | ||
* **Env:** allow escaping dollar sign ([22b54b5](https://github.com/adonisjs/adonis-framework/commit/22b54b5)), closes [#1037](https://github.com/adonisjs/adonis-framework/issues/1037) | ||
* **Env:** Env.load() docblock ([#1010](https://github.com/adonisjs/adonis-framework/issues/1010)) ([1b0412e](https://github.com/adonisjs/adonis-framework/commit/1b0412e)) | ||
### Features | ||
* **error:** add forum link to youch error page ([c26328f](https://github.com/adonisjs/adonis-framework/commit/c26328f)) | ||
* **exception:** Add forum link ([4e82b59](https://github.com/adonisjs/adonis-framework/commit/4e82b59)) | ||
* **Router:** duplicate route name failing test ([#1025](https://github.com/adonisjs/adonis-framework/issues/1025)) ([9a34cac](https://github.com/adonisjs/adonis-framework/commit/9a34cac)) | ||
* **routing:** prefix route's name via group ([98ca091](https://github.com/adonisjs/adonis-framework/commit/98ca091)) | ||
<a name="5.0.12"></a> | ||
@@ -2,0 +21,0 @@ ## [5.0.12](https://github.com/adonisjs/adonis-framework/compare/v5.0.11...v5.0.12) (2018-10-16) |
@@ -6,2 +6,2 @@ # Contributing | ||
Below is the guide to be followed strictly before submitting your pull requests. | ||
http://adonisjs.com/docs/3.1/contributing | ||
https://adonisjs.com/docs/contribution-guide |
{ | ||
"name": "@adonisjs/framework", | ||
"version": "5.0.12", | ||
"version": "5.0.13", | ||
"description": "Adonis framework makes it easy for you to write webapps with less code", | ||
@@ -29,7 +29,7 @@ "main": "index.js", | ||
"@adonisjs/fold": "^4.0.9", | ||
"@adonisjs/mrm-preset": "^1.0.14", | ||
"@adonisjs/mrm-preset": "^1.0.16", | ||
"@adonisjs/sink": "^1.0.17", | ||
"argon2": "^0.19.3", | ||
"clear-require": "^2.0.0", | ||
"commitizen": "^3.0.2", | ||
"commitizen": "^3.0.5", | ||
"cookie-signature": "^1.1.0", | ||
@@ -39,5 +39,5 @@ "coveralls": "^3.0.2", | ||
"fs-extra": "^7.0.0", | ||
"japa": "^2.0.5", | ||
"japa": "^2.0.7", | ||
"mrm": "^1.2.1", | ||
"nyc": "^13.1.0", | ||
"nyc": "^13.2.0", | ||
"pify": "^4.0.0", | ||
@@ -47,3 +47,3 @@ "pkg-ok": "^2.3.1", | ||
"standard": "^12.0.1", | ||
"supertest": "^3.3.0", | ||
"supertest": "^3.4.2", | ||
"test-console": "^1.1.0" | ||
@@ -56,4 +56,4 @@ }, | ||
"co-compose": "^4.0.0", | ||
"debug": "^4.1.0", | ||
"dotenv": "^6.1.0", | ||
"debug": "^4.1.1", | ||
"dotenv": "^6.2.0", | ||
"edge.js": "^1.1.4", | ||
@@ -75,3 +75,3 @@ "eventemitter2": "^5.0.1", | ||
"useragent": "^2.3.0", | ||
"winston": "^3.1.0", | ||
"winston": "^3.2.1", | ||
"youch": "^2.0.10" | ||
@@ -78,0 +78,0 @@ }, |
@@ -13,3 +13,4 @@ # Adonis Framework :triangular_ruler: | ||
[![Coveralls][coveralls-image]][coveralls-url] | ||
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fadonisjs%2Fadonis-framework.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fadonisjs%2Fadonis-framework?ref=badge_shield) | ||
[![FOSSA Status][fossa-image]][fossa-url] | ||
[![Pr's Welcome][pr-welcoming-image]][pr-welcoming-url] | ||
@@ -36,3 +37,3 @@ <img src="https://res.cloudinary.com/adonisjs/image/upload/q_100/v1497112678/adonis-purple_pzkmzt.svg" width="200px" align="right" hspace="30px" vspace="140px"> | ||
This repo/branch is supposed to run fine on all major OS platforms and targets `Node.js >=7.0` | ||
This repo/branch is supposed to run fine on all major OS platforms and targets `Node.js >= 8.0.0` | ||
@@ -102,4 +103,9 @@ ## Development | ||
[fossa-image]: https://app.fossa.io/api/projects/git%2Bgithub.com%2Fadonisjs%2Fadonis-framework.svg?type=shield | ||
[fossa-url]: https://app.fossa.io/projects/git%2Bgithub.com%2Fadonisjs%2Fadonis-framework?ref=badge_shield | ||
[pr-welcoming-image]: https://img.shields.io/badge/PRs%20-welcome-brightgreen.svg | ||
[pr-welcoming-url]: https://adonisjs.com/docs/contribution-guide | ||
## License | ||
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fadonisjs%2Fadonis-framework.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fadonisjs%2Fadonis-framework?ref=badge_large) |
@@ -74,4 +74,12 @@ 'use strict' | ||
_interpolate (env, envConfig) { | ||
const matches = env.match(/\$([a-zA-Z0-9_]+)|\${([a-zA-Z0-9_]+)}/g) || [] | ||
const matches = env.match(/(\\)?\$([a-zA-Z0-9_]+)|(\\)?\${([a-zA-Z0-9_]+)}/g) || [] | ||
_.each(matches, (match) => { | ||
/** | ||
* Variable is escaped | ||
*/ | ||
if (match.indexOf('\\') === 0) { | ||
env = env.replace(match, match.replace(/^\\\$/, '$')) | ||
return | ||
} | ||
const key = match.replace(/\$|{|}/g, '') | ||
@@ -81,2 +89,3 @@ const variable = envConfig[key] || process.env[key] || '' | ||
}) | ||
return env | ||
@@ -94,3 +103,3 @@ } | ||
* | ||
* @return {void} | ||
* @return {Object} | ||
*/ | ||
@@ -97,0 +106,0 @@ load (filePath, overwrite = true, encoding = 'utf8') { |
@@ -32,2 +32,11 @@ 'use strict' | ||
const youch = new Youch(error, req) | ||
youch.addLink(({ message }) => { | ||
return `<a href="https://forum.adonisjs.com/search?q=${message}" target="_blank" title="Search on the official forum"><i class="fab fa-discourse"></i></a>` | ||
}) | ||
youch.addLink(() => { | ||
return `<a href="https://discordapp.com/invite/vDcEjq6" target="_blank" title="Join the official Discord server"><i class="fab fa-discord"></i></a>` | ||
}) | ||
if (isJSON) { | ||
@@ -34,0 +43,0 @@ return youch.toJSON() |
@@ -41,2 +41,27 @@ 'use strict' | ||
/** | ||
* Give a name to a group of routes. | ||
* This will prefix all routes name. | ||
* | ||
* @method as | ||
* | ||
* @chainable | ||
* | ||
* @example | ||
* ```js | ||
* Route | ||
* .group() | ||
* .as('admin') | ||
* ``` | ||
*/ | ||
as (name) { | ||
this._routes.forEach((route) => { | ||
if (route.name.length > 0) { | ||
route.name = `${name}.${route.name}` | ||
} | ||
}) | ||
return this | ||
} | ||
/** | ||
* Add middleware to a group of routes. | ||
@@ -43,0 +68,0 @@ * Also see @ref('Route/middleware'). |
@@ -12,2 +12,4 @@ 'use strict' | ||
const GE = require('@adonisjs/generic-exceptions') | ||
module.exports = function (View, Route, Config) { | ||
@@ -18,3 +20,10 @@ /** | ||
View.global('route', function (...args) { | ||
const url = Route.url(...args) | ||
let url | ||
try { | ||
url = Route.url(...args) | ||
} catch (error) { | ||
throw new GE.InvalidArgumentException(`"route" view global error: ${error.message}`) | ||
} | ||
const baseUrl = Config ? Config.get('app.http.baseUrl', '') : '' | ||
@@ -21,0 +30,0 @@ return url && /^http(s)?/.test(url) ? url : `${baseUrl}${url}` |
214108
6651
109
Updateddebug@^4.1.1
Updateddotenv@^6.2.0
Updatedwinston@^3.2.1