diff --git a/package-lock.json b/package-lock.json index 53453530..b8893242 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,9 +8,6 @@ "name": "@donkeyclip/motorcortex-comets", "version": "1.0.6", "license": "MIT", - "dependencies": { - "@donkeyclip/motorcortex-anime": "^2.1.16" - }, "devDependencies": { "@babel/cli": "7.16.0", "@babel/core": "7.16.0", @@ -51,7 +48,7 @@ "node": ">=10" }, "peerDependencies": { - "@donkeyclip/motorcortex": ">= 7.4.0 < 8" + "@donkeyclip/motorcortex": ">= 7.6.2 < 8" } }, "node_modules/@babel/cli": { @@ -1628,6 +1625,7 @@ "version": "7.15.4", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz", "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==", + "dev": true, "dependencies": { "regenerator-runtime": "^0.13.4" }, @@ -1695,6 +1693,7 @@ "version": "7.6.2", "resolved": "https://registry.npmjs.org/@donkeyclip/motorcortex/-/motorcortex-7.6.2.tgz", "integrity": "sha512-I1vesrbUzJGhVBBs+xdC4UwcisfRdv+OAVlDJuSf6hSd4D2Fadd5WUY/rAU6Hc7O96SH1inhcCVyIxRjqdiZYw==", + "dev": true, "dependencies": { "bezier-easing": "2.1.0", "expr-eval": "2.0.2", @@ -1704,20 +1703,6 @@ "@babel/runtime": "7.15.4" } }, - "node_modules/@donkeyclip/motorcortex-anime": { - "version": "2.1.16", - "resolved": "https://registry.npmjs.org/@donkeyclip/motorcortex-anime/-/motorcortex-anime-2.1.16.tgz", - "integrity": "sha512-e1JK+mrYwerwyviOt8kIPh2tsiPFA3dQScB0PJdJ9zPr1RruYYYR7d6A4NorrL54O2avF3Yl7HmdIybfno1RZw==", - "dependencies": { - "mc-animejs-core": "3.1.5" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "@donkeyclip/motorcortex": ">= 6.4.1 < 8" - } - }, "node_modules/@donkeyclip/motorcortex-player": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/@donkeyclip/motorcortex-player/-/motorcortex-player-2.4.3.tgz", @@ -2868,7 +2853,8 @@ "node_modules/bezier-easing": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/bezier-easing/-/bezier-easing-2.1.0.tgz", - "integrity": "sha1-wE3+i5JtbsrKGBPWn/F5t8ICXYY=" + "integrity": "sha1-wE3+i5JtbsrKGBPWn/F5t8ICXYY=", + "dev": true }, "node_modules/big.js": { "version": "5.2.2", @@ -4984,7 +4970,8 @@ "node_modules/expr-eval": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/expr-eval/-/expr-eval-2.0.2.tgz", - "integrity": "sha512-4EMSHGOPSwAfBiibw3ndnP0AvjDWLsMvGOvWEZ2F96IGk0bIVdjQisOHxReSkE13mHcfbuCiXw+G4y0zv6N8Eg==" + "integrity": "sha512-4EMSHGOPSwAfBiibw3ndnP0AvjDWLsMvGOvWEZ2F96IGk0bIVdjQisOHxReSkE13mHcfbuCiXw+G4y0zv6N8Eg==", + "dev": true }, "node_modules/express": { "version": "4.17.1", @@ -5117,7 +5104,8 @@ "node_modules/fastest-validator": { "version": "1.12.0", "resolved": "https://registry.npmjs.org/fastest-validator/-/fastest-validator-1.12.0.tgz", - "integrity": "sha512-Qc7oCVO9hAPz5GUONmToIoa95YWzoe7SLsrjIXTfCFf6HFQXxxWePXe8D+Kp/XCrr5H/pMJwP2xprW07wYv/BQ==" + "integrity": "sha512-Qc7oCVO9hAPz5GUONmToIoa95YWzoe7SLsrjIXTfCFf6HFQXxxWePXe8D+Kp/XCrr5H/pMJwP2xprW07wYv/BQ==", + "dev": true }, "node_modules/fastq": { "version": "1.13.0", @@ -6748,11 +6736,6 @@ "semver": "bin/semver" } }, - "node_modules/mc-animejs-core": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/mc-animejs-core/-/mc-animejs-core-3.1.5.tgz", - "integrity": "sha512-/EbRoW4CM2SZqpeFkEIMfxCBUmgcAnqTFTXIypVRASZb66sHmACtx1I7Wo6926O8RInj7wpvFc7Q6PeLJwe8ow==" - }, "node_modules/md5": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz", @@ -8315,7 +8298,8 @@ "node_modules/regenerator-runtime": { "version": "0.13.9", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==", + "dev": true }, "node_modules/regenerator-transform": { "version": "0.14.5", @@ -11413,6 +11397,7 @@ "version": "7.15.4", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz", "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==", + "dev": true, "requires": { "regenerator-runtime": "^0.13.4" } @@ -11465,20 +11450,13 @@ "version": "7.6.2", "resolved": "https://registry.npmjs.org/@donkeyclip/motorcortex/-/motorcortex-7.6.2.tgz", "integrity": "sha512-I1vesrbUzJGhVBBs+xdC4UwcisfRdv+OAVlDJuSf6hSd4D2Fadd5WUY/rAU6Hc7O96SH1inhcCVyIxRjqdiZYw==", + "dev": true, "requires": { "bezier-easing": "2.1.0", "expr-eval": "2.0.2", "fastest-validator": "1.12.0" } }, - "@donkeyclip/motorcortex-anime": { - "version": "2.1.16", - "resolved": "https://registry.npmjs.org/@donkeyclip/motorcortex-anime/-/motorcortex-anime-2.1.16.tgz", - "integrity": "sha512-e1JK+mrYwerwyviOt8kIPh2tsiPFA3dQScB0PJdJ9zPr1RruYYYR7d6A4NorrL54O2avF3Yl7HmdIybfno1RZw==", - "requires": { - "mc-animejs-core": "3.1.5" - } - }, "@donkeyclip/motorcortex-player": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/@donkeyclip/motorcortex-player/-/motorcortex-player-2.4.3.tgz", @@ -12432,7 +12410,8 @@ "bezier-easing": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/bezier-easing/-/bezier-easing-2.1.0.tgz", - "integrity": "sha1-wE3+i5JtbsrKGBPWn/F5t8ICXYY=" + "integrity": "sha1-wE3+i5JtbsrKGBPWn/F5t8ICXYY=", + "dev": true }, "big.js": { "version": "5.2.2", @@ -14006,7 +13985,8 @@ "expr-eval": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/expr-eval/-/expr-eval-2.0.2.tgz", - "integrity": "sha512-4EMSHGOPSwAfBiibw3ndnP0AvjDWLsMvGOvWEZ2F96IGk0bIVdjQisOHxReSkE13mHcfbuCiXw+G4y0zv6N8Eg==" + "integrity": "sha512-4EMSHGOPSwAfBiibw3ndnP0AvjDWLsMvGOvWEZ2F96IGk0bIVdjQisOHxReSkE13mHcfbuCiXw+G4y0zv6N8Eg==", + "dev": true }, "express": { "version": "4.17.1", @@ -14127,7 +14107,8 @@ "fastest-validator": { "version": "1.12.0", "resolved": "https://registry.npmjs.org/fastest-validator/-/fastest-validator-1.12.0.tgz", - "integrity": "sha512-Qc7oCVO9hAPz5GUONmToIoa95YWzoe7SLsrjIXTfCFf6HFQXxxWePXe8D+Kp/XCrr5H/pMJwP2xprW07wYv/BQ==" + "integrity": "sha512-Qc7oCVO9hAPz5GUONmToIoa95YWzoe7SLsrjIXTfCFf6HFQXxxWePXe8D+Kp/XCrr5H/pMJwP2xprW07wYv/BQ==", + "dev": true }, "fastq": { "version": "1.13.0", @@ -15333,11 +15314,6 @@ } } }, - "mc-animejs-core": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/mc-animejs-core/-/mc-animejs-core-3.1.5.tgz", - "integrity": "sha512-/EbRoW4CM2SZqpeFkEIMfxCBUmgcAnqTFTXIypVRASZb66sHmACtx1I7Wo6926O8RInj7wpvFc7Q6PeLJwe8ow==" - }, "md5": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz", @@ -16448,7 +16424,8 @@ "regenerator-runtime": { "version": "0.13.9", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==", + "dev": true }, "regenerator-transform": { "version": "0.14.5", diff --git a/package.json b/package.json index 15fa6d30..7355f937 100644 --- a/package.json +++ b/package.json @@ -43,11 +43,9 @@ "path": "cz-conventional-changelog" } }, - "dependencies": { - "@donkeyclip/motorcortex-anime": "^2.1.16" - }, + "dependencies": {}, "peerDependencies": { - "@donkeyclip/motorcortex": ">= 7.4.0 < 8" + "@donkeyclip/motorcortex": ">= 7.6.2 < 8" }, "devDependencies": { "@babel/cli": "7.16.0", diff --git a/src/Incidents/Comets.js b/src/Incidents/Comets.js index afc8bd15..b3518ea6 100644 --- a/src/Incidents/Comets.js +++ b/src/Incidents/Comets.js @@ -1,6 +1,4 @@ -import { HTMLClip, loadPlugin } from "@donkeyclip/motorcortex"; -import AnimeDefinition from "@donkeyclip/motorcortex-anime"; -const Anime = loadPlugin(AnimeDefinition); +import { HTMLClip, CSSEffect } from "@donkeyclip/motorcortex"; import { _addDimension, timely } from "../helpers/randomizer"; const closeAngle = 29; @@ -112,7 +110,7 @@ export default class Comets extends HTMLClip { for (let i = 0; i < this.comets.length; i++) { // console.log(Math.tan(angle)*(-this.itemData[i].width -this.itemData[i].left)+ this.itemData[i].top) const angle = (-closeAngle * Math.PI) / 180; - const moveMagentComet = new Anime.Anime( + const moveMagentComet = new CSSEffect( { animatedAttrs: { left: `-${this.itemData[i].width}px`, diff --git a/src/Incidents/Stars.js b/src/Incidents/Stars.js index 070bda30..e493a968 100644 --- a/src/Incidents/Stars.js +++ b/src/Incidents/Stars.js @@ -1,6 +1,4 @@ -import { HTMLClip, loadPlugin, Combo } from "@donkeyclip/motorcortex"; -import AnimeDefinition from "@donkeyclip/motorcortex-anime"; -const Anime = loadPlugin(AnimeDefinition); +import { HTMLClip, CSSEffect, Combo } from "@donkeyclip/motorcortex"; import { spatial, timely } from "../helpers/randomizer"; export default class Stars extends HTMLClip { @@ -103,7 +101,7 @@ export default class Stars extends HTMLClip { { incidents: [ { - incidentClass: Anime.Anime, + incidentClass: CSSEffect, attrs: { animatedAttrs: _getAnimatedAttr( 0, @@ -116,7 +114,7 @@ export default class Stars extends HTMLClip { position: 0, }, { - incidentClass: Anime.Anime, + incidentClass: CSSEffect, attrs: { animatedAttrs: _getAnimatedAttr( 1,