Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

chore: cleanup moment leftovers (#69733)

Uladzimir Havenchyk727664ccc690
diff --git a/bun.lock b/bun.lock
index 8442e134f40..7a43002711d 100644
--- a/bun.lock
+++ b/bun.lock
@@ -120,8 +120,6 @@
"lodash.debounce": "^4.0.8",
"lodash.orderby": "^4.6.0",
"merge-refs": "^1.3.0",
- "moment": "^2.30.1",
- "moment-timezone": "^0.5.38",
"mustache": "^2.3.2",
"normalizr": "^3.0.2",
"ora": "^8.0.1",
@@ -427,7 +425,6 @@
"follow-redirects": "^1.15.5",
"json5": "2.2.2",
"mdast-util-to-hast": "^13.2.1",
- "moment": "^2.30.1",
"nth-check": "2.0.1",
"on-headers": "^1.1.0",
"prosemirror-model": "^1.25.4",
@@ -3868,10 +3865,6 @@
"module-replacements": ["[email protected]", "", {}, "sha512-j5sNQm3VCpQQ7nTqGeOZtoJtV3uKERgCBm9QRhmGRiXiqkf7iRFOkfxdJRZWLkqYY8PNf4cDQF/WfXUYLENrRA=="],
- "moment": ["[email protected]", "", {}, "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how=="],
-
- "moment-timezone": ["[email protected]", "", { "dependencies": { "moment": ">= 2.9.0" } }, "sha512-nMIrzGah4+oYZPflDvLZUgoVUO4fvAqHstvG3xAUnMolWncuAiLDWNnJZj6EwJGMGfb1ZcuTFE6GI3hNOVWI/Q=="],
-
"moo": ["[email protected]", "", {}, "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q=="],
"moo-color": ["[email protected]", "", { "dependencies": { "color-name": "^1.1.4" } }, "sha512-i/+ZKXMDf6aqYtBhuOcej71YSlbjT3wCO/4H1j8rPvxDJEifdwgg5MaFyu6iYAT8GBZJg2z0dkgK4YMzvURALQ=="],
diff --git a/eslint.config.mjs b/eslint.config.mjs
index bf38dcfc5f6..a6276a4b6e3 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -48,14 +48,6 @@ const baseMetabaseRestrictedConfig = {
name: "@mantine/core",
message: "Please import from `metabase/ui` instead.",
},
- {
- name: "moment",
- message: "Moment is deprecated, please use dayjs",
- },
- {
- name: "moment-timezone",
- message: "Moment is deprecated, please use dayjs",
- },
{
name: "@emotion/styled",
message: "Please style components using css modules.",
@@ -163,21 +155,6 @@ const configs = [
},
],
"no-empty": ["warn", { allowEmptyCatch: true }],
- "no-restricted-imports": [
- "error",
- {
- paths: [
- {
- name: "moment",
- message: "Moment is deprecated, please use dayjs",
- },
- {
- name: "moment-timezone",
- message: "Moment is deprecated, please use dayjs",
- },
- ],
- },
- ],
curly: ["warn", "all"],
eqeqeq: ["warn", "smart"],
"prefer-const": ["warn", { destructuring: "all" }],
@@ -273,7 +250,6 @@ const configs = [
{
allowed: [
"underscore",
- "moment",
"lodash.orderby",
"lodash.debounce",
"chalk",
@@ -453,14 +429,6 @@ const configs = [
"error",
{
paths: [
- {
- name: "moment",
- message: "Moment is deprecated, please use dayjs",
- },
- {
- name: "moment-timezone",
- message: "Moment is deprecated, please use dayjs",
- },
{
name: "metabase-types/api/mocks/presets",
message: "Please use e2e/support/cypress_sample_database instead",
@@ -583,14 +551,6 @@ const configs = [
"cljs/metabase.lib*",
],
paths: [
- {
- name: "moment",
- message: "Moment is deprecated, please use dayjs",
- },
- {
- name: "moment-timezone",
- message: "Moment is deprecated, please use dayjs",
- },
{
name: "@emotion/styled",
message: "Please style components using css modules.",
@@ -631,14 +591,6 @@ const configs = [
name: "@mantine/core",
message: "Please import from `metabase/ui` instead.",
},
- {
- name: "moment",
- message: "Moment is deprecated, please use dayjs",
- },
- {
- name: "moment-timezone",
- message: "Moment is deprecated, please use dayjs",
- },
{
name: "@emotion/styled",
message: "Please style components using css modules.",
@@ -692,16 +644,6 @@ const configs = [
],
},
],
- paths: [
- {
- name: "moment",
- message: "Moment is deprecated, please use dayjs",
- },
- {
- name: "moment-timezone",
- message: "Moment is deprecated, please use dayjs",
- },
- ],
},
],
"ttag/no-module-declaration": "error",
@@ -824,14 +766,6 @@ const configs = [
name: "@mantine/core",
message: "Please import from `metabase/ui` instead.",
},
- {
- name: "moment",
- message: "Moment is deprecated, please use dayjs",
- },
- {
- name: "moment-timezone",
- message: "Moment is deprecated, please use dayjs",
- },
{
name: "@storybook/test",
message:
@@ -868,14 +802,6 @@ const configs = [
name: "@mantine/core",
message: "Please import from `metabase/ui` instead.",
},
- {
- name: "moment",
- message: "Moment is deprecated, please use dayjs",
- },
- {
- name: "moment-timezone",
- message: "Moment is deprecated, please use dayjs",
- },
{
name: "@storybook/test",
message:
@@ -913,14 +839,6 @@ const configs = [
name: "@mantine/core",
message: "Please import from `metabase/ui` instead.",
},
- {
- name: "moment",
- message: "Moment is deprecated, please use dayjs",
- },
- {
- name: "moment-timezone",
- message: "Moment is deprecated, please use dayjs",
- },
{
name: "@storybook/test",
message:
diff --git a/frontend/src/metabase/lib/date-time.ts b/frontend/src/metabase/lib/date-time.ts
index 03378cf9995..90a25e8da2f 100644
--- a/frontend/src/metabase/lib/date-time.ts
+++ b/frontend/src/metabase/lib/date-time.ts
@@ -5,7 +5,6 @@ import _ from "underscore";
import type { DayOfWeekId } from "metabase-types/api";
// returns 0-6 where Sunday as 0 and Saturday as 6
-// Note: Keep in mind that this relays on moment internal state, which is not ideal.
const getFirstDayOfWeekIndex = (): number => {
return dayjs().startOf("week").isoWeekday();
};
diff --git a/frontend/src/metabase/visualizations/lib/renderer_utils.js b/frontend/src/metabase/visualizations/lib/renderer_utils.js
index 5be38adb9a8..433a652ad85 100644
--- a/frontend/src/metabase/visualizations/lib/renderer_utils.js
+++ b/frontend/src/metabase/visualizations/lib/renderer_utils.js
@@ -102,10 +102,10 @@ function getColumnIndex({ settings, data: { cols } }) {
return i === -1 ? 0 : i;
}
-// Crossfilter calls toString on each moment object, which calls format(), which is very slow.
+// Crossfilter calls toString on each dayjs object, which calls format(), which is very slow.
// Replace toString with a function that just returns the unparsed ISO input date, since that works
// just as well and is much faster
-function moment_fast_toString() {
+function dayjs_fast_toString() {
return this._i;
}
@@ -117,7 +117,7 @@ function parseTimestampAndWarn(value, unit) {
if (!m.isValid()) {
return { parsedValue: null, warning: invalidDateWarning(value) };
}
- m.toString = moment_fast_toString;
+ m.toString = dayjs_fast_toString;
return { parsedValue: m };
}
diff --git a/package.json b/package.json
index e960ae2036e..f4eed259c9d 100644
--- a/package.json
+++ b/package.json
@@ -125,8 +125,6 @@
"lodash.debounce": "^4.0.8",
"lodash.orderby": "^4.6.0",
"merge-refs": "^1.3.0",
- "moment": "^2.30.1",
- "moment-timezone": "^0.5.38",
"mustache": "^2.3.2",
"normalizr": "^3.0.2",
"ora": "^8.0.1",
@@ -407,7 +405,6 @@
"zrender": "^6.0.0"
},
"resolutions": {
- "moment": "^2.30.1",
"@types/react-dom": "^18.2.17",
"@types/react": "^18.2.42",
"ansi-html": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",