.codesandbox/ci.json

@@ -3,5 +3,5 @@
   "buildCommand": false,
   "packages": ["packages/*"],
   "sandboxes": ["/examples/codesandbox", "/website"],
-  "node": "14"
+  "node": "16"
 }

.eslintignore

@@ -0,0 +1,5 @@
+/branding/
+/stats/
+/storybook-static/
+node_modules/
+/packages/recompose/

.eslintrc.yml

@@ -4,8 +4,6 @@ extends:
   - plugin:@typescript-eslint/recommended
   - plugin:prettier/recommended
   - prettier
-  - prettier/@typescript-eslint
-  - prettier/react
 
 rules:
   # Leave this as a warning while we convert the codebase, then remove it

.github/workflows/ci.yml

@@ -1,36 +1,46 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches: ['master']
+  pull_request:
+    types: [opened, synchronize]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: ['14', '16']
+        node-version: ['16']
     steps:
-      - uses: actions/checkout@v2
+      - name: Check out code
+        uses: actions/checkout@v2
+
       - name: Setup Node ${{ matrix.node-version }}
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
+
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
+
       - name: Restore Yarn cache
         uses: actions/cache@v2
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
+
       - name: Restore Lerna cache
         uses: actions/cache@v2
         with:
           path: |
             node_modules
             */*/node_modules
           key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+
       - run: yarn install --frozen-lockfile
       - run: make bootstrap
       - run: make packages-build

.gitignore

@@ -14,4 +14,5 @@ build
 
 *.lerna_backup
 
-/stats
+/stats
+/api/app.js

.nvmrc

@@ -1 +1 @@
-v14
+v16

.storybook/babel.config.js

@@ -0,0 +1,7 @@
+module.exports = {
+    presets: [
+        ['@babel/preset-env', { loose: true }],
+        ['@babel/preset-react', { runtime: 'automatic' }],
+        '@babel/preset-typescript',
+    ],
+}

.storybook/main.js

@@ -1,12 +1,11 @@
 module.exports = {
-  stories: ['../**/*.stories.@(js|tsx)'],
-  addons: [
-    '@storybook/addon-knobs',
-    '@storybook/addon-actions',
-    '@storybook/addon-links',
-    '@storybook/addon-storysource',
-  ],
-  typescript: {
-    reactDocgen: 'none',
-  },
-};
+    stories: ['../packages/*/stories/*.stories.@(js|tsx)'],
+    addons: [
+        '@storybook/addon-knobs',
+        '@storybook/addon-actions',
+        '@storybook/addon-links',
+        '@storybook/addon-essentials',
+        '@storybook/addon-storysource',
+    ],
+    framework: '@storybook/react'
+}

CHANGELOG.md

@@ -1,5 +1,48 @@
+<a name="v0.75.0"></a>
+## v0.75.0 (2021-12-17)
+
+
+#### Features
+
+* **api:**
+  *  create new @nivo/static & @nivo/express packages ([fc0f27ff](https://github.com/plouc/nivo/commit/fc0f27ff314f783713c3497d625a3f8992038512))
+  *  fix heroku deployment ([a4dbb440](https://github.com/plouc/nivo/commit/a4dbb440c12fc8cd42153a039ed74ecfe87a5adc))
+  *  migrate API to TypeScript and fix stale mappings and examples ([d53681b4](https://github.com/plouc/nivo/commit/d53681b439d3bac08e978491a56518b3fe9c98b5))
+* **build:**
+  *  init support for development builds ([643a1c95](https://github.com/plouc/nivo/commit/643a1c95a117d62d0e2c3a1ea7f6d60bfaae1994))
+  *  fix build after upgrading a bunch of dependencies ([60cdbbbf](https://github.com/plouc/nivo/commit/60cdbbbf1a9f2631f0703f7c69f8d0cbbb9b6522))
+* **eslint:**
+  *  enable eslint for the website ([1ec5fbd0](https://github.com/plouc/nivo/commit/1ec5fbd0a8ff392aa185589c980f2f80fc6b48f9))
+  *  enable eslint for the api ([35d4a4a7](https://github.com/plouc/nivo/commit/35d4a4a702251b8b098fb235b8d79b5d521f77fc))
+* **storybook:**  upgrade storybook and addons ([64ac24e0](https://github.com/plouc/nivo/commit/64ac24e048a333155887c0a94f3accebd2362014))
+* **ts:**  upgrade TypeScript version ([eff43e28](https://github.com/plouc/nivo/commit/eff43e2865c337e2c1aae263f92e548a51756c33))
+* **website:**
+  *  update the API url to match the new path ([ec6e7d96](https://github.com/plouc/nivo/commit/ec6e7d963baa72aec959cc4c62e74ee6a6204662))
+  *  fix gatsby build due to dependencies updates ([6bfeaa86](https://github.com/plouc/nivo/commit/6bfeaa86e443359dfcd77fe7f26ea48a49a2388f))
+  *  update gatsby ([50778907](https://github.com/plouc/nivo/commit/50778907b4c76f0a32b617117f640ff5e465b13d))
+
+#### Bug Fixes
+
+* **bar:**  avoid to redefine react forwardRef type ([cd6e3ec3](https://github.com/plouc/nivo/commit/cd6e3ec37791393f88519924778602ba9da06065))
+* **build:**  fix error with duplicated typings for eslint by forcing the resolution of the package ([384e4240](https://github.com/plouc/nivo/commit/384e424070e313158dda140f4c12f8a76cffe9ee))
+* **ci:**  fix triggers for the CI workflow ([0750223f](https://github.com/plouc/nivo/commit/0750223fc78721ed5e744b152b0f2d52c31efa2e))
+* **core:**
+  *  import missing SVGProps type ([feb6de60](https://github.com/plouc/nivo/commit/feb6de60ec34ce289792e72db3eaacd3dcf6814a))
+  *  export linearGradientDef in typings ([7cfbfc96](https://github.com/plouc/nivo/commit/7cfbfc9623631cd94e165f25a1919cf9019dbdb3))
+* **format:**  fix formatting issues ([7d03e9a3](https://github.com/plouc/nivo/commit/7d03e9a39b5439007740a1eabdf6b4eebcc4c4e4))
+* **swarmplot:**  use the borderWidth property - fixes #1813 ([edd3990c](https://github.com/plouc/nivo/commit/edd3990c0846353c001853531948477ea7837500))
+* **website:**  fix React runtime issue with Gatsby ([e36b06b3](https://github.com/plouc/nivo/commit/e36b06b30120db374d9163cbefe3eaa44ed8a9be))
+
+#### Chore
+
+* **eslint:**  upgrade eslint ([82138679](https://github.com/plouc/nivo/commit/821386794a03273103f2c759faa4942d698ec74a))
+* **node:**  update Node.js to v16 ([b15f63cb](https://github.com/plouc/nivo/commit/b15f63cb94bb2f431c95f2145434a0b5dd267021))
+* **rollup:**  update rollup ([c253548f](https://github.com/plouc/nivo/commit/c253548fb18c6c6745d9a8abb0b6d6fedde74b99))
+
+
+
 <a name="v0.74.1"></a>
-## v0.74.1 (2021-12-13)
+## v0.74.1 (%cs)
 
 
 #### Features

Makefile

@@ -44,7 +44,7 @@ help: ##prints help
 ########################################################################################################################
 
 bootstrap: ##@0 global lerna bootstrap
-	@./node_modules/.bin/lerna bootstrap
+	@yarn lerna bootstrap
 
 init: ##@0 global cleanup/install/bootstrap
 	@$(MAKE) clean-all
@@ -53,7 +53,7 @@ init: ##@0 global cleanup/install/bootstrap
 	@$(MAKE) packages-build
 
 fmt: ##@0 global format code using prettier (js, css, md)
-	@./node_modules/.bin/prettier --color --write \
+	@yarn prettier --color --write \
 		"packages/*/{src,stories,tests}/**/*.{js,ts,tsx}" \
 		"packages/*/index.d.ts" \
 		"packages/*/README.md" \
@@ -63,7 +63,7 @@ fmt: ##@0 global format code using prettier (js, css, md)
 
 fmt-check: ##@0 global check if files were all formatted using prettier
 	@echo "${YELLOW}Checking formatting${RESET}"
-	@./node_modules/.bin/prettier --color --list-different \
+	@yarn prettier --color --list-different \
         "packages/*/{src,stories,tests}/**/*.{js,ts,tsx}" \
         "packages/*/index.d.ts" \
         "packages/*/README.md" \
@@ -86,6 +86,8 @@ clean-all: ##@0 global uninstall node modules, remove transpiled code & lock fil
 	@$(foreach source, $(SOURCES), $(call clean-source-all, $(source)))
 	@rm -rf website/node_modules
 	@rm -rf website/package-lock.json
+	@rm -rf api/node_modules
+	@rm -rf api/package-lock.json
 
 define clean-source-lib
 	rm -rf $(1)/*/cjs
@@ -111,42 +113,42 @@ lint: ##@0 run eslint & tslint
 
 package-lint-%: ##@1 packages run eslint on package
 	@echo "${YELLOW}Running eslint on package ${WHITE}@nivo/${*}${RESET}"
-	@./node_modules/.bin/eslint ./packages/${*}/{src,tests}
+	@yarn eslint ./packages/${*}/{src,tests}
 
 packages-lint: ##@1 packages run eslint on all packages
 	@echo "${YELLOW}Running eslint on all packages${RESET}"
-	@./node_modules/.bin/eslint "./packages/*/{src,tests}/**/*.{js,ts,tsx}"
+	@yarn eslint "./packages/*/{src,tests}/**/*.{js,ts,tsx}"
 
 packages-lint-fix: ##@1 packages run eslint on all packages with a fix option
 	@echo "${YELLOW}Running eslint on all packages${RESET}"
-	@./node_modules/.bin/eslint "./packages/*/{src,tests}/**/*.{js,ts,tsx}" --fix
+	@yarn eslint "./packages/*/{src,tests}/**/*.{js,ts,tsx}" --fix
 
 package-test-cover-%: ##@1 packages run tests for a package with code coverage
-	@yarn jest -c ./packages/jest.config.js --rootDir . --coverage ./packages/${*}/tests
+	@export BABEL_ENV=development; yarn jest -c ./packages/jest.config.js --rootDir . --coverage ./packages/${*}/tests
 
 package-test-%: ##@1 packages run tests for a package
-	@yarn jest -c ./packages/jest.config.js --rootDir . ./packages/${*}/tests
+	@export BABEL_ENV=development; yarn jest -c ./packages/jest.config.js --rootDir . ./packages/${*}/tests
 
 package-watch-test-%: ##@1 packages run tests for a package and watch for changes
-	@yarn jest -c ./packages/jest.config.js --rootDir . ./packages/${*}/tests --watch
+	@export BABEL_ENV=development; yarn jest -c ./packages/jest.config.js --rootDir . ./packages/${*}/tests --watch
 
 package-update-test-%: ##@1 packages run tests for a package and update its snapshots
-	@yarn jest -c ./packages/jest.config.js --rootDir . ./packages/${*}/tests -u
+	@export BABEL_ENV=development; yarn jest -c ./packages/jest.config.js --rootDir . ./packages/${*}/tests -u
 
 package-watch-test-%: ##@1 packages run tests for a package and watch for changes
-	@yarn jest -c ./packages/jest.config.js --rootDir . ./packages/${*}/tests --watch
+	@export BABEL_ENV=development; yarn jest -c ./packages/jest.config.js --rootDir . ./packages/${*}/tests --watch
 
 packages-test: ##@1 packages run tests for all packages
 	@echo "${YELLOW}Running test suites for all packages${RESET}"
-	@yarn jest -c ./packages/jest.config.js --rootDir . ./packages/*/tests
+	@export BABEL_ENV=development; yarn jest -c ./packages/jest.config.js --rootDir . ./packages/*/tests
 
 packages-watch-test: ##@1 packages run tests for all packages and watch for changes
 	@echo "${YELLOW}Running test suites watcher for all packages${RESET}"
-	@yarn jest -c ./packages/jest.config.js --rootDir . ./packages/*/tests --watch
+	@export BABEL_ENV=development; yarn jest -c ./packages/jest.config.js --rootDir . ./packages/*/tests --watch
 
 packages-test-cover: ##@1 packages run tests for all packages with code coverage
 	@echo "${YELLOW}Running test suites coverage for all packages${RESET}"
-	@yarn jest -c ./packages/jest.config.js --rootDir . --coverage ./packages/*/tests
+	@export BABEL_ENV=development; yarn jest -c ./packages/jest.config.js --rootDir . --coverage ./packages/*/tests
 
 packages-types: ##@1 packages build all package types
 	@echo "${YELLOW}Building TypeScript types for all packages${RESET}"
@@ -181,13 +183,13 @@ packages-publish: ##@1 packages publish all packages
 	@$(MAKE) packages-build
 
 	@echo "${YELLOW}Publishing packages${RESET}"
-	@./node_modules/.bin/lerna publish --exact
+	@yarn lerna publish --exact
 
 packages-publish-next: ##@1 packages publish all packages for @next npm tag
 	@$(MAKE) packages-build
 
 	@echo "${YELLOW}Publishing packages${RESET}"
-	@./node_modules/.bin/lerna publish --exact --npm-tag=next
+	@yarn lerna publish --exact --npm-tag=next
 
 package-watch-%: ##@1 packages build package (es flavor) on change, eg. `package-watch-bar`
 	@echo "${YELLOW}Running build watcher for package ${WHITE}@nivo/${*}${RESET}"
@@ -225,11 +227,14 @@ website-deploy: ##@2 website build & deploy website
 	@$(MAKE) website-build
 
 	@echo "${YELLOW}Deploying website${RESET}"
-	@./node_modules/.bin/gh-pages -d website/public -r git@github.com:plouc/nivo.git -b gh-pages
+	@yarn gh-pages -d website/public -r git@github.com:plouc/nivo.git -b gh-pages
 
 website-audit: ##@2 website audit website build
 	@cd website && yarn analyze
 
+website-lint: ##@2 website run eslint on the website code
+	@yarn eslint ./website/src
+
 website-sprites: ##@2 website build sprite sheet
 	@glue --img website/src/assets --css website/src/styles website/src/assets/icons
 
@@ -250,7 +255,7 @@ storybook-deploy: ##@3 storybook build and deploy storybook
 	@$(MAKE) storybook-build
 
 	@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
+	@yarn gh-pages -d storybook-static -r git@github.com:plouc/nivo.git -b gh-pages -e storybook
 
 ########################################################################################################################
 #
@@ -266,5 +271,8 @@ api: ##@5 API run API in regular mode (no watcher)
 	@echo "${YELLOW}Starting API${RESET}"
 	@cd api && yarn start
 
+api-lint: ##@5 API run eslint on the API code
+	@yarn eslint ./api/src
+
 api-deploy: ##@5 Deploy API on heroku
 	git subtree push --prefix api heroku master

Procfile

@@ -0,0 +1 @@
+web: node api/app.js

api/app.ts

@@ -0,0 +1,44 @@
+import express from 'express'
+import cors from 'cors'
+import bodyParser from 'body-parser'
+import compression from 'compression'
+import winston from 'winston'
+import expressWinston from 'express-winston'
+import { nivo } from '@nivo/express'
+
+const app = express()
+
+app.enable('trust proxy')
+app.set('json spaces', 4)
+app.use(cors())
+app.use(bodyParser.json())
+app.use(
+    expressWinston.logger({
+        transports: [new winston.transports.Console()],
+        format: winston.format.combine(winston.format.colorize(), winston.format.simple()),
+        meta: false,
+        expressFormat: true,
+        colorize: true,
+    })
+)
+app.use(compression())
+
+app.get('/status', (req, res) => {
+    res.status(200).json({
+        status: 'ok',
+        uptime: `${process.uptime()} second(s)`,
+        protocol: req.protocol,
+        host: req.get('host'),
+        env: {
+            // @ts-ignore
+            NODE_ENV: process.NODE_ENV,
+        },
+    })
+})
+
+app.use('/nivo', nivo)
+
+const port = process.env.PORT || 3030
+app.listen(port, () => {
+    console.log(`nivo api listening on ${port}`)
+})