From 4f33f082a904238252118a26557f7788dc3de3d9 Mon Sep 17 00:00:00 2001 From: Hannes Stiebitzhofer Date: Sun, 4 Oct 2026 20:15:08 +0200 Subject: [PATCH 1/2] =?UTF-8?q?feat(forestry-source):=20MultiPolygon,=20ri?= =?UTF-8?q?ng=20=E2=89=A5=204=20positions=20and=20Point=20=E2=87=92=20Area?= =?UTF-8?q?=20=E2=89=A4=204=20ha=20in=20v1.1.0=20(#336,=20#327)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apply the EUDR Information System geometry rules to ForestrySource v1.1.0 in place: add a MultiPolygon definition (feature geometry and GeometryCollection member), require at least 4 positions per linear ring, and require properties.Area between 0.0001 and 4 ha on a Feature whose geometry is a Point. ProducerCountry stays optional for backwards compatibility. Extract the geometry definitions to test/shared/forestry-geometry-block.json and assert the schema matches it, so the EU-minimum families can share the block. Add jest and networknt boundary tests. Adjust five fixtures whose Point features TRACES would reject: small plots get an Area within the limit (DMP_01/09, PDFs regenerated), 29.3 ha Points become closed Polygons (DMP_02/03), the 450 ha Point becomes the MultiPolygon case (DMP_08) and DMP_06 gains a MultiPolygon inside a GeometryCollection; those four render text-identical PDFs, baselines unchanged. Resolves #336. Resolves #327. Co-Authored-By: Claude Fable 5.1 --- schemas/ForestrySource/v1.1.0/README.md | 10 + schemas/ForestrySource/v1.1.0/schema.json | 64 +++++- .../ForestrySourceV110SchemaTest.java | 42 ++++ .../v1.1.0/valid_forestry_source_DMP_01.json | 3 +- .../v1.1.0/valid_forestry_source_DMP_01.pdf | Bin 33134 -> 33168 bytes .../v1.1.0/valid_forestry_source_DMP_02.json | 12 +- .../v1.1.0/valid_forestry_source_DMP_03.json | 12 +- .../v1.1.0/valid_forestry_source_DMP_06.json | 23 ++ .../v1.1.0/valid_forestry_source_DMP_08.json | 23 +- .../v1.1.0/valid_forestry_source_DMP_09.json | 3 +- .../v1.1.0/valid_forestry_source_DMP_09.pdf | Bin 33531 -> 33586 bytes test/forestry-source-v1.1.spec.js | 118 ++++++++++ test/shared/forestry-geometry-block.json | 209 ++++++++++++++++++ 13 files changed, 509 insertions(+), 10 deletions(-) create mode 100644 test/shared/forestry-geometry-block.json diff --git a/schemas/ForestrySource/v1.1.0/README.md b/schemas/ForestrySource/v1.1.0/README.md index baa5ffd..8a13ab0 100644 --- a/schemas/ForestrySource/v1.1.0/README.md +++ b/schemas/ForestrySource/v1.1.0/README.md @@ -13,6 +13,16 @@ Normative reference: _EUDR Information System — Operator API Reference_, DG EN The API describes the percentage as an estimate or deviation, so rendering uses neutral wording and does not add an automatic `±` sign. +## Geometry (harvest units) + +Normative reference for this section: the EUDR Information System's _GeoJSON description_ and _validation rules_ (Operator API Reference v1.2). Applied in place in v1.1.0 (material-identity/schemas#327, #336): + +- `Feature.geometry` accepts `Point`, `Polygon`, `MultiPolygon` and `GeometryCollection`; `MultiPolygon` is also accepted as a `GeometryCollection` member. GIS exports of tenures and cutting permits routinely produce `MultiPolygon`. +- Every linear ring has at least 4 positions (RFC 7946 §3.1.6). Ring closure (first position equal to the last) is required by RFC 7946 and by TRACES but cannot be expressed in JSON Schema; it is not enforced here. +- A `Point` is accepted by TRACES only for plots of at most 4 ha. A `Feature` whose geometry is a `Point` therefore requires `properties.Area` in hectares, between 0.0001 and 4. Larger plots are described as `Polygon` or `MultiPolygon`. The rule applies to the feature's own geometry, not to points inside a `GeometryCollection`. +- `properties.ProducerCountry` stays optional in v1.1.0 for backwards compatibility with published certificates. The EUDR Information System requires it per feature on upload, and the EU-minimum families (ForestrySourceEU, ForestryOutputEU) require it in the schema; the platform UI enforces it for v1.1.0. +- The geometry definitions (`Coordinates`, `PolygonCoordinates`, `Point`, `Polygon`, `MultiPolygon`, `GeometryCollection`, `Feature`, `Location`) are one shared block. `test/shared/forestry-geometry-block.json` holds the canonical text and `test/forestry-source-v1.1.spec.js` asserts that this schema matches it; the EU families join that assertion when they are published. + Regenerate the reference PDFs with: ```sh diff --git a/schemas/ForestrySource/v1.1.0/schema.json b/schemas/ForestrySource/v1.1.0/schema.json index 09ddfa0..166c5b5 100644 --- a/schemas/ForestrySource/v1.1.0/schema.json +++ b/schemas/ForestrySource/v1.1.0/schema.json @@ -302,12 +302,13 @@ }, "PolygonCoordinates": { "type": "array", + "description": "Array of linear rings (RFC 7946 §3.1.6): the first ring is the exterior boundary, any further rings are holes. Each ring has at least 4 positions and must be closed (first position equal to the last); closure is not enforced by this schema.", "items": { "type": "array", "items": { "$ref": "#/definitions/Coordinates" }, - "minItems": 3 + "minItems": 4 }, "minItems": 1 }, @@ -338,6 +339,26 @@ }, "required": ["type", "coordinates"] }, + "MultiPolygon": { + "type": "object", + "description": "A MultiPolygon geometry (RFC 7946 §3.1.7): one plot made of several polygons, as GIS exports of tenures and cutting permits commonly produce.", + "properties": { + "type": { + "type": "string", + "enum": ["MultiPolygon"] + }, + "coordinates": { + "type": "array", + "description": "One PolygonCoordinates entry per member polygon.", + "items": { + "$ref": "#/definitions/PolygonCoordinates" + }, + "minItems": 1 + } + }, + "required": ["type", "coordinates"], + "additionalProperties": false + }, "GeometryCollection": { "type": "object", "description": "A collection of geometry objects", @@ -355,6 +376,9 @@ }, { "$ref": "#/definitions/Polygon" + }, + { + "$ref": "#/definitions/MultiPolygon" } ] }, @@ -386,6 +410,7 @@ }, "Area": { "type": "number", + "description": "Plot area in hectares. Required when the geometry is a Point: the EUDR Information System accepts a Point only for plots of at most 4 ha (minimum 0.0001 ha); larger plots must be described by a Polygon or MultiPolygon.", "minimum": 0 }, "Name": { @@ -401,13 +426,48 @@ { "$ref": "#/definitions/Polygon" }, + { + "$ref": "#/definitions/MultiPolygon" + }, { "$ref": "#/definitions/GeometryCollection" } ] } }, - "required": ["type", "geometry"] + "required": ["type", "geometry"], + "if": { + "type": "object", + "properties": { + "geometry": { + "type": "object", + "properties": { + "type": { + "const": "Point" + } + }, + "required": ["type"] + } + }, + "required": ["geometry"] + }, + "then": { + "type": "object", + "properties": { + "properties": { + "type": "object", + "properties": { + "Area": { + "type": "number", + "minimum": 0.0001, + "maximum": 4 + } + }, + "required": ["Area"] + } + }, + "required": ["properties"] + } }, "Location": { "type": "object", diff --git a/src/test/java/com/materialidentity/schemaservice/ForestrySourceV110SchemaTest.java b/src/test/java/com/materialidentity/schemaservice/ForestrySourceV110SchemaTest.java index 56a34b2..e135eab 100644 --- a/src/test/java/com/materialidentity/schemaservice/ForestrySourceV110SchemaTest.java +++ b/src/test/java/com/materialidentity/schemaservice/ForestrySourceV110SchemaTest.java @@ -78,6 +78,48 @@ void requiresAtLeastOneMeasurement() throws Exception { assertInvalid(withMeasurements("{}")); } + private static final String RING = + "[[10.0,50.0],[10.02,50.0],[10.02,50.02],[10.0,50.02],[10.0,50.0]]"; + + @Test + void acceptsMultiPolygonAsFeatureGeometryAndAsCollectionMember() throws Exception { + assertValid(withFeature("{\"type\":\"MultiPolygon\",\"coordinates\":[[" + RING + "],[" + RING + "]]}", + "{\"Name\":\"Plot\"}")); + assertValid(withFeature( + "{\"type\":\"GeometryCollection\",\"geometries\":[{\"type\":\"Point\",\"coordinates\":[10.0,50.0]}," + + "{\"type\":\"MultiPolygon\",\"coordinates\":[[" + RING + "]]}]}", + "{\"Name\":\"Plot\"}")); + assertInvalid(withFeature("{\"type\":\"MultiPolygon\",\"coordinates\":[]}", "{\"Name\":\"Plot\"}")); + } + + @Test + void requiresAtLeastFourPositionsPerRing() throws Exception { + String threePositions = "[[10.0,50.0],[10.02,50.0],[10.0,50.0]]"; + assertInvalid(withFeature("{\"type\":\"Polygon\",\"coordinates\":[" + threePositions + "]}", + "{\"Name\":\"Plot\"}")); + assertInvalid(withFeature("{\"type\":\"MultiPolygon\",\"coordinates\":[[" + threePositions + "]]}", + "{\"Name\":\"Plot\"}")); + } + + @Test + void requiresAreaOfAtMostFourHectaresForPointPlots() throws Exception { + String point = "{\"type\":\"Point\",\"coordinates\":[10.0,50.0]}"; + assertValid(withFeature(point, "{\"Name\":\"Plot\",\"Area\":3.5}")); + assertValid(withFeature(point, "{\"Name\":\"Plot\",\"Area\":4}")); + assertInvalid(withFeature(point, "{\"Name\":\"Plot\"}")); + assertInvalid(withFeature(point, "{\"Name\":\"Plot\",\"Area\":0}")); + assertInvalid(withFeature(point, "{\"Name\":\"Plot\",\"Area\":4.5}")); + assertValid(withFeature("{\"type\":\"Polygon\",\"coordinates\":[" + RING + "]}", "{\"Name\":\"Plot\"}")); + } + + private static JsonNode withFeature(String geometryJson, String propertiesJson) throws Exception { + JsonNode certificate = baseCertificate.deepCopy(); + ObjectNode feature = (ObjectNode) certificate.at("/DigitalMaterialPassport/HarvestUnits/0/features/0"); + feature.set("geometry", OBJECT_MAPPER.readTree(geometryJson)); + feature.set("properties", OBJECT_MAPPER.readTree(propertiesJson)); + return certificate; + } + private static JsonNode withMeasurements(String measurementsJson) throws Exception { JsonNode certificate = baseCertificate.deepCopy(); ObjectNode species = (ObjectNode) certificate.at("/DigitalMaterialPassport/Products/0/ListOfSpecies/0"); diff --git a/test/fixtures/ForestrySource/v1.1.0/valid_forestry_source_DMP_01.json b/test/fixtures/ForestrySource/v1.1.0/valid_forestry_source_DMP_01.json index e04582c..ceea645 100644 --- a/test/fixtures/ForestrySource/v1.1.0/valid_forestry_source_DMP_01.json +++ b/test/fixtures/ForestrySource/v1.1.0/valid_forestry_source_DMP_01.json @@ -23,7 +23,8 @@ { "type": "Feature", "properties": { - "Name": "Harvest Unit 1" + "Name": "Harvest Unit 1", + "Area": 3.5 }, "geometry": { "type": "Point", diff --git a/test/fixtures/ForestrySource/v1.1.0/valid_forestry_source_DMP_01.pdf b/test/fixtures/ForestrySource/v1.1.0/valid_forestry_source_DMP_01.pdf index 2e2cb59b64239f6687e0befa2ca09cfd905a3b70..b308b18944eb51c85f978287f64de2de86f7de9b 100644 GIT binary patch delta 7975 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 delta 7983 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 diff --git a/test/forestry-source-v1.1.spec.js b/test/forestry-source-v1.1.spec.js index 2250538..287bd11 100644 --- a/test/forestry-source-v1.1.spec.js +++ b/test/forestry-source-v1.1.spec.js @@ -155,6 +155,124 @@ describe('ForestrySource v1.1.0 supplementary quantities', () => { ); }); +describe('ForestrySource v1.1.0 harvest-unit geometry', () => { + const geometryBlock = require('./shared/forestry-geometry-block.json'); + const square = (lon, lat, half) => [ + [lon - half, lat - half], + [lon + half, lat - half], + [lon + half, lat + half], + [lon - half, lat + half], + [lon - half, lat - half], + ]; + + function certificateWithFeature(geometry, properties = { Name: 'Plot' }) { + const certificate = structuredClone(baseCertificate); + certificate.DigitalMaterialPassport.HarvestUnits = [ + { + type: 'FeatureCollection', + features: [{ type: 'Feature', properties, geometry }], + }, + ]; + return certificate; + } + + test('matches the shared geometry block definition for definition', () => { + Object.entries(geometryBlock).forEach(([name, definition]) => { + expect(schema.definitions[name]).toEqual(definition); + }); + }); + + test('accepts a MultiPolygon feature', () => { + expectValidation( + certificateWithFeature({ + type: 'MultiPolygon', + coordinates: [[square(10, 50, 0.01)], [square(10.05, 50, 0.01)]], + }), + true + ); + }); + + test('accepts a MultiPolygon inside a GeometryCollection', () => { + expectValidation( + certificateWithFeature({ + type: 'GeometryCollection', + geometries: [ + { type: 'Point', coordinates: [10, 50] }, + { type: 'MultiPolygon', coordinates: [[square(10, 50, 0.01)]] }, + ], + }), + true + ); + }); + + test('rejects a MultiPolygon with empty coordinates', () => { + expectValidation( + certificateWithFeature({ type: 'MultiPolygon', coordinates: [] }), + false + ); + }); + + test.each(['Polygon', 'MultiPolygon'])( + 'rejects a %s ring with only 3 positions', + (type) => { + const ring = square(10, 50, 0.01).slice(0, 3); + const coordinates = type === 'Polygon' ? [ring] : [[ring]]; + expectValidation(certificateWithFeature({ type, coordinates }), false); + } + ); + + test.each([0.0001, 3.5, 4])( + 'accepts a Point plot with Area %s ha', + (Area) => { + expectValidation( + certificateWithFeature( + { type: 'Point', coordinates: [10, 50] }, + { Name: 'Small plot', Area } + ), + true + ); + } + ); + + test('rejects a Point plot without Area', () => { + expectValidation( + certificateWithFeature({ type: 'Point', coordinates: [10, 50] }), + false + ); + }); + + test.each([0, 4.0001, 29.3])( + 'rejects a Point plot with Area %s ha', + (Area) => { + expectValidation( + certificateWithFeature( + { type: 'Point', coordinates: [10, 50] }, + { Name: 'Too large for a point', Area } + ), + false + ); + } + ); + + test('does not require Area for a Polygon', () => { + expectValidation( + certificateWithFeature({ + type: 'Polygon', + coordinates: [square(10, 50, 0.01)], + }), + true + ); + }); + + test('keeps ProducerCountry optional', () => { + const certificate = certificateWithFeature( + { type: 'Polygon', coordinates: [square(10, 50, 0.01)] }, + { Name: 'No producer country' } + ); + expectValidation(certificate, true); + }); +}); + describe('ForestrySource v1.1.0 scientific-name components', () => { test('accepts a 200-character serialized boundary without a 100/100 split', () => { const atLimit = structuredClone(baseCertificate); diff --git a/test/shared/forestry-geometry-block.json b/test/shared/forestry-geometry-block.json new file mode 100644 index 0000000..118012f --- /dev/null +++ b/test/shared/forestry-geometry-block.json @@ -0,0 +1,209 @@ +{ + "Coordinates": { + "type": "array", + "items": [ + { + "type": "number", + "minimum": -180, + "maximum": 180, + "description": "Longitude" + }, + { + "type": "number", + "minimum": -90, + "maximum": 90, + "description": "Latitude" + } + ], + "minItems": 2, + "maxItems": 2, + "additionalItems": false + }, + "PolygonCoordinates": { + "type": "array", + "description": "Array of linear rings (RFC 7946 §3.1.6): the first ring is the exterior boundary, any further rings are holes. Each ring has at least 4 positions and must be closed (first position equal to the last); closure is not enforced by this schema.", + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/Coordinates" + }, + "minItems": 4 + }, + "minItems": 1 + }, + "Point": { + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": ["Point"] + }, + "coordinates": { + "$ref": "#/definitions/Coordinates" + } + }, + "required": ["type", "coordinates"], + "additionalProperties": false + }, + "Polygon": { + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": ["Polygon"] + }, + "coordinates": { + "$ref": "#/definitions/PolygonCoordinates" + } + }, + "required": ["type", "coordinates"] + }, + "MultiPolygon": { + "type": "object", + "description": "A MultiPolygon geometry (RFC 7946 §3.1.7): one plot made of several polygons, as GIS exports of tenures and cutting permits commonly produce.", + "properties": { + "type": { + "type": "string", + "enum": ["MultiPolygon"] + }, + "coordinates": { + "type": "array", + "description": "One PolygonCoordinates entry per member polygon.", + "items": { + "$ref": "#/definitions/PolygonCoordinates" + }, + "minItems": 1 + } + }, + "required": ["type", "coordinates"], + "additionalProperties": false + }, + "GeometryCollection": { + "type": "object", + "description": "A collection of geometry objects", + "properties": { + "type": { + "type": "string", + "enum": ["GeometryCollection"] + }, + "geometries": { + "type": "array", + "items": { + "oneOf": [ + { + "$ref": "#/definitions/Point" + }, + { + "$ref": "#/definitions/Polygon" + }, + { + "$ref": "#/definitions/MultiPolygon" + } + ] + }, + "minItems": 1 + } + }, + "required": ["type", "geometries"] + }, + "Feature": { + "type": "object", + "properties": { + "type": { + "type": "string", + "enum": ["Feature"] + }, + "properties": { + "type": "object", + "properties": { + "ProducerName": { + "type": "string" + }, + "ProducerCountry": { + "type": "string", + "minLength": 2, + "maxLength": 2 + }, + "ProductionPlace": { + "type": "string" + }, + "Area": { + "type": "number", + "description": "Plot area in hectares. Required when the geometry is a Point: the EUDR Information System accepts a Point only for plots of at most 4 ha (minimum 0.0001 ha); larger plots must be described by a Polygon or MultiPolygon.", + "minimum": 0 + }, + "Name": { + "type": "string" + } + } + }, + "geometry": { + "oneOf": [ + { + "$ref": "#/definitions/Point" + }, + { + "$ref": "#/definitions/Polygon" + }, + { + "$ref": "#/definitions/MultiPolygon" + }, + { + "$ref": "#/definitions/GeometryCollection" + } + ] + } + }, + "required": ["type", "geometry"], + "if": { + "type": "object", + "properties": { + "geometry": { + "type": "object", + "properties": { + "type": { + "const": "Point" + } + }, + "required": ["type"] + } + }, + "required": ["geometry"] + }, + "then": { + "type": "object", + "properties": { + "properties": { + "type": "object", + "properties": { + "Area": { + "type": "number", + "minimum": 0.0001, + "maximum": 4 + } + }, + "required": ["Area"] + } + }, + "required": ["properties"] + } + }, + "Location": { + "type": "object", + "description": "A harvesting location defined using GeoJSON FeatureCollection", + "properties": { + "type": { + "type": "string", + "enum": ["FeatureCollection"] + }, + "features": { + "type": "array", + "items": { + "$ref": "#/definitions/Feature" + }, + "minItems": 1 + } + }, + "required": ["type", "features"] + } +} From 8fb4b1c6866bd9f13e2d7bb973b1ef6844f4967f Mon Sep 17 00:00:00 2001 From: Hannes Stiebitzhofer Date: Tue, 6 Oct 2026 11:55:43 +0200 Subject: [PATCH 2/2] fix(deps): postcss-selector-parser 7.1.6; accept source-map-js advisory until 1.2.2 clears the release-age window MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The weekly Grype DB of 2026-10-06 flags two packages in ui/package-lock.json on every branch, main included: - postcss-selector-parser 6.1.4 (GHSA-rj75-hqrm-r3gf, Medium): quadratic selector parsing. Pinned to 7.1.6 via npm overrides; tailwindcss 3.4.3 and postcss-nested asked for ^6 but build identically against 7.1.6 — the Angular build output is byte-identical before and after. - source-map-js 1.2.1 (GHSA-68fv-2mgg-jv7q, High): event-loop DoS on untrusted source maps. The fix, 1.2.2, was published 2026-09-30 and the repo's .npmrc (min-release-age=7) quarantines it until 2026-10-07. Reached only through postcss/sass inside the Angular CLI build, never deployed; accepted in .grype.yaml until the window clears, bump tracked in #348. Co-Authored-By: Claude Fable 5.1 --- .grype.yaml | 8 ++++++++ ui/package-lock.json | 33 +++------------------------------ ui/package.json | 3 ++- 3 files changed, 13 insertions(+), 31 deletions(-) diff --git a/.grype.yaml b/.grype.yaml index d0b36ed..b953c58 100644 --- a/.grype.yaml +++ b/.grype.yaml @@ -60,6 +60,14 @@ ignore: # Remove this entry as soon as a patched braces is published and picked up by the lockfiles. - vulnerability: GHSA-vfj7-8cjw-p6xm + # source-map-js 1.2.1 (GHSA-68fv-2mgg-jv7q, High, published 2026-09-18): event-loop DoS through + # indexed source-map section offsets in untrusted source maps. Reached only through postcss and + # sass inside the Angular CLI build (ui/), which parses our own sources at build time; nothing of + # it is deployed. The fix, 1.2.2, exists (published 2026-09-30) but the repo's .npmrc + # (min-release-age=7) quarantines it until 2026-10-07. Accepted until then — bump and remove this + # entry per #348. + - vulnerability: GHSA-68fv-2mgg-jv7q + # Registry configuration (if needed for private registries) # registry: # auth: diff --git a/ui/package-lock.json b/ui/package-lock.json index bffff5e..7c29dbf 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -11245,24 +11245,10 @@ "postcss": "^8.2.14" } }, - "node_modules/postcss-nested/node_modules/postcss-selector-parser": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.4.tgz", - "integrity": "sha512-bIoJLOmjCO1S9XdY/DcnR5hJxvrDir1PbGChrzXG3vw0/FOliy/fA3dmdhQ441kah4gKv+TwckGzex6wNS5cnQ==", - "license": "MIT", - "dependencies": { - "cssesc": "^3.0.0", - "util-deprecate": "^1.0.2" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/postcss-selector-parser": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.4.tgz", - "integrity": "sha512-HeP7D2wyhkR+XaK6v4W8oRF62Dsz4flyuczALJp61GckGm42u1saSSJ/0auvcBqxs3jMRFEcPK34At/0JBKdOg==", - "dev": true, + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.6.tgz", + "integrity": "sha512-7qASPzhKF2l2KLboRZux8CCTRMdGiV08vWmyKzPz22qZ7ZjQBOeY7rNzNoCLSUiftJ7HUq0GERHmxw/t0dCdMw==", "license": "MIT", "dependencies": { "cssesc": "^3.0.0", @@ -12794,19 +12780,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/tailwindcss/node_modules/postcss-selector-parser": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.4.tgz", - "integrity": "sha512-bIoJLOmjCO1S9XdY/DcnR5hJxvrDir1PbGChrzXG3vw0/FOliy/fA3dmdhQ441kah4gKv+TwckGzex6wNS5cnQ==", - "license": "MIT", - "dependencies": { - "cssesc": "^3.0.0", - "util-deprecate": "^1.0.2" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/tailwindcss/node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", diff --git a/ui/package.json b/ui/package.json index 926cc89..dd28876 100644 --- a/ui/package.json +++ b/ui/package.json @@ -42,7 +42,8 @@ "immutable": "5.1.9", "body-parser": "1.20.6", "nanoid": "3.3.18", - "brace-expansion": "2.1.4" + "brace-expansion": "2.1.4", + "postcss-selector-parser": "7.1.6" }, "devDependencies": { "@angular-devkit/build-angular": "19.2.23",