From 9e5805f0929efcb061a7c9ecb66ed0093374a856 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 1 Sep 2021 11:41:48 +0100 Subject: [PATCH] Merge standard-components into the client library --- .../{standard-components => client}/README.md | 0 .../manifest.json | 0 packages/client/package.json | 19 +- packages/client/rollup.config.js | 34 + packages/client/src/api/api.js | 4 +- packages/client/src/api/automations.js | 3 +- packages/client/src/api/queries.js | 2 +- packages/client/src/api/rows.js | 2 +- .../client/src/components/ClientApp.svelte | 22 +- .../client/src/components/Component.svelte | 19 +- packages/client/src/components/Router.svelte | 2 +- packages/client/src/components/Screen.svelte | 4 +- .../components/app}/BackgroundImage.svelte | 0 .../src/components/app}/Button.svelte | 0 .../src/components/app}/CardStat.svelte | 0 .../src/components/app}/Container.svelte | 0 .../src/components/app}/DataProvider.svelte | 2 +- .../components/app}/DateRangePicker.svelte | 0 .../src/components/app}/Divider.svelte | 0 .../src/components/app}/Embed.svelte | 0 .../src/components/app}/ErrorsBox.svelte | 0 .../src/components/app}/Heading.svelte | 0 .../src/components/app}/Icon.svelte | 0 .../src/components/app}/Image.svelte | 0 .../src/components/app}/Layout.svelte | 3 +- .../src/components/app}/Link.svelte | 0 .../src/components/app}/Placeholder.svelte | 0 .../src/components/app}/Repeater.svelte | 0 .../src/components/app}/ScreenSlot.svelte | 0 .../src/components/app}/Section.svelte | 0 .../src/components/app}/SpectrumCard.svelte | 0 .../src/components/app}/Text.svelte | 0 .../components/app}/charts/ApexChart.svelte | 0 .../app}/charts/ApexOptionsBuilder.js | 0 .../components/app}/charts/AreaChart.svelte | 0 .../components/app}/charts/BarChart.svelte | 0 .../app}/charts/CandleStickChart.svelte | 0 .../components/app}/charts/DonutChart.svelte | 0 .../components/app}/charts/LineChart.svelte | 0 .../components/app}/charts/PieChart.svelte | 0 .../src/components/app}/charts/index.js | 0 .../components/app}/deprecated/Card.svelte | 0 .../app}/deprecated/CardHorizontal.svelte | 0 .../app}/deprecated/Navigation.svelte | 0 .../app}/deprecated/StackedList.svelte | 0 .../app}/forms/AttachmentField.svelte | 0 .../components/app}/forms/BooleanField.svelte | 0 .../app}/forms/DateTimeField.svelte | 0 .../src/components/app}/forms/Field.svelte | 0 .../components/app}/forms/FieldGroup.svelte | 0 .../app}/forms/FieldGroupFallback.svelte | 0 .../src/components/app}/forms/Form.svelte | 0 .../src/components/app}/forms/FormStep.svelte | 0 .../components/app}/forms/InnerForm.svelte | 2 +- .../app}/forms/LongFormField.svelte | 0 .../app}/forms/MultiFieldSelect.svelte | 0 .../components/app}/forms/NumberField.svelte | 0 .../components/app}/forms/OptionsField.svelte | 0 .../app}/forms/PasswordField.svelte | 0 .../app}/forms/RelationshipField.svelte | 0 .../components/app}/forms/StringField.svelte | 0 .../src/components/app}/forms/index.js | 0 .../components/app}/forms/optionsParser.js | 0 .../src/components/app}/forms/validation.js | 0 .../src/components/app}/index.js | 3 - .../components/app}/table/SlotRenderer.svelte | 0 .../src/components/app}/table/Table.svelte | 0 .../src/components/app}/table/index.js | 0 .../DeviceBindingsProvider.svelte | 0 .../components/{ => context}/Provider.svelte | 4 +- .../{ => context}/UserBindingsProvider.svelte | 4 +- .../{ => overlay}/ConfirmationDisplay.svelte | 2 +- .../{ => overlay}/NotificationDisplay.svelte | 2 +- .../{ => overlay}/PeekScreenDisplay.svelte | 2 +- .../components/preview/HoverIndicator.svelte | 2 +- .../components/preview/IndicatorSet.svelte | 2 +- .../preview/SelectionIndicator.svelte | 2 +- .../src/components/preview/SettingsBar.svelte | 4 +- .../components/preview/SettingsButton.svelte | 2 +- .../preview/SettingsColorPicker.svelte | 2 +- .../components/preview/SettingsPicker.svelte | 2 +- packages/client/src/index.js | 6 +- packages/client/src/sdk.js | 12 +- packages/client/src/{store => stores}/app.js | 0 packages/client/src/{store => stores}/auth.js | 0 .../client/src/{store => stores}/builder.js | 2 +- .../src/{store => stores}/confirmation.js | 0 .../client/src/{store => stores}/context.js | 0 .../src/{store => stores}/dataSource.js | 0 .../client/src/{store => stores}/index.js | 0 .../src/{store => stores}/initialise.js | 0 .../src/{store => stores}/notification.js | 0 packages/client/src/{store => stores}/peek.js | 0 .../client/src/{store => stores}/routes.js | 0 .../client/src/{store => stores}/screens.js | 0 packages/client/src/utils/buttonActions.js | 6 +- packages/client/src/utils/conditions.js | 5 +- packages/client/src/utils/hash.js | 12 - .../src => client/src/utils}/helpers.js | 16 + packages/client/src/utils/linkable.js | 2 +- .../src => client/src/utils}/lucene.js | 0 packages/client/src/utils/styleable.js | 2 +- packages/client/yarn.lock | 1324 ++++++++++++++++- packages/server/package.json | 4 +- .../src/api/controllers/static/index.js | 40 +- packages/server/src/api/routes/static.js | 1 - .../src/utilities/fileSystem/clientLibrary.js | 2 +- .../server/src/utilities/fileSystem/index.js | 7 +- packages/standard-components/.gitignore | 4 - packages/standard-components/LICENSE | 375 ----- packages/standard-components/package.json | 49 - .../standard-components/scripts/deploy.js | 34 - packages/standard-components/vite.config.js | 28 - packages/standard-components/yarn.lock | 292 ---- 114 files changed, 1454 insertions(+), 920 deletions(-) rename packages/{standard-components => client}/README.md (100%) rename packages/{standard-components => client}/manifest.json (100%) rename packages/{standard-components/src => client/src/components/app}/BackgroundImage.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/Button.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/CardStat.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/Container.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/DataProvider.svelte (99%) rename packages/{standard-components/src => client/src/components/app}/DateRangePicker.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/Divider.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/Embed.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/ErrorsBox.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/Heading.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/Icon.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/Image.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/Layout.svelte (98%) rename packages/{standard-components/src => client/src/components/app}/Link.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/Placeholder.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/Repeater.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/ScreenSlot.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/Section.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/SpectrumCard.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/Text.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/charts/ApexChart.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/charts/ApexOptionsBuilder.js (100%) rename packages/{standard-components/src => client/src/components/app}/charts/AreaChart.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/charts/BarChart.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/charts/CandleStickChart.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/charts/DonutChart.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/charts/LineChart.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/charts/PieChart.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/charts/index.js (100%) rename packages/{standard-components/src => client/src/components/app}/deprecated/Card.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/deprecated/CardHorizontal.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/deprecated/Navigation.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/deprecated/StackedList.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/forms/AttachmentField.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/forms/BooleanField.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/forms/DateTimeField.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/forms/Field.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/forms/FieldGroup.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/forms/FieldGroupFallback.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/forms/Form.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/forms/FormStep.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/forms/InnerForm.svelte (99%) rename packages/{standard-components/src => client/src/components/app}/forms/LongFormField.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/forms/MultiFieldSelect.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/forms/NumberField.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/forms/OptionsField.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/forms/PasswordField.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/forms/RelationshipField.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/forms/StringField.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/forms/index.js (100%) rename packages/{standard-components/src => client/src/components/app}/forms/optionsParser.js (100%) rename packages/{standard-components/src => client/src/components/app}/forms/validation.js (100%) rename packages/{standard-components/src => client/src/components/app}/index.js (95%) rename packages/{standard-components/src => client/src/components/app}/table/SlotRenderer.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/table/Table.svelte (100%) rename packages/{standard-components/src => client/src/components/app}/table/index.js (100%) rename packages/client/src/components/{ => context}/DeviceBindingsProvider.svelte (100%) rename packages/client/src/components/{ => context}/Provider.svelte (94%) rename packages/client/src/components/{ => context}/UserBindingsProvider.svelte (82%) rename packages/client/src/components/{ => overlay}/ConfirmationDisplay.svelte (88%) rename packages/client/src/components/{ => overlay}/NotificationDisplay.svelte (94%) rename packages/client/src/components/{ => overlay}/PeekScreenDisplay.svelte (99%) rename packages/client/src/{store => stores}/app.js (100%) rename packages/client/src/{store => stores}/auth.js (100%) rename packages/client/src/{store => stores}/builder.js (97%) rename packages/client/src/{store => stores}/confirmation.js (100%) rename packages/client/src/{store => stores}/context.js (100%) rename packages/client/src/{store => stores}/dataSource.js (100%) rename packages/client/src/{store => stores}/index.js (100%) rename packages/client/src/{store => stores}/initialise.js (100%) rename packages/client/src/{store => stores}/notification.js (100%) rename packages/client/src/{store => stores}/peek.js (100%) rename packages/client/src/{store => stores}/routes.js (100%) rename packages/client/src/{store => stores}/screens.js (100%) delete mode 100644 packages/client/src/utils/hash.js rename packages/{standard-components/src => client/src/utils}/helpers.js (79%) rename packages/{standard-components/src => client/src/utils}/lucene.js (100%) delete mode 100644 packages/standard-components/.gitignore delete mode 100644 packages/standard-components/LICENSE delete mode 100644 packages/standard-components/package.json delete mode 100644 packages/standard-components/scripts/deploy.js delete mode 100644 packages/standard-components/vite.config.js delete mode 100644 packages/standard-components/yarn.lock diff --git a/packages/standard-components/README.md b/packages/client/README.md similarity index 100% rename from packages/standard-components/README.md rename to packages/client/README.md diff --git a/packages/standard-components/manifest.json b/packages/client/manifest.json similarity index 100% rename from packages/standard-components/manifest.json rename to packages/client/manifest.json diff --git a/packages/client/package.json b/packages/client/package.json index fc03753c41..5f8cd0d60c 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -11,7 +11,8 @@ "import": "./dist/budibase-client.js", "require": "./dist/budibase-client.js" }, - "./package.json": "./package.json" + "./package.json": "./package.json", + "./manifest.json": "./manifest.json" }, "scripts": { "build": "rollup -c", @@ -19,15 +20,25 @@ }, "dependencies": { "@budibase/bbui": "^0.9.117-alpha.2", - "@budibase/standard-components": "^0.9.117-alpha.2", "@budibase/string-templates": "^0.9.117-alpha.2", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" }, "devDependencies": { + "@budibase/bbui": "^0.9.117-alpha.2", + "@rollup/plugin-alias": "^3.1.5", "@rollup/plugin-commonjs": "^18.0.0", "@rollup/plugin-node-resolve": "^11.2.1", + "@spectrum-css/button": "^3.0.3", + "@spectrum-css/card": "^3.0.3", + "@spectrum-css/divider": "^1.0.3", + "@spectrum-css/link": "^3.1.3", + "@spectrum-css/page": "^3.0.1", + "@spectrum-css/typography": "^3.0.2", + "@spectrum-css/vars": "^3.0.1", + "apexcharts": "^3.22.1", + "dayjs": "^1.10.5", "fs-extra": "^8.1.0", "jsdom": "^16.0.1", "postcss": "^8.2.10", @@ -39,7 +50,9 @@ "rollup-plugin-svelte": "^7.1.0", "rollup-plugin-svg": "^2.0.0", "rollup-plugin-terser": "^7.0.2", - "svelte": "^3.38.2" + "svelte": "^3.38.2", + "svelte-apexcharts": "^1.0.2", + "svelte-flatpickr": "^3.1.0" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" } diff --git a/packages/client/rollup.config.js b/packages/client/rollup.config.js index 3d8812087e..f404f93c4c 100644 --- a/packages/client/rollup.config.js +++ b/packages/client/rollup.config.js @@ -1,5 +1,6 @@ import commonjs from "@rollup/plugin-commonjs" import resolve from "@rollup/plugin-node-resolve" +import alias from "@rollup/plugin-alias" import svelte from "rollup-plugin-svelte" import { terser } from "rollup-plugin-terser" import postcss from "rollup-plugin-postcss" @@ -7,6 +8,7 @@ import svg from "rollup-plugin-svg" import json from "rollup-plugin-json" import builtins from "rollup-plugin-node-builtins" import globals from "rollup-plugin-node-globals" +import path from "path" const production = !process.env.ROLLUP_WATCH const ignoredWarnings = [ @@ -26,6 +28,38 @@ export default { }, ], plugins: [ + alias({ + entries: [ + { + find: "manifest.json", + replacement: path.resolve("./manifest.json"), + }, + { + find: "api", + replacement: path.resolve("./src/api"), + }, + { + find: "components", + replacement: path.resolve("./src/components"), + }, + { + find: "stores", + replacement: path.resolve("./src/stores"), + }, + { + find: "utils", + replacement: path.resolve("./src/utils"), + }, + { + find: "constants", + replacement: path.resolve("./src/constants"), + }, + { + find: "sdk", + replacement: path.resolve("./src/sdk"), + }, + ], + }), svelte({ emitCss: true, onwarn: (warning, handler) => { diff --git a/packages/client/src/api/api.js b/packages/client/src/api/api.js index 5449c3f219..2476030eb0 100644 --- a/packages/client/src/api/api.js +++ b/packages/client/src/api/api.js @@ -1,5 +1,5 @@ -import { notificationStore } from "../store" -import { ApiVersion } from "../constants" +import { notificationStore } from "stores" +import { ApiVersion } from "constants" /** * API cache for cached request responses. diff --git a/packages/client/src/api/automations.js b/packages/client/src/api/automations.js index 2b989f85ae..cb3e4623ad 100644 --- a/packages/client/src/api/automations.js +++ b/packages/client/src/api/automations.js @@ -1,5 +1,6 @@ -import { notificationStore } from "../store/notification" +import { notificationStore } from "stores/notification" import API from "./api" + /** * Executes an automation. Must have "App Action" trigger. */ diff --git a/packages/client/src/api/queries.js b/packages/client/src/api/queries.js index a6ef1a763f..8db41ecf5c 100644 --- a/packages/client/src/api/queries.js +++ b/packages/client/src/api/queries.js @@ -1,4 +1,4 @@ -import { notificationStore, dataSourceStore } from "../store" +import { notificationStore, dataSourceStore } from "stores" import API from "./api" /** diff --git a/packages/client/src/api/rows.js b/packages/client/src/api/rows.js index 21f8ec1f98..ba7a4215a9 100644 --- a/packages/client/src/api/rows.js +++ b/packages/client/src/api/rows.js @@ -1,4 +1,4 @@ -import { notificationStore, dataSourceStore } from "../store" +import { notificationStore, dataSourceStore } from "stores" import API from "./api" import { fetchTableDefinition } from "./tables" diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte index 11347821a9..e0464764f3 100644 --- a/packages/client/src/components/ClientApp.svelte +++ b/packages/client/src/components/ClientApp.svelte @@ -1,11 +1,9 @@ diff --git a/packages/client/src/components/NotificationDisplay.svelte b/packages/client/src/components/overlay/NotificationDisplay.svelte similarity index 94% rename from packages/client/src/components/NotificationDisplay.svelte rename to packages/client/src/components/overlay/NotificationDisplay.svelte index f03fb692fd..6e8be21647 100644 --- a/packages/client/src/components/NotificationDisplay.svelte +++ b/packages/client/src/components/overlay/NotificationDisplay.svelte @@ -1,5 +1,5 @@ diff --git a/packages/client/src/components/PeekScreenDisplay.svelte b/packages/client/src/components/overlay/PeekScreenDisplay.svelte similarity index 99% rename from packages/client/src/components/PeekScreenDisplay.svelte rename to packages/client/src/components/overlay/PeekScreenDisplay.svelte index 6d6e8c39c7..0af1ba499e 100644 --- a/packages/client/src/components/PeekScreenDisplay.svelte +++ b/packages/client/src/components/overlay/PeekScreenDisplay.svelte @@ -4,7 +4,7 @@ dataSourceStore, notificationStore, routeStore, - } from "../store" + } from "stores" import { Modal, ModalContent, ActionButton } from "@budibase/bbui" import { onDestroy } from "svelte" diff --git a/packages/client/src/components/preview/HoverIndicator.svelte b/packages/client/src/components/preview/HoverIndicator.svelte index 5cdf3eccff..9518c6d101 100644 --- a/packages/client/src/components/preview/HoverIndicator.svelte +++ b/packages/client/src/components/preview/HoverIndicator.svelte @@ -1,7 +1,7 @@ diff --git a/packages/client/src/components/preview/SettingsBar.svelte b/packages/client/src/components/preview/SettingsBar.svelte index 69197e6ede..bc4f93acda 100644 --- a/packages/client/src/components/preview/SettingsBar.svelte +++ b/packages/client/src/components/preview/SettingsBar.svelte @@ -3,8 +3,8 @@ import SettingsButton from "./SettingsButton.svelte" import SettingsColorPicker from "./SettingsColorPicker.svelte" import SettingsPicker from "./SettingsPicker.svelte" - import { builderStore } from "../../store" - import { domDebounce } from "../../utils/domDebounce" + import { builderStore } from "stores" + import { domDebounce } from "utils/domDebounce" const verticalOffset = 28 const horizontalOffset = 2 diff --git a/packages/client/src/components/preview/SettingsButton.svelte b/packages/client/src/components/preview/SettingsButton.svelte index c074d4e7f4..1490b2c9b7 100644 --- a/packages/client/src/components/preview/SettingsButton.svelte +++ b/packages/client/src/components/preview/SettingsButton.svelte @@ -1,6 +1,6 @@