Skip to content

Commit

Permalink
Merge branch 'dev' into feat/allow-files-deletion-in-debug-view
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinBelthle committed Sep 19, 2024
2 parents 7288b38 + 6a4bc9c commit 3285bad
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 22 deletions.
14 changes: 11 additions & 3 deletions webapp/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,17 @@ module.exports = {
"plugin:react/jsx-runtime",
"plugin:react-hooks/recommended",
"plugin:jsdoc/recommended-typescript",
"plugin:prettier/recommended",
"plugin:prettier/recommended", // Must be the last one
],
plugins: [
"license-header",
"react-refresh",
],
ignorePatterns: [
"dist",
"license-header.js",
".eslintrc.cjs",
],
plugins: ["react-refresh"],
ignorePatterns: ["dist", ".eslintrc.cjs"],
parser: "@typescript-eslint/parser",
parserOptions: {
// `ecmaVersion` is automatically sets by `esXXXX` in `env`
Expand Down Expand Up @@ -48,6 +55,7 @@ module.exports = {
"jsdoc/require-jsdoc": "off",
"jsdoc/require-hyphen-before-param-description": "warn",
"jsdoc/tag-lines": ["warn", "any", { startLines: 1 }], // Expected 1 line after block description
"license-header/header": ["error", "license-header.js"],
"no-console": "warn",
"no-param-reassign": [
"error",
Expand Down
1 change: 1 addition & 0 deletions webapp/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
license-header.js
19 changes: 19 additions & 0 deletions webapp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
"eslint": "8.55.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-jsdoc": "48.2.0",
"eslint-plugin-license-header": "0.6.1",
"eslint-plugin-prettier": "5.0.0",
"eslint-plugin-react": "7.33.2",
"eslint-plugin-react-hooks": "4.6.0",
Expand Down
15 changes: 0 additions & 15 deletions webapp/src/vite-env.d.ts

This file was deleted.

12 changes: 10 additions & 2 deletions webapp/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
"compilerOptions": {
"target": "es2022",
"useDefineForClassFields": true,
"lib": ["ES2022", "DOM", "DOM.Iterable"],
"lib": [
"ES2022",
"DOM",
"DOM.Iterable",
],
"module": "ESNext",
"skipLibCheck": true,

Expand All @@ -13,7 +17,11 @@
"isolatedModules": true,
"noEmit": true,
"jsx": "react-jsx",
"types": ["vitest/globals", "vitest/jsdom"],
"types": [
"vite/client",
"vitest/globals",
"vitest/jsdom",
],

/* Linting */
"strict": true,
Expand Down
5 changes: 4 additions & 1 deletion webapp/tsconfig.node.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
"module": "ESNext",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"types": ["vitest/globals", "vitest/jsdom"]
"types": [
"vitest/globals",
"vitest/jsdom",
]
},
"include": ["vite.config.ts"]
}
15 changes: 14 additions & 1 deletion webapp/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
/// <reference types="vitest" />
/**
* Copyright (c) 2024, RTE (https://www.rte-france.com)
*
* See AUTHORS.txt
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* SPDX-License-Identifier: MPL-2.0
*
* This file is part of the Antares project.
*/

import { defineConfig } from "vite";
import react from "@vitejs/plugin-react-swc";

Expand Down

0 comments on commit 3285bad

Please sign in to comment.