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

chore: format web base code consistently #1460

Merged
merged 5 commits into from
Jul 12, 2024
Merged
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
27 changes: 15 additions & 12 deletions web/.babelrc.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
{
"presets": [
["@babel/env", {
"targets": {
"chrome": "57",
"firefox": "52",
"safari": "10.3",
"edge": "16",
"opera": "44"
}
}],
"@babel/preset-react"
]
"presets": [
[
"@babel/env",
{
"targets": {
"chrome": "57",
"firefox": "52",
"safari": "10.3",
"edge": "16",
"opera": "44"
}
}
],
"@babel/preset-react"
]
}
161 changes: 86 additions & 75 deletions web/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,83 +1,94 @@
{
"root": true,
"env": {
"browser": true,
"es6": true,
"jest": true
"root": true,
"env": {
"browser": true,
"es6": true,
"jest": true
},
"extends": [
"eslint:recommended",
"standard",
"standard-jsx",
"standard-react",
"plugin:@typescript-eslint/recommended",
"prettier"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 7,
"ecmaFeatures": {
"jsx": true
},
"extends": [
"eslint:recommended",
"standard",
"standard-jsx",
"standard-react",
"plugin:@typescript-eslint/recommended"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 7,
"ecmaFeatures": {
"jsx": true
},
"sourceType": "module"
},
"plugins": ["agama-i18n", "flowtype", "i18next", "react", "react-hooks", "@typescript-eslint"],
"rules": {
"agama-i18n/string-literals": "error",
"i18next/no-literal-string": "error",
"indent": ["error", 2,
{
"ObjectExpression": "first",
"CallExpression": {"arguments": "first"},
"MemberExpression": 1,
"ignoredNodes": [ "JSXAttribute" ],
"SwitchCase": 1
}],
"newline-per-chained-call": ["error", { "ignoreChainWithDepth": 2 }],
"no-var": "error",
"no-multi-str": "off",
"no-use-before-define": "off",
"@typescript-eslint/no-unused-vars": "off",
"@typescript-eslint/no-use-before-define": "warn",
"@typescript-eslint/ban-ts-comment": "off",
"lines-between-class-members": ["error", "always", { "exceptAfterSingleLine": true }],
"prefer-promise-reject-errors": ["error", { "allowEmptyReject": true }],
"react/jsx-indent": ["error", 2],
"semi": ["error", "always", { "omitLastInOneLineBlock": true }],

"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "error",

"camelcase": "off",
"comma-dangle": "off",
"curly": "off",
"jsx-quotes": "off",
"key-spacing": "off",
"no-console": "off",
"quotes": "off",
"react/jsx-curly-spacing": "off",
"react/jsx-indent-props": "off",
"react/prop-types": "off",
"space-before-function-paren": "off",
"n/no-callback-literal": "off"
},
"overrides": [
"sourceType": "module"
},
"plugins": [
"agama-i18n",
"flowtype",
"i18next",
"react",
"react-hooks",
"@typescript-eslint"
],
"rules": {
"agama-i18n/string-literals": "error",
"i18next/no-literal-string": "error",
"no-var": "error",
"no-multi-str": "off",
"no-use-before-define": "off",
"@typescript-eslint/no-unused-vars": "off",
"@typescript-eslint/no-use-before-define": "warn",
"@typescript-eslint/ban-ts-comment": "off",
"lines-between-class-members": [
"error",
"always",
{
// do not check translations in the testing or development files
"files": ["*.test.*", "test-utils.js"],
"rules": {
"i18next/no-literal-string": "off"
}
},
"exceptAfterSingleLine": true
}
],
"prefer-promise-reject-errors": [
"error",
{
// do not check translation arguments in the test, it checks some internals by passing variables
"files": ["i18n.test.js"],
"rules": {
"agama-i18n/string-literals": "off"
}
"allowEmptyReject": true
}
],
"globals": {
"require": false,
"module": false
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "error",
"camelcase": "off",
"comma-dangle": "off",
"curly": "off",
"jsx-quotes": "off",
"key-spacing": "off",
"no-console": "off",
"quotes": "off",
"react/jsx-curly-spacing": "off",
"react/jsx-indent-props": "off",
"react/prop-types": "off",
"space-before-function-paren": "off",
"n/no-callback-literal": "off"
},
"overrides": [
{
// do not check translations in the testing or development files
"files": [
"*.test.*",
"test-utils.js"
],
"rules": {
"i18next/no-literal-string": "off"
}
},
{
// do not check translation arguments in the test, it checks some internals by passing variables
"files": [
"i18n.test.js"
],
"rules": {
"agama-i18n/string-literals": "off"
}
}
],
"globals": {
"require": false,
"module": false
}
}
6 changes: 5 additions & 1 deletion web/.prettierignore
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
src/lib/cockpit.js
dist
po
public
share
src/lib
6 changes: 1 addition & 5 deletions web/.prettierrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
{
"arrowParens": "avoid",
"printWidth": 100,
"semi": true,
"singleQuote": false,
"trailingComma": "none"
"printWidth": 100
}
6 changes: 5 additions & 1 deletion web/.stylelintrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{
"plugins": [
"stylelint-prettier"
],
"extends": [
"stylelint-config-standard",
"stylelint-config-standard-scss"
"stylelint-config-standard-scss",
"stylelint-prettier/recommended"
],
"rules": {
"at-rule-empty-line-before": null,
Expand Down
2 changes: 1 addition & 1 deletion web/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ machine (a virtual machine as well). In that case run
AGAMA_SERVER=https://<IP>:<port> npm run server -- --open
```

Where `AGAMA_SERVER` is the IP address, the hostname or the full URL of the
Where `AGAMA_SERVER` is the IP address, the hostname or the full URL of the
running Agama server instance. This is especially useful if you use the Live ISO
which does not contain any development tools, you can develop the web frontend
easily from your workstation.
Expand Down
4 changes: 2 additions & 2 deletions web/__mocks__/svg.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import React from "react";

export default ({...props}) => (
export default ({ ...props }) => (
// Simple SVG square based on a wikimedia example https://commons.wikimedia.org/wiki/SVG_examples
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="28" height="28" {...props}>
<rect x="0" y="0" width="28" height="28" />
Expand Down
11 changes: 4 additions & 7 deletions web/babel.config.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
const { NODE_ENV } = process.env;

const presets = [
'@babel/preset-react',
['@babel/preset-env', { targets: { node: 'current' } }]
];
const presets = ["@babel/preset-react", ["@babel/preset-env", { targets: { node: "current" } }]];
const plugins = [];

if (!['production', 'test'].includes(NODE_ENV)) {
plugins.push('react-refresh/babel');
if (!["production", "test"].includes(NODE_ENV)) {
plugins.push("react-refresh/babel");
}

module.exports = {
presets,
plugins
plugins,
};
8 changes: 1 addition & 7 deletions web/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,5 @@
]
}
],
"dictionaries": [
"custom",
"css",
"en-common-misspelling",
"fullstack",
"html"
]
"dictionaries": ["custom", "css", "en-common-misspelling", "fullstack", "html"]
}
22 changes: 7 additions & 15 deletions web/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* https://jestjs.io/docs/configuration
*/

const { pathsToModuleNameMapper } = require('ts-jest');
const { compilerOptions } = require('./tsconfig');
const { pathsToModuleNameMapper } = require("ts-jest");
const { compilerOptions } = require("./tsconfig");

module.exports = {
// All imported modules in your tests should be mocked automatically
Expand All @@ -23,18 +23,13 @@ module.exports = {
collectCoverage: true,

// An array of glob patterns indicating a set of files for which coverage information should be collected
collectCoverageFrom: [
"src/**/*.{js,jsx}",
"!src/lib/*.js"
],
collectCoverageFrom: ["src/**/*.{js,jsx}", "!src/lib/*.js"],

// The directory where Jest should output its coverage files
coverageDirectory: "coverage",

// An array of regexp pattern strings used to skip coverage collection
coveragePathIgnorePatterns: [
"/node_modules/"
],
coveragePathIgnorePatterns: ["/node_modules/"],

// Indicates which provider should be used to instrument code for coverage
// coverageProvider: "babel",
Expand Down Expand Up @@ -66,8 +61,7 @@ module.exports = {
// globalTeardown: undefined,

// A set of global variables that need to be available in all test environments
globals: {
},
globals: {},

// The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
// maxWorkers: "50%",
Expand Down Expand Up @@ -141,9 +135,7 @@ module.exports = {

// A list of paths to modules that run some code to configure or set up the testing framework before each test
// setupFilesAfterEnv: [],
setupFilesAfterEnv: [
"<rootDir>/src/setupTests.js"
],
setupFilesAfterEnv: ["<rootDir>/src/setupTests.js"],

// The number of seconds after which a test is considered as slow and reported as such in the results.
// slowTestThreshold: 5,
Expand Down Expand Up @@ -190,7 +182,7 @@ module.exports = {
// transform: undefined,
transform: {
"\\.m?jsx?$": "babel-jest",
"\\.(css|svg)$": "jest-transform-stub"
"\\.(css|svg)$": "jest-transform-stub",
},

// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
Expand Down
Loading
Loading