Skip to content

Commit a869510

Browse files
authored
Merge branch 'main' into 6527-fix-fe-build-errors
2 parents 20245ba + b0b5cdb commit a869510

5 files changed

Lines changed: 106 additions & 37 deletions

File tree

.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"parserOptions": {
1414
"ecmaVersion": 2022
1515
},
16-
"ignorePatterns": ["frontend/dist/", "var/", "*.svg", "*.xml"],
16+
"ignorePatterns": ["frontend/dist/", "var/", "*.svg", "*.xml", "**/*.d.ts"],
1717
"plugins": ["promise", "no-only-tests"],
1818
"settings": {
1919
"import/core-modules": [ "lottie-web-vue", "@heroicons/vue" ],

docs/upgrade/open-source-to-premium.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,9 @@ a restart of the `forge` app is required.
2121
After the forge application has restarted, the Node-RED runtimes need to be
2222
updated to leverage these features. As restarting Node-RED might need to be
2323
coordinated, FlowFuse will not automatically restart all instances.
24+
25+
### Reusing FlowFuse licenses
26+
27+
A single license may only be applied to one FlowFuse platform at any time. Running multiple FlowFuse platforms with the same license key is against the terms of the subscription.
28+
29+
A license may be reused on another FlowFuse platform if the original platform is no longer running. For example, if the FlowFuse platform is reinstalled onto new hardware, the license from the original install can be reused.

frontend/jsconfig.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"compilerOptions": {
3+
"jsx": "preserve",
4+
"baseUrl": "."
5+
},
6+
"include": ["src/**/*", "src/**/*.d.ts"]
7+
}

frontend/src/components.d.ts

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
// Global component type declarations for Volar (Vue - Official) IDE support.
2+
// Enables Go-to-Definition and autocomplete for globally registered components.
3+
// Keep in sync with: ui-components/components.js and main.js
4+
5+
declare module 'vue' {
6+
export interface GlobalComponents {
7+
// -- ui-components/components.js --
8+
FfNavBreadcrumb: typeof import('./ui-components/components/Breadcrumb.vue')['default']
9+
FfButton: typeof import('./ui-components/components/Button.vue')['default']
10+
FfCheck: typeof import('./ui-components/components/Check.vue')['default']
11+
FfDialog: typeof import('./ui-components/components/DialogBox.vue')['default']
12+
FfDivider: typeof import('./ui-components/components/Divider.vue')['default']
13+
FfHelp: typeof import('./ui-components/components/Help.vue')['default']
14+
FfMarkdownViewer: typeof import('./ui-components/components/Markdown.vue')['default']
15+
FfNotificationPill: typeof import('./ui-components/components/NotificationPill.vue')['default']
16+
FfNotificationToast: typeof import('./ui-components/components/NotificationToast.vue')['default']
17+
FfPopover: typeof import('./ui-components/components/Popover.vue')['default']
18+
FfSpinner: typeof import('./ui-components/components/Spinner.vue')['default']
19+
20+
// Data Table
21+
FfDataTable: typeof import('./ui-components/components/data-table/DataTable.vue')['default']
22+
FfDataTableCell: typeof import('./ui-components/components/data-table/DataTableCell.vue')['default']
23+
FfDataTableRow: typeof import('./ui-components/components/data-table/DataTableRow.vue')['default']
24+
25+
// Form Elements
26+
FfCheckbox: typeof import('./ui-components/components/form/Checkbox.vue')['default']
27+
FfCombobox: typeof import('./ui-components/components/form/ComboBox.vue')['default']
28+
FfDropdown: typeof import('./ui-components/components/form/Dropdown.vue')['default']
29+
FfDropdownOption: typeof import('./ui-components/components/form/DropdownOption.vue')['default']
30+
FfListbox: typeof import('./ui-components/components/form/ListBox.vue')['default']
31+
FfRadioButton: typeof import('./ui-components/components/form/RadioButton.vue')['default']
32+
FfRadioGroup: typeof import('./ui-components/components/form/RadioGroup.vue')['default']
33+
FfTextInput: typeof import('./ui-components/components/form/TextInput.vue')['default']
34+
FfTileSelection: typeof import('./ui-components/components/form/TileSelection.vue')['default']
35+
FfTileSelectionOption: typeof import('./ui-components/components/form/TileSelectionOption.vue')['default']
36+
FfToggleSwitch: typeof import('./ui-components/components/form/ToggleSwitch.vue')['default']
37+
38+
// Kebab Menu
39+
FfKebabItem: typeof import('./ui-components/components/kebab-menu/KebabItem.vue')['default']
40+
FfKebabMenu: typeof import('./ui-components/components/kebab-menu/KebabMenu.vue')['default']
41+
42+
// Tabs
43+
FfTabs: typeof import('./ui-components/components/tabs/Tabs.vue')['default']
44+
45+
// -- main.js --
46+
FfPage: typeof import('./layouts/Page.vue')['default']
47+
FfLayoutPlatform: typeof import('./layouts/Platform.vue')['default'],
48+
FfPageHeader: typeof import('./components/SectionNavigationHeader.vue')['default']
49+
FfLoading: typeof import('./components/Loading.vue')['default']
50+
FfTeamLink: typeof import('./components/router-links/TeamLink.vue')['default']
51+
LottieAnimation: typeof import('lottie-web-vue')['LottieAnimation']
52+
}
53+
}
54+
55+
export {}

package-lock.json

Lines changed: 37 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)