diff --git a/dlrs/main/classes/RollupService.cls b/dlrs/main/classes/RollupService.cls index da3cc444..0445df35 100644 --- a/dlrs/main/classes/RollupService.cls +++ b/dlrs/main/classes/RollupService.cls @@ -1671,7 +1671,6 @@ global with sharing class RollupService { // Bypass duplicate rules - // dmlOptions.duplicateRuleHeader.duplicateRuleBypassFlow = true; try { // Perform the update operation with Dmloptions diff --git a/dlrs/main/lwc/jsconfig.json b/dlrs/main/lwc/jsconfig.json index 9bf90499..4dc763de 100644 --- a/dlrs/main/lwc/jsconfig.json +++ b/dlrs/main/lwc/jsconfig.json @@ -1,25 +1,10 @@ -{ - "compilerOptions": { - "experimentalDecorators": true, - "baseUrl": ".", - "paths": { - "c/*": [ - "*" - ] - } - }, - "include": [ - "**/*", - "../../../.sfdx/typings/lwc/**/*.d.ts" - ], - "paths": { - "c/*": [ - "*" - ] - }, - "typeAcquisition": { - "include": [ - "jest" - ] - } -} +"compilerOptions": { + "experimentalDecorators": true + }, + "include": ["**/*", "../../../.sfdx/typings/lwc/**/*.d.ts"], + "paths": { + "c/*": ["*"] + }, + "typeAcquisition": { + "include": ["jest"] + } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 53c47821..ec7a2848 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,8 +25,8 @@ "eslint-plugin-jest": "^24.7.0", "husky": "^6.0.0", "lint-staged": "^11.2.6", - "prettier": "2.8.8", - "prettier-plugin-apex": "1.13.0" + "prettier": "2.5.0", + "prettier-plugin-apex": "1.10.0" } }, "node_modules/@ampproject/remapping": { @@ -2828,15 +2828,13 @@ } }, "node_modules/axios": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", - "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", "dev": true, "license": "MIT", "dependencies": { - "follow-redirects": "^1.15.6", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" + "follow-redirects": "^1.14.0" } }, "node_modules/babel-jest": { @@ -8250,9 +8248,9 @@ } }, "node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.0.tgz", + "integrity": "sha512-FM/zAKgWTxj40rH03VxzIPdXmj39SwSjwG0heUcNFwI+EMZJnY93yAiKXM3dObIKAM5TA88werc8T/EwhB45eg==", "dev": true, "license": "MIT", "bin": { @@ -8260,46 +8258,44 @@ }, "engines": { "node": ">=10.13.0" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" } }, "node_modules/prettier-plugin-apex": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/prettier-plugin-apex/-/prettier-plugin-apex-1.13.0.tgz", - "integrity": "sha512-QeGHrNOR6EXoH0Mto385FDrRC+XSCc/8zvtqNvhEaFovEMC7InDp2Mn5WxjJzQUdgtUYoXL+NYcSm3nxMqsymQ==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/prettier-plugin-apex/-/prettier-plugin-apex-1.10.0.tgz", + "integrity": "sha512-Kh6kMNq5IfCxlP49wsZbt2Pq/dx4zbwbEdjUcP9GCmXfRLGuoa6mrT26kIv8TJnEjFCPVzUjg1u0qa3qBStLmQ==", "dev": true, "license": "MIT", "dependencies": { - "axios": "^1.0.0", - "jest-docblock": "^29.0.0", - "wait-on": "^7.0.0", + "axios": "^0.21.0", + "jest-docblock": "^27.0.1", + "wait-on": "^5.2.1", "yargs": "^17.0.0" }, "bin": { "apex-ast-serializer": "vendor/apex-ast-serializer/bin/apex-ast-serializer", "apex-ast-serializer-http": "vendor/apex-ast-serializer/bin/apex-ast-serializer-http", - "start-apex-server": "dist/bin/start-apex-server.js", - "stop-apex-server": "dist/bin/stop-apex-server.js" + "start-apex-server": "bin/start-apex-server.js", + "stop-apex-server": "bin/stop-apex-server.js" }, "engines": { - "node": ">= 14.0.0" + "node": ">= 12.0.0" }, "peerDependencies": { "prettier": "^2.0.0" } }, "node_modules/prettier-plugin-apex/node_modules/jest-docblock": { - "version": "29.2.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.2.0.tgz", - "integrity": "sha512-bkxUsxTgWQGbXV5IENmfiIuqZhJcyvF7tU4zJ/7ioTutdz4ToB5Yx6JOFBpgI+TphRY4lhOyCWGNH/QFQh5T6A==", + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz", + "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==", "dev": true, + "license": "MIT", "dependencies": { "detect-newline": "^3.0.0" }, "engines": { - "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, "node_modules/pretty-format": { @@ -8362,12 +8358,6 @@ "node": ">= 6" } }, - "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "dev": true - }, "node_modules/psl": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", @@ -9469,25 +9459,45 @@ } }, "node_modules/wait-on": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-7.2.0.tgz", - "integrity": "sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.3.0.tgz", + "integrity": "sha512-DwrHrnTK+/0QFaB9a8Ol5Lna3k7WvUR4jzSKmz0YaPBpuN2sACyiPVKVfj6ejnjcajAcvn3wlbTyMIn9AZouOg==", "dev": true, "license": "MIT", "dependencies": { - "axios": "^1.6.1", - "joi": "^17.11.0", + "axios": "^0.21.1", + "joi": "^17.3.0", "lodash": "^4.17.21", - "minimist": "^1.2.8", - "rxjs": "^7.8.1" + "minimist": "^1.2.5", + "rxjs": "^6.6.3" }, "bin": { "wait-on": "bin/wait-on" }, "engines": { - "node": ">=12.0.0" + "node": ">=8.9.0" } }, + "node_modules/wait-on/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/wait-on/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true, + "license": "0BSD" + }, "node_modules/walker": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", diff --git a/package.json b/package.json index 95b04ce0..cc43d233 100644 --- a/package.json +++ b/package.json @@ -30,8 +30,8 @@ "eslint-plugin-jest": "^24.7.0", "husky": "^6.0.0", "lint-staged": "^11.2.6", - "prettier": "2.8.8", - "prettier-plugin-apex": "1.13.0" + "prettier": "2.5.0", + "prettier-plugin-apex": "1.10.0" }, "resolutions": { "minimist": "^1.2.6",