Commit Graph

363 Commits

Author SHA1 Message Date
Miroslav Bajtoš f5ac5273a7 Merge branch 'release/2.3.0' into production 2014-10-27 11:14:40 +01:00
Miroslav Bajtoš 84f8a51138 2.3.0 2014-10-27 11:14:19 +01:00
Miroslav Bajtoš d7bdbd31b1 compiler: fix coding style violations 2014-10-27 11:13:02 +01:00
Miroslav Bajtoš b480efde8a Merge pull request #59 from TorchlightSoftware/coffee-fix2
support coffee-script models and client code
2014-10-24 20:04:21 +02:00
bitmage e936deffe2 support coffee-script models and client code
Load models for any filetypes registered in require.extensions.

 - Server side coffee-script requires a `require('coffee-script/register');`

 - Client side coffee-script requires Coffeeify.
2014-10-24 10:42:30 -07:00
Miroslav Bajtoš 3961f1c615 Merge tag 'v2.2.0'
2.2.0
2014-10-22 08:58:40 +02:00
Miroslav Bajtoš 56c74174f1 Merge branch 'release/2.2.0' into production 2014-10-22 08:58:05 +02:00
Miroslav Bajtoš 5cea78c6aa 2.2.0 2014-10-22 08:57:44 +02:00
Miroslav Bajtoš b5c585291b Merge pull request #60 from strongloop/feature/skip-builtin-loopback-models
Skip definitions of built-in loopback models
2014-10-21 18:17:49 +02:00
Miroslav Bajtoš aa4cbdd80f compiler: support module-relative model sources
Interpret model sources in the same way how `require.resolve`
interprets the path:

 - values starting with `./` and `../` are relative to the file
   where they are specified

 - other values are relative to node modules folders

This way it's possible to specify a source `loopback/common/models`
and have it resolved to whatever place the loopback is installed.
2014-10-21 18:10:22 +02:00
Miroslav Bajtoš 26abb43ad4 Skip definitions of built-in loopback models
LoopBack built-in models are special: they follow the loopback-boot
structure and provide `common/models/{name}.json` files, but they are
also automatically loaded (created) by loopback.

This change modifies `executor` to recognize built-in models and do not
redefine them.
2014-10-21 18:10:22 +02:00
Miroslav Bajtoš 011296d825 Merge pull request #58 from strongloop/feature/use-loopback-2x-for-tests
Use loopback 2x for tests, update dependency versions
2014-10-21 09:45:50 +02:00
Miroslav Bajtoš c04946073f package: update dependency versions 2014-10-21 09:40:52 +02:00
Miroslav Bajtoš 927bee82f7 Use loopback 2.x in unit tests. 2014-10-21 09:38:25 +02:00
Raymond Feng fadfaffe25 Merge tag 'v2.1.0'
2.1.0
2014-10-09 12:23:19 -07:00
Raymond Feng 676f347f36 Merge branch 'release/2.1.0' into production 2014-10-09 12:23:15 -07:00
Raymond Feng 68593c8100 Bump version 2014-10-09 12:22:34 -07:00
Raymond Feng e0abff007e Merge pull request #50 from strongloop/feature/support-async-scripts
Add support async scripts
2014-10-09 12:19:21 -07:00
Raymond Feng 94cb4d6342 Add support for async boot scripts 2014-10-09 12:18:36 -07:00
Miroslav Bajtoš 38c4944e2e Merge pull request #54 from strongloop/feature/support-nested-values-in-config-overrides
Support nested values in config overrides
2014-10-09 19:33:13 +02:00
Miroslav Bajtoš 0d4b5bb7c4 Merge pull request #43 from johnsoftek/master
Custom rootDir for app config

Close #43
2014-10-09 16:36:31 +02:00
Miroslav Bajtoš d54e2b54d0 Clean up jsdoc comments.
- Fix formatting to improve the way how the text is rendered on
   http://apidocs.strongloop.com/loopback-boot/

 - Add `@property` entry for `options.appConfigRootDir`.
2014-10-09 16:36:19 +02:00
johnsoftek 18121a4208 Custom rootDir for app config 2014-10-09 16:36:19 +02:00
Miroslav Bajtoš f0836719c9 compiler: improve merging of Arrays and Objects
Add more unit-tests to cover various edge cases. Fix issues discovered
by these new tests.
2014-10-08 17:15:32 +02:00
Shelby Sanders e1d870dced config-loader: deeply merge Array and Object vals 2014-10-08 17:15:32 +02:00
Miroslav Bajtoš abda37fee9 gitignore: add Idea's *.iml files 2014-10-08 17:15:30 +02:00
Miroslav Bajtoš ac73288cef Merge pull request #51 from strongloop/feature/fix-jshint-problems
package: Add `jshint` to `devDependencies`
2014-10-08 15:06:19 +02:00
Miroslav Bajtoš ed0880d00f package: Add `jshint` to `devDependencies`
Remove dependency on a globally installed jshint instance
and fix `npm test` on machines without a global jshint.
2014-10-08 12:09:16 +02:00
Ryan Graham e974033395 Update contribution guidelines
Replace commit signing process with https://cla.strongloop.com/
2014-10-01 18:06:20 -07:00
Miroslav Bajtoš 6c26e99ab9 Merge pull request #36 from strongloop/feature/fix-CI-build
test: fix failures on CI
2014-08-19 19:37:39 +02:00
Miroslav Bajtoš 0169f22cd0 test: ensure sandbox dir is present
Fix test/browser.test.js failing on CI due to sandbox dir not present
on the first run.
2014-08-19 09:26:57 +02:00
Miroslav Bajtoš 34de593202 test: add `global.navigator` for browser tests
The debug module uses `navigator.userAgent` to detect whether the
browser support colors in console logs.
2014-08-18 14:56:20 +02:00
Miroslav Bajtoš 93bfc3a63a test: increase timeout for browserify 2014-08-18 14:35:19 +02:00
Miroslav Bajtoš edb1f1fdce index: fix jshint error
Wrap a too long line in a jsdoc comment.
2014-08-18 14:26:11 +02:00
Raymond Feng 20ed867d79 Merge pull request #34 from cajoy/master
documentation fix
2014-08-07 08:23:37 -07:00
Alex 1ae0167b7c documentation fix 2014-08-07 10:12:35 -04:00
Raymond Feng 51cf0052d0 Merge pull request #31 from fabien/fix/compile-options
Implemented modelSources, bootDirs and bootScripts options
2014-08-04 08:42:45 -07:00
Fabien Franzen 217f0ce32f Fix typo 2014-08-04 10:35:13 +02:00
Fabien Franzen f98d2cb89c Implemented modelSources, bootDirs and bootScripts options 2014-08-04 10:33:03 +02:00
Miroslav Bajtoš bc233e83d3 Merge tag 'v2.0.0'
2.0.0
2014-07-22 19:34:28 +02:00
Miroslav Bajtoš 4d55ab82aa Merge branch 'release/2.0.0' into production 2014-07-22 19:34:24 +02:00
Miroslav Bajtoš 5471129f79 2.0.0 2014-07-22 19:34:01 +02:00
Miroslav Bajtoš e2092bba17 Merge pull request #26 from strongloop/feature/simplify-model-fn-signature
executor: remove `Base` arg from model function
2014-07-22 19:28:05 +02:00
Miroslav Bajtoš c4b09c6b7a executor: remove `Base` arg from model function
Simplify the contract for functions exported by `models/*.js` files
by removing the second argument `Base`. The base class can be accessed
using `ModelCtor.base`.

An updated example of a model js file:

```js
module.exports = function(Customer) {
  Customer.setup = function() {
    Customer.base.setup.apply(this, arguments);
    // etc.
  };
};
```
2014-07-22 10:59:50 +02:00
Miroslav Bajtoš b5989e907e package: update dependency versions 2014-07-22 10:57:44 +02:00
Miroslav Bajtoš e42ee20d00 Merge tag 'vv2.0.0-beta3'
v2.0.0-beta3
2014-07-17 19:01:19 +02:00
Miroslav Bajtoš be74e7c1ec Merge branch 'release/v2.0.0-beta3' into production 2014-07-17 19:01:16 +02:00
Miroslav Bajtoš eac6cdf645 v2.0.0-beta3 2014-07-17 19:00:55 +02:00
Miroslav Bajtoš 6bf995c55b compiler: return a clone of instructions
When executor passes the instruction to loopback methods,
loopback modifies the data. Since we are loading the data using
`require` such changes affects also code that calls
`require` for one of the instructions files.

This change adds a deep clone step to prevent this issue.
2014-07-17 18:44:15 +02:00
Raymond Feng cb67fc4165 Merge tag 'v2.0.0-beta2'
2.0.0-beta2
2014-07-17 09:05:54 -07:00