Skip to content

Commit 2e41b0e

Browse files
ct-dixitct-dixit
authored
v 4.0.0 development done (#111)
1 parent 7f9367e commit 2e41b0e

File tree

127 files changed

+9605
-8857
lines changed

Some content is hidden

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

127 files changed

+9605
-8857
lines changed

‎vite/.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VITE_APP_VERSION=v3.5.0
1+
VITE_APP_VERSION=v4.0.0
22
GENERATE_SOURCEMAP=false
33

44
## PUBLIC URL

‎vite/.eslintrc‎

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

‎vite/.gitignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,19 @@
44
/node_modules
55
/.pnp
66
.pnp.js
7+
.yarn/*
8+
!.yarn/patches
9+
!.yarn/plugins
10+
!.yarn/releases
11+
!.yarn/sdks
12+
!.yarn/versions
713

814
# testing
915
/coverage
1016

1117
# production
1218
/build
19+
/dist
1320

1421
# misc
1522
.DS_Store

‎vite/.yarnrc.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nodeLinker: node-modules

‎vite/eslint.config.mjs‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
import { fixupConfigRules } from '@eslint/compat';
2+
import prettier from 'eslint-plugin-prettier';
3+
import react from 'eslint-plugin-react';
4+
import reactHooks from 'eslint-plugin-react-hooks';
5+
import jsxA11y from 'eslint-plugin-jsx-a11y';
6+
import js from '@eslint/js';
7+
import path from 'node:path';
8+
import { fileURLToPath } from 'node:url';
9+
import { FlatCompat } from '@eslint/eslintrc';
10+
11+
const __filename = fileURLToPath(import.meta.url);
12+
const __dirname = path.dirname(__filename);
13+
const compat = new FlatCompat({
14+
baseDirectory: __dirname,
15+
recommendedConfig: js.configs.recommended,
16+
allConfig: js.configs.all
17+
});
18+
19+
export default [
20+
...fixupConfigRules(compat.extends('prettier')),
21+
22+
{
23+
plugins: {
24+
prettier,
25+
react,
26+
'react-hooks': reactHooks,
27+
'jsx-a11y': jsxA11y
28+
},
29+
30+
languageOptions: {
31+
ecmaVersion: 2020,
32+
sourceType: 'module',
33+
parserOptions: {
34+
ecmaFeatures: {
35+
jsx: true // ✅ Enable JSX parsing
36+
}
37+
}
38+
},
39+
40+
settings: {
41+
react: {
42+
version: 'detect' // ✅ Detect the installed React version
43+
}
44+
},
45+
46+
rules: {
47+
'react/jsx-filename-extension': ['error', { extensions: ['.js', '.jsx'] }],
48+
'react/react-in-jsx-scope': 'off',
49+
'react/prop-types': 'off',
50+
'react/jsx-props-no-spreading': 'off',
51+
'react-hooks/rules-of-hooks': 'error',
52+
'react-hooks/exhaustive-deps': 'warn',
53+
'jsx-a11y/label-has-associated-control': 'off',
54+
'jsx-a11y/no-autofocus': 'off',
55+
56+
'prettier/prettier': [
57+
'warn',
58+
{
59+
bracketSpacing: true,
60+
printWidth: 140,
61+
singleQuote: true,
62+
trailingComma: 'none',
63+
tabWidth: 2,
64+
useTabs: false
65+
}
66+
]
67+
}
68+
},
69+
{
70+
ignores: ['node_modules/**'],
71+
files: ['src/**/*.{js,jsx}']
72+
}
73+
];

‎vite/favicon.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎vite/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
33
<head>
4-
<title>Berry - React Material Admin Dashboard Template</title>
4+
<title>Berry - React Material Free Admin Dashboard Template</title>
55
<link rel="icon" href="/favicon.svg" />
66
<!-- Meta Tags-->
77
<meta charset="utf-8" />

‎vite/jsconfig.json‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
11
{
2-
"compilerOptions": {
3-
"target": "esnext",
4-
"module": "commonjs",
5-
"baseUrl": "src"
6-
},
7-
"include": ["src/**/*"],
8-
"exclude": ["node_modules"]
2+
"compilerOptions": {
3+
"target": "ESNext",
4+
"useDefineForClassFields": true,
5+
"lib": ["DOM", "DOM.Iterable", "ESNext"],
6+
"allowJs": false,
7+
"skipLibCheck": true,
8+
"esModuleInterop": false,
9+
"allowSyntheticDefaultImports": true,
10+
"strict": true,
11+
"forceConsistentCasingInFileNames": true,
12+
"module": "ESNext",
13+
"moduleResolution": "Node",
14+
"resolveJsonModule": true,
15+
"isolatedModules": true,
16+
"noEmit": true,
17+
"jsx": "react-jsx",
18+
"baseUrl": "src"
19+
},
20+
"exclude": ["node_modules"],
21+
"include": ["src", "**/*.js", "**/*.jsx", "src/**/*"],
22+
"references": [{ "path": "./jsconfig.node.json" }]
923
}

‎vite/tsconfig.node.json‎ renamed to ‎vite/jsconfig.node.json‎

File renamed without changes.

‎vite/package.json‎

Lines changed: 48 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,53 @@
11
{
2-
"name": "berry-free-material-react",
3-
"version": "3.5.0",
2+
"name": "berry-material-react-js",
3+
"version": "4.0.0",
44
"private": true,
5-
"author": {
6-
"name": "CodedThemes",
7-
"email": "[email protected]",
8-
"url": "https://codedthemes.com/"
5+
"dependencies": {
6+
"@emotion/react": "^11.14.0",
7+
"@emotion/styled": "^11.14.0",
8+
"@fontsource/inter": "5.1.0",
9+
"@fontsource/poppins": "5.1.0",
10+
"@fontsource/roboto": "5.1.0",
11+
"@mui/icons-material": "6.1.9",
12+
"@mui/material": "6.1.9",
13+
"@tabler/icons-react": "3.24.0",
14+
"@vitejs/plugin-react": "4.3.4",
15+
"apexcharts": "3.46.0",
16+
"framer-motion": "11.12.0",
17+
"lodash-es": "4.17.21",
18+
"material-ui-popup-state": "5.3.1",
19+
"react": "18.3.1",
20+
"react-apexcharts": "1.4.1",
21+
"react-dom": "18.3.1",
22+
"react-perfect-scrollbar": "1.5.8",
23+
"react-router": "7.0.2",
24+
"react-router-dom": "7.0.2",
25+
"slick-carousel": "1.8.1",
26+
"swr": "2.2.5",
27+
"vite": "6.0.2",
28+
"vite-jsconfig-paths": "2.0.1",
29+
"web-vitals": "4.2.4",
30+
"yup": "1.4.0"
931
},
10-
"homepage": "https://berrydashboard.io/free",
1132
"scripts": {
12-
"start": "env-cmd -f .env vite",
33+
"start": "vite",
1334
"build": "vite build",
1435
"preview": "vite preview",
1536
"lint": "eslint \"src/**/*.{js,jsx,ts,tsx}\"",
1637
"lint:fix": "eslint --fix \"src/**/*.{js,jsx,ts,tsx}\"",
1738
"prettier": "prettier --write \"src/**/*.{js,jsx,ts,tsx}\""
1839
},
19-
"dependencies": {
20-
"@emotion/cache": "^11.11.0",
21-
"@emotion/react": "^11.11.3",
22-
"@emotion/styled": "^11.11.0",
23-
"@fontsource/inter": "^5.0.16",
24-
"@fontsource/poppins": "^5.0.8",
25-
"@fontsource/roboto": "^5.0.8",
26-
"@mui/icons-material": "^5.15.10",
27-
"@mui/lab": "^5.0.0-alpha.165",
28-
"@mui/material": "^5.15.10",
29-
"@mui/system": "^5.15.9",
30-
"@mui/utils": "^5.15.11",
31-
"@reduxjs/toolkit": "^2.2.1",
32-
"@tabler/icons-react": "^2.47.0",
33-
"@vitejs/plugin-react": "^4.2.1",
34-
"apexcharts": "^3.46.2",
35-
"env-cmd": "^10.1.0",
36-
"formik": "^2.4.5",
37-
"framer-motion": "^11.0.6",
38-
"material-ui-popup-state": "^5.0.10",
39-
"prop-types": "^15.8.1",
40-
"react": "^18.2.0",
41-
"react-apexcharts": "^1.4.1",
42-
"react-device-detect": "^2.2.3",
43-
"react-dom": "^18.2.0",
44-
"react-perfect-scrollbar": "^1.5.8",
45-
"react-redux": "^9.1.0",
46-
"react-router": "6.21.3",
47-
"react-router-dom": "^6.22.1",
48-
"redux": "^5.0.1",
49-
"redux-persist": "^6.0.0",
50-
"swr": "^2.2.5",
51-
"vite": "^5.2.10",
52-
"vite-jsconfig-paths": "^2.0.1",
53-
"web-vitals": "^3.5.2",
54-
"yup": "^1.3.3"
55-
},
5640
"eslintConfig": {
5741
"extends": [
58-
"react-app"
59-
]
60-
},
61-
"babel": {
62-
"presets": [
63-
"@babel/preset-react"
42+
"react-app",
43+
"react-app/jest"
6444
]
6545
},
6646
"browserslist": {
6747
"production": [
68-
"defaults",
69-
"not IE 11"
48+
">0.2%",
49+
"not dead",
50+
"not op_mini all"
7051
],
7152
"development": [
7253
"last 1 chrome version",
@@ -75,21 +56,17 @@
7556
]
7657
},
7758
"devDependencies": {
78-
"@babel/core": "^7.23.9",
79-
"@babel/eslint-parser": "^7.23.10",
80-
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
81-
"eslint": "^8.56.0",
82-
"eslint-config-prettier": "^9.1.0",
83-
"eslint-config-react-app": "^7.0.1",
84-
"eslint-plugin-flowtype": "^8.0.3",
85-
"eslint-plugin-import": "^2.29.1",
86-
"eslint-plugin-jsx-a11y": "^6.8.0",
87-
"eslint-plugin-prettier": "^5.1.3",
88-
"eslint-plugin-react": "^7.33.2",
89-
"eslint-plugin-react-hooks": "^4.6.0",
90-
"immutable": "^4.3.5",
91-
"prettier": "^3.2.5",
92-
"react-error-overlay": "6.0.11",
93-
"sass": "^1.71.1"
94-
}
95-
}
59+
"@eslint/compat": "1.2.3",
60+
"@eslint/eslintrc": "3.2.0",
61+
"@eslint/js": "9.16.0",
62+
"eslint": "9.16.0",
63+
"eslint-config-prettier": "9.1.0",
64+
"eslint-plugin-jsx-a11y": "6.10.2",
65+
"eslint-plugin-prettier": "5.2.1",
66+
"eslint-plugin-react": "7.37.4",
67+
"eslint-plugin-react-hooks": "5.0.0",
68+
"prettier": "3.4.1",
69+
"sass": "1.81.1"
70+
},
71+
"packageManager": "[email protected]"
72+
}

0 commit comments

Comments
 (0)