Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

two #26

Merged
merged 5 commits into from Aug 23, 2020
Merged

two #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e96e58
deliberate ES6 syntax
Fil Jun 5, 2020
1ae2a28
links to @6 versions
Fil Jul 10, 2020
779eef1
Merge branch 'master' into two
Fil Jul 27, 2020
7d1a33f
v2.0.0-rc.1
Fil Jul 27, 2020
ca0e283
yarn.lock
Fil Jul 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Expand Up @@ -25,9 +25,9 @@ var piyg = d3.scaleSequential(d3.interpolatePiYG);
If you use NPM, `npm install d3-scale-chromatic`. Otherwise, download the [latest release](https://github.com/d3/d3-scale-chromatic/releases/latest) or load directly from [d3js.org](https://d3js.org) as a [standalone library](https://d3js.org/d3-scale-chromatic.v1.min.js). AMD, CommonJS, and vanilla environments are supported. In vanilla, a `d3` global is exported:

```html
<script src="https://d3js.org/d3-color.v1.min.js"></script>
<script src="https://d3js.org/d3-interpolate.v1.min.js"></script>
<script src="https://d3js.org/d3-scale-chromatic.v1.min.js"></script>
<script src="https://d3js.org/d3-color.v2.min.js"></script>
<script src="https://d3js.org/d3-interpolate.v2.min.js"></script>
<script src="https://d3js.org/d3-scale-chromatic.v2.min.js"></script>
<script>

var yellow = d3.interpolateYlGn(0), // "rgb(255, 255, 229)"
Expand All @@ -40,7 +40,7 @@ var yellow = d3.interpolateYlGn(0), // "rgb(255, 255, 229)"
Or, as part of the [D3 default bundle](https://github.com/d3/d3):

```html
<script src="https://d3js.org/d3.v5.min.js"></script>
<script src="https://d3js.org/d3.v6.min.js"></script>
<script>

var yellow = d3.interpolateYlGn(0), // "rgb(255, 255, 229)"
Expand Down
9 changes: 6 additions & 3 deletions package.json
View file
Open in desktop
@@ -1,6 +1,9 @@
{
"name": "d3-scale-chromatic",
"version": "1.5.0",
"version": "2.0.0-rc.1",
"publishConfig": {
"tag": "next"
},
"description": "Sequential, diverging and categorical color schemes.",
"keywords": [
"d3",
Expand Down Expand Up @@ -36,8 +39,8 @@
"postpublish": "git push && git push --tags && cd ../d3.github.com && git pull && cp ../${npm_package_name}/dist/${npm_package_name}.js ${npm_package_name}.v${npm_package_version%%.*}.js && cp ../${npm_package_name}/dist/${npm_package_name}.min.js ${npm_package_name}.v${npm_package_version%%.*}.min.js && git add ${npm_package_name}.v${npm_package_version%%.*}.js ${npm_package_name}.v${npm_package_version%%.*}.min.js && git commit -m \"${npm_package_name} ${npm_package_version}\" && git push && cd - && zip -j dist/${npm_package_name}.zip -- LICENSE README.md dist/${npm_package_name}.js dist/${npm_package_name}.min.js"
},
"dependencies": {
"d3-color": "1",
"d3-interpolate": "1"
"d3-color": ">=2.0.0-rc.1",
"d3-interpolate": ">=2.0.0-rc.1"
},
"devDependencies": {
"eslint": "6",
Expand Down
4 changes: 1 addition & 3 deletions src/ramp.js
View file
Open in desktop
@@ -1,5 +1,3 @@
import {interpolateRgbBasis} from "d3-interpolate";

export default function(scheme) {
return interpolateRgbBasis(scheme[scheme.length - 1]);
}
export default scheme => interpolateRgbBasis(scheme[scheme.length - 1]);
11 changes: 0 additions & 11 deletions src/scheme.js
View file
Open in desktop

This file was deleted.

18 changes: 9 additions & 9 deletions yarn.lock
View file
Open in desktop
Expand Up @@ -169,17 +169,17 @@ cross-spawn@^6.0.5:
shebang-command "^1.2.0"
which "^1.2.9"

d3-color@1:
version "1.3.0"
resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.3.0.tgz#675818359074215b020dc1d41d518136dcb18fa9"
integrity sha512-NHODMBlj59xPAwl2BDiO2Mog6V+PrGRtBfWKqKRrs9MCqlSkIEb0Z/SfY7jW29ReHTDC/j+vwXhnZcXI3+3fbg==
d3-color@>=2.0.0-rc.1:
version "2.0.0-rc.1"
resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-2.0.0-rc.1.tgz#306e5424d97d7c392fbb5f4e2f71a19692b625d1"
integrity sha512-qG47cofgHAELBblsjxvnloC3EQ0wu33aqZ5DdV8wljDKJEcY1eTX6WrIstIG6y93hJvaVFCzQmglNXt6B6bqBA==

d3-interpolate@1:
version "1.3.2"
resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.3.2.tgz#417d3ebdeb4bc4efcc8fd4361c55e4040211fd68"
integrity sha512-NlNKGopqaz9qM1PXh9gBF1KSCVh+jSFErrSlD/4hybwoNX/gt1d8CDbDW+3i+5UOHhjC6s6nMvRxcuoMVNgL2w==
d3-interpolate@>=2.0.0-rc.1:
version "2.0.0-rc.1"
resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-2.0.0-rc.1.tgz#894989e6051c8fef5632be1a67d6734b4974b3e8"
integrity sha512-QJ7SdIqRvHada4WDkeCosJbn56ssRCs0QyPQhOZnlgpD3aNw14zssGrwF14E4ZCgrZgDf8J6mXXLAcyFnFhX7A==
dependencies:
d3-color "1"
d3-color ">=2.0.0-rc.1"

debug@^4.0.1:
version "4.1.1"
Expand Down