Merge pull request #2483 from openMF/bugfix/fix-eslint

Fix ESLint version conflicts
This commit is contained in:
Jose Alberto Hernandez
2025-06-02 22:10:48 +02:00
committed by Adam Saghy
6 changed files with 728 additions and 1836 deletions
+3 -6
View File
@@ -28,14 +28,11 @@ jobs:
# issue link : https://github.com/actions/setup-node/issues/26
# lts/gallium node v19.7.0 (npm v9.5.0)
node-version: '22.9.0'
- name: Angular CLI install
run: npm install -g --silent @angular/cli@16.0.2
- name: Npm install
run: npm install
- name: Run CI
run: npm ci
- name: Run eslint
run: npx ng lint
run: npx eslint .
- name: Run stylelint
run: npx stylelint "src/**/*.scss"
+1 -3
View File
@@ -32,9 +32,7 @@ RUN npm cache clear --force
RUN npm config set fetch-retry-maxtimeout 120000
RUN npm config set registry $NPM_REGISTRY_URL --location=global
RUN npm install --location=global @angular/cli@16.0.2
RUN npm install
RUN npm ci
RUN sh -c "ng build --output-path=/dist $BUILD_ENVIRONMENT_OPTIONS"
+712 -1813
View File
File diff suppressed because it is too large Load Diff
+9 -11
View File
@@ -18,7 +18,7 @@
"start": "npm run env -s && ng serve --aot --proxy-config proxy.conf.js",
"serve:dev": "npm run env -s && ng serve --source-map",
"serve:sw": "npm run build -s && npx http-server ./dist -p 4200",
"lint": "ng lint && stylelint \"src/**/*.scss\" && prettier . --check && htmlhint \"src\" --config .htmlhintrc",
"lint": "eslint . && stylelint \"src/**/*.scss\" && prettier . --check && htmlhint \"src\" --config .htmlhintrc",
"test": "npm run env -s && ng test",
"test:ci": "npm run env -s && npm run lint -s && ng test --code-coverage --watch=false",
"e2e": "ng e2e",
@@ -51,21 +51,19 @@
"@fortawesome/free-solid-svg-icons": "6.2.1",
"@ngx-translate/core": "^16.0.4",
"@ngx-translate/http-loader": "^16.0.1",
"@swimlane/ngx-graph": "^8.0.2",
"@swimlane/ngx-graph": "^9.0.1",
"@tailwindcss/forms": "^0.5.4",
"chart.js": "3.0.0-alpha",
"d3": "^7.9.0",
"html2canvas": "^1.4.1",
"install": "^0.13.0",
"jspdf": "^3.0.1",
"jspdf-autotable": "^5.0.2",
"lodash": "4.17.21",
"moment": "^2.29.4",
"ng": "^0.0.0",
"ngx-mat-select-search": "^7.0.10",
"rxjs": "6.6.7",
"rxjs": "7.8.1",
"tslib": "^2.0.0",
"vkbeautify": "^0.99.2",
"vkbeautify": "^0.99.3",
"xlsx": "^0.18.5",
"zone.js": "0.13.3"
},
@@ -81,23 +79,23 @@
"@angular/language-service": "16.2.12",
"@biesbjerg/ngx-translate-extract": "^7.0.4",
"@cypress/schematic": "^2.5.2",
"@ngx-rocket/scripts": "3.0.3",
"@types/d3-dispatch": "^3.0.1",
"@types/d3-drag": "^3.0.1",
"@types/d3-shape": "^3.1.0",
"@types/d3-timer": "^3.0.0",
"@types/d3-scale": "^3.2.2",
"@types/jasmine": "3.3.13",
"@types/jasminewd2": "2.0.6",
"@types/lodash": "4.14.132",
"@types/node": "12.11.1",
"@types/node": "22.15.29",
"@types/vkbeautify": "^0.99.2",
"@typescript-eslint/eslint-plugin": "^7.2.0",
"@typescript-eslint/parser": "^7.2.0",
"@typescript-eslint/eslint-plugin": "^8.26.1",
"@typescript-eslint/parser": "^8.26.1",
"cypress": "^13.17.0",
"eslint": "^8.57.0",
"git-describe": "^4.1.1",
"htmlhint": "1.1.4",
"https-proxy-agent": "2.2.1",
"https-proxy-agent": "7.0.2",
"husky": "^9.1.7",
"jasmine-core": "^4.2.0",
"jasmine-spec-reporter": "~5.0.0",
@@ -70,7 +70,7 @@ export class WorkflowDiagramComponent implements OnInit {
nodeCounter++;
}
// trigger center
this.center$.next();
this.center$.next(undefined);
}
public getStyles(node: Node): any {
+2 -2
View File
@@ -2,8 +2,8 @@
/* tslint:disable */
export default {
'mifos_x': {
'version': '250529',
'hash': '45b747e1'
'version': '250602',
'hash': 'gc4f18fd7'
},
'allow_switching_backend_instance': true
};