From 22eb7de7eaf8e8f516feabbd04a0167e52d0c686 Mon Sep 17 00:00:00 2001 From: Gazook89 <58999374+Gazook89@users.noreply.github.com> Date: Thu, 29 Jul 2021 17:47:29 -0500 Subject: [PATCH 01/31] Create userPage3D.css --- client/homebrew/pages/userPage/userPage3D.css | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 client/homebrew/pages/userPage/userPage3D.css diff --git a/client/homebrew/pages/userPage/userPage3D.css b/client/homebrew/pages/userPage/userPage3D.css new file mode 100644 index 000000000..f7809d868 --- /dev/null +++ b/client/homebrew/pages/userPage/userPage3D.css @@ -0,0 +1,80 @@ + +.phb { + background:transparent; + width:100%; +} + +.phb > div > h1 { + color:white; + background:linear-gradient(150deg, red, orange); + margin:10px; + border-radius:5px; + border:1px outset black; + filter:drop-shadow(3px 3px 8px black); + padding:10px; + font-family:codebold; + font-size: .705cm; +} + +.phb > div:nth-child(2) > h1 { + background:linear-gradient(150deg, blue, purple); +} + +.phb > div { + display: flex; + flex-wrap: wrap; + justify-content:center; + padding:20px; + gap:15px; + border:6px solid #333333; + border-radius:10px; + margin-bottom:20px; +} + +.phb div:first-child h1 { + flex: 1 0 100%; + margin:0 0 10px 0; +} + +.phb div:nth-child(2) h1 { + flex: 1 0 100%; +} + +.phb .brewItem { + background:linear-gradient(150deg, red, orange); + flex: 1 1 content; + margin:unset; + height: 150px; + border:1px outset black; + filter:drop-shadow(3px 3px 8px black); + color:white; + display:flex; + flex-direction:column; +} + +.phb div:nth-child(2) .brewItem { + background:linear-gradient(150deg, blue, purple); +} + +.phb .brewItem h2 { + font-family:CodeBold; + color:white; + /* width:max(90%,300px); */ + flex:0 0 auto; +} + +.phb .brewItem .description { + /* width:clamp(200px,100%,300px); */ + flex:1 1 auto; +} + +.phb .brewItem .info { + all:unset; + /* width:clamp(200px,100%,300px); */ + flex:0 0 20px; + opacity:30% +} + +.phb .brewItem:hover .info { + opacity:unset; +} From e6ebdd5be35027fd0f7ab33491a051cef48ff4db Mon Sep 17 00:00:00 2001 From: Gazook89 <58999374+Gazook89@users.noreply.github.com> Date: Thu, 29 Jul 2021 17:59:55 -0500 Subject: [PATCH 02/31] Update userPage3D.css --- client/homebrew/pages/userPage/userPage3D.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/client/homebrew/pages/userPage/userPage3D.css b/client/homebrew/pages/userPage/userPage3D.css index f7809d868..291c9fe70 100644 --- a/client/homebrew/pages/userPage/userPage3D.css +++ b/client/homebrew/pages/userPage/userPage3D.css @@ -26,9 +26,6 @@ justify-content:center; padding:20px; gap:15px; - border:6px solid #333333; - border-radius:10px; - margin-bottom:20px; } .phb div:first-child h1 { @@ -52,6 +49,10 @@ flex-direction:column; } +.phb .brewItem:active { + transform:scale(.99); +} + .phb div:nth-child(2) .brewItem { background:linear-gradient(150deg, blue, purple); } From 4c389a4077fde8949046d6f22bd1d1688c258e2b Mon Sep 17 00:00:00 2001 From: Gazook89 <58999374+Gazook89@users.noreply.github.com> Date: Thu, 29 Jul 2021 19:15:09 -0500 Subject: [PATCH 03/31] Delete userPage3D.css --- client/homebrew/pages/userPage/userPage3D.css | 81 ------------------- 1 file changed, 81 deletions(-) delete mode 100644 client/homebrew/pages/userPage/userPage3D.css diff --git a/client/homebrew/pages/userPage/userPage3D.css b/client/homebrew/pages/userPage/userPage3D.css deleted file mode 100644 index 291c9fe70..000000000 --- a/client/homebrew/pages/userPage/userPage3D.css +++ /dev/null @@ -1,81 +0,0 @@ - -.phb { - background:transparent; - width:100%; -} - -.phb > div > h1 { - color:white; - background:linear-gradient(150deg, red, orange); - margin:10px; - border-radius:5px; - border:1px outset black; - filter:drop-shadow(3px 3px 8px black); - padding:10px; - font-family:codebold; - font-size: .705cm; -} - -.phb > div:nth-child(2) > h1 { - background:linear-gradient(150deg, blue, purple); -} - -.phb > div { - display: flex; - flex-wrap: wrap; - justify-content:center; - padding:20px; - gap:15px; -} - -.phb div:first-child h1 { - flex: 1 0 100%; - margin:0 0 10px 0; -} - -.phb div:nth-child(2) h1 { - flex: 1 0 100%; -} - -.phb .brewItem { - background:linear-gradient(150deg, red, orange); - flex: 1 1 content; - margin:unset; - height: 150px; - border:1px outset black; - filter:drop-shadow(3px 3px 8px black); - color:white; - display:flex; - flex-direction:column; -} - -.phb .brewItem:active { - transform:scale(.99); -} - -.phb div:nth-child(2) .brewItem { - background:linear-gradient(150deg, blue, purple); -} - -.phb .brewItem h2 { - font-family:CodeBold; - color:white; - /* width:max(90%,300px); */ - flex:0 0 auto; -} - -.phb .brewItem .description { - /* width:clamp(200px,100%,300px); */ - flex:1 1 auto; -} - -.phb .brewItem .info { - all:unset; - /* width:clamp(200px,100%,300px); */ - flex:0 0 20px; - opacity:30% -} - -.phb .brewItem:hover .info { - opacity:unset; -} From 4d61670f384fde9e4b52a87022b7c0a02f895308 Mon Sep 17 00:00:00 2001 From: Gazook89 <58999374+Gazook89@users.noreply.github.com> Date: Sat, 31 Jul 2021 07:19:42 -0500 Subject: [PATCH 04/31] add 1st Level spell to spell list - legacy --- client/homebrew/editor/snippetbar/snippetsLegacy/magic.gen.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/homebrew/editor/snippetbar/snippetsLegacy/magic.gen.js b/client/homebrew/editor/snippetbar/snippetsLegacy/magic.gen.js index 14dd5bd20..010ec9e9f 100644 --- a/client/homebrew/editor/snippetbar/snippetsLegacy/magic.gen.js +++ b/client/homebrew/editor/snippetbar/snippetsLegacy/magic.gen.js @@ -51,7 +51,7 @@ const spellNames = [ module.exports = { spellList : function(){ - const levels = ['Cantrips (0 Level)', '2nd Level', '3rd Level', '4th Level', '5th Level', '6th Level', '7th Level', '8th Level', '9th Level']; + const levels = ['Cantrips (0 Level)', '1st Level', '2nd Level', '3rd Level', '4th Level', '5th Level', '6th Level', '7th Level', '8th Level', '9th Level']; const content = _.map(levels, (level)=>{ const spells = _.map(_.sampleSize(spellNames, _.random(5, 15)), (spell)=>{ @@ -88,4 +88,4 @@ module.exports = { '\n\n\n' ].join('\n'); } -}; \ No newline at end of file +}; From 0d8c3a1e60f7fe5088121d65f5e4877e27dfe66e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Aug 2021 03:00:39 +0000 Subject: [PATCH 05/31] Bump eslint from 7.31.0 to 7.32.0 Bumps [eslint](https://github.com/eslint/eslint) from 7.31.0 to 7.32.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v7.31.0...v7.32.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4cb47f5c0..c91dedb8d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "vitreum": "git+https://git@github.com/calculuschild/vitreum.git" }, "devDependencies": { - "eslint": "^7.31.0", + "eslint": "^7.32.0", "eslint-plugin-react": "^7.24.0", "pico-check": "^2.1.3" }, @@ -3854,9 +3854,9 @@ } }, "node_modules/eslint": { - "version": "7.31.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.31.0.tgz", - "integrity": "sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA==", + "version": "7.32.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", + "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", "dev": true, "dependencies": { "@babel/code-frame": "7.12.11", @@ -12508,9 +12508,9 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { - "version": "7.31.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.31.0.tgz", - "integrity": "sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA==", + "version": "7.32.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", + "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", "dev": true, "requires": { "@babel/code-frame": "7.12.11", diff --git a/package.json b/package.json index b002c1965..e0de9df0f 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "vitreum": "git+https://git@github.com/calculuschild/vitreum.git" }, "devDependencies": { - "eslint": "^7.31.0", + "eslint": "^7.32.0", "eslint-plugin-react": "^7.24.0", "pico-check": "^2.1.3" } From 502b0c4cc5aa733bdf74c1caf79586f9d998588b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Aug 2021 03:00:49 +0000 Subject: [PATCH 06/31] Bump googleapis from 82.0.0 to 83.0.0 Bumps [googleapis](https://github.com/googleapis/google-api-nodejs-client) from 82.0.0 to 83.0.0. - [Release notes](https://github.com/googleapis/google-api-nodejs-client/releases) - [Changelog](https://github.com/googleapis/google-api-nodejs-client/blob/master/CHANGELOG.md) - [Commits](https://github.com/googleapis/google-api-nodejs-client/compare/googleapis-v82.0.0...googleapis-v83.0.0) --- updated-dependencies: - dependency-name: googleapis dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4cb47f5c0..bc8b35fe2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "express-async-handler": "^1.1.4", "express-static-gzip": "2.1.1", "fs-extra": "10.0.0", - "googleapis": "82.0.0", + "googleapis": "83.0.0", "jwt-simple": "^0.5.6", "less": "^3.13.1", "lodash": "^4.17.21", @@ -4836,9 +4836,9 @@ } }, "node_modules/googleapis": { - "version": "82.0.0", - "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-82.0.0.tgz", - "integrity": "sha512-TytL2h+Cl82RP8ZZ4hgiqOz/ZKWJ5nqn2ZaQ1bNIsIp6z4xuasXyJsgPaZzHADyRx/zNQfRfJGwzRInYJy7X4A==", + "version": "83.0.0", + "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-83.0.0.tgz", + "integrity": "sha512-/xzWnSPfZC6jwoq4bY8gMauGHF2kIbWZJ6bPgMUzI4zUGAhGD7YttHtbZX6Vz/eYIviYaQtL7HIvw5Jnei/TzA==", "dependencies": { "google-auth-library": "^7.0.2", "googleapis-common": "^5.0.2" @@ -13278,9 +13278,9 @@ } }, "googleapis": { - "version": "82.0.0", - "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-82.0.0.tgz", - "integrity": "sha512-TytL2h+Cl82RP8ZZ4hgiqOz/ZKWJ5nqn2ZaQ1bNIsIp6z4xuasXyJsgPaZzHADyRx/zNQfRfJGwzRInYJy7X4A==", + "version": "83.0.0", + "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-83.0.0.tgz", + "integrity": "sha512-/xzWnSPfZC6jwoq4bY8gMauGHF2kIbWZJ6bPgMUzI4zUGAhGD7YttHtbZX6Vz/eYIviYaQtL7HIvw5Jnei/TzA==", "requires": { "google-auth-library": "^7.0.2", "googleapis-common": "^5.0.2" diff --git a/package.json b/package.json index b002c1965..0ca343c01 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "express-async-handler": "^1.1.4", "express-static-gzip": "2.1.1", "fs-extra": "10.0.0", - "googleapis": "82.0.0", + "googleapis": "83.0.0", "jwt-simple": "^0.5.6", "less": "^3.13.1", "lodash": "^4.17.21", From e257776852f2d5cd3adb4c4711ab34830addbf23 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Aug 2021 03:01:08 +0000 Subject: [PATCH 07/31] Bump mongoose from 5.13.4 to 5.13.5 Bumps [mongoose](https://github.com/Automattic/mongoose) from 5.13.4 to 5.13.5. - [Release notes](https://github.com/Automattic/mongoose/releases) - [Changelog](https://github.com/Automattic/mongoose/blob/master/History.md) - [Commits](https://github.com/Automattic/mongoose/compare/5.13.4...5.13.5) --- updated-dependencies: - dependency-name: mongoose dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package-lock.json | 16 +++++++--------- package.json | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4cb47f5c0..b8728f04c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "marked": "2.1.3", "markedLegacy": "npm:marked@^0.3.19", "moment": "^2.29.1", - "mongoose": "^5.13.4", + "mongoose": "^5.13.5", "nanoid": "3.1.23", "nconf": "^0.11.3", "prop-types": "15.7.2", @@ -6376,12 +6376,11 @@ } }, "node_modules/mongoose": { - "version": "5.13.4", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.13.4.tgz", - "integrity": "sha512-D1yVHAOa+G8iQZsC/nNzZe+CI1FCYu6Qk384s1vSyaSfKCu/alKeyL78BA73SsxeRKT9zmswSIueLbGBURjrKg==", + "version": "5.13.5", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.13.5.tgz", + "integrity": "sha512-sSUAk9GWgA8r3w3nVNrNjBaDem86aevwXO8ltDMKzCf+rjnteMMQkXHQdn1ePkt7alROEPZYCAjiRjptWRSPiQ==", "dependencies": { "@types/mongodb": "^3.5.27", - "@types/node": "14.x || 15.x", "bson": "^1.1.4", "kareem": "2.3.2", "mongodb": "3.6.10", @@ -14456,12 +14455,11 @@ } }, "mongoose": { - "version": "5.13.4", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.13.4.tgz", - "integrity": "sha512-D1yVHAOa+G8iQZsC/nNzZe+CI1FCYu6Qk384s1vSyaSfKCu/alKeyL78BA73SsxeRKT9zmswSIueLbGBURjrKg==", + "version": "5.13.5", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.13.5.tgz", + "integrity": "sha512-sSUAk9GWgA8r3w3nVNrNjBaDem86aevwXO8ltDMKzCf+rjnteMMQkXHQdn1ePkt7alROEPZYCAjiRjptWRSPiQ==", "requires": { "@types/mongodb": "^3.5.27", - "@types/node": "14.x || 15.x", "bson": "^1.1.4", "kareem": "2.3.2", "mongodb": "3.6.10", diff --git a/package.json b/package.json index b002c1965..ab3881876 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "marked": "2.1.3", "markedLegacy": "npm:marked@^0.3.19", "moment": "^2.29.1", - "mongoose": "^5.13.4", + "mongoose": "^5.13.5", "nanoid": "3.1.23", "nconf": "^0.11.3", "prop-types": "15.7.2", From 4efd89627d4ae5f896f835671a2bc2911d41840c Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Tue, 3 Aug 2021 13:54:45 +1200 Subject: [PATCH 08/31] Add `config/docker.*` to gitIgnore --- .gitignore | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fcedd6d4f..2f081e2dc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,8 @@ storage *.log build/* config/local.* +config/docker.* -todo.md -startDB.bat -startMViewer.bat +todo.md +startDB.bat +startMViewer.bat From b6f7dc048f6ac060a63ab9ed796afd672bb7108a Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Tue, 3 Aug 2021 19:12:51 +1200 Subject: [PATCH 09/31] Modify buildAdmin.js for Node compatibility --- scripts/buildAdmin.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/buildAdmin.js b/scripts/buildAdmin.js index 8da821525..6c8033b39 100644 --- a/scripts/buildAdmin.js +++ b/scripts/buildAdmin.js @@ -14,10 +14,11 @@ const transforms = { }; const build = async ({ bundle, render, ssr })=>{ - await fs.outputFile('./build/admin/bundle.css', await lessTransform.generate({ paths: './shared' })); + const css = await lessTransform.generate({ paths: './shared' }); + await fs.outputFile('./build/admin/bundle.css', css); await fs.outputFile('./build/admin/bundle.js', bundle); await fs.outputFile('./build/admin/ssr.js', ssr); - await fs.outputFile('./build/admin/render.js', render); + //await fs.outputFile('./build/admin/render.js', render); }; fs.emptyDirSync('./build/admin'); From 36c9c2616eecf72b5016c592a599d473d64c571f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Aug 2021 03:00:46 +0000 Subject: [PATCH 10/31] Bump @babel/preset-env from 7.14.8 to 7.15.0 Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.14.8 to 7.15.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.15.0/packages/babel-preset-env) --- updated-dependencies: - dependency-name: "@babel/preset-env" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 290 +++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 146 insertions(+), 146 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4cb47f5c0..688303010 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@babel/core": "^7.14.8", "@babel/plugin-transform-runtime": "^7.14.5", - "@babel/preset-env": "^7.14.8", + "@babel/preset-env": "^7.15.0", "@babel/preset-react": "^7.14.5", "body-parser": "^1.19.0", "classnames": "^2.3.1", @@ -64,9 +64,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.14.7", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.7.tgz", - "integrity": "sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz", + "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==", "engines": { "node": ">=6.9.0" } @@ -146,11 +146,11 @@ } }, "node_modules/@babel/generator": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.8.tgz", - "integrity": "sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz", + "integrity": "sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==", "dependencies": { - "@babel/types": "^7.14.8", + "@babel/types": "^7.15.0", "jsesc": "^2.5.1", "source-map": "^0.5.0" }, @@ -190,11 +190,11 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz", - "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz", + "integrity": "sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==", "dependencies": { - "@babel/compat-data": "^7.14.5", + "@babel/compat-data": "^7.15.0", "@babel/helper-validator-option": "^7.14.5", "browserslist": "^4.16.6", "semver": "^6.3.0" @@ -334,11 +334,11 @@ } }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.14.7", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz", - "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz", + "integrity": "sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==", "dependencies": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.15.0" }, "engines": { "node": ">=6.9.0" @@ -356,18 +356,18 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz", - "integrity": "sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz", + "integrity": "sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==", "dependencies": { "@babel/helper-module-imports": "^7.14.5", - "@babel/helper-replace-supers": "^7.14.5", + "@babel/helper-replace-supers": "^7.15.0", "@babel/helper-simple-access": "^7.14.8", "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/helper-validator-identifier": "^7.14.8", + "@babel/helper-validator-identifier": "^7.14.9", "@babel/template": "^7.14.5", - "@babel/traverse": "^7.14.8", - "@babel/types": "^7.14.8" + "@babel/traverse": "^7.15.0", + "@babel/types": "^7.15.0" }, "engines": { "node": ">=6.9.0" @@ -406,14 +406,14 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz", - "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz", + "integrity": "sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==", "dependencies": { - "@babel/helper-member-expression-to-functions": "^7.14.5", + "@babel/helper-member-expression-to-functions": "^7.15.0", "@babel/helper-optimise-call-expression": "^7.14.5", - "@babel/traverse": "^7.14.5", - "@babel/types": "^7.14.5" + "@babel/traverse": "^7.15.0", + "@babel/types": "^7.15.0" }, "engines": { "node": ">=6.9.0" @@ -453,9 +453,9 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz", - "integrity": "sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==", + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz", + "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==", "engines": { "node": ">=6.9.0" } @@ -538,9 +538,9 @@ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "node_modules/@babel/parser": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.8.tgz", - "integrity": "sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.0.tgz", + "integrity": "sha512-0v7oNOjr6YT9Z2RAOTv4T9aP+ubfx4Q/OhVtAet7PFDt0t9Oy6Jn+/rfC6b8HJ5zEqrQCiMxJfgtHpmIminmJQ==", "bin": { "parser": "bin/babel-parser.js" }, @@ -565,9 +565,9 @@ } }, "node_modules/@babel/plugin-proposal-async-generator-functions": { - "version": "7.14.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz", - "integrity": "sha512-RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q==", + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz", + "integrity": "sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5", "@babel/helper-remap-async-to-generator": "^7.14.5", @@ -1030,9 +1030,9 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz", - "integrity": "sha512-J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA==", + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz", + "integrity": "sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==", "dependencies": { "@babel/helper-annotate-as-pure": "^7.14.5", "@babel/helper-function-name": "^7.14.5", @@ -1203,13 +1203,13 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz", - "integrity": "sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz", + "integrity": "sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig==", "dependencies": { - "@babel/helper-module-transforms": "^7.14.5", + "@babel/helper-module-transforms": "^7.15.0", "@babel/helper-plugin-utils": "^7.14.5", - "@babel/helper-simple-access": "^7.14.5", + "@babel/helper-simple-access": "^7.14.8", "babel-plugin-dynamic-import-node": "^2.3.3" }, "engines": { @@ -1253,9 +1253,9 @@ } }, "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.14.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz", - "integrity": "sha512-DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg==", + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz", + "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==", "dependencies": { "@babel/helper-create-regexp-features-plugin": "^7.14.5" }, @@ -1595,16 +1595,16 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.8.tgz", - "integrity": "sha512-a9aOppDU93oArQ51H+B8M1vH+tayZbuBqzjOhntGetZVa+4tTu5jp+XTwqHGG2lxslqomPYVSjIxQkFwXzgnxg==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.0.tgz", + "integrity": "sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q==", "dependencies": { - "@babel/compat-data": "^7.14.7", - "@babel/helper-compilation-targets": "^7.14.5", + "@babel/compat-data": "^7.15.0", + "@babel/helper-compilation-targets": "^7.15.0", "@babel/helper-plugin-utils": "^7.14.5", "@babel/helper-validator-option": "^7.14.5", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.14.5", - "@babel/plugin-proposal-async-generator-functions": "^7.14.7", + "@babel/plugin-proposal-async-generator-functions": "^7.14.9", "@babel/plugin-proposal-class-properties": "^7.14.5", "@babel/plugin-proposal-class-static-block": "^7.14.5", "@babel/plugin-proposal-dynamic-import": "^7.14.5", @@ -1637,7 +1637,7 @@ "@babel/plugin-transform-async-to-generator": "^7.14.5", "@babel/plugin-transform-block-scoped-functions": "^7.14.5", "@babel/plugin-transform-block-scoping": "^7.14.5", - "@babel/plugin-transform-classes": "^7.14.5", + "@babel/plugin-transform-classes": "^7.14.9", "@babel/plugin-transform-computed-properties": "^7.14.5", "@babel/plugin-transform-destructuring": "^7.14.7", "@babel/plugin-transform-dotall-regex": "^7.14.5", @@ -1648,10 +1648,10 @@ "@babel/plugin-transform-literals": "^7.14.5", "@babel/plugin-transform-member-expression-literals": "^7.14.5", "@babel/plugin-transform-modules-amd": "^7.14.5", - "@babel/plugin-transform-modules-commonjs": "^7.14.5", + "@babel/plugin-transform-modules-commonjs": "^7.15.0", "@babel/plugin-transform-modules-systemjs": "^7.14.5", "@babel/plugin-transform-modules-umd": "^7.14.5", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.7", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9", "@babel/plugin-transform-new-target": "^7.14.5", "@babel/plugin-transform-object-super": "^7.14.5", "@babel/plugin-transform-parameters": "^7.14.5", @@ -1666,11 +1666,11 @@ "@babel/plugin-transform-unicode-escapes": "^7.14.5", "@babel/plugin-transform-unicode-regex": "^7.14.5", "@babel/preset-modules": "^0.1.4", - "@babel/types": "^7.14.8", + "@babel/types": "^7.15.0", "babel-plugin-polyfill-corejs2": "^0.2.2", "babel-plugin-polyfill-corejs3": "^0.2.2", "babel-plugin-polyfill-regenerator": "^0.2.2", - "core-js-compat": "^3.15.0", + "core-js-compat": "^3.16.0", "semver": "^6.3.0" }, "engines": { @@ -1746,17 +1746,17 @@ } }, "node_modules/@babel/traverse": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.8.tgz", - "integrity": "sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz", + "integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==", "dependencies": { "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.14.8", + "@babel/generator": "^7.15.0", "@babel/helper-function-name": "^7.14.5", "@babel/helper-hoist-variables": "^7.14.5", "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/parser": "^7.14.8", - "@babel/types": "^7.14.8", + "@babel/parser": "^7.15.0", + "@babel/types": "^7.15.0", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -1789,11 +1789,11 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/@babel/types": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz", - "integrity": "sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", + "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", "dependencies": { - "@babel/helper-validator-identifier": "^7.14.8", + "@babel/helper-validator-identifier": "^7.14.9", "to-fast-properties": "^2.0.0" }, "engines": { @@ -3361,9 +3361,9 @@ } }, "node_modules/core-js-compat": { - "version": "3.15.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.15.1.tgz", - "integrity": "sha512-xGhzYMX6y7oEGQGAJmP2TmtBLvR4nZmRGEcFa3ubHOq5YEp51gGN9AovVa0AoujGZIq+Wm6dISiYyGNfdflYww==", + "version": "3.16.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.0.tgz", + "integrity": "sha512-5D9sPHCdewoUK7pSUPfTF7ZhLh8k9/CoJXWUEo+F1dZT5Z1DVgcuRqUKhjeKW+YLb8f21rTFgWwQJiNw1hoZ5Q==", "dependencies": { "browserslist": "^4.16.6", "semver": "7.0.0" @@ -9580,9 +9580,9 @@ } }, "@babel/compat-data": { - "version": "7.14.7", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.7.tgz", - "integrity": "sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==" + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz", + "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==" }, "@babel/core": { "version": "7.14.8", @@ -9640,11 +9640,11 @@ } }, "@babel/generator": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.8.tgz", - "integrity": "sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz", + "integrity": "sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==", "requires": { - "@babel/types": "^7.14.8", + "@babel/types": "^7.15.0", "jsesc": "^2.5.1", "source-map": "^0.5.0" }, @@ -9674,11 +9674,11 @@ } }, "@babel/helper-compilation-targets": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz", - "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz", + "integrity": "sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==", "requires": { - "@babel/compat-data": "^7.14.5", + "@babel/compat-data": "^7.15.0", "@babel/helper-validator-option": "^7.14.5", "browserslist": "^4.16.6", "semver": "^6.3.0" @@ -9783,11 +9783,11 @@ } }, "@babel/helper-member-expression-to-functions": { - "version": "7.14.7", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz", - "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz", + "integrity": "sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==", "requires": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.15.0" } }, "@babel/helper-module-imports": { @@ -9799,18 +9799,18 @@ } }, "@babel/helper-module-transforms": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz", - "integrity": "sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz", + "integrity": "sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==", "requires": { "@babel/helper-module-imports": "^7.14.5", - "@babel/helper-replace-supers": "^7.14.5", + "@babel/helper-replace-supers": "^7.15.0", "@babel/helper-simple-access": "^7.14.8", "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/helper-validator-identifier": "^7.14.8", + "@babel/helper-validator-identifier": "^7.14.9", "@babel/template": "^7.14.5", - "@babel/traverse": "^7.14.8", - "@babel/types": "^7.14.8" + "@babel/traverse": "^7.15.0", + "@babel/types": "^7.15.0" } }, "@babel/helper-optimise-call-expression": { @@ -9837,14 +9837,14 @@ } }, "@babel/helper-replace-supers": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz", - "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz", + "integrity": "sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==", "requires": { - "@babel/helper-member-expression-to-functions": "^7.14.5", + "@babel/helper-member-expression-to-functions": "^7.15.0", "@babel/helper-optimise-call-expression": "^7.14.5", - "@babel/traverse": "^7.14.5", - "@babel/types": "^7.14.5" + "@babel/traverse": "^7.15.0", + "@babel/types": "^7.15.0" } }, "@babel/helper-simple-access": { @@ -9872,9 +9872,9 @@ } }, "@babel/helper-validator-identifier": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz", - "integrity": "sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==" + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz", + "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==" }, "@babel/helper-validator-option": { "version": "7.14.5", @@ -9938,9 +9938,9 @@ } }, "@babel/parser": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.8.tgz", - "integrity": "sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA==" + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.0.tgz", + "integrity": "sha512-0v7oNOjr6YT9Z2RAOTv4T9aP+ubfx4Q/OhVtAet7PFDt0t9Oy6Jn+/rfC6b8HJ5zEqrQCiMxJfgtHpmIminmJQ==" }, "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { "version": "7.14.5", @@ -9953,9 +9953,9 @@ } }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.14.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz", - "integrity": "sha512-RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q==", + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz", + "integrity": "sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==", "requires": { "@babel/helper-plugin-utils": "^7.14.5", "@babel/helper-remap-async-to-generator": "^7.14.5", @@ -10250,9 +10250,9 @@ } }, "@babel/plugin-transform-classes": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz", - "integrity": "sha512-J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA==", + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz", + "integrity": "sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==", "requires": { "@babel/helper-annotate-as-pure": "^7.14.5", "@babel/helper-function-name": "^7.14.5", @@ -10356,13 +10356,13 @@ } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz", - "integrity": "sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz", + "integrity": "sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig==", "requires": { - "@babel/helper-module-transforms": "^7.14.5", + "@babel/helper-module-transforms": "^7.15.0", "@babel/helper-plugin-utils": "^7.14.5", - "@babel/helper-simple-access": "^7.14.5", + "@babel/helper-simple-access": "^7.14.8", "babel-plugin-dynamic-import-node": "^2.3.3" } }, @@ -10388,9 +10388,9 @@ } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.14.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz", - "integrity": "sha512-DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg==", + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz", + "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==", "requires": { "@babel/helper-create-regexp-features-plugin": "^7.14.5" } @@ -10615,16 +10615,16 @@ } }, "@babel/preset-env": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.14.8.tgz", - "integrity": "sha512-a9aOppDU93oArQ51H+B8M1vH+tayZbuBqzjOhntGetZVa+4tTu5jp+XTwqHGG2lxslqomPYVSjIxQkFwXzgnxg==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.0.tgz", + "integrity": "sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q==", "requires": { - "@babel/compat-data": "^7.14.7", - "@babel/helper-compilation-targets": "^7.14.5", + "@babel/compat-data": "^7.15.0", + "@babel/helper-compilation-targets": "^7.15.0", "@babel/helper-plugin-utils": "^7.14.5", "@babel/helper-validator-option": "^7.14.5", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.14.5", - "@babel/plugin-proposal-async-generator-functions": "^7.14.7", + "@babel/plugin-proposal-async-generator-functions": "^7.14.9", "@babel/plugin-proposal-class-properties": "^7.14.5", "@babel/plugin-proposal-class-static-block": "^7.14.5", "@babel/plugin-proposal-dynamic-import": "^7.14.5", @@ -10657,7 +10657,7 @@ "@babel/plugin-transform-async-to-generator": "^7.14.5", "@babel/plugin-transform-block-scoped-functions": "^7.14.5", "@babel/plugin-transform-block-scoping": "^7.14.5", - "@babel/plugin-transform-classes": "^7.14.5", + "@babel/plugin-transform-classes": "^7.14.9", "@babel/plugin-transform-computed-properties": "^7.14.5", "@babel/plugin-transform-destructuring": "^7.14.7", "@babel/plugin-transform-dotall-regex": "^7.14.5", @@ -10668,10 +10668,10 @@ "@babel/plugin-transform-literals": "^7.14.5", "@babel/plugin-transform-member-expression-literals": "^7.14.5", "@babel/plugin-transform-modules-amd": "^7.14.5", - "@babel/plugin-transform-modules-commonjs": "^7.14.5", + "@babel/plugin-transform-modules-commonjs": "^7.15.0", "@babel/plugin-transform-modules-systemjs": "^7.14.5", "@babel/plugin-transform-modules-umd": "^7.14.5", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.7", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9", "@babel/plugin-transform-new-target": "^7.14.5", "@babel/plugin-transform-object-super": "^7.14.5", "@babel/plugin-transform-parameters": "^7.14.5", @@ -10686,11 +10686,11 @@ "@babel/plugin-transform-unicode-escapes": "^7.14.5", "@babel/plugin-transform-unicode-regex": "^7.14.5", "@babel/preset-modules": "^0.1.4", - "@babel/types": "^7.14.8", + "@babel/types": "^7.15.0", "babel-plugin-polyfill-corejs2": "^0.2.2", "babel-plugin-polyfill-corejs3": "^0.2.2", "babel-plugin-polyfill-regenerator": "^0.2.2", - "core-js-compat": "^3.15.0", + "core-js-compat": "^3.16.0", "semver": "^6.3.0" }, "dependencies": { @@ -10752,17 +10752,17 @@ } }, "@babel/traverse": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.8.tgz", - "integrity": "sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz", + "integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==", "requires": { "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.14.8", + "@babel/generator": "^7.15.0", "@babel/helper-function-name": "^7.14.5", "@babel/helper-hoist-variables": "^7.14.5", "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/parser": "^7.14.8", - "@babel/types": "^7.14.8", + "@babel/parser": "^7.15.0", + "@babel/types": "^7.15.0", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -10788,11 +10788,11 @@ } }, "@babel/types": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz", - "integrity": "sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", + "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", "requires": { - "@babel/helper-validator-identifier": "^7.14.8", + "@babel/helper-validator-identifier": "^7.14.9", "to-fast-properties": "^2.0.0" } }, @@ -12091,9 +12091,9 @@ "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" }, "core-js-compat": { - "version": "3.15.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.15.1.tgz", - "integrity": "sha512-xGhzYMX6y7oEGQGAJmP2TmtBLvR4nZmRGEcFa3ubHOq5YEp51gGN9AovVa0AoujGZIq+Wm6dISiYyGNfdflYww==", + "version": "3.16.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.0.tgz", + "integrity": "sha512-5D9sPHCdewoUK7pSUPfTF7ZhLh8k9/CoJXWUEo+F1dZT5Z1DVgcuRqUKhjeKW+YLb8f21rTFgWwQJiNw1hoZ5Q==", "requires": { "browserslist": "^4.16.6", "semver": "7.0.0" diff --git a/package.json b/package.json index b002c1965..5d287382f 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "dependencies": { "@babel/core": "^7.14.8", "@babel/plugin-transform-runtime": "^7.14.5", - "@babel/preset-env": "^7.14.8", + "@babel/preset-env": "^7.15.0", "@babel/preset-react": "^7.14.5", "body-parser": "^1.19.0", "classnames": "^2.3.1", From 01c5d50957898b48b3fd04e8643fc93931f34e51 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Aug 2021 03:00:58 +0000 Subject: [PATCH 11/31] Bump @babel/core from 7.14.8 to 7.15.0 Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.14.8 to 7.15.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.15.0/packages/babel-core) --- updated-dependencies: - dependency-name: "@babel/core" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 214 +++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4cb47f5c0..b5bdcedb9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "hasInstallScript": true, "license": "MIT", "dependencies": { - "@babel/core": "^7.14.8", + "@babel/core": "^7.15.0", "@babel/plugin-transform-runtime": "^7.14.5", "@babel/preset-env": "^7.14.8", "@babel/preset-react": "^7.14.5", @@ -64,27 +64,27 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.14.7", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.7.tgz", - "integrity": "sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz", + "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.8.tgz", - "integrity": "sha512-/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz", + "integrity": "sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==", "dependencies": { "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.14.8", - "@babel/helper-compilation-targets": "^7.14.5", - "@babel/helper-module-transforms": "^7.14.8", + "@babel/generator": "^7.15.0", + "@babel/helper-compilation-targets": "^7.15.0", + "@babel/helper-module-transforms": "^7.15.0", "@babel/helpers": "^7.14.8", - "@babel/parser": "^7.14.8", + "@babel/parser": "^7.15.0", "@babel/template": "^7.14.5", - "@babel/traverse": "^7.14.8", - "@babel/types": "^7.14.8", + "@babel/traverse": "^7.15.0", + "@babel/types": "^7.15.0", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -146,11 +146,11 @@ } }, "node_modules/@babel/generator": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.8.tgz", - "integrity": "sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz", + "integrity": "sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==", "dependencies": { - "@babel/types": "^7.14.8", + "@babel/types": "^7.15.0", "jsesc": "^2.5.1", "source-map": "^0.5.0" }, @@ -190,11 +190,11 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz", - "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz", + "integrity": "sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==", "dependencies": { - "@babel/compat-data": "^7.14.5", + "@babel/compat-data": "^7.15.0", "@babel/helper-validator-option": "^7.14.5", "browserslist": "^4.16.6", "semver": "^6.3.0" @@ -334,11 +334,11 @@ } }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.14.7", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz", - "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz", + "integrity": "sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==", "dependencies": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.15.0" }, "engines": { "node": ">=6.9.0" @@ -356,18 +356,18 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz", - "integrity": "sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz", + "integrity": "sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==", "dependencies": { "@babel/helper-module-imports": "^7.14.5", - "@babel/helper-replace-supers": "^7.14.5", + "@babel/helper-replace-supers": "^7.15.0", "@babel/helper-simple-access": "^7.14.8", "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/helper-validator-identifier": "^7.14.8", + "@babel/helper-validator-identifier": "^7.14.9", "@babel/template": "^7.14.5", - "@babel/traverse": "^7.14.8", - "@babel/types": "^7.14.8" + "@babel/traverse": "^7.15.0", + "@babel/types": "^7.15.0" }, "engines": { "node": ">=6.9.0" @@ -406,14 +406,14 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz", - "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz", + "integrity": "sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==", "dependencies": { - "@babel/helper-member-expression-to-functions": "^7.14.5", + "@babel/helper-member-expression-to-functions": "^7.15.0", "@babel/helper-optimise-call-expression": "^7.14.5", - "@babel/traverse": "^7.14.5", - "@babel/types": "^7.14.5" + "@babel/traverse": "^7.15.0", + "@babel/types": "^7.15.0" }, "engines": { "node": ">=6.9.0" @@ -453,9 +453,9 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz", - "integrity": "sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==", + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz", + "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==", "engines": { "node": ">=6.9.0" } @@ -538,9 +538,9 @@ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "node_modules/@babel/parser": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.8.tgz", - "integrity": "sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.0.tgz", + "integrity": "sha512-0v7oNOjr6YT9Z2RAOTv4T9aP+ubfx4Q/OhVtAet7PFDt0t9Oy6Jn+/rfC6b8HJ5zEqrQCiMxJfgtHpmIminmJQ==", "bin": { "parser": "bin/babel-parser.js" }, @@ -1746,17 +1746,17 @@ } }, "node_modules/@babel/traverse": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.8.tgz", - "integrity": "sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz", + "integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==", "dependencies": { "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.14.8", + "@babel/generator": "^7.15.0", "@babel/helper-function-name": "^7.14.5", "@babel/helper-hoist-variables": "^7.14.5", "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/parser": "^7.14.8", - "@babel/types": "^7.14.8", + "@babel/parser": "^7.15.0", + "@babel/types": "^7.15.0", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -1789,11 +1789,11 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/@babel/types": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz", - "integrity": "sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", + "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", "dependencies": { - "@babel/helper-validator-identifier": "^7.14.8", + "@babel/helper-validator-identifier": "^7.14.9", "to-fast-properties": "^2.0.0" }, "engines": { @@ -9580,24 +9580,24 @@ } }, "@babel/compat-data": { - "version": "7.14.7", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.7.tgz", - "integrity": "sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==" + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz", + "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==" }, "@babel/core": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.8.tgz", - "integrity": "sha512-/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz", + "integrity": "sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==", "requires": { "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.14.8", - "@babel/helper-compilation-targets": "^7.14.5", - "@babel/helper-module-transforms": "^7.14.8", + "@babel/generator": "^7.15.0", + "@babel/helper-compilation-targets": "^7.15.0", + "@babel/helper-module-transforms": "^7.15.0", "@babel/helpers": "^7.14.8", - "@babel/parser": "^7.14.8", + "@babel/parser": "^7.15.0", "@babel/template": "^7.14.5", - "@babel/traverse": "^7.14.8", - "@babel/types": "^7.14.8", + "@babel/traverse": "^7.15.0", + "@babel/types": "^7.15.0", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -9640,11 +9640,11 @@ } }, "@babel/generator": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.8.tgz", - "integrity": "sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz", + "integrity": "sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==", "requires": { - "@babel/types": "^7.14.8", + "@babel/types": "^7.15.0", "jsesc": "^2.5.1", "source-map": "^0.5.0" }, @@ -9674,11 +9674,11 @@ } }, "@babel/helper-compilation-targets": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz", - "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz", + "integrity": "sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==", "requires": { - "@babel/compat-data": "^7.14.5", + "@babel/compat-data": "^7.15.0", "@babel/helper-validator-option": "^7.14.5", "browserslist": "^4.16.6", "semver": "^6.3.0" @@ -9783,11 +9783,11 @@ } }, "@babel/helper-member-expression-to-functions": { - "version": "7.14.7", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz", - "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz", + "integrity": "sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==", "requires": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.15.0" } }, "@babel/helper-module-imports": { @@ -9799,18 +9799,18 @@ } }, "@babel/helper-module-transforms": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz", - "integrity": "sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz", + "integrity": "sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==", "requires": { "@babel/helper-module-imports": "^7.14.5", - "@babel/helper-replace-supers": "^7.14.5", + "@babel/helper-replace-supers": "^7.15.0", "@babel/helper-simple-access": "^7.14.8", "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/helper-validator-identifier": "^7.14.8", + "@babel/helper-validator-identifier": "^7.14.9", "@babel/template": "^7.14.5", - "@babel/traverse": "^7.14.8", - "@babel/types": "^7.14.8" + "@babel/traverse": "^7.15.0", + "@babel/types": "^7.15.0" } }, "@babel/helper-optimise-call-expression": { @@ -9837,14 +9837,14 @@ } }, "@babel/helper-replace-supers": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz", - "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz", + "integrity": "sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==", "requires": { - "@babel/helper-member-expression-to-functions": "^7.14.5", + "@babel/helper-member-expression-to-functions": "^7.15.0", "@babel/helper-optimise-call-expression": "^7.14.5", - "@babel/traverse": "^7.14.5", - "@babel/types": "^7.14.5" + "@babel/traverse": "^7.15.0", + "@babel/types": "^7.15.0" } }, "@babel/helper-simple-access": { @@ -9872,9 +9872,9 @@ } }, "@babel/helper-validator-identifier": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz", - "integrity": "sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==" + "version": "7.14.9", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz", + "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==" }, "@babel/helper-validator-option": { "version": "7.14.5", @@ -9938,9 +9938,9 @@ } }, "@babel/parser": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.8.tgz", - "integrity": "sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA==" + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.0.tgz", + "integrity": "sha512-0v7oNOjr6YT9Z2RAOTv4T9aP+ubfx4Q/OhVtAet7PFDt0t9Oy6Jn+/rfC6b8HJ5zEqrQCiMxJfgtHpmIminmJQ==" }, "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { "version": "7.14.5", @@ -10752,17 +10752,17 @@ } }, "@babel/traverse": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.8.tgz", - "integrity": "sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz", + "integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==", "requires": { "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.14.8", + "@babel/generator": "^7.15.0", "@babel/helper-function-name": "^7.14.5", "@babel/helper-hoist-variables": "^7.14.5", "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/parser": "^7.14.8", - "@babel/types": "^7.14.8", + "@babel/parser": "^7.15.0", + "@babel/types": "^7.15.0", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -10788,11 +10788,11 @@ } }, "@babel/types": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.8.tgz", - "integrity": "sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", + "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", "requires": { - "@babel/helper-validator-identifier": "^7.14.8", + "@babel/helper-validator-identifier": "^7.14.9", "to-fast-properties": "^2.0.0" } }, diff --git a/package.json b/package.json index b002c1965..af8afae91 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ ] }, "dependencies": { - "@babel/core": "^7.14.8", + "@babel/core": "^7.15.0", "@babel/plugin-transform-runtime": "^7.14.5", "@babel/preset-env": "^7.14.8", "@babel/preset-react": "^7.14.5", From 79fac17bf7411625610ecfe4cc1c3d0d8960e4cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Aug 2021 03:34:15 +0000 Subject: [PATCH 12/31] Bump @babel/plugin-transform-runtime from 7.14.5 to 7.15.0 Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.14.5 to 7.15.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.15.0/packages/babel-plugin-transform-runtime) --- updated-dependencies: - dependency-name: "@babel/plugin-transform-runtime" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 128 ++++------------------------------------------ package.json | 2 +- 2 files changed, 10 insertions(+), 120 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5eedf7753..f5977e6d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "MIT", "dependencies": { "@babel/core": "^7.15.0", - "@babel/plugin-transform-runtime": "^7.14.5", + "@babel/plugin-transform-runtime": "^7.15.0", "@babel/preset-env": "^7.15.0", "@babel/preset-react": "^7.14.5", "body-parser": "^1.19.0", @@ -1413,9 +1413,9 @@ } }, "node_modules/@babel/plugin-transform-runtime": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz", - "integrity": "sha512-fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz", + "integrity": "sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw==", "dependencies": { "@babel/helper-module-imports": "^7.14.5", "@babel/helper-plugin-utils": "^7.14.5", @@ -1426,66 +1426,11 @@ }, "engines": { "node": ">=6.9.0" - } - }, - "node_modules/@babel/plugin-transform-runtime/node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz", - "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==", - "dependencies": { - "@babel/helper-compilation-targets": "^7.13.0", - "@babel/helper-module-imports": "^7.12.13", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/traverse": "^7.13.0", - "debug": "^4.1.1", - "lodash.debounce": "^4.0.8", - "resolve": "^1.14.2", - "semver": "^6.1.2" - } - }, - "node_modules/@babel/plugin-transform-runtime/node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz", - "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==", - "dependencies": { - "@babel/compat-data": "^7.13.11", - "@babel/helper-define-polyfill-provider": "^0.2.2", - "semver": "^6.1.1" - } - }, - "node_modules/@babel/plugin-transform-runtime/node_modules/babel-plugin-polyfill-corejs3": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.2.tgz", - "integrity": "sha512-l1Cf8PKk12eEk5QP/NQ6TH8A1pee6wWDJ96WjxrMXFLHLOBFzYM4moG80HFgduVhTqAFez4alnZKEhP/bYHg0A==", - "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.2.2", - "core-js-compat": "^3.9.1" - } - }, - "node_modules/@babel/plugin-transform-runtime/node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz", - "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==", - "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.2.2" - } - }, - "node_modules/@babel/plugin-transform-runtime/node_modules/debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "dependencies": { - "ms": "2.1.2" }, - "engines": { - "node": ">=6.0" + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-runtime/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "node_modules/@babel/plugin-transform-runtime/node_modules/semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", @@ -10481,9 +10426,9 @@ } }, "@babel/plugin-transform-runtime": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz", - "integrity": "sha512-fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz", + "integrity": "sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw==", "requires": { "@babel/helper-module-imports": "^7.14.5", "@babel/helper-plugin-utils": "^7.14.5", @@ -10493,61 +10438,6 @@ "semver": "^6.3.0" }, "dependencies": { - "@babel/helper-define-polyfill-provider": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz", - "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==", - "requires": { - "@babel/helper-compilation-targets": "^7.13.0", - "@babel/helper-module-imports": "^7.12.13", - "@babel/helper-plugin-utils": "^7.13.0", - "@babel/traverse": "^7.13.0", - "debug": "^4.1.1", - "lodash.debounce": "^4.0.8", - "resolve": "^1.14.2", - "semver": "^6.1.2" - } - }, - "babel-plugin-polyfill-corejs2": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz", - "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==", - "requires": { - "@babel/compat-data": "^7.13.11", - "@babel/helper-define-polyfill-provider": "^0.2.2", - "semver": "^6.1.1" - } - }, - "babel-plugin-polyfill-corejs3": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.2.tgz", - "integrity": "sha512-l1Cf8PKk12eEk5QP/NQ6TH8A1pee6wWDJ96WjxrMXFLHLOBFzYM4moG80HFgduVhTqAFez4alnZKEhP/bYHg0A==", - "requires": { - "@babel/helper-define-polyfill-provider": "^0.2.2", - "core-js-compat": "^3.9.1" - } - }, - "babel-plugin-polyfill-regenerator": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz", - "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==", - "requires": { - "@babel/helper-define-polyfill-provider": "^0.2.2" - } - }, - "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", diff --git a/package.json b/package.json index acf577280..58e281a8a 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ }, "dependencies": { "@babel/core": "^7.15.0", - "@babel/plugin-transform-runtime": "^7.14.5", + "@babel/plugin-transform-runtime": "^7.15.0", "@babel/preset-env": "^7.15.0", "@babel/preset-react": "^7.14.5", "body-parser": "^1.19.0", From 17926775e77a68442e432b630a80163a10c3da35 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 6 Aug 2021 00:49:42 -0400 Subject: [PATCH 13/31] Fix ScalySans Font for Mac? --- themes/5ePhb.style.less | 3 ++- themes/fonts/5e/Scaly Sans.woff2 | Bin 11004 -> 10916 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/themes/5ePhb.style.less b/themes/5ePhb.style.less index 3ca74dbf4..c5f3fdc90 100644 --- a/themes/5ePhb.style.less +++ b/themes/5ePhb.style.less @@ -267,6 +267,7 @@ body { // * MONSTER STAT BLOCK // *****************************/ .monster { + .useSansSerif(); &.frame { border-style : solid; border-width : 7px 6px; @@ -280,7 +281,7 @@ body { padding : 4px 2px; margin : 0px -6px 1em; } - .useSansSerif(); + //-webkit-transform : translateZ(0); //Prevents shadows from breaking across columns, but breaks internal columns... position : relative; padding : 0px; diff --git a/themes/fonts/5e/Scaly Sans.woff2 b/themes/fonts/5e/Scaly Sans.woff2 index dd01bbf50a1e36af5c02dbfd23d630d91d822fb2..26fecef4b52f5d2e834e5a35cfd41f1ce47a3d78 100644 GIT binary patch literal 10916 zcmV;VDqGcePew8T0RR9104k&a4gdfE0A3gX04hfS0RR9100000000000000000000 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 G0000fs^v@o literal 11004 zcmV#kSrZmz;r+;kPL>T>^E)09RUJNbXK4$|A$3&bZVk0jf{ zS*JjJ)3j^~;$)exEeBe@_i`!E|NrrApL1uXvH)8N&hx&A zXvI)Nh4=J7fWJVvEj$I=e8i}|T9uW&a0&hmF#Wq($(_G<=SdzVyB>v_0X1dC5<<&a zyEFHF z`~s*5)J8ZU%fiH%tV3ndx`~3WOEwC< z03c$xgciBOS{o$|zvG600r7m%SPfjD003?rwWpim zwvlZXZ`bdB+4FS%dtZ1k=in>{WGDc{k#XQC`oQ;X4jA_$hrNY7TB8wS{St`e!BG*x zjR*`H=zBYnqc{NJ4y9lzf7ceFUKYG^ql@1U0Qj*#9Cyk?*Ss?BsYx&GQc4k-YVi$$ zWMqUXO{IvWE=Ng|&XJxD40Mt~XGS_P(M2X*ncYo9a+eK9OGzGb@nKIrGN{#hSV)s) zGu#FXYpUfZ0gw*i0J;XvrOx*{fRs|O%JpNK;F z#P=1pS?_=!$R#$!KIqke^x&aw2qaK&gcF=#BZN?}dtv1X#5OSoV{+uBh~PtnU8MGs z+OK;$kB-UUS#F)h+5xVOTNf@m9wZ?oJV+{cBLv}g1$R5p^0gv9 zDVCL4SaX^euOtzP)3EXJbmAtJ-qpU}^@9=1{H)hDd+l@7VWj#hFtXSg)=PmSzMbBD z;sZYut-w@JoK<3m)83uk(LLx4TW{dvmhm8Ks>S}Hv;XiDw6lGS$@>jA}O8L z%L4E-MUb_LIq~jpb~x{%ORbLt-R?AWcyWs_l}8Uoh|wUbD8#bYueA=JJ=ni^_%?_y ztT+I7IFgv(fe-_vV`SYz4e=p}5<*GJ`Xc~{90~^l^EZwNL^+*e5LrC`oSQD2jhhxY z<&2B2`yXLQ>rojokVqhg5vfE0@i)?(z2*sV<%lV{5bi9;6N3Z)A9L1Ms2*o z4%%m@t#a_ZwN}5?R+`Cse<||AvhCNUZ!WIka>#(+6YmbmuJswKKh8RgzMAh{3qu{V zW3s=Tl@PRKPK%^i2WS`bixRmO#=XPVeILdi4?zocm23m{cz9iaO zTckFHHL0D49hlN)Vwv6?PDjJcKsKl+*V3#-;D{k72dxRhX%<+|<3kdzcbr0AT09)( zB8og37SWYIE_IeTQQG4_vrz)bO$r z12wHI{ralfS#e^HkIJ0MF?E(8&SjuJ z&xd(*xIUoK`es;tzI&*_szM{F_%ZF#8^7qArk9L>m;1jA&Im1(zF-V zP)SVgSV4#D*XrdoO_5IT)melzyW54Lc%;fw;Ex|x^Bs+gK}Kxz(g`Gz(#-n_;M7+$`zNNoAgl_9nzZgBnV0PsoZjv ztKdRfTA$zI=M=KgFN5UM7TP(p4tzAC2ezhN=WxUvUS)XC1Pe=>g z!SOUa@g#N$C&ooF*lD**;txn>DLqC}Uky9ks(ZbE!{_0d4g?YJ)TisqH?FC9XSIA4 zI8HGvS`nw;62Yys&!Uw^ z&17Q>xSbBo2czFf^VAX_;I_z+1D#VopE7&R_{UU)fmM+JQQqQWw`~kC>DGX>h

}kva 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 From e1bd40dea374693c798c63a36e5c54a175ba5658 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 6 Aug 2021 12:34:59 -0400 Subject: [PATCH 14/31] Change DL to display inline, not float. --- themes/5ePhb.style.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/5ePhb.style.less b/themes/5ePhb.style.less index c5f3fdc90..997f12377 100644 --- a/themes/5ePhb.style.less +++ b/themes/5ePhb.style.less @@ -629,11 +629,11 @@ body { margin-top: -0.5em; } dt { - float: left; - //clear: left; //Doesn't seem necessary - margin-right: 5px; + display : inline; + margin-right : 5px; } dd { + display : inline; margin-left : 0px; text-indent : 0px; } From 20691f8ab5e73fde271d3e72c865f95742bf6593 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 6 Aug 2021 16:45:22 -0400 Subject: [PATCH 15/31] Update markdown.js --- shared/naturalcrit/markdown.js | 44 +++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js index 3a341f379..438f68b37 100644 --- a/shared/naturalcrit/markdown.js +++ b/shared/naturalcrit/markdown.js @@ -284,16 +284,18 @@ const spanTable = { } } + let prevRow; + // Get any remaining header rows l = item.header.length; for (i = 1; i < l; i++) { - item.header[i] = splitCells(item.header[i], colCount); + item.header[i] = splitCells(item.header[i], colCount, item.header[i-1]); } // Get main table cells l = item.rows.length; for (i = 0; i < l; i++) { - item.rows[i] = splitCells(item.rows[i], colCount); + item.rows[i] = splitCells(item.rows[i], colCount, item.rows[i-1]); } // header child tokens @@ -330,7 +332,7 @@ const spanTable = { for (j = 0; j < row.length; j++) { cell = row[j]; text = this.parseInline(cell.tokens); - output += getTableCell(text, cell.colspan, 'th', token.align[col]); + output += getTableCell(text, cell.colspan, cell.rowspan, 'th', token.align[col]); col += cell.colspan; } output += ``; @@ -345,7 +347,7 @@ const spanTable = { for (j = 0; j < row.length; j++) { cell = row[j]; text = this.parseInline(cell.tokens); - output += getTableCell(text, cell.colspan, 'td', token.align[col]); + output += getTableCell(text, cell.colspan, cell.rowspan, 'td', token.align[col]); col += cell.colspan; } output += ``; @@ -357,14 +359,18 @@ const spanTable = { } }; -const getTableCell = (text, colspan, type, align)=>{ +const getTableCell = (text, colspan, rowspan, type, align)=>{ + if(!rowspan) { + return ''; + } const tag = `<${type}` + `${colspan > 1 ? ` colspan=${colspan}` : ''}` + + `${rowspan > 1 ? ` rowspan=${rowspan}` : ''}` + `${align ? ` align=${align}` : ''}>`; return `${tag + text}\n`; }; -const splitCells = (tableRow, count)=>{ +const splitCells = (tableRow, count, prevRow = [])=>{ // ensure that every cell-delimiting pipe has a space // before it to distinguish it from an escaped pipe const row = tableRow.replace(/(\|+)/g, (match, p1, offset, str)=>{ @@ -391,12 +397,34 @@ const splitCells = (tableRow, count)=>{ let numCols = 0; for (; i < cells.length; i++) { - const trimmedCell = cells[i].split(/(? numCols) + break; + } + } + numCols += cells[i].colspan; } From f23b661a4b4309b1804feb07f3e7f865cc2a05f1 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 6 Aug 2021 16:49:53 -0400 Subject: [PATCH 16/31] Lint --- shared/naturalcrit/markdown.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js index 438f68b37..2a6f0e3b9 100644 --- a/shared/naturalcrit/markdown.js +++ b/shared/naturalcrit/markdown.js @@ -284,8 +284,6 @@ const spanTable = { } } - let prevRow; - // Get any remaining header rows l = item.header.length; for (i = 1; i < l; i++) { @@ -332,7 +330,7 @@ const spanTable = { for (j = 0; j < row.length; j++) { cell = row[j]; text = this.parseInline(cell.tokens); - output += getTableCell(text, cell.colspan, cell.rowspan, 'th', token.align[col]); + output += getTableCell(text, cell, 'th', token.align[col]); col += cell.colspan; } output += ``; @@ -347,7 +345,7 @@ const spanTable = { for (j = 0; j < row.length; j++) { cell = row[j]; text = this.parseInline(cell.tokens); - output += getTableCell(text, cell.colspan, cell.rowspan, 'td', token.align[col]); + output += getTableCell(text, cell, 'td', token.align[col]); col += cell.colspan; } output += ``; @@ -359,13 +357,13 @@ const spanTable = { } }; -const getTableCell = (text, colspan, rowspan, type, align)=>{ - if(!rowspan) { +const getTableCell = (text, cell, type, align)=>{ + if(!cell.rowspan) { return ''; } const tag = `<${type}` - + `${colspan > 1 ? ` colspan=${colspan}` : ''}` - + `${rowspan > 1 ? ` rowspan=${rowspan}` : ''}` + + `${cell.colspan > 1 ? ` colspan=${cell.colspan}` : ''}` + + `${cell.rowspan > 1 ? ` rowspan=${cell.rowspan}` : ''}` + `${align ? ` align=${align}` : ''}>`; return `${tag + text}\n`; }; @@ -411,10 +409,10 @@ const splitCells = (tableRow, count, prevRow = [])=>{ let prevCols = 0; let j, prevCell; for (j = 0; j < prevRow.length; j++) { - let prevCell = prevRow[j]; + prevCell = prevRow[j]; if((prevCols == numCols) && (prevCell.colspan == cells[i].colspan)) { cells[i].rowSpanTarget = prevCell.rowSpanTarget ?? prevCell; - cells[i].rowSpanTarget.text += ' ' + cells[i].text.slice(0, -1); + cells[i].rowSpanTarget.text += ` ${cells[i].text.slice(0, -1)}`; cells[i].rowSpanTarget.rowspan += 1; cells[i].rowspan = 0; break; From 8103d7d31fb74463f9080327edbba29e513928f4 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Fri, 6 Aug 2021 16:58:10 -0400 Subject: [PATCH 17/31] Update Classtable snippet --- .../editor/snippetbar/snippets/classtable.gen.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/client/homebrew/editor/snippetbar/snippets/classtable.gen.js b/client/homebrew/editor/snippetbar/snippets/classtable.gen.js index 867aa625e..c8a2d051f 100644 --- a/client/homebrew/editor/snippetbar/snippets/classtable.gen.js +++ b/client/homebrew/editor/snippetbar/snippets/classtable.gen.js @@ -70,9 +70,10 @@ module.exports = { let cantrips = 3; let spells = 1; let slots = 2; - return `

\n##### The ${classname}\n` + - `| Level | Proficiency Bonus | Features | Cantrips Known | Spells Known | 1st | 2nd | 3rd | 4th | 5th | 6th | 7th | 8th | 9th |\n`+ - `|:---:|:---:|:---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|\n${ + return `{{classTable,wide\n##### The ${classname}\n` + + `| Level | Proficiency | Features | Cantrips | Spells | --- Spell Slots Per Level --- |||||||||\n`+ + `| ^| Bonus ^| ^| Known ^| Known ^| 1st | 2nd | 3rd | 4th | 5th | 6th | 7th | 8th | 9th |\n`+ + `|:-----:|:-----------:|:---------|:--------:|:------:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|\n${ _.map(levels, function(levelName, level){ const res = [ levelName, @@ -88,7 +89,7 @@ module.exports = { slots += _.random(0, 2); return `| ${res} |`; - }).join('\n')}\n
\n\n`; + }).join('\n')}\n}}\n\n`; }, half : function(){ From fd8020dcc4c6ecd7881d718c0b99939f9e1bb7e6 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sat, 7 Aug 2021 14:41:11 +1200 Subject: [PATCH 18/31] Add tooltip and classNames to UserPage and BrewItem --- client/homebrew/pages/userPage/brewItem/brewItem.jsx | 11 +++++++++-- client/homebrew/pages/userPage/userPage.jsx | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/client/homebrew/pages/userPage/brewItem/brewItem.jsx b/client/homebrew/pages/userPage/brewItem/brewItem.jsx index b24bad363..f0557c47e 100644 --- a/client/homebrew/pages/userPage/brewItem/brewItem.jsx +++ b/client/homebrew/pages/userPage/brewItem/brewItem.jsx @@ -99,11 +99,18 @@ const BrewItem = createClass({ ; }, + getTooltipData : function(){ + const dateFormatString = 'YYYY-MM-DD HH:mm:ss'; + let outputString = `Created: ${this.props.brew.createdAt ? moment(this.props.brew.createdAt).local().format(dateFormatString) : 'UNKNOWN'}\n`; + outputString += `Last updated: ${this.props.brew.updatedAt ? moment(this.props.brew.updatedAt).local().format(dateFormatString) : 'UNKNOWN'}`; + return outputString; + }, + render : function(){ const brew = this.props.brew; - return
+ return

{brew.title}

-

{brew.description}

+

{brew.description}

diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx index 837da4359..be3c04a5b 100644 --- a/client/homebrew/pages/userPage/userPage.jsx +++ b/client/homebrew/pages/userPage/userPage.jsx @@ -140,11 +140,11 @@ const UserPage = createClass({
{this.renderSortOptions()} -
+

{this.getUsernameWithS()} brews

{this.renderBrews(brews.published)}
-
+

{this.getUsernameWithS()} unpublished brews

{this.renderBrews(brews.private)}
From a1e78f1d17fa722ca85a8a88d853159148f390f3 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sat, 7 Aug 2021 14:47:25 +1200 Subject: [PATCH 19/31] Add `createdTime` to G-Drive fields to retrieve Add Moment to UserPage sorting --- client/homebrew/pages/userPage/userPage.jsx | 15 ++++++++------- server/googleActions.js | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx index e5b9d5d77..5cc4213ee 100644 --- a/client/homebrew/pages/userPage/userPage.jsx +++ b/client/homebrew/pages/userPage/userPage.jsx @@ -4,6 +4,8 @@ const createClass = require('create-react-class'); const _ = require('lodash'); const cx = require('classnames'); +const moment = require('moment'); + const Nav = require('naturalcrit/nav/nav.jsx'); const Navbar = require('../../navbar/navbar.jsx'); @@ -42,7 +44,7 @@ const UserPage = createClass({ renderBrews : function(brews){ if(!brews || !brews.length) return
No Brews.
; - const sortedBrews = this.sortBrews(brews); + const sortedBrews = this.sortBrews(brews, this.state.sortType); return _.map(sortedBrews, (brew, idx)=>{ return ; @@ -50,13 +52,12 @@ const UserPage = createClass({ }, sortBrewOrder : function(brew){ - if(!brew.title){brew.title = 'No Title';}; const mapping = { 'alpha' : _.deburr(brew.title.toLowerCase()), - 'created' : brew.createdAt, - 'updated' : brew.updatedAt, + 'created' : moment(brew.createdAt).format(), + 'updated' : moment(brew.updatedAt).format(), 'views' : brew.views, - 'latest' : brew.lastViewed + 'latest' : moment(brew.lastViewed).format() }; return mapping[this.state.sortType]; }, @@ -141,11 +142,11 @@ const UserPage = createClass({
{this.renderSortOptions()} -
+

{this.getUsernameWithS()} brews

{this.renderBrews(brews.published)}
-
+

{this.getUsernameWithS()} unpublished brews

{this.renderBrews(brews.private)}
diff --git a/server/googleActions.js b/server/googleActions.js index 8faa0c720..ff5fd0662 100644 --- a/server/googleActions.js +++ b/server/googleActions.js @@ -95,7 +95,7 @@ GoogleActions = { const obj = await drive.files.list({ pageSize : 100, - fields : 'nextPageToken, files(id, name, description, modifiedTime, properties)', + fields : 'nextPageToken, files(id, name, description, createdTime, modifiedTime, properties)', q : 'mimeType != \'application/vnd.google-apps.folder\' and trashed = false' }) .catch((err)=>{ From 4940d8523c51f4f1635f60483b58e96237d29c1e Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Sat, 7 Aug 2021 14:56:06 +1200 Subject: [PATCH 20/31] Add title tooltip to Recent NavBar dropdown --- client/homebrew/navbar/recent.navitem.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/homebrew/navbar/recent.navitem.jsx b/client/homebrew/navbar/recent.navitem.jsx index f55817df0..e386d9caf 100644 --- a/client/homebrew/navbar/recent.navitem.jsx +++ b/client/homebrew/navbar/recent.navitem.jsx @@ -124,7 +124,7 @@ const RecentItems = createClass({ const makeItems = (brews)=>{ return _.map(brews, (brew)=>{ - return + return {brew.title || '[ no title ]'} {Moment(brew.ts).fromNow()} ; From 9ea068bf647afea9f1d1dfb7711ec7d21feca1fa Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Sat, 7 Aug 2021 00:48:59 -0400 Subject: [PATCH 21/31] Fix catastrophic backtracking and trim starting pipes --- shared/naturalcrit/markdown.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js index 2a6f0e3b9..01abc33a7 100644 --- a/shared/naturalcrit/markdown.js +++ b/shared/naturalcrit/markdown.js @@ -240,7 +240,7 @@ const spanTable = { start(src) { return src.match(/^\n *([^\n ].*\|.*)\n/)?.index; }, // Hint to Marked.js to stop and check for a match tokenizer(src, tokens) { //const regex = this.tokenizer.rules.block.table; - const regex = new RegExp('^ *([^\\n ].*\\|.*\\n(?:.*?[^\\s].*\\n)*?)' // Header + const regex = new RegExp('^ *([^\\n ].*\\|.*\\n(?: *[^\\s].*\\n)*?)' // Header + ' {0,3}(?:\\| *)?(:?-+:? *(?:\\| *:?-+:? *)*)\\|?' // Align + '(?:\\n *((?:(?!\\n| {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})' // Cells + '(?:\\n+|$)| {0,3}#{1,6} | {0,3}>| {4}[^\\n]| {0,3}(?:`{3,}' @@ -369,9 +369,9 @@ const getTableCell = (text, cell, type, align)=>{ }; const splitCells = (tableRow, count, prevRow = [])=>{ - // ensure that every cell-delimiting pipe has a space - // before it to distinguish it from an escaped pipe - const row = tableRow.replace(/(\|+)/g, (match, p1, offset, str)=>{ + // trim any excessive pipes at start of row + tableRow = tableRow.replace(/^\|+(?=\|)/, '') + .replace(/(\|+)/g, (match, p1, offset, str)=>{ let escaped = false, curr = offset; while (--curr >= 0 && str[curr] === '\\') escaped = !escaped; @@ -380,12 +380,12 @@ const splitCells = (tableRow, count, prevRow = [])=>{ // so we leave it and the slashes alone return p1; } else { - // add space before unescaped | + // add space before unescaped | to distinguish it from an escaped pipe return ` ${p1}`; } }); - const cells = row.split(/(?: \||(?<=\|)\|)(?=[^\|]|$)/g); + const cells = tableRow.split(/(?: \||(?<=\|)\|)(?=[^\|]|$)/g); let i = 0; // First/last cell in a row cannot be empty if it has no leading/trailing pipe @@ -400,7 +400,7 @@ const splitCells = (tableRow, count, prevRow = [])=>{ rowspan : 1, colspan : Math.max(cells[i].length - trimmedCell.length, 1), text : trimmedCell.trim().replace(/\\\|/g, '|') - // leading or trailing whitespace is ignored per the gfm spec + // trim whitespace and display escaped pipes as normal character }; // Handle Rowspan @@ -411,6 +411,7 @@ const splitCells = (tableRow, count, prevRow = [])=>{ for (j = 0; j < prevRow.length; j++) { prevCell = prevRow[j]; if((prevCols == numCols) && (prevCell.colspan == cells[i].colspan)) { + // merge into matching cell in previous row (the "target") cells[i].rowSpanTarget = prevCell.rowSpanTarget ?? prevCell; cells[i].rowSpanTarget.text += ` ${cells[i].text.slice(0, -1)}`; cells[i].rowSpanTarget.rowspan += 1; From ca9a8173bd51c8994033a107ccbb8c8b67a31aea Mon Sep 17 00:00:00 2001 From: Gazook89 <58999374+Gazook89@users.noreply.github.com> Date: Sat, 7 Aug 2021 22:43:15 -0500 Subject: [PATCH 22/31] Add HTML Comment Hotkey Resubmission of #1492 from new clone (old clone was deleted). --- .../editor/snippetbar/snippets/snippets.js | 7 +++++++ .../snippetbar/snippetsLegacy/snippets.js | 7 +++++++ shared/naturalcrit/codeEditor/codeEditor.jsx | 17 +++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/client/homebrew/editor/snippetbar/snippets/snippets.js b/client/homebrew/editor/snippetbar/snippets/snippets.js index 2ac8c7ea0..99226832d 100644 --- a/client/homebrew/editor/snippetbar/snippets/snippets.js +++ b/client/homebrew/editor/snippetbar/snippets/snippets.js @@ -113,6 +113,13 @@ module.exports = [ ' }\n' + '' }, + { + name : 'Add Comment', + icon : 'fas fa-comment-code', /* might need to be fa-solid fa-comment-code --not sure, Gazook */ + gen : dedent`\n + + \n` + }, ] }, diff --git a/client/homebrew/editor/snippetbar/snippetsLegacy/snippets.js b/client/homebrew/editor/snippetbar/snippetsLegacy/snippets.js index 2d4e2d0e4..830e5d194 100644 --- a/client/homebrew/editor/snippetbar/snippetsLegacy/snippets.js +++ b/client/homebrew/editor/snippetbar/snippetsLegacy/snippets.js @@ -100,6 +100,13 @@ module.exports = [ ' }\n' + '' }, + { + name : 'Add Comment', + icon : 'fas fa-comment-code', /* might need to be fa-solid fa-comment-code --not sure, Gazook */ + gen : dedent`\n + + \n` + }, ] }, diff --git a/shared/naturalcrit/codeEditor/codeEditor.jsx b/shared/naturalcrit/codeEditor/codeEditor.jsx index a40c48436..6de06cf81 100644 --- a/shared/naturalcrit/codeEditor/codeEditor.jsx +++ b/shared/naturalcrit/codeEditor/codeEditor.jsx @@ -53,6 +53,14 @@ const CodeEditor = createClass({ 'Cmd-I' : this.makeItalic, 'Ctrl-M' : this.makeSpan, 'Cmd-M' : this.makeSpan, + 'Ctrl-B' : this.makeBold, + 'Cmd-B' : this.makeBold, + 'Ctrl-I' : this.makeItalic, + 'Cmd-I' : this.makeItalic, + 'Ctrl-M' : this.makeSpan, + 'Cmd-M' : this.makeSpan, + 'Ctrl-\\' : this.makeComment, + 'Cmd-\\' : this.makeComment, } }); @@ -88,6 +96,15 @@ const CodeEditor = createClass({ } }, + makeComment : function() { + const selection = this.codeMirror.getSelection(), t = selection.slice(0, 4) === ''; + this.codeMirror.replaceSelection(t ? selection.slice(4, -3) : ``, 'around'); + if(selection.length === 0){ + const cursor = this.codeMirror.getCursor(); + this.codeMirror.setCursor({ line: cursor.line, ch: cursor.ch - 3 }); + } + }, + //=-- Externally used -==// setCursorPosition : function(line, char){ setTimeout(()=>{ From 1324bc05e80cb4091e71d29f54d9b2b5effc6351 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Sat, 7 Aug 2021 23:47:04 -0400 Subject: [PATCH 23/31] Remove commented line --- scripts/buildAdmin.js | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/buildAdmin.js b/scripts/buildAdmin.js index 6c8033b39..1157a063b 100644 --- a/scripts/buildAdmin.js +++ b/scripts/buildAdmin.js @@ -18,7 +18,6 @@ const build = async ({ bundle, render, ssr })=>{ await fs.outputFile('./build/admin/bundle.css', css); await fs.outputFile('./build/admin/bundle.js', bundle); await fs.outputFile('./build/admin/ssr.js', ssr); - //await fs.outputFile('./build/admin/render.js', render); }; fs.emptyDirSync('./build/admin'); From 37d11ec303d440db7f62de66f74f51a24f8d1fe7 Mon Sep 17 00:00:00 2001 From: Gazook89 <58999374+Gazook89@users.noreply.github.com> Date: Sat, 7 Aug 2021 22:49:51 -0500 Subject: [PATCH 24/31] Add spaces to satisfy circleCI --- shared/naturalcrit/codeEditor/codeEditor.jsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/shared/naturalcrit/codeEditor/codeEditor.jsx b/shared/naturalcrit/codeEditor/codeEditor.jsx index 6de06cf81..7af4c12b4 100644 --- a/shared/naturalcrit/codeEditor/codeEditor.jsx +++ b/shared/naturalcrit/codeEditor/codeEditor.jsx @@ -47,12 +47,12 @@ const CodeEditor = createClass({ indentWithTabs : true, tabSize : 2, extraKeys : { - 'Ctrl-B' : this.makeBold, - 'Cmd-B' : this.makeBold, - 'Ctrl-I' : this.makeItalic, - 'Cmd-I' : this.makeItalic, - 'Ctrl-M' : this.makeSpan, - 'Cmd-M' : this.makeSpan, + 'Ctrl-B' : this.makeBold, + 'Cmd-B' : this.makeBold, + 'Ctrl-I' : this.makeItalic, + 'Cmd-I' : this.makeItalic, + 'Ctrl-M' : this.makeSpan, + 'Cmd-M' : this.makeSpan, 'Ctrl-B' : this.makeBold, 'Cmd-B' : this.makeBold, 'Ctrl-I' : this.makeItalic, From e2280dca3937d463d2143731ddbf6cd61f926b0b Mon Sep 17 00:00:00 2001 From: Gazook89 <58999374+Gazook89@users.noreply.github.com> Date: Sat, 7 Aug 2021 23:01:29 -0500 Subject: [PATCH 25/31] Make Minor Tweaks to v3 Style Resubmission of #1497 due to deletion of old repo. --- themes/5ePhb.style.less | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/themes/5ePhb.style.less b/themes/5ePhb.style.less index 997f12377..a5f754d75 100644 --- a/themes/5ePhb.style.less +++ b/themes/5ePhb.style.less @@ -411,12 +411,17 @@ body { // * CODE BLOCKS // ************************************/ code{ - font-family: "Courier New", Courier, monospace; - font-size: 0.325; - padding: 2px 4px; - color: #58180d; - background-color: #faf7ea; - border-radius: 4px; + font-family : "Courier New", Courier, monospace; + font-size : 0.325; + padding : 0px 4px; + color : #58180d; + background-color : #faf7ea; + border-radius : 4px; + white-space : pre-wrap + } + + pre{ + margin-bottom : 10px; } pre code{ @@ -538,6 +543,8 @@ body { h1 { text-align : center; margin-bottom : 0.1cm; + + ul{ + margin-top : 20px; } a{ display : table; From 67759602410903ff5d712d08f3662f2cc7d1cff9 Mon Sep 17 00:00:00 2001 From: "G.Ambatte" Date: Mon, 9 Aug 2021 13:26:10 +1200 Subject: [PATCH 26/31] Hide Private brew `
` if UserPage is not for logged in User --- client/homebrew/pages/userPage/userPage.jsx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx index 28e0a17c9..f5e787a1d 100644 --- a/client/homebrew/pages/userPage/userPage.jsx +++ b/client/homebrew/pages/userPage/userPage.jsx @@ -145,10 +145,12 @@ const UserPage = createClass({

{this.getUsernameWithS()} brews

{this.renderBrews(brews.published)}
-
-

{this.getUsernameWithS()} unpublished brews

- {this.renderBrews(brews.private)} -
+ {this.props?.username == global.account?.username && +
+

{this.getUsernameWithS()} unpublished brews

+ {this.renderBrews(brews.private)} +
+ }
; From 86184f85954598e403afd3c4218dc56358ca3568 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Sun, 8 Aug 2021 22:13:23 -0400 Subject: [PATCH 27/31] Changed shortcut to CTRL + /, fixed icon --- .../editor/snippetbar/snippets/snippets.js | 6 ++-- .../snippetbar/snippetsLegacy/snippets.js | 8 ++--- shared/naturalcrit/codeEditor/codeEditor.jsx | 32 +++++++++---------- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/client/homebrew/editor/snippetbar/snippets/snippets.js b/client/homebrew/editor/snippetbar/snippets/snippets.js index 99226832d..b30a96e7c 100644 --- a/client/homebrew/editor/snippetbar/snippets/snippets.js +++ b/client/homebrew/editor/snippetbar/snippets/snippets.js @@ -115,10 +115,10 @@ module.exports = [ }, { name : 'Add Comment', - icon : 'fas fa-comment-code', /* might need to be fa-solid fa-comment-code --not sure, Gazook */ + icon : 'fas fa-code', /* might need to be fa-solid fa-comment-code --not sure, Gazook */ gen : dedent`\n - - \n` + + ` }, ] }, diff --git a/client/homebrew/editor/snippetbar/snippetsLegacy/snippets.js b/client/homebrew/editor/snippetbar/snippetsLegacy/snippets.js index 830e5d194..3ce871d91 100644 --- a/client/homebrew/editor/snippetbar/snippetsLegacy/snippets.js +++ b/client/homebrew/editor/snippetbar/snippetsLegacy/snippets.js @@ -102,11 +102,9 @@ module.exports = [ }, { name : 'Add Comment', - icon : 'fas fa-comment-code', /* might need to be fa-solid fa-comment-code --not sure, Gazook */ - gen : dedent`\n - - \n` - }, + icon : 'fas fa-code', + gen : `\n\n\n` + } ] }, diff --git a/shared/naturalcrit/codeEditor/codeEditor.jsx b/shared/naturalcrit/codeEditor/codeEditor.jsx index 7af4c12b4..bbfdbfa75 100644 --- a/shared/naturalcrit/codeEditor/codeEditor.jsx +++ b/shared/naturalcrit/codeEditor/codeEditor.jsx @@ -47,20 +47,20 @@ const CodeEditor = createClass({ indentWithTabs : true, tabSize : 2, extraKeys : { - 'Ctrl-B' : this.makeBold, - 'Cmd-B' : this.makeBold, - 'Ctrl-I' : this.makeItalic, - 'Cmd-I' : this.makeItalic, - 'Ctrl-M' : this.makeSpan, - 'Cmd-M' : this.makeSpan, - 'Ctrl-B' : this.makeBold, - 'Cmd-B' : this.makeBold, - 'Ctrl-I' : this.makeItalic, - 'Cmd-I' : this.makeItalic, - 'Ctrl-M' : this.makeSpan, - 'Cmd-M' : this.makeSpan, - 'Ctrl-\\' : this.makeComment, - 'Cmd-\\' : this.makeComment, + 'Ctrl-B' : this.makeBold, + 'Cmd-B' : this.makeBold, + 'Ctrl-I' : this.makeItalic, + 'Cmd-I' : this.makeItalic, + 'Ctrl-M' : this.makeSpan, + 'Cmd-M' : this.makeSpan, + 'Ctrl-B' : this.makeBold, + 'Cmd-B' : this.makeBold, + 'Ctrl-I' : this.makeItalic, + 'Cmd-I' : this.makeItalic, + 'Ctrl-M' : this.makeSpan, + 'Cmd-M' : this.makeSpan, + 'Ctrl-/' : this.makeComment, + 'Cmd-/' : this.makeComment, } }); @@ -98,10 +98,10 @@ const CodeEditor = createClass({ makeComment : function() { const selection = this.codeMirror.getSelection(), t = selection.slice(0, 4) === ''; - this.codeMirror.replaceSelection(t ? selection.slice(4, -3) : ``, 'around'); + this.codeMirror.replaceSelection(t ? selection.slice(4, -3) : ``, 'around'); if(selection.length === 0){ const cursor = this.codeMirror.getCursor(); - this.codeMirror.setCursor({ line: cursor.line, ch: cursor.ch - 3 }); + this.codeMirror.setCursor({ line: cursor.line, ch: cursor.ch - 4 }); } }, From bddc670eeac19ebbc64ee1de6eefde23675edb08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Aug 2021 03:00:38 +0000 Subject: [PATCH 28/31] Bump googleapis from 83.0.0 to 84.0.0 Bumps [googleapis](https://github.com/googleapis/google-api-nodejs-client) from 83.0.0 to 84.0.0. - [Release notes](https://github.com/googleapis/google-api-nodejs-client/releases) - [Changelog](https://github.com/googleapis/google-api-nodejs-client/blob/master/CHANGELOG.md) - [Commits](https://github.com/googleapis/google-api-nodejs-client/compare/googleapis-v83.0.0...googleapis-v84.0.0) --- updated-dependencies: - dependency-name: googleapis dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index f499feeeb..8a6acf7e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "express-async-handler": "^1.1.4", "express-static-gzip": "2.1.1", "fs-extra": "10.0.0", - "googleapis": "83.0.0", + "googleapis": "84.0.0", "jwt-simple": "^0.5.6", "less": "^3.13.1", "lodash": "^4.17.21", @@ -4781,9 +4781,9 @@ } }, "node_modules/googleapis": { - "version": "83.0.0", - "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-83.0.0.tgz", - "integrity": "sha512-/xzWnSPfZC6jwoq4bY8gMauGHF2kIbWZJ6bPgMUzI4zUGAhGD7YttHtbZX6Vz/eYIviYaQtL7HIvw5Jnei/TzA==", + "version": "84.0.0", + "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-84.0.0.tgz", + "integrity": "sha512-5WWLwmraulw3p55lu0gNpLz2FME1gcuR7QxgmUdAVHMiVN4LEasYjJV9p36gxcf2TMe6bn6+PgQ/63+CvBEgoQ==", "dependencies": { "google-auth-library": "^7.0.2", "googleapis-common": "^5.0.2" @@ -13167,9 +13167,9 @@ } }, "googleapis": { - "version": "83.0.0", - "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-83.0.0.tgz", - "integrity": "sha512-/xzWnSPfZC6jwoq4bY8gMauGHF2kIbWZJ6bPgMUzI4zUGAhGD7YttHtbZX6Vz/eYIviYaQtL7HIvw5Jnei/TzA==", + "version": "84.0.0", + "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-84.0.0.tgz", + "integrity": "sha512-5WWLwmraulw3p55lu0gNpLz2FME1gcuR7QxgmUdAVHMiVN4LEasYjJV9p36gxcf2TMe6bn6+PgQ/63+CvBEgoQ==", "requires": { "google-auth-library": "^7.0.2", "googleapis-common": "^5.0.2" diff --git a/package.json b/package.json index 2899d322e..db13743bd 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "express-async-handler": "^1.1.4", "express-static-gzip": "2.1.1", "fs-extra": "10.0.0", - "googleapis": "83.0.0", + "googleapis": "84.0.0", "jwt-simple": "^0.5.6", "less": "^3.13.1", "lodash": "^4.17.21", From 175b2f8664d8f45a3b17f27d5e4cdceac9d08cd9 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Mon, 9 Aug 2021 00:31:08 -0400 Subject: [PATCH 29/31] Further tweaking, use cm instead of px, top-margin when possible --- themes/5ePhb.style.less | 52 ++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/themes/5ePhb.style.less b/themes/5ePhb.style.less index a5f754d75..6dd65506a 100644 --- a/themes/5ePhb.style.less +++ b/themes/5ePhb.style.less @@ -355,9 +355,6 @@ body { .useColumns(0.96); } - hr+hr+blockquote{ - .useColumns(0.96); - } //***************************** // * FOOTER // *****************************/ @@ -411,17 +408,13 @@ body { // * CODE BLOCKS // ************************************/ code{ - font-family : "Courier New", Courier, monospace; - font-size : 0.325; - padding : 0px 4px; - color : #58180d; - background-color : #faf7ea; - border-radius : 4px; - white-space : pre-wrap - } - - pre{ - margin-bottom : 10px; + font-family : "Courier New", Courier, monospace; + font-size : 0.325; + padding : 0px 4px; + color : #58180d; + background-color : #faf7ea; + border-radius : 4px; + white-space : pre-wrap } pre code{ @@ -432,6 +425,9 @@ body { border-image-width : 10px; border-image-outset : 2px; border-radius : 12px; + & + * { + margin-top : 1em; + } } //***************************** // * EXTRAS @@ -542,9 +538,7 @@ body { break-inside : avoid; h1 { text-align : center; - margin-bottom : 0.1cm; - + ul{ - margin-top : 20px; + margin-bottom : 0cm; } a{ display : table; @@ -555,7 +549,13 @@ body { } } h4 { - margin-top : 0.1cm; + margin-top : 0.14cm; + & + ul li { + line-height: 1.2em; + } + } + & > ul { + margin-top: 0.52cm; } ul{ padding-left : 0; @@ -575,22 +575,22 @@ body { &::after { content : ""; position : absolute; - bottom : 0.08cm; /* Set as you want */ + bottom : 0.08cm; margin-left : 0.06cm; /* Spacing before dot leaders */ width : 100%; border-bottom : 0.05cm dotted #000; } } &:last-child { - font-family : BookInsanityRemake; - font-size : 0.34cm; - font-weight : normal; - color : black; + font-family : BookInsanityRemake; + font-size : 0.34cm; + font-weight : normal; + color : black; text-align : right; - vertical-align : bottom; /* Keep Price text bottom-aligned */ + vertical-align : bottom; /* Keep page number bottom-aligned */ width : 1%; - padding-left : 0.06cm; /* Spacing after dot leaders */ - /*white-space: nowrap; /* Uncomment if needed */ + padding-left : 0.06cm; /* Spacing after dot leaders */ + /*white-space : nowrap; /* Uncomment if needed */ } } ul { /*List indent*/ From 9ca8afb3baf2ac3cca3dbc997482815f35528b21 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Mon, 9 Aug 2021 00:40:25 -0400 Subject: [PATCH 30/31] optional chaining not needed on props --- client/homebrew/pages/userPage/userPage.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx index f5e787a1d..a3acab7f7 100644 --- a/client/homebrew/pages/userPage/userPage.jsx +++ b/client/homebrew/pages/userPage/userPage.jsx @@ -142,10 +142,10 @@ const UserPage = createClass({
{this.renderSortOptions()}
-

{this.getUsernameWithS()} brews

+

{this.getUsernameWithS()} published brews

{this.renderBrews(brews.published)}
- {this.props?.username == global.account?.username && + {this.props.username == global.account?.username &&

{this.getUsernameWithS()} unpublished brews

{this.renderBrews(brews.private)} From 621d34954ad01dddd9461046a645b8ebaaf3efaf Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Mon, 9 Aug 2021 00:52:49 -0400 Subject: [PATCH 31/31] Allow paragraphs to break across columns --- themes/5ePhb.style.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/5ePhb.style.less b/themes/5ePhb.style.less index 997f12377..049267600 100644 --- a/themes/5ePhb.style.less +++ b/themes/5ePhb.style.less @@ -450,7 +450,7 @@ body { break-before : column; } //Avoid breaking up - p,blockquote,table{ + blockquote,table{ z-index : 15; -webkit-column-break-inside : avoid; page-break-inside : avoid;