From 7634ed6869c35fda22f2d5643800c647a0c6914d Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 18 Mar 2021 18:26:41 +0000 Subject: [PATCH 1/6] Updating the CLI to have a fast init method, this will make using it for DO much much easier. --- packages/cli/src/constants.js | 4 ++++ packages/cli/src/hosting/index.js | 26 +++++++++++++++----------- packages/cli/src/hosting/makeEnv.js | 24 ++++++++++++++++-------- packages/cli/src/structures/Command.js | 13 +++++-------- 4 files changed, 40 insertions(+), 27 deletions(-) diff --git a/packages/cli/src/constants.js b/packages/cli/src/constants.js index a601909232..40c63d218d 100644 --- a/packages/cli/src/constants.js +++ b/packages/cli/src/constants.js @@ -2,3 +2,7 @@ exports.CommandWords = { HOSTING: "hosting", HELP: "help", } + +exports.InitTypes = { + QUICK: "quick", +} diff --git a/packages/cli/src/hosting/index.js b/packages/cli/src/hosting/index.js index a8e77f49d7..f5c2552c64 100644 --- a/packages/cli/src/hosting/index.js +++ b/packages/cli/src/hosting/index.js @@ -1,5 +1,5 @@ const Command = require("../structures/Command") -const { CommandWords } = require("../constants") +const { CommandWords, InitTypes } = require("../constants") const { lookpath } = require("lookpath") const { downloadFile, logErrorToFile, success, info } = require("../utils") const { confirmation } = require("../questions") @@ -50,17 +50,21 @@ async function handleError(func) { } } -async function init() { +async function init(info) { + const isQuick = info === InitTypes.QUICK await checkDockerConfigured() - const shouldContinue = await confirmation( - "This will create multiple files in current directory, should continue?" - ) - if (!shouldContinue) { - console.log("Stopping.") - return + if (!isQuick) { + const shouldContinue = await confirmation( + "This will create multiple files in current directory, should continue?" + ) + if (!shouldContinue) { + console.log("Stopping.") + return + } } await downloadFiles() - await envFile.make() + const config = isQuick ? envFile.QUICK_CONFIG : {} + await envFile.make(config) } async function start() { @@ -128,8 +132,8 @@ async function update() { const command = new Command(`${CommandWords.HOSTING}`) .addHelp("Controls self hosting on the Budibase platform.") .addSubOption( - "--init", - "Configure a self hosted platform in current directory.", + "--init [type]", + "Configure a self hosted platform in current directory, type can be unspecified or 'quick'.", init ) .addSubOption( diff --git a/packages/cli/src/hosting/makeEnv.js b/packages/cli/src/hosting/makeEnv.js index b7d3b9e849..b84e50eb6b 100644 --- a/packages/cli/src/hosting/makeEnv.js +++ b/packages/cli/src/hosting/makeEnv.js @@ -30,15 +30,23 @@ BUDIBASE_ENVIRONMENT=PRODUCTION` } module.exports.filePath = FILE_PATH +module.exports.QUICK_CONFIG = { + key: "budibase", + port: 10000, +} -module.exports.make = async () => { - const hostingKey = await string( - "Please input the password you'd like to use as your hosting key: " - ) - const hostingPort = await number( - "Please enter the port on which you want your installation to run: ", - 10000 - ) +module.exports.make = async (inputs = {}) => { + const hostingKey = + inputs.key || + (await string( + "Please input the password you'd like to use as your hosting key: " + )) + const hostingPort = + inputs.port || + (await number( + "Please enter the port on which you want your installation to run: ", + 10000 + )) const fileContents = getContents(hostingPort, hostingKey) fs.writeFileSync(FILE_PATH, fileContents) console.log( diff --git a/packages/cli/src/structures/Command.js b/packages/cli/src/structures/Command.js index 5ca0ce67ee..a8d24566be 100644 --- a/packages/cli/src/structures/Command.js +++ b/packages/cli/src/structures/Command.js @@ -13,8 +13,8 @@ class Command { return this } - addSubOption(command, help, func) { - this.opts.push({ command, help, func }) + addSubOption(command, help, func, extras = []) { + this.opts.push({ command, help, func, extras }) return this } @@ -37,13 +37,10 @@ class Command { command.action(async options => { try { let executed = false - if (thisCmd.func) { - await thisCmd.func(options) - executed = true - } for (let opt of thisCmd.opts) { - if (options[opt.command.replace("--", "")]) { - await opt.func(options) + const lookup = opt.command.split(" ")[0].replace("--", "") + if (options[lookup]) { + await opt.func(options[lookup]) executed = true } } From 810b3c34b7c2e7b8954d9043d53d97a627b583f0 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 18 Mar 2021 18:27:00 +0000 Subject: [PATCH 2/6] Formatting. --- .../EditAutomationPopover.svelte | 4 +- .../popovers/EditDatasourcePopover.svelte | 2 +- .../deploy/DeploymentHistory.svelte | 6 ++- .../automate/[automation]/index.svelte | 3 +- .../pages/[application]/automate/index.svelte | 23 ++++++----- .../pages/[application]/data/_layout.svelte | 9 ++-- .../[query]/_layout.svelte | 4 +- .../data/datasource/index.svelte | 41 ++++++++++--------- .../[application]/data/table/index.svelte | 3 +- 9 files changed, 50 insertions(+), 45 deletions(-) diff --git a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte index a99a16e240..81c38e553b 100644 --- a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte +++ b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte @@ -1,4 +1,4 @@ - diff --git a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte index c7842001d0..4cac41d63d 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte @@ -24,7 +24,7 @@ async function deleteDatasource() { await backendUiStore.actions.datasources.delete(datasource) notifier.success("Datasource deleted") - $goto('./datasource') + $goto("./datasource") hideEditor() } diff --git a/packages/builder/src/components/deploy/DeploymentHistory.svelte b/packages/builder/src/components/deploy/DeploymentHistory.svelte index c49abd433e..0933b1a676 100644 --- a/packages/builder/src/components/deploy/DeploymentHistory.svelte +++ b/packages/builder/src/components/deploy/DeploymentHistory.svelte @@ -119,11 +119,13 @@ {#if deployment.status.toLowerCase() === 'pending'} {/if} -
showErrorReasonModal(deployment.err)} class={`deployment-status ${deployment.status}`}> +
showErrorReasonModal(deployment.err)} + class={`deployment-status ${deployment.status}`}> {deployment.status} {#if deployment.status === DeploymentStatus.FAILURE} - + {/if}
diff --git a/packages/builder/src/pages/[application]/automate/[automation]/index.svelte b/packages/builder/src/pages/[application]/automate/[automation]/index.svelte index 031a72fad3..1a15ed48c6 100644 --- a/packages/builder/src/pages/[application]/automate/[automation]/index.svelte +++ b/packages/builder/src/pages/[application]/automate/[automation]/index.svelte @@ -1,6 +1,5 @@ - + - \ No newline at end of file diff --git a/packages/builder/src/pages/[application]/automate/index.svelte b/packages/builder/src/pages/[application]/automate/index.svelte index 98e5b80a18..f6568417a8 100644 --- a/packages/builder/src/pages/[application]/automate/index.svelte +++ b/packages/builder/src/pages/[application]/automate/index.svelte @@ -1,18 +1,19 @@ Create your first automation to get started @@ -23,4 +24,4 @@ color: var(--grey-5); margin-top: 2px; } - \ No newline at end of file + diff --git a/packages/builder/src/pages/[application]/data/_layout.svelte b/packages/builder/src/pages/[application]/data/_layout.svelte index 0674c93c88..5a31d7db92 100644 --- a/packages/builder/src/pages/[application]/data/_layout.svelte +++ b/packages/builder/src/pages/[application]/data/_layout.svelte @@ -17,11 +17,11 @@ }, ] - let tab = $isActive('./datasource') ? "datasource" : "table" + let tab = $isActive("./datasource") ? "datasource" : "table" function selectFirstTableOrSource({ detail }) { const type = detail.heading.key - if (type === 'datasource') { + if (type === "datasource") { $goto("./datasource") } else { $goto("./table") @@ -34,7 +34,10 @@
- +
m._id === $params.query - ) + const query = $backendUiStore.queries.find(m => m._id === $params.query) if (query) { backendUiStore.actions.queries.select(query) } diff --git a/packages/builder/src/pages/[application]/data/datasource/index.svelte b/packages/builder/src/pages/[application]/data/datasource/index.svelte index b1c7708465..00b08fb7b7 100644 --- a/packages/builder/src/pages/[application]/data/datasource/index.svelte +++ b/packages/builder/src/pages/[application]/data/datasource/index.svelte @@ -1,22 +1,23 @@ - - {#if $backendUiStore.tables.length === 0} - Connect your first datasource to start building. - {:else}Select a datasource to edit{/if} - - \ No newline at end of file + onMount(async () => { + // navigate to first table in list, if not already selected + $backendUiStore.datasources.length > 0 && + $goto(`../${$backendUiStore.datasources[0]._id}`) + }) + + +{#if $backendUiStore.tables.length === 0} + Connect your first datasource to start building. +{:else}Select a datasource to edit{/if} + + diff --git a/packages/builder/src/pages/[application]/data/table/index.svelte b/packages/builder/src/pages/[application]/data/table/index.svelte index d1659257d4..134d9e510f 100644 --- a/packages/builder/src/pages/[application]/data/table/index.svelte +++ b/packages/builder/src/pages/[application]/data/table/index.svelte @@ -4,7 +4,8 @@ import { onMount } from "svelte" onMount(async () => { - $backendUiStore.tables.length > 0 && $goto(`../${$backendUiStore.tables[0]._id}`) + $backendUiStore.tables.length > 0 && + $goto(`../${$backendUiStore.tables[0]._id}`) }) From c2302929bd2664cd2b80129f5417a33397a8abf4 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 19 Mar 2021 10:02:29 +0000 Subject: [PATCH 3/6] Adding a digital ocean startup init process which makes use of the user_data system. --- packages/cli/package.json | 1 + packages/cli/src/constants.js | 1 + packages/cli/src/hosting/index.js | 19 +++++++++++++++++-- packages/cli/src/hosting/makeEnv.js | 4 ++++ packages/cli/yarn.lock | 5 +++++ 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 5c58c80560..3f1b485f05 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -14,6 +14,7 @@ "chalk": "^4.1.0", "commander": "^7.1.0", "docker-compose": "^0.23.6", + "envfile": "^6.14.0", "inquirer": "^8.0.0", "lookpath": "^1.1.0", "pkg": "^4.4.9", diff --git a/packages/cli/src/constants.js b/packages/cli/src/constants.js index 40c63d218d..c8da56fa5c 100644 --- a/packages/cli/src/constants.js +++ b/packages/cli/src/constants.js @@ -5,4 +5,5 @@ exports.CommandWords = { exports.InitTypes = { QUICK: "quick", + DIGITAL_OCEAN: "do", } diff --git a/packages/cli/src/hosting/index.js b/packages/cli/src/hosting/index.js index f5c2552c64..8dbccde010 100644 --- a/packages/cli/src/hosting/index.js +++ b/packages/cli/src/hosting/index.js @@ -6,6 +6,8 @@ const { confirmation } = require("../questions") const fs = require("fs") const compose = require("docker-compose") const envFile = require("./makeEnv") +const { parse } = require("envfile") +const axios = require("axios") const BUDIBASE_SERVICES = ["app-service", "worker-service"] const ERROR_FILE = "docker-error.log" @@ -13,6 +15,7 @@ const FILE_URLS = [ "https://raw.githubusercontent.com/Budibase/budibase/master/hosting/docker-compose.yaml", "https://raw.githubusercontent.com/Budibase/budibase/master/hosting/envoy.yaml", ] +const DO_USER_DATA_URL = "http://169.254.169.254/metadata/v1/user-data" async function downloadFiles() { const promises = [] @@ -50,8 +53,8 @@ async function handleError(func) { } } -async function init(info) { - const isQuick = info === InitTypes.QUICK +async function init(type) { + const isQuick = type === InitTypes.QUICK || type === InitTypes.DIGITAL_OCEAN await checkDockerConfigured() if (!isQuick) { const shouldContinue = await confirmation( @@ -64,6 +67,18 @@ async function init(info) { } await downloadFiles() const config = isQuick ? envFile.QUICK_CONFIG : {} + if (type === InitTypes.DIGITAL_OCEAN) { + try { + const response = parse(await axios.get(DO_USER_DATA_URL)) + for (let [key, value] of Object.entries(envFile.ConfigMap)) { + if (response[key]) { + config[value] = response[key] + } + } + } catch (err) { + // don't need to handle error, just don't do anything + } + } await envFile.make(config) } diff --git a/packages/cli/src/hosting/makeEnv.js b/packages/cli/src/hosting/makeEnv.js index b84e50eb6b..c8359dd5e4 100644 --- a/packages/cli/src/hosting/makeEnv.js +++ b/packages/cli/src/hosting/makeEnv.js @@ -30,6 +30,10 @@ BUDIBASE_ENVIRONMENT=PRODUCTION` } module.exports.filePath = FILE_PATH +module.exports.ConfigMap = { + HOSTING_KEY: "key", + MAIN_PORT: "port", +} module.exports.QUICK_CONFIG = { key: "budibase", port: 10000, diff --git a/packages/cli/yarn.lock b/packages/cli/yarn.lock index c03030576c..00cf6284e3 100644 --- a/packages/cli/yarn.lock +++ b/packages/cli/yarn.lock @@ -391,6 +391,11 @@ enquirer@^2.3.5: dependencies: ansi-colors "^4.1.1" +envfile@^6.14.0: + version "6.14.0" + resolved "https://registry.yarnpkg.com/envfile/-/envfile-6.14.0.tgz#8dab1ab915a4c6567087a6bb9e732b1f164c2b30" + integrity sha512-JxpcaOgJQB/x0XFmNiqFu0BLK22PlI3F0d95of5SOqcLvBlGC0ug7MHYDWnmZqmx9svIue8v0cVcqAygPTyXHQ== + escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" From 2b33811496363e3e57190587cd1e00827be4a334 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 19 Mar 2021 10:29:43 +0000 Subject: [PATCH 4/6] Removing use of env file, was causing issues, just parsing the env variables directly. --- packages/cli/package.json | 1 - packages/cli/src/hosting/index.js | 24 +++++--- packages/cli/src/utils.js | 12 ++++ packages/cli/yarn.lock | 96 ++++++++++++++++--------------- 4 files changed, 78 insertions(+), 55 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 3f1b485f05..5c58c80560 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -14,7 +14,6 @@ "chalk": "^4.1.0", "commander": "^7.1.0", "docker-compose": "^0.23.6", - "envfile": "^6.14.0", "inquirer": "^8.0.0", "lookpath": "^1.1.0", "pkg": "^4.4.9", diff --git a/packages/cli/src/hosting/index.js b/packages/cli/src/hosting/index.js index 8dbccde010..710397f301 100644 --- a/packages/cli/src/hosting/index.js +++ b/packages/cli/src/hosting/index.js @@ -1,12 +1,17 @@ const Command = require("../structures/Command") const { CommandWords, InitTypes } = require("../constants") const { lookpath } = require("lookpath") -const { downloadFile, logErrorToFile, success, info } = require("../utils") +const { + downloadFile, + logErrorToFile, + success, + info, + parseEnv, +} = require("../utils") const { confirmation } = require("../questions") const fs = require("fs") const compose = require("docker-compose") -const envFile = require("./makeEnv") -const { parse } = require("envfile") +const makeEnv = require("./makeEnv") const axios = require("axios") const BUDIBASE_SERVICES = ["app-service", "worker-service"] @@ -37,7 +42,7 @@ async function checkDockerConfigured() { } function checkInitComplete() { - if (!fs.existsSync(envFile.filePath)) { + if (!fs.existsSync(makeEnv.filePath)) { throw "Please run the hosting --init command before any other hosting command." } } @@ -66,11 +71,12 @@ async function init(type) { } } await downloadFiles() - const config = isQuick ? envFile.QUICK_CONFIG : {} + const config = isQuick ? makeEnv.QUICK_CONFIG : {} if (type === InitTypes.DIGITAL_OCEAN) { try { - const response = parse(await axios.get(DO_USER_DATA_URL)) - for (let [key, value] of Object.entries(envFile.ConfigMap)) { + const output = await axios.get(DO_USER_DATA_URL) + const response = parseEnv(output.data) + for (let [key, value] of Object.entries(makeEnv.ConfigMap)) { if (response[key]) { config[value] = response[key] } @@ -79,14 +85,14 @@ async function init(type) { // don't need to handle error, just don't do anything } } - await envFile.make(config) + await makeEnv.make(config) } async function start() { await checkDockerConfigured() checkInitComplete() console.log(info("Starting services, this may take a moment.")) - const port = envFile.get("MAIN_PORT") + const port = makeEnv.get("MAIN_PORT") await handleError(async () => { await compose.upAll({ cwd: "./", log: false }) }) diff --git a/packages/cli/src/utils.js b/packages/cli/src/utils.js index 1605c277c0..05bb8d4991 100644 --- a/packages/cli/src/utils.js +++ b/packages/cli/src/utils.js @@ -44,3 +44,15 @@ exports.info = info => { exports.logErrorToFile = (file, error) => { fs.writeFileSync(path.resolve(`./${file}`), `Budiase Error\n${error}`) } + +exports.parseEnv = env => { + const lines = env.toString().split("\n") + let result = {} + for (const line of lines) { + const match = line.match(/^([^=:#]+?)[=:](.*)/) + if (match) { + result[match[1].trim()] = match[2].trim() + } + } + return result +} diff --git a/packages/cli/yarn.lock b/packages/cli/yarn.lock index 00cf6284e3..298fb78061 100644 --- a/packages/cli/yarn.lock +++ b/packages/cli/yarn.lock @@ -15,30 +15,30 @@ integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== "@babel/highlight@^7.10.4": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c" - integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww== + version "7.13.10" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1" + integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg== dependencies: "@babel/helper-validator-identifier" "^7.12.11" chalk "^2.0.0" js-tokens "^4.0.0" "@babel/parser@^7.9.4": - version "7.13.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.4.tgz#340211b0da94a351a6f10e63671fa727333d13ab" - integrity sha512-uvoOulWHhI+0+1f9L4BoozY7U5cIkZ9PgJqvb041d6vypgUmtVPG4vmGm4pSggjl8BELzvHyUeJSUyEMY6b+qA== + version "7.13.11" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.11.tgz#f93ebfc99d21c1772afbbaa153f47e7ce2f50b88" + integrity sha512-PhuoqeHoO9fc4ffMEVk4qb/w/s2iOSWohvbHxLtxui0eBg3Lg5gN1U8wp1V1u61hOWkPQJJyJzGH6Y+grwkq8Q== "@babel/runtime@^7.9.2": - version "7.13.7" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.7.tgz#d494e39d198ee9ca04f4dcb76d25d9d7a1dc961a" - integrity sha512-h+ilqoX998mRVM5FtB5ijRuHUDVt5l3yfoOi2uh18Z/O3hvyaHQ39NpxVkCIG5yFs+mLq/ewFp8Bss6zmWv6ZA== + version "7.13.10" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d" + integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw== dependencies: regenerator-runtime "^0.13.4" -"@eslint/eslintrc@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz#d736d6963d7003b6514e6324bec9c602ac340318" - integrity sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg== +"@eslint/eslintrc@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547" + integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog== dependencies: ajv "^6.12.4" debug "^4.1.1" @@ -47,7 +47,6 @@ ignore "^4.0.6" import-fresh "^3.2.1" js-yaml "^3.13.1" - lodash "^4.17.20" minimatch "^3.0.4" strip-json-comments "^3.1.1" @@ -93,9 +92,9 @@ ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4: uri-js "^4.2.2" ajv@^7.0.2: - version "7.1.1" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.1.1.tgz#1e6b37a454021fa9941713f38b952fc1c8d32a84" - integrity sha512-ga/aqDYnUy/o7vbsRTFhhTsNeXiYb5JWDIcRIeZfwRNCefwjNTVYCGdGSUrEmiu3yDK3vFvNbgJxvrQW4JXrYQ== + version "7.2.1" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.2.1.tgz#a5ac226171912447683524fa2f1248fcf8bac83d" + integrity sha512-+nu0HDv7kNSOua9apAVc979qd932rrZeb3WOvoiD31A/p1mIE5/9bN2027pE2rOPYEdS3UHzsvof4hY+lM9/WQ== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -391,11 +390,6 @@ enquirer@^2.3.5: dependencies: ansi-colors "^4.1.1" -envfile@^6.14.0: - version "6.14.0" - resolved "https://registry.yarnpkg.com/envfile/-/envfile-6.14.0.tgz#8dab1ab915a4c6567087a6bb9e732b1f164c2b30" - integrity sha512-JxpcaOgJQB/x0XFmNiqFu0BLK22PlI3F0d95of5SOqcLvBlGC0ug7MHYDWnmZqmx9svIue8v0cVcqAygPTyXHQ== - escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -439,12 +433,12 @@ eslint-visitor-keys@^2.0.0: integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== eslint@^7.20.0: - version "7.20.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.20.0.tgz#db07c4ca4eda2e2316e7aa57ac7fc91ec550bdc7" - integrity sha512-qGi0CTcOGP2OtCQBgWZlQjcTuP0XkIpYFj25XtRTQSHC+umNnp7UMshr2G8SLsRFYDdAPFeHOsiteadmMH02Yw== + version "7.22.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.22.0.tgz#07ecc61052fec63661a2cab6bd507127c07adc6f" + integrity sha512-3VawOtjSJUQiiqac8MQc+w457iGLfuNGLFn8JmF051tTKbh5/x/0vlcEj8OgDCaw7Ysa2Jn8paGshV7x2abKXg== dependencies: "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.3.0" + "@eslint/eslintrc" "^0.4.0" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -457,10 +451,10 @@ eslint@^7.20.0: espree "^7.3.1" esquery "^1.4.0" esutils "^2.0.2" - file-entry-cache "^6.0.0" + file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" glob-parent "^5.0.0" - globals "^12.1.0" + globals "^13.6.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" @@ -468,7 +462,7 @@ eslint@^7.20.0: js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.20" + lodash "^4.17.21" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" @@ -594,7 +588,7 @@ figures@^3.0.0: dependencies: escape-string-regexp "^1.0.5" -file-entry-cache@^6.0.0: +file-entry-cache@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== @@ -622,9 +616,9 @@ flatted@^3.1.0: integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== follow-redirects@^1.10.0: - version "1.13.2" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.2.tgz#dd73c8effc12728ba5cf4259d760ea5fb83e3147" - integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA== + version "1.13.3" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267" + integrity sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA== forever-agent@~0.6.1: version "0.6.1" @@ -680,9 +674,9 @@ getpass@^0.1.1: assert-plus "^1.0.0" glob-parent@^5.0.0, glob-parent@^5.1.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" - integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" @@ -705,6 +699,13 @@ globals@^12.1.0: dependencies: type-fest "^0.8.1" +globals@^13.6.0: + version "13.7.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.7.0.tgz#aed3bcefd80ad3ec0f0be2cf0c895110c0591795" + integrity sha512-Aipsz6ZKRxa/xQkZhNg0qIWXT6x6rD46f6x/PCnBomlttdIyAPak4YD9jTmKpZ72uROSMU87qJtcgpgHaVchiA== + dependencies: + type-fest "^0.20.2" + globby@^11.0.0: version "11.0.2" resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83" @@ -962,9 +963,9 @@ lodash@^4.17.20, lodash@^4.17.21: integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== lookpath@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/lookpath/-/lookpath-1.1.0.tgz#932d68371a2f0b4a5644f03d6a2b4728edba96d2" - integrity sha512-B9NM7XpVfkyWqfOBI/UW0kVhGw7pJztsduch+1wkbYDi90mYK6/InFul3lG0hYko/VEcVMARVBJ5daFRc5aKCw== + version "1.2.0" + resolved "https://registry.yarnpkg.com/lookpath/-/lookpath-1.2.0.tgz#5fccf91497acec085e66d98cb12446c21fe665ae" + integrity sha512-cUl+R2bGJcSJiHLVKzGHRTYTBhudbHIgd7s63gfGHteaz0BBKEEz2yw2rgbxZAFze92KlbkiWzL1ylYOmqIPVA== lru-cache@^6.0.0: version "6.0.0" @@ -1422,9 +1423,9 @@ stream-meter@^1.0.4: readable-stream "^2.1.4" string-width@^4.1.0, string-width@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.1.tgz#1933ce1f470973d224368009bd1316cad81d5f4f" - integrity sha512-LL0OLyN6AnfV9xqGQpDBwedT2Rt63737LxvsRxbcwpa2aIeynBApG2Sm//F3TaLHIR1aJBN52DWklc06b94o5Q== + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" @@ -1546,6 +1547,11 @@ type-fest@^0.11.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + type-fest@^0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" @@ -1588,9 +1594,9 @@ uuid@^3.3.2: integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== v8-compile-cache@^2.0.3: - version "2.2.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132" - integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q== + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== verror@1.10.0: version "1.10.0" From b8c265fbc85b196b6b59605959d0c50c2d6792ba Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 19 Mar 2021 10:37:02 +0000 Subject: [PATCH 5/6] Updating to scoped name for package. --- packages/cli/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 5c58c80560..9a74254476 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { - "name": "cli", - "version": "0.8.7", + "name": "@budibase/cli", + "version": "0.8.9", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": "src/index.js", From f2840d1bc779925e788db59dc5f9e084281eb9fc Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 19 Mar 2021 10:50:25 +0000 Subject: [PATCH 6/6] Setting up budi CLI for NPM as well. --- packages/cli/package.json | 6 ++++-- packages/cli/src/index.js | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 9a74254476..f369111372 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,9 +1,11 @@ { "name": "@budibase/cli", - "version": "0.8.9", + "version": "0.8.10", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", - "bin": "src/index.js", + "bin": { + "budi": "src/index.js" + }, "author": "Budibase", "license": "AGPL-3.0-or-later", "scripts": { diff --git a/packages/cli/src/index.js b/packages/cli/src/index.js index 526f259fc4..6693446b39 100644 --- a/packages/cli/src/index.js +++ b/packages/cli/src/index.js @@ -1,3 +1,4 @@ +#!/usr/bin/env node const { getCommands } = require("./options") const { Command } = require("commander") const { getHelpDescription } = require("./utils")