diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 91e5324..81d60b4 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -22,12 +22,12 @@ "@rollup/plugin-json": "^4.1.0", "@rollup/plugin-node-resolve": "^11.0.0", "@rollup/plugin-replace": "^2.4.2", - "rollup": "^2.3.4", + "rollup": "^2.75.5", "rollup-plugin-css-only": "^3.1.0", "rollup-plugin-livereload": "^2.0.0", - "rollup-plugin-svelte": "^7.0.0", + "rollup-plugin-svelte": "^7.1.0", "rollup-plugin-terser": "^7.0.0", - "svelte": "^3.0.0" + "svelte": "^3.48.0" } }, "node_modules/@babel/code-frame": { @@ -2880,9 +2880,9 @@ } }, "node_modules/rollup": { - "version": "2.50.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.50.4.tgz", - "integrity": "sha512-mBQa9O6bdqur7a6R+TXcbdYgfO2arXlDG+rSrWfwAvsiumpJjD4OS23R9QuhItuz8ysWb8mZ91CFFDQUhJY+8Q==", + "version": "2.75.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.75.5.tgz", + "integrity": "sha512-JzNlJZDison3o2mOxVmb44Oz7t74EfSd1SQrplQk0wSaXV7uLQXtVdHbxlcT3w+8tZ1TL4r/eLfc7nAbz38BBA==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -2891,7 +2891,7 @@ "node": ">=10.0.0" }, "optionalDependencies": { - "fsevents": "~2.3.1" + "fsevents": "~2.3.2" } }, "node_modules/rollup-plugin-css-only": { @@ -3122,9 +3122,9 @@ } }, "node_modules/svelte": { - "version": "3.38.2", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.38.2.tgz", - "integrity": "sha512-q5Dq0/QHh4BLJyEVWGe7Cej5NWs040LWjMbicBGZ+3qpFWJ1YObRmUDZKbbovddLC9WW7THTj3kYbTOFmU9fbg==", + "version": "3.48.0", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.48.0.tgz", + "integrity": "sha512-fN2YRm/bGumvjUpu6yI3BpvZnpIm9I6A7HR4oUNYd7ggYyIwSA/BX7DJ+UXXffLp6XNcUijyLvttbPVCYa/3xQ==", "engines": { "node": ">= 8" } @@ -5377,12 +5377,12 @@ } }, "rollup": { - "version": "2.50.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.50.4.tgz", - "integrity": "sha512-mBQa9O6bdqur7a6R+TXcbdYgfO2arXlDG+rSrWfwAvsiumpJjD4OS23R9QuhItuz8ysWb8mZ91CFFDQUhJY+8Q==", + "version": "2.75.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.75.5.tgz", + "integrity": "sha512-JzNlJZDison3o2mOxVmb44Oz7t74EfSd1SQrplQk0wSaXV7uLQXtVdHbxlcT3w+8tZ1TL4r/eLfc7nAbz38BBA==", "dev": true, "requires": { - "fsevents": "~2.3.1" + "fsevents": "~2.3.2" } }, "rollup-plugin-css-only": { @@ -5553,9 +5553,9 @@ } }, "svelte": { - "version": "3.38.2", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.38.2.tgz", - "integrity": "sha512-q5Dq0/QHh4BLJyEVWGe7Cej5NWs040LWjMbicBGZ+3qpFWJ1YObRmUDZKbbovddLC9WW7THTj3kYbTOFmU9fbg==" + "version": "3.48.0", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.48.0.tgz", + "integrity": "sha512-fN2YRm/bGumvjUpu6yI3BpvZnpIm9I6A7HR4oUNYd7ggYyIwSA/BX7DJ+UXXffLp6XNcUijyLvttbPVCYa/3xQ==" }, "svelte-click-outside": { "version": "1.0.0", diff --git a/frontend/package.json b/frontend/package.json index fd6f838..5fd6213 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -15,12 +15,12 @@ "@rollup/plugin-json": "^4.1.0", "@rollup/plugin-node-resolve": "^11.0.0", "@rollup/plugin-replace": "^2.4.2", - "rollup": "^2.3.4", + "rollup": "^2.75.5", "rollup-plugin-css-only": "^3.1.0", "rollup-plugin-livereload": "^2.0.0", - "rollup-plugin-svelte": "^7.0.0", + "rollup-plugin-svelte": "^7.1.0", "rollup-plugin-terser": "^7.0.0", - "svelte": "^3.0.0" + "svelte": "^3.48.0" }, "dependencies": { "axios": "^0.21.4", diff --git a/frontend/rollup.config.js b/frontend/rollup.config.js index 7a01ee8..7101038 100644 --- a/frontend/rollup.config.js +++ b/frontend/rollup.config.js @@ -61,7 +61,7 @@ export default { }), commonjs({ sourceMap: false }), json(), - babel({ + production && babel({ babelHelpers: 'bundled', extensions: ['.js', '.mjs', '.html', '.svelte'], include: ['src/**', 'node_modules/svelte/**'], diff --git a/frontend/src/components/ChannelDropdown.svelte b/frontend/src/components/ChannelDropdown.svelte index afed911..2211baa 100644 --- a/frontend/src/components/ChannelDropdown.svelte +++ b/frontend/src/components/ChannelDropdown.svelte @@ -1,6 +1,6 @@ {#if withNull} - {/if} @@ -22,8 +22,16 @@ export let withNull = false; export let nullLabel = "Disabled"; + $: value, ensureStringified(); + export let col1 = false; export let col2 = false; export let col3 = false; export let col4 = false; + + function ensureStringified() { + if (value === null) { + value = "null"; + } + } \ No newline at end of file diff --git a/frontend/src/components/SimplePanelDropdown.svelte b/frontend/src/components/SimplePanelDropdown.svelte index 1453cc0..4340b74 100644 --- a/frontend/src/components/SimplePanelDropdown.svelte +++ b/frontend/src/components/SimplePanelDropdown.svelte @@ -20,6 +20,14 @@ export let allowNone = false; export let panels = []; + $: value, ensureStringified(); + + function ensureStringified() { + if (value === null) { + value = "null"; + } + } + export let col1 = false; export let col2 = false; export let col3 = false;