Comparing version 0.2.4 to 0.2.5
@@ -1,10 +0,32 @@ | ||
Releases can be found on [npm](https://www.npmjs.com/package/d3-financial-components). | ||
Releases can be found on [npm](https://www.npmjs.com/package/d3fc). | ||
#Process | ||
#Release Process (for devs) | ||
* Setup [npm author info](https://docs.npmjs.com/getting-started/publishing-npm-packages) and ensure you're listed as a [collaborator on the repository](https://www.npmjs.com/package/d3-financial-components). | ||
* Create a [GitHub personal access token](https://github.com/settings/tokens) and configure the environment variables `GITHUB_USERNAME` (your username) and `GITHUB_PASSWORD` (the access token). | ||
* Checkout the master branch. `git checkout master` | ||
* Fetch the latest changes from upstream. `git fetch upstream` | ||
* Reset the local branch to match upstream master. `git reset --HARD upstream/master` | ||
* Run the release task. `grunt release` | ||
##Pre-requisites | ||
As well as the standard development instructions - | ||
* Setup [npm author info](https://docs.npmjs.com/getting-started/publishing-npm-packages) and ensure you're listed as a [collaborator on the repository](https://www.npmjs.com/package/d3fc). | ||
##Process | ||
```bash | ||
read -p "Version:" version | ||
git clean -fd | ||
git fetch upstream | ||
git checkout master | ||
git reset --hard upstream/master | ||
# n.b. don't tag at this point, we need to bump the version in the source | ||
npm version $version --no-git-tag-version | ||
grunt clean build | ||
git add --all | ||
git commit -m "Release version $version" | ||
git tag -a $version -m "Release version $version" | ||
git push upstream $version master | ||
npm publish | ||
``` |
@@ -253,13 +253,2 @@ /* global module */ | ||
_release: { | ||
options: { | ||
remote: 'upstream', | ||
github: { | ||
repo: 'ScottLogic/d3fc', | ||
usernameVar: 'GITHUB_USERNAME', | ||
passwordVar: 'GITHUB_PASSWORD' | ||
} | ||
} | ||
}, | ||
version: { | ||
@@ -275,4 +264,2 @@ defaults: { | ||
grunt.renameTask('release', '_release'); | ||
grunt.registerTask('check:failOnError', ['jshint:failOnError', 'jscs:failOnError']); | ||
@@ -290,3 +277,2 @@ grunt.registerTask('check:warnOnly', ['jshint:warnOnly', 'jscs:warnOnly']); | ||
grunt.registerTask('default', ['build']); | ||
grunt.registerTask('release', ['default', '_release']); | ||
}; |
{ | ||
"name": "d3fc", | ||
"version": "0.2.4", | ||
"version": "0.2.5", | ||
"description": "A set of re-useable components for building financial charts with D3", | ||
@@ -36,3 +36,2 @@ "author": "Scott Logic", | ||
"grunt-jscs": "^1.8.0", | ||
"grunt-release": "^0.12.0", | ||
"grunt-version": "^1.0.0", | ||
@@ -39,0 +38,0 @@ "jquery": "^1.11.2", |
@@ -16,5 +16,5 @@ # d3fc [![Build Status](https://travis-ci.org/ScottLogic/d3fc.svg?branch=master)](https://travis-ci.org/ScottLogic/d3fc) | ||
<script src="node_modules/d3fc/dist/d3fc.js"></script> | ||
<link href="node_modules/d3-financial-components/dist/d3fc.css" rel="stylesheet"/> | ||
<link href="node_modules/d3fc/dist/d3fc.css" rel="stylesheet"/> | ||
If you want a quick verification that everything has installed correctly, the following code will render a simple time series chart: | ||
@@ -21,0 +21,0 @@ |
(function() { | ||
'use strict'; | ||
// Needs to be defined like this so that the grunt task can update it | ||
var version = '0.2.5'; | ||
// Crazyness to get a strict mode compliant reference to the global object | ||
@@ -25,4 +28,5 @@ var global = null; | ||
tool: {}, | ||
util: {} | ||
util: {}, | ||
version: version | ||
}; | ||
}()); |
@@ -28,2 +28,4 @@ (function(d3, fc) { | ||
var joinedData = data || fc.util.fn.identity; | ||
if (!(container instanceof d3.selection)) { | ||
@@ -42,3 +44,3 @@ container = d3.select(container); | ||
} | ||
var updateSelection = selection.data(data, key); | ||
var updateSelection = selection.data(joinedData, key); | ||
@@ -45,0 +47,0 @@ // enter |
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
2464719
18
259
35750