Skip to content

Commit

Permalink
Merge branch 'master' into chore/eslint-v9
Browse files Browse the repository at this point in the history
  • Loading branch information
artus9033 committed Aug 9, 2024
2 parents a58405d + e684733 commit b70b36b
Show file tree
Hide file tree
Showing 59 changed files with 2,355 additions and 1,509 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,26 @@ jobs:
${{ runner.os }}-npm-${{ hashFiles('/package-lock.json') }}
${{ runner.os }}-npm-
# since npm ci installs only dependencies in package-lock.json, it may be that the package-lock.json pushed
# has been generated on non-linux, making the installed node_modules lack packages needed by the linux runner
- name: Ensure lefthook-linux-x64 & @rollup/rollup-linux-x64-gnu are installed
if: steps.cache-node_modules.outputs.cache-hit != 'true'
run: npm i --legacy-peer-deps lefthook-linux-x64 @rollup/rollup-linux-x64-gnu

- name: Install npm dependencies
if: steps.cache-node_modules.outputs.cache-hit != 'true'
run: npm ci --legacy-peer-deps

- name: Build plugin bundles
run: npm run build

- name: Build demos
run: npm run build:demos
- name: Build E2E pages & demos
run: npm run build:pages

- name: Upload demos artifact
uses: actions/upload-pages-artifact@v3
with:
path: demos/dist
path: pages/dist-demos

publish-demos:
name: Publish demos
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ jobs:
${{ runner.os }}-npm-${{ hashFiles('/package-lock.json') }}
${{ runner.os }}-npm-
# since npm ci installs only dependencies in package-lock.json, it may be that the package-lock.json pushed
# has been generated on non-linux, making the installed node_modules lack packages needed by the linux runner
- name: Ensure lefthook-linux-x64 & @rollup/rollup-linux-x64-gnu are installed
if: steps.cache-node_modules.outputs.cache-hit != 'true'
run: npm i --legacy-peer-deps lefthook-linux-x64 @rollup/rollup-linux-x64-gnu

- name: Install npm dependencies
if: steps.cache-node_modules.outputs.cache-hit != 'true'
run: npm ci --legacy-peer-deps
Expand All @@ -44,8 +50,8 @@ jobs:
- name: Build plugin bundles
run: npm run build

- name: Build demos
run: npm run build:demos
- name: Build E2E pages & demos
run: npm run build:pages

- name: Run tests
run: npm test
Expand Down
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
coverage
/dist
docs/assets
demos/dist/assets
pages/dist-demos/assets
pages/dist-e2e
node_modules
.DS_Store
.rollup.cache
.nyc_output
.vscode
.vscode
50 changes: 25 additions & 25 deletions README.md

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions demos/dist/assets/chart.min.js

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions demos/dist/assets/chartjs-adapter-date-fns.bundle.min.js

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions demos/dist/assets/chartjs-plugin-datalabels.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b70b36b

Please sign in to comment.