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.

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

Release #8364

Merged
merged 31 commits into from Aug 15, 2022
Merged

Release #8364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
3b9bdb7
ci: set up node before running yarn and use caching everywhere (#8328)
domoritz Jul 31, 2022
506004b
chore(deps-dev): bump eslint-plugin-jest from 26.6.0 to 26.7.0 (#8333)
dependabot[bot] Aug 1, 2022
7cdb2eb
chore(deps-dev): bump @typescript-eslint/eslint-plugin from 5.30.7 to…
dependabot[bot] Aug 1, 2022
e2175d5
chore(deps-dev): bump @auto-it/first-time-contributor from 10.37.3 to…
dependabot[bot] Aug 1, 2022
4af1afb
chore(deps-dev): bump eslint from 8.20.0 to 8.21.0 (#8329)
dependabot[bot] Aug 1, 2022
d6da2f9
chore(deps-dev): bump @auto-it/conventional-commits from 10.37.3 to 1…
dependabot[bot] Aug 1, 2022
6b88e74
chore(deps-dev): bump auto from 10.37.3 to 10.37.4 (#8335)
dependabot[bot] Aug 1, 2022
c26fd94
chore(deps-dev): bump rollup from 2.77.0 to 2.77.2 (#8334)
dependabot[bot] Aug 1, 2022
cc593c1
chore(deps-dev): bump @typescript-eslint/parser from 5.30.7 to 5.31.0…
dependabot[bot] Aug 1, 2022
0bbe2d5
chore(deps-dev): bump del-cli from 4.0.1 to 5.0.0 (#8313)
dependabot[bot] Aug 1, 2022
5995ece
feat: Add `timeFormatType` field (#8320)
lsh Aug 4, 2022
bda0bf1
chore(deps-dev): bump @rollup/plugin-commonjs from 22.0.1 to 22.0.2 (…
dependabot[bot] Aug 8, 2022
40f3f5d
chore(deps-dev): bump @babel/core from 7.18.9 to 7.18.10 (#8346)
dependabot[bot] Aug 8, 2022
8f119b6
chore(deps-dev): bump eslint-plugin-jest from 26.7.0 to 26.8.0 (#8345)
dependabot[bot] Aug 8, 2022
913148a
chore(deps-dev): bump @typescript-eslint/parser from 5.31.0 to 5.32.0…
dependabot[bot] Aug 8, 2022
e4e59b8
chore(deps-dev): bump @types/chai from 4.3.1 to 4.3.3 (#8343)
dependabot[bot] Aug 8, 2022
7e20daf
chore(deps-dev): bump @babel/preset-env from 7.18.9 to 7.18.10 (#8341)
dependabot[bot] Aug 8, 2022
a969fda
chore(deps-dev): bump @typescript-eslint/eslint-plugin from 5.31.0 to…
dependabot[bot] Aug 8, 2022
5fb894a
fix: fix thin bar problem (#8350) (#8349)
kanitw Aug 11, 2022
a0378de
docs: Explicit temporal type (#8352)
domoritz Aug 11, 2022
d2699a1
docs: add heat lane example (#8353)
domoritz Aug 11, 2022
01d2dbc
ci: simplify setup and use caching (#8355)
domoritz Aug 12, 2022
d623a2f
docs: add MarkText to Vega-Lite ecosystem (#8283)
fish-404 Aug 12, 2022
2704cf9
chore(deps-dev): bump @typescript-eslint/parser from 5.32.0 to 5.33.0…
dependabot[bot] Aug 15, 2022
f3c001d
chore(deps-dev): bump rollup from 2.77.2 to 2.78.0 (#8360)
dependabot[bot] Aug 15, 2022
29248f6
chore(deps-dev): bump eslint from 8.21.0 to 8.22.0 (#8359)
dependabot[bot] Aug 15, 2022
fec2883
chore(deps-dev): bump eslint-plugin-jest from 26.8.0 to 26.8.2 (#8358)
dependabot[bot] Aug 15, 2022
c91b7c4
chore(deps-dev): bump @typescript-eslint/eslint-plugin from 5.32.0 to…
dependabot[bot] Aug 15, 2022
af53b74
ci: split scripts and refine triggers (#8356)
domoritz Aug 15, 2022
cf0e97b
Update CONTRIBUTING.md
kanitw Aug 15, 2022
1102bf3
ci: Use Pull Request Head Ref (#8363)
lsh Aug 15, 2022
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
53 changes: 53 additions & 0 deletions .github/workflows/check-toc.yml
@@ -0,0 +1,53 @@
name: Check

on:
workflow_dispatch:
pull_request:
paths:
- 'site/**'
- 'scripts/**'

jobs:
toc:
name: TOC
if: "!contains(github.event.head_commit.message, '[ci skip]')"
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
with:
token: ${{ secrets.GH_PAT || github.token }}
ref: ${{ github.event.pull_request.head.ref }}

- name: Setup Node
uses: actions/setup-node@v3
with:
cache: 'yarn'

- name: Install Node dependencies
run: yarn --frozen-lockfile

- name: Setup Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: '2.x'

- name: Setup data
run: yarn data

- name: Build Jekyll
run: |
gem install bundler
pushd site
bundle install
bundle exec jekyll build -q
popd

- name: Build TOC
run: scripts/generate-toc

- name: Setup Git remote
run: scripts/setup-git-ci.sh

- name: Check and Commit
run: scripts/check-and-commit-toc.sh
56 changes: 6 additions & 50 deletions .github/workflows/check.yml
@@ -1,9 +1,8 @@
name: Check

on:
push:
branches:
- '**'
workflow_dispatch:
pull_request:

jobs:
check:
Expand All @@ -14,6 +13,7 @@ jobs:
- uses: actions/checkout@v3
with:
token: ${{ secrets.GH_PAT || github.token }}
ref: ${{ github.event.pull_request.head.ref }}

- name: Setup Node
uses: actions/setup-node@v3
Expand All @@ -35,60 +35,16 @@ jobs:
sudo mv parallel sem /usr/local/bin

- name: Format
if: github.ref != 'refs/heads/next'
run: yarn format

- name: Build Schema
run: yarn schema

- name: Check Schema
run: ./scripts/check-schema.sh
run: scripts/check-schema.sh

- name: Setup Git remote
run: ./scripts/setup-git-ci.sh
run: scripts/setup-git-ci.sh

- name: Check and Commit
run: ./scripts/check-and-commit.sh

toc:
name: TOC
if: "!contains(github.event.head_commit.message, '[ci skip]')"
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
with:
token: ${{ secrets.GH_PAT || github.token }}

- name: Setup Node
uses: actions/setup-node@v3
with:
cache: 'yarn'

- name: Install Node dependencies
run: yarn --frozen-lockfile

- name: Setup Ruby
uses: actions/setup-ruby@v1
with:
ruby-version: '2.x'

- name: Setup data
run: yarn data

- name: Build Jekyll
run: |
gem install bundler
pushd site
bundle install
bundle exec jekyll build -q
popd

- name: Build TOC
run: scripts/generate-toc

- name: Setup Git remote
run: ./scripts/setup-git-ci.sh

- name: Check and Commit
run: ./scripts/check-and-commit-toc.sh
run: scripts/check-and-commit.sh
3 changes: 3 additions & 0 deletions .github/workflows/merge-dependabot.yml
@@ -1,7 +1,10 @@
name: Auto-merge Dependabot PRs

on:
workflow_dispatch:
schedule:
- cron: '0 * * * *'

jobs:
auto_merge:
name: Auto-merge Dependabot PRs
Expand Down
21 changes: 16 additions & 5 deletions .github/workflows/publish-to-npm.yml
Expand Up @@ -7,28 +7,39 @@ on:
- 'dependabot/**'
# documentation site should not trigger releases
- 'gh-pages'
paths-ignore:
- 'site/**'

jobs:
publish:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'ci skip') && !contains(github.event.head_commit.message, 'skip ci')"

name: Make a release and publish to NPM

steps:
- uses: actions/checkout@v3

- name: Prepare repository
run: git fetch --unshallow --tags
with:
fetch-depth: 0

- uses: actions/setup-node@v3
with:
registry-url: 'https://registry.npmjs.org'
cache: 'yarn'
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Install Node dependencies
run: yarn --frozen-lockfile

- run: npm run release
- name: Build
run: yarn build

- name: Check NPM deployment
run: ./scripts/check-npm.sh

- name: Create release
run: npm run shipit
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
16 changes: 7 additions & 9 deletions .github/workflows/release-docs-and-schema.yml
Expand Up @@ -15,14 +15,19 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Setup Node
uses: actions/setup-node@v3
with:
cache: 'yarn'

- name: Install Node dependencies
run: yarn --frozen-lockfile

- name: Build
run: yarn build

- name: Setup Git remote
run: ./scripts/setup-git-ci.sh
run: scripts/setup-git-ci.sh
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -34,13 +39,6 @@ jobs:
env:
GH_PAT: ${{ secrets.GH_PAT }}

- name: Check NPM deployment
run: ./scripts/check-npm.sh

- uses: actions/setup-node@v3
with:
registry-url: 'https://registry.npmjs.org'

- name: Prebuild website
run: yarn predeploy:site

Expand All @@ -51,4 +49,4 @@ jobs:
site-directory: 'site/'

- name: Publish schema
run: ./scripts/deploy-schema.sh
run: scripts/deploy-schema.sh
31 changes: 31 additions & 0 deletions .github/workflows/test-docs.yml
@@ -0,0 +1,31 @@
name: Test

on:
workflow_dispatch:
pull_request:
paths:
- 'site/**'
- 'yarn.lock'
- '**prettier**'

jobs:
build-site:
name: Build Site
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Setup Node
uses: actions/setup-node@v3
with:
cache: 'yarn'

- name: Install Node dependencies
run: yarn --frozen-lockfile

- name: Lint
run: yarn prettierbase --check

- name: Build
run: yarn build:site
36 changes: 9 additions & 27 deletions .github/workflows/test.yml
@@ -1,13 +1,13 @@
name: Test

on:
push:
branches:
- next
workflow_dispatch:
pull_request:
paths-ignore:
- 'site/**'

jobs:
test-matrix:
test:
name: Node
runs-on: ubuntu-latest

Expand All @@ -31,8 +31,8 @@ jobs:
- name: Build
run: yarn build

build-site:
name: Build Site
runtime-lint-coverage:
name: Runtime, Linting, and Coverage
runs-on: ubuntu-latest

steps:
Expand All @@ -46,24 +46,6 @@ jobs:
- name: Install Node dependencies
run: yarn --frozen-lockfile

- name: Build
run: yarn build:site

runtime-lint-coverage:
name: Runtime, Linting, and Coverage
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Install Node dependencies
run: yarn --frozen-lockfile

- name: Setup Node
uses: actions/setup-node@v3
with:
cache: 'yarn'

- name: Install extra dependencies for Puppeteer
run: sudo apt-get install libgbm1

Expand Down Expand Up @@ -95,14 +77,14 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Install Node dependencies
run: yarn --frozen-lockfile

- name: Setup Node
uses: actions/setup-node@v3
with:
cache: 'yarn'

- name: Install Node dependencies
run: yarn --frozen-lockfile

- name: Build
run: yarn build:only

Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Expand Up @@ -200,6 +200,7 @@ Publishing is handled by a 2-branch [pre-release process](https://intuit.github.
- When merging into `next`, please use the `squash and merge` strategy.
- To release a new stable version, open a PR from `next` into `stable` using this [compare link](https://github.com/vega/vega-lite/compare/stable...next).
- When merging from `next` into `stable`, please use the `create a merge commit` strategy.
- After the release note is generated (from commits), please take a look to clean up so the log is readable to the community.

## Suggested Programming Environment.

Expand Down
4 changes: 4 additions & 0 deletions build/vega-lite-schema.json
Expand Up @@ -7725,6 +7725,10 @@
"description": "Default time format for raw time values (without time units) in text marks, legend labels and header labels.\n\n__Default value:__ `\"%b %d, %Y\"` __Note:__ Axes automatically determine the format for each label automatically so this config does not affect axes.",
"type": "string"
},
"timeFormatType": {
"description": "[Custom format type](https://vega.github.io/vega-lite/docs/config.html#custom-format-type) for `config.timeFormat`.\n\n__Default value:__ `undefined` -- This is equilvalent to call D3-time-format, which is exposed as [`timeFormat` in Vega-Expression](https://vega.github.io/vega/docs/expressions/#timeFormat). __Note:__ You must also set `customFormatTypes` to `true` and there must *not* be a `timeUnit` defined to use this feature.",
"type": "string"
},
"title": {
"$ref": "#/definitions/TitleConfig",
"description": "Title configuration, which determines default properties for all [titles](https://vega.github.io/vega-lite/docs/title.html). For a full list of title configuration options, please see the [corresponding section of the title documentation](https://vega.github.io/vega-lite/docs/title.html#config)."
Expand Down
2 changes: 1 addition & 1 deletion examples/compiled/arc_ordinal_theta.vg.json
Expand Up @@ -57,7 +57,7 @@
"endAngle": {
"scale": "theta",
"field": "dir",
"offset": {"scale": "theta", "band": 1}
"offset": {"signal": "max(0.25, bandwidth('theta'))"}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion examples/compiled/bar.vg.json
Expand Up @@ -60,7 +60,7 @@
"signal": "\"a: \" + (isValid(datum[\"a\"]) ? datum[\"a\"] : \"\"+datum[\"a\"]) + \"; b: \" + (format(datum[\"b\"], \"\"))"
},
"x": {"scale": "x", "field": "a"},
"width": {"scale": "x", "band": 1},
"width": {"signal": "max(0.25, bandwidth('x'))"},
"y": {"scale": "y", "field": "b_end"},
"y2": {"scale": "y", "field": "b_start"}
}
Expand Down
2 changes: 1 addition & 1 deletion examples/compiled/bar_aggregate.vg.json
Expand Up @@ -49,7 +49,7 @@
"x": {"scale": "x", "field": "sum_people"},
"x2": {"scale": "x", "value": 0},
"y": {"scale": "y", "field": "age"},
"height": {"scale": "y", "band": 1}
"height": {"signal": "max(0.25, bandwidth('y'))"}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion examples/compiled/bar_aggregate_format.vg.json
Expand Up @@ -49,7 +49,7 @@
"x": {"scale": "x", "field": "sum_people"},
"x2": {"scale": "x", "value": 0},
"y": {"scale": "y", "field": "age"},
"height": {"scale": "y", "band": 1}
"height": {"signal": "max(0.25, bandwidth('y'))"}
}
}
}
Expand Down