Skip to content

Commit fa84103

Browse files
fulldecentfulldecent
authored
Merge branch 'chartjs:master' into fix-min-js-two-renames
2 parents 699753f + c86116d commit fa84103

File tree

92 files changed

+4728
-4122
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+4728
-4122
lines changed

‎.github/release-drafter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ template: |
4747
* [Migration guide](https://www.chartjs.org/docs/$RESOLVED_VERSION/migration/v4-migration.html)
4848
* [Docs](https://www.chartjs.org/docs/$RESOLVED_VERSION/)
4949
* [API](https://www.chartjs.org/docs/$RESOLVED_VERSION/api/)
50-
* [Samples](https://www.chartjs.org/docs/$RESOLVED_VERSION/samples/)
50+
* [Samples](https://www.chartjs.org/docs/$RESOLVED_VERSION/samples/information.html)
5151
5252
$CHANGES
5353

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ jobs:
3030
fail-fast: false
3131

3232
steps:
33-
- uses: actions/checkout@v3
34-
- uses: pnpm/action-setup@v2.4.0
33+
- uses: actions/checkout@v4
34+
- uses: pnpm/action-setup@v4.1.0
3535
- name: Use Node.js
36-
uses: actions/setup-node@v3
36+
uses: actions/setup-node@v4
3737
with:
3838
node-version: 16
3939
cache: pnpm
40-
- uses: dorny/paths-filter@v2
40+
- uses: dorny/paths-filter@v3
4141
id: changes
4242
with:
4343
filters: |

‎.github/workflows/compressed-size.yml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,8 @@ jobs:
1616
runs-on: ubuntu-latest
1717

1818
steps:
19-
- uses: actions/checkout@v3
20-
- uses: pnpm/action-setup@v2.4.0
19+
- uses: actions/checkout@v4
20+
- uses: pnpm/action-setup@v4.1.0
2121
- uses: preactjs/compressed-size-action@v2
2222
with:
2323
repo-token: "${{ secrets.GITHUB_TOKEN }}"
24-
25-
size-limit:
26-
runs-on: ubuntu-latest
27-
steps:
28-
- uses: actions/checkout@v3
29-
- uses: pnpm/[email protected]
30-
- uses: andresz1/size-limit-action@master
31-
with:
32-
github_token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/deploy-docs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
needs: correct_repository
2424
runs-on: ubuntu-latest
2525
steps:
26-
- uses: actions/checkout@v3
27-
- uses: pnpm/action-setup@v2.4.0
26+
- uses: actions/checkout@v4
27+
- uses: pnpm/action-setup@v4.1.0
2828
- name: Use Node.js
29-
uses: actions/setup-node@v3
29+
uses: actions/setup-node@v4
3030
with:
3131
node-version: 16
3232
cache: pnpm

‎.github/workflows/release-drafter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ jobs:
2626
needs: correct_repository
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: release-drafter/release-drafter@v5
29+
- uses: release-drafter/release-drafter@v6
3030
env:
3131
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
version: ${{ steps.trim.outputs.version }}
1717
steps:
1818
- id: trim
19-
run: echo "::set-output name=version::${TAG:1}"
19+
run: echo "version=${TAG:1}" >> $GITHUB_OUTPUT
2020
env:
2121
TAG: ${{ github.event.release.tag_name }}
2222

@@ -26,9 +26,9 @@ jobs:
2626
needs: setup
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v3
30-
- uses: pnpm/action-setup@v2.4.0
31-
- uses: actions/setup-node@v3
29+
- uses: actions/checkout@v4
30+
- uses: pnpm/action-setup@v4.1.0
31+
- uses: actions/setup-node@v4
3232
with:
3333
registry-url: https://registry.npmjs.org/
3434
node-version: 16
@@ -71,9 +71,9 @@ jobs:
7171
runs-on: ubuntu-latest
7272
if: "!github.event.release.prerelease"
7373
steps:
74-
- uses: actions/checkout@v3
75-
- uses: pnpm/action-setup@v2.4.0
76-
- uses: actions/setup-node@v3
74+
- uses: actions/checkout@v4
75+
- uses: pnpm/action-setup@v4.1.0
76+
- uses: actions/setup-node@v4
7777
with:
7878
registry-url: https://registry.npmjs.org/
7979
node-version: 16

‎.size-limit.cjs‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2014-2022 Chart.js Contributors
3+
Copyright (c) 2014-2024 Chart.js Contributors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
66

‎docs/.vuepress/config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ export default defineConfig({
294294
'getting-started/installation',
295295
'getting-started/integration',
296296
'getting-started/usage',
297+
'getting-started/using-from-node-js',
297298
]
298299
},
299300
{

‎docs/axes/cartesian/linear.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,4 @@ module.exports = {
9797

9898
## Internal data format
9999

100-
Internally, the linear scale uses numeric data
100+
Internally, the linear scale uses numeric data.

0 commit comments

Comments
 (0)