diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..ca3f1e5 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +v14 \ No newline at end of file diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..0e87c8a --- /dev/null +++ b/.travis.yml @@ -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= diff --git a/README.md b/README.md index 5443e7b..b86f16b 100644 --- a/README.md +++ b/README.md @@ -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({ @@ -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 diff --git a/bower.json b/bower.json deleted file mode 100644 index 1d7e422..0000000 --- a/bower.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "lateralus-components", - "version": "0.0.10", - "authors": [ - "Jeremy Kahn " - ], - "description": "A set of general-use components for Lateralus", - "moduleType": [ - "amd" - ], - "keywords": [ - "lateralus" - ], - "license": "MIT", - "homepage": "https://github.com/Jellyvision/lateralus-components", - "dependencies": { - "lateralus": "0.9.3", - "jsoneditor": "~4.1.3" - } -} diff --git a/package.json b/package.json index a6f5904..6843829 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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" } }