From aec1d50256f20f955ead22ffc3e6f7fbbd03d456 Mon Sep 17 00:00:00 2001 From: s-weigand Date: Sun, 14 Jul 2024 15:32:51 +0200 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=9B=A1=EF=B8=8F=20Replace=20polyfill.?= =?UTF-8?q?io=20cdn=20links=20with=20cloudflare=20cdn?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See polykill vulnerability e.g.: https://www.veracode.com/blog/security-news/polyfill-supply-chain-attack-what-it-and-how-know-if-youre-affected --- documentation/demos/6000-elements/index.html | 2 +- documentation/demos/circle-layout/index.html | 2 +- documentation/demos/concentric-layout/index.html | 2 +- documentation/demos/cose-bilkent-layout-compound/index.html | 2 +- documentation/demos/cose-bilkent-layout/index.html | 2 +- documentation/demos/cose-layout/index.html | 2 +- documentation/demos/edge-arrows/index.html | 2 +- documentation/demos/edge-types/index.html | 2 +- documentation/demos/genemania-export/index.html | 2 +- documentation/demos/grid-layout/index.html | 2 +- documentation/demos/labels/index.html | 2 +- documentation/demos/node-types/index.html | 2 +- documentation/demos/performance-tuning/index.html | 2 +- documentation/demos/radius-types/index.html | 2 +- documentation/demos/spread-layout/index.html | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/documentation/demos/6000-elements/index.html b/documentation/demos/6000-elements/index.html index c861076154..210985daee 100644 --- a/documentation/demos/6000-elements/index.html +++ b/documentation/demos/6000-elements/index.html @@ -6,7 +6,7 @@ - + diff --git a/documentation/demos/circle-layout/index.html b/documentation/demos/circle-layout/index.html index 88282c91e3..d385b12626 100644 --- a/documentation/demos/circle-layout/index.html +++ b/documentation/demos/circle-layout/index.html @@ -7,7 +7,7 @@ - + diff --git a/documentation/demos/concentric-layout/index.html b/documentation/demos/concentric-layout/index.html index 0eebddf911..9f6a78ff92 100644 --- a/documentation/demos/concentric-layout/index.html +++ b/documentation/demos/concentric-layout/index.html @@ -7,7 +7,7 @@ - + diff --git a/documentation/demos/cose-bilkent-layout-compound/index.html b/documentation/demos/cose-bilkent-layout-compound/index.html index c083ee372b..e8f6b4a89e 100644 --- a/documentation/demos/cose-bilkent-layout-compound/index.html +++ b/documentation/demos/cose-bilkent-layout-compound/index.html @@ -7,7 +7,7 @@ - + diff --git a/documentation/demos/cose-bilkent-layout/index.html b/documentation/demos/cose-bilkent-layout/index.html index 7fc87adbb4..b1c0074b49 100644 --- a/documentation/demos/cose-bilkent-layout/index.html +++ b/documentation/demos/cose-bilkent-layout/index.html @@ -7,7 +7,7 @@ - + diff --git a/documentation/demos/cose-layout/index.html b/documentation/demos/cose-layout/index.html index b8d6c500a1..ae35788a9b 100644 --- a/documentation/demos/cose-layout/index.html +++ b/documentation/demos/cose-layout/index.html @@ -7,7 +7,7 @@ - + diff --git a/documentation/demos/edge-arrows/index.html b/documentation/demos/edge-arrows/index.html index 62902db75b..dfd6037197 100644 --- a/documentation/demos/edge-arrows/index.html +++ b/documentation/demos/edge-arrows/index.html @@ -7,7 +7,7 @@ - + diff --git a/documentation/demos/edge-types/index.html b/documentation/demos/edge-types/index.html index f5e8e44a78..9c07cae796 100644 --- a/documentation/demos/edge-types/index.html +++ b/documentation/demos/edge-types/index.html @@ -7,7 +7,7 @@ - + diff --git a/documentation/demos/genemania-export/index.html b/documentation/demos/genemania-export/index.html index 78bc25f55c..c0836c2a18 100644 --- a/documentation/demos/genemania-export/index.html +++ b/documentation/demos/genemania-export/index.html @@ -7,7 +7,7 @@ - + diff --git a/documentation/demos/grid-layout/index.html b/documentation/demos/grid-layout/index.html index 02da8b1f3b..6d24ce9338 100644 --- a/documentation/demos/grid-layout/index.html +++ b/documentation/demos/grid-layout/index.html @@ -7,7 +7,7 @@ - + diff --git a/documentation/demos/labels/index.html b/documentation/demos/labels/index.html index 8bdd5b48de..784ae081c4 100644 --- a/documentation/demos/labels/index.html +++ b/documentation/demos/labels/index.html @@ -7,7 +7,7 @@ - + diff --git a/documentation/demos/node-types/index.html b/documentation/demos/node-types/index.html index f9d3437c7d..af787fe2b7 100644 --- a/documentation/demos/node-types/index.html +++ b/documentation/demos/node-types/index.html @@ -7,7 +7,7 @@ - + diff --git a/documentation/demos/performance-tuning/index.html b/documentation/demos/performance-tuning/index.html index 129be384b1..074eaad3b3 100644 --- a/documentation/demos/performance-tuning/index.html +++ b/documentation/demos/performance-tuning/index.html @@ -6,7 +6,7 @@ - + Performance tuning diff --git a/documentation/demos/radius-types/index.html b/documentation/demos/radius-types/index.html index 52a200bb76..5feab44f50 100644 --- a/documentation/demos/radius-types/index.html +++ b/documentation/demos/radius-types/index.html @@ -7,7 +7,7 @@ - + diff --git a/documentation/demos/spread-layout/index.html b/documentation/demos/spread-layout/index.html index bac094a9c1..b19882b290 100644 --- a/documentation/demos/spread-layout/index.html +++ b/documentation/demos/spread-layout/index.html @@ -7,7 +7,7 @@ - + From ec34a5f51446464cc2585d535c9286dbddf5b14f Mon Sep 17 00:00:00 2001 From: s-weigand Date: Sun, 14 Jul 2024 15:39:10 +0200 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20npm=20command=20'docs:?= =?UTF-8?q?js'=20to=20not=20put=20file=20in=20build=20subfolder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 15601b096b..d1982444c0 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "test:modules:debug": "mocha inspect -r esm test/modules", "travis": "run-s build test:build test:modules lint", "docs": "run-s docs:build docs:js", - "docs:js": "cpy build/cytoscape.min.js documentation/js", + "docs:js": "cpy --flat build/cytoscape.min.js documentation/js", "docs:build": "node documentation/docmaker.js", "docs:push": "gh-pages -d documentation", "benchmark": "run-s benchmark:all", From abcecaab70e2a6e99b278044c477ab0267fbd571 Mon Sep 17 00:00:00 2001 From: s-weigand Date: Sun, 14 Jul 2024 18:12:14 +0200 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=A9=B9=20Fix=20external=20link=20to?= =?UTF-8?q?=20cytoscape-cise?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- documentation/docmaker.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/docmaker.json b/documentation/docmaker.json index 61a5888f5d..0c1b81a79f 100644 --- a/documentation/docmaker.json +++ b/documentation/docmaker.json @@ -46,7 +46,7 @@ { "name": "Circle layout", "id": "circle-layout" }, { "name": "Concentric layout", "id": "concentric-layout" }, { "name": "AVSDF layout", "id": "avsdf-layout", "github": "iVis-at-Bilkent/cytoscape.js-avsdf", "viewUrl": "https://ivis-at-bilkent.github.io/cytoscape.js-avsdf/demo.html" }, - { "name": "CiSE layout", "id": "cise-layout", "github": "iVis-at-Bilkent/cytoscape.js-cise", "viewUrl": "https://ivis-at-bilkent.github.io/cytoscape.js-cise/demo.html" }, + { "name": "CiSE layout", "id": "cise-layout", "github": "iVis-at-Bilkent/cytoscape.js-cise", "viewUrl": "https://ivis-at-bilkent.github.io/cytoscape.js-cise/demo/demo.html" }, { "name": "Grid layout", "id": "grid-layout" }, { "name": "CoSE layout", "id": "cose-layout" }, { "name": "CoSE Bilkent layout", "id": "cose-bilkent-layout", "github": "cytoscape/cytoscape.js-cose-bilkent" }, From 0887717fe87ef307a393f4059fe8181cae8b3616 Mon Sep 17 00:00:00 2001 From: s-weigand Date: Sun, 14 Jul 2024 18:28:16 +0200 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=A7=B9=20Add=20cytoscape.min.js=20in?= =?UTF-8?q?=20docs=20folder=20to=20.gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This prevents accidental commits of a generated file leading to merge conflicts. This also simplifies pruning by using 'git clean -dfX' --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 66dc5787d1..1db90d6e24 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,6 @@ build/** documentation/slimerjs-*/** documentation/api/** documentation/download/*.zip +documentation/js/cytoscape.min.js benchmark/suite/cytoscape.js From d942b4c36d2b698f762a8a773462c2e5677c05a3 Mon Sep 17 00:00:00 2001 From: Sebastian Weigand Date: Tue, 16 Jul 2024 22:23:35 +0200 Subject: [PATCH 5/5] =?UTF-8?q?revert=20=F0=9F=A7=B9=20Add=20cytoscape.min?= =?UTF-8?q?.js=20in=20docs=20folder=20to=20.gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Max Franz --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1db90d6e24..66dc5787d1 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,5 @@ build/** documentation/slimerjs-*/** documentation/api/** documentation/download/*.zip -documentation/js/cytoscape.min.js benchmark/suite/cytoscape.js