From f1e738fc34a635160633cf051589f5ae31b1816a Mon Sep 17 00:00:00 2001 From: "Mahatthana (Kelvin) Nomsawadi" <me@bboykelvin.dev> Date: Thu, 21 Nov 2024 17:49:31 +0700 Subject: [PATCH] ci(sdk): Fix can't build SDK from master (#50319) * Prevent tests file from being imported when building SDK * Exclude more test files from SDK build --- ...icOrEmbeddedDashboardPage.common.unit.spec.tsx | 0 ...EmbeddedDashboardPage.enterprise.unit.spec.tsx | 0 ...cOrEmbeddedDashboardPage.premium.unit.spec.tsx | 0 .../{ => tests}/setup.tsx | 2 +- .../PublicOrEmbeddedQuestion.common.unit.spec.tsx | 0 ...licOrEmbeddedQuestion.enterprise.unit.spec.tsx | 0 ...PublicOrEmbeddedQuestion.premium.unit.spec.tsx | 0 .../{ => tests}/setup.tsx | 2 +- .../SmartScalar/SmartScalar.stories.tsx | 2 +- .../{ => tests}/SmartScalar.unit.spec.js | 0 .../SmartScalar/{ => tests}/test-mocks.ts | 0 tsconfig.sdk.json | 15 ++++----------- 12 files changed, 7 insertions(+), 14 deletions(-) rename frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/{ => tests}/PublicOrEmbeddedDashboardPage.common.unit.spec.tsx (100%) rename frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/{ => tests}/PublicOrEmbeddedDashboardPage.enterprise.unit.spec.tsx (100%) rename frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/{ => tests}/PublicOrEmbeddedDashboardPage.premium.unit.spec.tsx (100%) rename frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/{ => tests}/setup.tsx (97%) rename frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/{ => tests}/PublicOrEmbeddedQuestion.common.unit.spec.tsx (100%) rename frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/{ => tests}/PublicOrEmbeddedQuestion.enterprise.unit.spec.tsx (100%) rename frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/{ => tests}/PublicOrEmbeddedQuestion.premium.unit.spec.tsx (100%) rename frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/{ => tests}/setup.tsx (97%) rename frontend/src/metabase/visualizations/visualizations/SmartScalar/{ => tests}/SmartScalar.unit.spec.js (100%) rename frontend/src/metabase/visualizations/visualizations/SmartScalar/{ => tests}/test-mocks.ts (100%) diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.common.unit.spec.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/PublicOrEmbeddedDashboardPage.common.unit.spec.tsx similarity index 100% rename from frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.common.unit.spec.tsx rename to frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/PublicOrEmbeddedDashboardPage.common.unit.spec.tsx diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.enterprise.unit.spec.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/PublicOrEmbeddedDashboardPage.enterprise.unit.spec.tsx similarity index 100% rename from frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.enterprise.unit.spec.tsx rename to frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/PublicOrEmbeddedDashboardPage.enterprise.unit.spec.tsx diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.premium.unit.spec.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/PublicOrEmbeddedDashboardPage.premium.unit.spec.tsx similarity index 100% rename from frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/PublicOrEmbeddedDashboardPage.premium.unit.spec.tsx rename to frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/PublicOrEmbeddedDashboardPage.premium.unit.spec.tsx diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/setup.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/setup.tsx similarity index 97% rename from frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/setup.tsx rename to frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/setup.tsx index 15cd894f2dd..8cbec6d7e81 100644 --- a/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/setup.tsx +++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedDashboard/PublicOrEmbeddedDashboardPage/tests/setup.tsx @@ -21,7 +21,7 @@ import { } from "metabase-types/api/mocks"; import { createMockState } from "metabase-types/store/mocks"; -import { PublicOrEmbeddedDashboardPage } from "./PublicOrEmbeddedDashboardPage"; +import { PublicOrEmbeddedDashboardPage } from "../PublicOrEmbeddedDashboardPage"; const MOCK_TOKEN = "eyJhbGciOiJIUzI1NiJ9.eyJyZXNvdXJjZSI6eyJkYXNoYm9hcmQiOjExfSwicGFyYW1zIjp7fSwiaWF0IjoxNzEyNjg0NTA1LCJfZW1iZWRkaW5nX3BhcmFtcyI6e319.WbZTB-cQYh4gjh61ZzoLOcFbJ6j6RlOY3GS4fwzv3W4"; diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.common.unit.spec.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/PublicOrEmbeddedQuestion.common.unit.spec.tsx similarity index 100% rename from frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.common.unit.spec.tsx rename to frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/PublicOrEmbeddedQuestion.common.unit.spec.tsx diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.enterprise.unit.spec.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/PublicOrEmbeddedQuestion.enterprise.unit.spec.tsx similarity index 100% rename from frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.enterprise.unit.spec.tsx rename to frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/PublicOrEmbeddedQuestion.enterprise.unit.spec.tsx diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.premium.unit.spec.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/PublicOrEmbeddedQuestion.premium.unit.spec.tsx similarity index 100% rename from frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion.premium.unit.spec.tsx rename to frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/PublicOrEmbeddedQuestion.premium.unit.spec.tsx diff --git a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/setup.tsx b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/setup.tsx similarity index 97% rename from frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/setup.tsx rename to frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/setup.tsx index baaf7f9203f..3958c101891 100644 --- a/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/setup.tsx +++ b/frontend/src/metabase/public/containers/PublicOrEmbeddedQuestion/PublicOrEmbeddedQuestion/tests/setup.tsx @@ -23,7 +23,7 @@ import { } from "metabase-types/api/mocks"; import { createMockState } from "metabase-types/store/mocks"; -import { PublicOrEmbeddedQuestion } from "./PublicOrEmbeddedQuestion"; +import { PublicOrEmbeddedQuestion } from "../PublicOrEmbeddedQuestion"; registerStaticVisualizations(); diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.stories.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.stories.tsx index 21dad94d23b..500027f28ff 100644 --- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.stories.tsx +++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.stories.tsx @@ -9,7 +9,7 @@ import { registerVisualization } from "metabase/visualizations"; import Visualization from "metabase/visualizations/components/Visualization"; import { SmartScalar } from "./SmartScalar"; -import { mockSeries } from "./test-mocks"; +import { mockSeries } from "./tests/test-mocks"; export default { title: "viz/SmartScalar", diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.unit.spec.js b/frontend/src/metabase/visualizations/visualizations/SmartScalar/tests/SmartScalar.unit.spec.js similarity index 100% rename from frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.unit.spec.js rename to frontend/src/metabase/visualizations/visualizations/SmartScalar/tests/SmartScalar.unit.spec.js diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/test-mocks.ts b/frontend/src/metabase/visualizations/visualizations/SmartScalar/tests/test-mocks.ts similarity index 100% rename from frontend/src/metabase/visualizations/visualizations/SmartScalar/test-mocks.ts rename to frontend/src/metabase/visualizations/visualizations/SmartScalar/tests/test-mocks.ts diff --git a/tsconfig.sdk.json b/tsconfig.sdk.json index a679f17d8e6..9acdd6a7428 100644 --- a/tsconfig.sdk.json +++ b/tsconfig.sdk.json @@ -9,16 +9,9 @@ "emitDeclarationOnly": true, "outDir": "./resources/embedding-sdk/dist", "paths": { - "*": [ - "./frontend/src/*", - "./frontend/test/*", - "./enterprise/frontend/src/*", - "./enterprise/frontend/test/*" - ], - "cljs/*": [ - "./target/cljs_release/*" - ] - }, + "*": ["./frontend/src/*", "./enterprise/frontend/src/*"], + "cljs/*": ["./target/cljs_release/*"] + } }, "include": [ "frontend/src/**/*.ts", @@ -39,4 +32,4 @@ "**/testMocks.ts", "**/*.stories.tsx" ] -} \ No newline at end of file +} -- GitLab