build: Use prettier for javascript

Stop ignoring .js and .json files in prettier and fix existing issues.

The `prettier-plugin-multiline-arrays` plugin is used to split arrays
with multiple elements into one line per element.
This commit is contained in:
Ralph Hopman
2024-12-19 10:19:28 +01:00
committed by Adam Saghy
parent 2ec9ba81d6
commit f693318c2e
25 changed files with 7770 additions and 7608 deletions
-2
View File
@@ -1,6 +1,4 @@
/dist
/node_modules
**/.git
*.js
*.json
*.ts
+4
View File
@@ -1,4 +1,8 @@
{
"multilineArraysWrapThreshold": 1,
"plugins": [
"prettier-plugin-multiline-arrays"
],
"singleQuote": true,
"trailingComma": "none"
}
+27 -5
View File
@@ -1,8 +1,13 @@
{
"extends": ["stylelint-config-standard", "stylelint-config-recommended-scss"],
"extends": [
"stylelint-config-standard",
"stylelint-config-recommended-scss"
],
"rules": {
"font-family-name-quotes": "always-where-recommended",
"font-family-no-missing-generic-family-keyword": [true, { "ignoreFontFamilies": ["FontAwesome"] }],
"font-family-no-missing-generic-family-keyword": [
true,
{ "ignoreFontFamilies": ["FontAwesome"] }],
"function-url-quotes": [
"always",
{
@@ -16,7 +21,9 @@
"declaration-no-important": null,
"at-rule-no-vendor-prefix": true,
"at-rule-no-unknown": null,
"scss/at-rule-no-unknown": [true, { "ignoreAtRules": ["tailwind"] }],
"scss/at-rule-no-unknown": [
true,
{ "ignoreAtRules": ["tailwind"] }],
"media-feature-name-no-vendor-prefix": true,
"property-no-vendor-prefix": true,
"selector-no-vendor-prefix": true,
@@ -35,7 +42,12 @@
"selector-type-no-unknown": [
true,
{
"ignoreTypes": ["/^mat/", "/^mifosx/", "fa-icon", "ng-template"]
"ignoreTypes": [
"/^mat/",
"/^mifosx/",
"fa-icon",
"ng-template"
]
}
],
"selector-pseudo-element-no-unknown": [
@@ -44,6 +56,16 @@
"ignorePseudoElements": ["ng-deep"]
}
],
"unit-allowed-list": ["px", "%", "em", "rem", "vw", "vh", "deg", "s", "ms"]
"unit-allowed-list": [
"px",
"%",
"em",
"rem",
"vw",
"vh",
"deg",
"s",
"ms"
]
}
}
+1 -1
View File
@@ -9,7 +9,7 @@ exports.config = {
'./src/**/*.e2e-spec.ts'
],
capabilities: {
'browserName': process.env.PROTRACTOR_BROWSER || 'chrome'
browserName: process.env.PROTRACTOR_BROWSER || 'chrome'
},
// Only works with Chrome and Firefox
directConnect: true,
-1
View File
@@ -6,4 +6,3 @@
"types": ["cypress"]
}
}
+1 -1
View File
@@ -4,6 +4,6 @@ module.exports = {
ignorableDeepImportMatchers: [
/@ckeditor\//
]
},
}
}
};
+134
View File
@@ -92,6 +92,7 @@
"karma-junit-reporter": "1.2.0",
"lint-staged": "^15.2.10",
"prettier": "^3.3.3",
"prettier-plugin-multiline-arrays": "^3.0.6",
"protractor": "~7.0.0",
"puppeteer": "^15.3.2",
"stylelint": "^16.10.0",
@@ -959,6 +960,31 @@
"integrity": "sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg==",
"dev": true
},
"node_modules/@augment-vir/common": {
"version": "28.2.4",
"resolved": "https://registry.npmjs.org/@augment-vir/common/-/common-28.2.4.tgz",
"integrity": "sha512-5Ib0OX7YlxAuFrG+MAoTsz6RlKMcbdMdoNGcEEKH/ezc/ZKMy/IHZ9Z/ZcCHYopZ4ocGXzVY4KUOiJ8+CXXvTA==",
"dev": true,
"license": "MIT",
"dependencies": {
"browser-or-node": "^3.0.0",
"run-time-assertions": "^1.5.1",
"type-fest": "^4.20.1"
}
},
"node_modules/@augment-vir/common/node_modules/type-fest": {
"version": "4.29.0",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.29.0.tgz",
"integrity": "sha512-RPYt6dKyemXJe7I6oNstcH24myUGSReicxcHTvCLgzm4e0n8y05dGvcGB15/SoPRBmhlMthWQ9pvKyL81ko8nQ==",
"dev": true,
"license": "(MIT OR CC0-1.0)",
"engines": {
"node": ">=16"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/@babel/code-frame": {
"version": "7.24.2",
"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz",
@@ -6342,6 +6368,13 @@
"node": ">=8"
}
},
"node_modules/browser-or-node": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/browser-or-node/-/browser-or-node-3.0.0.tgz",
"integrity": "sha512-iczIdVJzGEYhP5DqQxYM9Hh7Ztpqqi+CXZpSmX8ALFs9ecXkQIeqRyM6TfxEfMVpwhl3dSuDvxdzzo9sUOIVBQ==",
"dev": true,
"license": "MIT"
},
"node_modules/browserslist": {
"version": "4.23.0",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
@@ -10164,6 +10197,13 @@
"node": ">= 0.8.0"
}
},
"node_modules/expect-type": {
"version": "0.15.0",
"resolved": "https://registry.npmjs.org/expect-type/-/expect-type-0.15.0.tgz",
"integrity": "sha512-yWnriYB4e8G54M5/fAFj7rCIBiKs1HAACaY13kCz6Ku0dezjS9aMcfcdVK2X8Tv2tEV1BPz/wKfQ7WA4S/d8aA==",
"dev": true,
"license": "Apache-2.0"
},
"node_modules/exponential-backoff": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
@@ -16848,6 +16888,20 @@
"url": "https://github.com/prettier/prettier?sponsor=1"
}
},
"node_modules/prettier-plugin-multiline-arrays": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/prettier-plugin-multiline-arrays/-/prettier-plugin-multiline-arrays-3.0.6.tgz",
"integrity": "sha512-FrWVa7MoDQo9b5XoLPrqIDClb0k+O8wOIsIr1DutRXhcerLY8PfIe/yYeTVD/vpRISkSXCBEYmj5Voe0wb5dEQ==",
"dev": true,
"license": "(MIT or CC0 1.0)",
"dependencies": {
"@augment-vir/common": "^28.1.0",
"proxy-vir": "^1.0.0"
},
"peerDependencies": {
"prettier": ">=3.0.0"
}
},
"node_modules/pretty-bytes": {
"version": "5.6.0",
"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
@@ -17218,6 +17272,48 @@
"integrity": "sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==",
"dev": true
},
"node_modules/proxy-vir": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/proxy-vir/-/proxy-vir-1.0.0.tgz",
"integrity": "sha512-WV1gkBxUOwLSz0Bn09tisIqLK7leAqtFm/474t3L0hQKJw7/gdrkGcWw0/OT1PhSy+TDS6swfq7Niuoq3XJhkQ==",
"dev": true,
"license": "(MIT or CC0 1.0)",
"dependencies": {
"@augment-vir/common": "^23.3.4"
}
},
"node_modules/proxy-vir/node_modules/@augment-vir/common": {
"version": "23.4.0",
"resolved": "https://registry.npmjs.org/@augment-vir/common/-/common-23.4.0.tgz",
"integrity": "sha512-QIrJ1doD00TNbOzeVrk9KgPTzRlIjayxERnhtbQjK/AFPj5yElcB03GbnGdQZPzws/R+5gfMM5cZiH7QyBP+Kg==",
"dev": true,
"license": "MIT",
"dependencies": {
"browser-or-node": "^2.1.1",
"run-time-assertions": "^1.0.0",
"type-fest": "^4.10.2"
}
},
"node_modules/proxy-vir/node_modules/browser-or-node": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/browser-or-node/-/browser-or-node-2.1.1.tgz",
"integrity": "sha512-8CVjaLJGuSKMVTxJ2DpBl5XnlNDiT4cQFeuCJJrvJmts9YrTZDizTX7PjC2s6W4x+MBGZeEY6dGMrF04/6Hgqg==",
"dev": true,
"license": "MIT"
},
"node_modules/proxy-vir/node_modules/type-fest": {
"version": "4.29.0",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.29.0.tgz",
"integrity": "sha512-RPYt6dKyemXJe7I6oNstcH24myUGSReicxcHTvCLgzm4e0n8y05dGvcGB15/SoPRBmhlMthWQ9pvKyL81ko8nQ==",
"dev": true,
"license": "(MIT OR CC0-1.0)",
"engines": {
"node": ">=16"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/prr": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -18106,6 +18202,44 @@
"queue-microtask": "^1.2.2"
}
},
"node_modules/run-time-assertions": {
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/run-time-assertions/-/run-time-assertions-1.5.2.tgz",
"integrity": "sha512-ccfwvjGuNU14cSSXLlmPRiqEgMfA7w3J2TViO79zMnzXGvE6FJ0dxnhIQGwe5r/vwySOJ4sqZksexo9wyAlA8g==",
"deprecated": "Use @augment-vir/assert instead.",
"dev": true,
"license": "(MIT or CC0 1.0)",
"dependencies": {
"@augment-vir/common": "^29.3.0",
"expect-type": "~0.15.0",
"type-fest": "^4.22.0"
}
},
"node_modules/run-time-assertions/node_modules/@augment-vir/common": {
"version": "29.3.0",
"resolved": "https://registry.npmjs.org/@augment-vir/common/-/common-29.3.0.tgz",
"integrity": "sha512-k3OX35/576thmGUzQUBcCKGarb7ONBfiu07+iV2vxmjl7VoB1rOB0vu8WqgB1ceJq2EMLDPXY18hHpJ9WeTHXQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"browser-or-node": "^3.0.0",
"run-time-assertions": "^1.5.1",
"type-fest": "^4.21.0"
}
},
"node_modules/run-time-assertions/node_modules/type-fest": {
"version": "4.29.0",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.29.0.tgz",
"integrity": "sha512-RPYt6dKyemXJe7I6oNstcH24myUGSReicxcHTvCLgzm4e0n8y05dGvcGB15/SoPRBmhlMthWQ9pvKyL81ko8nQ==",
"dev": true,
"license": "(MIT OR CC0-1.0)",
"engines": {
"node": ">=16"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/rw": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
+1
View File
@@ -112,6 +112,7 @@
"karma-junit-reporter": "1.2.0",
"lint-staged": "^15.2.10",
"prettier": "^3.3.3",
"prettier-plugin-multiline-arrays": "^3.0.6",
"protractor": "~7.0.0",
"puppeteer": "^15.3.2",
"stylelint": "^16.10.0",
+3 -1
View File
@@ -32,7 +32,9 @@ function setupForCorporateProxy(proxyConfig) {
if (proxyServer) {
console.log(`Using corporate proxy server: ${proxyServer}`);
agent = new HttpsProxyAgent(proxyServer);
proxyConfig.forEach(entry => { entry.agent = agent; });
proxyConfig.forEach((entry) => {
entry.agent = agent;
});
}
return proxyConfig;
+9 -10
View File
@@ -1,19 +1,19 @@
(function (window) {
window["env"] = window["env"] || {};
window['env'] = window['env'] || {};
// BackEnd Environment variables
window["env"]["fineractApiUrls"] = '$FINERACT_API_URLS';
window["env"]["fineractApiUrl"] = '$FINERACT_API_URL';
window['env']['fineractApiUrls'] = '$FINERACT_API_URLS';
window['env']['fineractApiUrl'] = '$FINERACT_API_URL';
window["env"]["apiProvider"] = '$FINERACT_API_PROVIDER';
window["env"]["apiVersion"] = '$FINERACT_API_VERSION';
window['env']['apiProvider'] = '$FINERACT_API_PROVIDER';
window['env']['apiVersion'] = '$FINERACT_API_VERSION';
window["env"]["fineractPlatformTenantId"] = '$FINERACT_PLATFORM_TENANT_IDENTIFIER';
window["env"]["fineractPlatformTenantIds"] = '$FINERACT_PLATFORM_TENANTS_IDENTIFIER';
window['env']['fineractPlatformTenantId'] = '$FINERACT_PLATFORM_TENANT_IDENTIFIER';
window['env']['fineractPlatformTenantIds'] = '$FINERACT_PLATFORM_TENANTS_IDENTIFIER';
// Language Environment variables
window["env"]["defaultLanguage"] = '$MIFOS_DEFAULT_LANGUAGE';
window["env"]["supportedLanguages"] = '$MIFOS_SUPPORTED_LANGUAGES';
window['env']['defaultLanguage'] = '$MIFOS_DEFAULT_LANGUAGE';
window['env']['supportedLanguages'] = '$MIFOS_SUPPORTED_LANGUAGES';
window['env']['preloadClients'] = '$MIFOS_PRELOAD_CLIENTS';
@@ -34,5 +34,4 @@
// Time in milliseconds for Session idle timeout, default 300000 seconds
window['env']['sessionIdleTimeout'] = '$MIFOS_SESSION_IDLE_TIMEOUT';
})(this);
+2 -1
View File
@@ -681,7 +681,8 @@
"Overdue/Due Fee/Int,Principal": "Vencido/Comisiones vencida/int, Capital",
"Due penalty, fee, interest, principal, In advance principal, penalty, fee, interest": "Penalización vencida, Comisiones, Intereses, Capital, Capital adelantado, Penalizaciones, Comisiones, Intereses",
"Due penalty, interest, principal, fee, In advance penalty, interest, principal, fee": "Penalización vencida, Intereses, Capital, Comisiones, Penalización por adelantado, Intereses, Capital, Comisiones",
"Principal": "Capital", "Repayment": "Reembolso",
"Principal": "Capital",
"Repayment": "Reembolso",
"Down payment": "Auto Pago",
"Charge refund": "Reembolso de cargo",
"Charge adjustment": "Ajuste de cargo",
+9 -10
View File
@@ -2,8 +2,8 @@
module.exports = {
mode: process.env.TAILWIND_MODE ? 'jit' : '',
content: [
"./src/app/**/*.{html,js}",
'./index.html',
'./src/app/**/*.{html,js}',
'./index.html'
],
theme: {
extends: {
@@ -12,15 +12,14 @@ module.exports = {
'fade-in-down': 'fade-in-down 0.3s ease-out',
'fade-out-down': 'fade-out-down 0.3s ease-out',
'fade-in-up': 'fade-in-up 0.3s ease-out',
'fade-out-up': 'fade-out-up 0.3s ease-out',
'fade-out-up': 'fade-out-up 0.3s ease-out'
},
boxShadow: {
custom: '0px 0px 50px 0px rgb(82 63 105 / 15%)',
},
},
custom: '0px 0px 50px 0px rgb(82 63 105 / 15%)'
}
}
},
plugins: [
require("@tailwindcss/forms")
],
}
require('@tailwindcss/forms')
]
};
+6 -3
View File
@@ -8,10 +8,11 @@ const gitInfo = gitDescribeSync({
dirtySemver: false
});
gitInfo.version = moment().format('YYMMDD');;
gitInfo.version = moment().format('YYMMDD');
const file = resolve(__dirname, '.', 'src', 'environments', '.env.ts');
writeFileSync(file,
writeFileSync(
file,
`// IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
/* tslint:disable */
export default {
@@ -22,6 +23,8 @@ export default {
'allow_switching_backend_instance': true
};
/* tslint:enable */
`, { encoding: 'utf-8' });
`,
{ encoding: 'utf-8' }
);
console.log(`Wrote version info ${gitInfo.raw} to ${relative(resolve(__dirname, '..'), file)}`);