diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index f83f7f6fab..54d3c7b025 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -29,7 +29,7 @@ RUN /tmp/set_up_stackwalker.sh && \ # Install frontend JS deps COPY --chown=app:app ./webapp/package*.json /webapp-frontend-deps/ -RUN cd /webapp-frontend-deps/ && npm install +RUN cd /webapp-frontend-deps/ && npm ci # NOTE(relud): these dependencies are installed separately, relocated, and patched to reference the # new location (aka shaded), so that they can be installed at the same time as newer versions @@ -52,6 +52,5 @@ ENV PYTHONUNBUFFERED=1 \ PYTHONDONTWRITEBYTECODE=1 \ PYTHONPATH=/app \ UGLIFYJS_BINARY=/webapp-frontend-deps/node_modules/.bin/uglifyjs \ - CSSMIN_BINARY=/webapp-frontend-deps/node_modules/.bin/cssmin \ NPM_ROOT_PATH=/webapp-frontend-deps/ \ NODE_PATH=/webapp-frontend-deps/node_modules/ diff --git a/docker/Dockerfile b/docker/Dockerfile index b4b613b316..e67be91d26 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -30,7 +30,7 @@ RUN /tmp/set_up_stackwalker.sh && \ # Install frontend JS deps COPY --chown=app:app ./webapp/package*.json /webapp-frontend-deps/ -RUN cd /webapp-frontend-deps/ && npm install +RUN cd /webapp-frontend-deps/ && npm ci # NOTE(relud): these dependencies are installed separately, relocated, and patched to reference the # new location (aka shaded), so that they can be installed at the same time as newer versions @@ -47,7 +47,6 @@ ENV PYTHONUNBUFFERED=1 \ PYTHONDONTWRITEBYTECODE=1 \ PYTHONPATH=/app \ UGLIFYJS_BINARY=/webapp-frontend-deps/node_modules/.bin/uglifyjs \ - CSSMIN_BINARY=/webapp-frontend-deps/node_modules/.bin/cssmin \ NPM_ROOT_PATH=/webapp-frontend-deps/ \ NODE_PATH=/webapp-frontend-deps/node_modules/ @@ -57,9 +56,7 @@ USER app # Copy everything over COPY --chown=app:app . /app/ -# Run collectstatic in container which puts files in the default place for -# static files -RUN cd /app/webapp/ && TOOL_ENV=True python manage.py collectstatic --noinput +RUN cd /app/webapp/ && npm run build # Set entrypoint for this image. The entrypoint script takes a service # to run as the first argument. See the script for available arguments. diff --git a/webapp/crashstats/crashstats/jinja2/crashstats_base.html b/webapp/crashstats/crashstats/jinja2/crashstats_base.html index 77bdc41ab1..ae348041e2 100644 --- a/webapp/crashstats/crashstats/jinja2/crashstats_base.html +++ b/webapp/crashstats/crashstats/jinja2/crashstats_base.html @@ -16,10 +16,7 @@ {% endblock %} {% endblock %} - {% block site_css %} - {% stylesheet 'crashstats_base' %} - {% stylesheet 'fontawesome' %} - {% endblock %} + diff --git a/webapp/crashstats/crashstats/jinja2/error_base.html b/webapp/crashstats/crashstats/jinja2/error_base.html index d41e2d0aa8..5038c5f045 100644 --- a/webapp/crashstats/crashstats/jinja2/error_base.html +++ b/webapp/crashstats/crashstats/jinja2/error_base.html @@ -3,9 +3,7 @@ {% block page_title %}Error{% endblock %} - {% block site_css %} - {% stylesheet 'crashstats_base' %} - {% endblock %} +
diff --git a/webapp/crashstats/crashstats/static/crashstats/css/base/typography.css b/webapp/crashstats/crashstats/static/crashstats/css/base/typography.css index 47f7bbfb72..3a7cb36b7b 100644 --- a/webapp/crashstats/crashstats/static/crashstats/css/base/typography.css +++ b/webapp/crashstats/crashstats/static/crashstats/css/base/typography.css @@ -4,7 +4,7 @@ @font-face { font-family: 'icons'; - src: url('/static/crashstats/fonts/icons.eot?#iefix2013') format('embedded-opentype'), url('/static/crashstats/fonts/icons.woff?2013') format('woff'), url('/static/crashstats/fonts/icons.ttf?2013') format('truetype'); + src: url('/static/crashstats/fonts/icons.eot') format('embedded-opentype'), url('/static/crashstats/fonts/icons.woff') format('woff'), url('/static/crashstats/fonts/icons.ttf') format('truetype'); font-weight: normal; font-style: normal; } diff --git a/webapp/crashstats/crashstats/static/crashstats/css/components/status.css b/webapp/crashstats/crashstats/static/crashstats/css/components/status.css new file mode 100644 index 0000000000..f008d2111e --- /dev/null +++ b/webapp/crashstats/crashstats/static/crashstats/css/components/status.css @@ -0,0 +1,56 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +/* Styles copied from /webapp/crashstats/status/static/status/css/status.css + * because Django Pipeline doesn't allow traversing urls outside the base dir + * TODO: decide if it's needed in both locations and DRY */ + +.status-message { + position: relative; + background-color: var(--light-grey); + border: none; + color: #ffffff; + font-size: 1.1em; + padding: 1em 3.5rem; + line-height: 1.5em; +} +.status-message span { + font-style: italic; +} +.status-message:before { + padding: 4px 4px 0 0; + vertical-align: middle; + position: absolute; + left: 1rem; +} +.status-message.severity-info { + background-color: #ededf0; + color: #0c0c0d; +} +.status-message.severity-info a { + color: var(--primary-medium); +} +.status-message.severity-info:before { + content: url("/static/img/3rdparty/silk/information.png"); +} +.status-message.severity-warning { + background-color: #ffe900; + color: #3e2800; +} +.status-message.severity-warning a { + color: var(--primary-medium); +} +.status-message.severity-warning:before { + content: url("/static/img/3rdparty/silk/error.png"); +} +.status-message.severity-critical { + background-color: var(--red); +} +.status-message.severity-critical, +.status-message.severity-critical a { + color: #ffffff; +} +.status-message.severity-critical:before { + content: url("/static/img/3rdparty/silk/exclamation.png"); +} diff --git a/webapp/crashstats/crashstats/static/crashstats/css/crashstats-base.css b/webapp/crashstats/crashstats/static/crashstats/css/crashstats-base.css new file mode 100644 index 0000000000..520cc356b8 --- /dev/null +++ b/webapp/crashstats/crashstats/static/crashstats/css/crashstats-base.css @@ -0,0 +1,360 @@ +@import "./base/reset.css"; +@import "./base/variables.css"; +@import "./base/forms.css"; +@import "./base/tables.css"; +@import "./base/typography.css"; +@import "./base/layout.css"; + +/* Layout elements */ +@import "./components/nav.css"; +@import "./components/footer.css"; + +/* Common components */ +@import "./components/accordion.css"; +@import "./components/admin.css"; +@import "./components/code.css"; +@import "./components/message.css"; +@import "./components/pagination.css"; +@import "./components/panel.css"; +@import "./components/select.css"; +@import "./components/simplebox.css"; +@import "./components/statusicon.css"; +@import "./components/sumo_link.css"; +@import "./components/table_sorter.css"; +@import "./components/note.css"; +@import "./components/tip.css"; +@import "./components/tree.css"; + +/* The following is copied from /webapp/crashstats/status/static/status/css/status.css + * Django Pipeline doesn't allow traversing urls outside the base dir + * e.g. "../../../../status/static/status/css/status.css"; + * TODO: decide if it's needed in both locations and DRY */ +@import "./components/status.css"; + +/* Other shared styles */ +a { + text-decoration: none; +} + +a, +a:link, +a:hover, +a:active { + color: var(--primary); + text-decoration: underline; +} + +.ui-widget-content a:visited, +a:visited { + color: var(--purple); +} + +body>h1 { + font-size: 200%; +} + +.clear { + clear: both; +} + +.clear_left { + clear: left; +} + +.clear_right { + clear: right; +} + +.float_left { + float: left; +} + +.float_right { + float: right; +} + +.hidden { + display: none; +} + +.visually-hidden { + position: absolute; + clip: rect(1px 1px 1px 1px); + /* IE6, IE7 */ + clip: rect(1px, 1px, 1px, 1px); + padding: 0; + border: 0; + height: 1px; + width: 1px; + overflow: hidden; +} + +time { + display: inline-block; +} + +.mx-4 { + margin-left: 1rem; + margin-right: 1rem; +} + +.my-2 { + margin-top: 0.5rem; + margin-bottom: 0.5rem; +} + +.w-1\/12 { + width: 8.3333%; +} + +.w-2\/12 { + width: 16.6667%; +} + +.w-3\/12 { + width: 25%; +} + +.w-4\/12 { + width: 33.3333%; +} + +.w-5\/12 { + width: 41.6667%; +} + +.w-6\/12 { + width: 50%; +} + +.w-7\/12 { + width: 58.3333%; +} + +.w-8\/12 { + width: 66.6667%; +} + +.w-9\/12 { + width: 75%; +} + +.w-10\/12 { + width: 83.3333%; +} + +.w-11\/12 { + width: 91.666667%; +} + +.w-full { + width: 100%; +} + +#mainbody { + position: relative; + margin: 1em 2em; + text-align: left; + flex: 1; +} + +.loading { + position: absolute; + top: 45%; + left: 45%; +} + +.inline-loader { + width: 18px; + height: 18px; + vertical-align: middle; +} + +.logout-form { + display: inline; +} + +button.logout-button { + background: none; + color: var(--primary); + font-size: var(--base-font-size); + padding: 0; +} + +button.logout-button:hover { + background: none; + text-decoration: underline; +} + +/* --- */ +/* --- */ +#data_sources { + border: 0; +} + +#data_sources table { + width: 100%; +} + +#data_sources th:last-child { + width: 80px; +} + +#data_sources_nav { + background: none; + border: 0; +} + +#data_sources_nav li { + background: none; + border: 0; +} + +#data_sources_nav li:before { + content: ""; +} + +span.push_right { + margin-right: 10px; +} + +.list tr:nth-child(2n+1) { + background-color: var(--off-white); +} + +.list tr:nth-child(2n) { + background-color: #ffffff; +} + +.list tr:hover { + background-color: #ffffff; +} + +.list tr td { + padding: 0.5em; + text-align: left; +} + +.list tr td label { + border-bottom: 1px dashed var(--grey); + font-weight: normal; +} + +.list th { + background: var(--off-white); + padding: 2px; + border: 1px solid var(--black); + font-weight: bold; +} + +.list th a { + display: block; + padding: 0.2em 1.2em 0.2em 0.2em; + text-align: left; +} + +.list th a:hover { + background-color: #ffffff; +} + +.oopp-hang { + clear: right; + float: right; +} + +.oopp-hang .current { + float: right; + background-image: url("/static/img/3rdparty/fatcow/stop16x16.png"); + background-repeat: no-repeat; + color: var(--red); + padding-left: 20px; + height: 16px; + font-weight: 900; +} + +.oopp-hang .current .type { + color: var(--dark-grey); +} + +.oopp-hang .pair { + clear: right; + padding: 0.5em 0 0.5em 0.5em; +} + +.oopp-hang .pair a { + text-decoration: none; +} + +td.in1 ul, +td.in2 ul { + padding-left: 15px; +} + +.trend { + font-weight: 900; + color: #ffffff; +} + +.trend.up { + background: url("/static/img/up_arrow.png") no-repeat scroll right 10px var(--red); +} + +.trend.down { + background: url("/static/img/down_arrow.png") no-repeat scroll right 10px var(--green); +} + +.complete { + position: absolute; + right: 0px; + background-color: #ffffff; + border: solid 1px var(--grey); + margin: 1em; +} + +.correlation-module { + position: relative; + float: left; + padding: 1em; + width: 320px; +} + +.correlation-module h3 { + font-weight: bold; +} + +#duration-nav { + float: right; +} + +#duration-nav ul li { + float: left; + padding-right: 1em; + list-style-type: none; +} + +div.expandable-menu, +div.each-sparkline { + margin-left: 12px; + border: none; +} + +.correlation-cell div div.complete { + display: none; +} + +.correlation pre { + clear: left; +} + +.correlation h3 { + margin-top: 0.1em; +} + +.complete h3 { + margin: 0.75em 0 0 0; +} + +/* jQueryUI theme overrides */ +.ui-tabs-panel { + border: 1px solid var(--off-white); +} \ No newline at end of file diff --git a/webapp/crashstats/settings/base.py b/webapp/crashstats/settings/base.py index 538f801a42..c973f621c6 100644 --- a/webapp/crashstats/settings/base.py +++ b/webapp/crashstats/settings/base.py @@ -459,15 +459,12 @@ def filter(self, record): ] PIPELINE = { - "STYLESHEETS": PIPELINE_CSS, "JAVASCRIPT": PIPELINE_JS, "JS_COMPRESSOR": "pipeline.compressors.uglifyjs.UglifyJSCompressor", "UGLIFYJS_BINARY": _config( "UGLIFYJS_BINARY", default=path("node_modules/.bin/uglifyjs") ), "UGLIFYJS_ARGUMENTS": "--mangle", - "CSS_COMPRESSOR": "pipeline.compressors.cssmin.CSSMinCompressor", - "CSSMIN_BINARY": _config("CSSMIN_BINARY", default=path("node_modules/.bin/cssmin")), # Don't wrap javascript code in... `(...code...)();` # because possibly much code has been built with the assumption that # things will be made available globally. diff --git a/webapp/crashstats/settings/bundles.py b/webapp/crashstats/settings/bundles.py index 4fa19c2a44..00df4b143e 100644 --- a/webapp/crashstats/settings/bundles.py +++ b/webapp/crashstats/settings/bundles.py @@ -52,10 +52,6 @@ # PIPELINE_CSS = { - "fontawesome": { - "source_filenames": ("@fortawesome/fontawesome-free/css/all.min.css",), - "output_filename": "css/fontawesome.min.css", - }, "search": { "source_filenames": ("supersearch/css/search.css",), "output_filename": "css/search.min.css", @@ -91,14 +87,6 @@ ), "output_filename": "css/metricsgraphics.min.css", }, - "crashstats_base": { - "source_filenames": ( - "crashstats/css/base/variables.css", - "crashstats/css/base.css", - "status/css/status.css", - ), - "output_filename": "css/crashstats-base.min.css", - }, "api_documentation": { "source_filenames": ("api/css/documentation.css",), "output_filename": "css/api-documentation.min.css", diff --git a/webapp/esbuild.js b/webapp/esbuild.js new file mode 100644 index 0000000000..665b07269f --- /dev/null +++ b/webapp/esbuild.js @@ -0,0 +1,23 @@ +// # This Source Code Form is subject to the terms of the Mozilla Public +// # License, v. 2.0. If a copy of the MPL was not distributed with this +// # file, You can obtain one at https://mozilla.org/MPL/2.0/. + +import esbuild from 'esbuild' + +const entryPoints = [ + 'crashstats/crashstats/static/crashstats/css/crashstats-base.css', +] + +await esbuild.build({ + bundle: true, + entryNames: '[ext]/[name]', + entryPoints, + external: ['*.gif', '*.svg', '*.png', '*.eot', '*.woff', '*.ttf'], + format: 'esm', + logLevel: 'info', + outdir: 'static', + minify: true, + sourcemap: true, + splitting: false, + treeShaking: true, +}) \ No newline at end of file diff --git a/webapp/package-lock.json b/webapp/package-lock.json index 827a3fdd4e..f4385166b5 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -9,7 +9,6 @@ "version": "0.0.0", "license": "MPL-2.0", "dependencies": { - "@fortawesome/fontawesome-free": "5.15.1", "ace-builds": "1.4.12", "d3": "5.1.0", "filesize": "6.1.0", @@ -26,7 +25,7 @@ "tablesorter": "2.31.3" }, "devDependencies": { - "cssmin": "0.4.3", + "esbuild": "0.24.2", "eslint": "7.13.0", "eslint-config-prettier": "6.15.0", "eslint-plugin-prettier": "3.1.4", @@ -132,6 +131,406 @@ "node": ">=4" } }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz", + "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz", + "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz", + "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz", + "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz", + "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz", + "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz", + "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz", + "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz", + "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz", + "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz", + "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz", + "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz", + "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz", + "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz", + "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz", + "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz", + "integrity": "sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz", + "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz", + "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz", + "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz", + "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz", + "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz", + "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz", + "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz", + "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, "node_modules/@eslint/eslintrc": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.2.tgz", @@ -153,15 +552,6 @@ "node": "^10.12.0 || >=12.0.0" } }, - "node_modules/@fortawesome/fontawesome-free": { - "version": "5.15.1", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.1.tgz", - "integrity": "sha512-OEdH7SyC1suTdhBGW91/zBfR6qaIhThbcN8PUXtXilY4GYnSBbVqOntdHbC1vXwsDnX0Qix2m2+DSU1J51ybOQ==", - "hasInstallScript": true, - "engines": { - "node": ">=6" - } - }, "node_modules/ace-builds": { "version": "1.4.12", "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.12.tgz", @@ -339,15 +729,6 @@ "node": ">= 8" } }, - "node_modules/cssmin": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/cssmin/-/cssmin-0.4.3.tgz", - "integrity": "sha512-A0hOtBUV5dPB/gRKsLZsqoyeFHuKIWCXdumFdsK/0nlhwK1NRZHwtm0svdTA4uEpixZD+o0xs7MirNsG2X1JBg==", - "dev": true, - "bin": { - "cssmin": "bin/cssmin" - } - }, "node_modules/d3": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/d3/-/d3-5.1.0.tgz", @@ -692,6 +1073,46 @@ "node": ">=8.6" } }, + "node_modules/esbuild": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz", + "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==", + "dev": true, + "hasInstallScript": true, + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.24.2", + "@esbuild/android-arm": "0.24.2", + "@esbuild/android-arm64": "0.24.2", + "@esbuild/android-x64": "0.24.2", + "@esbuild/darwin-arm64": "0.24.2", + "@esbuild/darwin-x64": "0.24.2", + "@esbuild/freebsd-arm64": "0.24.2", + "@esbuild/freebsd-x64": "0.24.2", + "@esbuild/linux-arm": "0.24.2", + "@esbuild/linux-arm64": "0.24.2", + "@esbuild/linux-ia32": "0.24.2", + "@esbuild/linux-loong64": "0.24.2", + "@esbuild/linux-mips64el": "0.24.2", + "@esbuild/linux-ppc64": "0.24.2", + "@esbuild/linux-riscv64": "0.24.2", + "@esbuild/linux-s390x": "0.24.2", + "@esbuild/linux-x64": "0.24.2", + "@esbuild/netbsd-arm64": "0.24.2", + "@esbuild/netbsd-x64": "0.24.2", + "@esbuild/openbsd-arm64": "0.24.2", + "@esbuild/openbsd-x64": "0.24.2", + "@esbuild/sunos-x64": "0.24.2", + "@esbuild/win32-arm64": "0.24.2", + "@esbuild/win32-ia32": "0.24.2", + "@esbuild/win32-x64": "0.24.2" + } + }, "node_modules/escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -2147,6 +2568,181 @@ } } }, + "@esbuild/aix-ppc64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz", + "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==", + "dev": true, + "optional": true + }, + "@esbuild/android-arm": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz", + "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==", + "dev": true, + "optional": true + }, + "@esbuild/android-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz", + "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==", + "dev": true, + "optional": true + }, + "@esbuild/android-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz", + "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==", + "dev": true, + "optional": true + }, + "@esbuild/darwin-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz", + "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==", + "dev": true, + "optional": true + }, + "@esbuild/darwin-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz", + "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==", + "dev": true, + "optional": true + }, + "@esbuild/freebsd-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz", + "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==", + "dev": true, + "optional": true + }, + "@esbuild/freebsd-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz", + "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==", + "dev": true, + "optional": true + }, + "@esbuild/linux-arm": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz", + "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==", + "dev": true, + "optional": true + }, + "@esbuild/linux-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz", + "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==", + "dev": true, + "optional": true + }, + "@esbuild/linux-ia32": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz", + "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==", + "dev": true, + "optional": true + }, + "@esbuild/linux-loong64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz", + "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==", + "dev": true, + "optional": true + }, + "@esbuild/linux-mips64el": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz", + "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==", + "dev": true, + "optional": true + }, + "@esbuild/linux-ppc64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz", + "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==", + "dev": true, + "optional": true + }, + "@esbuild/linux-riscv64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz", + "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==", + "dev": true, + "optional": true + }, + "@esbuild/linux-s390x": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz", + "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==", + "dev": true, + "optional": true + }, + "@esbuild/linux-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz", + "integrity": "sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==", + "dev": true, + "optional": true + }, + "@esbuild/netbsd-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz", + "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==", + "dev": true, + "optional": true + }, + "@esbuild/netbsd-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz", + "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==", + "dev": true, + "optional": true + }, + "@esbuild/openbsd-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz", + "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==", + "dev": true, + "optional": true + }, + "@esbuild/openbsd-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz", + "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==", + "dev": true, + "optional": true + }, + "@esbuild/sunos-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz", + "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==", + "dev": true, + "optional": true + }, + "@esbuild/win32-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz", + "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==", + "dev": true, + "optional": true + }, + "@esbuild/win32-ia32": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz", + "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==", + "dev": true, + "optional": true + }, + "@esbuild/win32-x64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz", + "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==", + "dev": true, + "optional": true + }, "@eslint/eslintrc": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.2.tgz", @@ -2165,11 +2761,6 @@ "strip-json-comments": "^3.1.1" } }, - "@fortawesome/fontawesome-free": { - "version": "5.15.1", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.1.tgz", - "integrity": "sha512-OEdH7SyC1suTdhBGW91/zBfR6qaIhThbcN8PUXtXilY4GYnSBbVqOntdHbC1vXwsDnX0Qix2m2+DSU1J51ybOQ==" - }, "ace-builds": { "version": "1.4.12", "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.12.tgz", @@ -2305,12 +2896,6 @@ "which": "^2.0.1" } }, - "cssmin": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/cssmin/-/cssmin-0.4.3.tgz", - "integrity": "sha512-A0hOtBUV5dPB/gRKsLZsqoyeFHuKIWCXdumFdsK/0nlhwK1NRZHwtm0svdTA4uEpixZD+o0xs7MirNsG2X1JBg==", - "dev": true - }, "d3": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/d3/-/d3-5.1.0.tgz", @@ -2630,6 +3215,39 @@ "ansi-colors": "^4.1.1" } }, + "esbuild": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz", + "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==", + "dev": true, + "requires": { + "@esbuild/aix-ppc64": "0.24.2", + "@esbuild/android-arm": "0.24.2", + "@esbuild/android-arm64": "0.24.2", + "@esbuild/android-x64": "0.24.2", + "@esbuild/darwin-arm64": "0.24.2", + "@esbuild/darwin-x64": "0.24.2", + "@esbuild/freebsd-arm64": "0.24.2", + "@esbuild/freebsd-x64": "0.24.2", + "@esbuild/linux-arm": "0.24.2", + "@esbuild/linux-arm64": "0.24.2", + "@esbuild/linux-ia32": "0.24.2", + "@esbuild/linux-loong64": "0.24.2", + "@esbuild/linux-mips64el": "0.24.2", + "@esbuild/linux-ppc64": "0.24.2", + "@esbuild/linux-riscv64": "0.24.2", + "@esbuild/linux-s390x": "0.24.2", + "@esbuild/linux-x64": "0.24.2", + "@esbuild/netbsd-arm64": "0.24.2", + "@esbuild/netbsd-x64": "0.24.2", + "@esbuild/openbsd-arm64": "0.24.2", + "@esbuild/openbsd-x64": "0.24.2", + "@esbuild/sunos-x64": "0.24.2", + "@esbuild/win32-arm64": "0.24.2", + "@esbuild/win32-ia32": "0.24.2", + "@esbuild/win32-x64": "0.24.2" + } + }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", diff --git a/webapp/package.json b/webapp/package.json index caa2ec0a3e..b03309b1c4 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -6,10 +6,11 @@ "type": "git", "url": "git://github.com/mozilla-services/socorro.git" }, + "type": "module", "author": "Mozilla", "license": "MPL-2.0", "devDependencies": { - "cssmin": "0.4.3", + "esbuild": "0.24.2", "eslint": "7.13.0", "eslint-config-prettier": "6.15.0", "eslint-plugin-prettier": "3.1.4", @@ -18,7 +19,6 @@ "uglify-js": "3.11.5" }, "dependencies": { - "@fortawesome/fontawesome-free": "5.15.1", "ace-builds": "1.4.12", "d3": "5.1.0", "filesize": "6.1.0", @@ -33,5 +33,12 @@ "qs": "6.9.4", "Select2": "github:select2/select2#3.5.4", "tablesorter": "2.31.3" + }, + "scripts": { + "build": "rm -rf static/* && node esbuild && npm run build:old && npm run copy:images", + "build:old": "TOOL_ENV=True ./manage.py collectstatic --noinput", + "copy:images": "mkdir -p static/img/ && cp -r crashstats/crashstats/static/img/ static/img/", + "prestart": "npm run build", + "start": "DEBUG=False bash ../bin/run_service_webapp.sh" } }