Commit Graph

410 Commits

Author SHA1 Message Date
Ryan Graham ce7fe3fb07 Update URLs in CONTRIBUTING.md (#198) 2016-07-13 17:42:46 -07:00
Miroslav Bajtoš c2484a6265 Merge pull request #194 from strongloop/fix/require-cache
Stop caching config files
2016-07-13 16:37:49 +02:00
Miroslav Bajtoš 296c38568c Merge pull request #196 from strongloop/fix/travis
travis: drop io.js, add Node v4 and v6
2016-07-01 16:22:10 +02:00
Miroslav Bajtoš 24571328a8 travis: drop io.js, add Node v4 and v6 2016-07-01 16:03:42 +02:00
Miroslav Bajtoš 5f5e86e47f test: fix security warning
Add a simple implementation of getRandomValues to the browser context
to get rid of the following warning:

    [SECURITY] node-uuid: crypto not usable, falling back to insecure
    Math.random()
2016-07-01 16:01:58 +02:00
Miroslav Bajtoš 7b226b212e Stop caching config files 2016-07-01 15:38:25 +02:00
Miroslav Bajtoš 58d9322190 2.19.0
* update copyright notices and license (Ryan Graham)
 * Add flag var lazyConnect to ds config (juehou)
2016-06-20 17:11:43 +02:00
Ryan Graham 5eaa909006
update copyright notices and license 2016-05-05 21:52:36 -07:00
Janny defe5f4bb8 Merge pull request #185 from strongloop/feature/lazy-connect
Add flag var lazyConnect to ds config
2016-05-05 18:18:22 -04:00
juehou d334425ada Add flag var lazyConnect to ds config 2016-05-05 17:33:16 -04:00
Miroslav Bajtoš 51a699af01 2.18.1
* parse config: should ignore null values (Loïc Mahieu)
2016-04-13 16:16:14 +02:00
Miroslav Bajtoš 47974fd1d2 Merge pull request #183 from LoicMahieu/fix/182
parse config: should ignore null values
2016-04-13 16:15:52 +02:00
Loïc Mahieu 1d2649eee7 parse config: should ignore null values
Fix #182
2016-04-13 11:26:24 +02:00
Miroslav Bajtoš cc551b0c0f 2.18.0
* Dynamic datasources.json from ENV and config.json (David Cheung)
 * Use eslint with loopback config (Miroslav Bajtoš)
2016-04-07 10:28:22 +02:00
Miroslav Bajtoš 707214cac4 Merge pull request #177 from strongloop/dynamic-config
Dynamic datasources.json from ENV and config.json
2016-04-07 10:26:41 +02:00
David Cheung 4a815deb27 Dynamic datasources.json from ENV and config.json
Let environment variables override configuration set by config.json
and/or app.set()

Behavior changes
- datasources.json now support dynamic configuration through
  env-vars and config.json
- component-config.json will first consider env-var
  for resolving dynamic conf, then fallback to config.json
- middleware.json will first consider env-var for resolving
  dynamic conf, then fallback to config.json
- for all the dynamic confg, unresolved conf will return as `undefined`

Example:

Consider the following server/datasources.json
```
{
  "mysql" : {
    "name" : "mysql_db",
    "host" : "${MYSQL_DB_HOST}",
    ...
  }
}
```

Now you can provide the parameter through
an environment variable:

```
$ MYSQL_DB_HOST=127.0.0.1 node .
```

or you can set the value in server/config.json

```
{
  "MYSQL_DB_HOST": "127.0.0.1"
}
```
2016-04-06 10:30:23 -04:00
Miroslav Bajtoš b3e5f23865 Merge pull request #178 from strongloop/feature/eslint
Use eslint with loopback config
2016-04-05 15:55:58 +02:00
Miroslav Bajtoš 902005ed8e Use eslint with loopback config
Drop jshint and jscs in favour of eslint.
2016-04-05 15:42:58 +02:00
Miroslav Bajtoš 058e0e2f56 2.17.0
* executor: move "booted" and cb() to the next tick (Miroslav Bajtoš)
 * Fix lodash 4.0.0 breaking changes (Jérémie Drouet)
 * When config is overriden with null don't merge (Farid Neshat)
2016-02-23 12:08:30 +01:00
Miroslav Bajtoš 90b9211fff Merge pull request #174 from strongloop/fix/booted-event-asynchrony
executor: move "booted" and cb() to the next tick
2016-02-23 12:07:42 +01:00
Miroslav Bajtoš b0e5a0bc63 executor: move "booted" and cb() to the next tick
Fix executor to always emit the "booted" event and call the callback
in the next tick of the event loop, regardless of whether there are any
async boot scripts.

Before this change, adding a listener for "booted" event was cumbersome:

    boot(app);
    if (app.booting)
      app.on('booted', handler);
    else
      handler();

With the fix in place, one can simply write the following:

    boot(app);
    app.on('booted', handler);
2016-02-22 11:01:06 +01:00
Miroslav Bajtoš e9afcaac70 Merge pull request #168 from alFReD-NSH/null-config
When config is overriden with null don't merge
2016-02-01 13:42:06 +01:00
Simon Ho 2e3b37a4f8 Merge pull request #169 from jdrouet/lodash-breaking-change
Fix lodash 4.0.0 breaking changes
2016-01-18 13:28:28 -08:00
Jérémie Drouet c475e4af84 Fix lodash 4.0.0 breaking changes 2016-01-18 13:29:46 +01:00
Farid Neshat d850560a18 When config is overriden with null don't merge
Fixes #146 and also fixes strongloop/loopback-component-explorer#51
2016-01-08 22:54:17 +08:00
Miroslav Bajtoš a5b888a719 2.16.0
* executor: allow loopback versions >= 3.0.0-alpha (Miroslav Bajtoš)
2015-12-22 10:03:54 +01:00
Miroslav Bajtoš ab6a8ae776 Merge pull request #165 from strongloop/support-loopback-3.0
executor: allow loopback versions >= 3.0.0-alpha
2015-12-22 10:03:39 +01:00
Miroslav Bajtoš 3836078985 executor: allow loopback versions >= 3.0.0-alpha 2015-12-22 09:55:37 +01:00
Miroslav Bajtoš adeece3b30 2.15.0
* Bluemix prefers HOST/PORT over VCAP_APP_XXXX (Sai Vennam)
 * Set app env if it is supplied in options object (Amir Jafarian)
2015-12-04 17:06:10 +01:00
Miroslav Bajtoš d8b298b53d Merge pull request #158 from svennam92/patch-1
Bluemix favors PORT over VCAP_APP_PORT
2015-12-04 17:05:31 +01:00
Sai Vennam de6ebf65ee Bluemix prefers HOST/PORT over VCAP_APP_XXXX 2015-12-03 13:29:58 -05:00
Miroslav Bajtoš 4e3e1a7394 Merge pull request #164 from strongloop/set-app-env
Set app env if it is supplied in options object
2015-12-02 16:38:54 +01:00
Amir Jafarian 2574c9dbb6 Set app env if it is supplied in options object
Set the app env if it is supplied in options object which solves issue
number 28 under loopback-boot repo
2015-11-30 10:30:09 -05:00
Miroslav Bajtoš 088ca864c2 2.14.2
* executor: preserve RegExps in middleware paths (Miroslav Bajtoš)
2015-11-24 18:53:48 +01:00
Miroslav Bajtoš 5f0175afbf Merge pull request #159 from strongloop/fix/interpolate-regexp
executor: preserve RegExps in middleware paths
2015-11-24 18:53:17 +01:00
Miroslav Bajtoš a023e1f142 2.14.1
* Warn user if missing a config file (Amir Jafarian)
 * Refer to licenses with a link (Sam Roberts)
2015-11-24 14:15:56 +01:00
Miroslav Bajtoš c17efda0eb Merge pull request #162 from Amir-61/missingConfigWarning
Warn about missing main json config file
2015-11-24 14:07:53 +01:00
Amir Jafarian 3f55acf9d5 Warn user if missing a config file
Report a warning when the main json file is missing and there is a
local or {env} file present
2015-11-23 13:34:19 -05:00
Miroslav Bajtoš 1d27cf0e05 executor: preserve RegExps in middleware paths
Fix interpolateVariables() to skip objects with a non-default
constructor, for example RegExp or Date.
2015-11-04 15:47:55 +01:00
Sam Roberts 24fbfbebf1 Refer to licenses with a link 2015-11-03 12:27:49 -08:00
Miroslav Bajtoš 638368844d 2.14.0
* Support bluemix env variables for host and port (Miroslav Bajtoš)
2015-10-14 11:20:30 +02:00
Miroslav Bajtoš 5238bc1027 Merge pull request #156 from strongloop/feature/bluemix-env
Support bluemix environment variables for host and port
2015-10-14 11:18:45 +02:00
Miroslav Bajtoš c8fdbd5110 Support bluemix env variables for host and port
Detect Bluemix/CouldFoundry environment and automatically apply
VCAP_APP_PORT and VCAP_APP_HOST settings.
2015-10-09 13:21:38 -07:00
Miroslav Bajtoš 63589c03ab 2.13.0
* add env folder for boot (yorkie)
 * Use strongloop conventions for licensing (Sam Roberts)
2015-10-01 19:19:10 +02:00
Miroslav Bajtoš fbafa2b608 Merge pull request #154 from weflex/add/env-boot
add env postifix to boot
2015-10-01 18:11:24 +02:00
yorkie d249b15ce0 add env folder for boot 2015-09-29 12:31:46 +08:00
Sam Roberts d1b00ce5d8 Use strongloop conventions for licensing 2015-09-21 16:42:54 -07:00
Miroslav Bajtoš 6ef37ef651 2.12.2
* test: fix strict mode failure (Ryan Graham)
2015-09-09 13:39:21 +02:00
Miroslav Bajtoš 819e1ea9c8 Merge pull request #155 from strongloop/fix-build
test: fix strict mode failure
2015-09-09 13:27:42 +02:00
Ryan Graham a5bc1056aa test: fix strict mode failure
Since the value is undefined at the this point, just remove it so that
linters and strict mode don't cause the entire test suite to abort.
2015-09-08 17:30:30 -07:00