diff --git a/frontend/src/metabase-lib/lib/Dimension.ts b/frontend/src/metabase-lib/lib/Dimension.ts
index 3f7c7f3b5b7fab37a959b82aff932df78186b2aa..a3d491da9adff43466064ad5b0ab6d486c8b1507 100644
--- a/frontend/src/metabase-lib/lib/Dimension.ts
+++ b/frontend/src/metabase-lib/lib/Dimension.ts
@@ -3,7 +3,6 @@
 import { t, ngettext, msgid } from "ttag";
 import _ from "underscore";
 import { stripId, FK_SYMBOL } from "metabase/lib/formatting";
-import { TYPE } from "metabase/lib/types";
 import {
   Field as AbstractField,
   ConcreteField,
@@ -15,6 +14,7 @@ import { VariableTarget } from "metabase-types/types/Parameter";
 import { IconName } from "metabase-types/types";
 import { infer, MONOTYPE } from "metabase/lib/expressions/typeinferencer";
 import { isa } from "cljs/metabase.types";
+import { TYPE } from "metabase-lib/lib/types/constants";
 import {
   DATETIME_UNITS,
   formatBucketing,
diff --git a/frontend/src/metabase-lib/lib/queries/StructuredQuery.ts b/frontend/src/metabase-lib/lib/queries/StructuredQuery.ts
index ce11f8f17c31215858804152b01ea489a6a0dfe6..b5f4f3cb85789ce97cbaeae858a9b340fae8438e 100644
--- a/frontend/src/metabase-lib/lib/queries/StructuredQuery.ts
+++ b/frontend/src/metabase-lib/lib/queries/StructuredQuery.ts
@@ -28,11 +28,11 @@ import { AggregationOperator } from "metabase-types/types/Metadata";
 import { DatabaseEngine, DatabaseId } from "metabase-types/types/Database";
 import { TableId } from "metabase-types/types/Table";
 import { Column } from "metabase-types/types/Dataset";
-import { TYPE } from "metabase/lib/types";
 import {
   isVirtualCardId,
   getQuestionIdFromVirtualTableId,
 } from "metabase/lib/saved-questions";
+import { TYPE } from "metabase-lib/lib/types/constants";
 import { fieldRefForColumn } from "metabase-lib/lib/queries/utils/dataset";
 import { isSegment } from "metabase-lib/lib/queries/utils/filter";
 import { getUniqueExpressionName } from "metabase-lib/lib/queries/utils/expression";
diff --git a/frontend/src/metabase-lib/lib/queries/drills/column-filter-drill.js b/frontend/src/metabase-lib/lib/queries/drills/column-filter-drill.js
index 83c2fb6a609a60959dfc25becb2fdc3a22e1858e..7b2d8d73d30da310381332b9e0d9d85a6a4f6a1e 100644
--- a/frontend/src/metabase-lib/lib/queries/drills/column-filter-drill.js
+++ b/frontend/src/metabase-lib/lib/queries/drills/column-filter-drill.js
@@ -1,4 +1,5 @@
-import { isa, TYPE } from "metabase/lib/types";
+import { isa } from "metabase-lib/lib/types/utils/isa";
+import { TYPE } from "metabase-lib/lib/types/constants";
 
 const INVALID_TYPES = [TYPE.Structured];
 
diff --git a/frontend/src/metabase-lib/lib/queries/drills/distribution-drill.js b/frontend/src/metabase-lib/lib/queries/drills/distribution-drill.js
index 979441d0a45c3b3b9eb2b86672ae7639a1066e4b..570ec3f911ed27c2d9ed69c0399896db96d04766 100644
--- a/frontend/src/metabase-lib/lib/queries/drills/distribution-drill.js
+++ b/frontend/src/metabase-lib/lib/queries/drills/distribution-drill.js
@@ -1,4 +1,5 @@
-import { isa, TYPE } from "metabase/lib/types";
+import { isa } from "metabase-lib/lib/types/utils/isa";
+import { TYPE } from "metabase-lib/lib/types/constants";
 
 const DENYLIST_TYPES = [
   TYPE.PK,
diff --git a/frontend/src/metabase-lib/lib/queries/drills/foreign-key-drill.js b/frontend/src/metabase-lib/lib/queries/drills/foreign-key-drill.js
index 47af66e918420ac5aa520c6dbcdcee8b3c75e189..deff4b191cf7ae2b5179bc448916d7ffa4c018f6 100644
--- a/frontend/src/metabase-lib/lib/queries/drills/foreign-key-drill.js
+++ b/frontend/src/metabase-lib/lib/queries/drills/foreign-key-drill.js
@@ -1,5 +1,5 @@
-import { isFK, isPK } from "metabase/lib/types";
 import { stripId } from "metabase/lib/formatting/strings";
+import { isFK, isPK } from "metabase-lib/lib/types/utils/isa";
 
 export function foreignKeyDrill({ question, clicked }) {
   const query = question.query();
diff --git a/frontend/src/metabase-lib/lib/queries/drills/quick-filter-drill.js b/frontend/src/metabase-lib/lib/queries/drills/quick-filter-drill.js
index 31e9b16d8e52fee16bc029659b6ace748486d75e..0fcef5f8f715e8d6fb5e1aa0c8811566eb0fc952 100644
--- a/frontend/src/metabase-lib/lib/queries/drills/quick-filter-drill.js
+++ b/frontend/src/metabase-lib/lib/queries/drills/quick-filter-drill.js
@@ -1,5 +1,6 @@
-import { isa, isFK, isPK, TYPE } from "metabase/lib/types";
 import { isDate, isNumeric } from "metabase/lib/schema_metadata";
+import { isa, isFK, isPK } from "metabase-lib/lib/types/utils/isa";
+import { TYPE } from "metabase-lib/lib/types/constants";
 import { isLocalField } from "metabase-lib/lib/queries/utils";
 
 const INVALID_TYPES = [TYPE.Structured];
diff --git a/frontend/src/metabase-lib/lib/queries/drills/sort-drill.js b/frontend/src/metabase-lib/lib/queries/drills/sort-drill.js
index 53af916187c072733494003ca1215eb7179fc18d..9d10c32de392dbb992a43283fb27e381c90b8d80 100644
--- a/frontend/src/metabase-lib/lib/queries/drills/sort-drill.js
+++ b/frontend/src/metabase-lib/lib/queries/drills/sort-drill.js
@@ -1,4 +1,5 @@
-import { isa, TYPE } from "metabase/lib/types";
+import { isa } from "metabase-lib/lib/types/utils/isa";
+import { TYPE } from "metabase-lib/lib/types/constants";
 import Dimension from "metabase-lib/lib/Dimension";
 
 const INVALID_TYPES = [TYPE.Structured];
diff --git a/frontend/src/metabase-lib/lib/queries/drills/summarize-column-drill.js b/frontend/src/metabase-lib/lib/queries/drills/summarize-column-drill.js
index 52a757ec8065201597c75b7d496d1696b21225ba..33c6266e85309174d5fb8a14a40777e92a5b833c 100644
--- a/frontend/src/metabase-lib/lib/queries/drills/summarize-column-drill.js
+++ b/frontend/src/metabase-lib/lib/queries/drills/summarize-column-drill.js
@@ -1,9 +1,10 @@
 import _ from "underscore";
-import { isa, TYPE } from "metabase/lib/types";
 import {
   getAggregationOperator,
   isCompatibleAggregationOperatorForField,
 } from "metabase/lib/schema_metadata";
+import { isa } from "metabase-lib/lib/types/utils/isa";
+import { TYPE } from "metabase-lib/lib/types/constants";
 import { fieldRefForColumn } from "metabase-lib/lib/queries/utils/dataset";
 
 const AGGREGATIONS = ["sum", "avg", "distinct"];
diff --git a/frontend/src/metabase-lib/lib/queries/structured/Aggregation.ts b/frontend/src/metabase-lib/lib/queries/structured/Aggregation.ts
index 52990501c72c0fc065e7f20272496a11a9d6b6e1..409004331f5c5c15b3e6a6b48019cd6aa63674a5 100644
--- a/frontend/src/metabase-lib/lib/queries/structured/Aggregation.ts
+++ b/frontend/src/metabase-lib/lib/queries/structured/Aggregation.ts
@@ -1,11 +1,11 @@
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-nocheck
 import { t } from "ttag";
-import { TYPE } from "metabase/lib/types";
 import { Aggregation as AggregationObject } from "metabase-types/types/Query";
 import { AggregationOperator } from "metabase-types/types/Metadata";
 import { MetricId } from "metabase-types/types/Metric";
 import { FieldId } from "metabase-types/types/Field";
+import { TYPE } from "metabase-lib/lib/types/constants";
 import * as AGGREGATION from "metabase-lib/lib/queries/utils/aggregation";
 import Filter from "metabase-lib/lib/queries/structured/Filter";
 import Metric from "metabase-lib/lib/metadata/Metric";
diff --git a/frontend/src/metabase-lib/lib/queries/utils/drilldown.js b/frontend/src/metabase-lib/lib/queries/utils/drilldown.js
index 749ec17a8ca349bacf7c49910f9ab3fabcaa26c4..9b3617d0ffa5929e904d81757c5771dc7fb3857d 100644
--- a/frontend/src/metabase-lib/lib/queries/utils/drilldown.js
+++ b/frontend/src/metabase-lib/lib/queries/utils/drilldown.js
@@ -1,6 +1,7 @@
 import _ from "underscore";
-import { isa, TYPE } from "metabase/lib/types";
 import { isLatitude, isLongitude, isDate } from "metabase/lib/schema_metadata";
+import { isa } from "metabase-lib/lib/types/utils/isa";
+import { TYPE } from "metabase-lib/lib/types/constants";
 
 import { isExpressionField } from "metabase-lib/lib/queries/utils/field-ref";
 import { FieldDimension } from "metabase-lib/lib/Dimension";
diff --git a/frontend/src/metabase-lib/lib/queries/utils/field-ref.js b/frontend/src/metabase-lib/lib/queries/utils/field-ref.js
index fd508df1b0fe889baed4646ba0202228d5aa4211..c742dcc446fdaba22e310d8e3f03b53715e66ef9 100644
--- a/frontend/src/metabase-lib/lib/queries/utils/field-ref.js
+++ b/frontend/src/metabase-lib/lib/queries/utils/field-ref.js
@@ -1,6 +1,6 @@
 import _ from "underscore";
 
-import { TYPE } from "metabase/lib/types";
+import { TYPE } from "metabase-lib/lib/types/constants";
 import Field from "metabase-lib/lib/metadata/Field";
 import { FieldDimension } from "metabase-lib/lib/Dimension";
 import * as Table from "./table";
diff --git a/frontend/src/metabase-lib/lib/types/constants.js b/frontend/src/metabase-lib/lib/types/constants.js
new file mode 100644
index 0000000000000000000000000000000000000000..b1b8c4a3bd1023ed6dd3945f60e1a73426a0c2c9
--- /dev/null
+++ b/frontend/src/metabase-lib/lib/types/constants.js
@@ -0,0 +1,3 @@
+import { TYPE as cljs_TYPE } from "cljs/metabase.types";
+
+export const TYPE = cljs_TYPE;
diff --git a/frontend/src/metabase/lib/types.js b/frontend/src/metabase-lib/lib/types/utils/isa.js
similarity index 84%
rename from frontend/src/metabase/lib/types.js
rename to frontend/src/metabase-lib/lib/types/utils/isa.js
index 9bc1e893540694ea6a64f56d504ed8942927e587..47403d1ddba3672d4ce6c551c8e093b4ebbdee6d 100644
--- a/frontend/src/metabase/lib/types.js
+++ b/frontend/src/metabase-lib/lib/types/utils/isa.js
@@ -1,6 +1,6 @@
-import { isa as cljs_isa, TYPE as cljs_TYPE } from "cljs/metabase.types";
+import { isa as cljs_isa } from "cljs/metabase.types";
 
-export const TYPE = cljs_TYPE;
+import { TYPE } from "metabase-lib/lib/types/constants";
 
 /**
  * Is x the same as, or a descendant type of, y?
diff --git a/frontend/src/metabase/admin/datamodel/components/database/ColumnItem/ColumnItem.jsx b/frontend/src/metabase/admin/datamodel/components/database/ColumnItem/ColumnItem.jsx
index 8c029e46bdd7f194756a6809ead86348e1d50d7c..ee3050bbbb3c9bcdd4fde11670df5b4fa986f1b2 100644
--- a/frontend/src/metabase/admin/datamodel/components/database/ColumnItem/ColumnItem.jsx
+++ b/frontend/src/metabase/admin/datamodel/components/database/ColumnItem/ColumnItem.jsx
@@ -10,12 +10,12 @@ import Select, { Option } from "metabase/core/components/Select";
 import Button from "metabase/core/components/Button";
 import * as MetabaseCore from "metabase/lib/core";
 import { isCurrency } from "metabase/lib/schema_metadata";
-import { isFK } from "metabase/lib/types";
 import { getGlobalSettingsForColumn } from "metabase/visualizations/lib/settings/column";
 
 import { currency } from "cljs/metabase.shared.util.currency";
 
 import * as MetabaseAnalytics from "metabase/lib/analytics";
+import { isFK } from "metabase-lib/lib/types/utils/isa";
 import { getFieldRawName } from "../../../utils";
 import { ColumnItemInput } from "./ColumnItem.styled";
 
diff --git a/frontend/src/metabase/admin/datamodel/containers/FieldApp.jsx b/frontend/src/metabase/admin/datamodel/containers/FieldApp.jsx
index 2a12e190f74b0335aaacd62088c432a9e6d1d3d6..9a8e47a9d7093fc0e240f6fc4910e6f6f0196f0e 100644
--- a/frontend/src/metabase/admin/datamodel/containers/FieldApp.jsx
+++ b/frontend/src/metabase/admin/datamodel/containers/FieldApp.jsx
@@ -23,7 +23,6 @@ import AdminLayout from "metabase/components/AdminLayout";
 import { LeftNavPane, LeftNavPaneItem } from "metabase/components/LeftNavPane";
 
 import { is_coerceable, coercions_for_type } from "cljs/metabase.types";
-import { isFK } from "metabase/lib/types";
 
 import ColumnSettings from "metabase/visualizations/components/ColumnSettings";
 
@@ -40,6 +39,7 @@ import { isCurrency } from "metabase/lib/schema_metadata";
 import Databases from "metabase/entities/databases";
 import Tables from "metabase/entities/tables";
 import Fields from "metabase/entities/fields";
+import { isFK } from "metabase-lib/lib/types/utils/isa";
 import { rescanFieldValues, discardFieldValues } from "../field";
 import UpdateCachedFieldValues from "../components/UpdateCachedFieldValues";
 import FieldRemapping from "../components/FieldRemapping";
diff --git a/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.jsx b/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.jsx
index a77ca7cb90da0d8e48e30ddb58038865773e9849..fb32a229821262982f9b58c23bfdde51e597298e 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.jsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.jsx
@@ -2,9 +2,8 @@
 import React from "react";
 import { t } from "ttag";
 
-import { TYPE } from "metabase/lib/types";
-
 import ColumnSettings from "metabase/visualizations/components/ColumnSettings";
+import { TYPE } from "metabase-lib/lib/types/constants";
 
 const SETTING_TYPES = [
   {
diff --git a/frontend/src/metabase/entities/fields.js b/frontend/src/metabase/entities/fields.js
index e3b06a9a1254ecf521bdc1587af10f514524676f..e8922069f6a98d6deeceff549c4b950f68eb687e 100644
--- a/frontend/src/metabase/entities/fields.js
+++ b/frontend/src/metabase/entities/fields.js
@@ -23,7 +23,7 @@ import {
   field_semantic_types,
   has_field_values_options,
 } from "metabase/lib/core";
-import { TYPE } from "metabase/lib/types";
+import { TYPE } from "metabase-lib/lib/types/constants";
 import {
   getFieldValues,
   getRemappings,
diff --git a/frontend/src/metabase/lib/click-behavior.js b/frontend/src/metabase/lib/click-behavior.js
index 47cabea0208865f0b1f347da2cd8332b93795a0d..23c68d91c74d63641e62e1effa938d468bb4ec4b 100644
--- a/frontend/src/metabase/lib/click-behavior.js
+++ b/frontend/src/metabase/lib/click-behavior.js
@@ -4,13 +4,14 @@ import { t, ngettext, msgid } from "ttag";
 
 import { isDate } from "metabase/lib/schema_metadata";
 import { parseTimestamp } from "metabase/lib/time";
-import { isa, TYPE } from "metabase/lib/types";
 import { formatDateTimeForParameter } from "metabase/lib/formatting/date";
 import {
   dimensionFilterForParameter,
   variableFilterForParameter,
 } from "metabase/parameters/utils/filters";
 import { isValidImplicitActionClickBehavior } from "metabase/writeback/utils";
+import { isa } from "metabase-lib/lib/types/utils/isa";
+import { TYPE } from "metabase-lib/lib/types/constants";
 import Question from "metabase-lib/lib/Question";
 import TemplateTagVariable from "metabase-lib/lib/variables/TemplateTagVariable";
 import { TemplateTagDimension } from "metabase-lib/lib/Dimension";
diff --git a/frontend/src/metabase/lib/core.js b/frontend/src/metabase/lib/core.js
index 241738ef013211b4b40fcfe1a46947646eca7958..306f322afb1abd19f4953e475917eef729c14953 100644
--- a/frontend/src/metabase/lib/core.js
+++ b/frontend/src/metabase/lib/core.js
@@ -1,5 +1,5 @@
 import { t } from "ttag";
-import { TYPE } from "metabase/lib/types";
+import { TYPE } from "metabase-lib/lib/types/constants";
 
 export const field_semantic_types = [
   /* Overall Row */
diff --git a/frontend/src/metabase/lib/schema_metadata.js b/frontend/src/metabase/lib/schema_metadata.js
index 89e980256102bcf176d4bbf4c2bba9de1ef0bd97..ac4e2e3dc3b51e1025ac0284e5dcb74503a208ff 100644
--- a/frontend/src/metabase/lib/schema_metadata.js
+++ b/frontend/src/metabase/lib/schema_metadata.js
@@ -1,12 +1,12 @@
 import _ from "underscore";
 import { t } from "ttag";
+import { field_semantic_types_map } from "metabase/lib/core";
 import {
   isa,
   isFK as isTypeFK,
   isPK as isTypePK,
-  TYPE,
-} from "metabase/lib/types";
-import { field_semantic_types_map } from "metabase/lib/core";
+} from "metabase-lib/lib/types/utils/isa";
+import { TYPE } from "metabase-lib/lib/types/constants";
 
 // primary field types used for picking operators, etc
 export const NUMBER = "NUMBER";
diff --git a/frontend/src/metabase/reference/components/Field.jsx b/frontend/src/metabase/reference/components/Field.jsx
index e032d16aeaf9ec4aa2146817a69947aabfc583cd..93748ced06065ccbff16efbe15dd177fe028cde2 100644
--- a/frontend/src/metabase/reference/components/Field.jsx
+++ b/frontend/src/metabase/reference/components/Field.jsx
@@ -6,11 +6,11 @@ import { t } from "ttag";
 import { getIn } from "icepick";
 import cx from "classnames";
 import * as MetabaseCore from "metabase/lib/core";
-import { isFK } from "metabase/lib/types";
 
 import S from "metabase/components/List.css";
 import Select from "metabase/core/components/Select";
 import Icon from "metabase/components/Icon";
+import { isFK } from "metabase-lib/lib/types/utils/isa";
 import F from "./Field.css";
 
 const Field = ({ field, foreignKeys, url, icon, isEditing, formField }) => (
diff --git a/frontend/src/metabase/reference/components/FieldTypeDetail.jsx b/frontend/src/metabase/reference/components/FieldTypeDetail.jsx
index 2f051b1d248153dad17339a42ea4991db3479a09..a93e7fe651cba484fa86dc5794f93c7757a76655 100644
--- a/frontend/src/metabase/reference/components/FieldTypeDetail.jsx
+++ b/frontend/src/metabase/reference/components/FieldTypeDetail.jsx
@@ -5,11 +5,11 @@ import { getIn } from "icepick";
 import { t } from "ttag";
 import * as MetabaseCore from "metabase/lib/core";
 import { isNumericBaseType } from "metabase/lib/schema_metadata";
-import { isFK } from "metabase/lib/types";
 
 import Select from "metabase/core/components/Select";
 
 import D from "metabase/reference/components/Detail.css";
+import { isFK } from "metabase-lib/lib/types/utils/isa";
 
 const FieldTypeDetail = ({
   field,
diff --git a/frontend/src/metabase/reference/utils.js b/frontend/src/metabase/reference/utils.js
index 53dd740a5dceb192598fe1a603eff0d2f449b42e..872cdd12a855fd4289d8cb7f8a3d81b424f04928 100644
--- a/frontend/src/metabase/reference/utils.js
+++ b/frontend/src/metabase/reference/utils.js
@@ -2,8 +2,8 @@ import { assoc, assocIn, chain } from "icepick";
 
 import { titleize, humanize } from "metabase/lib/formatting";
 import { startNewCard } from "metabase/lib/card";
-import { isPK } from "metabase/lib/types";
 import * as Urls from "metabase/lib/urls";
+import { isPK } from "metabase-lib/lib/types/utils/isa";
 
 export const idsToObjectMap = (ids, objects) =>
   ids
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsx
index 904ecfdc91a7fc9b63e54d4567303fc1cb072de4..5d382e6cd47ad307c7098b54ed2ca3a75c6c9837 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.tsx
@@ -8,8 +8,9 @@ import ExpandableString from "metabase/query_builder/components/ExpandableString
 import EmptyState from "metabase/components/EmptyState";
 
 import { isID } from "metabase/lib/schema_metadata";
-import { TYPE, isa } from "metabase/lib/types";
 import { formatValue, formatColumn } from "metabase/lib/formatting";
+import { isa } from "metabase-lib/lib/types/utils/isa";
+import { TYPE } from "metabase-lib/lib/types/constants";
 
 import { OnVisualizationClickType } from "./types";
 import {
diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.unit.spec.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.unit.spec.tsx
index 5108b2452c05703b80bb1884d0dfdcc79591130e..9db183e59d4e0d03928e2eeb81f8ab68d33aeb2a 100644
--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.unit.spec.tsx
+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetailsTable.unit.spec.tsx
@@ -2,8 +2,8 @@ import React from "react";
 import { render, screen } from "@testing-library/react";
 
 import { DetailsTable } from "metabase/visualizations/components/ObjectDetail/ObjectDetailsTable";
-import { TYPE } from "metabase/lib/types";
 import testDataset from "__support__/testDataset";
+import { TYPE } from "metabase-lib/lib/types/constants";
 
 const objectDetailCard = {
   card: {
diff --git a/frontend/src/metabase/visualizations/visualizations/Scalar.jsx b/frontend/src/metabase/visualizations/visualizations/Scalar.jsx
index 42b09ed329e4f5b544b1b73f851e89235e670d05..b5ab03a473a08e2d5ac3c6facb5444564d30360c 100644
--- a/frontend/src/metabase/visualizations/visualizations/Scalar.jsx
+++ b/frontend/src/metabase/visualizations/visualizations/Scalar.jsx
@@ -4,7 +4,6 @@ import { t } from "ttag";
 
 import _ from "underscore";
 import { formatValue } from "metabase/lib/formatting";
-import { TYPE } from "metabase/lib/types";
 
 import { fieldSetting } from "metabase/visualizations/lib/settings/utils";
 import { columnSettings } from "metabase/visualizations/lib/settings/column";
@@ -13,6 +12,7 @@ import ScalarValue, {
   ScalarWrapper,
   ScalarTitle,
 } from "metabase/visualizations/components/ScalarValue";
+import { TYPE } from "metabase-lib/lib/types/constants";
 import { ScalarContainer } from "./Scalar.styled";
 
 // convert legacy `scalar.*` visualization settings to format options
diff --git a/frontend/src/metabase/writeback/containers/WritebackForm.tsx b/frontend/src/metabase/writeback/containers/WritebackForm.tsx
index 394e80d362e9ad5e9d28b080b30afdcd71431664..7133518a4371aac97a95b7a7e5339cbd2a32fd35 100644
--- a/frontend/src/metabase/writeback/containers/WritebackForm.tsx
+++ b/frontend/src/metabase/writeback/containers/WritebackForm.tsx
@@ -2,8 +2,8 @@ import React, { useCallback, useMemo } from "react";
 import { t } from "ttag";
 
 import validate from "metabase/lib/validate";
-import { TYPE } from "metabase/lib/types";
 
+import { TYPE } from "metabase-lib/lib/types/constants";
 import Field from "metabase-lib/lib/metadata/Field";
 import Table from "metabase-lib/lib/metadata/Table";
 
diff --git a/frontend/src/metabase/writeback/utils.ts b/frontend/src/metabase/writeback/utils.ts
index 1fdab78d2c1c8e890b99bcff5739c3989f050b58..063fb2a669b9e6c7badf0ba9d78c142fd840e4e2 100644
--- a/frontend/src/metabase/writeback/utils.ts
+++ b/frontend/src/metabase/writeback/utils.ts
@@ -1,5 +1,3 @@
-import { TYPE } from "metabase/lib/types";
-
 import type {
   ActionDashboardCard,
   BaseDashboardOrderedCard,
@@ -7,6 +5,7 @@ import type {
   Database as IDatabase,
 } from "metabase-types/api";
 import type { SavedCard } from "metabase-types/types/Card";
+import { TYPE } from "metabase-lib/lib/types/constants";
 import type Database from "metabase-lib/lib/metadata/Database";
 import type Field from "metabase-lib/lib/metadata/Field";
 
diff --git a/frontend/test/metabase/lib/data_grid.unit.spec.js b/frontend/test/metabase/lib/data_grid.unit.spec.js
index b48ad6c43202d4f13195d8526144a76730d890f6..c6c5d51a229dbf8b0c8d3f04f25d3dfacf637cf3 100644
--- a/frontend/test/metabase/lib/data_grid.unit.spec.js
+++ b/frontend/test/metabase/lib/data_grid.unit.spec.js
@@ -9,7 +9,7 @@ import {
   COLUMN_SHOW_TOTALS,
 } from "metabase/lib/data_grid";
 
-import { TYPE } from "metabase/lib/types";
+import { TYPE } from "metabase-lib/lib/types/constants";
 
 const dimension = i => ({
   name: "D" + i,
diff --git a/frontend/test/metabase/lib/expressions/__support__/expressions.js b/frontend/test/metabase/lib/expressions/__support__/expressions.js
index 60b6b8c1f79f92260fdb5081152772174413cdf1..4f091e45af88cb31521e9f14cdd2f5ae0ee3fb96 100644
--- a/frontend/test/metabase/lib/expressions/__support__/expressions.js
+++ b/frontend/test/metabase/lib/expressions/__support__/expressions.js
@@ -1,5 +1,5 @@
-import { TYPE } from "metabase/lib/types";
 import { makeMetadata } from "__support__/sample_database_fixture";
+import { TYPE } from "metabase-lib/lib/types/constants";
 
 const metadata = makeMetadata({
   databases: {
diff --git a/frontend/test/metabase/lib/formatting.unit.spec.js b/frontend/test/metabase/lib/formatting.unit.spec.js
index 34daaca80d498d3124ef1f15da66b0248dd85a45..101c3392e99af74e556d48604c9cb464552587f8 100644
--- a/frontend/test/metabase/lib/formatting.unit.spec.js
+++ b/frontend/test/metabase/lib/formatting.unit.spec.js
@@ -13,7 +13,7 @@ import {
   getCurrencySymbol,
 } from "metabase/lib/formatting";
 import ExternalLink from "metabase/core/components/ExternalLink";
-import { TYPE } from "metabase/lib/types";
+import { TYPE } from "metabase-lib/lib/types/constants";
 
 describe("formatting", () => {
   describe("capitalize", () => {
diff --git a/frontend/test/metabase/lib/schema_metadata.unit.spec.js b/frontend/test/metabase/lib/schema_metadata.unit.spec.js
index f99c733677095cc3fa007845f0f658c3d98e679e..9f5755f19328b9328d131d3bc3162081c796bff1 100644
--- a/frontend/test/metabase/lib/schema_metadata.unit.spec.js
+++ b/frontend/test/metabase/lib/schema_metadata.unit.spec.js
@@ -22,7 +22,7 @@ import {
   getSemanticTypeName,
 } from "metabase/lib/schema_metadata";
 
-import { TYPE } from "metabase/lib/types";
+import { TYPE } from "metabase-lib/lib/types/constants";
 
 describe("schema_metadata", () => {
   describe("getFieldType", () => {
diff --git a/frontend/test/metabase/reference/utils.unit.spec.js b/frontend/test/metabase/reference/utils.unit.spec.js
index b9365ae7bff8df6cb10e6d12ef5ce58de58e7e69..c387ce6b0d4134f7dae2a1d774b1cf2f4b8defc5 100644
--- a/frontend/test/metabase/reference/utils.unit.spec.js
+++ b/frontend/test/metabase/reference/utils.unit.spec.js
@@ -1,7 +1,7 @@
 import { databaseToForeignKeys, getQuestion } from "metabase/reference/utils";
 
 import { separateTablesBySchema } from "metabase/reference/databases/TableList";
-import { TYPE } from "metabase/lib/types";
+import { TYPE } from "metabase-lib/lib/types/constants";
 
 describe("Reference utils.js", () => {
   describe("databaseToForeignKeys()", () => {
diff --git a/frontend/test/metabase/visualizations/lib/table.unit.spec.js b/frontend/test/metabase/visualizations/lib/table.unit.spec.js
index 56e5d82a3369294d6683f0b412024dbe1bd89473..af0fedea0ac4010ab8f1a677b928c2b63019b530 100644
--- a/frontend/test/metabase/visualizations/lib/table.unit.spec.js
+++ b/frontend/test/metabase/visualizations/lib/table.unit.spec.js
@@ -3,7 +3,7 @@ import {
   getTableClickedObjectRowData,
   isColumnRightAligned,
 } from "metabase/visualizations/lib/table";
-import { TYPE } from "metabase/lib/types";
+import { TYPE } from "metabase-lib/lib/types/constants";
 
 const RAW_COLUMN = {
   source: "fields",
diff --git a/frontend/test/metabase/visualizations/lib/timeseries.unit.spec.js b/frontend/test/metabase/visualizations/lib/timeseries.unit.spec.js
index f3852654cea8ca6cc890a2e68d3d3b257aff3f1a..ac8d4933677a43d9f2abc01c238fb22b48bd5bcf 100644
--- a/frontend/test/metabase/visualizations/lib/timeseries.unit.spec.js
+++ b/frontend/test/metabase/visualizations/lib/timeseries.unit.spec.js
@@ -6,7 +6,7 @@ import {
 } from "metabase/visualizations/lib/timeseries";
 import { getVisualizationTransformed } from "metabase/visualizations";
 
-import { TYPE } from "metabase/lib/types";
+import { TYPE } from "metabase-lib/lib/types/constants";
 import { StringColumn, NumberColumn } from "../__support__/visualizations";
 
 describe("visualization.lib.timeseries", () => {