From 80ed66e0d6220c970d5c84a0484f5263edc29ad0 Mon Sep 17 00:00:00 2001 From: Lars Berning <151194+laberning@users.noreply.github.com> Date: Sat, 19 Feb 2022 20:34:22 +0100 Subject: [PATCH] updates kaboom to latest alpha version --- app/client/arcade/RowingGames.js | 3 +- app/client/arcade/SpaceBackground.js | 6 +- app/client/arcade/StrokeFighterBattleScene.js | 14 +- app/client/arcade/StrokeFighterStartScene.js | 5 - app/client/components/GameComponent.js | 4 +- package-lock.json | 178 +++++++++--------- package.json | 2 +- 7 files changed, 102 insertions(+), 110 deletions(-) diff --git a/app/client/arcade/RowingGames.js b/app/client/arcade/RowingGames.js index 0989c3c..2c45b27 100644 --- a/app/client/arcade/RowingGames.js +++ b/app/client/arcade/RowingGames.js @@ -43,7 +43,6 @@ export function createRowingGames (canvasElement, clientWidth, clientHeight) { let activeScene k.scene('strokeFighterBattle', () => { activeScene = StrokeFighterBattleScene(k) }) k.scene('strokeFighterStart', () => { activeScene = StrokeFighterStartScene(k) }) - k.scene('disposed', () => { }) k.go('strokeFighterStart') @@ -58,7 +57,7 @@ export function createRowingGames (canvasElement, clientWidth, clientHeight) { // todo: currently we move to an empty scene to dispose the game as there does not seem to be // a mechanism in kaboom to dispose the instance. function dispose () { - k.go('disposed') + k.quit() } return { diff --git a/app/client/arcade/SpaceBackground.js b/app/client/arcade/SpaceBackground.js index b870a07..ce08039 100644 --- a/app/client/arcade/SpaceBackground.js +++ b/app/client/arcade/SpaceBackground.js @@ -16,10 +16,10 @@ const STAR_NUM = 10 export default function addSpaceBackground (k) { const background = k.add([ k.rect(k.width() + 50, k.height() + 50), + k.z(-100), k.pos(-25, -25), k.color(0, 9, 28), - redflash(), - k.layer('background') + redflash() ]) for (let i = 0; i < STAR_NUM; i++) { @@ -37,9 +37,9 @@ export default function addSpaceBackground (k) { const starColor = k.rand(120, 200) k.add([ k.sprite(spriteName), + k.z(-100), k.scale(k.rand(0.2, 0.7)), k.color(starColor, starColor, starColor), - k.layer('background'), k.pos(position), 'star', { speed: k.rand(STAR_SPEED * 0.5, STAR_SPEED * 1.5) } diff --git a/app/client/arcade/StrokeFighterBattleScene.js b/app/client/arcade/StrokeFighterBattleScene.js index 566829c..a7e4d4e 100644 --- a/app/client/arcade/StrokeFighterBattleScene.js +++ b/app/client/arcade/StrokeFighterBattleScene.js @@ -38,11 +38,10 @@ export default function StrokeFighterBattleScene (k) { let trainingTime = 0 - k.layers([ - 'background', - 'game', - 'ui' - ], 'game') + const ui = k.add([ + k.fixed(), + k.z(100) + ]) const background = addSpaceBackground(k) @@ -182,11 +181,10 @@ export default function StrokeFighterBattleScene (k) { }) }) - const timer = k.add([ + const timer = ui.add([ k.text('00:00', { size: 25, font: 'sinko' }), k.pos(10, 10), - k.fixed(), - k.layer('ui') + k.fixed() ]) let trainingTimeRounded = 0 diff --git a/app/client/arcade/StrokeFighterStartScene.js b/app/client/arcade/StrokeFighterStartScene.js index 2e08864..af85209 100644 --- a/app/client/arcade/StrokeFighterStartScene.js +++ b/app/client/arcade/StrokeFighterStartScene.js @@ -12,11 +12,6 @@ import addSpaceBackground from './SpaceBackground.js' * @param {import('kaboom').KaboomCtx} k Kaboom Context */ export default function StrokeFighterStartScene (k) { - k.layers([ - 'background', - 'ui' - ], 'ui') - addSpaceBackground(k) k.add([ diff --git a/app/client/components/GameComponent.js b/app/client/components/GameComponent.js index 3f9ea05..9af245f 100644 --- a/app/client/components/GameComponent.js +++ b/app/client/components/GameComponent.js @@ -23,8 +23,8 @@ export class GameComponent extends AppElement { display: flex; } #arcade { - width: 100vh; - height: 100vh; + width: 100vh !important; + height: 100vh !important; } @media (orientation: portrait) { :host { diff --git a/package-lock.json b/package-lock.json index bb6cbb7..118095f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "ant-plus": "0.1.24", "finalhandler": "1.1.2", "form-data": "4.0.0", - "kaboom": "2000.2.7", + "kaboom": "2001.0.0-alpha.21", "lit": "2.1.3", "loglevel": "1.8.0", "nosleep.js": "0.12.0", @@ -151,9 +151,9 @@ } }, "node_modules/@ampproject/remapping": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.1.tgz", - "integrity": "sha512-Aolwjd7HSC2PyY0fDj/wA/EimQT4HfEnFYNp5s9CQlrdhyvWTtvZ5YzrUPu6R6/1jKiUlxu8bUhkdSnKHNAHMA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz", + "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==", "dev": true, "dependencies": { "@jridgewell/trace-mapping": "^0.3.0" @@ -184,9 +184,9 @@ } }, "node_modules/@babel/core": { - "version": "7.17.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.3.tgz", - "integrity": "sha512-TolSoY0D/G6/e5bufjUK7wqQeHdcK4NbdxHg0hrhx/zN6boloG52oNpxbZuil/GqmAIz2qEnJ0s8ay24j2YwVg==", + "version": "7.17.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.5.tgz", + "integrity": "sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.1.0", @@ -1815,9 +1815,9 @@ } }, "node_modules/@gar/promisify": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz", - "integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", + "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", "dev": true }, "node_modules/@humanwhocodes/config-array": { @@ -1872,9 +1872,9 @@ } }, "node_modules/@lit/reactive-element": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.2.2.tgz", - "integrity": "sha512-HkhTTO2rT8jlf4izz7ME/+YUjqz+ZHgmnOKorA+7tkDmQDg6QzDpWSFz//1YyiL193W4bc7rlQCiYyFiZa9pkQ==" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.3.0.tgz", + "integrity": "sha512-0TKSIuJHXNLM0k98fi0AdMIdUoHIYlDHTP+0Vruc2SOs4T6vU1FinXgSvYd8mSrkt+8R+qdRAXvjpqrMXMyBgw==" }, "node_modules/@mapbox/node-pre-gyp": { "version": "1.0.8", @@ -3203,15 +3203,15 @@ } }, "node_modules/browserslist": { - "version": "4.19.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz", - "integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==", + "version": "4.19.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.3.tgz", + "integrity": "sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==", "dev": true, "dependencies": { - "caniuse-lite": "^1.0.30001286", - "electron-to-chromium": "^1.4.17", + "caniuse-lite": "^1.0.30001312", + "electron-to-chromium": "^1.4.71", "escalade": "^3.1.1", - "node-releases": "^2.0.1", + "node-releases": "^2.0.2", "picocolors": "^1.0.0" }, "bin": { @@ -3740,9 +3740,9 @@ } }, "node_modules/core-js-compat": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.0.tgz", - "integrity": "sha512-OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A==", + "version": "3.21.1", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.1.tgz", + "integrity": "sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==", "dev": true, "dependencies": { "browserslist": "^4.19.1", @@ -5332,9 +5332,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.14.8", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz", - "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==", + "version": "1.14.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", + "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", "dev": true, "funding": [ { @@ -6697,9 +6697,9 @@ "dev": true }, "node_modules/kaboom": { - "version": "2000.2.7", - "resolved": "https://registry.npmjs.org/kaboom/-/kaboom-2000.2.7.tgz", - "integrity": "sha512-CiEsmVdmufedNNvppMrVwVGYmao+WRsjE7M/TU4lFGYwUNwBPBVxORmsKvUmuvchw0cR+Dwcj1vAL+K8P06qGA==" + "version": "2001.0.0-alpha.21", + "resolved": "https://registry.npmjs.org/kaboom/-/kaboom-2001.0.0-alpha.21.tgz", + "integrity": "sha512-fwxZzVjhaSIUxQdEbNKDMVjHcU2AllRiy4u/BKNd1ww/gZMdC1IA64qWLVUWWS02R7VSLd70umFYJof3R7CvOg==" }, "node_modules/keyv": { "version": "4.1.1", @@ -6770,18 +6770,18 @@ } }, "node_modules/lit-element": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-3.1.2.tgz", - "integrity": "sha512-5VLn5a7anAFH7oz6d7TRG3KiTZQ5GEFsAgOKB8Yc+HDyuDUGOT2cL1CYTz/U4b/xlJxO+euP14pyji+z3Z3kOg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-3.2.0.tgz", + "integrity": "sha512-HbE7yt2SnUtg5DCrWt028oaU4D5F4k/1cntAFHTkzY8ZIa8N0Wmu92PxSxucsQSOXlODFrICkQ5x/tEshKi13g==", "dependencies": { - "@lit/reactive-element": "^1.1.0", - "lit-html": "^2.1.0" + "@lit/reactive-element": "^1.3.0", + "lit-html": "^2.2.0" } }, "node_modules/lit-html": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.1.3.tgz", - "integrity": "sha512-WgvdwiNeuoT0mYEEJI+AAV2DEtlqzVM4lyDSaeQSg5ZwhS/CkGJBO/4n66alApEuSS9WXw9+ADBp8SPvtDEKSg==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.2.0.tgz", + "integrity": "sha512-dJnevgV8VkCuOXLWrjQopDE8nSy8CzipZ/ATfYQv7z7Dct4abblcKecf50gkIScuwCTzKvRLgvTgV0zzagW4gA==", "dependencies": { "@types/trusted-types": "^2.0.2" } @@ -7112,9 +7112,9 @@ } }, "node_modules/minimatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.1.tgz", - "integrity": "sha512-reLxBcKUPNBnc/sVtAbxgRVFSegoGeLaSjmphNhcwcolhYLRgtJscn5mRl6YRZNQv40Y7P6JM2YhSIsbL9OB5A==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "devOptional": true, "dependencies": { "brace-expansion": "^1.1.7" @@ -7287,9 +7287,9 @@ "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==" }, "node_modules/nanoid": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.0.tgz", - "integrity": "sha512-JzxqqT5u/x+/KOFSd7JP15DOo9nOoHpx6DYatqIHUW2+flybkm+mdcraotSQR5WcnZr+qhGVh8Ted0KdfSMxlg==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz", + "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==", "dev": true, "bin": { "nanoid": "bin/nanoid.cjs" @@ -11102,9 +11102,9 @@ "dev": true }, "node_modules/vm2": { - "version": "3.9.7", - "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.7.tgz", - "integrity": "sha512-g/GZ7V0Mlmch3eDVOATvAXr1GsJNg6kQ5PjvYy3HbJMCRn5slNbo/u73Uy7r5yUej1cRa3ZjtoVwcWSQuQ/fow==", + "version": "3.9.8", + "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.8.tgz", + "integrity": "sha512-/1PYg/BwdKzMPo8maOZ0heT7DLI0DAFTm7YQaz/Lim9oIaFZsJs3EdtalvXuBfZwczNwsYhju75NW4d6E+4q+w==", "dev": true, "dependencies": { "acorn": "^8.7.0", @@ -11475,9 +11475,9 @@ } }, "@ampproject/remapping": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.1.tgz", - "integrity": "sha512-Aolwjd7HSC2PyY0fDj/wA/EimQT4HfEnFYNp5s9CQlrdhyvWTtvZ5YzrUPu6R6/1jKiUlxu8bUhkdSnKHNAHMA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.1.2.tgz", + "integrity": "sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==", "dev": true, "requires": { "@jridgewell/trace-mapping": "^0.3.0" @@ -11499,9 +11499,9 @@ "dev": true }, "@babel/core": { - "version": "7.17.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.3.tgz", - "integrity": "sha512-TolSoY0D/G6/e5bufjUK7wqQeHdcK4NbdxHg0hrhx/zN6boloG52oNpxbZuil/GqmAIz2qEnJ0s8ay24j2YwVg==", + "version": "7.17.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.17.5.tgz", + "integrity": "sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==", "dev": true, "requires": { "@ampproject/remapping": "^2.1.0", @@ -12632,9 +12632,9 @@ } }, "@gar/promisify": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz", - "integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", + "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", "dev": true }, "@humanwhocodes/config-array": { @@ -12683,9 +12683,9 @@ } }, "@lit/reactive-element": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.2.2.tgz", - "integrity": "sha512-HkhTTO2rT8jlf4izz7ME/+YUjqz+ZHgmnOKorA+7tkDmQDg6QzDpWSFz//1YyiL193W4bc7rlQCiYyFiZa9pkQ==" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.3.0.tgz", + "integrity": "sha512-0TKSIuJHXNLM0k98fi0AdMIdUoHIYlDHTP+0Vruc2SOs4T6vU1FinXgSvYd8mSrkt+8R+qdRAXvjpqrMXMyBgw==" }, "@mapbox/node-pre-gyp": { "version": "1.0.8", @@ -13746,15 +13746,15 @@ } }, "browserslist": { - "version": "4.19.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz", - "integrity": "sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==", + "version": "4.19.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.19.3.tgz", + "integrity": "sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001286", - "electron-to-chromium": "^1.4.17", + "caniuse-lite": "^1.0.30001312", + "electron-to-chromium": "^1.4.71", "escalade": "^3.1.1", - "node-releases": "^2.0.1", + "node-releases": "^2.0.2", "picocolors": "^1.0.0" } }, @@ -14154,9 +14154,9 @@ } }, "core-js-compat": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.0.tgz", - "integrity": "sha512-OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A==", + "version": "3.21.1", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.1.tgz", + "integrity": "sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==", "dev": true, "requires": { "browserslist": "^4.19.1", @@ -15364,9 +15364,9 @@ "dev": true }, "follow-redirects": { - "version": "1.14.8", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz", - "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==", + "version": "1.14.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", + "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", "dev": true }, "forever-agent": { @@ -16381,9 +16381,9 @@ "dev": true }, "kaboom": { - "version": "2000.2.7", - "resolved": "https://registry.npmjs.org/kaboom/-/kaboom-2000.2.7.tgz", - "integrity": "sha512-CiEsmVdmufedNNvppMrVwVGYmao+WRsjE7M/TU4lFGYwUNwBPBVxORmsKvUmuvchw0cR+Dwcj1vAL+K8P06qGA==" + "version": "2001.0.0-alpha.21", + "resolved": "https://registry.npmjs.org/kaboom/-/kaboom-2001.0.0-alpha.21.tgz", + "integrity": "sha512-fwxZzVjhaSIUxQdEbNKDMVjHcU2AllRiy4u/BKNd1ww/gZMdC1IA64qWLVUWWS02R7VSLd70umFYJof3R7CvOg==" }, "keyv": { "version": "4.1.1", @@ -16445,18 +16445,18 @@ } }, "lit-element": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-3.1.2.tgz", - "integrity": "sha512-5VLn5a7anAFH7oz6d7TRG3KiTZQ5GEFsAgOKB8Yc+HDyuDUGOT2cL1CYTz/U4b/xlJxO+euP14pyji+z3Z3kOg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-3.2.0.tgz", + "integrity": "sha512-HbE7yt2SnUtg5DCrWt028oaU4D5F4k/1cntAFHTkzY8ZIa8N0Wmu92PxSxucsQSOXlODFrICkQ5x/tEshKi13g==", "requires": { - "@lit/reactive-element": "^1.1.0", - "lit-html": "^2.1.0" + "@lit/reactive-element": "^1.3.0", + "lit-html": "^2.2.0" } }, "lit-html": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.1.3.tgz", - "integrity": "sha512-WgvdwiNeuoT0mYEEJI+AAV2DEtlqzVM4lyDSaeQSg5ZwhS/CkGJBO/4n66alApEuSS9WXw9+ADBp8SPvtDEKSg==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.2.0.tgz", + "integrity": "sha512-dJnevgV8VkCuOXLWrjQopDE8nSy8CzipZ/ATfYQv7z7Dct4abblcKecf50gkIScuwCTzKvRLgvTgV0zzagW4gA==", "requires": { "@types/trusted-types": "^2.0.2" } @@ -16706,9 +16706,9 @@ "dev": true }, "minimatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.1.tgz", - "integrity": "sha512-reLxBcKUPNBnc/sVtAbxgRVFSegoGeLaSjmphNhcwcolhYLRgtJscn5mRl6YRZNQv40Y7P6JM2YhSIsbL9OB5A==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "devOptional": true, "requires": { "brace-expansion": "^1.1.7" @@ -16842,9 +16842,9 @@ "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==" }, "nanoid": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.0.tgz", - "integrity": "sha512-JzxqqT5u/x+/KOFSd7JP15DOo9nOoHpx6DYatqIHUW2+flybkm+mdcraotSQR5WcnZr+qhGVh8Ted0KdfSMxlg==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz", + "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==", "dev": true }, "napi-thread-safe-callback": { @@ -19750,9 +19750,9 @@ } }, "vm2": { - "version": "3.9.7", - "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.7.tgz", - "integrity": "sha512-g/GZ7V0Mlmch3eDVOATvAXr1GsJNg6kQ5PjvYy3HbJMCRn5slNbo/u73Uy7r5yUej1cRa3ZjtoVwcWSQuQ/fow==", + "version": "3.9.8", + "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.8.tgz", + "integrity": "sha512-/1PYg/BwdKzMPo8maOZ0heT7DLI0DAFTm7YQaz/Lim9oIaFZsJs3EdtalvXuBfZwczNwsYhju75NW4d6E+4q+w==", "dev": true, "requires": { "acorn": "^8.7.0", diff --git a/package.json b/package.json index 0540b49..8f730e1 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "ant-plus": "0.1.24", "finalhandler": "1.1.2", "form-data": "4.0.0", - "kaboom": "2000.2.7", + "kaboom": "2001.0.0-alpha.21", "lit": "2.1.3", "loglevel": "1.8.0", "nosleep.js": "0.12.0",