Skip to content

Commit

Permalink
Merge branch 'main' into mbostock/observable10
Browse files Browse the repository at this point in the history
  • Loading branch information
mbostock committed Dec 8, 2023
2 parents 1c5ae10 + 6fdb955 commit 1658af5
Show file tree
Hide file tree
Showing 18 changed files with 153 additions and 19 deletions.
2 changes: 1 addition & 1 deletion docs/.vitepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default defineConfig({
["script", {}, "window.dataLayer=window.dataLayer||[];\nfunction gtag(){dataLayer.push(arguments);}\ngtag('js',new Date());\ngtag('config','G-9B88TP6PKQ');"]
],
sitemap: {
hostname: 'https://observablehq.com/plot'
hostname: 'https://observablehq.com/plot/'
},
themeConfig: {
// https://vitepress.dev/reference/default-theme-config
Expand Down
1 change: 0 additions & 1 deletion docs/data/tsa.csv

This file was deleted.

1 change: 1 addition & 0 deletions docs/public/data/tsa.csv
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
],
"scripts": {
"test": "yarn test:mocha && yarn test:tsc && yarn test:lint && yarn test:prettier",
"test:coverage": "npx c8 yarn test:mocha",
"test:coverage": "c8 yarn test:mocha",
"test:mocha": "mkdir -p test/output && TZ=America/Los_Angeles mocha 'test/**/*-test.*' 'test/plot.js'",
"test:lint": "eslint src test",
"test:prettier": "prettier --check src test",
Expand Down Expand Up @@ -58,6 +58,7 @@
"@types/node": "^20.5.0",
"@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"c8": "^8.0.1",
"canvas": "^2.0.0",
"d3-geo-projection": "^4.0.0",
"eslint": "^8.16.0",
Expand Down
2 changes: 1 addition & 1 deletion src/marks/difference.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export function differenceY(
x = x1 === undefined && x2 === undefined ? indexOf : undefined,
y = y1 === undefined && y2 === undefined ? identity : undefined,
fill, // ignored
positiveFill = "#01ab63",
positiveFill = "#3ca951",
negativeFill = "#4269d0",
fillOpacity = 1,
positiveFillOpacity = fillOpacity,
Expand Down
2 changes: 1 addition & 1 deletion test/output/differenceFilterX.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion test/output/differenceFilterY1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion test/output/differenceFilterY2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion test/output/differenceY.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion test/output/differenceYClip.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion test/output/differenceYConstant.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion test/output/differenceYCurve.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion test/output/differenceYOrdinal.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion test/output/differenceYOrdinalFlip.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion test/output/differenceYRandom.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion test/output/differenceYReverse.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion test/output/differenceYZero.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 1658af5

Please sign in to comment.