Skip to content

Commit

Permalink
feat(examples):fix retro example dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Raphaël Benitte authored and Raphaël Benitte committed Dec 7, 2017
1 parent 2da761d commit 2c84d01
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 18 deletions.
22 changes: 20 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SOURCES = packages

.PHONY: help bootstrap init packages-build packages-publish clean-all website-install website website-build website-deploy storybook storybook-build storybook-deploy deploy-all
.PHONY: help bootstrap init packages-build packages-publish clean-all website-install website website-build website-deploy storybook storybook-build storybook-deploy deploy-all examples-install

########################################################################################################################
#
Expand Down Expand Up @@ -50,6 +50,7 @@ init: ##@init cleanup/install/bootstrap
@make bootstrap
@make packages-build
@make website-install
@make examples-install

########################################################################################################################
#
Expand Down Expand Up @@ -137,7 +138,7 @@ package-dev-%: ##@packages setup package for development, link to website, run w
########################################################################################################################

website-install: ##@website install website dependencies
@echo "${YELLOW}INstalling website dependencies${RESET}"
@echo "${YELLOW}Installing website dependencies${RESET}"
@cd website && yarn install

website: ##@website start website in dev mode
Expand Down Expand Up @@ -190,3 +191,20 @@ storybook-deploy: ##@storybook build and deploy storybook

@echo "${YELLOW}Deploying storybook${RESET}"
@./node_modules/.bin/gh-pages -d storybook-static -r git@github.com:plouc/nivo.git -b gh-pages -e storybook

########################################################################################################################
#
# EXAMPLES
#
########################################################################################################################

examples-install: ##@examples install all examples dependencies
@make example-install-retro

example-install-%: ##@examples install example dependencies, eg. example-install-retro
@echo "${YELLOW}Installing ${WHITE}${*}${YELLOW} example dependencies${RESET}"
@cd examples/${*} && yarn install

example-start-%: ##@examples start example in dev mode, eg. example-start-retro
@echo "${YELLOW}Starting ${WHITE}${*}${YELLOW} example dev server${RESET}"
@cd examples/${*} && yarn start
14 changes: 7 additions & 7 deletions examples/retro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"version": "0.32.0-9",
"private": true,
"dependencies": {
"@nivo/bar": "^0.33.0-3",
"@nivo/chord": "^0.33.0-3",
"@nivo/bar": "^0.33.0-4",
"@nivo/chord": "^0.33.0-4",
"@nivo/circle-packing": "^0.32.0",
"@nivo/core": "^0.32.0",
"@nivo/heatmap": "^0.33.0-3",
"@nivo/pie": "^0.33.0-3",
"@nivo/stream": "^0.33.0-3",
"nivo": "^0.32.0",
"nivo-generators": "^0.9.3",
"@nivo/generators": "^0.32.0",
"@nivo/heatmap": "^0.33.0-4",
"@nivo/pie": "^0.33.0-4",
"@nivo/stream": "^0.33.0-4",
"@nivo/treemap": "^0.32.0",
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react-scripts": "1.0.13"
Expand Down
4 changes: 2 additions & 2 deletions examples/retro/src/components/Background.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import { ResponsiveStream } from 'nivo'
import { generateCountriesData } from 'nivo-generators'
import { ResponsiveStream } from '@nivo/stream'
import { generateCountriesData } from '@nivo/generators'

const Background = () => (
<div className="Background">
Expand Down
2 changes: 1 addition & 1 deletion examples/retro/src/components/charts/Bar.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import { ResponsiveBar } from '@nivo/bar'
import { generateCountriesData } from 'nivo-generators'
import { generateCountriesData } from '@nivo/generators'
import { colors } from '../../constants'

const Bar = () => (
Expand Down
2 changes: 1 addition & 1 deletion examples/retro/src/components/charts/Bubble.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import { ResponsiveBubble } from '@nivo/circle-packing'
import { generateCountriesData } from 'nivo-generators'
import { generateCountriesData } from '@nivo/generators'
import { colors } from '../../constants'

const Bubble = () => (
Expand Down
2 changes: 1 addition & 1 deletion examples/retro/src/components/charts/Chord.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import { ResponsiveChord } from '@nivo/chord'
import { generateChordData } from 'nivo-generators'
import { generateChordData } from '@nivo/generators'
import { colors } from '../../constants'

const Chord = () => (
Expand Down
2 changes: 1 addition & 1 deletion examples/retro/src/components/charts/HeatMap.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import { ResponsiveHeatMap } from '@nivo/heatmap'
import { generateCountriesData } from 'nivo-generators'
import { generateCountriesData } from '@nivo/generators'
import { colors } from '../../constants'

const HeatMap = () => (
Expand Down
2 changes: 1 addition & 1 deletion examples/retro/src/components/charts/Pie.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import { ResponsivePie } from '@nivo/pie'
import { generateProgrammingLanguageStats } from 'nivo-generators'
import { generateProgrammingLanguageStats } from '@nivo/generators'
import { colors } from '../../constants'

const Pie = () => (
Expand Down
2 changes: 1 addition & 1 deletion examples/retro/src/components/charts/Stream.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import { ResponsiveStream } from '@nivo/stream'
import { patternDotsDef } from '@nivo/core'
import { generateCountriesData } from 'nivo-generators'
import { generateCountriesData } from '@nivo/generators'
import { colors } from '../../constants'

const Stream = () => (
Expand Down
2 changes: 1 addition & 1 deletion examples/retro/src/components/charts/TreeMap.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import { ResponsiveTreeMap } from '@nivo/treemap'
import { generateCountriesData } from 'nivo-generators'
import { generateCountriesData } from '@nivo/generators'
import { colors } from '../../constants'

const TreeMap = () => (
Expand Down

0 comments on commit 2c84d01

Please sign in to comment.