Skip to content

Commit

Permalink
Merge pull request #48 from Bramikke/master
Browse files Browse the repository at this point in the history
Zingchart-React compatibility with React 18+
  • Loading branch information
jeanettephung committed Dec 7, 2023
2 parents fed588d + 6bf4c7d commit 66e6a10
Show file tree
Hide file tree
Showing 36 changed files with 13,591 additions and 47,026 deletions.
8 changes: 1 addition & 7 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
{
"presets": [
["env", {
"modules": false
}],
"stage-0",
"react"
]
"presets": ["@babel/env", "@babel/preset-react"]
}
23 changes: 0 additions & 23 deletions .eslintrc

This file was deleted.

10 changes: 3 additions & 7 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
name: Build

# Run on a dev branch
on:
on:
push:
branches:
- master
Expand All @@ -27,13 +27,9 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
# npm ci REQUIRES a package-lock.json file
- name: Install Fresh Dependencies
run: |
rm package-lock.json
npm install
run: npm ci
- name: Build library
run: npm run build
- name: Log build output
run: |
ls -alt dist/
run: ls -alt dist/
7 changes: 2 additions & 5 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
name: Test

# Run on a dev branch
on:
on:
push:
branches:
- master
Expand All @@ -27,11 +27,8 @@ jobs:
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
# npm ci REQUIRES a package-lock.json file
- name: Install Fresh Dependencies
run: |
rm package-lock.json
npm install
run: npm ci
- name: Build library
run: npm run build
- name: Run Unit Tests
Expand Down
26 changes: 8 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@

# See https://help.github.com/ignore-files/ for more about ignoring files.
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
node_modules
/node_modules

# production
/build

# all builds
build
.rpt2_cache
# output files
/dist

# misc
.DS_Store
Expand All @@ -20,16 +21,5 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*

## dist output files
dist/zingchart-react.es.js
dist/zingchart-react.es.js.map

## Unignored Files
!dist/modules/**
!dist/zingchart-react.js

# Example files
example/package-lock.json

# Outher output files
# Other generated files
CHANGELOG.md
187 changes: 0 additions & 187 deletions dist/index.es.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/index.es.js.map

This file was deleted.

192 changes: 0 additions & 192 deletions dist/index.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/index.js.map

This file was deleted.

Loading

0 comments on commit 66e6a10

Please sign in to comment.