diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index be5704d2c..60d4c2d0b 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -51,7 +51,7 @@ "@superset-ui/plugin-chart-word-cloud": "file:./plugins/plugin-chart-word-cloud", "@superset-ui/switchboard": "file:./packages/superset-ui-switchboard", "@types/d3-format": "^3.0.1", - "@types/d3-time-format": "^3.0.1", + "@types/d3-time-format": "^4.0.3", "@visx/axis": "^3.8.0", "@visx/grid": "^3.5.0", "@visx/responsive": "^3.0.0", @@ -69,6 +69,7 @@ "classnames": "^2.2.5", "core-js": "^3.38.1", "d3-scale": "^2.1.2", + "d3-time-format": "^4.1.0", "dom-to-image-more": "^3.2.0", "emotion-rgba": "0.0.12", "fast-glob": "^3.2.7", @@ -3779,6 +3780,14 @@ "version": "1.4.2", "license": "BSD-3-Clause" }, + "node_modules/@data-ui/event-flow/node_modules/d3-time-format": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz", + "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==", + "dependencies": { + "d3-time": "1" + } + }, "node_modules/@data-ui/forms": { "version": "0.0.84", "license": "MIT", @@ -3992,6 +4001,14 @@ "d3-time-format": "2" } }, + "node_modules/@data-ui/histogram/node_modules/d3-time-format": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz", + "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==", + "dependencies": { + "d3-time": "1" + } + }, "node_modules/@data-ui/histogram/node_modules/resize-observer-polyfill": { "version": "1.5.0", "license": "MIT" @@ -4041,6 +4058,14 @@ "d3-time-format": "2" } }, + "node_modules/@data-ui/radial-chart/node_modules/d3-time-format": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz", + "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==", + "dependencies": { + "d3-time": "1" + } + }, "node_modules/@data-ui/shared": { "version": "0.0.84", "license": "MIT", @@ -4879,6 +4904,14 @@ "d3-array": "2" } }, + "node_modules/@encodable/color/node_modules/d3-time-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", + "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "dependencies": { + "d3-time": "1 - 2" + } + }, "node_modules/@encodable/format": { "version": "1.0.6", "license": "Apache-2.0", @@ -12087,6 +12120,15 @@ "d3-array": "2" } }, + "node_modules/@superset-ui/legacy-plugin-chart-time-table/node_modules/d3-time-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", + "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "peer": true, + "dependencies": { + "d3-time": "1 - 2" + } + }, "node_modules/@superset-ui/legacy-plugin-chart-world-map": { "resolved": "plugins/legacy-plugin-chart-world-map", "link": true @@ -13052,8 +13094,9 @@ "license": "MIT" }, "node_modules/@types/d3-time-format": { - "version": "3.0.1", - "license": "MIT" + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz", + "integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==" }, "node_modules/@types/d3-voronoi": { "version": "1.1.12", @@ -14577,16 +14620,6 @@ "node": ">=12" } }, - "node_modules/@visx/vendor/node_modules/d3-time-format": { - "version": "4.1.0", - "license": "ISC", - "dependencies": { - "d3-time": "1 - 3" - }, - "engines": { - "node": ">=12" - } - }, "node_modules/@visx/vendor/node_modules/internmap": { "version": "2.0.3", "license": "ISC", @@ -14870,6 +14903,14 @@ "version": "1.1.0", "license": "BSD-3-Clause" }, + "node_modules/@vx/scale/node_modules/d3-time-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", + "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "dependencies": { + "d3-time": "1 - 2" + } + }, "node_modules/@vx/shape": { "version": "0.0.140", "license": "MIT", @@ -20962,6 +21003,14 @@ "d3-color": "1" } }, + "node_modules/d3-scale/node_modules/d3-time-format": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz", + "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==", + "dependencies": { + "d3-time": "1" + } + }, "node_modules/d3-selection": { "version": "3.0.0", "license": "ISC", @@ -20988,10 +21037,14 @@ "license": "BSD-3-Clause" }, "node_modules/d3-time-format": { - "version": "2.3.0", - "license": "BSD-3-Clause", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz", + "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==", "dependencies": { - "d3-time": "1" + "d3-time": "1 - 3" + }, + "engines": { + "node": ">=12" } }, "node_modules/d3-timer": { @@ -22387,6 +22440,14 @@ "d3-array": "2" } }, + "node_modules/encodable/node_modules/d3-time-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", + "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "dependencies": { + "d3-time": "1 - 2" + } + }, "node_modules/encodeurl": { "version": "1.0.2", "dev": true, @@ -54886,7 +54947,7 @@ "@types/d3-interpolate": "^3.0.4", "@types/d3-scale": "^2.1.1", "@types/d3-time": "^3.0.3", - "@types/d3-time-format": "^2.1.0", + "@types/d3-time-format": "^4.0.3", "@types/enzyme": "^3.10.18", "@types/fetch-mock": "^7.3.8", "@types/json-bigint": "^1.0.4", @@ -54902,7 +54963,7 @@ "d3-interpolate": "^3.0.1", "d3-scale": "^3.0.0", "d3-time": "^3.1.0", - "d3-time-format": "^2.2.0", + "d3-time-format": "^4.1.0", "fetch-retry": "^6.0.0", "jed": "^1.1.1", "lodash": "^4.17.11", @@ -55044,6 +55105,14 @@ "d3-array": "2" } }, + "packages/superset-ui-core/node_modules/d3-scale/node_modules/d3-time-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", + "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "dependencies": { + "d3-time": "1 - 2" + } + }, "packages/superset-ui-core/node_modules/d3-time": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz", @@ -55944,6 +56013,14 @@ "d3-array": "2" } }, + "plugins/legacy-plugin-chart-horizon/node_modules/d3-time-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", + "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "dependencies": { + "d3-time": "1 - 2" + } + }, "plugins/legacy-plugin-chart-map-box": { "name": "@superset-ui/legacy-plugin-chart-map-box", "version": "0.18.25", @@ -56431,6 +56508,14 @@ "d3-array": "2" } }, + "plugins/legacy-preset-chart-deckgl/node_modules/d3-time-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", + "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "dependencies": { + "d3-time": "1 - 2" + } + }, "plugins/legacy-preset-chart-deckgl/node_modules/d3-time/node_modules/d3-array": { "version": "2.12.1", "license": "BSD-3-Clause", @@ -56726,6 +56811,14 @@ "d3-array": "2" } }, + "plugins/plugin-chart-word-cloud/node_modules/d3-time-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", + "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "dependencies": { + "d3-time": "1 - 2" + } + }, "tools/eslint-plugin-theme-colors": { "version": "1.0.0", "dev": true, @@ -58897,6 +58990,14 @@ }, "d3-selection": { "version": "1.4.2" + }, + "d3-time-format": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz", + "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==", + "requires": { + "d3-time": "1" + } } } }, @@ -59059,6 +59160,14 @@ "d3-time-format": "2" } }, + "d3-time-format": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz", + "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==", + "requires": { + "d3-time": "1" + } + }, "resize-observer-polyfill": { "version": "1.5.0" } @@ -59100,6 +59209,14 @@ "d3-time": "1", "d3-time-format": "2" } + }, + "d3-time-format": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz", + "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==", + "requires": { + "d3-time": "1" + } } } }, @@ -59738,6 +59855,14 @@ "requires": { "d3-array": "2" } + }, + "d3-time-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", + "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "requires": { + "d3-time": "1 - 2" + } } } }, @@ -64427,7 +64552,7 @@ "@types/d3-interpolate": "^3.0.4", "@types/d3-scale": "^2.1.1", "@types/d3-time": "^3.0.3", - "@types/d3-time-format": "^2.1.0", + "@types/d3-time-format": "^4.0.3", "@types/enzyme": "^3.10.18", "@types/fetch-mock": "^7.3.8", "@types/json-bigint": "^1.0.4", @@ -64443,7 +64568,7 @@ "d3-interpolate": "^3.0.1", "d3-scale": "^3.0.0", "d3-time": "^3.1.0", - "d3-time-format": "^2.2.0", + "d3-time-format": "^4.1.0", "fetch-mock": "^6.5.2", "fetch-retry": "^6.0.0", "jed": "^1.1.1", @@ -64528,6 +64653,14 @@ "requires": { "d3-array": "2" } + }, + "d3-time-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", + "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "requires": { + "d3-time": "1 - 2" + } } } }, @@ -66001,6 +66134,14 @@ "requires": { "d3-array": "2" } + }, + "d3-time-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", + "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "requires": { + "d3-time": "1 - 2" + } } } }, @@ -66121,6 +66262,15 @@ "requires": { "d3-array": "2" } + }, + "d3-time-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", + "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "peer": true, + "requires": { + "d3-time": "1 - 2" + } } } }, @@ -66385,6 +66535,14 @@ } } }, + "d3-time-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", + "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "requires": { + "d3-time": "1 - 2" + } + }, "deck.gl": { "version": "8.9.22", "requires": { @@ -66573,6 +66731,14 @@ "requires": { "d3-array": "2" } + }, + "d3-time-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", + "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "requires": { + "d3-time": "1 - 2" + } } } }, @@ -67173,7 +67339,9 @@ "version": "1.1.1" }, "@types/d3-time-format": { - "version": "3.0.1" + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@types/d3-time-format/-/d3-time-format-4.0.3.tgz", + "integrity": "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==" }, "@types/d3-voronoi": { "version": "1.1.12" @@ -68287,12 +68455,6 @@ "d3-array": "2 - 3" } }, - "d3-time-format": { - "version": "4.1.0", - "requires": { - "d3-time": "1 - 3" - } - }, "internmap": { "version": "2.0.3" } @@ -68510,6 +68672,14 @@ }, "d3-time": { "version": "1.1.0" + }, + "d3-time-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", + "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "requires": { + "d3-time": "1 - 2" + } } } }, @@ -72578,6 +72748,14 @@ "requires": { "d3-color": "^3.1.0" } + }, + "d3-time-format": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz", + "integrity": "sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==", + "requires": { + "d3-time": "1" + } } } }, @@ -72613,9 +72791,11 @@ "version": "1.0.10" }, "d3-time-format": { - "version": "2.3.0", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz", + "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==", "requires": { - "d3-time": "1" + "d3-time": "1 - 3" } }, "d3-timer": { @@ -73537,6 +73717,14 @@ "requires": { "d3-array": "2" } + }, + "d3-time-format": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", + "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "requires": { + "d3-time": "1 - 2" + } } } }, diff --git a/superset-frontend/package.json b/superset-frontend/package.json index fd7658d1c..353dcc81f 100644 --- a/superset-frontend/package.json +++ b/superset-frontend/package.json @@ -117,7 +117,7 @@ "@superset-ui/plugin-chart-word-cloud": "file:./plugins/plugin-chart-word-cloud", "@superset-ui/switchboard": "file:./packages/superset-ui-switchboard", "@types/d3-format": "^3.0.1", - "@types/d3-time-format": "^3.0.1", + "@types/d3-time-format": "^4.0.3", "@visx/axis": "^3.8.0", "@visx/grid": "^3.5.0", "@visx/responsive": "^3.0.0", diff --git a/superset-frontend/packages/superset-ui-core/package.json b/superset-frontend/packages/superset-ui-core/package.json index 6774f8300..11ae62010 100644 --- a/superset-frontend/packages/superset-ui-core/package.json +++ b/superset-frontend/packages/superset-ui-core/package.json @@ -30,7 +30,7 @@ "@types/d3-interpolate": "^3.0.4", "@types/d3-scale": "^2.1.1", "@types/d3-time": "^3.0.3", - "@types/d3-time-format": "^2.1.0", + "@types/d3-time-format": "^4.0.3", "@types/enzyme": "^3.10.18", "@types/fetch-mock": "^7.3.8", "@types/json-bigint": "^1.0.4", @@ -46,7 +46,7 @@ "d3-interpolate": "^3.0.1", "d3-scale": "^3.0.0", "d3-time": "^3.1.0", - "d3-time-format": "^2.2.0", + "d3-time-format": "^4.1.0", "fetch-retry": "^6.0.0", "jed": "^1.1.1", "lodash": "^4.17.11",