Skip to content

Commit 66e6a10

Browse files
Merge pull request #48 from Bramikke/master
Zingchart-React compatibility with React 18+
2 parents fed588d + 6bf4c7d commit 66e6a10

36 files changed

Lines changed: 13591 additions & 47026 deletions

.babelrc

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
{
2-
"presets": [
3-
["env", {
4-
"modules": false
5-
}],
6-
"stage-0",
7-
"react"
8-
]
2+
"presets": ["@babel/env", "@babel/preset-react"]
93
}

.eslintrc

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

.github/workflows/build.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
name: Build
44

55
# Run on a dev branch
6-
on:
6+
on:
77
push:
88
branches:
99
- master
@@ -27,13 +27,9 @@ jobs:
2727
uses: actions/setup-node@v1
2828
with:
2929
node-version: ${{ matrix.node-version }}
30-
# npm ci REQUIRES a package-lock.json file
3130
- name: Install Fresh Dependencies
32-
run: |
33-
rm package-lock.json
34-
npm install
31+
run: npm ci
3532
- name: Build library
3633
run: npm run build
3734
- name: Log build output
38-
run: |
39-
ls -alt dist/
35+
run: ls -alt dist/

.github/workflows/test.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
name: Test
44

55
# Run on a dev branch
6-
on:
6+
on:
77
push:
88
branches:
99
- master
@@ -27,11 +27,8 @@ jobs:
2727
uses: actions/setup-node@v1
2828
with:
2929
node-version: ${{ matrix.node-version }}
30-
# npm ci REQUIRES a package-lock.json file
3130
- name: Install Fresh Dependencies
32-
run: |
33-
rm package-lock.json
34-
npm install
31+
run: npm ci
3532
- name: Build library
3633
run: npm run build
3734
- name: Run Unit Tests

.gitignore

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
2-
# See https://help.github.com/ignore-files/ for more about ignoring files.
1+
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
32

43
# dependencies
5-
node_modules
4+
/node_modules
5+
6+
# production
7+
/build
68

7-
# all builds
8-
build
9-
.rpt2_cache
9+
# output files
10+
/dist
1011

1112
# misc
1213
.DS_Store
@@ -20,16 +21,5 @@ npm-debug.log*
2021
yarn-debug.log*
2122
yarn-error.log*
2223

23-
## dist output files
24-
dist/zingchart-react.es.js
25-
dist/zingchart-react.es.js.map
26-
27-
## Unignored Files
28-
!dist/modules/**
29-
!dist/zingchart-react.js
30-
31-
# Example files
32-
example/package-lock.json
33-
34-
# Outher output files
24+
# Other generated files
3525
CHANGELOG.md

dist/index.es.js

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

dist/index.es.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist/index.js

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

dist/index.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)