diff --git a/.cache.tar.xz b/.cache.tar.xz index 626490b642..1c0e406cef 100644 Binary files a/.cache.tar.xz and b/.cache.tar.xz differ diff --git a/package-lock.json b/package-lock.json index f3a2adfa95..05785ec1b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4926,6 +4926,20 @@ "node": ">=4" } }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "license": "ISC", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/aproba": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", @@ -5273,6 +5287,19 @@ "integrity": "sha512-Nik3Sc0ncrMK4UUdXQmAnRtzmNQTAAXmXIopizwZ1W1t8QmfJj+zL4OA2I7XPTPW5z5TDqv4hRo/JzouDJnX3A==", "license": "Apache-2.0" }, + "node_modules/binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/bindings": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", @@ -5613,8 +5640,9 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz", "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==", - "devOptional": true, "license": "MIT", + "optional": true, + "peer": true, "dependencies": { "readdirp": "^4.0.1" }, @@ -8127,6 +8155,19 @@ "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", "license": "MIT" }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "license": "MIT", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/is-decimal": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-2.0.1.tgz", @@ -10656,6 +10697,16 @@ "node": ">=6" } }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/not": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/not/-/not-0.1.0.tgz", @@ -11351,8 +11402,9 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.1.tgz", "integrity": "sha512-GkMg9uOTpIWWKbSsgwb5fA4EavTR+SG/PMPoAY8hkhHfEEY0/vqljY+XHqtDf2cr2IJtoNRDbrrEpZUiZCkYRw==", - "devOptional": true, "license": "MIT", + "optional": true, + "peer": true, "engines": { "node": ">= 14.16.0" }, @@ -12221,8 +12273,9 @@ "version": "1.79.4", "resolved": "https://registry.npmjs.org/sass/-/sass-1.79.4.tgz", "integrity": "sha512-K0QDSNPXgyqO4GZq2HO5Q70TLxTH6cIT59RdoCHMivrC8rqzaTw5ab9prjz9KUN1El4FLXrBXJhik61JR4HcGg==", - "devOptional": true, "license": "MIT", + "optional": true, + "peer": true, "dependencies": { "chokidar": "^4.0.0", "immutable": "^4.0.0", @@ -13828,7 +13881,63 @@ "prettier": "^3.3.3", "prettier-plugin-astro": "^0.14.1", "prettier-plugin-svelte": "^3.2.6", - "sass": "^1.77.8" + "sass": "1.77.6" + } + }, + "sites/main-site/node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "sites/main-site/node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "license": "MIT", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "sites/main-site/node_modules/sass": { + "version": "1.77.6", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz", + "integrity": "sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", + "source-map-js": ">=0.6.2 <2.0.0" + }, + "bin": { + "sass": "sass.js" + }, + "engines": { + "node": ">=14.0.0" } }, "sites/modules-subworkflows": { diff --git a/sites/main-site/package.json b/sites/main-site/package.json index 15bcdaf809..e5d9fbc6f8 100644 --- a/sites/main-site/package.json +++ b/sites/main-site/package.json @@ -112,6 +112,6 @@ "prettier": "^3.3.3", "prettier-plugin-astro": "^0.14.1", "prettier-plugin-svelte": "^3.2.6", - "sass": "^1.77.8" + "sass": "1.77.6" } } diff --git a/sites/main-site/src/components/schema/SchemaListing.svelte b/sites/main-site/src/components/schema/SchemaListing.svelte index 1d45ba2b4e..8967931033 100644 --- a/sites/main-site/src/components/schema/SchemaListing.svelte +++ b/sites/main-site/src/components/schema/SchemaListing.svelte @@ -5,7 +5,7 @@ export let schema; - const schemaDefs = schema.definitions || schema.properties || schema.$defs; + const schemaDefs = schema.definitions || schema.$defs || schema.properties; onMount(() => { const observer = new IntersectionObserver( (entries) => { diff --git a/sites/pipelines/src/pages/[pipeline]/[version]/parameters.astro b/sites/pipelines/src/pages/[pipeline]/[version]/parameters.astro index a201812d03..52bd8f3a32 100644 --- a/sites/pipelines/src/pages/[pipeline]/[version]/parameters.astro +++ b/sites/pipelines/src/pages/[pipeline]/[version]/parameters.astro @@ -62,14 +62,12 @@ if (existsSync(cache_key)) { let schema_buffer = await promises.readFile(cache_key, 'utf-8'); schema = JSON.parse(schema_buffer); } -console.log('pipeline: ', pipeline); let schemaDefs = schema.definitions && Object.keys(schema.definitions).length > 0 ? schema.definitions - : schema.properties - ? schema.properties - : schema.$defs; -console.log('schemaDefs: ', schemaDefs); + : schema.$defs && Object.keys(schema.$defs).length > 0 + ? schema.$defs + : schema.properties; if (schemaDefs && Object.keys(schemaDefs).length > 0) { headings = Object.entries(schemaDefs).map(([key, value]) => { return {