Skip to content

Commit 9174fb0

Browse files
author
Mathis Girault
committed
fix
1 parent a13a907 commit 9174fb0

File tree

8 files changed

+4696
-782
lines changed

8 files changed

+4696
-782
lines changed

eslint-plugin/.yarnrc.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ compressionLevel: mixed
22

33
enableGlobalCache: false
44

5+
httpProxy: "http://vip-users.proxy.edf.fr:3131"
6+
7+
httpsProxy: "http://vip-users.proxy.edf.fr:3131"
8+
59
nodeLinker: node-modules
610

711
yarnPath: .yarn/releases/yarn-4.9.1.cjs

eslint-plugin/package-lock.json

Lines changed: 4417 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eslint-plugin/yarn.lock

Lines changed: 269 additions & 773 deletions
Large diffs are not rendered by default.

sonar-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<project.build.sourceEncoding>${encoding}</project.build.sourceEncoding>
5050
<project.reporting.outputEncoding>${encoding}</project.reporting.outputEncoding>
5151

52-
<version.creedengo-rules-specifications>2.2.2</version.creedengo-rules-specifications>
52+
<version.creedengo-rules-specifications>main-SNAPSHOT</version.creedengo-rules-specifications>
5353
<version.sonarqube>9.14.0.375</version.sonarqube>
5454
<version.sonar-javascript>9.13.0.20537</version.sonar-javascript>
5555
<version.sonar-packaging>1.23.0.740</version.sonar-packaging>

sonar-plugin/src/main/java/org/greencodeinitiative/creedengo/javascript/CheckList.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ public static List<Class<? extends JavaScriptCheck>> getAllChecks() {
3737
AvoidAutoPlay.class,
3838
AvoidBrightnessOverride.class,
3939
AvoidCSSAnimations.class,
40-
<<<<<<< Updated upstream
41-
=======
4240
AvoidGettersAndSetters.class,
43-
>>>>>>> Stashed changes
4441
AvoidHighAccuracyGeolocation.class,
4542
AvoidKeepAwake.class,
4643
LimitDbQueryResult.class,

sonar-plugin/src/main/resources/org/greencodeinitiative/creedengo/profiles/javascript_profile.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
{
22
"name": "Creedengo",
33
"ruleKeys": [
4-
<<<<<<< Updated upstream
5-
=======
64
"GCI7",
7-
>>>>>>> Stashed changes
85
"GCI9",
96
"GCI11",
107
"GCI12",

test-project/.yarnrc.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
nodeLinker: node-modules
22

3+
httpProxy: "http://vip-users.proxy.edf.fr:3131"
4+
httpsProxy: "http://vip-users.proxy.edf.fr:3131"
5+
36
yarnPath: .yarn/releases/yarn-4.9.1.cjs

test-project/yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ __metadata:
1414

1515
"@creedengo/eslint-plugin@file:../eslint-plugin::locator=creedengo-javascript-test-project%40workspace%3A.":
1616
version: 2.1.0
17-
resolution: "@creedengo/eslint-plugin@file:../eslint-plugin#../eslint-plugin::hash=af861c&locator=creedengo-javascript-test-project%40workspace%3A."
17+
resolution: "@creedengo/eslint-plugin@file:../eslint-plugin#../eslint-plugin::hash=c14324&locator=creedengo-javascript-test-project%40workspace%3A."
1818
peerDependencies:
1919
eslint: ">= 7 < 10"
20-
checksum: 10c0/64fa2595a6d49b62975f706677898013c257500f8b2a06f0e66b2885f9f24143340efb6ad6b916012772c362d94536c61cdd708802124f96745936dde66a1807
20+
checksum: 10c0/4bae7aa53eab732d7ab3778c682dab3e0c1bd49303adcae17c1b38355e8a72bd9b6952b6a700545fc246b7fb07011cefb25785aede583e8a7aef1b24d5fb3665
2121
languageName: node
2222
linkType: hard
2323

0 commit comments

Comments
 (0)