From 051fbfcebdb59c3caf2043945c22c7e58d755665 Mon Sep 17 00:00:00 2001 From: Aiden Foxx Date: Sat, 12 Jun 2021 19:18:35 +0200 Subject: [PATCH 01/41] Fixed migrations for fresh Oracle install (#6228) --- .../database/migrations/20201105B-change-webhook-url-type.ts | 4 +++- .../migrations/20210312A-webhooks-collections-text.ts | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/api/src/database/migrations/20201105B-change-webhook-url-type.ts b/api/src/database/migrations/20201105B-change-webhook-url-type.ts index d1ad118cc5..3107d4d9dd 100644 --- a/api/src/database/migrations/20201105B-change-webhook-url-type.ts +++ b/api/src/database/migrations/20201105B-change-webhook-url-type.ts @@ -1,4 +1,6 @@ import { Knex } from 'knex'; +// @ts-ignore +import Client_Oracledb from 'knex/lib/dialects/oracledb'; import env from '../../env'; async function oracleAlterUrl(knex: Knex, type: string): Promise { @@ -10,7 +12,7 @@ async function oracleAlterUrl(knex: Knex, type: string): Promise { } export async function up(knex: Knex): Promise { - if (env.DB_CLIENT === 'oracledb') { + if (knex.client instanceof Client_Oracledb) { await oracleAlterUrl(knex, 'CLOB'); return; } diff --git a/api/src/database/migrations/20210312A-webhooks-collections-text.ts b/api/src/database/migrations/20210312A-webhooks-collections-text.ts index 09cd50b5c1..489e0253f5 100644 --- a/api/src/database/migrations/20210312A-webhooks-collections-text.ts +++ b/api/src/database/migrations/20210312A-webhooks-collections-text.ts @@ -1,4 +1,6 @@ import { Knex } from 'knex'; +// @ts-ignore +import Client_Oracledb from 'knex/lib/dialects/oracledb'; import env from '../../env'; async function oracleAlterCollections(knex: Knex, type: string): Promise { @@ -10,7 +12,7 @@ async function oracleAlterCollections(knex: Knex, type: string): Promise { } export async function up(knex: Knex): Promise { - if (env.DB_CLIENT === 'oracledb') { + if (knex.client instanceof Client_Oracledb) { await oracleAlterCollections(knex, 'CLOB'); return; } From 28847faee67aba9e3c5c10a202a6198f8d80c8c3 Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Mon, 14 Jun 2021 09:56:42 -0400 Subject: [PATCH 02/41] Add missing return type --- api/src/utils/adjust-date.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/utils/adjust-date.ts b/api/src/utils/adjust-date.ts index e83301628a..ac7409ba51 100644 --- a/api/src/utils/adjust-date.ts +++ b/api/src/utils/adjust-date.ts @@ -24,7 +24,7 @@ import { clone } from 'lodash'; * * The conversion is lifted straight from `ms`. */ -export function adjustDate(date: Date, adjustment: string) { +export function adjustDate(date: Date, adjustment: string): Date { date = clone(date); const subtract = adjustment.startsWith('-'); From fdf53765d1c8be115e1ad9973332349480d2a7eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Jun 2021 09:57:04 -0400 Subject: [PATCH 03/41] Bump eslint-plugin-vue from 7.11.0 to 7.11.1 (#6238) Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 7.11.0 to 7.11.1. - [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases) - [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v7.11.0...v7.11.1) --- updated-dependencies: - dependency-name: eslint-plugin-vue dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 17 +++++++---------- package.json | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index bb2a8fc5bf..c396f9ef94 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "eslint-config-prettier": "^8.3.0", "eslint-plugin-prettier": "^3.4.0", "eslint-plugin-prettier-vue": "^3.1.0", - "eslint-plugin-vue": "^7.11.0", + "eslint-plugin-vue": "^7.11.1", "globby": "^11.0.3", "jest": "^27.0.4", "knex": "^0.95.6", @@ -18414,9 +18414,9 @@ } }, "node_modules/eslint-plugin-vue": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.11.0.tgz", - "integrity": "sha512-Qwo8wilqnOXnG9B5auEiTstyaHefyhHd5lEhhxemwXoWsAxIW2yppzuVudowC5n+qn1nMLNV9TANkTthBK7Waw==", + "version": "7.11.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.11.1.tgz", + "integrity": "sha512-lbw3vkEAGqYjqd1HpPFWHXtYaS8mILTJ5KOpJfRxO3Fo7o0wCf1zD7vSOasbm6nTA9xIgvZQ4VcyGIzQXxznHw==", "dev": true, "dependencies": { "eslint-utils": "^2.1.0", @@ -64050,7 +64050,6 @@ "resolved": "https://registry.npmjs.org/@oclif/command/-/command-1.8.0.tgz", "integrity": "sha512-5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw==", "requires": { - "@oclif/config": "^1.15.1", "@oclif/errors": "^1.3.3", "@oclif/parser": "^3.8.3", "@oclif/plugin-help": "^3", @@ -65990,7 +65989,6 @@ "integrity": "sha512-pM7CR3yXB6L8Gfn6EmX7FLNE3+V/15I3o33GkSNsWvgsMp6HVGXKkXgojrcfUUauyL1LZOdvTmu4enU2RePGHw==", "dev": true, "requires": { - "@babel/core": "^7.11.0", "@babel/helper-compilation-targets": "^7.9.6", "@babel/helper-module-imports": "^7.8.3", "@babel/plugin-proposal-class-properties": "^7.8.3", @@ -66003,7 +66001,6 @@ "@vue/babel-plugin-jsx": "^1.0.3", "@vue/babel-preset-jsx": "^1.2.4", "babel-plugin-dynamic-import-node": "^2.3.3", - "core-js": "^3.6.5", "core-js-compat": "^3.6.5", "semver": "^6.1.0" }, @@ -74305,9 +74302,9 @@ "requires": {} }, "eslint-plugin-vue": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.11.0.tgz", - "integrity": "sha512-Qwo8wilqnOXnG9B5auEiTstyaHefyhHd5lEhhxemwXoWsAxIW2yppzuVudowC5n+qn1nMLNV9TANkTthBK7Waw==", + "version": "7.11.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.11.1.tgz", + "integrity": "sha512-lbw3vkEAGqYjqd1HpPFWHXtYaS8mILTJ5KOpJfRxO3Fo7o0wCf1zD7vSOasbm6nTA9xIgvZQ4VcyGIzQXxznHw==", "dev": true, "requires": { "eslint-utils": "^2.1.0", diff --git a/package.json b/package.json index b1ed5fe858..00ddba9f2d 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "eslint-config-prettier": "^8.3.0", "eslint-plugin-prettier": "^3.4.0", "eslint-plugin-prettier-vue": "^3.1.0", - "eslint-plugin-vue": "^7.11.0", + "eslint-plugin-vue": "^7.11.1", "globby": "^11.0.3", "jest": "^27.0.4", "knex": "^0.95.6", From a3e187e705088bd7a51e73ec963d97e13f0e8857 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Jun 2021 09:57:48 -0400 Subject: [PATCH 04/41] Bump npm-watch from 0.9.0 to 0.10.0 (#6239) Bumps [npm-watch](https://github.com/M-Zuber/npm-watch) from 0.9.0 to 0.10.0. - [Release notes](https://github.com/M-Zuber/npm-watch/releases) - [Commits](https://github.com/M-Zuber/npm-watch/compare/v0.9.0...v0.10.0) --- updated-dependencies: - dependency-name: npm-watch dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/package.json | 2 +- package-lock.json | 148 +++++++++++++++-------------------- packages/schema/package.json | 2 +- packages/specs/package.json | 2 +- 4 files changed, 67 insertions(+), 87 deletions(-) diff --git a/docs/package.json b/docs/package.json index 4c5e31c77e..ab13b37f50 100644 --- a/docs/package.json +++ b/docs/package.json @@ -34,7 +34,7 @@ "fs-extra": "^10.0.0", "lodash.get": "^4.4.2", "micromark": "^2.10.1", - "npm-watch": "^0.9.0", + "npm-watch": "^0.10.0", "slugify": "^1.5.3", "vuepress": "^1.7.1", "vuepress-plugin-clean-urls": "^1.1.2" diff --git a/package-lock.json b/package-lock.json index c396f9ef94..6ab495eb37 100644 --- a/package-lock.json +++ b/package-lock.json @@ -518,7 +518,7 @@ "fs-extra": "^10.0.0", "lodash.get": "^4.4.2", "micromark": "^2.10.1", - "npm-watch": "^0.9.0", + "npm-watch": "^0.10.0", "slugify": "^1.5.3", "vuepress": "^1.7.1", "vuepress-plugin-clean-urls": "^1.1.2" @@ -11699,7 +11699,7 @@ "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "dev": true, + "devOptional": true, "dependencies": { "safer-buffer": "~2.1.0" } @@ -11733,7 +11733,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true, + "devOptional": true, "engines": { "node": ">=0.8" } @@ -11998,7 +11998,7 @@ "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true, + "devOptional": true, "engines": { "node": "*" } @@ -12007,7 +12007,7 @@ "version": "1.11.0", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", - "dev": true + "devOptional": true }, "node_modules/axe-core": { "version": "4.2.2", @@ -12611,7 +12611,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dev": true, + "devOptional": true, "dependencies": { "tweetnacl": "^0.14.3" } @@ -12733,7 +12733,6 @@ "version": "0.0.9", "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", - "dev": true, "optional": true, "dependencies": { "inherits": "~2.0.0" @@ -13621,7 +13620,7 @@ "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true + "devOptional": true }, "node_modules/ccount": { "version": "1.1.0", @@ -16261,7 +16260,7 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, + "devOptional": true, "dependencies": { "assert-plus": "^1.0.0" }, @@ -17334,7 +17333,7 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "dev": true, + "devOptional": true, "dependencies": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" @@ -19567,7 +19566,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true, + "devOptional": true, "engines": [ "node >=0.6.0" ] @@ -20071,7 +20070,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true, + "devOptional": true, "engines": { "node": "*" } @@ -20558,7 +20557,6 @@ "version": "1.0.12", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", - "dev": true, "optional": true, "dependencies": { "graceful-fs": "^4.1.2", @@ -20574,7 +20572,6 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, "optional": true, "dependencies": { "glob": "^7.1.3" @@ -23902,7 +23899,7 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, + "devOptional": true, "dependencies": { "assert-plus": "^1.0.0" } @@ -25073,7 +25070,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true, + "devOptional": true, "engines": { "node": ">=4" } @@ -25083,7 +25080,7 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", "deprecated": "this library is no longer supported", - "dev": true, + "devOptional": true, "dependencies": { "ajv": "^6.12.3", "har-schema": "^2.0.0" @@ -25744,7 +25741,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, + "devOptional": true, "dependencies": { "assert-plus": "^1.0.0", "jsprim": "^1.2.2", @@ -27098,7 +27095,7 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true + "devOptional": true }, "node_modules/istanbul-lib-coverage": { "version": "3.0.0", @@ -29400,7 +29397,7 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true + "devOptional": true }, "node_modules/jsdom": { "version": "16.6.0", @@ -29541,7 +29538,7 @@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true + "devOptional": true }, "node_modules/json-schema-traverse": { "version": "0.4.1", @@ -29712,7 +29709,7 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, + "devOptional": true, "engines": [ "node >=0.6.0" ], @@ -29779,7 +29776,6 @@ "version": "7.7.0", "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz", "integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==", - "dev": true, "hasInstallScript": true, "optional": true, "dependencies": { @@ -34926,9 +34922,9 @@ } }, "node_modules/npm-watch": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/npm-watch/-/npm-watch-0.9.0.tgz", - "integrity": "sha512-C5Rgh5+jvY33K1EH8Qjr1hfpH9Nhasc90QJ0W+JyKg2ogE0LOCZI4xirC8QmywW7XinyBpynwxlrN6aPfjc3Hw==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/npm-watch/-/npm-watch-0.10.0.tgz", + "integrity": "sha512-Kiwh44/Yci2SfTRP99WKXsItdDvkQuU9ri99O8Cu4ywl7rniPP4ewP/kD5nZKUfyGilui+5DyFjYg3FyNcBYQw==", "dev": true, "dependencies": { "nodemon": "^2.0.7", @@ -36681,7 +36677,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true + "devOptional": true }, "node_modules/pg": { "version": "8.6.0", @@ -40360,7 +40356,7 @@ "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", - "dev": true, + "devOptional": true, "dependencies": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -40420,7 +40416,7 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, + "devOptional": true, "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -40434,7 +40430,7 @@ "version": "6.5.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "dev": true, + "devOptional": true, "engines": { "node": ">=0.6" } @@ -40443,7 +40439,7 @@ "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, + "devOptional": true, "dependencies": { "psl": "^1.1.28", "punycode": "^2.1.1" @@ -42264,7 +42260,6 @@ "version": "3.8.0", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", - "dev": true, "optional": true, "dependencies": { "fstream": "^1.0.0", @@ -42291,7 +42286,6 @@ "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "dev": true, "optional": true, "dependencies": { "abbrev": "1" @@ -42304,7 +42298,6 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, "optional": true, "dependencies": { "glob": "^7.1.3" @@ -42317,7 +42310,6 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", - "dev": true, "optional": true, "bin": { "semver": "bin/semver" @@ -42327,7 +42319,6 @@ "version": "2.2.2", "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", - "dev": true, "optional": true, "dependencies": { "block-stream": "*", @@ -42339,7 +42330,6 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, "optional": true, "dependencies": { "isexe": "^2.0.0" @@ -42387,7 +42377,7 @@ "version": "1.16.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "dev": true, + "devOptional": true, "dependencies": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -46333,7 +46323,7 @@ "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true + "devOptional": true }, "node_modules/type": { "version": "1.2.0", @@ -47337,7 +47327,7 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, + "devOptional": true, "engines": [ "node >=0.6.0" ], @@ -55188,7 +55178,7 @@ "lodash": "^4.17.21" }, "devDependencies": { - "npm-watch": "^0.9.0", + "npm-watch": "^0.10.0", "typescript": "^4.3.2" } }, @@ -55501,7 +55491,7 @@ "openapi3-ts": "^2.0.1" }, "devDependencies": { - "npm-watch": "^0.9.0", + "npm-watch": "^0.10.0", "swagger-cli": "^4.0.4", "swagger-ui-watcher": "^2.1.11" } @@ -57571,7 +57561,7 @@ "fs-extra": "^10.0.0", "lodash.get": "^4.4.2", "micromark": "^2.10.1", - "npm-watch": "^0.9.0", + "npm-watch": "^0.10.0", "slugify": "^1.5.3", "vuepress": "^1.7.1", "vuepress-plugin-clean-urls": "^1.1.2" @@ -60733,7 +60723,7 @@ "requires": { "knex-schema-inspector": "^1.3.0", "lodash": "^4.17.21", - "npm-watch": "^0.9.0", + "npm-watch": "^0.10.0", "typescript": "^4.3.2" } }, @@ -60995,7 +60985,7 @@ "@directus/specs": { "version": "file:packages/specs", "requires": { - "npm-watch": "^0.9.0", + "npm-watch": "^0.10.0", "openapi3-ts": "^2.0.1", "swagger-cli": "^4.0.4", "swagger-ui-watcher": "^2.1.11" @@ -68378,7 +68368,7 @@ "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "dev": true, + "devOptional": true, "requires": { "safer-buffer": "~2.1.0" } @@ -68429,7 +68419,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true + "devOptional": true }, "assign-symbols": { "version": "1.0.0", @@ -68643,13 +68633,13 @@ "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true + "devOptional": true }, "aws4": { "version": "1.11.0", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", - "dev": true + "devOptional": true }, "axe-core": { "version": "4.2.2", @@ -69110,7 +69100,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dev": true, + "devOptional": true, "requires": { "tweetnacl": "^0.14.3" } @@ -69213,7 +69203,6 @@ "version": "0.0.9", "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", - "dev": true, "optional": true, "requires": { "inherits": "~2.0.0" @@ -69931,7 +69920,7 @@ "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true + "devOptional": true }, "ccount": { "version": "1.1.0", @@ -72155,7 +72144,7 @@ "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, + "devOptional": true, "requires": { "assert-plus": "^1.0.0" } @@ -73327,7 +73316,7 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "dev": true, + "devOptional": true, "requires": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" @@ -75053,7 +75042,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true + "devOptional": true }, "fast-copy": { "version": "2.1.1", @@ -75460,7 +75449,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true + "devOptional": true }, "fork-ts-checker-webpack-plugin": { "version": "3.1.1", @@ -75847,7 +75836,6 @@ "version": "1.0.12", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", - "dev": true, "optional": true, "requires": { "graceful-fs": "^4.1.2", @@ -75860,7 +75848,6 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, "optional": true, "requires": { "glob": "^7.1.3" @@ -78433,7 +78420,7 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, + "devOptional": true, "requires": { "assert-plus": "^1.0.0" } @@ -79333,13 +79320,13 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true + "devOptional": true }, "har-validator": { "version": "5.1.5", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "dev": true, + "devOptional": true, "requires": { "ajv": "^6.12.3", "har-schema": "^2.0.0" @@ -79870,7 +79857,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, + "devOptional": true, "requires": { "assert-plus": "^1.0.0", "jsprim": "^1.2.2", @@ -80838,7 +80825,7 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true + "devOptional": true }, "istanbul-lib-coverage": { "version": "3.0.0", @@ -82586,7 +82573,7 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true + "devOptional": true }, "jsdom": { "version": "16.6.0", @@ -82699,7 +82686,7 @@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true + "devOptional": true }, "json-schema-traverse": { "version": "0.4.1", @@ -82833,7 +82820,7 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, + "devOptional": true, "requires": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", @@ -82891,7 +82878,6 @@ "version": "7.7.0", "resolved": "https://registry.npmjs.org/keytar/-/keytar-7.7.0.tgz", "integrity": "sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==", - "dev": true, "optional": true, "requires": { "node-addon-api": "^3.0.0", @@ -87034,9 +87020,9 @@ } }, "npm-watch": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/npm-watch/-/npm-watch-0.9.0.tgz", - "integrity": "sha512-C5Rgh5+jvY33K1EH8Qjr1hfpH9Nhasc90QJ0W+JyKg2ogE0LOCZI4xirC8QmywW7XinyBpynwxlrN6aPfjc3Hw==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/npm-watch/-/npm-watch-0.10.0.tgz", + "integrity": "sha512-Kiwh44/Yci2SfTRP99WKXsItdDvkQuU9ri99O8Cu4ywl7rniPP4ewP/kD5nZKUfyGilui+5DyFjYg3FyNcBYQw==", "dev": true, "requires": { "nodemon": "^2.0.7", @@ -88416,7 +88402,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true + "devOptional": true }, "pg": { "version": "8.6.0", @@ -91410,7 +91396,7 @@ "version": "2.88.2", "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "dev": true, + "devOptional": true, "requires": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -91438,7 +91424,7 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, + "devOptional": true, "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -91449,13 +91435,13 @@ "version": "6.5.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "dev": true + "devOptional": true }, "tough-cookie": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, + "devOptional": true, "requires": { "psl": "^1.1.28", "punycode": "^2.1.1" @@ -92960,7 +92946,6 @@ "version": "3.8.0", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", - "dev": true, "optional": true, "requires": { "fstream": "^1.0.0", @@ -92981,7 +92966,6 @@ "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "dev": true, "optional": true, "requires": { "abbrev": "1" @@ -92991,7 +92975,6 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, "optional": true, "requires": { "glob": "^7.1.3" @@ -93001,14 +92984,12 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", - "dev": true, "optional": true }, "tar": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", - "dev": true, "optional": true, "requires": { "block-stream": "*", @@ -93020,7 +93001,6 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, "optional": true, "requires": { "isexe": "^2.0.0" @@ -93058,7 +93038,7 @@ "version": "1.16.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "dev": true, + "devOptional": true, "requires": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -96158,7 +96138,7 @@ "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true + "devOptional": true }, "type": { "version": "1.2.0", @@ -96951,7 +96931,7 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, + "devOptional": true, "requires": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", diff --git a/packages/schema/package.json b/packages/schema/package.json index 64e71947fb..defb9883da 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -39,7 +39,7 @@ }, "homepage": "https://github.com/directus/directus#readme", "devDependencies": { - "npm-watch": "^0.9.0", + "npm-watch": "^0.10.0", "typescript": "^4.3.2" }, "dependencies": { diff --git a/packages/specs/package.json b/packages/specs/package.json index eb115bd4f9..6e4bfa723b 100644 --- a/packages/specs/package.json +++ b/packages/specs/package.json @@ -40,7 +40,7 @@ ], "gitHead": "24621f3934dc77eb23441331040ed13c676ceffd", "devDependencies": { - "npm-watch": "^0.9.0", + "npm-watch": "^0.10.0", "swagger-cli": "^4.0.4", "swagger-ui-watcher": "^2.1.11" }, From 43426b60f314ba221da4b216c3de850dbc663014 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Jun 2021 09:59:02 -0400 Subject: [PATCH 05/41] Bump aws-sdk from 2.926.0 to 2.927.0 (#6237) Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.926.0 to 2.927.0. - [Release notes](https://github.com/aws/aws-sdk-js/releases) - [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js/compare/v2.926.0...v2.927.0) --- updated-dependencies: - dependency-name: aws-sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 16 ++++++++-------- packages/drive-s3/package.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6ab495eb37..0f139ead2b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11902,9 +11902,9 @@ } }, "node_modules/aws-sdk": { - "version": "2.926.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.926.0.tgz", - "integrity": "sha512-GFdAznnwxBxRPUTLP8gyFG8GhbUQ0sWwNCocYHkS/FB18hr8gmB3xv2m7VVWA/YkPDXvviPnoB680Z47VSEkqA==", + "version": "2.927.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.927.0.tgz", + "integrity": "sha512-S1dbpq26bQNYBQPHAsZBt0/L/e0FAWFdjjQoU3zdaVIXa08eA9d/oRI3kEs568ErJgBjwWU1CUUlr1byBxKjUQ==", "hasInstallScript": true, "dependencies": { "buffer": "4.9.2", @@ -51086,7 +51086,7 @@ "license": "MIT", "dependencies": { "@directus/drive": "9.0.0-rc.75", - "aws-sdk": "^2.926.0", + "aws-sdk": "^2.927.0", "normalize-path": "^3.0.0" }, "devDependencies": { @@ -57731,7 +57731,7 @@ "@types/jest": "^26.0.22", "@types/node": "^15.12.0", "@types/normalize-path": "^3.0.0", - "aws-sdk": "^2.926.0", + "aws-sdk": "^2.927.0", "dotenv": "^10.0.0", "fs-extra": "^10.0.0", "jest": "^27.0.4", @@ -68549,9 +68549,9 @@ } }, "aws-sdk": { - "version": "2.926.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.926.0.tgz", - "integrity": "sha512-GFdAznnwxBxRPUTLP8gyFG8GhbUQ0sWwNCocYHkS/FB18hr8gmB3xv2m7VVWA/YkPDXvviPnoB680Z47VSEkqA==", + "version": "2.927.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.927.0.tgz", + "integrity": "sha512-S1dbpq26bQNYBQPHAsZBt0/L/e0FAWFdjjQoU3zdaVIXa08eA9d/oRI3kEs568ErJgBjwWU1CUUlr1byBxKjUQ==", "requires": { "buffer": "4.9.2", "events": "1.1.1", diff --git a/packages/drive-s3/package.json b/packages/drive-s3/package.json index 3f1408da88..e89f27204a 100644 --- a/packages/drive-s3/package.json +++ b/packages/drive-s3/package.json @@ -35,7 +35,7 @@ }, "dependencies": { "@directus/drive": "9.0.0-rc.75", - "aws-sdk": "^2.926.0", + "aws-sdk": "^2.927.0", "normalize-path": "^3.0.0" }, "devDependencies": { From b0dfdc34a83c1db02781f88896a6354a4b82e2d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Jun 2021 10:05:41 -0400 Subject: [PATCH 06/41] Bump cropperjs from 1.5.11 to 1.5.12 (#6240) Bumps [cropperjs](https://github.com/fengyuanchen/cropperjs) from 1.5.11 to 1.5.12. - [Release notes](https://github.com/fengyuanchen/cropperjs/releases) - [Changelog](https://github.com/fengyuanchen/cropperjs/blob/master/CHANGELOG.md) - [Commits](https://github.com/fengyuanchen/cropperjs/compare/v1.5.11...v1.5.12) --- updated-dependencies: - dependency-name: cropperjs dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/package.json | 2 +- package-lock.json | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/package.json b/app/package.json index 60bc2ee700..6f120f74cf 100644 --- a/app/package.json +++ b/app/package.json @@ -62,7 +62,7 @@ "base-64": "^1.0.0", "codemirror": "^5.61.1", "copyfiles": "^2.4.1", - "cropperjs": "^1.5.11", + "cropperjs": "^1.5.12", "date-fns": "^2.21.1", "dompurify": "^2.2.9", "escape-string-regexp": "^5.0.0", diff --git a/package-lock.json b/package-lock.json index 0f139ead2b..94cae2c9f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -482,7 +482,7 @@ "base-64": "^1.0.0", "codemirror": "^5.61.1", "copyfiles": "^2.4.1", - "cropperjs": "^1.5.11", + "cropperjs": "^1.5.12", "date-fns": "^2.21.1", "dompurify": "^2.2.9", "escape-string-regexp": "^5.0.0", @@ -15760,9 +15760,9 @@ "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==" }, "node_modules/cropperjs": { - "version": "1.5.11", - "resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.5.11.tgz", - "integrity": "sha512-SJUeBBhtNBnnn+UrLKluhFRIXLJn7XFPv8QN1j49X5t+BIMwkgvDev541f96bmu8Xe0TgCx3gON22KmY/VddaA==", + "version": "1.5.12", + "resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.5.12.tgz", + "integrity": "sha512-re7UdjE5UnwdrovyhNzZ6gathI4Rs3KGCBSc8HCIjUo5hO42CtzyblmWLj6QWVw7huHyDMfpKxhiO2II77nhDw==", "dev": true }, "node_modules/cross-env": { @@ -57209,7 +57209,7 @@ "base-64": "^1.0.0", "codemirror": "^5.61.1", "copyfiles": "^2.4.1", - "cropperjs": "^1.5.11", + "cropperjs": "^1.5.12", "date-fns": "^2.21.1", "dompurify": "^2.2.9", "escape-string-regexp": "^5.0.0", @@ -71743,9 +71743,9 @@ "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==" }, "cropperjs": { - "version": "1.5.11", - "resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.5.11.tgz", - "integrity": "sha512-SJUeBBhtNBnnn+UrLKluhFRIXLJn7XFPv8QN1j49X5t+BIMwkgvDev541f96bmu8Xe0TgCx3gON22KmY/VddaA==", + "version": "1.5.12", + "resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.5.12.tgz", + "integrity": "sha512-re7UdjE5UnwdrovyhNzZ6gathI4Rs3KGCBSc8HCIjUo5hO42CtzyblmWLj6QWVw7huHyDMfpKxhiO2II77nhDw==", "dev": true }, "cross-env": { From 1d851221a31ef49d28e963ecf8acde01a7ad6abb Mon Sep 17 00:00:00 2001 From: Nicola Krumschmidt Date: Mon, 14 Jun 2021 16:07:06 +0200 Subject: [PATCH 07/41] Add missing return type to adjustDate() (#6253) Co-authored-by: Rijk van Zanten --- api/src/utils/adjust-date.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/utils/adjust-date.ts b/api/src/utils/adjust-date.ts index ac7409ba51..5d631cffdf 100644 --- a/api/src/utils/adjust-date.ts +++ b/api/src/utils/adjust-date.ts @@ -24,7 +24,7 @@ import { clone } from 'lodash'; * * The conversion is lifted straight from `ms`. */ -export function adjustDate(date: Date, adjustment: string): Date { +export function adjustDate(date: Date, adjustment: string): Date | undefined { date = clone(date); const subtract = adjustment.startsWith('-'); From 39198952bba8f5a983bef7b7f07ebc8a8229fff3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Jun 2021 10:11:55 -0400 Subject: [PATCH 08/41] Bump ioredis from 4.27.5 to 4.27.6 (#6241) Bumps [ioredis](https://github.com/luin/ioredis) from 4.27.5 to 4.27.6. - [Release notes](https://github.com/luin/ioredis/releases) - [Changelog](https://github.com/luin/ioredis/blob/master/Changelog.md) - [Commits](https://github.com/luin/ioredis/compare/v4.27.5...v4.27.6) --- updated-dependencies: - dependency-name: ioredis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- api/package.json | 2 +- package-lock.json | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/api/package.json b/api/package.json index 830098f2e7..a442d81b75 100644 --- a/api/package.json +++ b/api/package.json @@ -138,7 +138,7 @@ "connect-memcached": "^1.0.0", "connect-redis": "^6.0.0", "connect-session-knex": "^2.1.0", - "ioredis": "^4.27.2", + "ioredis": "^4.27.6", "keyv-memcache": "^1.2.5", "memcached": "^2.2.2", "mysql": "^2.18.1", diff --git a/package-lock.json b/package-lock.json index 94cae2c9f2..ee91958d99 100644 --- a/package-lock.json +++ b/package-lock.json @@ -165,7 +165,7 @@ "connect-memcached": "^1.0.0", "connect-redis": "^6.0.0", "connect-session-knex": "^2.1.0", - "ioredis": "^4.27.2", + "ioredis": "^4.27.6", "keyv-memcache": "^1.2.5", "memcached": "^2.2.2", "mysql": "^2.18.1", @@ -26208,9 +26208,9 @@ } }, "node_modules/ioredis": { - "version": "4.27.5", - "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.27.5.tgz", - "integrity": "sha512-JJ3HzOzU6kgUk3gKhpx8kxEYn9ruI5TkpOtGvbw/hLyWxfC19T9uCZTgmw4Mci4al4aOCCMfAjYzJ7aqQkLbJg==", + "version": "4.27.6", + "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.27.6.tgz", + "integrity": "sha512-6W3ZHMbpCa8ByMyC1LJGOi7P2WiOKP9B3resoZOVLDhi+6dDBOW+KNsRq3yI36Hmnb2sifCxHX+YSarTeXh48A==", "optional": true, "dependencies": { "cluster-key-slot": "^1.1.0", @@ -72815,7 +72815,7 @@ "graphql-compose": "^9.0.1", "icc": "^2.0.0", "inquirer": "^8.1.0", - "ioredis": "^4.27.2", + "ioredis": "^4.27.6", "joi": "^17.3.0", "js-yaml": "^4.1.0", "js2xmlparser": "^4.0.1", @@ -80213,9 +80213,9 @@ } }, "ioredis": { - "version": "4.27.5", - "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.27.5.tgz", - "integrity": "sha512-JJ3HzOzU6kgUk3gKhpx8kxEYn9ruI5TkpOtGvbw/hLyWxfC19T9uCZTgmw4Mci4al4aOCCMfAjYzJ7aqQkLbJg==", + "version": "4.27.6", + "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.27.6.tgz", + "integrity": "sha512-6W3ZHMbpCa8ByMyC1LJGOi7P2WiOKP9B3resoZOVLDhi+6dDBOW+KNsRq3yI36Hmnb2sifCxHX+YSarTeXh48A==", "optional": true, "requires": { "cluster-key-slot": "^1.1.0", From 2174d9e9710fb7a21c05236ca55b2b5eba68dc62 Mon Sep 17 00:00:00 2001 From: masterwendu Date: Mon, 14 Jun 2021 16:24:17 +0200 Subject: [PATCH 09/41] #6217 fix missing styling of tinymce (#6236) * #6217 fix missing styling of tinymce * #6217 remove unused css imports --- app/package.json | 2 +- .../input-rich-text-html/input-rich-text-html.vue | 9 ++++----- package-lock.json | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/package.json b/app/package.json index 6f120f74cf..c5f4bf7ad3 100644 --- a/app/package.json +++ b/app/package.json @@ -38,7 +38,7 @@ "@popperjs/core": "^2.9.2", "@rollup/plugin-yaml": "^3.0.0", "@sindresorhus/slugify": "^2.1.0", - "@tinymce/tinymce-vue": "^4.0.0", + "@tinymce/tinymce-vue": "^4.0.3", "@types/base-64": "^1.0.0", "@types/bytes": "^3.1.0", "@types/codemirror": "^5.60.0", diff --git a/app/src/interfaces/input-rich-text-html/input-rich-text-html.vue b/app/src/interfaces/input-rich-text-html/input-rich-text-html.vue index 1291329210..49425cc18a 100644 --- a/app/src/interfaces/input-rich-text-html/input-rich-text-html.vue +++ b/app/src/interfaces/input-rich-text-html/input-rich-text-html.vue @@ -6,7 +6,6 @@ :disabled="disabled" model-events="change keydown blur focus paste ExecCommand SetContent" v-model="internalValue" - @change="onChange" @onFocusIn="setFocus(true)" @onFocusOut="setFocus(false)" /> @@ -344,9 +343,6 @@ export default defineComponent({ closeCodeDrawer, saveCode, sourceCodeButton, - onChange(a: any) { - console.log(a); - }, }; function setup(editor: any) { @@ -374,9 +370,12 @@ export default defineComponent({ }); - + +