From 58703786a73253af8b5ce4b87ed4107d98d2c933 Mon Sep 17 00:00:00 2001 From: Adria Jimenez Date: Fri, 7 Oct 2016 12:38:47 +0200 Subject: [PATCH 1/3] Corrected word in the Readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 52f55d4..e138e0c 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ const providers = [ ### Registering Aliases -Providers are also defined inside `bootstrap/app.js` file. +Aliases are also defined inside `bootstrap/app.js` file. ```javascript const aliases = { From 40356be263d92ae150cc82866b4db91d203cf446 Mon Sep 17 00:00:00 2001 From: Harminder Virk Date: Mon, 12 Dec 2016 15:14:21 +0530 Subject: [PATCH 2/3] chore(package): upgrade packages and fix tests move tests to bin directory since harmony_proxies is optional --- bin/coverage.js | 12 ++++++++++++ bin/test.js | 12 ++++++++++++ package.json | 24 +++++++++++++----------- src/Formatter/index.js | 2 +- 4 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 bin/coverage.js create mode 100644 bin/test.js diff --git a/bin/coverage.js b/bin/coverage.js new file mode 100644 index 0000000..aea0c79 --- /dev/null +++ b/bin/coverage.js @@ -0,0 +1,12 @@ +'use strict' + +const semver = require('semver') +const shell = require('shelljs') +const nodeJsVersion = process.version +let proxiesFlag = '' + +if (semver.lt(nodeJsVersion, '6.0.0')) { + proxiesFlag = '--harmony_proxies' +} + +shell.exec(`DB=${process.env.DB} node ${proxiesFlag} ./node_modules/.bin/istanbul cover _mocha test`) diff --git a/bin/test.js b/bin/test.js new file mode 100644 index 0000000..1d33d31 --- /dev/null +++ b/bin/test.js @@ -0,0 +1,12 @@ +'use strict' + +const semver = require('semver') +const shell = require('shelljs') +const nodeJsVersion = process.version +let proxiesFlag = '' + +if (semver.lt(nodeJsVersion, '6.0.0')) { + proxiesFlag = '--harmony_proxies' +} + +shell.exec(`DB=${process.env.DB} node ${proxiesFlag} ./node_modules/.bin/istanbul cover _mocha --report lcovonly -- -R spec test && cat ./coverage/lcov.info | coveralls && rm -rf ./coverage`) diff --git a/package.json b/package.json index bcb5113..83fc99f 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ "test": "test" }, "scripts": { - "test": "npm run lint && node --harmony_proxies ./node_modules/.bin/istanbul cover _mocha --report lcovonly -- -R spec test && cat ./coverage/lcov.info | coveralls && rm -rf ./coverage", - "coverage": "npm run lint && istanbul cover _mocha test", + "test": "npm run lint && FORCE_COLOR=true node ./bin/test", + "coverage": "npm run lint && FORCE_COLOR=true node ./bin/coverage", "lint": "standard" }, "keywords": [ @@ -24,18 +24,20 @@ "accepts": "^1.3.3", "adonis-ace": "^3.0.4", "adonis-fold": "^3.0.3", - "adonis-lucid": "^3.0.5", + "adonis-lucid": "^3.0.11", "chai": "^3.5.0", "clear-require": "^1.0.1", "co-mocha": "^1.1.3", - "coveralls": "^2.11.14", + "coveralls": "^2.11.15", "cz-conventional-changelog": "^1.2.0", "istanbul": "^0.4.5", - "mocha": "^3.0.2", + "mocha": "^3.2.0", "mocha-lcov-reporter": "^1.2.0", - "sqlite3": "^3.1.4", - "standard": "^8.1.0", - "supertest": "^2.0.0" + "semver": "^5.3.0", + "shelljs": "^0.7.5", + "sqlite3": "^3.1.8", + "standard": "^8.6.0", + "supertest": "^2.0.1" }, "standard": { "global": [ @@ -58,14 +60,14 @@ "co": "^4.6.0", "co-fs-extra": "^1.2.1", "flat": "^2.0.1", - "haye": "^1.0.0", + "haye": "^1.0.1", "intl": "^1.2.5", "intl-format-cache": "^2.0.5", "intl-messageformat": "^1.3.0", "intl-relativeformat": "^1.3.0", - "lodash": "^4.16.1", + "lodash": "^4.17.2", "negotiator": "^0.6.1", "node-exceptions": "^1.0.3", - "require-all": "^2.0.0" + "require-all": "^2.1.0" } } diff --git a/src/Formatter/index.js b/src/Formatter/index.js index f5c60cd..849ac48 100644 --- a/src/Formatter/index.js +++ b/src/Formatter/index.js @@ -19,7 +19,7 @@ const intlNumber = fnCache(Intl.NumberFormat) const intlDate = fnCache(Intl.DateTimeFormat) const intlMessage = fnCache(require('intl-messageformat')) const intlRelativeFormat = fnCache(require('intl-relativeformat')) -const expressionRegex = /\[(.*)\]/ +const expressionRegex = new RegExp('\\[(.*)\\]') /** * Build options by merging defaults, format From 888f4167e3509375cc81eefa3d39ea7cc8a3c099 Mon Sep 17 00:00:00 2001 From: Harminder Virk Date: Mon, 12 Dec 2016 15:18:59 +0530 Subject: [PATCH 3/3] chore(release): release 1.0.5 --- CHANGELOG.md | 5 +++++ package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a458a2..de53ee5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ + +## [1.0.5](https://github.com/adonisjs/adonis-antl/compare/v1.0.4...v1.0.5) (2016-12-12) + + + ## [1.0.4](https://github.com/adonisjs/adonis-antl/compare/v1.0.3...v1.0.4) (2016-10-07) diff --git a/package.json b/package.json index 83fc99f..5a74178 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "adonis-antl", - "version": "1.0.4", + "version": "1.0.5", "description": "Localization for adonisjs app", "main": "index.js", "directories": {