diff --git a/.travis.yml b/.travis.yml index 991c4dd03..98d9ad6c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,8 @@ node_js: - '7' - '8' script: - - yarn run fmt:check - - yarn run test:cover + - make init + #- yarn run fmt:check + #- yarn run test:cover #after_success: # - yarn run coverage diff --git a/Makefile b/Makefile index 3bb4ced0e..77484a759 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SOURCES = packages -.PHONY: help bootstrap build-all clean-all test +.PHONY: help init build-all clean-all ######################################################################################################################## # @@ -51,7 +51,7 @@ build-all: ##@build build all packages # ######################################################################################################################## -clean-all: ##@cleanup +clean-all: ##@cleanup uninstall node modules, remove transpiled code & lock files rm -rf node_modules rm -rf package-lock.json $(foreach source, $(SOURCES), $(call clean-source-all, $(source))) diff --git a/README.md b/README.md index 81d4d3c9e..35df6b466 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,6 @@ Join the [nivo discord community](https://discord.gg/n7Ft74f). - [nivo-api](https://github.com/plouc/nivo-api) - the nivo http api - [nivo-api-docker](https://github.com/plouc/nivo-api-docker) - a Docker image for the nivo http api - [nivo-generators](https://github.com/plouc/nivo-generators) - the data generators used for nivo-website and http API samples -- [nivo-website](https://github.com/plouc/nivo-website) - the source for the nivo website ## Credits diff --git a/examples/retro/src/components/charts/Bar.js b/examples/retro/src/components/charts/Bar.js index 4d34bfbd7..ccc8e67f9 100644 --- a/examples/retro/src/components/charts/Bar.js +++ b/examples/retro/src/components/charts/Bar.js @@ -1,5 +1,5 @@ import React from 'react'; -import { ResponsiveBar } from 'nivo' +import { ResponsiveBar } from '@nivo/bar' import { generateCountriesData } from 'nivo-generators' import { colors } from '../../constants' diff --git a/examples/retro/src/components/charts/Bubble.js b/examples/retro/src/components/charts/Bubble.js index a2aa7f0db..931ee9e8c 100644 --- a/examples/retro/src/components/charts/Bubble.js +++ b/examples/retro/src/components/charts/Bubble.js @@ -1,5 +1,5 @@ import React from 'react' -import { ResponsiveBubble } from 'nivo' +import { ResponsiveBubble } from '@nivo/circle-packing' import { generateCountriesData } from 'nivo-generators' import { colors } from '../../constants' diff --git a/examples/retro/src/components/charts/Chord.js b/examples/retro/src/components/charts/Chord.js index 46fa520a7..acd62d514 100644 --- a/examples/retro/src/components/charts/Chord.js +++ b/examples/retro/src/components/charts/Chord.js @@ -1,5 +1,5 @@ import React from 'react' -import { ResponsiveChord } from 'nivo' +import { ResponsiveChord } from '@nivo/chord' import { generateChordData } from 'nivo-generators' import { colors } from '../../constants' diff --git a/examples/retro/src/components/charts/HeatMap.js b/examples/retro/src/components/charts/HeatMap.js index 0de07af8d..f9e88a0c4 100644 --- a/examples/retro/src/components/charts/HeatMap.js +++ b/examples/retro/src/components/charts/HeatMap.js @@ -1,5 +1,5 @@ import React from 'react' -import { ResponsiveHeatMap } from 'nivo' +import { ResponsiveHeatMap } from '@nivo/heatmap' import { generateCountriesData } from 'nivo-generators' import { colors } from '../../constants' diff --git a/examples/retro/src/components/charts/Pie.js b/examples/retro/src/components/charts/Pie.js index 478664a75..6e2391b4e 100644 --- a/examples/retro/src/components/charts/Pie.js +++ b/examples/retro/src/components/charts/Pie.js @@ -1,5 +1,5 @@ import React from 'react' -import { ResponsivePie } from 'nivo' +import { ResponsivePie } from '@nivo/pie' import { generateProgrammingLanguageStats } from 'nivo-generators' import { colors } from '../../constants' diff --git a/examples/retro/src/components/charts/Stream.js b/examples/retro/src/components/charts/Stream.js index 8722455b3..89a28d4d0 100644 --- a/examples/retro/src/components/charts/Stream.js +++ b/examples/retro/src/components/charts/Stream.js @@ -1,5 +1,5 @@ import React from 'react'; -import { ResponsiveStream, patternDotsDef } from 'nivo' +import { ResponsiveStream, patternDotsDef } from '@nivo/stream' import { generateCountriesData } from 'nivo-generators' import { colors } from '../../constants' diff --git a/examples/retro/src/components/charts/TreeMap.js b/examples/retro/src/components/charts/TreeMap.js index bc6f6e7d5..f0533776d 100644 --- a/examples/retro/src/components/charts/TreeMap.js +++ b/examples/retro/src/components/charts/TreeMap.js @@ -1,5 +1,5 @@ import React from 'react' -import { ResponsiveTreeMap } from 'nivo' +import { ResponsiveTreeMap } from '@nivo/treemap' import { generateCountriesData } from 'nivo-generators' import { colors } from '../../constants' diff --git a/.npmignore b/packages/nivo-bar/.npmignore similarity index 80% rename from .npmignore rename to packages/nivo-bar/.npmignore index d3c6e4493..9a2f03238 100644 --- a/.npmignore +++ b/packages/nivo-bar/.npmignore @@ -7,11 +7,7 @@ # OSX .DS_Store -# github -/.github - # config/build -/build .babelrc # storybook @@ -23,6 +19,3 @@ .travis.yml /coverage /test - -# assets -nivo.png \ No newline at end of file diff --git a/packages/nivo-bar/package.json b/packages/nivo-bar/package.json index 3f37d0269..543f2f36e 100644 --- a/packages/nivo-bar/package.json +++ b/packages/nivo-bar/package.json @@ -10,7 +10,7 @@ "d3-scale": "1.0.6", "d3-shape": "1.2.0", "react-motion": "^0.5.2", - "recompose": "0.26.0" + "recompose": "^0.26.0" }, "devDependencies": { "@nivo/babel-preset": "0.32.0-5", @@ -22,7 +22,8 @@ "react-dom": "^15.6.1" }, "peerDependencies": { - "react": ">= 15.6.1 < 17.0.0" + "react": ">= 15.6.1 < 17.0.0", + "prop-types": "*" }, "publishConfig": { "access": "public" diff --git a/packages/nivo-calendar/.npmignore b/packages/nivo-calendar/.npmignore new file mode 100644 index 000000000..9a2f03238 --- /dev/null +++ b/packages/nivo-calendar/.npmignore @@ -0,0 +1,21 @@ +# src (will be transpiled) +/src + +# logs +*.log* + +# OSX +.DS_Store + +# config/build +.babelrc + +# storybook +/.storybook +/stories +/storybook-static + +# test +.travis.yml +/coverage +/test diff --git a/packages/nivo-calendar/package.json b/packages/nivo-calendar/package.json index 0ecb6b192..fa819d0a5 100644 --- a/packages/nivo-calendar/package.json +++ b/packages/nivo-calendar/package.json @@ -10,7 +10,7 @@ "d3-scale": "1.0.6", "d3-time": "1.0.7", "d3-time-format": "2.0.5", - "recompose": "0.26.0" + "recompose": "^0.26.0" }, "devDependencies": { "@nivo/babel-preset": "0.32.0-5", @@ -22,7 +22,8 @@ "react-dom": "^15.6.1" }, "peerDependencies": { - "react": ">= 15.6.1 < 17.0.0" + "react": ">= 15.6.1 < 17.0.0", + "prop-types": "*" }, "publishConfig": { "access": "public" diff --git a/packages/nivo-chord/.npmignore b/packages/nivo-chord/.npmignore new file mode 100644 index 000000000..9a2f03238 --- /dev/null +++ b/packages/nivo-chord/.npmignore @@ -0,0 +1,21 @@ +# src (will be transpiled) +/src + +# logs +*.log* + +# OSX +.DS_Store + +# config/build +.babelrc + +# storybook +/.storybook +/stories +/storybook-static + +# test +.travis.yml +/coverage +/test diff --git a/packages/nivo-chord/package.json b/packages/nivo-chord/package.json index e38ce7643..4912711d7 100644 --- a/packages/nivo-chord/package.json +++ b/packages/nivo-chord/package.json @@ -11,7 +11,7 @@ "d3-format": "1.2.0", "d3-shape": "1.2.0", "react-motion": "^0.5.2", - "recompose": "0.26.0" + "recompose": "^0.26.0" }, "devDependencies": { "@nivo/babel-preset": "0.32.0-5", @@ -23,7 +23,8 @@ "react-dom": "^15.6.1" }, "peerDependencies": { - "react": ">= 15.6.1 < 17.0.0" + "react": ">= 15.6.1 < 17.0.0", + "prop-types": "*" }, "publishConfig": { "access": "public" diff --git a/packages/nivo-circle-packing/.npmignore b/packages/nivo-circle-packing/.npmignore new file mode 100644 index 000000000..9a2f03238 --- /dev/null +++ b/packages/nivo-circle-packing/.npmignore @@ -0,0 +1,21 @@ +# src (will be transpiled) +/src + +# logs +*.log* + +# OSX +.DS_Store + +# config/build +.babelrc + +# storybook +/.storybook +/stories +/storybook-static + +# test +.travis.yml +/coverage +/test diff --git a/packages/nivo-circle-packing/package.json b/packages/nivo-circle-packing/package.json index b6221d215..ffde311db 100644 --- a/packages/nivo-circle-packing/package.json +++ b/packages/nivo-circle-packing/package.json @@ -24,7 +24,8 @@ "react": ">= 15.6.1 < 17.0.0" }, "publishConfig": { - "access": "public" + "access": "public", + "prop-types": "*" }, "scripts": { "build:commonjs": "rm -rf lib && cross-env NODE_ENV=commonjs babel src --out-dir lib", diff --git a/packages/nivo-core/package.json b/packages/nivo-core/package.json index 8c976424b..d27d86df7 100644 --- a/packages/nivo-core/package.json +++ b/packages/nivo-core/package.json @@ -14,7 +14,8 @@ "d3-scale-chromatic": "1.1.1", "d3-shape": "1.2.0", "react-measure": "^2.0.2", - "react-motion": "^0.5.2" + "react-motion": "^0.5.2", + "recompose": "^0.26.0" }, "devDependencies": { "@nivo/babel-preset": "0.32.0-5", @@ -26,6 +27,7 @@ "react-dom": "^15.6.1" }, "peerDependencies": { + "prop-types": "*", "react": ">= 15.6.1 < 17.0.0" }, "publishConfig": { diff --git a/packages/nivo-heatmap/package.json b/packages/nivo-heatmap/package.json index 88e640cdf..ba8a16c98 100644 --- a/packages/nivo-heatmap/package.json +++ b/packages/nivo-heatmap/package.json @@ -9,7 +9,7 @@ "@nivo/core": "0.32.0-5", "d3-scale": "1.0.6", "react-motion": "^0.5.2", - "recompose": "0.26.0" + "recompose": "^0.26.0" }, "devDependencies": { "@nivo/babel-preset": "0.32.0-5", @@ -21,7 +21,8 @@ "react-dom": "^15.6.1" }, "peerDependencies": { - "react": ">= 15.6.1 < 17.0.0" + "react": ">= 15.6.1 < 17.0.0", + "prop-types": "*" }, "publishConfig": { "access": "public" diff --git a/packages/nivo-line/package.json b/packages/nivo-line/package.json index 92f5e1b7d..b5fdb5e2f 100644 --- a/packages/nivo-line/package.json +++ b/packages/nivo-line/package.json @@ -11,7 +11,7 @@ "d3-scale": "1.0.6", "d3-shape": "1.2.0", "react-motion": "^0.5.2", - "recompose": "0.26.0" + "recompose": "^0.26.0" }, "devDependencies": { "@nivo/babel-preset": "0.32.0-5", @@ -23,7 +23,8 @@ "react-dom": "^15.6.1" }, "peerDependencies": { - "react": ">= 15.6.1 < 17.0.0" + "react": ">= 15.6.1 < 17.0.0", + "prop-types": "*" }, "publishConfig": { "access": "public" diff --git a/packages/nivo-pie/package.json b/packages/nivo-pie/package.json index 362a53b08..27b666480 100644 --- a/packages/nivo-pie/package.json +++ b/packages/nivo-pie/package.json @@ -9,7 +9,7 @@ "@nivo/core": "0.32.0-5", "d3-shape": "1.2.0", "react-motion": "^0.5.2", - "recompose": "0.26.0" + "recompose": "^0.26.0" }, "devDependencies": { "@nivo/babel-preset": "0.32.0-5", @@ -21,7 +21,8 @@ "react-dom": "^15.6.1" }, "peerDependencies": { - "react": ">= 15.6.1 < 17.0.0" + "react": ">= 15.6.1 < 17.0.0", + "prop-types": "*" }, "publishConfig": { "access": "public" diff --git a/packages/nivo-radar/package.json b/packages/nivo-radar/package.json index f74d799a1..ed02ee65e 100644 --- a/packages/nivo-radar/package.json +++ b/packages/nivo-radar/package.json @@ -11,7 +11,7 @@ "d3-scale": "1.0.6", "d3-shape": "1.2.0", "react-motion": "^0.5.2", - "recompose": "0.26.0" + "recompose": "^0.26.0" }, "devDependencies": { "@nivo/babel-preset": "0.32.0-5", @@ -23,7 +23,8 @@ "react-dom": "^15.6.1" }, "peerDependencies": { - "react": ">= 15.6.1 < 17.0.0" + "react": ">= 15.6.1 < 17.0.0", + "prop-types": "*" }, "publishConfig": { "access": "public" diff --git a/packages/nivo-sankey/package.json b/packages/nivo-sankey/package.json index 8c95c688a..bc2f95c2c 100644 --- a/packages/nivo-sankey/package.json +++ b/packages/nivo-sankey/package.json @@ -9,7 +9,7 @@ "@nivo/core": "0.32.0-5", "d3-sankey": "0.7.1", "react-motion": "^0.5.2", - "recompose": "0.26.0" + "recompose": "^0.26.0" }, "devDependencies": { "@nivo/babel-preset": "0.32.0-5", @@ -21,7 +21,8 @@ "react-dom": "^15.6.1" }, "peerDependencies": { - "react": ">= 15.6.1 < 17.0.0" + "react": ">= 15.6.1 < 17.0.0", + "prop-types": "*" }, "publishConfig": { "access": "public" diff --git a/packages/nivo-stream/package.json b/packages/nivo-stream/package.json index 4b73245c9..bcdbf9eec 100644 --- a/packages/nivo-stream/package.json +++ b/packages/nivo-stream/package.json @@ -10,7 +10,7 @@ "d3-format": "1.2.0", "d3-scale": "1.0.6", "d3-shape": "1.2.0", - "recompose": "0.26.0" + "recompose": "^0.26.0" }, "devDependencies": { "@nivo/babel-preset": "0.32.0-5", @@ -22,7 +22,8 @@ "react-dom": "^15.6.1" }, "peerDependencies": { - "react": ">= 15.6.1 < 17.0.0" + "react": ">= 15.6.1 < 17.0.0", + "prop-types": "*" }, "publishConfig": { "access": "public" diff --git a/packages/nivo-sunburst/package.json b/packages/nivo-sunburst/package.json index d7da99f88..28f63b49d 100644 --- a/packages/nivo-sunburst/package.json +++ b/packages/nivo-sunburst/package.json @@ -10,7 +10,7 @@ "d3-hierarchy": "1.1.5", "d3-shape": "1.2.0", "react-motion": "^0.5.2", - "recompose": "0.26.0" + "recompose": "^0.26.0" }, "devDependencies": { "@nivo/babel-preset": "0.32.0-5", @@ -22,7 +22,8 @@ "react-dom": "^15.6.1" }, "peerDependencies": { - "react": ">= 15.6.1 < 17.0.0" + "react": ">= 15.6.1 < 17.0.0", + "prop-types": "*" }, "publishConfig": { "access": "public" diff --git a/packages/nivo-treemap/package.json b/packages/nivo-treemap/package.json index b73ae70c7..dbd6cea58 100644 --- a/packages/nivo-treemap/package.json +++ b/packages/nivo-treemap/package.json @@ -9,7 +9,7 @@ "@nivo/core": "0.32.0-5", "d3-hierarchy": "1.1.5", "react-motion": "^0.5.2", - "recompose": "0.26.0" + "recompose": "^0.26.0" }, "devDependencies": { "@nivo/babel-preset": "0.32.0-5", @@ -21,7 +21,8 @@ "react-dom": "^15.6.1" }, "peerDependencies": { - "react": ">= 15.6.1 < 17.0.0" + "react": ">= 15.6.1 < 17.0.0", + "prop-types": "*" }, "publishConfig": { "access": "public" diff --git a/packages/nivo-voronoi/package.json b/packages/nivo-voronoi/package.json index 3660e1ad2..63481d788 100644 --- a/packages/nivo-voronoi/package.json +++ b/packages/nivo-voronoi/package.json @@ -8,7 +8,7 @@ "dependencies": { "@nivo/core": "0.32.0-5", "d3-voronoi": "1.1.2", - "recompose": "0.26.0" + "recompose": "^0.26.0" }, "devDependencies": { "@nivo/babel-preset": "0.32.0-5", @@ -20,7 +20,8 @@ "react-dom": "^15.6.1" }, "peerDependencies": { - "react": ">= 15.6.1 < 17.0.0" + "react": ">= 15.6.1 < 17.0.0", + "prop-types": "*" }, "publishConfig": { "access": "public"