diff --git a/api/package.json b/api/package.json index c04ea6da5..0296c32a3 100644 --- a/api/package.json +++ b/api/package.json @@ -31,7 +31,7 @@ "@apidevtools/swagger-cli": "^4.0.4", "@koa/cors": "^4.0.0", "@koa/router": "^12.0.0", - "@publicodes/rest-api": "^1.0.2", + "@publicodes/rest-api": "^1.0.3", "@sentry/node": "^7.70.0", "@sentry/utils": "^7.70.0", "got": "^13.0.0", @@ -43,7 +43,7 @@ "modele-social": "workspace:^", "nodemon": "^3.0.1", "piano-analytics-js": "^6.13.0", - "publicodes": "^1.0.2", + "publicodes": "^1.0.3", "rate-limiter-flexible": "^2.4.2", "swagger-ui-dist": "^5.7.2" }, diff --git a/exoneration-covid/package.json b/exoneration-covid/package.json index 51914e63d..765832c5b 100644 --- a/exoneration-covid/package.json +++ b/exoneration-covid/package.json @@ -21,7 +21,7 @@ "onchange": "^7.1.0" }, "peerDependencies": { - "publicodes": "^1.0.2" + "publicodes": "^1.0.3" }, "scripts": { "build": "node ../scripts/build-rules.js", diff --git a/modele-social/package.json b/modele-social/package.json index d0bff8f8e..8ae7c1c43 100644 --- a/modele-social/package.json +++ b/modele-social/package.json @@ -23,11 +23,11 @@ "onchange": "^7.1.0" }, "peerDependencies": { - "publicodes": "^1.0.2" + "publicodes": "^1.0.3" }, "scripts": { - "build": "node ../scripts/build-rules.js", - "start": "yarn run build && onchange 'règles/**/*.yaml' -- yarn run build", + "build": "node ../scripts/build-rules.js && echo 'ℹ️ Compilation effectuée'", + "start": "yarn run build && onchange 'règles/**/*.publicodes' -- yarn run build && echo 'ℹ️ Compilation effectuée'", "clean": "rimraf dist node_modules", "prepack": "yarn run build", "up": "yarn version --minor && echo \"ℹ N'oubliez pas de poussez le tag git\"", diff --git a/modele-social/règles/dirigeant/exonérations.publicodes b/modele-social/règles/dirigeant/exonérations.publicodes index c79d2f607..6e82ddf48 100644 --- a/modele-social/règles/dirigeant/exonérations.publicodes +++ b/modele-social/règles/dirigeant/exonérations.publicodes @@ -157,7 +157,7 @@ dirigeant . indépendant . cotisations et contributions . exonérations . pensio dirigeant . indépendant . cotisations et contributions . exonérations . ACRE: applicable si: dirigeant . exonérations . ACRE - valeur: oui + valeur: non références: 'L’Acre pour les indépendants: quel avantages ?': https://www.urssaf.fr/portail/home/independant/je-beneficie-dexonerations/accre/quels-avantages/travailleurs-independants-ne-rel.html diff --git a/package.json b/package.json index 3c90bb962..ef548c355 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-vitest": "^0.3.22", "prettier": "^3.0.3", - "publicodes": "^1.0.2", + "publicodes": "^1.0.3", "rimraf": "^5.0.1" }, "resolutions": { diff --git a/site/package.json b/site/package.json index c4adbffe1..2998cdd65 100644 --- a/site/package.json +++ b/site/package.json @@ -56,7 +56,7 @@ "@internationalized/number": "^3.2.1", "@juggle/resize-observer": "^3.4.0", "@leeoniya/ufuzzy": "^1.0.10", - "@publicodes/react-ui": "^1.0.2", + "@publicodes/react-ui": "^1.0.3", "@react-aria/accordion": "^3.0.0-alpha.17", "@react-pdf/renderer": "^3.1.12", "@sentry/integrations": "^7.70.0", @@ -71,7 +71,7 @@ "markdown-to-jsx": "^7.3.2", "modele-social": "workspace:^", "piano-analytics-js": "^6.13.0", - "publicodes": "^1.0.2", + "publicodes": "^1.0.3", "react": "^18.2.0", "react-aria": "^3.24.0", "react-day-picker": "^8.8.2", diff --git a/site/test/regressions/__snapshots__/indépendant.test.ts.snap b/site/test/regressions/__snapshots__/indépendant.test.ts.snap index c0563bf5f..65c7402a7 100644 --- a/site/test/regressions/__snapshots__/indépendant.test.ts.snap +++ b/site/test/regressions/__snapshots__/indépendant.test.ts.snap @@ -259,7 +259,7 @@ impôt . montant: 77265" `; exports[`calculate simulations-indépendant > cotisations forfaitaires début d'activité 1`] = ` -"dirigeant . indépendant . cotisations et contributions . début activité: NaN +"dirigeant . indépendant . cotisations et contributions . début activité: undefined dirigeant . indépendant . revenu professionnel: 35533 dirigeant . rémunération . cotisations: 15822 dirigeant . rémunération . net: 34178 @@ -343,7 +343,7 @@ Notifications affichées : entreprise . TVA . franchise de TVA . notification" `; exports[`calculate simulations-indépendant > exonération pension invalidité 3`] = ` -"dirigeant . indépendant . cotisations et contributions . début activité: NaN +"dirigeant . indépendant . cotisations et contributions . début activité: undefined dirigeant . indépendant . revenu professionnel: 9255 dirigeant . rémunération . cotisations: 1013 dirigeant . rémunération . net: 8987 diff --git a/yarn.lock b/yarn.lock index 0efb5cf68..fadde55d8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7587,22 +7587,22 @@ __metadata: languageName: node linkType: hard -"@publicodes/react-ui@npm:^1.0.2": - version: 1.0.2 - resolution: "@publicodes/react-ui@npm:1.0.2" +"@publicodes/react-ui@npm:^1.0.3": + version: 1.0.3 + resolution: "@publicodes/react-ui@npm:1.0.3" dependencies: styled-components: ^6.1.1 peerDependencies: publicodes: ^1.0.1 react: ^18 react-dom: ^18 - checksum: f074ec84dbd6e00c5242eee9f8a24dbfe0edbda06d3385b33339425403c31b274567627d92575f9b811b32ca89795b1a8213c473777be168fb031eaa7953e57a + checksum: bbec3725a6bc46d590a2721dd33ea9335e97b7f6e357d4c2315306d6a02fbbcfe1b23b913a9d7e0d624c79e7915f18dae2ccd55b953816010e63b51365bc15fa languageName: node linkType: hard -"@publicodes/rest-api@npm:^1.0.2": - version: 1.0.2 - resolution: "@publicodes/rest-api@npm:1.0.2" +"@publicodes/rest-api@npm:^1.0.3": + version: 1.0.3 + resolution: "@publicodes/rest-api@npm:1.0.3" dependencies: "@koa/cors": ^3.4.3 "@koa/router": ^10.1.1 @@ -7611,7 +7611,7 @@ __metadata: openapi-validator-middleware: ^3.2.6 peerDependencies: publicodes: ^1.0.1 - checksum: ebbdc78819f656456e85a74c3b7aa563c50d20310be47e1a91d5f3f08bea9e64776e401b875f7c6e26e056702bbc0d92e0311f96a7c4cf3a3cfc82e860ffd23c + checksum: 9ef531fee075b4ebe10200a4ddb6d3dd2e3d0915a473f02593062e2976027f0047168d98d1529783bdfbb936517e543fec1956e3fcbadea20b7dcf382a033fe5 languageName: node linkType: hard @@ -14015,7 +14015,7 @@ __metadata: "@apidevtools/swagger-cli": ^4.0.4 "@koa/cors": ^4.0.0 "@koa/router": ^12.0.0 - "@publicodes/rest-api": ^1.0.2 + "@publicodes/rest-api": ^1.0.3 "@sentry/node": ^7.70.0 "@sentry/utils": ^7.70.0 "@types/ioredis-mock": ^8.2.2 @@ -14035,7 +14035,7 @@ __metadata: modele-social: "workspace:^" nodemon: ^3.0.1 piano-analytics-js: ^6.13.0 - publicodes: ^1.0.2 + publicodes: ^1.0.3 rate-limiter-flexible: ^2.4.2 swagger-ui-dist: ^5.7.2 ts-node: ^10.9.1 @@ -19104,7 +19104,7 @@ __metadata: js-yaml: ^4.1.0 onchange: ^7.1.0 peerDependencies: - publicodes: ^1.0.2 + publicodes: ^1.0.3 languageName: unknown linkType: soft @@ -24627,7 +24627,7 @@ __metadata: js-yaml: ^4.1.0 onchange: ^7.1.0 peerDependencies: - publicodes: ^1.0.2 + publicodes: ^1.0.3 languageName: unknown linkType: soft @@ -26892,21 +26892,12 @@ __metadata: languageName: node linkType: hard -"publicodes@npm:^1.0.0-beta.77": - version: 1.0.0-rfc.2 - resolution: "publicodes@npm:1.0.0-rfc.2" +"publicodes@npm:^1.0.0-beta.77, publicodes@npm:^1.0.3": + version: 1.0.3 + resolution: "publicodes@npm:1.0.3" peerDependencies: "@types/mocha": ^9.0.0 - checksum: 67c677154b1942257cb329294ca52e94a0cb961bcc64ab4aa5c9530e14687cae066cab8a612c05b758a6d29f603aba7846094c01d12d520f87106ccc3e843fc4 - languageName: node - linkType: hard - -"publicodes@npm:^1.0.2": - version: 1.0.2 - resolution: "publicodes@npm:1.0.2" - peerDependencies: - "@types/mocha": ^9.0.0 - checksum: fbb27b1ad00c7f0d89acdc9a2b0c7fd5921a1fe89bbf653f89c4bb743414771c29dbe5ed94651c211918cb9177748fdb2377a0cf682df6c1a70f864d30e05f02 + checksum: c98becd43b8ce009688494b407587fee9382c207734dd6996ab327c9a0f0626cd8439480ec37fc38985d2ee01c769318029a13148e9a89e5b5b16ae5d6194dcc languageName: node linkType: hard @@ -28616,7 +28607,7 @@ __metadata: eslint-plugin-react-hooks: ^4.6.0 eslint-plugin-vitest: ^0.3.22 prettier: ^3.0.3 - publicodes: ^1.0.2 + publicodes: ^1.0.3 rimraf: ^5.0.1 languageName: unknown linkType: soft @@ -29192,7 +29183,7 @@ __metadata: "@internationalized/number": ^3.2.1 "@juggle/resize-observer": ^3.4.0 "@leeoniya/ufuzzy": ^1.0.10 - "@publicodes/react-ui": ^1.0.2 + "@publicodes/react-ui": ^1.0.3 "@react-aria/accordion": ^3.0.0-alpha.17 "@react-pdf/renderer": ^3.1.12 "@react-types/accordion": ^3.0.0-alpha.16 @@ -29243,7 +29234,7 @@ __metadata: modele-social: "workspace:^" netlify-cli: ^17.10.1 piano-analytics-js: ^6.13.0 - publicodes: ^1.0.2 + publicodes: ^1.0.3 react: ^18.2.0 react-aria: ^3.24.0 react-day-picker: ^8.8.2