From e7c9983a62b5de0e691766bc2b814c47e10dbb5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Vy=C4=8D=C3=ADtal?= Date: Mon, 3 Aug 2020 20:54:59 +0200 Subject: [PATCH] feat!: update Vis Data and remove Moment (#295) BREAKING CHANGE: Type coercion in Data Sets is no longer available and Moment is no longer a part of bundled files. --- index.js | 1 - lib/header.js | 42 ------------------------------------------ lib/module/moment.js | 8 -------- package-lock.json | 12 +++--------- package.json | 6 ++---- rollup.build.js | 3 +-- 6 files changed, 6 insertions(+), 66 deletions(-) delete mode 100644 lib/header.js delete mode 100644 lib/module/moment.js diff --git a/index.js b/index.js index d016e8fdb..8faee923b 100644 --- a/index.js +++ b/index.js @@ -21,6 +21,5 @@ exports.graph3d = { }; // bundled external libraries -exports.moment = require('./lib/module/moment'); exports.Hammer = require('./lib/module/hammer'); exports.keycharm = require('keycharm'); diff --git a/lib/header.js b/lib/header.js deleted file mode 100644 index 915256cae..000000000 --- a/lib/header.js +++ /dev/null @@ -1,42 +0,0 @@ -import moment from 'moment'; -import pkg from '../package.json'; - -const header = ` -${ pkg.homepage } - -${ pkg.description } - -@version ${ pkg.version } -@date ${ moment().utc().format() } - -@copyright (c) 2011-2017 Almende B.V, http://almende.com -@copyright (c) 2018-2019 visjs contributors, https://github.com/visjs - -@license -vis.js is dual licensed under both - - 1. The Apache 2.0 License - http://www.apache.org/licenses/LICENSE-2.0 - - and - - 2. The MIT License - http://opensource.org/licenses/MIT - -vis.js may be distributed under either license.`; - -/** - * Generate a dynamic header banner. - * - * @param {String} component - * @returns {String} banner - */ -function genHeader(component) { - return [ - pkg.name, - component ? ' - ' + component : '', - header - ].join(''); -} - -export default genHeader; \ No newline at end of file diff --git a/lib/module/moment.js b/lib/module/moment.js deleted file mode 100644 index c537774e1..000000000 --- a/lib/module/moment.js +++ /dev/null @@ -1,8 +0,0 @@ -import Moment from "moment"; - -// first check if moment.js is already loaded in the browser window, if so, -// use this instance. Else, load via commonjs. -const MomentOrWindowDotMoment = - (typeof window !== "undefined" && window.moment) || Moment; - -export default MomentOrWindowDotMoment; diff --git a/package-lock.json b/package-lock.json index d7b9e1377..bc6a365f0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10284,12 +10284,6 @@ "integrity": "sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==", "dev": true }, - "moment": { - "version": "2.27.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz", - "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==", - "dev": true - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -19015,9 +19009,9 @@ "dev": true }, "vis-data": { - "version": "6.6.1", - "resolved": "https://registry.npmjs.org/vis-data/-/vis-data-6.6.1.tgz", - "integrity": "sha512-xmujDB2Dzf8T04rGFJ9OP4OA6zRVrz8R9hb0CVKryBrZRCljCga9JjSfgctA8S7wdZu7otDtUIwX4ZOgfV/57w==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/vis-data/-/vis-data-7.0.0.tgz", + "integrity": "sha512-qKpyAQ9UMT0QygLbCulgabKkgfo8aVkuWSqhvEiaah/iy/Dvj17iMFChUU+UIioorWlweXcp5ziXoMLIl7hTAg==", "dev": true }, "vis-dev-utils": { diff --git a/package.json b/package.json index a2cb438fd..d7c9c6c67 100644 --- a/package.json +++ b/package.json @@ -62,10 +62,9 @@ "component-emitter": "^1.3.0", "hammerjs": "^2.0.0", "keycharm": "^0.2.0 || ^0.3.0", - "moment": "^2.24.0", "propagating-hammerjs": "^1.4.0", "uuid": "^7.0.0 || ^8.0.0", - "vis-data": "^6.5.0", + "vis-data": "^7.0.0", "vis-util": "^3.0.0 || ^4.0.0" }, "devDependencies": { @@ -93,7 +92,6 @@ "keycharm": "0.3.1", "lint-staged": "10.2.11", "mocha": "8.1.0", - "moment": "2.27.0", "nyc": "15.1.0", "opencollective": "1.0.3", "postcss-assets": "5.0.0", @@ -114,7 +112,7 @@ "snap-shot-it": "7.9.3", "test-console": "1.1.0", "uuid": "8.3.0", - "vis-data": "6.6.1", + "vis-data": "7.0.0", "vis-dev-utils": "2.4.0", "vis-util": "4.3.4" }, diff --git a/rollup.build.js b/rollup.build.js index 3e705657f..0f618875b 100644 --- a/rollup.build.js +++ b/rollup.build.js @@ -2,7 +2,7 @@ import packageJSON from "./package.json"; import { generateRollupConfiguration } from "vis-dev-utils"; export default generateRollupConfiguration({ - externalForPeerBuild: ["moment", "vis-data"], + externalForPeerBuild: ["vis-data"], globals: { "component-emitter": "Emitter", "propagating-hammerjs": "propagating", @@ -10,7 +10,6 @@ export default generateRollupConfiguration({ "vis-util": "vis", hammerjs: "Hammer", keycharm: "keycharm", - moment: "moment", uuid: "uuidv4" }, header: { name: "vis-graph3d" },