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

Vite #3323

Closed
wants to merge 8 commits into from
Closed

Vite #3323

Show file tree
Hide file tree
Changes from all commits
Commits
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
298 changes: 298 additions & 0 deletions index.html

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions jsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"compilerOptions": {
"target": "ESNext",
"baseUrl": ".",
"paths": {
"src/*": ["./src/*"],
"state/*": ["./src/state/*"],
"shared/*": ["./src/shared/*"],
"resources/*": ["./src/resources/*"],
"components/*": ["./src/components/*"],
"hooks/*": ["./src/hooks/*"]
}
}
}
8,519 changes: 7,184 additions & 1,335 deletions package-lock.json

Large diffs are not rendered by default.

23 changes: 15 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@
"license": "Apache-2.0",
"name": "@kyma-project/busola",
"version": "0.0.1-rc.8",
"type": "module",
"scripts": {
"postinstall": "cd backend && npm install",
"start": "concurrently -c cyan,green npm:busola npm:backend",
"busola": "npm run copy-themes; PORT=8080 BROWSER=none GENERATE_SOURCEMAP=false react-app-rewired start",
"busola": "npm run copy-themes; PORT=8080 BROWSER=none GENERATE_SOURCEMAP=false vite",
"backend": "cd backend && npm run start",
"eslint-check": "eslint src/ backend/",
"lint-check": "prettier --config ./.prettierrc --ignore-path ./.prettierignore --check '**/*.{ts,tsx,js,jsx,json,html,css,yaml,md}'",
"lint-fix": "prettier --config ./.prettierrc --ignore-path ./.prettierignore --write '**/*.{ts,tsx,js,jsx,json,html,css,yaml,md}'",
"lint-staged": "lint-staged --concurrent=false",
"test": "react-app-rewired test",
"eject": "react-scripts eject",
"build": "npm run copy-themes; INLINE_RUNTIME_CHUNK=false GENERATE_SOURCEMAP=false react-app-rewired build",
"build:docker": "npm run copy-themes; INLINE_RUNTIME_CHUNK=false GENERATE_SOURCEMAP=false react-app-rewired build --env IS_DOCKER=true",
"test": "vitest",
"test:coverage": "vitest run --coverage --watch=false",
"build": "npm run copy-themes; INLINE_RUNTIME_CHUNK=false GENERATE_SOURCEMAP=false tsc && vite build",
"build:docker": "npm run copy-themes; INLINE_RUNTIME_CHUNK=false GENERATE_SOURCEMAP=false tsc && vite build --env IS_DOCKER=true",
"copy-themes": "cp node_modules/@sap-theming/theming-base-content/content/Base/baseLib/sap_horizon/css_variables.css public/themes/@sap-theming/default.css; for theme in hcb dark hcw ; do cp node_modules/@sap-theming/theming-base-content/content/Base/baseLib/sap_horizon_$theme/css_variables.css public/themes/@sap-theming/$theme.css ; done"
},
"eslintConfig": {
Expand Down Expand Up @@ -67,6 +68,7 @@
"@ui5/webcomponents-react": "~1.28.1",
"@ui5/webcomponents-react-base": "^1.28.1",
"@ui5/webcomponents-react-charts": "^1.28.1",
"@vitejs/plugin-react-swc": "^3.7.0",
"classnames": "^2.2.6",
"copy-to-clipboard": "^3.2.0",
"core-js": "^3.3.6",
Expand Down Expand Up @@ -99,7 +101,10 @@
"recoil": "^0.7.5",
"resize-observer-polyfill": "^1.5.1",
"rfc6902": "^5.0.1",
"url": "^0.11.0"
"url": "^0.11.0",
"vite": "^5.4.2",
"vite-plugin-svgr": "^4.2.0",
"vite-tsconfig-paths": "^5.0.1"
},
"devDependencies": {
"@testing-library/jest-dom": "^6.4.5",
Expand All @@ -115,6 +120,7 @@
"@types/react": "^18.0.21",
"@types/react-dom": "^18.0.6",
"@types/uuid": "^9.0.0",
"@vitest/coverage-v8": "^2.0.5",
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.6",
"babel-polyfill": "^6.26.0",
"concurrently": "^7.6.0",
Expand All @@ -123,15 +129,16 @@
"enzyme-to-json": "^3.4.0",
"husky": "^2.4.1",
"jest": "^29.7.0",
"jsdom": "^25.0.0",
"jsdom-worker-fix": "^0.1.8",
"lint-staged": "^10.4.0",
"prettier": "^1.18.2",
"react-app-rewired": "^2.2.1",
"react-scripts": "^5.0.0",
"sass": "^1.77.8",
"sass-loader": "^13.3.2",
"typescript": "^4.8.4",
"uuid": "^9.0.0"
"uuid": "^9.0.0",
"vitest": "^2.0.5"
},
"lint-staged": {
"src/i18n/*.yaml": "yaml-sort --lineWidth=-1 -i ",
Expand Down
128 changes: 0 additions & 128 deletions public/index.html

This file was deleted.

7 changes: 4 additions & 3 deletions src/components/App/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import { useMakeGardenerLoginRoute } from 'components/Gardener/useMakeGardenerLo
import { useHandleResetEndpoint } from 'components/Clusters/shared';
import { Preferences } from 'components/Preferences/Preferences';
import { useResourceSchemas } from './resourceSchemas/useResourceSchemas';
import { Header } from 'header/Header';

import { ContentWrapper } from './ContentWrapper/ContentWrapper';
import { Sidebar } from 'sidebar/Sidebar';
import { Sidebar } from 'src/sidebar/Sidebar';
import { useInitTheme } from './useInitTheme';
import ClusterList from 'components/Clusters/views/ClusterList';
import ClusterRoutes from './ClusterRoutes';
Expand All @@ -32,9 +32,10 @@ import { IncorrectPath } from './IncorrectPath';

import './App.scss';
import { useAfterInitHook } from 'state/useAfterInitHook';
import useSidebarCondensed from 'sidebar/useSidebarCondensed';
import useSidebarCondensed from 'src/sidebar/useSidebarCondensed';
import { useGetValidationEnabledSchemas } from 'state/validationEnabledSchemasAtom';
import { useGetKymaResources } from 'state/kymaResourcesAtom';
import { Header } from 'src/header/Header';

export default function App() {
const language = useRecoilValue(languageAtom);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import toJsonSchema from '@openapi-contrib/openapi-schema-to-json-schema';
import { Resolver } from '@stoplight/json-ref-resolver';
import * as jp from 'jsonpath';
import jp from 'jsonpath';

const CUSTOM_KEY = 'format';
const CUSTOM_FORMATS = {
Expand Down
2 changes: 1 addition & 1 deletion src/components/BusolaExtensions/BusolaExtensionEdit.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { cloneDeep } from 'lodash';
import { ResourceForm } from 'shared/ResourceForm';
import * as Inputs from 'shared/ResourceForm/inputs';
import { K8sNameField, Editor } from 'shared/ResourceForm/fields';
import * as jp from 'jsonpath';
import jp from 'jsonpath';

import { createConfigMapTemplate, SECTIONS } from './helpers';
import { EXTENSION_VERSION_LABEL } from './constants';
Expand Down
Loading
Loading