From 999ccdbe2098d344163c315120749f0323e2b8f8 Mon Sep 17 00:00:00 2001 From: adrinr Date: Mon, 6 Mar 2023 14:08:12 +0100 Subject: [PATCH] Rename package to shared-core --- packages/builder/package.json | 2 +- packages/builder/vite.config.js | 4 ++-- packages/client/package.json | 2 +- packages/client/rollup.config.js | 4 ++-- packages/frontend-core/src/constants.js | 2 +- packages/frontend-core/src/utils/lucene.js | 2 +- packages/server/jest.config.ts | 2 +- packages/server/package.json | 2 +- packages/server/src/integrations/googlesheets.ts | 2 +- packages/server/tsconfig.json | 4 ++-- packages/{data-utils => shared-core}/.gitignore | 0 packages/{data-utils => shared-core}/package.json | 2 +- packages/{data-utils => shared-core}/src/constants.ts | 0 packages/{data-utils => shared-core}/src/filters.ts | 0 packages/{data-utils => shared-core}/src/index.ts | 0 packages/{data-utils => shared-core}/tsconfig.build.json | 0 packages/{data-utils => shared-core}/tsconfig.json | 0 packages/{data-utils => shared-core}/yarn.lock | 0 scripts/link-dependencies.sh | 4 ++-- 19 files changed, 16 insertions(+), 16 deletions(-) rename packages/{data-utils => shared-core}/.gitignore (100%) rename packages/{data-utils => shared-core}/package.json (90%) rename packages/{data-utils => shared-core}/src/constants.ts (100%) rename packages/{data-utils => shared-core}/src/filters.ts (100%) rename packages/{data-utils => shared-core}/src/index.ts (100%) rename packages/{data-utils => shared-core}/tsconfig.build.json (100%) rename packages/{data-utils => shared-core}/tsconfig.json (100%) rename packages/{data-utils => shared-core}/yarn.lock (100%) diff --git a/packages/builder/package.json b/packages/builder/package.json index 1e81875003..031e4845e8 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -60,7 +60,7 @@ "dependencies": { "@budibase/bbui": "2.3.21-alpha.1", "@budibase/client": "2.3.21-alpha.1", - "@budibase/data-utils": "0.0.1", + "@budibase/shared-core": "0.0.1", "@budibase/frontend-core": "2.3.21-alpha.1", "@budibase/string-templates": "2.3.21-alpha.1", "@fortawesome/fontawesome-svg-core": "^6.2.1", diff --git a/packages/builder/vite.config.js b/packages/builder/vite.config.js index d10ac29027..aba7704e2c 100644 --- a/packages/builder/vite.config.js +++ b/packages/builder/vite.config.js @@ -98,8 +98,8 @@ export default defineConfig(({ mode }) => { replacement: path.resolve("./src/helpers"), }, { - find: "@budibase/data-utils", - replacement: path.resolve("../data-utils/src"), + find: "@budibase/shared-core", + replacement: path.resolve("../shared-core/src"), }, ], }, diff --git a/packages/client/package.json b/packages/client/package.json index 806967d16e..c1791c4372 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@budibase/bbui": "2.3.21-alpha.1", - "@budibase/data-utils": "0.0.1", + "@budibase/shared-core": "0.0.1", "@budibase/frontend-core": "2.3.21-alpha.1", "@budibase/string-templates": "2.3.21-alpha.1", "@spectrum-css/button": "^3.0.3", diff --git a/packages/client/rollup.config.js b/packages/client/rollup.config.js index 009017e3a0..8a3c352f80 100644 --- a/packages/client/rollup.config.js +++ b/packages/client/rollup.config.js @@ -70,8 +70,8 @@ export default { replacement: path.resolve("./src/sdk"), }, { - find: "@budibase/data-utils", - replacement: path.resolve("../data-utils/dist/src"), + find: "@budibase/shared-core", + replacement: path.resolve("../shared-core/dist/src"), }, ], }), diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js index 393b9c867c..bdf7abe36f 100644 --- a/packages/frontend-core/src/constants.js +++ b/packages/frontend-core/src/constants.js @@ -1,7 +1,7 @@ /** * Operator options for lucene queries */ -export { OperatorOptions, SqlNumberTypeRangeMap } from "@budibase/data-utils" +export { OperatorOptions, SqlNumberTypeRangeMap } from "@budibase/shared-core" // Cookie names export const Cookies = { diff --git a/packages/frontend-core/src/utils/lucene.js b/packages/frontend-core/src/utils/lucene.js index e23e0d5532..4b85c7d311 100644 --- a/packages/frontend-core/src/utils/lucene.js +++ b/packages/frontend-core/src/utils/lucene.js @@ -1 +1 @@ -export * from "@budibase/data-utils" +export * from "@budibase/shared-core" diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts index d07afd2209..03eca3705b 100644 --- a/packages/server/jest.config.ts +++ b/packages/server/jest.config.ts @@ -14,7 +14,7 @@ const baseConfig: Config.InitialProjectOptions = { moduleNameMapper: { "@budibase/backend-core/(.*)": "/../backend-core/$1", "@budibase/backend-core": "/../backend-core/src", - "@budibase/data-utils": "/../data-utils/src", + "@budibase/shared-core": "/../shared-core/src", "@budibase/types": "/../types/src", }, } diff --git a/packages/server/package.json b/packages/server/package.json index a64ca48203..647272d112 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.3.21-alpha.1", "@budibase/client": "2.3.21-alpha.1", - "@budibase/data-utils": "0.0.1", + "@budibase/shared-core": "0.0.1", "@budibase/pro": "2.3.21-alpha.1", "@budibase/string-templates": "2.3.21-alpha.1", "@budibase/types": "2.3.21-alpha.1", diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts index 69df1f7289..d5ab848051 100644 --- a/packages/server/src/integrations/googlesheets.ts +++ b/packages/server/src/integrations/googlesheets.ts @@ -16,7 +16,7 @@ import { DataSourceOperation, FieldTypes } from "../constants" import { GoogleSpreadsheet } from "google-spreadsheet" import fetch from "node-fetch" import { configs, HTTPError } from "@budibase/backend-core" -import { runLuceneQuery } from "@budibase/data-utils" +import { runLuceneQuery } from "@budibase/shared-core" interface GoogleSheetsConfig { spreadsheetId: string diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json index 937d7adb8a..5f4ee1a701 100644 --- a/packages/server/tsconfig.json +++ b/packages/server/tsconfig.json @@ -9,7 +9,7 @@ "@budibase/types": ["../types/src"], "@budibase/backend-core": ["../backend-core/src"], "@budibase/backend-core/*": ["../backend-core/*"], - "@budibase/data-utils": ["../data-utils/src"], + "@budibase/shared-core": ["../shared-core/src"], "@budibase/pro": ["../../../budibase-pro/packages/pro/src"] } }, @@ -20,7 +20,7 @@ "references": [ { "path": "../types" }, { "path": "../backend-core" }, - { "path": "../data-utils" }, + { "path": "../shared-core" }, { "path": "../../../budibase-pro/packages/pro" } ], "include": ["src/**/*", "specs", "package.json"], diff --git a/packages/data-utils/.gitignore b/packages/shared-core/.gitignore similarity index 100% rename from packages/data-utils/.gitignore rename to packages/shared-core/.gitignore diff --git a/packages/data-utils/package.json b/packages/shared-core/package.json similarity index 90% rename from packages/data-utils/package.json rename to packages/shared-core/package.json index 6d57b09eb3..c312fec42a 100644 --- a/packages/data-utils/package.json +++ b/packages/shared-core/package.json @@ -1,5 +1,5 @@ { - "name": "@budibase/data-utils", + "name": "@budibase/shared-core", "private": true, "version": "0.0.1", "description": "Shared data utils", diff --git a/packages/data-utils/src/constants.ts b/packages/shared-core/src/constants.ts similarity index 100% rename from packages/data-utils/src/constants.ts rename to packages/shared-core/src/constants.ts diff --git a/packages/data-utils/src/filters.ts b/packages/shared-core/src/filters.ts similarity index 100% rename from packages/data-utils/src/filters.ts rename to packages/shared-core/src/filters.ts diff --git a/packages/data-utils/src/index.ts b/packages/shared-core/src/index.ts similarity index 100% rename from packages/data-utils/src/index.ts rename to packages/shared-core/src/index.ts diff --git a/packages/data-utils/tsconfig.build.json b/packages/shared-core/tsconfig.build.json similarity index 100% rename from packages/data-utils/tsconfig.build.json rename to packages/shared-core/tsconfig.build.json diff --git a/packages/data-utils/tsconfig.json b/packages/shared-core/tsconfig.json similarity index 100% rename from packages/data-utils/tsconfig.json rename to packages/shared-core/tsconfig.json diff --git a/packages/data-utils/yarn.lock b/packages/shared-core/yarn.lock similarity index 100% rename from packages/data-utils/yarn.lock rename to packages/shared-core/yarn.lock diff --git a/scripts/link-dependencies.sh b/scripts/link-dependencies.sh index 2a5691aa93..31d99fda3c 100755 --- a/scripts/link-dependencies.sh +++ b/scripts/link-dependencies.sh @@ -28,8 +28,8 @@ yarn unlink yarn link cd - -echo "Linking data-utils" -cd packages/data-utils +echo "Linking shared-core" +cd packages/shared-core yarn unlink yarn link cd -