Skip to content

Commit 3cf6b47

Browse files
Rajesh-Nagarajan-11Rajesh-Nagarajan-11
authored
Merge branch 'master' into patch-1
2 parents 5ca6261 + c6f343e commit 3cf6b47

Some content is hidden

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

60 files changed

+25913
-14643
lines changed

‎.desktop-lighthouserc.js‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@ module.exports = {
33
"collect": {
44
"settings": {
55
"preset": "desktop"
6-
},
6+
},
77
"staticDistDir": "./public",
88
"url": [
99
"http://localhost/404/index.html?desktop",
1010
"http://localhost/?desktop",
1111
"http://localhost/company/about/index.html?desktop",
12-
"http://localhost/cloud-native-management/meshery/index.html?desktop",
13-
"http://localhost/cloud-native-management/kanvas/index.html?desktop",
14-
"http://localhost/learn/learning-paths/index.html?desktop",
15-
"http://localhost/learn/service-mesh-books/index.html?desktop",
16-
"http://localhost/learn/workshops/index.html?desktop",
17-
"http://localhost/learn/index.html?desktop",
18-
"http://localhost/blog/index.html?desktop",
19-
"http://localhost/resources/index.html?desktop",
20-
"http://localhost/careers/index.html?desktop",
21-
"http://localhost/community/members/index.html?desktop",
22-
"http://localhost/community/meshmates/index.html?desktop",
23-
"http://localhost/community/events/index.html?desktop",
24-
"http://localhost/community/newcomers/index.html?desktop",
12+
"http://localhost/cloud-native-management/meshery/index.html?desktop",
13+
"http://localhost/cloud-native-management/kanvas/index.html?desktop",
14+
"http://localhost/learn/learning-paths/index.html?desktop",
15+
"http://localhost/learn/service-mesh-books/index.html?desktop",
16+
"http://localhost/learn/workshops/index.html?desktop",
17+
"http://localhost/learn/index.html?desktop",
18+
"http://localhost/blog/index.html?desktop",
19+
"http://localhost/resources/index.html?desktop",
20+
"http://localhost/careers/index.html?desktop",
21+
"http://localhost/community/members/index.html?desktop",
22+
"http://localhost/community/meshmates/index.html?desktop",
23+
"http://localhost/community/events/index.html?desktop",
24+
"http://localhost/community/newcomers/index.html?desktop",
2525
],
2626
},
2727
"assert": {
28-
"assertions": {
29-
"categories:performance": ["warn", {"minScore": .90}],
30-
"categories:accessibility": ["warn", {"minScore": .90}],
31-
"categories:best-practices": ["warn", {"minScore": .90}],
32-
"categories:seo": ["warn", {"minScore": .90}],
33-
}
34-
},
35-
"upload": {
36-
"target": "temporary-public-storage",
37-
},
28+
"assertions": {
29+
"categories:performance": ["warn", { "minScore": .90 }],
30+
"categories:accessibility": ["warn", { "minScore": .90 }],
31+
"categories:best-practices": ["warn", { "minScore": .90 }],
32+
"categories:seo": ["warn", { "minScore": .90 }],
3833
}
39-
};
34+
},
35+
"upload": {
36+
"target": "temporary-public-storage",
37+
},
38+
}
39+
};

‎.eslintignore‎

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

‎.eslintrc.js‎

Lines changed: 0 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +0,0 @@
1-
module.exports = {
2-
3-
"env": {
4-
"browser": true,
5-
"es6": true,
6-
"node": true,
7-
"amd": true
8-
},
9-
"settings": {
10-
"react": {
11-
"version": "detect"
12-
}
13-
},
14-
"extends": [
15-
"eslint:recommended",
16-
"plugin:react/recommended"
17-
],
18-
"parser": "@babel/eslint-parser",
19-
"parserOptions": {
20-
"ecmaFeatures": {
21-
"jsx": true
22-
},
23-
"ecmaVersion": 2018,
24-
"sourceType": "module"
25-
},
26-
"plugins": [
27-
"react"
28-
],
29-
"rules": {
30-
"array-bracket-spacing": ["error", "never"],
31-
"comma-style": ["error"],
32-
"arrow-spacing": [
33-
"error",
34-
{
35-
"after": true,
36-
"before": true
37-
}
38-
],
39-
"block-scoped-var": "error",
40-
"block-spacing": "error",
41-
"brace-style": [
42-
"error",
43-
"1tbs"
44-
],
45-
"jsx-quotes": ["error", "prefer-double"],
46-
"keyword-spacing": "error",
47-
"key-spacing": ["error", {
48-
"beforeColon": false,
49-
"afterColon": true,
50-
}],
51-
"no-unused-vars": [
52-
"warn",
53-
{
54-
"varsIgnorePattern": "React"
55-
}
56-
],
57-
"no-trailing-spaces": "error",
58-
"object-curly-spacing": ["error", "always"],
59-
"react/display-name": 0,
60-
"react/prop-types": 0,
61-
"react/no-unescaped-entities": [0],
62-
"react/jsx-no-duplicate-props": [0],
63-
"indent": [
64-
"error", 2, {
65-
"FunctionExpression": { "parameters": "first" },
66-
"FunctionDeclaration": { "parameters": "first" },
67-
"MemberExpression": 1,
68-
"SwitchCase": 1,
69-
"outerIIFEBody": 0,
70-
"VariableDeclarator": { "var": 2, "let": 2, "const": 3 },
71-
ignoredNodes: ["TemplateLiteral"]
72-
}
73-
],
74-
"linebreak-style": [
75-
"error",
76-
"unix"
77-
],
78-
"quotes": [
79-
"error",
80-
"double"
81-
],
82-
"semi": [
83-
"error",
84-
"always"
85-
],
86-
"strict": 0,
87-
"valid-typeof": 0,
88-
"space-unary-ops": [
89-
1, {
90-
"words": true,
91-
"nonwords": false
92-
}
93-
],
94-
"space-infix-ops": [
95-
"error"
96-
]
97-
}
98-
};

‎.lighthouserc.js‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
module.exports = {
2-
"ci": {
3-
"collect": {
4-
"staticDistDir": "./public",
5-
"url" : [
6-
"http://localhost/404.html",
7-
"http://localhost/404/index.html",
8-
"http://localhost",
9-
"http://localhost/company/about/index.html",
10-
"http://localhost/cloud-native-management/meshery/index.html",
11-
"http://localhost/cloud-native-management/kanvas/index.html",
12-
"http://localhost/learn/learning-paths/index.html",
13-
"http://localhost/learn/service-mesh-books/index.html",
14-
"http://localhost/learn/workshops/index.html",
15-
"http://localhost/learn/index.html",
16-
"http://localhost/blog/index.html",
17-
"http://localhost/resources/index.html",
18-
"http://localhost/careers/index.html",
19-
"http://localhost/community/members/index.html",
20-
"http://localhost/community/meshmates/index.html",
21-
"http://localhost/community/events/index.html",
22-
"http://localhost/community/newcomers/index.html",
23-
],
24-
},
25-
"assert": {
26-
"assertions": {
27-
"categories:performance": ["warn", {"minScore": .90}],
28-
"categories:accessibility": ["warn", {"minScore": .90}],
29-
"categories:best-practices": ["warn", {"minScore": .90}],
30-
"categories:seo": ["warn", {"minScore": .90}],
31-
}
32-
},
33-
"upload": {
34-
"target": "temporary-public-storage",
35-
},
36-
}
37-
};
2+
"ci": {
3+
"collect": {
4+
"staticDistDir": "./public",
5+
"url": [
6+
"http://localhost/404.html",
7+
"http://localhost/404/index.html",
8+
"http://localhost",
9+
"http://localhost/company/about/index.html",
10+
"http://localhost/cloud-native-management/meshery/index.html",
11+
"http://localhost/cloud-native-management/kanvas/index.html",
12+
"http://localhost/learn/learning-paths/index.html",
13+
"http://localhost/learn/service-mesh-books/index.html",
14+
"http://localhost/learn/workshops/index.html",
15+
"http://localhost/learn/index.html",
16+
"http://localhost/blog/index.html",
17+
"http://localhost/resources/index.html",
18+
"http://localhost/careers/index.html",
19+
"http://localhost/community/members/index.html",
20+
"http://localhost/community/meshmates/index.html",
21+
"http://localhost/community/events/index.html",
22+
"http://localhost/community/newcomers/index.html",
23+
],
24+
},
25+
"assert": {
26+
"assertions": {
27+
"categories:performance": ["warn", { "minScore": .90 }],
28+
"categories:accessibility": ["warn", { "minScore": .90 }],
29+
"categories:best-practices": ["warn", { "minScore": .90 }],
30+
"categories:seo": ["warn", { "minScore": .90 }],
31+
}
32+
},
33+
"upload": {
34+
"target": "temporary-public-storage",
35+
},
36+
}
37+
};

‎eslint.config.js‎

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
const {
2+
defineConfig,
3+
globalIgnores,
4+
} = require("eslint/config");
5+
6+
const globals = require("globals");
7+
const babelParser = require("@babel/eslint-parser");
8+
const react = require("eslint-plugin-react");
9+
const js = require("@eslint/js");
10+
11+
const {
12+
FlatCompat,
13+
} = require("@eslint/eslintrc");
14+
15+
const compat = new FlatCompat({
16+
baseDirectory: __dirname,
17+
recommendedConfig: js.configs.recommended,
18+
allConfig: js.configs.all
19+
});
20+
21+
module.exports = defineConfig([{
22+
languageOptions: {
23+
globals: {
24+
...globals.browser,
25+
...globals.node,
26+
...globals.amd,
27+
},
28+
29+
parser: babelParser,
30+
"ecmaVersion": 2018,
31+
"sourceType": "module",
32+
33+
parserOptions: {
34+
"ecmaFeatures": {
35+
"jsx": true,
36+
},
37+
},
38+
},
39+
40+
"settings": {
41+
"react": {
42+
"version": "detect",
43+
},
44+
},
45+
46+
extends: compat.extends("eslint:recommended", "plugin:react/recommended"),
47+
48+
plugins: {
49+
react,
50+
},
51+
52+
"rules": {
53+
"array-bracket-spacing": ["error", "never"],
54+
"comma-style": ["error"],
55+
56+
"arrow-spacing": ["error", {
57+
"after": true,
58+
"before": true,
59+
}],
60+
61+
"block-scoped-var": "error",
62+
"block-spacing": "error",
63+
"brace-style": ["error", "1tbs"],
64+
"jsx-quotes": ["error", "prefer-double"],
65+
"keyword-spacing": "error",
66+
67+
"key-spacing": ["error", {
68+
"beforeColon": false,
69+
"afterColon": true,
70+
}],
71+
72+
"no-unused-vars": ["warn", {
73+
"varsIgnorePattern": "React",
74+
}],
75+
76+
"no-trailing-spaces": "error",
77+
"object-curly-spacing": ["error", "always"],
78+
"react/display-name": 0,
79+
"react/prop-types": 0,
80+
"react/no-unescaped-entities": [0],
81+
"react/jsx-no-duplicate-props": [0],
82+
83+
"indent": ["error", 2, {
84+
"FunctionExpression": {
85+
"parameters": "first",
86+
},
87+
88+
"FunctionDeclaration": {
89+
"parameters": "first",
90+
},
91+
92+
"MemberExpression": 1,
93+
"SwitchCase": 1,
94+
"outerIIFEBody": 0,
95+
96+
"VariableDeclarator": {
97+
"var": 2,
98+
"let": 2,
99+
"const": 3,
100+
},
101+
102+
ignoredNodes: ["TemplateLiteral"],
103+
}],
104+
105+
"linebreak-style": ["error", "unix"],
106+
"quotes": ["error", "double"],
107+
"semi": ["error", "always"],
108+
"strict": 0,
109+
"valid-typeof": 0,
110+
111+
"space-unary-ops": [1, {
112+
"words": true,
113+
"nonwords": false,
114+
}],
115+
116+
"space-infix-ops": ["error"],
117+
},
118+
}, globalIgnores([
119+
"**/node_modules/",
120+
"**/*.test.js",
121+
"src/utils/",
122+
"**/.cache/",
123+
"**/.github/",
124+
"**/assets/",
125+
"**/public/",
126+
"**/.babelrc",
127+
"**/.env.development",
128+
"**/CNAME",
129+
"**/CODE_OF_CONDUCT.md",
130+
"**/CODEOWNERS",
131+
"**/font-preload-cache.json",
132+
"**/LICENSE",
133+
"**/Makefile",
134+
"**/README.md",
135+
"**/package.json",
136+
"**/package-lock.json",
137+
"**/static/",
138+
])]);

0 commit comments

Comments
 (0)