Merge pull request #4034 from emersonbottero/develop

fix: moment-mini default exporter
mermaid-js · Feb 5, 2023 · 71e5a53 · 71e5a53
2 parents a75cacd + df10d64
commit 71e5a53
Show file tree

Hide file tree

Showing 6 changed files with 260 additions and 413 deletions.
diff --git a/packages/mermaid/package.json b/packages/mermaid/package.json
@@ -59,7 +59,7 @@
     "elkjs": "^0.8.2",
     "khroma": "^2.0.0",
     "lodash-es": "^4.17.21",
-    "moment-mini": "^2.24.0",
+    "moment": "^2.29.4",
     "non-layered-tidy-tree-layout": "^2.0.2",
     "stylis": "^4.1.2",
     "ts-dedent": "^2.2.0",
@@ -86,7 +86,6 @@
     "js-base64": "^3.7.2",
     "jsdom": "^20.0.2",
     "micromatch": "^4.0.5",
-    "moment": "^2.29.4",
     "path-browserify": "^1.0.1",
     "prettier": "^2.7.1",
     "remark": "^14.0.2",

diff --git a/packages/mermaid/src/diagrams/gantt/ganttDb.js b/packages/mermaid/src/diagrams/gantt/ganttDb.js
@@ -1,4 +1,4 @@
-import moment from 'moment-mini';
+import moment from 'moment';
 import { sanitizeUrl } from '@braintree/sanitize-url';
 import { log } from '../../logger';
 import * as configApi from '../../config';

diff --git a/packages/mermaid/src/diagrams/gantt/ganttDb.spec.ts b/packages/mermaid/src/diagrams/gantt/ganttDb.spec.ts
@@ -1,5 +1,5 @@
 // @ts-nocheck TODO: Fix TS
-import moment from 'moment-mini';
+import moment from 'moment';
 import ganttDb from './ganttDb';
 import { convert } from '../../tests/util';
 

diff --git a/packages/mermaid/src/diagrams/gantt/ganttRenderer.js b/packages/mermaid/src/diagrams/gantt/ganttRenderer.js
@@ -1,4 +1,4 @@
-import moment from 'moment-mini';
+import moment from 'moment';
 import { log } from '../../logger';
 import {
   select,

diff --git a/packages/mermaid/src/logger.ts b/packages/mermaid/src/logger.ts
@@ -2,7 +2,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable @typescript-eslint/no-empty-function */
 /* eslint-disable no-console */
-import moment from 'moment-mini';
+import moment from 'moment';
 
 export type LogLevel = 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'fatal';