From d27674de5cee1f25629870b11a37dd42a719291b Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 11 Jan 2023 19:07:01 +0000 Subject: [PATCH] Replacing some require statements with imports. --- packages/server/src/api/routes/row.ts | 2 +- packages/server/src/index.ts | 2 +- .../server/src/integrations/base/sqlTable.ts | 2 +- packages/server/src/integrations/dynamodb.ts | 6 +++--- packages/server/src/integrations/mysql.ts | 2 +- packages/server/src/integrations/rest.ts | 16 ++++++++-------- packages/server/src/threads/query.ts | 6 +++--- .../src/utilities/fileSystem/filesystem.ts | 10 ++++++---- .../server/src/utilities/fileSystem/plugin.ts | 7 +++---- .../server/src/utilities/fileSystem/template.ts | 4 ++-- 10 files changed, 29 insertions(+), 28 deletions(-) diff --git a/packages/server/src/api/routes/row.ts b/packages/server/src/api/routes/row.ts index f4462b3595..6d1cd206c6 100644 --- a/packages/server/src/api/routes/row.ts +++ b/packages/server/src/api/routes/row.ts @@ -3,7 +3,7 @@ import * as rowController from "../controllers/row" import authorized from "../../middleware/authorized" import { paramResource, paramSubResource } from "../../middleware/resourceId" import { permissions } from "@budibase/backend-core" -const { internalSearchValidator } = require("./utils/validators") +import { internalSearchValidator } from "./utils/validators" const { PermissionType, PermissionLevel } = permissions const router: Router = new Router() diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index fac8403c49..b3fbb22bde 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -1,6 +1,6 @@ import { bootstrap } from "global-agent" const fixPath = require("fix-path") -const { checkDevelopmentEnvironment } = require("./utilities/fileSystem") +import { checkDevelopmentEnvironment } from "./utilities/fileSystem" function runServer() { // this will shutdown the system if development environment not ready diff --git a/packages/server/src/integrations/base/sqlTable.ts b/packages/server/src/integrations/base/sqlTable.ts index 2ab610fecd..58b2b7a3d1 100644 --- a/packages/server/src/integrations/base/sqlTable.ts +++ b/packages/server/src/integrations/base/sqlTable.ts @@ -3,7 +3,7 @@ import { Operation, QueryJson, RenameColumn, Table } from "@budibase/types" import { breakExternalTableId } from "../utils" import SchemaBuilder = Knex.SchemaBuilder import CreateTableBuilder = Knex.CreateTableBuilder -const { FieldTypes, RelationshipTypes } = require("../../constants") +import { FieldTypes, RelationshipTypes } from "../../constants" function generateSchema( schema: CreateTableBuilder, diff --git a/packages/server/src/integrations/dynamodb.ts b/packages/server/src/integrations/dynamodb.ts index bf9a0c3b52..28c1c7b52b 100644 --- a/packages/server/src/integrations/dynamodb.ts +++ b/packages/server/src/integrations/dynamodb.ts @@ -5,8 +5,8 @@ import { IntegrationBase, } from "@budibase/types" -const AWS = require("aws-sdk") -const { AWS_REGION } = require("../db/dynamoClient") +import AWS from "aws-sdk" +import { AWS_REGION } from "../db/dynamoClient" interface DynamoDBConfig { region: string @@ -182,7 +182,7 @@ class DynamoDBIntegration implements IntegrationBase { return response } - async describe(query: { table: string }) { + async describe(query: { table: string }): Promise { const params = { TableName: query.table, } diff --git a/packages/server/src/integrations/mysql.ts b/packages/server/src/integrations/mysql.ts index 1cd9a356b3..b3881c63a9 100644 --- a/packages/server/src/integrations/mysql.ts +++ b/packages/server/src/integrations/mysql.ts @@ -16,7 +16,7 @@ import { finaliseExternalTables, } from "./utils" import dayjs from "dayjs" -const { NUMBER_REGEX } = require("../utilities") +import { NUMBER_REGEX } from "../utilities" import Sql from "./base/sql" import { MySQLColumn } from "./base/types" diff --git a/packages/server/src/integrations/rest.ts b/packages/server/src/integrations/rest.ts index 08d2337593..f13c14e504 100644 --- a/packages/server/src/integrations/rest.ts +++ b/packages/server/src/integrations/rest.ts @@ -16,11 +16,11 @@ import { import { get } from "lodash" import * as https from "https" import qs from "querystring" -const fetch = require("node-fetch") -const { formatBytes } = require("../utilities") -const { performance } = require("perf_hooks") -const FormData = require("form-data") -const { URLSearchParams } = require("url") +import fetch from "node-fetch" +import { formatBytes } from "../utilities" +import { performance } from "perf_hooks" +import FormData from "form-data" +import { URLSearchParams } from "url" const BodyTypes = { NONE: "none", @@ -204,12 +204,12 @@ class RestIntegration implements IntegrationBase { // Append page number or cursor param if configured if (pageParam && paginationValues.page != null) { - params.append(pageParam, paginationValues.page) + params.append(pageParam, paginationValues.page as string) } // Append page size param if configured if (sizeParam && paginationValues.limit != null) { - params.append(sizeParam, paginationValues.limit) + params.append(sizeParam, String(paginationValues.limit)) } // Prepend query string with pagination params @@ -280,7 +280,7 @@ class RestIntegration implements IntegrationBase { case BodyTypes.ENCODED: const params = new URLSearchParams() for (let [key, value] of Object.entries(object)) { - params.append(key, value) + params.append(key, value as string) } addPaginationToBody((key: string, value: any) => { params.append(key, value) diff --git a/packages/server/src/threads/query.ts b/packages/server/src/threads/query.ts index dbbaa5d2ff..5eb027883f 100644 --- a/packages/server/src/threads/query.ts +++ b/packages/server/src/threads/query.ts @@ -9,11 +9,11 @@ import { getGlobalIDFromUserMetadataID } from "../db/utils" import sdk from "../sdk" import { cloneDeep } from "lodash/fp" -const { isSQL } = require("../integrations/utils") -const { +import { isSQL } from "../integrations/utils" +import { enrichQueryFields, interpolateSQL, -} = require("../integrations/queries/sql") +} from "../integrations/queries/sql" class QueryRunner { datasource: any diff --git a/packages/server/src/utilities/fileSystem/filesystem.ts b/packages/server/src/utilities/fileSystem/filesystem.ts index 48810ffc47..086eaa835a 100644 --- a/packages/server/src/utilities/fileSystem/filesystem.ts +++ b/packages/server/src/utilities/fileSystem/filesystem.ts @@ -1,10 +1,10 @@ import { PathLike } from "fs" -const { budibaseTempDir } = require("../budibaseDir") -const fs = require("fs") -const { join } = require("path") -const uuid = require("uuid/v4") +import fs from "fs" +import { budibaseTempDir } from "../budibaseDir" +import { join } from "path" import env from "../../environment" import tar from "tar" +const uuid = require("uuid/v4") export const TOP_LEVEL_PATH = join(__dirname, "..", "..", "..") @@ -112,6 +112,7 @@ export const sendTempFile = (fileContents: any) => { * allows a centralised location to check logic is all good. */ export const readFileSync = (filepath: PathLike, options = "utf8") => { + // @ts-ignore return fs.readFileSync(filepath, options) } @@ -147,6 +148,7 @@ export const findFileRec = (startPath: PathLike, filter: string): any => { const files = fs.readdirSync(startPath) for (let i = 0, len = files.length; i < len; i++) { + // @ts-ignore const filename = join(startPath, files[i]) const stat = fs.lstatSync(filename) diff --git a/packages/server/src/utilities/fileSystem/plugin.ts b/packages/server/src/utilities/fileSystem/plugin.ts index ea1742faba..0bc2b7de44 100644 --- a/packages/server/src/utilities/fileSystem/plugin.ts +++ b/packages/server/src/utilities/fileSystem/plugin.ts @@ -1,8 +1,7 @@ import { Plugin } from "@budibase/types" - -const { budibaseTempDir } = require("../budibaseDir") -const fs = require("fs") -const { join } = require("path") +import { budibaseTempDir } from "../budibaseDir" +import fs from "fs" +import { join } from "path" import { objectStore } from "@budibase/backend-core" const DATASOURCE_PATH = join(budibaseTempDir(), "datasource") diff --git a/packages/server/src/utilities/fileSystem/template.ts b/packages/server/src/utilities/fileSystem/template.ts index 17a959007e..87e0b44e5c 100644 --- a/packages/server/src/utilities/fileSystem/template.ts +++ b/packages/server/src/utilities/fileSystem/template.ts @@ -1,5 +1,5 @@ -const fs = require("fs") -const { join } = require("path") +import fs from "fs" +import { join } from "path" import { ObjectStoreBuckets } from "../../constants" import { objectStore } from "@budibase/backend-core"