Commit Graph

346 Commits

Author SHA1 Message Date
Raymond Feng 32276c79d4 Merge pull request #147 from strongloop/feature/enhance-middleware-merge
Enhance middleware config merge
2015-08-10 07:55:31 -07:00
Raymond Feng 7362cc489e Enhance middleware config merge 2015-08-07 15:53:28 -07:00
Raymond Feng 952c4101ef 2.9.0
* Fix the build failure (Raymond Feng)

 * Fix the model-config/datasource merge (Raymond Feng)

 * Resolved style issue (Dennis Ashby)

 * Added code to allow model-config to respect model-config.local.js and model-config.env.js as do other config files. (Dennis Ashby)

 * Add jsdoc for `options.mixinSources` (Miroslav Bajtoš)

 * allow middleware to be optional (Hage Yaapa)
2015-08-03 07:47:10 -07:00
Raymond Feng e052da83db Merge pull request #143 from strongloop/dashby3000-master
Fix & Merge https://github.com/strongloop/loopback-boot/pull/141
2015-08-03 07:45:48 -07:00
Raymond Feng 450aa6dd21 Merge branch 'master' of github.com:strongloop/loopback-boot into dashby3000-master 2015-07-31 13:45:23 -07:00
Raymond Feng 329fc59113 Fix the build failure 2015-07-31 10:02:16 -07:00
Raymond Feng 02c826337c Fix the model-config/datasource merge 2015-07-31 10:01:53 -07:00
Dennis Ashby ab723b5490 Resolved style issue 2015-07-31 06:29:03 -07:00
Dennis Ashby 41af081c55 Added code to allow model-config to respect model-config.local.js and model-config.env.js as do other config files. 2015-07-25 09:56:28 -07:00
Miroslav Bajtoš 4f6e768426 Merge pull request #139 from strongloop/fix/jsdoc-mixinSources
Add jsdoc for `options.mixinSources`
2015-07-03 09:42:19 +02:00
Miroslav Bajtoš 6980a250ef Add jsdoc for `options.mixinSources` 2015-06-30 18:07:22 +02:00
Miroslav Bajtoš ac5265f726 Merge pull request #134 from hacksparrow/master
allow middleware to be optional

Close #134
2015-06-25 19:33:03 +02:00
Hage Yaapa 66cc099d1d allow middleware to be optional 2015-06-25 19:32:40 +02:00
Miroslav Bajtoš 0aac03ebb5 2.8.2
* Excl. mod. main path from middleware instructions (Miroslav Bajtoš)
2015-06-24 19:00:42 +02:00
Miroslav Bajtoš 5c8334c7c7 Merge pull request #136 from strongloop/fix/omit-middleware-main-module-file
Excl. mod. main path from middleware instructions
2015-06-24 19:00:15 +02:00
Miroslav Bajtoš a63ae8e44b Excl. mod. main path from middleware instructions
When loading middleware configured in "middleware.json", loopback-boot
used to require() the full path to middleware's module main file,
for example "node_modules/strong-express-metrics/index.js".

This is breaking strong-agent probes, as it's difficult to detect
when the intercepted module (e.g. "strong-express-metrics") was loaded.

This commit modifies the compiler to omit the tail (the path to the
module main source file) when requiring middleware.
2015-06-24 17:21:22 +02:00
Ritchie Martori 6c33a60bbc 2.8.1
* Add more debug info for config loading (Ritchie Martori)

 * use a new variable for better debug output (Bryan Clark)
2015-06-10 09:56:00 -07:00
Ritchie Martori a7d6cf695c Merge pull request #133 from strongloop/feature/config-loader-debug
Add more debug info for config loading
2015-06-10 09:52:07 -07:00
Ritchie Martori 50d99c7e6b Add more debug info for config loading 2015-06-03 11:12:10 -07:00
Raymond Feng bd4c2fc968 Merge pull request #132 from clarkbw/better-debug
use a new variable for better debug output
2015-05-29 10:14:50 -07:00
Bryan Clark 2e63631b31 use a new variable for better debug output
Because tryResolveAppPath returns undefined when it can’t resolve a
path the debug output for directories that cannot be resolved is fairly
useless.

You get output like this:
  loopback👢compiler Skipping unknown module source dir undefined
+0ms

When you want output like this:
loopback👢compiler Skipping unknown module source dir "./models"
+0ms
2015-05-29 09:03:08 -07:00
Miroslav Bajtoš a06aaba1cb 2.8.0
* Support iisnode using named pipes as PORT value (Jonathan Sheely)

 * support 'mixinsources' option (Pradnya Baviskar)

 * compiler: Simplify verifyModelDefinitions() (Miroslav Bajtoš)

 * Fix coding style issues, add API docs (Miroslav Bajtoš)

 * Extend options arg to support custom model definitions (Shlomi Assaf)

 * add support for mixins  - [mixinDirs]: List of directories to look for files  containing model mixin definition. (Pradnya Baviskar)
2015-05-29 10:37:02 +02:00
Miroslav Bajtoš 083a1265a4 Merge pull request #130 from jsheely/master
Support iisnode using named pipes as PORT value

Close #130
2015-05-29 10:35:18 +02:00
Jonathan Sheely 44f733f59f Support iisnode using named pipes as PORT value
Port can't be number checked to support iisnode. Using a parseInt()
or number isNumber function won't work if we want to support iisnode
which uses named pipes for ports (ex. \\.\pipe\mypipe)
2015-05-29 10:34:05 +02:00
Miroslav Bajtoš 140180f667 Merge pull request #131 from PradnyaBaviskar/lb-issue-79-mixinsources
support 'mixinsources' option
2015-05-07 16:04:14 +02:00
Pradnya Baviskar 53f51820f5 support 'mixinsources' option
- By default looks for mixinsources in  directory

- Loads only mixins used through models
2015-05-07 14:35:55 +05:30
Miroslav Bajtoš 2815a42d81 Merge pull request #100 from shlomiassaf:simpleModelDef
Extend options arg to support custom model definitions

Close #100
Close #49
2015-05-05 11:29:30 +02:00
Miroslav Bajtoš 43df90a4c8 compiler: Simplify verifyModelDefinitions()
Refactor `verifyModelDefinitions()` to use the new function
`fixFileExtension` instead of removed `filterValidSourceFiles()`.
2015-05-05 11:28:58 +02:00
Miroslav Bajtoš 0563840006 Fix coding style issues, add API docs 2015-05-05 11:28:58 +02:00
Shlomi Assaf b6c60a297d Extend options arg to support custom model definitions
Extend the options argument of boot/compile to allow the developer
to supply custom model definitions (to replace the result of
findModelDefinitions). Together with the existing options.models,
it allows to specify all model-related data and still use the benefits
which loopback-boot provides (most notably loading models in order
defined by inheritance, i.e. base models are loaded before models that
are extending them).
2015-05-05 11:24:02 +02:00
Miroslav Bajtoš 0e19f0a1b2 Merge pull request #120 from PradnyaBaviskar/lb-boot-issue-79
Add support for mixinDirs
2015-04-24 09:29:39 +02:00
Pradnya Baviskar 9bb988713e add support for mixins
- [mixinDirs]: List of directories to look for files
 containing model mixin definition.
2015-04-24 12:42:56 +05:30
Miroslav Bajtoš aed73a9e51 2.7.1
* executor: fix port lookup (Miroslav Bajtoš)

 * Clean up compiler.tryResolveAppPath (Miroslav Bajtoš)

 * Configure Travis CI builds (Miroslav Bajtoš)
2015-04-23 09:32:10 +02:00
Miroslav Bajtoš c3bbc13fd8 Merge pull request #126 from strongloop/fix/number-isFinite
executor: fix port lookup
2015-04-23 09:26:29 +02:00
Miroslav Bajtoš e5fd8c7975 executor: fix port lookup
Use the global `isFinite` function to find the first valid port
number. This is the same behaviour as `_.isFinite` in lodash@2.x.

As a result, only values that are a valid number are accepted, e.g.
"0" is accepted but "0xy" is not.
2015-04-23 08:51:24 +02:00
Miroslav Bajtoš a2000829bc Merge pull request #127 from strongloop/refactor/tryResolveAppPath
Clean up compiler.tryResolveAppPath
2015-04-22 11:40:12 +02:00
Miroslav Bajtoš acb3d1815f Clean up compiler.tryResolveAppPath
Enable the strict mode by default.
2015-04-22 09:52:06 +02:00
Miroslav Bajtoš e3763ac28e Merge pull request #121 from strongloop/enable-travis
Configure Travis CI builds
2015-04-17 09:14:11 +02:00
Miroslav Bajtoš f9d74f2c5e Configure Travis CI builds 2015-04-17 09:12:45 +02:00
Miroslav Bajtoš 6c0c8b9f8b 2.7.0
* Upgrade lodash and drop underscore.string (Bryan Clark)

 * add console.error message to a bad require in a boot script (Bryan Clark)

 * Support per-application registry of models (Miroslav Bajtoš)

 * Use filename as default value for Model name (Pradnya Baviskar)

 * compiler: code cleanup (Miroslav Bajtoš)

 * Improve the resolution of relative paths  - resolve module relative path for component  - prioritize coffeescript over json (Pradnya Baviskar)

 * Resolve module paths as relative to appRootDir - for middleware (Pradnya Baviskar)

 * Support for multiple apps in browserified bundle. (Krishna Raman)

 * Resolve missing file extension for module relative paths (Pradnya Baviskar)

 * Resolve module paths as relative to appRootDir (Pradnya Baviskar)

 * Resolve relative paths in  using appRootDir (Pradnya Baviskar)

 * Add feature to disable component (Pradnya Baviskar)

 * Fix test for different line endings on Windows (Pradnya Baviskar)

 * Refactor unit test assertions to be more specific (Simon Ho)

 * Add unit test to verify `app.booting flag status (Simon Ho)
2015-04-15 17:43:43 +02:00
Miroslav Bajtoš d9c0f12a66 Merge pull request #119 from clarkbw/lodash
upgrade lodash and drop underscore.string

Close #119
2015-04-15 17:40:32 +02:00
Bryan Clark 044a4df07a Upgrade lodash and drop underscore.string
Update to the latest version of "lodash" to use the string functions
included and drop the usage of "underscore.string".

Existing tests run checks for `flying-car` definitions to be named
`FlyingCar` so there doesn’t seem to be a need to add more checks.

`isFinite` changed from the older version of lodash to no longer coerce
strings into numbers, this commit adds a call of `parseInt` before
checking whether the value is a finite number.

`parseInt` on an undefined returns NaN which isFinite does not identify
as a number.

While changing this part, the code was reworked to use `Number.isFinite`
and thus the executor no longer depends on lodash. This should reduce
the size of the browser bundle.
2015-04-15 17:40:14 +02:00
Miroslav Bajtoš 80831cdaaf Merge pull request #115 from clarkbw/bad-require
add console.error message to a bad require in a boot script
2015-04-14 19:02:06 +02:00
Bryan Clark 1d8bd15a77 add console.error message to a bad require in a boot script
This change produces the following error message in the tests:
`Failed loading boot script badScript.js`
`Cannot find module 'doesnt-exist’`
2015-04-14 09:09:18 -07:00
Miroslav Bajtoš 2e9f001100 Merge pull request #112 from strongloop/feature/app-registries
Support per-application registry of models
2015-04-14 08:22:02 +02:00
Miroslav Bajtoš acf1868ba4 Support per-application registry of models 2015-04-09 17:56:56 +02:00
Miroslav Bajtoš 1b9f137062 Merge pull request #118 from PradnyaBaviskar/lb-boot-issue-42
Use filename as default value for Model name
2015-04-08 10:50:03 +02:00
Pradnya Baviskar 39d820a657 Use filename as default value for Model name 2015-04-08 14:04:57 +05:30
Miroslav Bajtoš ade8605618 Merge pull request #117 from strongloop/fix/compiler-code-cleanup
compiler: code cleanup
2015-04-07 12:38:24 +02:00
Miroslav Bajtoš 6526ffeb3d compiler: code cleanup
Refactor and simplify the internal method tryResolveAppPath.

Fix a bug in the resolver of middleware paths which was discovered
by the refactoring.
2015-04-07 10:42:49 +02:00