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

React upgrade #3

Closed
wants to merge 59 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
c6bdb28
Support react version between 17 & 18
rushi Jul 6, 2023
48b4fb1
ignore vscode
rushi Jul 6, 2023
9e4bbc7
upgrade react in package.lock
rushi Jul 6, 2023
8397ec2
upgrade react
rushi Jul 6, 2023
bd5b034
One more upgrade
rushi Jul 6, 2023
c821c89
Upgrade tailwindcss forms
rushi Jul 24, 2023
714baac
npm audit fix
rushi Jul 24, 2023
7f6a6b6
Upgrade tippy.js
rushi Jul 25, 2023
d1851f9
Update types
rushi Sep 23, 2023
3cf65a5
Remove border-transparent to fix dupe issue
rushi Sep 23, 2023
7947c34
Prettier
rushi Oct 14, 2023
e5fba9b
Merge branch 'master' of github.com:xola/ui-kit into react-upgrade
rushi Oct 14, 2023
9344336
npm audit fix
rushi Oct 14, 2023
60f08df
Packages update
rushi Oct 14, 2023
4ab34eb
Remove redundant scripts in package.json and copy lint ignores to file
rushi Oct 14, 2023
838b14f
Upgrade to latest jest
rushi Oct 14, 2023
0e5a467
Only support ES, and copy index.d.ts for support
rushi Oct 14, 2023
e2d4db5
Fix version
rushi Oct 14, 2023
9d3428e
Add UMD to test the difference
rushi Oct 14, 2023
12c797e
Update config to use ES
rushi Oct 14, 2023
399ffa7
Publish Github pages for master branch only
rushi Oct 14, 2023
d0ec0b8
Update index.d.ts with more files that we've added over time
rushi Oct 14, 2023
8bdb162
Upgrade to Node 18
rushi Oct 14, 2023
c135cc2
Fix CRM Icon issue
rushi Oct 15, 2023
9ab6d28
Initial commit for upgrade to Storybook 7.4 - Temp remove DatePicker
rushi Oct 16, 2023
b0bd133
Revert "Initial commit for upgrade to Storybook 7.4 - Temp remove Dat…
rushi Oct 16, 2023
49d621a
Revert "Upgrade to Node 18"
rushi Oct 16, 2023
fd81436
3.0.1
rushi Oct 16, 2023
068c0dd
3.0.2
rushi Oct 16, 2023
075d158
Fix SSR
rushi Oct 31, 2023
81869f1
Upgrade to react-json-view that uses React 18
rushi Oct 31, 2023
29971af
Temp comment out react-json-view since it has issues with React 18
rushi Nov 1, 2023
3377940
Remove line-clamp plugin since it is included by default
rushi Nov 7, 2023
d670ece
Suppress hydration warning for downshift
rushi Nov 7, 2023
720e861
Remove `useId` hook in favor of the one from React 18
rushi Nov 7, 2023
9944b01
Debug IDs
rushi Nov 7, 2023
a70b899
Remove debug
rushi Nov 7, 2023
a00a91a
Upgrade to new react18-json-view
rushi Nov 9, 2023
307b7cf
Comment out JsonView because of JS/JSX/TSX
rushi Nov 9, 2023
7782e7f
3.0.3
rushi Nov 9, 2023
5b6982e
3.0.4
rushi Nov 14, 2023
fa819ab
Merge branch 'master' of github.com:xola/ui-kit into react-upgrade
rushi Nov 22, 2023
77f5c40
Use default token
rushi Sep 6, 2024
dcc45fb
Set `permissions` on eslint.yml workflow
rushi Sep 9, 2024
d4db076
Explicitly specify GITHUB_TOKEN
rushi Sep 9, 2024
2b00715
Do not checkout & run workflow if user is not in Xola (#347)
rushi Sep 9, 2024
b27eae8
XS-30 | Multi language support - Xola app content (#334)
kirtesh-xola Sep 9, 2024
ff00cfe
XS-414 weekdays bug fix and removed unnecessary console log (#348)
manojx031 Sep 18, 2024
adbbda5
Merge branch 'master' of github.com:xola/ui-kit into react-upgrade
rushi Sep 20, 2024
ccb71c2
npm audit fix
rushi Sep 20, 2024
b4c6dcc
Updgrade to Node v18 & JS Lint
rushi Sep 20, 2024
105f197
Upgrade packages and better startup script
rushi Sep 20, 2024
729caa8
Replace jest with vitest
rushi Sep 20, 2024
5006583
Upgrade Headless UI 1.4 -> 1.7 needs verification
rushi Sep 20, 2024
2ee5421
🧹 Lint
rushi Sep 20, 2024
720f64b
🧹 Lint after switching to "lodash-es"
rushi Sep 20, 2024
1b73713
3.0.6
rushi Sep 20, 2024
1bd1b5d
Code syntax fixes
rushi Sep 20, 2024
a516477
Update file in build
rushi Sep 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,30 @@
name: Publish @xola/ui-kit

on:
workflow_dispatch:
inputs:
tag:
description: "Tag version"
default: latest
required: true
workflow_dispatch:
inputs:
tag:
description: "Tag version"
default: latest
required: true

jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: actions/setup-node@v3
with:
node-version: 16
cache: "npm"
cache-dependency-path: "package-lock.json"
registry-url: https://registry.npmjs.org/
- uses: actions/setup-node@v3
with:
node-version: 16
cache: "npm"
cache-dependency-path: "package-lock.json"
registry-url: https://registry.npmjs.org/

- run: npm ci
- run: npm ci

- run: npm run build
- run: npm run build

- run: npm publish --tag ${{ github.event.inputs.tag }}
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
- run: npm publish --tag ${{ github.event.inputs.tag }}
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
31 changes: 24 additions & 7 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Lint
on:
push:
# Runs against the workflow and code from the merge commit
pull_request:
types: [ opened, synchronize, reopened ]
# pull_request:
# types: [ opened, synchronize, reopened ]
# Runs against the workflow and code from the base of the pull request
# pull_request_target:
# types: [opened, synchronize, reopened]
pull_request_target:
types: [opened, synchronize, reopened]

env:
DISABLE_PROGRESS: true
Expand All @@ -16,15 +16,32 @@ concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

permissions:
checks: write

jobs:
Lint:
name: ⚡ ES Lint
runs-on: ubuntu-latest

steps:
- name: Check user for team affiliation
uses: tspascoal/get-user-teams-membership@v2
id: checkUserMember
with:
GITHUB_TOKEN: ${{ secrets.ES_LINT_TOKEN }}
username: ${{ github.actor }}
organization: xola
team: 'Engineering,X2 Consultants'

- if: ${{ steps.checkUserMember.outputs.isTeamMember == 'false' }}
run: |
echo "Hey ${{ github.actor }} you are not in a whitelisted team"
exit 1

- uses: actions/checkout@v3
with:
token: "${{ github.token }}"
token: ${{ secrets.GITHUB_TOKEN }}
ref: ${{github.event.pull_request.head.sha}}
repository: ${{github.event.pull_request.head.repo.full_name}}

Expand All @@ -36,7 +53,7 @@ jobs:
cache-dependency-path: "package-lock.json"

- name: Install Node Dependencies
run: npm ci
run: npm ci --no-fund --no-audit

- name: Save Code Linting Report to JSON
# This is to show failures in GitHub pull request using the action below
Expand All @@ -48,7 +65,7 @@ jobs:
with:
check-name: "View Lint Report"
markdown-report-on-step-summary: true
repo-token: "${{ github.token }}"
repo-token: ${{ secrets.GITHUB_TOKEN }}
report-json: "eslint_report.json"

# # OPTIONAL: save a copy of the usage report for download or use in another job
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Publish UI Kit Storybook
on:
push:
branches:
- "**" # matches every branch
- "master" # matches every branch

jobs:
publish:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ storybook-static
*.tgz
src/theme.js
.idea
.vscode
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
18
9 changes: 6 additions & 3 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
src/theme.js
package-lock.json
node_modules
.idea
.github
git_ignore
node_modules
package.json
package-lock.json
src/theme.js
16 changes: 16 additions & 0 deletions .xo-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"ignorePatterns": [
"src/stories",
"**/*.test.js*",
"**/*.test.ts*",
"**/test/**/*.*"
],
"rules": {
"complexity": [
"warn",
{
"max": 25
}
]
}
}
2 changes: 1 addition & 1 deletion index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -274,4 +274,4 @@ export {
WriteIcon,
XolaBotIcon,
XrayIcon,
} from "./build/ui-kit.umd";
} from "./build/ui-kit.es";
Loading
Loading