File 0002-Fix-msagl-and-remove-esfx.patch of Package grafana.37536
Index: grafana-10.4.11/.drone.yml
===================================================================
--- grafana-10.4.11.orig/.drone.yml
+++ grafana-10.4.11/.drone.yml
@@ -115,7 +115,6 @@ steps:
image: alpine:3.20.3
name: identify-runner
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
@@ -217,7 +216,6 @@ steps:
image: alpine:3.20.3
name: identify-runner
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
@@ -530,7 +528,6 @@ steps:
image: golang:1.22.7-alpine
name: wire-install
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
@@ -1050,7 +1047,6 @@ steps:
image: alpine:3.20.3
name: identify-runner
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
@@ -1403,7 +1399,6 @@ steps:
image: alpine:3.20.3
name: identify-runner
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
@@ -1480,7 +1475,6 @@ steps:
image: alpine:3.20.3
name: identify-runner
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
@@ -1539,7 +1533,6 @@ steps:
image: alpine:3.20.3
name: identify-runner
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
@@ -1803,7 +1796,6 @@ steps:
image: golang:1.22.7-alpine
name: wire-install
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
@@ -2903,7 +2895,6 @@ steps:
image: golang:1.22.7-alpine
name: compile-build-cmd
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
@@ -3735,7 +3726,6 @@ steps:
image: alpine:3.20.3
name: identify-runner
- commands:
- - apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python
- yarn install --immutable
depends_on: []
image: node:20.9.0-alpine
Index: grafana-10.4.11/package.json
===================================================================
--- grafana-10.4.11.orig/package.json
+++ grafana-10.4.11/package.json
@@ -259,8 +259,8 @@
"@locker/near-membrane-dom": "0.13.6",
"@locker/near-membrane-shared": "0.13.6",
"@locker/near-membrane-shared-dom": "0.13.6",
- "@msagl/core": "^1.1.16",
- "@msagl/parser": "^1.1.16",
+ "@msagl/core": "^1.1.19",
+ "@msagl/parser": "^1.1.19",
"@opentelemetry/api": "1.7.0",
"@opentelemetry/exporter-collector": "0.25.0",
"@opentelemetry/semantic-conventions": "1.21.0",
Index: grafana-10.4.11/scripts/drone/steps/lib.star
===================================================================
--- grafana-10.4.11.orig/scripts/drone/steps/lib.star
+++ grafana-10.4.11/scripts/drone/steps/lib.star
@@ -35,8 +35,6 @@ def yarn_install_step():
"name": "yarn-install",
"image": images["node"],
"commands": [
- # Python is needed to build `esfx`, which is needed by `msagl`
- "apk add --update g++ make python3 && ln -sf /usr/bin/python3 /usr/bin/python",
"yarn install --immutable",
],
"depends_on": [],
Index: grafana-10.4.11/yarn.lock
===================================================================
--- grafana-10.4.11.orig/yarn.lock
+++ grafana-10.4.11/yarn.lock
@@ -2932,98 +2932,6 @@ __metadata:
languageName: node
linkType: hard
-"@esfx/collection-core@npm:^1.0.0":
- version: 1.0.0
- resolution: "@esfx/collection-core@npm:1.0.0"
- checksum: 10/7e26d89953a201a6c965af18516e48ea0628ca2674c56c51368d61a3dc47b7d47b05984dc2392fecbbda4bb7134e735da0a01445818dd843a2b54e5b2010b4a2
- languageName: node
- linkType: hard
-
-"@esfx/collections-hashmap@npm:^1.0.2":
- version: 1.0.2
- resolution: "@esfx/collections-hashmap@npm:1.0.2"
- dependencies:
- "@esfx/collection-core": "npm:^1.0.0"
- "@esfx/equatable": "npm:^1.0.2"
- checksum: 10/caef6a231ad6bb9aee06cce1a5da4918c07868be9732c96cf268762d1e7cf06365409d59c2e4d47acd3ad81022a5e552f6c1b75660ecdb2eb68265b70f67749d
- languageName: node
- linkType: hard
-
-"@esfx/collections-hashset@npm:^1.0.2":
- version: 1.0.2
- resolution: "@esfx/collections-hashset@npm:1.0.2"
- dependencies:
- "@esfx/collection-core": "npm:^1.0.0"
- "@esfx/equatable": "npm:^1.0.2"
- checksum: 10/75250e1682f42af85ff5e6b837e02faf27977515f52551857fcb28854025bc02d019801f062b92eef25b1781d1686453cb18726fa1468ed1c41eabe517860a4f
- languageName: node
- linkType: hard
-
-"@esfx/collections-linkedlist@npm:^1.0.2":
- version: 1.0.2
- resolution: "@esfx/collections-linkedlist@npm:1.0.2"
- dependencies:
- "@esfx/collection-core": "npm:^1.0.0"
- "@esfx/equatable": "npm:^1.0.2"
- checksum: 10/ddaafab0d90a8588b4292639e194217dfa5403fe4e6acc375b235ba1736a69dd43893b507f9c4aaae04377d66b23a1da0bee063be578940a03124cf0a6372096
- languageName: node
- linkType: hard
-
-"@esfx/collections-multimap@npm:^1.0.2":
- version: 1.0.2
- resolution: "@esfx/collections-multimap@npm:1.0.2"
- dependencies:
- "@esfx/collection-core": "npm:^1.0.0"
- "@esfx/collections-hashmap": "npm:^1.0.2"
- "@esfx/collections-hashset": "npm:^1.0.2"
- "@esfx/equatable": "npm:^1.0.2"
- checksum: 10/ba6aebb8c737d9f6d9c6a06edd6904bf731c0e0eddc4aaa1fd67cf074f04441c368feee7a37af7dcab658602959d75002cc314283accf37dc1789c7a81d65914
- languageName: node
- linkType: hard
-
-"@esfx/collections-sortedmap@npm:^1.0.0, @esfx/collections-sortedmap@npm:^1.0.2":
- version: 1.0.2
- resolution: "@esfx/collections-sortedmap@npm:1.0.2"
- dependencies:
- "@esfx/collection-core": "npm:^1.0.0"
- "@esfx/equatable": "npm:^1.0.2"
- checksum: 10/428f752583b5fa78e57137952f4925ca8f54daa3816a34b699adcf2206e816f3771c0bf7cfcbeafcf36e4036df200ab90bd7e6d1067bc7dc04e1dcc10f24706a
- languageName: node
- linkType: hard
-
-"@esfx/collections-sortedset@npm:^1.0.2":
- version: 1.0.2
- resolution: "@esfx/collections-sortedset@npm:1.0.2"
- dependencies:
- "@esfx/collection-core": "npm:^1.0.0"
- "@esfx/equatable": "npm:^1.0.2"
- checksum: 10/3f0f1fac9a861bcad3965ffa23b9519b92b6aa54bd163e72a4220cc699a7a0f8fa120deb05152fdc3a2071bd543103fe0de74760e5ce3366e3b79874b2749b1d
- languageName: node
- linkType: hard
-
-"@esfx/collections@npm:^1.0.0":
- version: 1.0.2
- resolution: "@esfx/collections@npm:1.0.2"
- dependencies:
- "@esfx/collections-hashmap": "npm:^1.0.2"
- "@esfx/collections-hashset": "npm:^1.0.2"
- "@esfx/collections-linkedlist": "npm:^1.0.2"
- "@esfx/collections-multimap": "npm:^1.0.2"
- "@esfx/collections-sortedmap": "npm:^1.0.2"
- "@esfx/collections-sortedset": "npm:^1.0.2"
- checksum: 10/3f7f8d908e0e4c7ec31f48b5f52a44d3ba00fa74dc20aa2fdb811a69612ff477b2c96a288970a29073c8a7281d1cdda58614272dd1ce7d2a88305a5f98b33f9f
- languageName: node
- linkType: hard
-
-"@esfx/equatable@npm:^1.0.2":
- version: 1.0.2
- resolution: "@esfx/equatable@npm:1.0.2"
- dependencies:
- "@mapbox/node-pre-gyp": "npm:^1.0.9"
- checksum: 10/54e9de6092116699fb206676c5afd7b513e7b3e3fa03d08b8ee84a6f3b4d0057346606ceb2745f47cb1e73be28e77ca3fa403f1dcc66151a1f7a2e9cb48f7df3
- languageName: node
- linkType: hard
-
"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0":
version: 4.4.0
resolution: "@eslint-community/eslint-utils@npm:4.4.0"
@@ -5192,25 +5100,6 @@ __metadata:
languageName: node
linkType: hard
-"@mapbox/node-pre-gyp@npm:^1.0.9":
- version: 1.0.11
- resolution: "@mapbox/node-pre-gyp@npm:1.0.11"
- dependencies:
- detect-libc: "npm:^2.0.0"
- https-proxy-agent: "npm:^5.0.0"
- make-dir: "npm:^3.1.0"
- node-fetch: "npm:^2.6.7"
- nopt: "npm:^5.0.0"
- npmlog: "npm:^5.0.1"
- rimraf: "npm:^3.0.2"
- semver: "npm:^7.3.5"
- tar: "npm:^6.1.11"
- bin:
- node-pre-gyp: bin/node-pre-gyp
- checksum: 10/59529a2444e44fddb63057152452b00705aa58059079191126c79ac1388ae4565625afa84ed4dd1bf017d1111ab6e47907f7c5192e06d83c9496f2f3e708680a
- languageName: node
- linkType: hard
-
"@mapbox/point-geometry@npm:^0.1.0":
version: 0.1.0
resolution: "@mapbox/point-geometry@npm:0.1.0"
@@ -5270,39 +5159,38 @@ __metadata:
languageName: node
linkType: hard
-"@msagl/core@npm:^1.1.16, @msagl/core@npm:^1.1.17":
- version: 1.1.17
- resolution: "@msagl/core@npm:1.1.17"
+"@msagl/core@npm:^1.1.19":
+ version: 1.1.19
+ resolution: "@msagl/core@npm:1.1.19"
dependencies:
- "@esfx/collections": "npm:^1.0.0"
- "@esfx/collections-sortedmap": "npm:^1.0.0"
+ linked-list-typed: "npm:^1.52.0"
queue-typescript: "npm:^1.0.1"
reliable-random: "npm:^0.0.1"
stack-typescript: "npm:^1.0.4"
typescript-string-operations: "npm:^1.4.1"
- checksum: 10/6a0c83911d0802cf4372a9d976017117d9ecbec8e8bda8850fb58dec76558c0453290a51ad1c55b451ae70deeb3a57b1623bcbf7d054b3bfdacb9ea2a8190d5a
+ checksum: 10/33536bb2ea00215010078faab2211af8be7bcab9e6067f035bed043ae21196bce98364ed554b97552b4cb674ae6c7c65e7f426a4f8cff7b4353c6d23968f1688
languageName: node
linkType: hard
-"@msagl/drawing@npm:^1.1.17":
- version: 1.1.17
- resolution: "@msagl/drawing@npm:1.1.17"
+"@msagl/drawing@npm:^1.1.19":
+ version: 1.1.19
+ resolution: "@msagl/drawing@npm:1.1.19"
dependencies:
- "@msagl/core": "npm:^1.1.17"
- checksum: 10/7a3f38cf2cafeda292cbd7c3f78d55f39f11a5923c3675ecd5a51d362660461fca50b42e5c9aa58431ad34f650fff0443be99670947c6fcd6f07701057a08c52
+ "@msagl/core": "npm:^1.1.19"
+ checksum: 10/b8963ab6f8dd7943a10d950abe11030996e12cd74503c6d704678dce54c1fd0f5ee1570cc893027e24150e475294d09a4ae4ac3be8f9e9f8d7382d7b7c5303a9
languageName: node
linkType: hard
-"@msagl/parser@npm:^1.1.16":
- version: 1.1.17
- resolution: "@msagl/parser@npm:1.1.17"
+"@msagl/parser@npm:^1.1.19":
+ version: 1.1.19
+ resolution: "@msagl/parser@npm:1.1.19"
dependencies:
- "@msagl/core": "npm:^1.1.17"
- "@msagl/drawing": "npm:^1.1.17"
+ "@msagl/core": "npm:^1.1.19"
+ "@msagl/drawing": "npm:^1.1.19"
"@types/parse-color": "npm:^1.0.1"
dotparser: "npm:^1.1.1"
parse-color: "npm:^1.0.0"
- checksum: 10/eae9c0a02410177b9c8f73edcad3c9e4610a31a972b3c58a870fe1db7c75b857304a87b82e8b7f9d6afedf91be73969856626ebb0f3fdae0d47c4e62da805ca1
+ checksum: 10/349dcd57a3365628699b45172359363b86a1b27f8300b5b7fde97ba65eb512191a7433b72908a544fbbdc1d91bcaa9ca498faef345078367529820a47af38609
languageName: node
linkType: hard
@@ -11618,16 +11506,6 @@ __metadata:
languageName: node
linkType: hard
-"are-we-there-yet@npm:^2.0.0":
- version: 2.0.0
- resolution: "are-we-there-yet@npm:2.0.0"
- dependencies:
- delegates: "npm:^1.0.0"
- readable-stream: "npm:^3.6.0"
- checksum: 10/ea6f47d14fc33ae9cbea3e686eeca021d9d7b9db83a306010dd04ad5f2c8b7675291b127d3fcbfcbd8fec26e47b3324ad5b469a6cc3733a582f2fe4e12fc6756
- languageName: node
- linkType: hard
-
"are-we-there-yet@npm:^3.0.0":
version: 3.0.0
resolution: "are-we-there-yet@npm:3.0.0"
@@ -13383,7 +13261,7 @@ __metadata:
languageName: node
linkType: hard
-"color-support@npm:^1.1.2, color-support@npm:^1.1.3":
+"color-support@npm:^1.1.3":
version: 1.1.3
resolution: "color-support@npm:1.1.3"
bin:
@@ -14874,6 +14752,13 @@ __metadata:
languageName: node
linkType: hard
+"data-structure-typed@npm:^1.52.0":
+ version: 1.52.0
+ resolution: "data-structure-typed@npm:1.52.0"
+ checksum: 10/9adddcbd0aae44311e866ac093c353fe7f092c19216152329261ea85b5e5e33413ec0605d4766c2ed2939d0b5d1a41576f8c0d21c5c6fe407a7bbdd9b2b2f159
+ languageName: node
+ linkType: hard
+
"data-urls@npm:^3.0.2":
version: 3.0.2
resolution: "data-urls@npm:3.0.2"
@@ -15219,13 +15104,6 @@ __metadata:
languageName: node
linkType: hard
-"detect-libc@npm:^2.0.0":
- version: 2.0.2
- resolution: "detect-libc@npm:2.0.2"
- checksum: 10/6118f30c0c425b1e56b9d2609f29bec50d35a6af0b762b6ad127271478f3bbfda7319ce869230cf1a351f2b219f39332cde290858553336d652c77b970f15de8
- languageName: node
- linkType: hard
-
"detect-newline@npm:^3.0.0":
version: 3.1.0
resolution: "detect-newline@npm:3.1.0"
@@ -17784,23 +17662,6 @@ __metadata:
languageName: node
linkType: hard
-"gauge@npm:^3.0.0":
- version: 3.0.2
- resolution: "gauge@npm:3.0.2"
- dependencies:
- aproba: "npm:^1.0.3 || ^2.0.0"
- color-support: "npm:^1.1.2"
- console-control-strings: "npm:^1.0.0"
- has-unicode: "npm:^2.0.1"
- object-assign: "npm:^4.1.1"
- signal-exit: "npm:^3.0.0"
- string-width: "npm:^4.2.3"
- strip-ansi: "npm:^6.0.1"
- wide-align: "npm:^1.1.2"
- checksum: 10/46df086451672a5fecd58f7ec86da74542c795f8e00153fbef2884286ce0e86653c3eb23be2d0abb0c4a82b9b2a9dec3b09b6a1cf31c28085fa0376599a26589
- languageName: node
- linkType: hard
-
"gauge@npm:^4.0.3":
version: 4.0.4
resolution: "gauge@npm:4.0.4"
@@ -18415,8 +18276,8 @@ __metadata:
"@locker/near-membrane-dom": "npm:0.13.6"
"@locker/near-membrane-shared": "npm:0.13.6"
"@locker/near-membrane-shared-dom": "npm:0.13.6"
- "@msagl/core": "npm:^1.1.16"
- "@msagl/parser": "npm:^1.1.16"
+ "@msagl/core": "npm:^1.1.19"
+ "@msagl/parser": "npm:^1.1.19"
"@opentelemetry/api": "npm:1.7.0"
"@opentelemetry/exporter-collector": "npm:0.25.0"
"@opentelemetry/semantic-conventions": "npm:1.21.0"
@@ -21782,6 +21643,15 @@ __metadata:
languageName: node
linkType: hard
+"linked-list-typed@npm:^1.52.0":
+ version: 1.52.0
+ resolution: "linked-list-typed@npm:1.52.0"
+ dependencies:
+ data-structure-typed: "npm:^1.52.0"
+ checksum: 10/8d378c1691f0fa6b3c045784510bc1bfea2cb4d9f51decccc321e39680e031352580423c84aa0b862bbea829db53a046a3f7752b82a83020c640d47c2b433994
+ languageName: node
+ linkType: hard
+
"linked-list-typescript@npm:^1.0.11":
version: 1.0.15
resolution: "linked-list-typescript@npm:1.0.15"
@@ -22185,7 +22055,7 @@ __metadata:
languageName: node
linkType: hard
-"make-dir@npm:^3.0.0, make-dir@npm:^3.0.2, make-dir@npm:^3.1.0":
+"make-dir@npm:^3.0.0, make-dir@npm:^3.0.2":
version: 3.1.0
resolution: "make-dir@npm:3.1.0"
dependencies:
@@ -23632,18 +23502,6 @@ __metadata:
languageName: node
linkType: hard
-"npmlog@npm:^5.0.1":
- version: 5.0.1
- resolution: "npmlog@npm:5.0.1"
- dependencies:
- are-we-there-yet: "npm:^2.0.0"
- console-control-strings: "npm:^1.1.0"
- gauge: "npm:^3.0.0"
- set-blocking: "npm:^2.0.0"
- checksum: 10/f42c7b9584cdd26a13c41a21930b6f5912896b6419ab15be88cc5721fc792f1c3dd30eb602b26ae08575694628ba70afdcf3675d86e4f450fc544757e52726ec
- languageName: node
- linkType: hard
-
"npmlog@npm:^6.0.0, npmlog@npm:^6.0.2":
version: 6.0.2
resolution: "npmlog@npm:6.0.2"
@@ -30333,9 +30191,9 @@ __metadata:
linkType: hard
"typescript-string-operations@npm:^1.4.1":
- version: 1.5.0
- resolution: "typescript-string-operations@npm:1.5.0"
- checksum: 10/a884c4241fc45b9cceb2744c20fb229e6dfcb48f96afd68ef2d67fda1e4586c96d20fd0343b57c14ac33b2ebe000aa7524a4932424aea3077fe9e692555384f2
+ version: 1.5.1
+ resolution: "typescript-string-operations@npm:1.5.1"
+ checksum: 10/cec5ad55922ff6e5fc9f43bd7cdcbbb4049bf7b69b18d0ff508b7227519b4da2ce1873b913760b3bf12651833b67d314e0c1c8cee26a25cc0e138335e34bb250
languageName: node
linkType: hard
@@ -31614,7 +31472,7 @@ __metadata:
languageName: node
linkType: hard
-"wide-align@npm:^1.1.0, wide-align@npm:^1.1.2, wide-align@npm:^1.1.5":
+"wide-align@npm:^1.1.0, wide-align@npm:^1.1.5":
version: 1.1.5
resolution: "wide-align@npm:1.1.5"
dependencies:
Index: grafana-10.4.11/.yarnrc.yml
===================================================================
--- grafana-10.4.11.orig/.yarnrc.yml
+++ grafana-10.4.11/.yarnrc.yml
@@ -33,10 +33,6 @@ packageExtensions:
react-resizable@3.0.4:
peerDependencies:
react-dom: 17.0.1
- '@msagl/drawing@*':
- dependencies:
- queue-typescript: "^1.0.1"
- "@esfx/collections-sortedmap": "^1.0.0"
plugins:
- path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
