Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v14
10 changes: 10 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
language: node_js
node_js:
- 5
deploy:
provider: npm
email: operations@jellyvision.com
on:
tags: true
api_key:
secure: fKz89WnuDPSFvjV5iFCq+z36gLDjhtbGT+pdTN7MWnMonFk6Vex5KoUqDQkorrH8wTU3qMhjrqa+HH9ShoOBVjC5z05mEo7yQ0utR7Hb6Dpr77PqJAwm4bphBZ3hAI9/qXtbfi2KGwuPoE0oa59TAebLosKmaP1AJVhDPTH+eu8=
15 changes: 14 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

This is a collection of general-use UI components that can be used to enhance a [Lateralus](https://github.com/Jellyvision/lateralus) app. Each component has its own README file, so please explore the directory of the component which you would like to know more about.

To wire up a component in your app, set it up as an [AMD package](http://requirejs.org/docs/api.html#packages), like so:
## Using Lateralus Components

To wire up a component in your app, set it up as an [AMD package](http://requirejs.org/docs/api.html#packages), like so:

````javascript
require.config({
Expand All @@ -21,3 +22,15 @@ require.config({
}
});
````

## Branching & Versioning

- Pre-Release
- Branch off of `/develop`
- Publish [pre-release versions](https://jasonraimondi.com/posts/use-the-npm-version-command-to-semantically-version-your-node-project/#create-a-prerelease-version) from feature branches using `npm publish --tag next`
- Test your pre-release version in a locally running lateralus app
- When you're ready to release your new version:
- Merge to `/develop`
- Checkout `/develop` and promote your prerelease version to a release version
- Create a PR from `/develop` to `/master`
- Publish your release version to npm
20 changes: 0 additions & 20 deletions bower.json

This file was deleted.

13 changes: 8 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "@jellyvision/lateralus-components",
"version": "0.0.10",
"name": "lateralus-components",
"version": "0.0.13-alpha.0",
"description": "A set of general-use components for Lateralus",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
"test": "jshint model-editor/*.js select/*.js tabs/*.js"
},
"repository": {
"type": "git",
Expand All @@ -19,7 +19,10 @@
},
"homepage": "https://github.com/Jellyvision/lateralus-components#readme",
"dependencies": {
"lateralus": "0.9.3",
"jsoneditor": "~4.1.3"
"jsoneditor": "~10.1.0",
"lateralus": "^1.1.0"
},
"devDependencies": {
"jshint": "^2.13.6"
}
}