From 2d0298249b88e1527a0e132fbc8416e8a69f2ed4 Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Fri, 9 Feb 2024 15:35:19 +0100 Subject: [PATCH] chore: fix import sorting --- frontend/.prettierignore | 2 + frontend/.prettierrc.json | 9 +- frontend/package-lock.json | 1105 +++++++++++++---- frontend/package.json | 2 +- frontend/src/js/app.ts | 8 +- frontend/src/js/core/ai.ts | 6 +- frontend/src/js/core/spotlight-operations.ts | 1 + frontend/src/js/core/store.ts | 1 - frontend/src/js/core/templating.ts | 5 +- frontend/src/js/ui/components/box-version.ts | 1 - .../src/js/ui/components/config/checkbox.ts | 3 +- .../src/js/ui/components/config/creator.ts | 10 +- .../js/ui/components/config/data-source.ts | 2 - .../src/js/ui/components/config/editor.ts | 1 - .../src/js/ui/components/config/file-path.ts | 1 - .../js/ui/components/config/folder-path.ts | 3 +- .../ui/components/config/multiple-options.ts | 3 +- .../src/js/ui/components/config/number.ts | 3 +- .../src/js/ui/components/config/options.ts | 3 +- frontend/src/js/ui/components/config/seed.ts | 1 - frontend/src/js/ui/components/config/text.ts | 3 +- frontend/src/js/ui/components/config/types.ts | 8 +- frontend/src/js/ui/components/device.ts | 1 - .../src/js/ui/components/editor/basic-info.ts | 5 +- .../src/js/ui/components/editor/generator.ts | 11 +- .../src/js/ui/components/editor/images.ts | 1 - .../src/js/ui/components/editor/template.ts | 24 +- frontend/src/js/ui/components/entry-select.ts | 6 +- frontend/src/js/ui/components/image-upload.ts | 1 - .../ui/components/layout/center-container.ts | 2 + .../ui/components/modals/additional-infos.ts | 6 +- .../js/ui/components/modals/create-source.ts | 12 +- .../js/ui/components/modals/file-browser.ts | 12 +- .../modals/imexport/import-export.ts | 3 - .../modals/source/create-edit-entry.ts | 9 +- frontend/src/js/ui/components/monaco.ts | 2 +- .../src/js/ui/components/overlay/dropdown.ts | 3 +- .../ui/components/portal/fullscreen-loader.ts | 1 - .../src/js/ui/components/portal/spotlight.ts | 2 - .../ui/components/print-preview-template.ts | 3 - .../src/js/ui/components/print-preview.ts | 1 - .../src/js/ui/components/source-select.ts | 10 +- .../ui/components/view-layout/breadcrumbs.ts | 2 - .../view-layout/paginated-content.ts | 2 +- .../components/view-layout/property-edit.ts | 2 - .../components/view-layout/side-menu-pager.ts | 3 +- .../js/ui/components/view-layout/side-nav.ts | 1 - .../js/ui/components/view-layout/spoiler.ts | 3 +- frontend/src/js/ui/spectre/icon-button.ts | 1 - frontend/src/js/ui/spectre/modal.ts | 1 - frontend/src/js/ui/spectre/select.ts | 3 +- frontend/src/js/ui/util.ts | 1 - frontend/src/js/ui/views/data-source/all.ts | 9 +- .../src/js/ui/views/data-source/single.ts | 25 +- frontend/src/js/ui/views/devices.ts | 2 - .../src/js/ui/views/extern-print/generator.ts | 4 +- .../src/js/ui/views/extern-print/template.ts | 2 +- frontend/src/js/ui/views/generator/all.ts | 8 +- frontend/src/js/ui/views/generator/create.ts | 2 - frontend/src/js/ui/views/generator/edit.ts | 9 +- frontend/src/js/ui/views/generator/single.ts | 17 +- frontend/src/js/ui/views/home.ts | 5 +- frontend/src/js/ui/views/settings.ts | 19 +- frontend/src/js/ui/views/template/all.ts | 9 +- .../src/js/ui/views/template/create-entity.ts | 20 +- frontend/src/js/ui/views/template/create.ts | 5 +- frontend/src/js/ui/views/template/edit.ts | 9 +- frontend/src/js/ui/views/template/single.ts | 18 +- frontend/src/js/ui/views/workshop/all.ts | 10 +- frontend/src/js/ui/views/workshop/repo.ts | 34 +- frontend/src/js/ui/views/workshop/single.ts | 10 +- 71 files changed, 1023 insertions(+), 509 deletions(-) create mode 100644 frontend/.prettierignore diff --git a/frontend/.prettierignore b/frontend/.prettierignore new file mode 100644 index 00000000..36ed7414 --- /dev/null +++ b/frontend/.prettierignore @@ -0,0 +1,2 @@ +*.json +.DS_Store \ No newline at end of file diff --git a/frontend/.prettierrc.json b/frontend/.prettierrc.json index 954ea62f..317d94d1 100644 --- a/frontend/.prettierrc.json +++ b/frontend/.prettierrc.json @@ -4,23 +4,26 @@ "jsxSingleQuote": true, "singleQuote": true, "tabWidth": 2, - "plugins": ["@trivago/prettier-plugin-sort-imports"], + "plugins": ["@ianvs/prettier-plugin-sort-imports"], "importOrder": [ "^(.*).(css|scss)$", "^/img/(.*)$", + "", "^mithril$", "^lodash-es", + "", "", + "", "^./(.*)$", + "", "js/types/(.*)$", "js/workers/(.*)$", "js/core/(.*)$", + "", "js/ui/spectre(.*)$", "js/ui/components(.*)$", "js/ui/views/(.*)$", "js/ui/[^\/]+$" ], - "importOrderSeparation": true, - "importOrderSortSpecifiers": true, "parser": "babel-ts" } diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 4af09686..468be429 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -11,7 +11,8 @@ "devDependencies": { "@airjp73/dice-notation": "^2.2.2", "@emmetio/codemirror-plugin": "^0.5.4", - "@trivago/prettier-plugin-sort-imports": "^4.2.0", + "@ianvs/prettier-plugin-sort-imports": "^4.1.1", + "@trivago/prettier-plugin-sort-imports": "^4.3.0", "@types/lodash-es": "^4.17.7", "@types/markdown-it": "^13.0.6", "@types/mithril": "^2.0.12", @@ -71,19 +72,130 @@ "moo": "^0.5.1" } }, + "node_modules/@ampproject/remapping": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", + "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", + "dev": true, + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/@babel/code-frame": { - "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", - "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", + "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", "dev": true, "dependencies": { - "@babel/highlight": "^7.22.13", + "@babel/highlight": "^7.23.4", "chalk": "^2.4.2" }, "engines": { "node": ">=6.9.0" } }, + "node_modules/@babel/compat-data": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz", + "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz", + "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", + "@babel/helper-compilation-targets": "^7.23.6", + "@babel/helper-module-transforms": "^7.23.3", + "@babel/helpers": "^7.23.9", + "@babel/parser": "^7.23.9", + "@babel/template": "^7.23.9", + "@babel/traverse": "^7.23.9", + "@babel/types": "^7.23.9", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/core/node_modules/@babel/generator": { + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", + "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", + "dev": true, + "dependencies": { + "@babel/types": "^7.23.6", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core/node_modules/@babel/traverse": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz", + "integrity": "sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.9", + "@babel/types": "^7.23.9", + "debug": "^4.3.1", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core/node_modules/@babel/types": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", + "dev": true, + "dependencies": { + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, "node_modules/@babel/generator": { "version": "7.17.7", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz", @@ -98,6 +210,46 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz", + "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==", + "dev": true, + "dependencies": { + "@babel/compat-data": "^7.23.5", + "@babel/helper-validator-option": "^7.23.5", + "browserslist": "^4.22.2", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "dependencies": { + "yallist": "^3.0.2" + } + }, + "node_modules/@babel/helper-compilation-targets/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@babel/helper-compilation-targets/node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + }, "node_modules/@babel/helper-environment-visitor": { "version": "7.22.20", "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", @@ -160,6 +312,77 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/helper-module-imports": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", + "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", + "dev": true, + "dependencies": { + "@babel/types": "^7.22.15" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-imports/node_modules/@babel/types": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", + "dev": true, + "dependencies": { + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz", + "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==", + "dev": true, + "dependencies": { + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-module-imports": "^7.22.15", + "@babel/helper-simple-access": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/helper-validator-identifier": "^7.22.20" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-simple-access": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", + "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", + "dev": true, + "dependencies": { + "@babel/types": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-simple-access/node_modules/@babel/types": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", + "dev": true, + "dependencies": { + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/helper-split-export-declaration": { "version": "7.22.6", "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", @@ -187,9 +410,9 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", + "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==", "dev": true, "engines": { "node": ">=6.9.0" @@ -204,10 +427,83 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/helper-validator-option": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", + "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.9.tgz", + "integrity": "sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==", + "dev": true, + "dependencies": { + "@babel/template": "^7.23.9", + "@babel/traverse": "^7.23.9", + "@babel/types": "^7.23.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers/node_modules/@babel/generator": { + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", + "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", + "dev": true, + "dependencies": { + "@babel/types": "^7.23.6", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers/node_modules/@babel/traverse": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz", + "integrity": "sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.9", + "@babel/types": "^7.23.9", + "debug": "^4.3.1", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers/node_modules/@babel/types": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", + "dev": true, + "dependencies": { + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/highlight": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", - "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", + "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", "dev": true, "dependencies": { "@babel/helper-validator-identifier": "^7.22.20", @@ -219,9 +515,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz", - "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz", + "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -231,26 +527,26 @@ } }, "node_modules/@babel/template": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", - "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.23.9.tgz", + "integrity": "sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.22.13", - "@babel/parser": "^7.22.15", - "@babel/types": "^7.22.15" + "@babel/code-frame": "^7.23.5", + "@babel/parser": "^7.23.9", + "@babel/types": "^7.23.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/template/node_modules/@babel/types": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz", - "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-string-parser": "^7.23.4", "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, @@ -664,6 +960,58 @@ "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", "dev": true }, + "node_modules/@ianvs/prettier-plugin-sort-imports": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@ianvs/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.1.1.tgz", + "integrity": "sha512-kJhXq63ngpTQ2dxgf5GasbPJWsJA3LgoOdd7WGhpUSzLgLgI4IsIzYkbJf9kmpOHe7Vdm/o3PcRA3jmizXUuAQ==", + "dev": true, + "dependencies": { + "@babel/core": "^7.21.8", + "@babel/generator": "^7.21.5", + "@babel/parser": "^7.21.8", + "@babel/traverse": "^7.21.5", + "@babel/types": "^7.21.5", + "semver": "^7.5.2" + }, + "peerDependencies": { + "@vue/compiler-sfc": ">=3.0.0", + "prettier": "2 || 3" + }, + "peerDependenciesMeta": { + "@vue/compiler-sfc": { + "optional": true + } + } + }, + "node_modules/@ianvs/prettier-plugin-sort-imports/node_modules/@babel/generator": { + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", + "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", + "dev": true, + "dependencies": { + "@babel/types": "^7.23.6", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@ianvs/prettier-plugin-sort-imports/node_modules/@babel/types": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", + "dev": true, + "dependencies": { + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", @@ -882,39 +1230,6 @@ } } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/@typescript-eslint/parser": { "version": "6.11.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.11.0.tgz", @@ -1027,39 +1342,6 @@ } } }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/@typescript-eslint/utils": { "version": "6.11.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.11.0.tgz", @@ -1085,39 +1367,6 @@ "eslint": "^7.0.0 || ^8.0.0" } }, - "node_modules/@typescript-eslint/utils/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/utils/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/utils/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/@typescript-eslint/visitor-keys": { "version": "6.11.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.11.0.tgz", @@ -1283,9 +1532,9 @@ } }, "node_modules/browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", + "version": "4.22.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.3.tgz", + "integrity": "sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==", "dev": true, "funding": [ { @@ -1295,13 +1544,17 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" + "caniuse-lite": "^1.0.30001580", + "electron-to-chromium": "^1.4.648", + "node-releases": "^2.0.14", + "update-browserslist-db": "^1.0.13" }, "bin": { "browserslist": "cli.js" @@ -1320,9 +1573,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001412", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001412.tgz", - "integrity": "sha512-+TeEIee1gS5bYOiuf+PS/kp2mrXic37Hl66VY6EAfxasIk5fELTktK2oOezYed12H8w7jt3s512PpulQidPjwA==", + "version": "1.0.30001585", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001585.tgz", + "integrity": "sha512-yr2BWR1yLXQ8fMpdS/4ZZXpseBgE7o4g41x3a6AJOqZuOi+iE/WdJYAuZ6Y95i4Ohd2Y+9MzIWRR+uGABH4s3Q==", "dev": true, "funding": [ { @@ -1332,6 +1585,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ] }, @@ -1431,6 +1688,12 @@ "proto-list": "~1.2.1" } }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -1602,9 +1865,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.265", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.265.tgz", - "integrity": "sha512-38KaYBNs0oCzWCpr6j7fY/W9vF0vSp4tKFIshQTgdZMhUpkxgotkQgjJP6iGMdmlsgMs3i0/Hkko4UXLTrkYVQ==", + "version": "1.4.664", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.664.tgz", + "integrity": "sha512-k9VKKSkOSNPvSckZgDDl/IQx45E1quMjX8QfLzUsAs/zve8AyFDK+ByRynSP/OfEfryiKHpQeMf00z0leLCc3A==", "dev": true }, "node_modules/emmet": { @@ -2013,9 +2276,9 @@ } }, "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", "dev": true, "engines": { "node": ">=6" @@ -2455,6 +2718,15 @@ "node": ">=10" } }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -2851,6 +3123,18 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -3046,9 +3330,9 @@ "dev": true }, "node_modules/node-releases": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", "dev": true }, "node_modules/nopt": { @@ -3450,6 +3734,39 @@ "node": ">=8.9.0" } }, + "node_modules/semver": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -3683,9 +4000,9 @@ "dev": true }, "node_modules/update-browserslist-db": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz", - "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "dev": true, "funding": [ { @@ -3695,6 +4012,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { @@ -3702,7 +4023,7 @@ "picocolors": "^1.0.0" }, "bin": { - "browserslist-lint": "cli.js" + "update-browserslist-db": "cli.js" }, "peerDependencies": { "browserslist": ">= 4.21.0" @@ -3854,16 +4175,104 @@ "moo": "^0.5.1" } }, + "@ampproject/remapping": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", + "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", + "dev": true, + "requires": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, "@babel/code-frame": { - "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", - "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", + "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", "dev": true, "requires": { - "@babel/highlight": "^7.22.13", + "@babel/highlight": "^7.23.4", "chalk": "^2.4.2" } }, + "@babel/compat-data": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz", + "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==", + "dev": true + }, + "@babel/core": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz", + "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==", + "dev": true, + "requires": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", + "@babel/helper-compilation-targets": "^7.23.6", + "@babel/helper-module-transforms": "^7.23.3", + "@babel/helpers": "^7.23.9", + "@babel/parser": "^7.23.9", + "@babel/template": "^7.23.9", + "@babel/traverse": "^7.23.9", + "@babel/types": "^7.23.9", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "dependencies": { + "@babel/generator": { + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", + "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", + "dev": true, + "requires": { + "@babel/types": "^7.23.6", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + } + }, + "@babel/traverse": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz", + "integrity": "sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.9", + "@babel/types": "^7.23.9", + "debug": "^4.3.1", + "globals": "^11.1.0" + } + }, + "@babel/types": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + } + }, + "semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true + } + } + }, "@babel/generator": { "version": "7.17.7", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz", @@ -3875,6 +4284,42 @@ "source-map": "^0.5.0" } }, + "@babel/helper-compilation-targets": { + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz", + "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==", + "dev": true, + "requires": { + "@babel/compat-data": "^7.23.5", + "@babel/helper-validator-option": "^7.23.5", + "browserslist": "^4.22.2", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + }, + "dependencies": { + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "requires": { + "yallist": "^3.0.2" + } + }, + "semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + } + } + }, "@babel/helper-environment-visitor": { "version": "7.22.20", "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", @@ -3926,6 +4371,63 @@ } } }, + "@babel/helper-module-imports": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", + "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", + "dev": true, + "requires": { + "@babel/types": "^7.22.15" + }, + "dependencies": { + "@babel/types": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + } + } + } + }, + "@babel/helper-module-transforms": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz", + "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==", + "dev": true, + "requires": { + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-module-imports": "^7.22.15", + "@babel/helper-simple-access": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/helper-validator-identifier": "^7.22.20" + } + }, + "@babel/helper-simple-access": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", + "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", + "dev": true, + "requires": { + "@babel/types": "^7.22.5" + }, + "dependencies": { + "@babel/types": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + } + } + } + }, "@babel/helper-split-export-declaration": { "version": "7.22.6", "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", @@ -3949,9 +4451,9 @@ } }, "@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", + "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==", "dev": true }, "@babel/helper-validator-identifier": { @@ -3960,10 +4462,70 @@ "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true }, + "@babel/helper-validator-option": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", + "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", + "dev": true + }, + "@babel/helpers": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.9.tgz", + "integrity": "sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==", + "dev": true, + "requires": { + "@babel/template": "^7.23.9", + "@babel/traverse": "^7.23.9", + "@babel/types": "^7.23.9" + }, + "dependencies": { + "@babel/generator": { + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", + "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", + "dev": true, + "requires": { + "@babel/types": "^7.23.6", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + } + }, + "@babel/traverse": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz", + "integrity": "sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.9", + "@babel/types": "^7.23.9", + "debug": "^4.3.1", + "globals": "^11.1.0" + } + }, + "@babel/types": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + } + } + } + }, "@babel/highlight": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", - "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", + "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.22.20", @@ -3972,29 +4534,29 @@ } }, "@babel/parser": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz", - "integrity": "sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz", + "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==", "dev": true }, "@babel/template": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", - "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.23.9.tgz", + "integrity": "sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==", "dev": true, "requires": { - "@babel/code-frame": "^7.22.13", - "@babel/parser": "^7.22.15", - "@babel/types": "^7.22.15" + "@babel/code-frame": "^7.23.5", + "@babel/parser": "^7.23.9", + "@babel/types": "^7.23.9" }, "dependencies": { "@babel/types": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz", - "integrity": "sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", "dev": true, "requires": { - "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-string-parser": "^7.23.4", "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" } @@ -4360,6 +4922,45 @@ "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", "dev": true }, + "@ianvs/prettier-plugin-sort-imports": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@ianvs/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.1.1.tgz", + "integrity": "sha512-kJhXq63ngpTQ2dxgf5GasbPJWsJA3LgoOdd7WGhpUSzLgLgI4IsIzYkbJf9kmpOHe7Vdm/o3PcRA3jmizXUuAQ==", + "dev": true, + "requires": { + "@babel/core": "^7.21.8", + "@babel/generator": "^7.21.5", + "@babel/parser": "^7.21.8", + "@babel/traverse": "^7.21.5", + "@babel/types": "^7.21.5", + "semver": "^7.5.2" + }, + "dependencies": { + "@babel/generator": { + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", + "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", + "dev": true, + "requires": { + "@babel/types": "^7.23.6", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + } + }, + "@babel/types": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + } + } + } + }, "@jridgewell/gen-mapping": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", @@ -4529,32 +5130,6 @@ "natural-compare": "^1.4.0", "semver": "^7.5.4", "ts-api-utils": "^1.0.1" - }, - "dependencies": { - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } } }, "@typescript-eslint/parser": { @@ -4611,32 +5186,6 @@ "is-glob": "^4.0.3", "semver": "^7.5.4", "ts-api-utils": "^1.0.1" - }, - "dependencies": { - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } } }, "@typescript-eslint/utils": { @@ -4652,32 +5201,6 @@ "@typescript-eslint/types": "6.11.0", "@typescript-eslint/typescript-estree": "6.11.0", "semver": "^7.5.4" - }, - "dependencies": { - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } } }, "@typescript-eslint/visitor-keys": { @@ -4808,15 +5331,15 @@ } }, "browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", + "version": "4.22.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.3.tgz", + "integrity": "sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" + "caniuse-lite": "^1.0.30001580", + "electron-to-chromium": "^1.4.648", + "node-releases": "^2.0.14", + "update-browserslist-db": "^1.0.13" } }, "callsites": { @@ -4826,9 +5349,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001412", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001412.tgz", - "integrity": "sha512-+TeEIee1gS5bYOiuf+PS/kp2mrXic37Hl66VY6EAfxasIk5fELTktK2oOezYed12H8w7jt3s512PpulQidPjwA==", + "version": "1.0.30001585", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001585.tgz", + "integrity": "sha512-yr2BWR1yLXQ8fMpdS/4ZZXpseBgE7o4g41x3a6AJOqZuOi+iE/WdJYAuZ6Y95i4Ohd2Y+9MzIWRR+uGABH4s3Q==", "dev": true }, "chalk": { @@ -4910,6 +5433,12 @@ "proto-list": "~1.2.1" } }, + "convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, "cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -5038,9 +5567,9 @@ } }, "electron-to-chromium": { - "version": "1.4.265", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.265.tgz", - "integrity": "sha512-38KaYBNs0oCzWCpr6j7fY/W9vF0vSp4tKFIshQTgdZMhUpkxgotkQgjJP6iGMdmlsgMs3i0/Hkko4UXLTrkYVQ==", + "version": "1.4.664", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.664.tgz", + "integrity": "sha512-k9VKKSkOSNPvSckZgDDl/IQx45E1quMjX8QfLzUsAs/zve8AyFDK+ByRynSP/OfEfryiKHpQeMf00z0leLCc3A==", "dev": true }, "emmet": { @@ -5258,9 +5787,9 @@ "optional": true }, "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", "dev": true }, "escape-string-regexp": { @@ -5578,6 +6107,12 @@ "integrity": "sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==", "dev": true }, + "gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true + }, "glob": { "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -5880,6 +6415,12 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, + "json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true + }, "keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -6045,9 +6586,9 @@ "dev": true }, "node-releases": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", "dev": true }, "nopt": { @@ -6296,6 +6837,32 @@ "source-map-js": ">=0.6.2 <2.0.0" } }, + "semver": { + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + } + } + }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -6456,9 +7023,9 @@ "dev": true }, "update-browserslist-db": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz", - "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "dev": true, "requires": { "escalade": "^3.1.1", diff --git a/frontend/package.json b/frontend/package.json index f955348f..aea9a915 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -19,7 +19,7 @@ "devDependencies": { "@airjp73/dice-notation": "^2.2.2", "@emmetio/codemirror-plugin": "^0.5.4", - "@trivago/prettier-plugin-sort-imports": "^4.2.0", + "@ianvs/prettier-plugin-sort-imports": "^4.1.1", "@types/lodash-es": "^4.17.7", "@types/markdown-it": "^13.0.6", "@types/mithril": "^2.0.12", diff --git a/frontend/src/js/app.ts b/frontend/src/js/app.ts index 1c239b0b..32f7ffe7 100644 --- a/frontend/src/js/app.ts +++ b/frontend/src/js/app.ts @@ -9,10 +9,11 @@ import m from 'mithril'; import store, { settings } from 'js/core/store'; import Spotlight from 'js/ui/components/portal/spotlight'; - import DataSourceAll from 'js/ui/views/data-source/all'; import DataSourceSingle from 'js/ui/views/data-source/single'; import Devices from 'js/ui/views/devices'; +import ExternPrintGenerator from 'js/ui/views/extern-print/generator'; +import ExternPrintTemplate from 'js/ui/views/extern-print/template'; import GeneratorAll from 'js/ui/views/generator/all'; import GeneratorCreate from 'js/ui/views/generator/create'; import GeneratorEdit from 'js/ui/views/generator/edit'; @@ -25,11 +26,8 @@ import TemplateCreateEntity from 'js/ui/views/template/create-entity'; import TemplateEdit from 'js/ui/views/template/edit'; import TemplateSingle from 'js/ui/views/template/single'; import WorkshopAll from 'js/ui/views/workshop/all'; -import WorkshopSingle from 'js/ui/views/workshop/single'; import WorkshopRepo from 'js/ui/views/workshop/repo'; -import ExternPrintTemplate from 'js/ui/views/extern-print/template'; -import ExternPrintGenerator from 'js/ui/views/extern-print/generator'; - +import WorkshopSingle from 'js/ui/views/workshop/single'; import * as Portal from 'js/ui/portal'; import * as Toast from 'js/ui/toast'; diff --git a/frontend/src/js/core/ai.ts b/frontend/src/js/core/ai.ts index a70ce3f2..1e00a2df 100644 --- a/frontend/src/js/core/ai.ts +++ b/frontend/src/js/core/ai.ts @@ -1,9 +1,9 @@ -import { settings } from 'js/core/store'; +import Entry from 'js/types/entry'; +import Template from 'js/types/template'; import * as API from 'js/core/api'; import { AI_GENERATE } from 'js/core/api'; -import Template from 'js/types/template'; -import Entry from 'js/types/entry'; import { safeCall } from 'js/core/safe'; +import { settings } from 'js/core/store'; /** * Extracts the JSON from the AI response. Sometimes the response is wrapped in a explanation text, diff --git a/frontend/src/js/core/spotlight-operations.ts b/frontend/src/js/core/spotlight-operations.ts index 1ce51b8e..c3e20f7f 100644 --- a/frontend/src/js/core/spotlight-operations.ts +++ b/frontend/src/js/core/spotlight-operations.ts @@ -1,4 +1,5 @@ import m from 'mithril'; + import { openDataSourceCreateModal } from 'js/ui/components/modals/create-source'; export type SpotlightOperation = { diff --git a/frontend/src/js/core/store.ts b/frontend/src/js/core/store.ts index 32d37a99..e7880c98 100644 --- a/frontend/src/js/core/store.ts +++ b/frontend/src/js/core/store.ts @@ -11,7 +11,6 @@ import PublicList from 'js/types/public-list'; import Settings, { createEmptySettings } from 'js/types/settings'; import Template from 'js/types/template'; import * as Version from 'js/types/version'; - import * as API from 'js/core/api'; import { Operations, SpotlightOperation } from 'js/core/spotlight-operations'; diff --git a/frontend/src/js/core/templating.ts b/frontend/src/js/core/templating.ts index 1e2b9e78..808498c4 100644 --- a/frontend/src/js/core/templating.ts +++ b/frontend/src/js/core/templating.ts @@ -1,13 +1,12 @@ +import { cloneDeep } from 'lodash-es'; + import hash from 'object-hash'; import Settings from 'js/types/settings'; - // @ts-ignore import TemplatingWorker from 'js/workers/templating-worker?worker'; - import dither from 'js/core/dither'; import { ai } from 'js/core/store'; -import { cloneDeep } from 'lodash-es'; type WorkerJob = { hashed: string; diff --git a/frontend/src/js/ui/components/box-version.ts b/frontend/src/js/ui/components/box-version.ts index e3523af8..08090dca 100644 --- a/frontend/src/js/ui/components/box-version.ts +++ b/frontend/src/js/ui/components/box-version.ts @@ -1,7 +1,6 @@ import m from 'mithril'; import Button from 'js/ui/spectre/button'; - import Icon from 'js/ui/components/atomic/icon'; import Box from 'js/ui/components/box'; import Flex from 'js/ui/components/layout/flex'; diff --git a/frontend/src/js/ui/components/config/checkbox.ts b/frontend/src/js/ui/components/config/checkbox.ts index bcb8bfe0..6a108f41 100644 --- a/frontend/src/js/ui/components/config/checkbox.ts +++ b/frontend/src/js/ui/components/config/checkbox.ts @@ -1,8 +1,7 @@ import m from 'mithril'; -import MiniHeader from 'js/ui/components/atomic/mini-header'; import Checkbox from 'js/ui/spectre/checkbox'; - +import MiniHeader from 'js/ui/components/atomic/mini-header'; import Config, { ConfigProps } from 'js/ui/components/config/config'; export default { diff --git a/frontend/src/js/ui/components/config/creator.ts b/frontend/src/js/ui/components/config/creator.ts index 3fad2203..65027bdf 100644 --- a/frontend/src/js/ui/components/config/creator.ts +++ b/frontend/src/js/ui/components/config/creator.ts @@ -1,14 +1,16 @@ import m from 'mithril'; + import { ConfigValue } from 'js/types/config'; -import Input from 'js/ui/spectre/input'; + import Button from 'js/ui/spectre/button'; import IconButton from 'js/ui/spectre/icon-button'; +import Input from 'js/ui/spectre/input'; +import Select from 'js/ui/spectre/select'; import Icon from 'js/ui/components/atomic/icon'; +import MiniHeader from 'js/ui/components/atomic/mini-header'; +import types from 'js/ui/components/config/types'; import Flex from 'js/ui/components/layout/flex'; import Spoiler from 'js/ui/components/view-layout/spoiler'; -import types from 'js/ui/components/config/types'; -import Select from 'js/ui/spectre/select'; -import MiniHeader from 'js/ui/components/atomic/mini-header'; type ConfigValueID = ConfigValue & { _id?: string }; diff --git a/frontend/src/js/ui/components/config/data-source.ts b/frontend/src/js/ui/components/config/data-source.ts index 3a7cd586..1ebf4f85 100644 --- a/frontend/src/js/ui/components/config/data-source.ts +++ b/frontend/src/js/ui/components/config/data-source.ts @@ -1,11 +1,9 @@ import m from 'mithril'; import { buildId } from 'js/types/basic-info'; - import { sources } from 'js/core/store'; import Select from 'js/ui/spectre/select'; - import Config from 'js/ui/components/config/config'; export default { diff --git a/frontend/src/js/ui/components/config/editor.ts b/frontend/src/js/ui/components/config/editor.ts index 1d6f439c..0e9287f1 100644 --- a/frontend/src/js/ui/components/config/editor.ts +++ b/frontend/src/js/ui/components/config/editor.ts @@ -1,5 +1,4 @@ import m from 'mithril'; - import { isEqual } from 'lodash-es'; import { css } from 'goober'; diff --git a/frontend/src/js/ui/components/config/file-path.ts b/frontend/src/js/ui/components/config/file-path.ts index 9889f2f3..edf896fa 100644 --- a/frontend/src/js/ui/components/config/file-path.ts +++ b/frontend/src/js/ui/components/config/file-path.ts @@ -1,7 +1,6 @@ import m from 'mithril'; import Button from 'js/ui/spectre/button'; - import Config, { ConfigProps } from 'js/ui/components/config/config'; import { openFileModal } from 'js/ui/components/modals/file-browser'; diff --git a/frontend/src/js/ui/components/config/folder-path.ts b/frontend/src/js/ui/components/config/folder-path.ts index d81d147b..26ee71e5 100644 --- a/frontend/src/js/ui/components/config/folder-path.ts +++ b/frontend/src/js/ui/components/config/folder-path.ts @@ -1,9 +1,8 @@ import m from 'mithril'; -import { openFileModal } from 'js/ui/components/modals/file-browser'; import Button from 'js/ui/spectre/button'; - import Config, { ConfigProps } from 'js/ui/components/config/config'; +import { openFileModal } from 'js/ui/components/modals/file-browser'; export default { name: 'FilePath', diff --git a/frontend/src/js/ui/components/config/multiple-options.ts b/frontend/src/js/ui/components/config/multiple-options.ts index f7588721..3b51bcbc 100644 --- a/frontend/src/js/ui/components/config/multiple-options.ts +++ b/frontend/src/js/ui/components/config/multiple-options.ts @@ -1,12 +1,11 @@ import m from 'mithril'; -import MiniHeader from 'js/ui/components/atomic/mini-header'; import Checkbox from 'js/ui/spectre/checkbox'; import Input from 'js/ui/spectre/input'; import Label from 'js/ui/spectre/label'; import Select, { OnInputEvent } from 'js/ui/spectre/select'; - import Icon from 'js/ui/components/atomic/icon'; +import MiniHeader from 'js/ui/components/atomic/mini-header'; import Config, { ConfigProps } from 'js/ui/components/config/config'; export default { diff --git a/frontend/src/js/ui/components/config/number.ts b/frontend/src/js/ui/components/config/number.ts index a4026d80..53a11a8d 100644 --- a/frontend/src/js/ui/components/config/number.ts +++ b/frontend/src/js/ui/components/config/number.ts @@ -1,8 +1,7 @@ import m from 'mithril'; -import MiniHeader from 'js/ui/components/atomic/mini-header'; import Input from 'js/ui/spectre/input'; - +import MiniHeader from 'js/ui/components/atomic/mini-header'; import Config, { ConfigProps } from 'js/ui/components/config/config'; export default { diff --git a/frontend/src/js/ui/components/config/options.ts b/frontend/src/js/ui/components/config/options.ts index 81a36b52..4756e4a3 100644 --- a/frontend/src/js/ui/components/config/options.ts +++ b/frontend/src/js/ui/components/config/options.ts @@ -1,9 +1,8 @@ import m from 'mithril'; -import MiniHeader from 'js/ui/components/atomic/mini-header'; import Input from 'js/ui/spectre/input'; import Select from 'js/ui/spectre/select'; - +import MiniHeader from 'js/ui/components/atomic/mini-header'; import Config, { ConfigProps } from 'js/ui/components/config/config'; export default { diff --git a/frontend/src/js/ui/components/config/seed.ts b/frontend/src/js/ui/components/config/seed.ts index c2871c40..15df9ae2 100644 --- a/frontend/src/js/ui/components/config/seed.ts +++ b/frontend/src/js/ui/components/config/seed.ts @@ -2,7 +2,6 @@ import m from 'mithril'; import Button from 'js/ui/spectre/button'; import Input from 'js/ui/spectre/input'; - import Icon from 'js/ui/components/atomic/icon'; import Config, { ConfigProps } from 'js/ui/components/config/config'; import Flex from 'js/ui/components/layout/flex'; diff --git a/frontend/src/js/ui/components/config/text.ts b/frontend/src/js/ui/components/config/text.ts index 24efe1d4..66b5300c 100644 --- a/frontend/src/js/ui/components/config/text.ts +++ b/frontend/src/js/ui/components/config/text.ts @@ -1,8 +1,7 @@ import m from 'mithril'; -import MiniHeader from 'js/ui/components/atomic/mini-header'; import Input from 'js/ui/spectre/input'; - +import MiniHeader from 'js/ui/components/atomic/mini-header'; import Config, { ConfigProps } from 'js/ui/components/config/config'; export default { diff --git a/frontend/src/js/ui/components/config/types.ts b/frontend/src/js/ui/components/config/types.ts index 0f7913c1..b05150e4 100644 --- a/frontend/src/js/ui/components/config/types.ts +++ b/frontend/src/js/ui/components/config/types.ts @@ -1,12 +1,12 @@ import Checkbox from './checkbox'; -import Number from './number'; -import Options from './options'; -import Seed from './seed'; -import Text from './text'; import DataSources from './data-source'; import FilePath from './file-path'; import FolderPath from './folder-path'; import MultipleOptions from './multiple-options'; +import Number from './number'; +import Options from './options'; +import Seed from './seed'; +import Text from './text'; export default { Checkbox, diff --git a/frontend/src/js/ui/components/device.ts b/frontend/src/js/ui/components/device.ts index a8edbe80..c614e7c9 100644 --- a/frontend/src/js/ui/components/device.ts +++ b/frontend/src/js/ui/components/device.ts @@ -1,7 +1,6 @@ import m from 'mithril'; import Button from 'js/ui/spectre/button'; - import Box from 'js/ui/components/box'; import Flex from 'js/ui/components/layout/flex'; diff --git a/frontend/src/js/ui/components/editor/basic-info.ts b/frontend/src/js/ui/components/editor/basic-info.ts index 0b3d9d95..dc43bfff 100644 --- a/frontend/src/js/ui/components/editor/basic-info.ts +++ b/frontend/src/js/ui/components/editor/basic-info.ts @@ -1,12 +1,11 @@ import m from 'mithril'; import BasicInfo from 'js/types/basic-info'; -import EditorHeader from 'js/ui/components/view-layout/property-header'; -import PropertyEdit, { type PropertyAnnotation } from 'js/ui/components/view-layout/property-edit'; import Icon from 'js/ui/components/atomic/icon'; import Flex from 'js/ui/components/layout/flex'; - +import PropertyEdit, { type PropertyAnnotation } from 'js/ui/components/view-layout/property-edit'; +import EditorHeader from 'js/ui/components/view-layout/property-header'; import { author, slug } from 'js/ui/validator'; export type BasicInfoProps = { diff --git a/frontend/src/js/ui/components/editor/generator.ts b/frontend/src/js/ui/components/editor/generator.ts index 8387dc5e..21eaef9a 100644 --- a/frontend/src/js/ui/components/editor/generator.ts +++ b/frontend/src/js/ui/components/editor/generator.ts @@ -2,22 +2,21 @@ import m from 'mithril'; import { fillConfigValues } from 'js/types/config'; import Generator, { sanitizeConfig } from 'js/types/generator'; - import { createNunjucksCompletionProvider } from 'js/core/monaco/completion-nunjucks'; import { settings } from 'js/core/store'; +import Label from 'js/ui/spectre/label'; +import Icon from 'js/ui/components/atomic/icon'; +import ConfigCreator from 'js/ui/components/config/creator'; import Editor from 'js/ui/components/config/editor'; import BasicInfo from 'js/ui/components/editor/basic-info'; import Images from 'js/ui/components/editor/images'; import Flex from 'js/ui/components/layout/flex'; import Monaco from 'js/ui/components/monaco'; import PrintPreviewTemplate, { PrintPreviewError } from 'js/ui/components/print-preview-template'; -import SideMenuPager from 'js/ui/components/view-layout/side-menu-pager'; -import EditorHeader from 'js/ui/components/view-layout/property-header'; -import ConfigCreator from 'js/ui/components/config/creator'; import SourceSelect from 'js/ui/components/source-select'; -import Label from 'js/ui/spectre/label'; -import Icon from 'js/ui/components/atomic/icon'; +import EditorHeader from 'js/ui/components/view-layout/property-header'; +import SideMenuPager from 'js/ui/components/view-layout/side-menu-pager'; type GeneratorEditorProps = { generator: Generator; diff --git a/frontend/src/js/ui/components/editor/images.ts b/frontend/src/js/ui/components/editor/images.ts index 01d47cf0..44a5d4d9 100644 --- a/frontend/src/js/ui/components/editor/images.ts +++ b/frontend/src/js/ui/components/editor/images.ts @@ -1,5 +1,4 @@ import m from 'mithril'; - import { map } from 'lodash-es'; import { css } from 'goober'; diff --git a/frontend/src/js/ui/components/editor/template.ts b/frontend/src/js/ui/components/editor/template.ts index 77da6f70..e013a017 100644 --- a/frontend/src/js/ui/components/editor/template.ts +++ b/frontend/src/js/ui/components/editor/template.ts @@ -1,32 +1,30 @@ import m from 'mithril'; - import { debounce } from 'lodash-es'; -import Template from 'js/types/template'; import Entry from 'js/types/entry'; - +import Template from 'js/types/template'; import { buildId } from 'src/js/types/basic-info'; +import { fillConfigValues } from 'src/js/types/config'; +import * as API from 'js/core/api'; import { createNunjucksCompletionProvider } from 'js/core/monaco/completion-nunjucks'; import { settings } from 'js/core/store'; -import * as API from 'js/core/api'; -import { error, dialogWarning } from 'js/ui/toast'; import { render } from 'js/core/templating'; +import Button from 'js/ui/spectre/button'; +import Label from 'js/ui/spectre/label'; +import Icon from 'js/ui/components/atomic/icon'; +import ConfigCreator from 'js/ui/components/config/creator'; +import Editor from 'js/ui/components/config/editor'; import BasicInfo from 'js/ui/components/editor/basic-info'; import Images from 'js/ui/components/editor/images'; +import EntrySelect from 'js/ui/components/entry-select'; import Flex from 'js/ui/components/layout/flex'; import Monaco from 'js/ui/components/monaco'; -import Editor from 'js/ui/components/config/editor'; import PrintPreviewTemplate, { PrintPreviewError } from 'js/ui/components/print-preview-template'; -import SideMenuPager from 'js/ui/components/view-layout/side-menu-pager'; import SourceSelect from 'js/ui/components/source-select'; -import Label from 'js/ui/spectre/label'; -import Button from 'js/ui/spectre/button'; -import Icon from 'js/ui/components/atomic/icon'; import EditorHeader from 'js/ui/components/view-layout/property-header'; -import EntrySelect from 'js/ui/components/entry-select'; -import ConfigCreator from 'js/ui/components/config/creator'; -import { fillConfigValues } from 'src/js/types/config'; +import SideMenuPager from 'js/ui/components/view-layout/side-menu-pager'; +import { dialogWarning, error } from 'js/ui/toast'; type TemplateEditorProps = { template: Template; diff --git a/frontend/src/js/ui/components/entry-select.ts b/frontend/src/js/ui/components/entry-select.ts index c38170dc..78ef97db 100644 --- a/frontend/src/js/ui/components/entry-select.ts +++ b/frontend/src/js/ui/components/entry-select.ts @@ -1,8 +1,10 @@ import m from 'mithril'; -import Dropdown from 'js/ui/components/overlay/dropdown'; -import Input from 'js/ui/spectre/input'; + import Entry from 'js/types/entry'; +import Input from 'js/ui/spectre/input'; +import Dropdown from 'js/ui/components/overlay/dropdown'; + type EntrySelectProps = { className?: string; entries: Entry[]; diff --git a/frontend/src/js/ui/components/image-upload.ts b/frontend/src/js/ui/components/image-upload.ts index 3063fcaf..b917fffb 100644 --- a/frontend/src/js/ui/components/image-upload.ts +++ b/frontend/src/js/ui/components/image-upload.ts @@ -5,7 +5,6 @@ import guid from 'js/core/guid'; import Button from 'js/ui/spectre/button'; import Input from 'js/ui/spectre/input'; - import Icon from 'js/ui/components/atomic/icon'; import Flex from 'js/ui/components/layout/flex'; diff --git a/frontend/src/js/ui/components/layout/center-container.ts b/frontend/src/js/ui/components/layout/center-container.ts index e113c48c..bdda653a 100644 --- a/frontend/src/js/ui/components/layout/center-container.ts +++ b/frontend/src/js/ui/components/layout/center-container.ts @@ -1,5 +1,7 @@ import m from 'mithril'; + import { css } from 'goober'; + import Flex from 'js/ui/components/layout/flex'; const containerClass = css` diff --git a/frontend/src/js/ui/components/modals/additional-infos.ts b/frontend/src/js/ui/components/modals/additional-infos.ts index 50b0f5e3..a1834864 100644 --- a/frontend/src/js/ui/components/modals/additional-infos.ts +++ b/frontend/src/js/ui/components/modals/additional-infos.ts @@ -1,10 +1,10 @@ import m from 'mithril'; -import { popPortal, pushPortal } from 'js/ui/portal'; -import Modal from 'js/ui/spectre/modal'; import Input from 'js/ui/spectre/input'; -import Flex from 'js/ui/components/layout/flex'; +import Modal from 'js/ui/spectre/modal'; import TextArea from 'js/ui/spectre/text-area'; +import Flex from 'js/ui/components/layout/flex'; +import { popPortal, pushPortal } from 'js/ui/portal'; type AdditionalInfosProps = { type: 'generator' | 'template'; diff --git a/frontend/src/js/ui/components/modals/create-source.ts b/frontend/src/js/ui/components/modals/create-source.ts index d813c485..0d0fb736 100644 --- a/frontend/src/js/ui/components/modals/create-source.ts +++ b/frontend/src/js/ui/components/modals/create-source.ts @@ -1,12 +1,14 @@ import m from 'mithril'; + +import { buildId } from 'js/types/basic-info'; +import * as API from 'js/core/api'; +import store from 'js/core/store'; + +import Button from 'js/ui/spectre/button'; import Modal from 'js/ui/spectre/modal'; -import { popPortal, pushPortal } from 'js/ui/portal'; import BasicInfo from 'js/ui/components/editor/basic-info'; -import Button from 'js/ui/spectre/button'; -import * as API from 'js/core/api'; +import { popPortal, pushPortal } from 'js/ui/portal'; import { error } from 'js/ui/toast'; -import store from 'js/core/store'; -import { buildId } from 'js/types/basic-info'; type CreateSourceProps = { name: string; diff --git a/frontend/src/js/ui/components/modals/file-browser.ts b/frontend/src/js/ui/components/modals/file-browser.ts index 80058be7..27a5cd0a 100644 --- a/frontend/src/js/ui/components/modals/file-browser.ts +++ b/frontend/src/js/ui/components/modals/file-browser.ts @@ -1,12 +1,14 @@ import m from 'mithril'; -import { popPortal, pushPortal } from 'js/ui/portal'; + import * as API from 'js/core/api'; -import Modal from 'js/ui/spectre/modal'; -import SideMenu from 'js/ui/components/view-layout/side-menu'; -import Flex from 'js/ui/components/layout/flex'; + +import Button from 'js/ui/spectre/button'; import Input from 'js/ui/spectre/input'; +import Modal from 'js/ui/spectre/modal'; import Icon from 'js/ui/components/atomic/icon'; -import Button from 'js/ui/spectre/button'; +import Flex from 'js/ui/components/layout/flex'; +import SideMenu from 'js/ui/components/view-layout/side-menu'; +import { popPortal, pushPortal } from 'js/ui/portal'; type FileBrowserProps = { title: string; diff --git a/frontend/src/js/ui/components/modals/imexport/import-export.ts b/frontend/src/js/ui/components/modals/imexport/import-export.ts index 6814b0e4..066fff77 100644 --- a/frontend/src/js/ui/components/modals/imexport/import-export.ts +++ b/frontend/src/js/ui/components/modals/imexport/import-export.ts @@ -1,7 +1,6 @@ import m from 'mithril'; import { ImportExport } from 'js/types/import-export'; - import * as API from 'js/core/api'; import store from 'js/core/store'; @@ -9,12 +8,10 @@ import Button from 'js/ui/spectre/button'; import Loader from 'js/ui/spectre/loader'; import Modal from 'js/ui/spectre/modal'; import Select from 'js/ui/spectre/select'; - import Config from 'js/ui/components/config/config'; import ConfigTypes from 'js/ui/components/config/types'; import HorizontalProperty from 'js/ui/components/horizontal-property'; import Flex from 'js/ui/components/layout/flex'; - import { popPortal } from 'js/ui/portal'; import { error, success } from 'js/ui/toast'; diff --git a/frontend/src/js/ui/components/modals/source/create-edit-entry.ts b/frontend/src/js/ui/components/modals/source/create-edit-entry.ts index ec80ae2f..6e8c40f5 100644 --- a/frontend/src/js/ui/components/modals/source/create-edit-entry.ts +++ b/frontend/src/js/ui/components/modals/source/create-edit-entry.ts @@ -1,10 +1,11 @@ import m from 'mithril'; -import Modal from 'js/ui/spectre/modal'; -import { popPortal, pushPortal } from 'js/ui/portal'; -import Flex from 'js/ui/components/layout/flex'; -import Input from 'js/ui/spectre/input'; + import Button from 'js/ui/spectre/button'; +import Input from 'js/ui/spectre/input'; +import Modal from 'js/ui/spectre/modal'; import HorizontalProperty from 'js/ui/components/horizontal-property'; +import Flex from 'js/ui/components/layout/flex'; +import { popPortal, pushPortal } from 'js/ui/portal'; type CreateEditEntrySourceEntryProps = { id?: string; diff --git a/frontend/src/js/ui/components/monaco.ts b/frontend/src/js/ui/components/monaco.ts index b32c01e0..613fe244 100644 --- a/frontend/src/js/ui/components/monaco.ts +++ b/frontend/src/js/ui/components/monaco.ts @@ -1,8 +1,8 @@ import m from 'mithril'; import { emmetHTML } from 'emmet-monaco-es'; -import * as monaco from 'monaco-editor'; import { css } from 'goober'; +import * as monaco from 'monaco-editor'; import guid from 'js/core/guid'; import type { CompletionFunction } from 'js/core/monaco/completion'; diff --git a/frontend/src/js/ui/components/overlay/dropdown.ts b/frontend/src/js/ui/components/overlay/dropdown.ts index 8b6aa1a1..4b14f0c1 100644 --- a/frontend/src/js/ui/components/overlay/dropdown.ts +++ b/frontend/src/js/ui/components/overlay/dropdown.ts @@ -1,8 +1,7 @@ import m from 'mithril'; -import Tippy from 'tippy.js'; - import { css } from 'goober'; +import Tippy from 'tippy.js'; const dropdownStyle = css` border: 0.05rem solid #bcc3ce; diff --git a/frontend/src/js/ui/components/portal/fullscreen-loader.ts b/frontend/src/js/ui/components/portal/fullscreen-loader.ts index 94e21744..547c3b86 100644 --- a/frontend/src/js/ui/components/portal/fullscreen-loader.ts +++ b/frontend/src/js/ui/components/portal/fullscreen-loader.ts @@ -1,7 +1,6 @@ import m from 'mithril'; import Loader from 'js/ui/spectre/loader'; - import Flex from 'js/ui/components/layout/flex'; export type FullscreenLoaderProps = { diff --git a/frontend/src/js/ui/components/portal/spotlight.ts b/frontend/src/js/ui/components/portal/spotlight.ts index 4ba7b5b4..86cd3cbc 100644 --- a/frontend/src/js/ui/components/portal/spotlight.ts +++ b/frontend/src/js/ui/components/portal/spotlight.ts @@ -1,5 +1,4 @@ import m from 'mithril'; - import { capitalize, debounce } from 'lodash-es'; import Fuse from 'fuse.js'; @@ -10,7 +9,6 @@ import store, { FuseSearch } from 'js/core/store'; import Icon from 'js/ui/components/atomic/icon'; import Key from 'js/ui/components/atomic/key'; import Flex from 'js/ui/components/layout/flex'; - import { clearPortal } from 'js/ui/portal'; const ItemHeight = 60; diff --git a/frontend/src/js/ui/components/print-preview-template.ts b/frontend/src/js/ui/components/print-preview-template.ts index d93570e5..d121dab5 100644 --- a/frontend/src/js/ui/components/print-preview-template.ts +++ b/frontend/src/js/ui/components/print-preview-template.ts @@ -1,15 +1,12 @@ import m from 'mithril'; - import { cloneDeep, debounce, isEqual } from 'lodash-es'; import Generator from 'js/types/generator'; import Template from 'js/types/template'; - import store, { settings } from 'js/core/store'; import { containsAi, render } from 'js/core/templating'; import Button from 'js/ui/spectre/button'; - import Icon from 'js/ui/components/atomic/icon'; import Flex from 'js/ui/components/layout/flex'; import PrintPreview from 'js/ui/components/print-preview'; diff --git a/frontend/src/js/ui/components/print-preview.ts b/frontend/src/js/ui/components/print-preview.ts index 5d64c2a8..4ba9b4c4 100644 --- a/frontend/src/js/ui/components/print-preview.ts +++ b/frontend/src/js/ui/components/print-preview.ts @@ -1,5 +1,4 @@ import m from 'mithril'; - import { startsWith } from 'lodash-es'; import { css, keyframes } from 'goober'; diff --git a/frontend/src/js/ui/components/source-select.ts b/frontend/src/js/ui/components/source-select.ts index 03068b2f..6a72cac0 100644 --- a/frontend/src/js/ui/components/source-select.ts +++ b/frontend/src/js/ui/components/source-select.ts @@ -1,10 +1,12 @@ import m from 'mithril'; -import Dropdown from 'js/ui/components/overlay/dropdown'; -import Input from 'js/ui/spectre/input'; -import { sources } from 'js/core/store'; + import { buildId } from 'js/types/basic-info'; -import Flex from 'js/ui/components/layout/flex'; +import { sources } from 'js/core/store'; + +import Input from 'js/ui/spectre/input'; import Icon from 'js/ui/components/atomic/icon'; +import Flex from 'js/ui/components/layout/flex'; +import Dropdown from 'js/ui/components/overlay/dropdown'; type SourceSelectProps = { sources: string[]; diff --git a/frontend/src/js/ui/components/view-layout/breadcrumbs.ts b/frontend/src/js/ui/components/view-layout/breadcrumbs.ts index aa7ef7f5..22da8c26 100644 --- a/frontend/src/js/ui/components/view-layout/breadcrumbs.ts +++ b/frontend/src/js/ui/components/view-layout/breadcrumbs.ts @@ -1,10 +1,8 @@ import m from 'mithril'; - import { flatMap } from 'lodash-es'; import Icon from 'js/ui/components/atomic/icon'; import Flex from 'js/ui/components/layout/flex'; - import { dialogWarning } from 'js/ui/toast'; type BreadcrumbItem = { diff --git a/frontend/src/js/ui/components/view-layout/paginated-content.ts b/frontend/src/js/ui/components/view-layout/paginated-content.ts index aebc3ca4..39b148a9 100644 --- a/frontend/src/js/ui/components/view-layout/paginated-content.ts +++ b/frontend/src/js/ui/components/view-layout/paginated-content.ts @@ -1,7 +1,7 @@ import m from 'mithril'; -import Flex from 'js/ui/components/layout/flex'; import IconButton from 'js/ui/spectre/icon-button'; +import Flex from 'js/ui/components/layout/flex'; type PaginatedContentProps = { perPage: number; diff --git a/frontend/src/js/ui/components/view-layout/property-edit.ts b/frontend/src/js/ui/components/view-layout/property-edit.ts index 92c1a2cc..a1077f50 100644 --- a/frontend/src/js/ui/components/view-layout/property-edit.ts +++ b/frontend/src/js/ui/components/view-layout/property-edit.ts @@ -1,12 +1,10 @@ import m from 'mithril'; - import { map } from 'lodash-es'; import Checkbox from 'js/ui/spectre/checkbox'; import IconButton from 'js/ui/spectre/icon-button'; import Input from 'js/ui/spectre/input'; import TextArea from 'js/ui/spectre/text-area'; - import Icon from 'js/ui/components/atomic/icon'; import HorizontalProperty from 'js/ui/components/horizontal-property'; import Flex from 'js/ui/components/layout/flex'; diff --git a/frontend/src/js/ui/components/view-layout/side-menu-pager.ts b/frontend/src/js/ui/components/view-layout/side-menu-pager.ts index bdec4c9b..33fb08b9 100644 --- a/frontend/src/js/ui/components/view-layout/side-menu-pager.ts +++ b/frontend/src/js/ui/components/view-layout/side-menu-pager.ts @@ -1,10 +1,9 @@ import m from 'mithril'; +import CenterContainer from 'js/ui/components/layout/center-container'; import Flex from 'js/ui/components/layout/flex'; import SideMenu, { type SideMenuItem } from 'js/ui/components/view-layout/side-menu'; - import { filterChildren } from 'js/ui/util'; -import CenterContainer from 'js/ui/components/layout/center-container'; type SideMenuPagerItem = { id?: string; diff --git a/frontend/src/js/ui/components/view-layout/side-nav.ts b/frontend/src/js/ui/components/view-layout/side-nav.ts index 328f6e49..3dd2451f 100644 --- a/frontend/src/js/ui/components/view-layout/side-nav.ts +++ b/frontend/src/js/ui/components/view-layout/side-nav.ts @@ -1,5 +1,4 @@ import m from 'mithril'; - import { map } from 'lodash-es'; import Logo from 'js/ui/components/atomic/logo'; diff --git a/frontend/src/js/ui/components/view-layout/spoiler.ts b/frontend/src/js/ui/components/view-layout/spoiler.ts index 9a0f6508..d66a5047 100644 --- a/frontend/src/js/ui/components/view-layout/spoiler.ts +++ b/frontend/src/js/ui/components/view-layout/spoiler.ts @@ -1,6 +1,7 @@ import m from 'mithril'; -import Flex from 'js/ui/components/layout/flex'; + import Icon from 'js/ui/components/atomic/icon'; +import Flex from 'js/ui/components/layout/flex'; type SpoilerProps = { title: m.Component; diff --git a/frontend/src/js/ui/spectre/icon-button.ts b/frontend/src/js/ui/spectre/icon-button.ts index 25b7372f..1d8a64ff 100644 --- a/frontend/src/js/ui/spectre/icon-button.ts +++ b/frontend/src/js/ui/spectre/icon-button.ts @@ -1,7 +1,6 @@ import m from 'mithril'; import Button, { type ButtonProps } from 'js/ui/spectre/button'; - import Icon from 'js/ui/components/atomic/icon'; type IconButtonProps = ButtonProps & { diff --git a/frontend/src/js/ui/spectre/modal.ts b/frontend/src/js/ui/spectre/modal.ts index 764b1e19..929cc96d 100644 --- a/frontend/src/js/ui/spectre/modal.ts +++ b/frontend/src/js/ui/spectre/modal.ts @@ -1,7 +1,6 @@ import m from 'mithril'; import Loader from 'js/ui/spectre/loader'; - import Icon from 'js/ui/components/atomic/icon'; import Flex from 'js/ui/components/layout/flex'; diff --git a/frontend/src/js/ui/spectre/select.ts b/frontend/src/js/ui/spectre/select.ts index a2b8fe0b..c869bcfa 100644 --- a/frontend/src/js/ui/spectre/select.ts +++ b/frontend/src/js/ui/spectre/select.ts @@ -1,8 +1,7 @@ import m from 'mithril'; -import Tippy from 'tippy.js'; - import { css } from 'goober'; +import Tippy from 'tippy.js'; const dropdownStyle = css` border: 0.05rem solid #bcc3ce; diff --git a/frontend/src/js/ui/util.ts b/frontend/src/js/ui/util.ts index 49223506..ad5a608a 100644 --- a/frontend/src/js/ui/util.ts +++ b/frontend/src/js/ui/util.ts @@ -1,5 +1,4 @@ import m from 'mithril'; - import { isArray } from 'lodash-es'; /** diff --git a/frontend/src/js/ui/views/data-source/all.ts b/frontend/src/js/ui/views/data-source/all.ts index 8d6bbaa8..5062f81d 100644 --- a/frontend/src/js/ui/views/data-source/all.ts +++ b/frontend/src/js/ui/views/data-source/all.ts @@ -1,24 +1,21 @@ import m from 'mithril'; - import { groupBy, map } from 'lodash-es'; import { buildId } from 'js/types/basic-info'; - +import * as API from 'js/core/api'; import store, { generators, sources } from 'js/core/store'; +import IconButton from 'js/ui/spectre/icon-button'; import Input from 'js/ui/spectre/input'; import Icon from 'js/ui/components/atomic/icon'; import Title from 'js/ui/components/atomic/title'; import Flex from 'js/ui/components/layout/flex'; import Grid from 'js/ui/components/layout/grid'; +import { openDataSourceCreateModal } from 'js/ui/components/modals/create-source'; import ImportExport from 'js/ui/components/modals/imexport/import-export'; import SourceBox from 'js/ui/components/source-box'; import Base from 'js/ui/components/view-layout/base'; -import * as API from 'js/core/api'; - import { setPortal } from 'js/ui/portal'; -import IconButton from 'js/ui/spectre/icon-button'; -import { openDataSourceCreateModal } from 'js/ui/components/modals/create-source'; export default (): m.Component => { let searchValue = ''; diff --git a/frontend/src/js/ui/views/data-source/single.ts b/frontend/src/js/ui/views/data-source/single.ts index 0ab2cceb..39726322 100644 --- a/frontend/src/js/ui/views/data-source/single.ts +++ b/frontend/src/js/ui/views/data-source/single.ts @@ -1,29 +1,28 @@ import m from 'mithril'; +import { buildId } from 'js/types/basic-info'; import DataSource from 'js/types/data-source'; import Entry from 'js/types/entry'; - import * as API from 'js/core/api'; +import store from 'js/core/store'; import Button from 'js/ui/spectre/button'; -import Loader from 'js/ui/spectre/loader'; -import Base from 'js/ui/components/view-layout/base'; -import Breadcrumbs from 'js/ui/components/view-layout/breadcrumbs'; -import SidebarPage from 'js/ui/components/view-layout/sidebar-page'; -import { dialogWarning, error, success } from 'js/ui/toast'; -import PaginatedContent from 'js/ui/components/view-layout/paginated-content'; +import IconButton from 'js/ui/spectre/icon-button'; import Input from 'js/ui/spectre/input'; -import EntryListItem from 'js/ui/components/entry-list-item'; -import Monaco from 'js/ui/components/monaco'; +import Loader from 'js/ui/spectre/loader'; import Icon from 'js/ui/components/atomic/icon'; import Tooltip from 'js/ui/components/atomic/tooltip'; -import store from 'js/core/store'; +import EntryListItem from 'js/ui/components/entry-list-item'; import Flex from 'js/ui/components/layout/flex'; +import ImportExport from 'js/ui/components/modals/imexport/import-export'; import CreateSourceEntry from 'js/ui/components/modals/source/create-edit-entry'; -import IconButton from 'js/ui/spectre/icon-button'; +import Monaco from 'js/ui/components/monaco'; +import Base from 'js/ui/components/view-layout/base'; +import Breadcrumbs from 'js/ui/components/view-layout/breadcrumbs'; +import PaginatedContent from 'js/ui/components/view-layout/paginated-content'; +import SidebarPage from 'js/ui/components/view-layout/sidebar-page'; import { setPortal } from 'js/ui/portal'; -import { buildId } from 'js/types/basic-info'; -import ImportExport from 'js/ui/components/modals/imexport/import-export'; +import { dialogWarning, error, success } from 'js/ui/toast'; type SingleSourceProps = { id: string; diff --git a/frontend/src/js/ui/views/devices.ts b/frontend/src/js/ui/views/devices.ts index a5e4d3ac..e17c18b6 100644 --- a/frontend/src/js/ui/views/devices.ts +++ b/frontend/src/js/ui/views/devices.ts @@ -1,11 +1,9 @@ import m from 'mithril'; - import { map } from 'lodash-es'; import store, { settings } from 'js/core/store'; import Select from 'js/ui/spectre/select'; - import InfoIcon from 'js/ui/components/atomic/info-icon'; import Title from 'js/ui/components/atomic/title'; import Device from 'js/ui/components/device'; diff --git a/frontend/src/js/ui/views/extern-print/generator.ts b/frontend/src/js/ui/views/extern-print/generator.ts index 7176c3ce..91fab7e1 100644 --- a/frontend/src/js/ui/views/extern-print/generator.ts +++ b/frontend/src/js/ui/views/extern-print/generator.ts @@ -1,9 +1,9 @@ import m from 'mithril'; +import Generator from 'js/types/generator'; import * as API from 'js/core/api'; -import { render } from 'js/core/templating'; import { settings } from 'js/core/store'; -import Generator from 'js/types/generator'; +import { render } from 'js/core/templating'; type ExternPrintProps = { id: string; diff --git a/frontend/src/js/ui/views/extern-print/template.ts b/frontend/src/js/ui/views/extern-print/template.ts index a53ca291..0eb5313b 100644 --- a/frontend/src/js/ui/views/extern-print/template.ts +++ b/frontend/src/js/ui/views/extern-print/template.ts @@ -2,8 +2,8 @@ import m from 'mithril'; import Template from 'js/types/template'; import * as API from 'js/core/api'; -import { render } from 'js/core/templating'; import { settings } from 'js/core/store'; +import { render } from 'js/core/templating'; type ExternPrintProps = { id: string; diff --git a/frontend/src/js/ui/views/generator/all.ts b/frontend/src/js/ui/views/generator/all.ts index 163f32db..99d989bd 100644 --- a/frontend/src/js/ui/views/generator/all.ts +++ b/frontend/src/js/ui/views/generator/all.ts @@ -1,23 +1,21 @@ import m from 'mithril'; - import { groupBy, map } from 'lodash-es'; import { buildId } from 'js/types/basic-info'; import { sanitizeConfig } from 'js/types/generator'; - +import * as API from 'js/core/api'; import store, { generators } from 'js/core/store'; +import IconButton from 'js/ui/spectre/icon-button'; import Input from 'js/ui/spectre/input'; import Icon from 'js/ui/components/atomic/icon'; import Title from 'js/ui/components/atomic/title'; import Flex from 'js/ui/components/layout/flex'; import Grid from 'js/ui/components/layout/grid'; +import ImportExport from 'js/ui/components/modals/imexport/import-export'; import TemplateBox from 'js/ui/components/template-box'; import Base from 'js/ui/components/view-layout/base'; -import IconButton from 'js/ui/spectre/icon-button'; import { setPortal } from 'js/ui/portal'; -import * as API from 'js/core/api'; -import ImportExport from 'js/ui/components/modals/imexport/import-export'; export default (): m.Component => { let searchValue = ''; diff --git a/frontend/src/js/ui/views/generator/create.ts b/frontend/src/js/ui/views/generator/create.ts index e2fe281f..03a43605 100644 --- a/frontend/src/js/ui/views/generator/create.ts +++ b/frontend/src/js/ui/views/generator/create.ts @@ -2,7 +2,6 @@ import m from 'mithril'; import { buildId } from 'js/types/basic-info'; import Generator, { createEmptyGenerator } from 'js/types/generator'; - import * as API from 'js/core/api'; import store from 'js/core/store'; @@ -11,7 +10,6 @@ import Loader from 'js/ui/spectre/loader'; import GeneratorEditor from 'js/ui/components/editor/generator'; import Base from 'js/ui/components/view-layout/base'; import Breadcrumbs from 'js/ui/components/view-layout/breadcrumbs'; - import { error } from 'js/ui/toast'; type GeneratorCreateProps = { diff --git a/frontend/src/js/ui/views/generator/edit.ts b/frontend/src/js/ui/views/generator/edit.ts index 895b9f69..9c886f19 100644 --- a/frontend/src/js/ui/views/generator/edit.ts +++ b/frontend/src/js/ui/views/generator/edit.ts @@ -2,20 +2,17 @@ import m from 'mithril'; import { buildId } from 'js/types/basic-info'; import Generator from 'js/types/generator'; - import * as API from 'js/core/api'; import IconButton from 'js/ui/spectre/icon-button'; import Loader from 'js/ui/spectre/loader'; - +import Tooltip from 'js/ui/components/atomic/tooltip'; import GeneratorEditor from 'js/ui/components/editor/generator'; +import Flex from 'js/ui/components/layout/flex'; +import { openDevTools } from 'js/ui/components/print-preview'; import Base from 'js/ui/components/view-layout/base'; import Breadcrumbs from 'js/ui/components/view-layout/breadcrumbs'; - import { error } from 'js/ui/toast'; -import Tooltip from 'js/ui/components/atomic/tooltip'; -import { openDevTools } from 'js/ui/components/print-preview'; -import Flex from 'js/ui/components/layout/flex'; type EditGeneratorProps = { id: string; diff --git a/frontend/src/js/ui/views/generator/single.ts b/frontend/src/js/ui/views/generator/single.ts index 37ce6314..83825c68 100644 --- a/frontend/src/js/ui/views/generator/single.ts +++ b/frontend/src/js/ui/views/generator/single.ts @@ -1,25 +1,24 @@ import m from 'mithril'; +import { buildId } from 'js/types/basic-info'; import Generator, { sanitizeConfig } from 'js/types/generator'; - import * as API from 'js/core/api'; +import store from 'js/core/store'; import IconButton from 'js/ui/spectre/icon-button'; import Loader from 'js/ui/spectre/loader'; -import Editor from 'js/ui/components/config/editor'; -import Base from 'js/ui/components/view-layout/base'; -import Breadcrumbs from 'js/ui/components/view-layout/breadcrumbs'; -import SidebarPrintPage from 'js/ui/components/view-layout/sidebar-print-page'; import Tooltip from 'js/ui/components/atomic/tooltip'; -import { dialogWarning, success, error } from 'js/ui/toast'; -import { buildId } from 'js/types/basic-info'; +import Editor from 'js/ui/components/config/editor'; import Flex from 'js/ui/components/layout/flex'; import { openAdditionalInfosModal } from 'js/ui/components/modals/additional-infos'; import { openFileModal } from 'js/ui/components/modals/file-browser'; -import { setPortal } from 'js/ui/portal'; import ImportExport from 'js/ui/components/modals/imexport/import-export'; -import store from 'js/core/store'; import { openDevTools } from 'js/ui/components/print-preview'; +import Base from 'js/ui/components/view-layout/base'; +import Breadcrumbs from 'js/ui/components/view-layout/breadcrumbs'; +import SidebarPrintPage from 'js/ui/components/view-layout/sidebar-print-page'; +import { setPortal } from 'js/ui/portal'; +import { dialogWarning, error, success } from 'js/ui/toast'; type SingleGeneratorProps = { id: string; diff --git a/frontend/src/js/ui/views/home.ts b/frontend/src/js/ui/views/home.ts index d781ef2b..e36fafd5 100644 --- a/frontend/src/js/ui/views/home.ts +++ b/frontend/src/js/ui/views/home.ts @@ -3,16 +3,15 @@ import m from 'mithril'; import store from 'js/core/store'; import Button from 'js/ui/spectre/button'; - +import Icon from 'js/ui/components/atomic/icon'; import Logo from 'js/ui/components/atomic/logo'; import Title from 'js/ui/components/atomic/title'; +import Box from 'js/ui/components/box'; import BoxVersion from 'js/ui/components/box-version'; import DiscordWidget from 'js/ui/components/discord-widget'; import Hero from 'js/ui/components/hero'; -import Icon from 'js/ui/components/atomic/icon'; import Flex from 'js/ui/components/layout/flex'; import Base from 'js/ui/components/view-layout/base'; -import Box from 'js/ui/components/box'; export default (): m.Component => ({ view(vnode) { diff --git a/frontend/src/js/ui/views/settings.ts b/frontend/src/js/ui/views/settings.ts index f285bc7e..ab830787 100644 --- a/frontend/src/js/ui/views/settings.ts +++ b/frontend/src/js/ui/views/settings.ts @@ -3,25 +3,22 @@ import m from 'mithril'; import { css } from 'goober'; import Settings, { Commands } from 'js/types/settings'; - -import store, { printer, settings } from 'js/core/store'; - import * as API from 'js/core/api'; +import store, { printer, settings } from 'js/core/store'; -import FullscreenLoader from 'js/ui/components/portal/fullscreen-loader'; +import Button from 'js/ui/spectre/button'; +import IconButton from 'js/ui/spectre/icon-button'; +import Input from 'js/ui/spectre/input'; +import Select from 'js/ui/spectre/select'; import Title from 'js/ui/components/atomic/title'; +import HorizontalProperty from 'js/ui/components/horizontal-property'; import Flex from 'js/ui/components/layout/flex'; +import FullscreenLoader from 'js/ui/components/portal/fullscreen-loader'; import Base from 'js/ui/components/view-layout/base'; import PropertyEdit, { PropertyEditProps } from 'js/ui/components/view-layout/property-edit'; import PropertyHeader from 'js/ui/components/view-layout/property-header'; -import IconButton from 'js/ui/spectre/icon-button'; -import Select from 'js/ui/spectre/select'; -import HorizontalProperty from 'js/ui/components/horizontal-property'; -import Button from 'js/ui/spectre/button'; -import Input from 'js/ui/spectre/input'; - -import { error, neutral, success } from 'js/ui/toast'; import { clearPortal, setPortal } from 'js/ui/portal'; +import { error, neutral, success } from 'js/ui/toast'; const containerClass = css` max-width: 1000px; diff --git a/frontend/src/js/ui/views/template/all.ts b/frontend/src/js/ui/views/template/all.ts index fb16e584..e79a74d7 100644 --- a/frontend/src/js/ui/views/template/all.ts +++ b/frontend/src/js/ui/views/template/all.ts @@ -1,23 +1,20 @@ import m from 'mithril'; - import { groupBy, map } from 'lodash-es'; import { buildId } from 'js/types/basic-info'; - +import * as API from 'js/core/api'; import store, { templates } from 'js/core/store'; +import IconButton from 'js/ui/spectre/icon-button'; import Input from 'js/ui/spectre/input'; - import Icon from 'js/ui/components/atomic/icon'; import Title from 'js/ui/components/atomic/title'; import Flex from 'js/ui/components/layout/flex'; import Grid from 'js/ui/components/layout/grid'; +import ImportExport from 'js/ui/components/modals/imexport/import-export'; import TemplateBox from 'js/ui/components/template-box'; import Base from 'js/ui/components/view-layout/base'; -import IconButton from 'js/ui/spectre/icon-button'; import { setPortal } from 'js/ui/portal'; -import * as API from 'js/core/api'; -import ImportExport from 'js/ui/components/modals/imexport/import-export'; export default (): m.Component => { let searchValue = ''; diff --git a/frontend/src/js/ui/views/template/create-entity.ts b/frontend/src/js/ui/views/template/create-entity.ts index 799617b5..90baf330 100644 --- a/frontend/src/js/ui/views/template/create-entity.ts +++ b/frontend/src/js/ui/views/template/create-entity.ts @@ -1,25 +1,25 @@ import m from 'mithril'; - import { get, set } from 'lodash-es'; import { buildId } from 'js/types/basic-info'; -import Template from 'js/types/template'; import Entry from 'js/types/entry'; +import Template from 'js/types/template'; import * as API from 'js/core/api'; -import { SchemaRoot, buildSchema, readableName, initialData, objectPathToSchema, SchemaNode } from 'js/core/schema'; +import { buildSchema, initialData, objectPathToSchema, readableName, SchemaNode, SchemaRoot } from 'js/core/schema'; + import IconButton from 'js/ui/spectre/icon-button'; +import Input from 'js/ui/spectre/input'; import Loader from 'js/ui/spectre/loader'; -import EditorHeader from 'js/ui/components/view-layout/property-header'; -import Base from 'js/ui/components/view-layout/base'; -import Breadcrumbs from 'js/ui/components/view-layout/breadcrumbs'; -import SidebarPrintPage from 'js/ui/components/view-layout/sidebar-print-page'; -import SideMenuPager from 'js/ui/components/view-layout/side-menu-pager'; +import Icon from 'js/ui/components/atomic/icon'; import types from 'js/ui/components/config/types'; import HorizontalProperty from 'js/ui/components/horizontal-property'; import Flex from 'js/ui/components/layout/flex'; -import Icon from 'js/ui/components/atomic/icon'; +import Base from 'js/ui/components/view-layout/base'; +import Breadcrumbs from 'js/ui/components/view-layout/breadcrumbs'; +import EditorHeader from 'js/ui/components/view-layout/property-header'; +import SideMenuPager from 'js/ui/components/view-layout/side-menu-pager'; +import SidebarPrintPage from 'js/ui/components/view-layout/sidebar-print-page'; import { error } from 'js/ui/toast'; -import Input from 'js/ui/spectre/input'; type CreateTemplateEntityProps = { id: string; diff --git a/frontend/src/js/ui/views/template/create.ts b/frontend/src/js/ui/views/template/create.ts index 24102386..ca1a346c 100644 --- a/frontend/src/js/ui/views/template/create.ts +++ b/frontend/src/js/ui/views/template/create.ts @@ -1,16 +1,15 @@ import m from 'mithril'; +import { buildId } from 'js/types/basic-info'; import Template, { createEmptyTemplate } from 'js/types/template'; - import * as API from 'js/core/api'; +import store from 'js/core/store'; import IconButton from 'js/ui/spectre/icon-button'; import TemplateEditor from 'js/ui/components/editor/template'; import Base from 'js/ui/components/view-layout/base'; import Breadcrumbs from 'js/ui/components/view-layout/breadcrumbs'; import { error } from 'js/ui/toast'; -import { buildId } from 'js/types/basic-info'; -import store from 'js/core/store'; type TemplateCreateProps = { id?: string; diff --git a/frontend/src/js/ui/views/template/edit.ts b/frontend/src/js/ui/views/template/edit.ts index 2e403436..7b74b6e8 100644 --- a/frontend/src/js/ui/views/template/edit.ts +++ b/frontend/src/js/ui/views/template/edit.ts @@ -2,20 +2,17 @@ import m from 'mithril'; import { buildId } from 'js/types/basic-info'; import Template from 'js/types/template'; - import * as API from 'js/core/api'; import IconButton from 'js/ui/spectre/icon-button'; import Loader from 'js/ui/spectre/loader'; - +import Tooltip from 'js/ui/components/atomic/tooltip'; import TemplateEditor from 'js/ui/components/editor/template'; +import Flex from 'js/ui/components/layout/flex'; +import { openDevTools } from 'js/ui/components/print-preview'; import Base from 'js/ui/components/view-layout/base'; import Breadcrumbs from 'js/ui/components/view-layout/breadcrumbs'; - import { error } from 'js/ui/toast'; -import Flex from 'js/ui/components/layout/flex'; -import { openDevTools } from 'js/ui/components/print-preview'; -import Tooltip from 'js/ui/components/atomic/tooltip'; type EditTemplateProps = { id: string; diff --git a/frontend/src/js/ui/views/template/single.ts b/frontend/src/js/ui/views/template/single.ts index 2323e317..2933db59 100644 --- a/frontend/src/js/ui/views/template/single.ts +++ b/frontend/src/js/ui/views/template/single.ts @@ -1,13 +1,11 @@ import m from 'mithril'; - import { debounce } from 'lodash-es'; import { buildId } from 'js/types/basic-info'; import Entry from 'js/types/entry'; import Template, { sanitizeConfig } from 'js/types/template'; - -import * as API from 'js/core/api'; import * as AI from 'js/core/ai'; +import * as API from 'js/core/api'; import store, { settings } from 'js/core/store'; import { render } from 'js/core/templating'; @@ -16,22 +14,20 @@ import IconButton from 'js/ui/spectre/icon-button'; import Input from 'js/ui/spectre/input'; import Loader from 'js/ui/spectre/loader'; import TextArea from 'js/ui/spectre/text-area'; - import Tooltip from 'js/ui/components/atomic/tooltip'; import Editor from 'js/ui/components/config/editor'; +import EntryListItem from 'js/ui/components/entry-list-item'; import Flex from 'js/ui/components/layout/flex'; +import { openAdditionalInfosModal } from 'js/ui/components/modals/additional-infos'; +import { openFileModal } from 'js/ui/components/modals/file-browser'; +import ImportExport from 'js/ui/components/modals/imexport/import-export'; +import { openDevTools } from 'js/ui/components/print-preview'; import Base from 'js/ui/components/view-layout/base'; import Breadcrumbs from 'js/ui/components/view-layout/breadcrumbs'; import PaginatedContent from 'js/ui/components/view-layout/paginated-content'; import SidebarPrintPage from 'js/ui/components/view-layout/sidebar-print-page'; - -import { error, success, dialogWarning } from 'js/ui/toast'; -import EntryListItem from 'js/ui/components/entry-list-item'; -import { openAdditionalInfosModal } from 'js/ui/components/modals/additional-infos'; -import { openFileModal } from 'js/ui/components/modals/file-browser'; import { setPortal } from 'js/ui/portal'; -import ImportExport from 'js/ui/components/modals/imexport/import-export'; -import { openDevTools } from 'js/ui/components/print-preview'; +import { dialogWarning, error, success } from 'js/ui/toast'; const PER_PAGE = 10; diff --git a/frontend/src/js/ui/views/workshop/all.ts b/frontend/src/js/ui/views/workshop/all.ts index 2d21101c..7a2e4a9f 100644 --- a/frontend/src/js/ui/views/workshop/all.ts +++ b/frontend/src/js/ui/views/workshop/all.ts @@ -1,16 +1,16 @@ import m from 'mithril'; +import PublicList from 'src/js/types/public-list'; import * as API from 'js/core/api'; +import IconButton from 'src/js/ui/spectre/icon-button'; import Title from 'js/ui/components/atomic/title'; import Base from 'js/ui/components/view-layout/base'; -import { error } from 'js/ui/toast'; -import PublicList from 'src/js/types/public-list'; -import CenterContainer from 'src/js/ui/components/layout/center-container'; import HorizontalProperty from 'src/js/ui/components/horizontal-property'; -import PropertyHeader from 'src/js/ui/components/view-layout/property-header'; -import IconButton from 'src/js/ui/spectre/icon-button'; +import CenterContainer from 'src/js/ui/components/layout/center-container'; import Flex from 'src/js/ui/components/layout/flex'; +import PropertyHeader from 'src/js/ui/components/view-layout/property-header'; +import { error } from 'js/ui/toast'; type WorkshopState = { publicLists: PublicList[]; diff --git a/frontend/src/js/ui/views/workshop/repo.ts b/frontend/src/js/ui/views/workshop/repo.ts index 88026cc4..c32c1bf0 100644 --- a/frontend/src/js/ui/views/workshop/repo.ts +++ b/frontend/src/js/ui/views/workshop/repo.ts @@ -1,27 +1,27 @@ import m from 'mithril'; - -import * as API from 'js/core/api'; - import { startCase } from 'lodash-es'; -import Base from 'js/ui/components/view-layout/base'; -import { error, success } from 'js/ui/toast'; -import { Package, Repo } from 'src/js/types/public-list'; -import Flex from 'js/ui/components/layout/flex'; -import Breadcrumbs from 'js/ui/components/view-layout/breadcrumbs'; -import Loader from 'js/ui/spectre/loader'; -import HorizontalProperty from 'js/ui/components/horizontal-property'; -import Select from 'js/ui/spectre/select'; -import store from 'js/core/store'; -import IconButton from 'js/ui/spectre/icon-button'; -import DataSource from 'js/types/data-source'; -import Generator from 'js/types/generator'; -import Template from 'js/types/template'; -import Input from 'js/ui/spectre/input'; import hljs from 'highlight.js'; import MarkdownIt from 'markdown-it'; import MarkdownItReplaceLink from 'markdown-it-replace-link'; + import { buildId } from 'js/types/basic-info'; +import DataSource from 'js/types/data-source'; +import Generator from 'js/types/generator'; +import Template from 'js/types/template'; +import { Package, Repo } from 'src/js/types/public-list'; +import * as API from 'js/core/api'; +import store from 'js/core/store'; + +import IconButton from 'js/ui/spectre/icon-button'; +import Input from 'js/ui/spectre/input'; +import Loader from 'js/ui/spectre/loader'; +import Select from 'js/ui/spectre/select'; +import HorizontalProperty from 'js/ui/components/horizontal-property'; +import Flex from 'js/ui/components/layout/flex'; +import Base from 'js/ui/components/view-layout/base'; +import Breadcrumbs from 'js/ui/components/view-layout/breadcrumbs'; +import { error, success } from 'js/ui/toast'; // @ts-ignore const markdown = new MarkdownIt({ diff --git a/frontend/src/js/ui/views/workshop/single.ts b/frontend/src/js/ui/views/workshop/single.ts index 13a68c99..3ff4ae00 100644 --- a/frontend/src/js/ui/views/workshop/single.ts +++ b/frontend/src/js/ui/views/workshop/single.ts @@ -1,17 +1,17 @@ import m from 'mithril'; +import PublicList from 'js/types/public-list'; import * as API from 'js/core/api'; -import Base from 'js/ui/components/view-layout/base'; -import { error } from 'js/ui/toast'; -import PublicList from 'js/types/public-list'; -import Breadcrumbs from 'js/ui/components/view-layout/breadcrumbs'; -import Flex from 'js/ui/components/layout/flex'; import Input from 'js/ui/spectre/input'; import Icon from 'js/ui/components/atomic/icon'; import Title from 'js/ui/components/atomic/title'; +import Flex from 'js/ui/components/layout/flex'; import Grid from 'js/ui/components/layout/grid'; +import Base from 'js/ui/components/view-layout/base'; +import Breadcrumbs from 'js/ui/components/view-layout/breadcrumbs'; import WorkshopBox from 'js/ui/components/workshop-box'; +import { error } from 'js/ui/toast'; type WorkshopProps = { id: string;