diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1308d4047..12e9e4086 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - node-version: [16.x, 18.x, 20.x] + node-version: [18.x, 20.x] steps: - uses: actions/checkout@v4 diff --git a/.gitignore b/.gitignore index b90e7bff9..414f8017f 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,7 @@ test/server-test-config/ssl-key.pem test/server-test-config/plugin-config-data/ docs/built +.signalk +packages/server-admin-ui/scss.bs4 +packages/server-admin-ui/scss.bs5 +packages/server-admin-ui/_scss \ No newline at end of file diff --git a/build.log b/build.log new file mode 100644 index 000000000..b5fa3b101 --- /dev/null +++ b/build.log @@ -0,0 +1,585 @@ + +> signalk-server@2.12.0 build:all +> npm run build:workspaces && npm run build && npm run build-declaration && npm run build:docs + + +> signalk-server@2.12.0 build:workspaces +> npm run build --workspaces --if-present + + +> @signalk/server-admin-ui@2.11.0 build +> webpack --mode=production + +Webpack Bundle Analyzer saved stats file to /Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/public/stats.json +assets by status 4.14 MiB [cached] 25 assets +assets by path . 1.66 MiB + assets by path *.js 1.63 MiB + assets by status 1.49 MiB [big] + asset 964.js 1.1 MiB [compared for emit] [minimized] [big] (id hint: vendors) 2 related assets + asset 957.js 397 KiB [emitted] [minimized] [big] 1 related asset + asset 144.js 130 KiB [compared for emit] [minimized] (id hint: vendors) 2 related assets + asset main.js 7.05 KiB [compared for emit] [minimized] (name: main) 1 related asset + asset 41.js 6.5 KiB [compared for emit] [minimized] 2 related assets + asset 188.js 296 bytes [compared for emit] [minimized] 1 related asset + assets by path img/ 32.3 KiB + asset img/favicon.ico 14.7 KiB [compared for emit] [from: public_src/img/favicon.ico] [copied] + asset img/signal-k-logo-image-text.svg 10.6 KiB [compared for emit] [from: public_src/img/signal-k-logo-image-text.svg] [copied] + asset img/logo-symbol.png 7.02 KiB [compared for emit] [from: public_src/img/logo-symbol.png] [copied] + asset index.html 511 bytes [compared for emit] +orphan modules 1.73 MiB [orphan] 944 modules +runtime modules 18.5 KiB 15 modules +built modules 4.72 MiB (javascript) 84 bytes (share-init) 84 bytes (consume-shared) [built] + javascript modules 4.69 MiB + modules by path ../../node_modules/ 4.19 MiB 535 modules + modules by path ./ 517 KiB 6 modules + json modules 33.2 KiB + modules by path ../../node_modules/ansi-to-html/ 30 KiB 4 modules + modules by path ../../node_modules/ajv/lib/ 3.12 KiB 2 modules + provide-module modules 84 bytes + provide shared module (default) react-dom@18.3.1 = ../../node_modules/reac...(truncated) 42 bytes [built] [code generated] + provide shared module (default) react@18.3.1 = ../../node_modules/react/index.js 42 bytes [built] [code generated] + consume-shared-module modules 84 bytes + consume shared module (default) react@=18.3.1 (singleton) (fallback: ../../node_...(truncated) 42 bytes [built] [code generated] + consume shared module (default) react-dom@=18.3.1 (strict) (fallback: ../../node...(truncated) 42 bytes [built] [code generated] + +WARNING in ./src/views/security/EnableSecurity.js 55:40-55 +export 'InputGroupAddon' (imported as 'InputGroupAddon') was not found in 'reactstrap' (possible exports: Accordion, AccordionBody, AccordionContext, AccordionHeader, AccordionItem, Alert, Badge, Breadcrumb, BreadcrumbItem, Button, ButtonDropdown, ButtonGroup, ButtonToggle, ButtonToolbar, Card, CardBody, CardColumns, CardDeck, CardFooter, CardGroup, CardHeader, CardImg, CardImgOverlay, CardLink, CardSubtitle, CardText, CardTitle, Carousel, CarouselCaption, CarouselControl, CarouselIndicators, CarouselItem, CloseButton, Col, Collapse, Container, Dropdown, DropdownContext, DropdownItem, DropdownMenu, DropdownToggle, Fade, Form, FormFeedback, FormGroup, FormText, Input, InputGroup, InputGroupText, Label, List, ListGroup, ListGroupItem, ListGroupItemHeading, ListGroupItemText, ListInlineItem, Media, Modal, ModalBody, ModalFooter, ModalHeader, Nav, NavItem, NavLink, Navbar, NavbarBrand, NavbarText, NavbarToggler, Offcanvas, OffcanvasBody, OffcanvasHeader, Pagination, PaginationItem, PaginationLink, Placeholder, PlaceholderButton, Polyfill, Popover, PopoverBody, PopoverHeader, PopperContent, PopperTargetHelper, Progress, Row, Spinner, TabContent, TabPane, Table, Toast, ToastBody, ToastHeader, Tooltip, UncontrolledAccordion, UncontrolledAlert, UncontrolledButtonDropdown, UncontrolledCarousel, UncontrolledCollapse, UncontrolledDropdown, UncontrolledPopover, UncontrolledTooltip, Util) + @ ./src/views/security/Login.js 7:0-46 46:46-60 + @ ./src/containers/Full/Full.js 17:0-47 124:48-53 153:48-53 + @ ./src/bootstrap.js 20:0-42 289:44-48 + @ ./src/index.js + +WARNING in ./src/views/security/EnableSecurity.js 67:40-55 +export 'InputGroupAddon' (imported as 'InputGroupAddon') was not found in 'reactstrap' (possible exports: Accordion, AccordionBody, AccordionContext, AccordionHeader, AccordionItem, Alert, Badge, Breadcrumb, BreadcrumbItem, Button, ButtonDropdown, ButtonGroup, ButtonToggle, ButtonToolbar, Card, CardBody, CardColumns, CardDeck, CardFooter, CardGroup, CardHeader, CardImg, CardImgOverlay, CardLink, CardSubtitle, CardText, CardTitle, Carousel, CarouselCaption, CarouselControl, CarouselIndicators, CarouselItem, CloseButton, Col, Collapse, Container, Dropdown, DropdownContext, DropdownItem, DropdownMenu, DropdownToggle, Fade, Form, FormFeedback, FormGroup, FormText, Input, InputGroup, InputGroupText, Label, List, ListGroup, ListGroupItem, ListGroupItemHeading, ListGroupItemText, ListInlineItem, Media, Modal, ModalBody, ModalFooter, ModalHeader, Nav, NavItem, NavLink, Navbar, NavbarBrand, NavbarText, NavbarToggler, Offcanvas, OffcanvasBody, OffcanvasHeader, Pagination, PaginationItem, PaginationLink, Placeholder, PlaceholderButton, Polyfill, Popover, PopoverBody, PopoverHeader, PopperContent, PopperTargetHelper, Progress, Row, Spinner, TabContent, TabPane, Table, Toast, ToastBody, ToastHeader, Tooltip, UncontrolledAccordion, UncontrolledAlert, UncontrolledButtonDropdown, UncontrolledCarousel, UncontrolledCollapse, UncontrolledDropdown, UncontrolledPopover, UncontrolledTooltip, Util) + @ ./src/views/security/Login.js 7:0-46 46:46-60 + @ ./src/containers/Full/Full.js 17:0-47 124:48-53 153:48-53 + @ ./src/bootstrap.js 20:0-42 289:44-48 + @ ./src/index.js + +WARNING in ./src/views/security/Login.js 58:42-57 +export 'InputGroupAddon' (imported as 'InputGroupAddon') was not found in 'reactstrap' (possible exports: Accordion, AccordionBody, AccordionContext, AccordionHeader, AccordionItem, Alert, Badge, Breadcrumb, BreadcrumbItem, Button, ButtonDropdown, ButtonGroup, ButtonToggle, ButtonToolbar, Card, CardBody, CardColumns, CardDeck, CardFooter, CardGroup, CardHeader, CardImg, CardImgOverlay, CardLink, CardSubtitle, CardText, CardTitle, Carousel, CarouselCaption, CarouselControl, CarouselIndicators, CarouselItem, CloseButton, Col, Collapse, Container, Dropdown, DropdownContext, DropdownItem, DropdownMenu, DropdownToggle, Fade, Form, FormFeedback, FormGroup, FormText, Input, InputGroup, InputGroupText, Label, List, ListGroup, ListGroupItem, ListGroupItemHeading, ListGroupItemText, ListInlineItem, Media, Modal, ModalBody, ModalFooter, ModalHeader, Nav, NavItem, NavLink, Navbar, NavbarBrand, NavbarText, NavbarToggler, Offcanvas, OffcanvasBody, OffcanvasHeader, Pagination, PaginationItem, PaginationLink, Placeholder, PlaceholderButton, Polyfill, Popover, PopoverBody, PopoverHeader, PopperContent, PopperTargetHelper, Progress, Row, Spinner, TabContent, TabPane, Table, Toast, ToastBody, ToastHeader, Tooltip, UncontrolledAccordion, UncontrolledAlert, UncontrolledButtonDropdown, UncontrolledCarousel, UncontrolledCollapse, UncontrolledDropdown, UncontrolledPopover, UncontrolledTooltip, Util) + @ ./src/containers/Full/Full.js 17:0-47 124:48-53 153:48-53 + @ ./src/bootstrap.js 20:0-42 289:44-48 + @ ./src/index.js + +WARNING in ./src/views/security/Login.js 70:42-57 +export 'InputGroupAddon' (imported as 'InputGroupAddon') was not found in 'reactstrap' (possible exports: Accordion, AccordionBody, AccordionContext, AccordionHeader, AccordionItem, Alert, Badge, Breadcrumb, BreadcrumbItem, Button, ButtonDropdown, ButtonGroup, ButtonToggle, ButtonToolbar, Card, CardBody, CardColumns, CardDeck, CardFooter, CardGroup, CardHeader, CardImg, CardImgOverlay, CardLink, CardSubtitle, CardText, CardTitle, Carousel, CarouselCaption, CarouselControl, CarouselIndicators, CarouselItem, CloseButton, Col, Collapse, Container, Dropdown, DropdownContext, DropdownItem, DropdownMenu, DropdownToggle, Fade, Form, FormFeedback, FormGroup, FormText, Input, InputGroup, InputGroupText, Label, List, ListGroup, ListGroupItem, ListGroupItemHeading, ListGroupItemText, ListInlineItem, Media, Modal, ModalBody, ModalFooter, ModalHeader, Nav, NavItem, NavLink, Navbar, NavbarBrand, NavbarText, NavbarToggler, Offcanvas, OffcanvasBody, OffcanvasHeader, Pagination, PaginationItem, PaginationLink, Placeholder, PlaceholderButton, Polyfill, Popover, PopoverBody, PopoverHeader, PopperContent, PopperTargetHelper, Progress, Row, Spinner, TabContent, TabPane, Table, Toast, ToastBody, ToastHeader, Tooltip, UncontrolledAccordion, UncontrolledAlert, UncontrolledButtonDropdown, UncontrolledCarousel, UncontrolledCollapse, UncontrolledDropdown, UncontrolledPopover, UncontrolledTooltip, Util) + @ ./src/containers/Full/Full.js 17:0-47 124:48-53 153:48-53 + @ ./src/bootstrap.js 20:0-42 289:44-48 + @ ./src/index.js + +WARNING in ./src/views/security/Register.js 86:40-55 +export 'InputGroupAddon' (imported as 'InputGroupAddon') was not found in 'reactstrap' (possible exports: Accordion, AccordionBody, AccordionContext, AccordionHeader, AccordionItem, Alert, Badge, Breadcrumb, BreadcrumbItem, Button, ButtonDropdown, ButtonGroup, ButtonToggle, ButtonToolbar, Card, CardBody, CardColumns, CardDeck, CardFooter, CardGroup, CardHeader, CardImg, CardImgOverlay, CardLink, CardSubtitle, CardText, CardTitle, Carousel, CarouselCaption, CarouselControl, CarouselIndicators, CarouselItem, CloseButton, Col, Collapse, Container, Dropdown, DropdownContext, DropdownItem, DropdownMenu, DropdownToggle, Fade, Form, FormFeedback, FormGroup, FormText, Input, InputGroup, InputGroupText, Label, List, ListGroup, ListGroupItem, ListGroupItemHeading, ListGroupItemText, ListInlineItem, Media, Modal, ModalBody, ModalFooter, ModalHeader, Nav, NavItem, NavLink, Navbar, NavbarBrand, NavbarText, NavbarToggler, Offcanvas, OffcanvasBody, OffcanvasHeader, Pagination, PaginationItem, PaginationLink, Placeholder, PlaceholderButton, Polyfill, Popover, PopoverBody, PopoverHeader, PopperContent, PopperTargetHelper, Progress, Row, Spinner, TabContent, TabPane, Table, Toast, ToastBody, ToastHeader, Tooltip, UncontrolledAccordion, UncontrolledAlert, UncontrolledButtonDropdown, UncontrolledCarousel, UncontrolledCollapse, UncontrolledDropdown, UncontrolledPopover, UncontrolledTooltip, Util) + @ ./src/containers/Full/Full.js 21:0-53 127:48-56 + @ ./src/bootstrap.js 20:0-42 289:44-48 + @ ./src/index.js + +WARNING in ./src/views/security/Register.js 95:40-55 +export 'InputGroupAddon' (imported as 'InputGroupAddon') was not found in 'reactstrap' (possible exports: Accordion, AccordionBody, AccordionContext, AccordionHeader, AccordionItem, Alert, Badge, Breadcrumb, BreadcrumbItem, Button, ButtonDropdown, ButtonGroup, ButtonToggle, ButtonToolbar, Card, CardBody, CardColumns, CardDeck, CardFooter, CardGroup, CardHeader, CardImg, CardImgOverlay, CardLink, CardSubtitle, CardText, CardTitle, Carousel, CarouselCaption, CarouselControl, CarouselIndicators, CarouselItem, CloseButton, Col, Collapse, Container, Dropdown, DropdownContext, DropdownItem, DropdownMenu, DropdownToggle, Fade, Form, FormFeedback, FormGroup, FormText, Input, InputGroup, InputGroupText, Label, List, ListGroup, ListGroupItem, ListGroupItemHeading, ListGroupItemText, ListInlineItem, Media, Modal, ModalBody, ModalFooter, ModalHeader, Nav, NavItem, NavLink, Navbar, NavbarBrand, NavbarText, NavbarToggler, Offcanvas, OffcanvasBody, OffcanvasHeader, Pagination, PaginationItem, PaginationLink, Placeholder, PlaceholderButton, Polyfill, Popover, PopoverBody, PopoverHeader, PopperContent, PopperTargetHelper, Progress, Row, Spinner, TabContent, TabPane, Table, Toast, ToastBody, ToastHeader, Tooltip, UncontrolledAccordion, UncontrolledAlert, UncontrolledButtonDropdown, UncontrolledCarousel, UncontrolledCollapse, UncontrolledDropdown, UncontrolledPopover, UncontrolledTooltip, Util) + @ ./src/containers/Full/Full.js 21:0-53 127:48-56 + @ ./src/bootstrap.js 20:0-42 289:44-48 + @ ./src/index.js + +WARNING in ./src/views/security/Register.js 106:40-55 +export 'InputGroupAddon' (imported as 'InputGroupAddon') was not found in 'reactstrap' (possible exports: Accordion, AccordionBody, AccordionContext, AccordionHeader, AccordionItem, Alert, Badge, Breadcrumb, BreadcrumbItem, Button, ButtonDropdown, ButtonGroup, ButtonToggle, ButtonToolbar, Card, CardBody, CardColumns, CardDeck, CardFooter, CardGroup, CardHeader, CardImg, CardImgOverlay, CardLink, CardSubtitle, CardText, CardTitle, Carousel, CarouselCaption, CarouselControl, CarouselIndicators, CarouselItem, CloseButton, Col, Collapse, Container, Dropdown, DropdownContext, DropdownItem, DropdownMenu, DropdownToggle, Fade, Form, FormFeedback, FormGroup, FormText, Input, InputGroup, InputGroupText, Label, List, ListGroup, ListGroupItem, ListGroupItemHeading, ListGroupItemText, ListInlineItem, Media, Modal, ModalBody, ModalFooter, ModalHeader, Nav, NavItem, NavLink, Navbar, NavbarBrand, NavbarText, NavbarToggler, Offcanvas, OffcanvasBody, OffcanvasHeader, Pagination, PaginationItem, PaginationLink, Placeholder, PlaceholderButton, Polyfill, Popover, PopoverBody, PopoverHeader, PopperContent, PopperTargetHelper, Progress, Row, Spinner, TabContent, TabPane, Table, Toast, ToastBody, ToastHeader, Tooltip, UncontrolledAccordion, UncontrolledAlert, UncontrolledButtonDropdown, UncontrolledCarousel, UncontrolledCollapse, UncontrolledDropdown, UncontrolledPopover, UncontrolledTooltip, Util) + @ ./src/containers/Full/Full.js 21:0-53 127:48-56 + @ ./src/bootstrap.js 20:0-42 289:44-48 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 9, column 8 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/bootstrap.scss:9:8: +Sass @import rules are deprecated and will be removed in Dart Sass 3.0.0. + +More info and automated migrator: https://sass-lang.com/d/import + +9 | @import "functions"; + + +scss/bootstrap.scss 10:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 9, column 8 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/style.scss:9:8: +Sass @import rules are deprecated and will be removed in Dart Sass 3.0.0. + +More info and automated migrator: https://sass-lang.com/d/import + +9 | @import 'bootstrap'; + + +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 10, column 8 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/bootstrap.scss:10:8: +Sass @import rules are deprecated and will be removed in Dart Sass 3.0.0. + +More info and automated migrator: https://sass-lang.com/d/import + +10 | @import "variables"; + + +scss/bootstrap.scss 11:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 11, column 8 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/bootstrap.scss:11:8: +Sass @import rules are deprecated and will be removed in Dart Sass 3.0.0. + +More info and automated migrator: https://sass-lang.com/d/import + +11 | @import "mixins"; + + +scss/bootstrap.scss 12:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 21, column 8 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/style.scss:21:8: +Sass @import rules are deprecated and will be removed in Dart Sass 3.0.0. + +More info and automated migrator: https://sass-lang.com/d/import + +21 | @import 'custom'; + +scss/style.scss 22:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 36, column 10 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/_functions.scss:36:10: +Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use color.red instead. + +More info and automated migrator: https://sass-lang.com/d/import + +36 | @return red($value), green($value), blue($value); + + +scss/_functions.scss 37:11 to-rgb() +scss/_functions.scss 61:36 map-loop() +scss/_variables.scss 94:20 @import +scss/bootstrap.scss 11:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 36, column 10 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/_functions.scss:36:10: +red() is deprecated. Suggestion: + +color.channel($color, "red", $space: rgb) + +More info: https://sass-lang.com/d/color-functions + +36 | @return red($value), green($value), blue($value); + + +scss/_functions.scss 37:11 to-rgb() +scss/_functions.scss 61:36 map-loop() +scss/_variables.scss 94:20 @import +scss/bootstrap.scss 11:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 36, column 23 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/_functions.scss:36:23: +Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use color.green instead. + +More info and automated migrator: https://sass-lang.com/d/import + +36 | @return red($value), green($value), blue($value); + + +scss/_functions.scss 37:24 to-rgb() +scss/_functions.scss 61:36 map-loop() +scss/_variables.scss 94:20 @import +scss/bootstrap.scss 11:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 36, column 23 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/_functions.scss:36:23: +green() is deprecated. Suggestion: + +color.channel($color, "green", $space: rgb) + +More info: https://sass-lang.com/d/color-functions + +36 | @return red($value), green($value), blue($value); + + +scss/_functions.scss 37:24 to-rgb() +scss/_functions.scss 61:36 map-loop() +scss/_variables.scss 94:20 @import +scss/bootstrap.scss 11:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 36, column 38 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/_functions.scss:36:38: +blue() is deprecated. Suggestion: + +color.channel($color, "blue", $space: rgb) + +More info: https://sass-lang.com/d/color-functions + +36 | @return red($value), green($value), blue($value); + + +scss/_functions.scss 37:39 to-rgb() +scss/_functions.scss 61:36 map-loop() +scss/_variables.scss 94:20 @import +scss/bootstrap.scss 11:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 37, column 4 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/_type.scss:37:4: +Sass's behavior for declarations that appear after nested +rules will be changing to match the behavior specified by CSS in an upcoming +version. To keep the existing behavior, move the declaration above the nested +rule. To opt into the new behavior, wrap the declaration in `& {}`. + +More info: https://sass-lang.com/d/mixed-decls + +37 | font-weight: $display-font-weight; + + +scss/_type.scss 38:5 @import +scss/bootstrap.scss 18:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 37, column 4 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/_type.scss:37:4: +Sass's behavior for declarations that appear after nested +rules will be changing to match the behavior specified by CSS in an upcoming +version. To keep the existing behavior, move the declaration above the nested +rule. To opt into the new behavior, wrap the declaration in `& {}`. + +More info: https://sass-lang.com/d/mixed-decls + +37 | font-weight: $display-font-weight; + + +scss/_type.scss 38:5 @import +scss/bootstrap.scss 18:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 38, column 4 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/_type.scss:38:4: +Sass's behavior for declarations that appear after nested +rules will be changing to match the behavior specified by CSS in an upcoming +version. To keep the existing behavior, move the declaration above the nested +rule. To opt into the new behavior, wrap the declaration in `& {}`. + +More info: https://sass-lang.com/d/mixed-decls + +38 | line-height: $display-line-height; + + +scss/_type.scss 39:5 @import +scss/bootstrap.scss 18:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 50, column 65 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/_alert.scss:50:65: +Passing percentage units to the global abs() function is deprecated. +In the future, this will emit a CSS abs() function to be resolved by the browser. +To preserve current behavior: math.abs(40%) +To emit a CSS abs() now: abs(#{40%}) +More info: https://sass-lang.com/d/abs-percent + +50 | $alert-color: mix($value, color-contrast($alert-background), abs($alert-color-scale)); + + +scss/_alert.scss 51:66 @import +scss/bootstrap.scss 35:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 56, column 13 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/vendor/_rfs.scss:56:13: +Passing percentage units to the global abs() function is deprecated. +In the future, this will emit a CSS abs() function to be resolved by the browser. +To preserve current behavior: math.abs(100%) +To emit a CSS abs() now: abs(#{100%}) +More info: https://sass-lang.com/d/abs-percent + +56 | $dividend: abs($dividend); + + +scss/vendor/_rfs.scss 57:14 divide() +scss/mixins/_grid.scss 59:12 row-cols() +scss/mixins/_grid.scss 85:13 @content +scss/mixins/_breakpoints.scss 68:5 media-breakpoint-up() +scss/mixins/_grid.scss 72:5 make-grid-columns() +scss/_grid.scss 32:3 @import +scss/bootstrap.scss 21:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 57, column 14 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/_functions.scss:57:14: +Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use list.append instead. + +More info and automated migrator: https://sass-lang.com/d/import + +57 | $_args: append($_args, if($arg == "$key", $key, if($arg == "$value", $value, $arg))); + + +scss/_functions.scss 58:15 map-loop() +scss/_variables.scss 94:20 @import +scss/bootstrap.scss 11:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 60, column 35 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/_functions.scss:60:35: +Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use meta.call instead. + +More info and automated migrator: https://sass-lang.com/d/import + +60 | $_map: map-merge($_map, ($key: call(get-function($func), $_args...))); + + +scss/_functions.scss 61:36 map-loop() +scss/_variables.scss 94:20 @import +scss/bootstrap.scss 11:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 60, column 40 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/_functions.scss:60:40: +Global built-in functions are deprecated and will be removed in Dart Sass 3.0.0. +Use meta.get-function instead. + +More info and automated migrator: https://sass-lang.com/d/import + +60 | $_map: map-merge($_map, ($key: call(get-function($func), $_args...))); + + +scss/_functions.scss 61:41 map-loop() +scss/_variables.scss 94:20 @import +scss/bootstrap.scss 11:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 168, column 83 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/_list-group.scss:168:83: +Passing percentage units to the global abs() function is deprecated. +In the future, this will emit a CSS abs() function to be resolved by the browser. +To preserve current behavior: math.abs(40%) +To emit a CSS abs() now: abs(#{40%}) +More info: https://sass-lang.com/d/abs-percent + +168 | $list-group-variant-color: mix($value, color-contrast($list-group-variant-bg), abs($list-group-item-color-scale)); + + +scss/_list-group.scss 169:84 @import +scss/bootstrap.scss 37:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 184, column 9 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/_functions.scss:184:9: +red() is deprecated. Suggestion: + +color.channel($color, "red", $space: rgb) + +More info: https://sass-lang.com/d/color-functions + +184 | "r": red($color), + + +scss/_functions.scss 185:10 luminance() +scss/_functions.scss 174:8 contrast-ratio() +scss/_functions.scss 159:22 color-contrast() +scss/mixins/_table-variants.scss 4:13 table-variant() +scss/_tables.scss 138:3 @import +scss/bootstrap.scss 22:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 200, column 10 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/_functions.scss:200:10: +$weight: Passing a number without unit % (100) is deprecated. + +To preserve current behavior: $weight * 1% + +More info: https://sass-lang.com/d/function-units + +200 | @return mix(rgba($foreground, 1), $background, opacity($foreground) * 100); + + +scss/_functions.scss 201:11 opaque() +scss/mixins/_table-variants.scss 4:28 table-variant() +scss/_tables.scss 138:3 @import +scss/bootstrap.scss 22:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 510, column 2 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/_reboot.scss:510:2: +Sass's behavior for declarations that appear after nested +rules will be changing to match the behavior specified by CSS in an upcoming +version. To keep the existing behavior, move the declaration above the nested +rule. To opt into the new behavior, wrap the declaration in `& {}`. + +More info: https://sass-lang.com/d/mixed-decls + +510 | font-weight: $legend-font-weight; + + +scss/_reboot.scss 511:3 @import +scss/bootstrap.scss 17:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 511, column 2 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/_reboot.scss:511:2: +Sass's behavior for declarations that appear after nested +rules will be changing to match the behavior specified by CSS in an upcoming +version. To keep the existing behavior, move the declaration above the nested +rule. To opt into the new behavior, wrap the declaration in `& {}`. + +More info: https://sass-lang.com/d/mixed-decls + +511 | line-height: inherit; + + +scss/_reboot.scss 512:3 @import +scss/bootstrap.scss 17:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +Deprecation Warning on line 1362, column 36 of file:///Users/andrewgerngross/dev/signalk-server-nextgen/packages/server-admin-ui/scss/_variables.scss:1362:36: +fade-in() is deprecated. Suggestions: + +color.scale($color, $alpha: 6.25%) +color.adjust($color, $alpha: 0.05) + +More info: https://sass-lang.com/d/color-functions + +1362 | $popover-arrow-outer-color: fade-in($popover-border-color, .05) !default; + + +scss/_variables.scss 1363:37 @import +scss/bootstrap.scss 11:9 @import +scss/style.scss 10:9 root stylesheet + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in ./scss/style.scss (../../node_modules/css-loader/dist/cjs.js!../../node_modules/sass-loader/dist/cjs.js!./scss/style.scss) +Module Warning (from ../../node_modules/sass-loader/dist/cjs.js): +231 repetitive deprecation warnings omitted. +Run in verbose mode to see all warnings. + @ ./scss/style.scss 2:12-140 9:17-24 13:15-29 + @ ./src/bootstrap.js 15:0-28 + @ ./src/index.js + +WARNING in asset size limit: The following asset(s) exceed the recommended size limit (244 KiB). +This can impact web performance. +Assets: + ./fonts/fontawesome-webfont.c1e38fd9e0e74ba58f7a2b77ef29fdd3.svg (434 KiB) + ./fonts/fa-brands-400.2f517e09eb2ca6650ff5bec5a95157ab.svg (730 KiB) + ./fonts/fa-solid-900.7a8b4f130182d19a2d7c67d80c090397.svg (897 KiB) + 957.js (397 KiB) + 964.js (1.1 MiB) + +webpack 5.96.1 compiled with 33 warnings in 29076 ms + +> @signalk/server-api@2.5.0 build +> tsc --declaration + + +> @signalk/resources-provider@1.3.0 build +> tsc + + +> signalk-server@2.12.0 build +> tsc --build && npm run build:docs + + +> signalk-server@2.12.0 build:docs +> USER_INFO=$(id -u):$(id -g) docker run --rm -v ${PWD}/docs:/book peaceiris/mdbook:v0.4.40 build + diff --git a/package.json b/package.json index 36a47f11a..d92ac8c50 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,6 @@ "@types/mocha": "^10.0.1", "@types/ncp": "^2.0.5", "@types/node-fetch": "^2.5.3", - "@types/rmfr": "^2.0.1", "@types/semver": "^7.1.0", "@types/serialport": "^8.0.2", "@types/split": "^1.0.0", @@ -168,8 +167,7 @@ "lint-staged": "^10.0.3", "mocha": "^10.2.0", "prettier": "^2.7.1", - "rimraf": "^3.0.2", - "rmfr": "^2.0.0", + "rimraf": "^6.0.1", "ts-node": "^10.9.1", "typedoc": "^0.26.11", "typescript": "5.6.x" diff --git a/packages/resources-provider-plugin/.eslintrc.js b/packages/resources-provider-plugin/.eslintrc.js deleted file mode 100644 index e6c897780..000000000 --- a/packages/resources-provider-plugin/.eslintrc.js +++ /dev/null @@ -1,25 +0,0 @@ -// eslint-disable-next-line no-undef -module.exports = { - root: true, - extends: ['eslint:recommended', 'prettier'], - parserOptions: { - ecmaVersion: 2019, - sourceType: 'module' - }, - env: { - node: true, - es2019: true - }, - overrides: [ - { - files: ['**/*.ts'], - extends: [ - 'eslint:recommended', - 'plugin:@typescript-eslint/recommended', - 'prettier' - ], - parser: '@typescript-eslint/parser', - plugins: ['@typescript-eslint'] - } - ] -} diff --git a/packages/resources-provider-plugin/package.json b/packages/resources-provider-plugin/package.json index d9c1554ba..e5dff0976 100644 --- a/packages/resources-provider-plugin/package.json +++ b/packages/resources-provider-plugin/package.json @@ -26,9 +26,9 @@ "build-declaration": "tsc --declaration --allowJs false", "watch": "npm run build -- -w", "prettier": "prettier -w src/", - "lint": "eslint -c .eslintrc.js --ext .ts --ext .js --fix src/", + "lint": "eslint --ext .ts --ext .js --fix src/", "format": "npm run prettier && npm run lint", - "ci-lint": "eslint -c .eslintrc.js --ext .ts --ext .js src/ && prettier --check src/", + "ci-lint": "eslint --ext .ts --ext .js src/ && prettier --check src/", "prepublishOnly": "npm run build && npm run build-declaration", "test": "npm run build && npm run build-declaration && npm run ci-lint" }, diff --git a/packages/resources-provider-plugin/src/index.ts b/packages/resources-provider-plugin/src/index.ts index d61e61eaf..6c9170cb7 100644 --- a/packages/resources-provider-plugin/src/index.ts +++ b/packages/resources-provider-plugin/src/index.ts @@ -256,7 +256,7 @@ module.exports = (server: ResourceProviderApp): Plugin => { } } }) - } catch (error) { + } catch (_error) { failed.push(resType) } }) diff --git a/packages/resources-provider-plugin/src/lib/filestorage.ts b/packages/resources-provider-plugin/src/lib/filestorage.ts index 66b1536e3..feeeed652 100644 --- a/packages/resources-provider-plugin/src/lib/filestorage.ts +++ b/packages/resources-provider-plugin/src/lib/filestorage.ts @@ -57,7 +57,7 @@ export class FileStore implements IResourceStore { try { await this.checkPath(this.savePath) - } catch (error) { + } catch (_error) { throw new Error(`Unable to create ${this.savePath}!`) } return await this.createSavePaths(enabledResTypes) @@ -74,13 +74,13 @@ export class FileStore implements IResourceStore { try { await access(this.resources[t].path, constants.W_OK | constants.R_OK) this.debug(`${this.resources[t].path} - OK....`) - } catch (error) { + } catch (_error) { this.debug(`${this.resources[t].path} NOT available...`) this.debug(`Creating ${this.resources[t].path} ...`) try { await mkdir(this.resources[t].path, { recursive: true }) this.debug(`Created ${this.resources[t].path} - OK....`) - } catch (error) { + } catch (_error) { result.error = true result.message += `ERROR creating ${this.resources[t].path} folder\r\n ` } @@ -217,7 +217,7 @@ export class FileStore implements IResourceStore { ) this.debug(`${path} - OK...`) return true - } catch (error) { + } catch (_error) { // if not then create it this.debug(`${path} does NOT exist...`) this.debug(`Creating ${path} ...`) @@ -225,7 +225,7 @@ export class FileStore implements IResourceStore { await mkdir(path, { recursive: true }) this.debug(`Created ${path} - OK...`) return true - } catch (error) { + } catch (_error) { throw new Error(`Unable to create ${path}!`) } } diff --git a/packages/server-admin-ui-dependencies/package.json b/packages/server-admin-ui-dependencies/package.json index 1b3075f3e..47ebaada6 100644 --- a/packages/server-admin-ui-dependencies/package.json +++ b/packages/server-admin-ui-dependencies/package.json @@ -6,19 +6,19 @@ "author": "teppo.kurki@iki.fi", "license": "Apache-2.0", "optionalDependencies": { - "validate-peer-dependencies": "^1.1.0" + "validate-peer-dependencies": "2.2.0" }, "peerDependencies": { - "@fortawesome/fontawesome-free": "^5.15.1", - "bootstrap": "^4.5.3", - "font-awesome": "^4.7.0", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "react-redux": "^5.1.2", - "react-select": "^3.1.0", - "reactstrap": "^5.0.0", - "redux": "^3.7.2", - "redux-thunk": "2.3.0", + "@fortawesome/fontawesome-free": "6.7.1", + "bootstrap": "5.3.3", + "font-awesome": "4.7.0", + "react": "18.3.1", + "react-dom": "18.3.1", + "react-redux": "9.1.2", + "react-select": "5.8.3", + "reactstrap": "9.2.3", + "redux": "5.0.1", + "redux-thunk": "3.1.0", "simple-line-icons": "^2.5.5" } } diff --git a/packages/server-admin-ui/scss/_bootstrap-variables.scss b/packages/server-admin-ui/_scss/_bootstrap-variables.scss similarity index 100% rename from packages/server-admin-ui/scss/_bootstrap-variables.scss rename to packages/server-admin-ui/_scss/_bootstrap-variables.scss diff --git a/packages/server-admin-ui/scss/_core-variables.scss b/packages/server-admin-ui/_scss/_core-variables.scss similarity index 100% rename from packages/server-admin-ui/scss/_core-variables.scss rename to packages/server-admin-ui/_scss/_core-variables.scss diff --git a/packages/server-admin-ui/_scss/_custom.scss b/packages/server-admin-ui/_scss/_custom.scss new file mode 100644 index 000000000..c5fe97aa2 --- /dev/null +++ b/packages/server-admin-ui/_scss/_custom.scss @@ -0,0 +1,30 @@ +// Here you can add other styles + + +form.rjsf label { + margin-bottom: 0; +} + +form.rjsf div>p.field-description { + font-size: 0.7rem; + font-style: italic; + margin-bottom: 0px; +} + +form.rjsf input { + width: auto; +} + +form.rjsf div.row.array-item { + background-color: aliceblue; + margin-bottom: 3px; +} + +@media (max-width: 767px) { + .container-fluid, .row { + padding:0 2px !important; + } + .navbar-header { + margin:0px; + } +} \ No newline at end of file diff --git a/packages/server-admin-ui/scss/core/_animate.scss b/packages/server-admin-ui/_scss/core/_animate.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_animate.scss rename to packages/server-admin-ui/_scss/core/_animate.scss diff --git a/packages/server-admin-ui/scss/core/_aside.scss b/packages/server-admin-ui/_scss/core/_aside.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_aside.scss rename to packages/server-admin-ui/_scss/core/_aside.scss diff --git a/packages/server-admin-ui/scss/core/_avatars.scss b/packages/server-admin-ui/_scss/core/_avatars.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_avatars.scss rename to packages/server-admin-ui/_scss/core/_avatars.scss diff --git a/packages/server-admin-ui/_scss/core/_badge.scss b/packages/server-admin-ui/_scss/core/_badge.scss new file mode 100644 index 000000000..fc81c1d9d --- /dev/null +++ b/packages/server-admin-ui/_scss/core/_badge.scss @@ -0,0 +1,3 @@ +.badge-pill { + border-radius: .25rem +} diff --git a/packages/server-admin-ui/scss/core/_breadcrumb-menu.scss b/packages/server-admin-ui/_scss/core/_breadcrumb-menu.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_breadcrumb-menu.scss rename to packages/server-admin-ui/_scss/core/_breadcrumb-menu.scss diff --git a/packages/server-admin-ui/scss/core/_breadcrumb.scss b/packages/server-admin-ui/_scss/core/_breadcrumb.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_breadcrumb.scss rename to packages/server-admin-ui/_scss/core/_breadcrumb.scss diff --git a/packages/server-admin-ui/scss/core/_buttons.scss b/packages/server-admin-ui/_scss/core/_buttons.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_buttons.scss rename to packages/server-admin-ui/_scss/core/_buttons.scss diff --git a/packages/server-admin-ui/scss/core/_callout.scss b/packages/server-admin-ui/_scss/core/_callout.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_callout.scss rename to packages/server-admin-ui/_scss/core/_callout.scss diff --git a/packages/server-admin-ui/scss/core/_card.scss b/packages/server-admin-ui/_scss/core/_card.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_card.scss rename to packages/server-admin-ui/_scss/core/_card.scss diff --git a/packages/server-admin-ui/scss/core/_charts.scss b/packages/server-admin-ui/_scss/core/_charts.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_charts.scss rename to packages/server-admin-ui/_scss/core/_charts.scss diff --git a/packages/server-admin-ui/scss/core/_dropdown-menu-right.scss b/packages/server-admin-ui/_scss/core/_dropdown-menu-right.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_dropdown-menu-right.scss rename to packages/server-admin-ui/_scss/core/_dropdown-menu-right.scss diff --git a/packages/server-admin-ui/scss/core/_dropdown.scss b/packages/server-admin-ui/_scss/core/_dropdown.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_dropdown.scss rename to packages/server-admin-ui/_scss/core/_dropdown.scss diff --git a/packages/server-admin-ui/scss/core/_footer.scss b/packages/server-admin-ui/_scss/core/_footer.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_footer.scss rename to packages/server-admin-ui/_scss/core/_footer.scss diff --git a/packages/server-admin-ui/scss/core/_grid.scss b/packages/server-admin-ui/_scss/core/_grid.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_grid.scss rename to packages/server-admin-ui/_scss/core/_grid.scss diff --git a/packages/server-admin-ui/scss/core/_input-group.scss b/packages/server-admin-ui/_scss/core/_input-group.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_input-group.scss rename to packages/server-admin-ui/_scss/core/_input-group.scss diff --git a/packages/server-admin-ui/scss/core/_layout.scss b/packages/server-admin-ui/_scss/core/_layout.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_layout.scss rename to packages/server-admin-ui/_scss/core/_layout.scss diff --git a/packages/server-admin-ui/scss/core/_loading.scss b/packages/server-admin-ui/_scss/core/_loading.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_loading.scss rename to packages/server-admin-ui/_scss/core/_loading.scss diff --git a/packages/server-admin-ui/scss/core/_mixins.scss b/packages/server-admin-ui/_scss/core/_mixins.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_mixins.scss rename to packages/server-admin-ui/_scss/core/_mixins.scss diff --git a/packages/server-admin-ui/scss/core/_mobile.scss b/packages/server-admin-ui/_scss/core/_mobile.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_mobile.scss rename to packages/server-admin-ui/_scss/core/_mobile.scss diff --git a/packages/server-admin-ui/scss/core/_modal.scss b/packages/server-admin-ui/_scss/core/_modal.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_modal.scss rename to packages/server-admin-ui/_scss/core/_modal.scss diff --git a/packages/server-admin-ui/scss/core/_nav.scss b/packages/server-admin-ui/_scss/core/_nav.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_nav.scss rename to packages/server-admin-ui/_scss/core/_nav.scss diff --git a/packages/server-admin-ui/scss/core/_navbar.scss b/packages/server-admin-ui/_scss/core/_navbar.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_navbar.scss rename to packages/server-admin-ui/_scss/core/_navbar.scss diff --git a/packages/server-admin-ui/scss/core/_others.scss b/packages/server-admin-ui/_scss/core/_others.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_others.scss rename to packages/server-admin-ui/_scss/core/_others.scss diff --git a/packages/server-admin-ui/scss/core/_progress.scss b/packages/server-admin-ui/_scss/core/_progress.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_progress.scss rename to packages/server-admin-ui/_scss/core/_progress.scss diff --git a/packages/server-admin-ui/scss/core/_rtl.scss b/packages/server-admin-ui/_scss/core/_rtl.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_rtl.scss rename to packages/server-admin-ui/_scss/core/_rtl.scss diff --git a/packages/server-admin-ui/scss/core/_sidebar.scss b/packages/server-admin-ui/_scss/core/_sidebar.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_sidebar.scss rename to packages/server-admin-ui/_scss/core/_sidebar.scss diff --git a/packages/server-admin-ui/scss/core/_switches.scss b/packages/server-admin-ui/_scss/core/_switches.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_switches.scss rename to packages/server-admin-ui/_scss/core/_switches.scss diff --git a/packages/server-admin-ui/scss/core/_tables.scss b/packages/server-admin-ui/_scss/core/_tables.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_tables.scss rename to packages/server-admin-ui/_scss/core/_tables.scss diff --git a/packages/server-admin-ui/scss/core/_temp.scss b/packages/server-admin-ui/_scss/core/_temp.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_temp.scss rename to packages/server-admin-ui/_scss/core/_temp.scss diff --git a/packages/server-admin-ui/scss/core/_typography.scss b/packages/server-admin-ui/_scss/core/_typography.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_typography.scss rename to packages/server-admin-ui/_scss/core/_typography.scss diff --git a/packages/server-admin-ui/scss/core/_utilities.scss b/packages/server-admin-ui/_scss/core/_utilities.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_utilities.scss rename to packages/server-admin-ui/_scss/core/_utilities.scss diff --git a/packages/server-admin-ui/scss/core/_variables.scss b/packages/server-admin-ui/_scss/core/_variables.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_variables.scss rename to packages/server-admin-ui/_scss/core/_variables.scss diff --git a/packages/server-admin-ui/scss/core/_widgets.scss b/packages/server-admin-ui/_scss/core/_widgets.scss similarity index 100% rename from packages/server-admin-ui/scss/core/_widgets.scss rename to packages/server-admin-ui/_scss/core/_widgets.scss diff --git a/packages/server-admin-ui/scss/core/core.scss b/packages/server-admin-ui/_scss/core/core.scss similarity index 100% rename from packages/server-admin-ui/scss/core/core.scss rename to packages/server-admin-ui/_scss/core/core.scss diff --git a/packages/server-admin-ui/scss/core/utilities/_background.scss b/packages/server-admin-ui/_scss/core/utilities/_background.scss similarity index 100% rename from packages/server-admin-ui/scss/core/utilities/_background.scss rename to packages/server-admin-ui/_scss/core/utilities/_background.scss diff --git a/packages/server-admin-ui/scss/core/utilities/_borders.scss b/packages/server-admin-ui/_scss/core/utilities/_borders.scss similarity index 100% rename from packages/server-admin-ui/scss/core/utilities/_borders.scss rename to packages/server-admin-ui/_scss/core/utilities/_borders.scss diff --git a/packages/server-admin-ui/scss/core/utilities/_display.scss b/packages/server-admin-ui/_scss/core/utilities/_display.scss similarity index 100% rename from packages/server-admin-ui/scss/core/utilities/_display.scss rename to packages/server-admin-ui/_scss/core/utilities/_display.scss diff --git a/packages/server-admin-ui/_scss/style.scss b/packages/server-admin-ui/_scss/style.scss new file mode 100644 index 000000000..0062c7272 --- /dev/null +++ b/packages/server-admin-ui/_scss/style.scss @@ -0,0 +1,22 @@ +/*! + * CoreUI - Open Source Bootstrap Admin Template + * @version v1.0.6 + * @link http://coreui.io + * Copyright (c) 2017 creativeLabs Ɓukasz Holeczek + * @license MIT + */ + +// Override Boostrap variables +@import 'bootstrap-variables'; + +// Import Bootstrap source files +@import '~bootstrap/scss/bootstrap'; + +// Override core variables +@import 'core-variables'; + +// Import core styles +@import 'core/core'; + +// Custom styles +@import 'custom'; diff --git a/packages/server-admin-ui/scss/vendors/_variables.scss b/packages/server-admin-ui/_scss/vendors/_variables.scss similarity index 100% rename from packages/server-admin-ui/scss/vendors/_variables.scss rename to packages/server-admin-ui/_scss/vendors/_variables.scss diff --git a/packages/server-admin-ui/scss/vendors/chart.js/chart.scss b/packages/server-admin-ui/_scss/vendors/chart.js/chart.scss similarity index 100% rename from packages/server-admin-ui/scss/vendors/chart.js/chart.scss rename to packages/server-admin-ui/_scss/vendors/chart.js/chart.scss diff --git a/packages/server-admin-ui/package.json b/packages/server-admin-ui/package.json index 02cf100a7..084feff96 100644 --- a/packages/server-admin-ui/package.json +++ b/packages/server-admin-ui/package.json @@ -15,50 +15,51 @@ "devDependencies": { "@babel/core": "^7.11.6", "@babel/preset-react": "^7.10.4", - "@fortawesome/fontawesome-free": "^5.15.1", - "@fortawesome/fontawesome-svg-core": "^6.5.1", - "@fortawesome/free-regular-svg-icons": "^6.5.1", - "@fortawesome/free-solid-svg-icons": "^6.5.1", - "@fortawesome/react-fontawesome": "^0.2.0", + "@fortawesome/fontawesome-free": "6.7.1", + "@fortawesome/fontawesome-svg-core": "6.7.1", + "@fortawesome/free-regular-svg-icons": "6.7.1", + "@fortawesome/free-solid-svg-icons": "6.7.1", + "@fortawesome/react-fontawesome": "0.2.2", "@signalk/server-admin-ui-dependencies": "1.0.1", - "ansi-to-html": "^0.6.14", + "@coreui/coreui": "5.2.0", + "ansi-to-html": "0.7.2", "babel-loader": "^8.1.0", - "bootstrap": "^4.5.3", + "bootstrap": "5.3.3", "buffer": "^6.0.3", "copy-webpack-plugin": "^11.0.0", "css-loader": "^5.0.0", "eslint": "^8.57.0", "eslint-plugin-react": "^7.34.1", "file-loader": "^6.1.1", - "font-awesome": "^4.7.0", - "html-webpack-plugin": "^5.0.0-alpha.6", + "html-webpack-plugin": "5.6.3", "jsonlint-mod": "^1.7.6", - "lodash.get": "^4.4.2", - "lodash.remove": "^4.7.0", - "lodash.set": "^4.3.2", - "lodash.uniq": "^4.5.0", + "lodash.get": "4.4.2", + "lodash.remove": "4.7.0", + "lodash.set": "4.3.2", + "lodash.uniq": "4.5.0", "moment": "^2.29.1", "prettier": "^2.3.2", - "react": "^16.13.1", - "react-copy-to-clipboard": "^5.0.3", - "react-dom": "^16.13.1", - "react-html-parser": "^2.0.2", - "react-json-tree": "^0.13.0", - "react-jsonschema-form-bs4": "^1.7.1", - "react-redux": "^5.1.2", - "react-router-dom": "^4.3.1", - "react-select": "^3.1.0", - "reactstrap": "^5.0.0", + "react": "18.3.1", + "react-copy-to-clipboard": "5.1.0", + "react-dom": "18.3.1", + "html-react-parser": "5.1.19", + "react-json-tree": "0.19.0", + "@rjsf/core": "5.23.1", + "@rjsf/validator-ajv8": "5.23.1", + "react-redux": "9.1.2", + "react-router": "7.0.2", + "react-select": "5.8.3", + "reactstrap": "9.2.3", "reconnecting-websocket": "^4.4.0", - "redux": "^3.7.2", - "redux-thunk": "2.3.0", + "redux": "5.0.1", + "redux-thunk": "3.1.0", "sass": "^1.81.0", "sass-loader": "^16.0.3", "simple-line-icons": "^2.5.5", "style-loader": "^2.0.0", - "webpack": "^5.96.1", - "webpack-bundle-analyzer": "^3.9.0", - "webpack-cli": "^4.2.0" + "webpack": "5.96.1", + "webpack-bundle-analyzer": "4.10.2", + "webpack-cli": "5.1.4" }, "scripts": { "prepublishOnly": "npm run clean && npm run build", diff --git a/packages/server-admin-ui/public_src/index.html b/packages/server-admin-ui/public_src/index.html index 2b68c0111..064c8579c 100644 --- a/packages/server-admin-ui/public_src/index.html +++ b/packages/server-admin-ui/public_src/index.html @@ -41,7 +41,7 @@ --> -
+