From e08ed8c461d907b1cc56b71308e76244416426a9 Mon Sep 17 00:00:00 2001 From: Paula Isabel <102936794+paulaxisabel@users.noreply.github.com> Date: Thu, 6 Oct 2022 14:40:47 +0800 Subject: [PATCH 01/22] Update Code Of Conduct --- CODE_OF_CONDUCT.md | 77 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 20 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index b07babdb2e..46b43452cf 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -2,45 +2,82 @@ ## Our Pledge -In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. +We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, caste, color, religion, or sexual identity and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community. ## Our Standards -Examples of behavior that contributes to creating a positive environment include: +Examples of behavior that contributes to a positive environment for our community include: -- Using welcoming and inclusive language -- Being respectful of differing viewpoints and experiences -- Gracefully accepting constructive criticism -- Focusing on what is best for the community -- Showing empathy towards other community members +- Demonstrating empathy and kindness toward other people +- Being respectful of differing opinions, viewpoints, and experiences +- Giving and gracefully accepting constructive feedback +- Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience +- Focusing on what is best not just for us as individuals, but for the overall community -Examples of unacceptable behavior by participants include: +Examples of unacceptable behavior include: -- The use of sexualized language or imagery and unwelcome sexual attention or advances -- Trolling, insulting/derogatory comments, and personal or political attacks +- The use of sexualized language or imagery, and sexual attention or advances of any kind +- Trolling, insulting or derogatory comments, and personal or political attacks - Public or private harassment -- Publishing others' private information, such as a physical or electronic address, without explicit permission +- Publishing others' private information, such as a physical or email address, without their explicit permission - Other conduct which could reasonably be considered inappropriate in a professional setting -## Our Responsibilities +## Enforcement Responsibilities -Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. +Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful. -Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. +Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate. ## Scope -This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. +This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. ## Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at hi@strapi.io. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at hi@strapi.io. All complaints will be reviewed and investigated promptly and fairly. -Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. +All community leaders are obligated to respect the privacy and security of the reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series of actions. + +**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within the community. ## Attribution -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4][version] +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.1, available at [https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1]. -[homepage]: https://contributor-covenant.org -[version]: https://contributor-covenant.org/version/1/4/ +Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder][Mozilla CoC]. + +For answers to common questions about this code of conduct, see the FAQ at [https://www.contributor-covenant.org/faq][FAQ]. Translations are available at [https://www.contributor-covenant.org/translations][translations]. + +[homepage]: https://www.contributor-covenant.org +[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html +[Mozilla CoC]: https://github.com/mozilla/diversity +[FAQ]: https://www.contributor-covenant.org/faq +[translations]: https://www.contributor-covenant.org/translations From 04ba1b670ca077408eed14eccb0f7aa81cf11d83 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 09:11:49 +0000 Subject: [PATCH 02/22] chore(deps): bump pg from 8.6.0 to 8.8.0 Bumps [pg](https://github.com/brianc/node-postgres/tree/HEAD/packages/pg) from 8.6.0 to 8.8.0. - [Release notes](https://github.com/brianc/node-postgres/releases) - [Changelog](https://github.com/brianc/node-postgres/blob/master/CHANGELOG.md) - [Commits](https://github.com/brianc/node-postgres/commits/pg@8.8.0/packages/pg) --- updated-dependencies: - dependency-name: pg dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- examples/getstarted/package.json | 2 +- examples/kitchensink/package.json | 2 +- yarn.lock | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/getstarted/package.json b/examples/getstarted/package.json index 3aef7c50f7..53814dba12 100644 --- a/examples/getstarted/package.json +++ b/examples/getstarted/package.json @@ -27,7 +27,7 @@ "lodash": "4.17.21", "mysql": "2.18.1", "passport-google-oauth2": "0.2.0", - "pg": "8.6.0", + "pg": "8.8.0", "sqlite3": "5.1.2" }, "strapi": { diff --git a/examples/kitchensink/package.json b/examples/kitchensink/package.json index 8ba4b2f8b1..fd7038ac70 100644 --- a/examples/kitchensink/package.json +++ b/examples/kitchensink/package.json @@ -19,7 +19,7 @@ "lodash": "4.17.21", "mysql": "2.18.1", "passport-google-oauth2": "0.2.0", - "pg": "8.6.0", + "pg": "8.8.0", "sqlite3": "5.1.2" }, "strapi": { diff --git a/yarn.lock b/yarn.lock index 2a01561d17..038a607e02 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18333,10 +18333,10 @@ pg-int8@1.0.1: resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== -pg-pool@^3.3.0: - version "3.5.1" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.1.tgz#f499ce76f9bf5097488b3b83b19861f28e4ed905" - integrity sha512-6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ== +pg-pool@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.5.2.tgz#ed1bed1fb8d79f1c6fd5fb1c99e990fbf9ddf178" + integrity sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w== pg-protocol@^1.5.0: version "1.5.0" @@ -18354,15 +18354,15 @@ pg-types@^2.1.0: postgres-date "~1.0.4" postgres-interval "^1.1.0" -pg@8.6.0: - version "8.6.0" - resolved "https://registry.yarnpkg.com/pg/-/pg-8.6.0.tgz#e222296b0b079b280cce106ea991703335487db2" - integrity sha512-qNS9u61lqljTDFvmk/N66EeGq3n6Ujzj0FFyNMGQr6XuEv4tgNTXvJQTfJdcvGit5p5/DWPu+wj920hAJFI+QQ== +pg@8.8.0: + version "8.8.0" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.8.0.tgz#a77f41f9d9ede7009abfca54667c775a240da686" + integrity sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw== dependencies: buffer-writer "2.0.0" packet-reader "1.0.0" pg-connection-string "^2.5.0" - pg-pool "^3.3.0" + pg-pool "^3.5.2" pg-protocol "^1.5.0" pg-types "^2.1.0" pgpass "1.x" From 80ea7d835b7f73410b0dede831e697737c14a8b8 Mon Sep 17 00:00:00 2001 From: Gary Alway Date: Tue, 13 Dec 2022 19:30:55 +0000 Subject: [PATCH 03/22] adds run migrations setting --- packages/core/database/lib/index.js | 2 ++ packages/core/database/lib/migrations/index.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/core/database/lib/index.js b/packages/core/database/lib/index.js index 3e003fcbf7..300c3c8dee 100644 --- a/packages/core/database/lib/index.js +++ b/packages/core/database/lib/index.js @@ -20,6 +20,8 @@ class Database { connection: {}, settings: { forceMigration: true, + runMigrations: true, + ...config.settings, }, ...config, }; diff --git a/packages/core/database/lib/migrations/index.js b/packages/core/database/lib/migrations/index.js index 6745bdc724..5b2baea4a8 100644 --- a/packages/core/database/lib/migrations/index.js +++ b/packages/core/database/lib/migrations/index.js @@ -61,7 +61,7 @@ const createMigrationsProvider = (db) => { async shouldRun() { const pending = await migrations.pending(); - return pending.length > 0; + return pending.length > 0 && db.settings.runMigrations; }, async up() { await migrations.up(); From 392995837c8329801c485b3630663ea9d1405a70 Mon Sep 17 00:00:00 2001 From: derrickmehaffy Date: Wed, 14 Dec 2022 14:47:38 -0700 Subject: [PATCH 04/22] Update for v3 EOL --- README.md | 10 +++++++--- SECURITY.md | 8 +++++--- packages/core/strapi/README.md | 12 ++++++++---- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 2457a19e4c..1fd87e6783 100644 --- a/README.md +++ b/README.md @@ -86,8 +86,12 @@ Complete installation requirements can be found in the documentation under = 14 <= 18 -- NPM >= 6.x +Strapi only supports maintenance and LTS versions of Node.js. Please refer to the Node.js release schedule for more information. NPM versions installed by default with Node.js are supported. Generally it's recommended to use yarn over npm where possible. + +| Strapi Version | Recommended | Minimum | +| -------------- | ----------- | ------- | +| 4.3.9 and up | 18.x | 16.x | +| 4.0.x to 4.3.8 | 16.x | 16.x | **Database:** @@ -98,7 +102,7 @@ Complete installation requirements can be found in the documentation under = 14 <= 18 -- NPM >= 6.x +Strapi only supports maintenance and LTS versions of Node.js. Please refer to the Node.js release schedule for more information. NPM versions installed by default with Node.js are supported. Generally it's recommended to use yarn over npm where possible. + +| Strapi Version | Recommended | Minimum | +| -------------- | ----------- | ------- | +| 4.3.9 and up | 18.x | 16.x | +| 4.0.x to 4.3.8 | 16.x | 16.x | **Database:** @@ -98,7 +102,7 @@ Complete installation requirements can be found in the documentation under Date: Fri, 16 Dec 2022 10:02:31 -0700 Subject: [PATCH 05/22] PR feedback and update workflow response --- .github/workflows/issues_handleLabel.yml | 4 ++-- README.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/issues_handleLabel.yml b/.github/workflows/issues_handleLabel.yml index 84363cbdae..5d6db803c2 100644 --- a/.github/workflows/issues_handleLabel.yml +++ b/.github/workflows/issues_handleLabel.yml @@ -61,7 +61,7 @@ jobs: Hello @${{ github.event.issue.user.login }}, - Thank you for reporting this potential bug report, please keep in mind that we are no longer accepting bug reports unless they could be deemed high or critical severity or related to security in nature. + Thank you for reporting this potential bug report, please keep in mind that we are no longer accepting bug reports for Strapi v3. The recommended action we suggest for v3 users is to utilize the various migration resources to upgrade your package from Strapi v3 to Strapi v4: - [Code Migration Guide](https://docs.strapi.io/developer-docs/latest/update-migration-guides/migration-guides/v4/code-migration.html) and/or [Codemods project](https://github.com/strapi/codemods) @@ -69,7 +69,7 @@ jobs: - [Plugin Migration Guide](https://docs.strapi.io/developer-docs/latest/update-migration-guides/migration-guides/v4/plugin-migration.html) Please see our [Security file](https://github.com/strapi/strapi/security) for more information about supported versions. - For now this issue is marked as closed as we do not believe this issue is Critical/High Severity nor related to security. + For now this issue is marked as closed. Thank You - name: 'Close: unsupported v3 issues' diff --git a/README.md b/README.md index 1fd87e6783..aa56d38f8d 100644 --- a/README.md +++ b/README.md @@ -90,8 +90,8 @@ Strapi only supports maintenance and LTS versions of Node.js. Please refer to th | Strapi Version | Recommended | Minimum | | -------------- | ----------- | ------- | -| 4.3.9 and up | 18.x | 16.x | -| 4.0.x to 4.3.8 | 16.x | 16.x | +| 4.3.9 and up | 18.x | 14.x | +| 4.0.x to 4.3.8 | 16.x | 14.x | **Database:** @@ -102,7 +102,7 @@ Strapi only supports maintenance and LTS versions of Node.js. Please refer to th | PostgreSQL | 11.0 | 14.0 | | SQLite | 3 | 3 | -**We recommend always using the latest version of Strapi GA to start your new projects**. +**We recommend always using the latest version of Strapi stable to start your new projects**. ## Features From e84bb5b94e5517f7af6c29a636d98635d50892e7 Mon Sep 17 00:00:00 2001 From: derrickmehaffy Date: Fri, 16 Dec 2022 10:03:13 -0700 Subject: [PATCH 06/22] copy readme --- packages/core/strapi/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/core/strapi/README.md b/packages/core/strapi/README.md index 1fd87e6783..aa56d38f8d 100644 --- a/packages/core/strapi/README.md +++ b/packages/core/strapi/README.md @@ -90,8 +90,8 @@ Strapi only supports maintenance and LTS versions of Node.js. Please refer to th | Strapi Version | Recommended | Minimum | | -------------- | ----------- | ------- | -| 4.3.9 and up | 18.x | 16.x | -| 4.0.x to 4.3.8 | 16.x | 16.x | +| 4.3.9 and up | 18.x | 14.x | +| 4.0.x to 4.3.8 | 16.x | 14.x | **Database:** @@ -102,7 +102,7 @@ Strapi only supports maintenance and LTS versions of Node.js. Please refer to th | PostgreSQL | 11.0 | 14.0 | | SQLite | 3 | 3 | -**We recommend always using the latest version of Strapi GA to start your new projects**. +**We recommend always using the latest version of Strapi stable to start your new projects**. ## Features From 40577a07f19bd5cf60f089e9f321fd672952997d Mon Sep 17 00:00:00 2001 From: derrickmehaffy Date: Fri, 16 Dec 2022 10:03:41 -0700 Subject: [PATCH 07/22] PR Feedback --- SECURITY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SECURITY.md b/SECURITY.md index e2b50dddd2..2d2c05ee1d 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -4,7 +4,7 @@ As of January 2023 (and until this document is updated), only the v4.x.x _GA_ releases of Strapi are supported for updates and bug fixes. Any previous versions are currently not supported and users are advised to use them "at their own risk". -- v4.x.x **GA** is considered LTS until further notice +- v4.x.x **Stable** is considered LTS until further notice - v4.x.x **Beta** is considered unstable and not supported - v4.x.x **Alpha** is considered unstable and not supported - v3.x.x is considered deprecated and not supported From 06128ee3085e6cb5e934515600b6e7386ba2044a Mon Sep 17 00:00:00 2001 From: Gregor Sondermeier Date: Mon, 19 Dec 2022 09:59:11 +0100 Subject: [PATCH 08/22] Update Sentry plugin readme regarding non-prod env I was following the original guide to disable the Sentry plugin for non-production environments, but I noticed the approach as originally documented is problematic: In my project I have some code that calls `strapi.plugin('sentry').service('sentry').sendError(error)`. If the Sentry plugin would be disabled, this would cause a null pointer exception (or whatever it was), because `strapi.plugin('sentry')` would return `undefined`. So here is my suggested change on how to disable the plugin for non-production environments. --- packages/plugins/sentry/README.md | 33 +++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/packages/plugins/sentry/README.md b/packages/plugins/sentry/README.md index ca7eff4bb9..9735e07b77 100644 --- a/packages/plugins/sentry/README.md +++ b/packages/plugins/sentry/README.md @@ -98,9 +98,13 @@ const sentryInstance = strapi .getInstance(); ``` -## Disabling +## Disabling for non-production environments -This plugin can be disabled in the plugins configuration file. With the `env` utility, it is also possible to disable it depending on the environment. +The plugin will only send errors to Sentry when the `dsn` config property is set. If the `dsn` property is set to a nil value, the Sentry plugin will still be available to use in the running Strapi instance, but the service it will not actually send errors to Sentry. +When you start Strapi with a nil `dsn` config property, the plugin will print a warning: +`info: @strapi/plugin-sentry is disabled because no Sentry DSN was provided` + +You can make use of that by using the `env` utility to set the `dsn` config property depending on the environment. **Example** @@ -110,8 +114,29 @@ This plugin can be disabled in the plugins configuration file. With the `env` ut module.exports = ({ env }) => ({ // ... sentry: { - // Only enable Sentry in production - enabled: env('NODE_ENV') === 'production', + enabled: true, + config: { + // Only set `dsn` property in production + dsn: env('NODE_ENV') === 'production' ? env('SENTRY_DSN') : null, + }, + }, + // ... +}); +``` + +## Disabling altogether + +Like every other plugin, you can also disable this plugin in the plugins configuration file. This will cause `strapi.plugins('sentry')` to return undefined. + +**Example** + +`./config/plugins.js` + +```js +module.exports = ({ env }) => ({ + // ... + sentry: { + enabled: false }, // ... }); From a930c2262ebf60ff99d8f9a0df527e0b9e89d98f Mon Sep 17 00:00:00 2001 From: Ben Irvin Date: Mon, 19 Dec 2022 14:27:17 +0100 Subject: [PATCH 09/22] add eslint cache option --- .gitignore | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 06d74047d7..854d626a85 100644 --- a/.gitignore +++ b/.gitignore @@ -80,6 +80,7 @@ $RECYCLE.BIN/ .idea nbproject .vscode/ +.eslintcache ############################ diff --git a/package.json b/package.json index 10a3909b9f..a05896c4bb 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "build": "lerna run --stream build --no-private", "generate": "plop --plopfile ./packages/generators/admin/plopfile.js", "lint": "npm-run-all -p lint:code lint:css", - "lint:code": "eslint .", + "lint:code": "eslint --cache --cache-strategy content .", "lint:css": "stylelint packages/**/admin/src/**/*.js", "lint:fix": "eslint --fix .", "lint:other": "npm run prettier:other -- --check", From 8c72013b90c008dcfbc6db913ab0d286cd823b63 Mon Sep 17 00:00:00 2001 From: Ben Irvin Date: Mon, 19 Dec 2022 15:01:26 +0100 Subject: [PATCH 10/22] cache prettier --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a05896c4bb..c4bab69835 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,8 @@ "format": "npm-run-all -p format:*", "format:code": "npm run prettier:code -- --write", "format:other": "npm run prettier:other -- --write", - "prettier:code": "prettier \"**/*.js\"", - "prettier:other": "prettier \"**/*.{md,css,scss,yaml,yml}\"", + "prettier:code": "prettier --cache --cache-strategy content \"**/*.js\"", + "prettier:other": "prettier --cache --cache-strategy content \"**/*.{md,css,scss,yaml,yml}\"", "test:clean": "rimraf ./coverage", "test:front": "npm run test:clean && cross-env IS_EE=true jest --config ./jest.config.front.js", "test:front:watch": "cross-env IS_EE=true jest --config ./jest.config.front.js --watchAll", From e793510d24f839e0de4dd7871a4f02deafc7403c Mon Sep 17 00:00:00 2001 From: Ivan Ha Date: Fri, 23 Dec 2022 18:26:32 +0800 Subject: [PATCH 11/22] fix: translations of CarouselAssetActions --- .../MediaLibraryInput/Carousel/CarouselAssetActions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAssetActions.js b/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAssetActions.js index d364128a66..0b3cc2fd4b 100644 --- a/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAssetActions.js +++ b/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAssetActions.js @@ -43,7 +43,7 @@ export const CarouselAssetActions = ({ asset, onDeleteAsset, onAddAsset, onEditA {onEditAsset && ( } From 11711bff4f1949765262082401484225f44224a6 Mon Sep 17 00:00:00 2001 From: Ivan Ha Date: Wed, 28 Dec 2022 18:05:47 +0800 Subject: [PATCH 12/22] fix: broken non-EN translations in EditFolderDialog --- .../src/components/EditFolderDialog/EditFolderDialog.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js b/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js index efe23fee9c..345fa7d358 100644 --- a/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js +++ b/packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js @@ -258,7 +258,7 @@ export const EditFolderDialog = ({ onClose, folder, location, parentFolderId }) disabled={!canUpdate || isEditFolderLoading} > {formatMessage({ - id: 'modal.folder.create.delete', + id: getTrad('modal.folder.create.delete'), defaultMessage: 'Delete folder', })} @@ -272,8 +272,8 @@ export const EditFolderDialog = ({ onClose, folder, location, parentFolderId }) > {formatMessage( isEditing - ? { id: 'modal.folder.edit.submit', defaultMessage: 'Save' } - : { id: 'modal.folder.create.submit', defaultMessage: 'Create' } + ? { id: getTrad('modal.folder.edit.submit'), defaultMessage: 'Save' } + : { id: getTrad('modal.folder.create.submit'), defaultMessage: 'Create' } )} From 6648646c4589e4b3ed08ddd60e98f139e119e152 Mon Sep 17 00:00:00 2001 From: Ivan Ha Date: Wed, 28 Dec 2022 18:06:39 +0800 Subject: [PATCH 13/22] fix: various zh translations in Media Library --- packages/core/admin/admin/src/translations/zh.json | 1 + .../core/upload/admin/src/translations/zh.json | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/core/admin/admin/src/translations/zh.json b/packages/core/admin/admin/src/translations/zh.json index aac52e453a..6e6430c8c3 100644 --- a/packages/core/admin/admin/src/translations/zh.json +++ b/packages/core/admin/admin/src/translations/zh.json @@ -736,6 +736,7 @@ "global.finish": "完成", "global.marketplace": "市集", "global.name": "名稱", + "global.move": "移動", "global.none": "無", "global.password": "密碼", "global.plugins": "外掛程式", diff --git a/packages/core/upload/admin/src/translations/zh.json b/packages/core/upload/admin/src/translations/zh.json index c3cfd5dfe3..c9faecc520 100644 --- a/packages/core/upload/admin/src/translations/zh.json +++ b/packages/core/upload/admin/src/translations/zh.json @@ -21,6 +21,9 @@ "form.input.label.file-alt": "預設顯示文字", "form.input.label.file-caption": "標題", "form.input.label.file-name": "檔案名稱", + "form.input.label.folder-location": "位置", + "form.input.label.file-location": "位置", + "form.input.label.folder-name": "資料夾名稱", "form.upload-url.error.url.invalid": "連結不合法", "form.upload-url.error.url.invalids": "{number} 個連結不合法", "header.actions.add-assets": "新增素材", @@ -50,11 +53,11 @@ "list.assets.loading-asset": "正在載入媒體預覽：{path}", "list.assets.not-supported-content": "無可用預覽", "list.assets.preview-asset": "路徑為 {path} 的影片預覽", - "list.assets.selected": "{numberFolders, plural, one {1 folder} other {# folders}} - {numberAssets, plural, one {1 asset} other {# assets}}", + "list.assets.selected": "{numberFolders, plural, one {1個資料夾} other {#個資料夾}} - {numberAssets, plural, one {1個素材} other {#個素材}}", "list.assets.type-not-allowed": "此檔案類型不合法", - "list.assets.to-upload": "{number, plural, =0 {No asset} one {1 asset} other {# assets}} ready to upload", + "list.assets.to-upload": "{number, plural, =0 {沒有} one {1 個} other {# 個}}素材準備上傳", "list.folder.edit": "編輯資料夾", - "list.folder.subtitle": "{folderCount, plural, =0 {# folder} one {# folder} other {# folders}}, {filesCount, plural, =0 {# asset} one {# asset} other {# assets}}", + "list.folder.subtitle": "{folderCount, plural, =0 {# 資料夾} one {# 資料夾} other {# 資料夾}}, {filesCount, plural, =0 {# 素材} one {# 素材} other {# 素材}}", "list.folders.title": "資料夾", "mediaLibraryInput.actions.nextSlide": "下一張投影片", "mediaLibraryInput.actions.previousSlide": "上一張投影片", @@ -72,6 +75,9 @@ "modal.header.select-files": "選取的檔案", "modal.header.go-back": "返回", "modal.folder.move.title": "移動元素至", + "modal.folder.create.title": "新增資料夾", + "modal.folder.create.submit": "新增", + "modal.folder.create.delete": "刪除", "modal.nav.browse": "瀏覽", "modal.nav.computer": "從本機", "modal.nav.selected": "已選取", @@ -79,7 +85,7 @@ "modal.remove.success-label": "已成功刪除元素。", "modal.move.success-label": "已成功移動元素", "modal.selected-list.sub-header-subtitle": "於此欄位拖曳檔案排序清單", - "modal.upload-list.footer.button": "上傳 {number, plural, one {# asset} other {# assets}} 至媒體庫", + "modal.upload-list.footer.button": "上傳 {number, plural, one {# 個} other {# 個}}素材至媒體庫", "modal.upload-list.sub-header-subtitle": "上傳到媒體庫前管理你的素材", "modal.upload-list.sub-header.button": "新增更多素材", "modal.upload.cancelled": "上傳遭手動中斷。", From eb49c631662a6a4903c50a0346cb93b6a7c6ae34 Mon Sep 17 00:00:00 2001 From: Gregor Sondermeier Date: Wed, 28 Dec 2022 12:37:26 +0100 Subject: [PATCH 14/22] apply code review suggestion in packages/plugins/sentry/README.md --- packages/plugins/sentry/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/plugins/sentry/README.md b/packages/plugins/sentry/README.md index 9735e07b77..56ba6d59c2 100644 --- a/packages/plugins/sentry/README.md +++ b/packages/plugins/sentry/README.md @@ -100,7 +100,8 @@ const sentryInstance = strapi ## Disabling for non-production environments -The plugin will only send errors to Sentry when the `dsn` config property is set. If the `dsn` property is set to a nil value, the Sentry plugin will still be available to use in the running Strapi instance, but the service it will not actually send errors to Sentry. +If the `dsn` property is set to a nil value (`null` or `undefined`) while `enabled` is true, the Sentry plugin will be available to use in the running Strapi instance, but the service will not actually send errors to Sentry. That allows you to write code that runs on every environment without additional checks, but only send errors to Sentry in production. + When you start Strapi with a nil `dsn` config property, the plugin will print a warning: `info: @strapi/plugin-sentry is disabled because no Sentry DSN was provided` From 9ed95854ccaf7aac3a0714f7249484cc3b8279ba Mon Sep 17 00:00:00 2001 From: Ivan Ha Date: Wed, 28 Dec 2022 22:09:22 +0800 Subject: [PATCH 15/22] fixup! fix: translations of CarouselAssetActions --- .../MediaLibraryInput/Carousel/CarouselAssetActions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAssetActions.js b/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAssetActions.js index 0b3cc2fd4b..6ce9b00599 100644 --- a/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAssetActions.js +++ b/packages/core/upload/admin/src/components/MediaLibraryInput/Carousel/CarouselAssetActions.js @@ -43,7 +43,7 @@ export const CarouselAssetActions = ({ asset, onDeleteAsset, onAddAsset, onEditA {onEditAsset && ( } From 8f1988367c1ccbbb1c44866d9dc9fa512e4f3b31 Mon Sep 17 00:00:00 2001 From: Convly Date: Wed, 28 Dec 2022 15:17:36 +0100 Subject: [PATCH 16/22] v4.5.5 --- .github/actions/check-pr-status/package.json | 2 +- examples/getstarted/package.json | 22 ++++++++-------- examples/kitchensink-ts/package.json | 8 +++--- examples/kitchensink/package.json | 10 +++---- lerna.json | 2 +- packages/admin-test-utils/package.json | 2 +- packages/cli/create-strapi-app/package.json | 4 +-- .../cli/create-strapi-starter/package.json | 4 +-- packages/core/admin/package.json | 14 +++++----- packages/core/content-manager/package.json | 4 +-- .../core/content-type-builder/package.json | 8 +++--- packages/core/database/package.json | 2 +- packages/core/email/package.json | 8 +++--- packages/core/helper-plugin/package.json | 2 +- packages/core/permissions/package.json | 4 +-- packages/core/strapi/package.json | 26 +++++++++---------- packages/core/upload/package.json | 8 +++--- packages/core/utils/package.json | 2 +- packages/generators/app/package.json | 2 +- packages/generators/generators/package.json | 6 ++--- packages/plugins/color-picker/package.json | 2 +- packages/plugins/documentation/package.json | 6 ++--- packages/plugins/graphql/package.json | 4 +-- packages/plugins/i18n/package.json | 4 +-- packages/plugins/sentry/package.json | 2 +- .../plugins/users-permissions/package.json | 6 ++--- .../providers/email-amazon-ses/package.json | 4 +-- packages/providers/email-mailgun/package.json | 4 +-- .../providers/email-nodemailer/package.json | 2 +- .../providers/email-sendgrid/package.json | 4 +-- .../providers/email-sendmail/package.json | 4 +-- packages/providers/upload-aws-s3/package.json | 2 +- .../providers/upload-cloudinary/package.json | 4 +-- packages/providers/upload-local/package.json | 4 +-- .../babel-plugin-switch-ee-ce/package.json | 2 +- packages/utils/logger/package.json | 2 +- packages/utils/typescript/package.json | 2 +- 37 files changed, 99 insertions(+), 99 deletions(-) diff --git a/.github/actions/check-pr-status/package.json b/.github/actions/check-pr-status/package.json index 2b1b251050..6dd06759b5 100644 --- a/.github/actions/check-pr-status/package.json +++ b/.github/actions/check-pr-status/package.json @@ -1,6 +1,6 @@ { "name": "check-pr-status", - "version": "4.5.4", + "version": "4.5.5", "main": "dist/index.js", "license": "MIT", "private": true, diff --git a/examples/getstarted/package.json b/examples/getstarted/package.json index 1b0f151bfb..56019ab766 100644 --- a/examples/getstarted/package.json +++ b/examples/getstarted/package.json @@ -1,7 +1,7 @@ { "name": "getstarted", "private": true, - "version": "4.5.4", + "version": "4.5.5", "description": "A Strapi application.", "scripts": { "develop": "strapi develop", @@ -12,16 +12,16 @@ "strapi": "strapi" }, "dependencies": { - "@strapi/plugin-color-picker": "4.5.4", - "@strapi/plugin-documentation": "4.5.4", - "@strapi/plugin-graphql": "4.5.4", - "@strapi/plugin-i18n": "4.5.4", - "@strapi/plugin-sentry": "4.5.4", - "@strapi/plugin-users-permissions": "4.5.4", - "@strapi/provider-email-mailgun": "4.5.4", - "@strapi/provider-upload-aws-s3": "4.5.4", - "@strapi/provider-upload-cloudinary": "4.5.4", - "@strapi/strapi": "4.5.4", + "@strapi/plugin-color-picker": "4.5.5", + "@strapi/plugin-documentation": "4.5.5", + "@strapi/plugin-graphql": "4.5.5", + "@strapi/plugin-i18n": "4.5.5", + "@strapi/plugin-sentry": "4.5.5", + "@strapi/plugin-users-permissions": "4.5.5", + "@strapi/provider-email-mailgun": "4.5.5", + "@strapi/provider-upload-aws-s3": "4.5.5", + "@strapi/provider-upload-cloudinary": "4.5.5", + "@strapi/strapi": "4.5.5", "@vscode/sqlite3": "5.0.8", "better-sqlite3": "7.4.6", "lodash": "4.17.21", diff --git a/examples/kitchensink-ts/package.json b/examples/kitchensink-ts/package.json index 734e11b0d4..024f065d06 100644 --- a/examples/kitchensink-ts/package.json +++ b/examples/kitchensink-ts/package.json @@ -1,7 +1,7 @@ { "name": "kitchensink-ts", "private": true, - "version": "4.5.4", + "version": "4.5.5", "description": "A Strapi application", "scripts": { "develop": "strapi develop", @@ -10,9 +10,9 @@ "strapi": "strapi" }, "dependencies": { - "@strapi/plugin-i18n": "4.5.4", - "@strapi/plugin-users-permissions": "4.5.4", - "@strapi/strapi": "4.5.4", + "@strapi/plugin-i18n": "4.5.5", + "@strapi/plugin-users-permissions": "4.5.5", + "@strapi/strapi": "4.5.5", "better-sqlite3": "7.4.6" }, "author": { diff --git a/examples/kitchensink/package.json b/examples/kitchensink/package.json index ebb022fd71..783b4767c3 100644 --- a/examples/kitchensink/package.json +++ b/examples/kitchensink/package.json @@ -1,7 +1,7 @@ { "name": "kitchensink", "private": true, - "version": "4.5.4", + "version": "4.5.5", "description": "A Strapi application.", "scripts": { "develop": "strapi develop", @@ -12,10 +12,10 @@ "strapi": "strapi" }, "dependencies": { - "@strapi/provider-email-mailgun": "4.5.4", - "@strapi/provider-upload-aws-s3": "4.5.4", - "@strapi/provider-upload-cloudinary": "4.5.4", - "@strapi/strapi": "4.5.4", + "@strapi/provider-email-mailgun": "4.5.5", + "@strapi/provider-upload-aws-s3": "4.5.5", + "@strapi/provider-upload-cloudinary": "4.5.5", + "@strapi/strapi": "4.5.5", "lodash": "4.17.21", "mysql": "2.18.1", "passport-google-oauth2": "0.2.0", diff --git a/lerna.json b/lerna.json index 88caa778ea..340846b0f1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "4.5.4", + "version": "4.5.5", "packages": [ "packages/*", "examples/*" diff --git a/packages/admin-test-utils/package.json b/packages/admin-test-utils/package.json index 1a89c53c27..84b3e5fb34 100644 --- a/packages/admin-test-utils/package.json +++ b/packages/admin-test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/admin-test-utils", - "version": "4.5.4", + "version": "4.5.5", "private": true, "description": "Test utilities for the Strapi administration panel", "license": "MIT", diff --git a/packages/cli/create-strapi-app/package.json b/packages/cli/create-strapi-app/package.json index 63de92b7aa..72970bd661 100644 --- a/packages/cli/create-strapi-app/package.json +++ b/packages/cli/create-strapi-app/package.json @@ -1,9 +1,9 @@ { "name": "create-strapi-app", - "version": "4.5.4", + "version": "4.5.5", "description": "Generate a new Strapi application.", "dependencies": { - "@strapi/generate-new": "4.5.4", + "@strapi/generate-new": "4.5.5", "commander": "8.2.0", "inquirer": "8.2.4" }, diff --git a/packages/cli/create-strapi-starter/package.json b/packages/cli/create-strapi-starter/package.json index 9b8fa94898..f8c5f202e9 100644 --- a/packages/cli/create-strapi-starter/package.json +++ b/packages/cli/create-strapi-starter/package.json @@ -1,6 +1,6 @@ { "name": "create-strapi-starter", - "version": "4.5.4", + "version": "4.5.5", "description": "Generate a new Strapi application.", "keywords": [ "create-strapi-starter", @@ -38,7 +38,7 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "@strapi/generate-new": "4.5.4", + "@strapi/generate-new": "4.5.5", "chalk": "4.1.1", "ci-info": "3.5.0", "commander": "8.2.0", diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json index 3a643ecd79..f34884caef 100644 --- a/packages/core/admin/package.json +++ b/packages/core/admin/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/admin", - "version": "4.5.4", + "version": "4.5.5", "description": "Strapi Admin", "repository": { "type": "git", @@ -46,13 +46,13 @@ "@casl/ability": "^5.4.3", "@fingerprintjs/fingerprintjs": "3.3.3", "@pmmmwh/react-refresh-webpack-plugin": "0.5.7", - "@strapi/babel-plugin-switch-ee-ce": "4.5.4", + "@strapi/babel-plugin-switch-ee-ce": "4.5.5", "@strapi/design-system": "1.4.1", - "@strapi/helper-plugin": "4.5.4", + "@strapi/helper-plugin": "4.5.5", "@strapi/icons": "1.4.1", - "@strapi/permissions": "4.5.4", - "@strapi/typescript-utils": "4.5.4", - "@strapi/utils": "4.5.4", + "@strapi/permissions": "4.5.5", + "@strapi/typescript-utils": "4.5.5", + "@strapi/utils": "4.5.5", "axios": "1.2.1", "babel-loader": "8.2.5", "babel-plugin-styled-components": "2.0.2", @@ -82,8 +82,8 @@ "jsonwebtoken": "8.5.1", "koa-compose": "4.1.0", "koa-passport": "5.0.0", - "koa2-ratelimit": "^1.1.2", "koa-static": "5.0.0", + "koa2-ratelimit": "^1.1.2", "lodash": "4.17.21", "markdown-it": "^12.3.2", "markdown-it-abbr": "^1.0.4", diff --git a/packages/core/content-manager/package.json b/packages/core/content-manager/package.json index 0aff5a5521..f69b289cd6 100644 --- a/packages/core/content-manager/package.json +++ b/packages/core/content-manager/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-content-manager", - "version": "4.5.4", + "version": "4.5.5", "description": "A powerful UI to easily manage your data.", "repository": { "type": "git", @@ -24,7 +24,7 @@ }, "dependencies": { "@sindresorhus/slugify": "1.1.0", - "@strapi/utils": "4.5.4", + "@strapi/utils": "4.5.5", "lodash": "4.17.21" }, "engines": { diff --git a/packages/core/content-type-builder/package.json b/packages/core/content-type-builder/package.json index 7b7368c2b9..52901182a4 100644 --- a/packages/core/content-type-builder/package.json +++ b/packages/core/content-type-builder/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-content-type-builder", - "version": "4.5.4", + "version": "4.5.5", "description": "Strapi plugin to create content type", "repository": { "type": "git", @@ -28,9 +28,9 @@ }, "dependencies": { "@sindresorhus/slugify": "1.1.0", - "@strapi/generators": "4.5.4", - "@strapi/helper-plugin": "4.5.4", - "@strapi/utils": "4.5.4", + "@strapi/generators": "4.5.5", + "@strapi/helper-plugin": "4.5.5", + "@strapi/utils": "4.5.5", "fs-extra": "10.0.0", "lodash": "4.17.21", "pluralize": "^8.0.0", diff --git a/packages/core/database/package.json b/packages/core/database/package.json index bcddbd491d..915fcb2981 100644 --- a/packages/core/database/package.json +++ b/packages/core/database/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/database", - "version": "4.5.4", + "version": "4.5.5", "description": "Strapi's database layer", "homepage": "https://strapi.io", "bugs": { diff --git a/packages/core/email/package.json b/packages/core/email/package.json index 1196ced7b3..8d12a84e4b 100644 --- a/packages/core/email/package.json +++ b/packages/core/email/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-email", - "version": "4.5.4", + "version": "4.5.5", "description": "Easily configure your Strapi application to send emails.", "repository": { "type": "git", @@ -26,12 +26,12 @@ "test:front:watch:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll" }, "dependencies": { - "@strapi/provider-email-sendmail": "4.5.4", - "@strapi/utils": "4.5.4", + "@strapi/provider-email-sendmail": "4.5.5", + "@strapi/utils": "4.5.5", "lodash": "4.17.21" }, "devDependencies": { - "@strapi/helper-plugin": "4.5.4", + "@strapi/helper-plugin": "4.5.5", "@testing-library/react": "12.1.4" }, "engines": { diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json index 60164cd236..3edd4d2455 100644 --- a/packages/core/helper-plugin/package.json +++ b/packages/core/helper-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/helper-plugin", - "version": "4.5.4", + "version": "4.5.5", "description": "Helper for Strapi plugins development", "repository": { "type": "git", diff --git a/packages/core/permissions/package.json b/packages/core/permissions/package.json index cdbef1acc1..d04ba55a1a 100644 --- a/packages/core/permissions/package.json +++ b/packages/core/permissions/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/permissions", - "version": "4.5.4", + "version": "4.5.5", "description": "Strapi's permission layer.", "repository": { "type": "git", @@ -25,7 +25,7 @@ }, "dependencies": { "@casl/ability": "5.4.4", - "@strapi/utils": "4.5.4", + "@strapi/utils": "4.5.5", "lodash": "4.17.21", "sift": "16.0.0" }, diff --git a/packages/core/strapi/package.json b/packages/core/strapi/package.json index 9c004c077b..2b5b4a8743 100644 --- a/packages/core/strapi/package.json +++ b/packages/core/strapi/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/strapi", - "version": "4.5.4", + "version": "4.5.5", "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite", "keywords": [ "strapi", @@ -80,18 +80,18 @@ "dependencies": { "@koa/cors": "3.4.3", "@koa/router": "10.1.1", - "@strapi/admin": "4.5.4", - "@strapi/database": "4.5.4", - "@strapi/generate-new": "4.5.4", - "@strapi/generators": "4.5.4", - "@strapi/logger": "4.5.4", - "@strapi/permissions": "4.5.4", - "@strapi/plugin-content-manager": "4.5.4", - "@strapi/plugin-content-type-builder": "4.5.4", - "@strapi/plugin-email": "4.5.4", - "@strapi/plugin-upload": "4.5.4", - "@strapi/typescript-utils": "4.5.4", - "@strapi/utils": "4.5.4", + "@strapi/admin": "4.5.5", + "@strapi/database": "4.5.5", + "@strapi/generate-new": "4.5.5", + "@strapi/generators": "4.5.5", + "@strapi/logger": "4.5.5", + "@strapi/permissions": "4.5.5", + "@strapi/plugin-content-manager": "4.5.5", + "@strapi/plugin-content-type-builder": "4.5.5", + "@strapi/plugin-email": "4.5.5", + "@strapi/plugin-upload": "4.5.5", + "@strapi/typescript-utils": "4.5.5", + "@strapi/utils": "4.5.5", "bcryptjs": "2.4.3", "boxen": "5.1.2", "chalk": "4.1.2", diff --git a/packages/core/upload/package.json b/packages/core/upload/package.json index af1327e717..496364e005 100644 --- a/packages/core/upload/package.json +++ b/packages/core/upload/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-upload", - "version": "4.5.4", + "version": "4.5.5", "description": "Makes it easy to upload images and files to your Strapi Application.", "license": "SEE LICENSE IN LICENSE", "author": { @@ -23,9 +23,9 @@ "test:front:watch:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll" }, "dependencies": { - "@strapi/helper-plugin": "4.5.4", - "@strapi/provider-upload-local": "4.5.4", - "@strapi/utils": "4.5.4", + "@strapi/helper-plugin": "4.5.5", + "@strapi/provider-upload-local": "4.5.5", + "@strapi/utils": "4.5.5", "byte-size": "7.0.1", "cropperjs": "1.5.12", "date-fns": "2.29.3", diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json index e79c4fe4d7..07adf049fc 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/utils", - "version": "4.5.4", + "version": "4.5.5", "description": "Shared utilities for the Strapi packages", "keywords": [ "strapi", diff --git a/packages/generators/app/package.json b/packages/generators/app/package.json index 9bfc82a892..b4da5d15d4 100644 --- a/packages/generators/app/package.json +++ b/packages/generators/app/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/generate-new", - "version": "4.5.4", + "version": "4.5.5", "description": "Generate a new Strapi application.", "keywords": [ "generate", diff --git a/packages/generators/generators/package.json b/packages/generators/generators/package.json index 0ce46d8724..cf5546667a 100644 --- a/packages/generators/generators/package.json +++ b/packages/generators/generators/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/generators", - "version": "4.5.4", + "version": "4.5.5", "description": "Interactive API generator.", "keywords": [ "strapi", @@ -30,8 +30,8 @@ "main": "lib/index.js", "dependencies": { "@sindresorhus/slugify": "1.1.0", - "@strapi/typescript-utils": "4.5.4", - "@strapi/utils": "4.5.4", + "@strapi/typescript-utils": "4.5.5", + "@strapi/utils": "4.5.5", "chalk": "4.1.2", "fs-extra": "10.0.0", "node-plop": "0.26.3", diff --git a/packages/plugins/color-picker/package.json b/packages/plugins/color-picker/package.json index 5b6de889c3..8343f937e7 100644 --- a/packages/plugins/color-picker/package.json +++ b/packages/plugins/color-picker/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-color-picker", - "version": "4.5.4", + "version": "4.5.5", "description": "Strapi maintained Custom Fields", "strapi": { "name": "color-picker", diff --git a/packages/plugins/documentation/package.json b/packages/plugins/documentation/package.json index 84d7625bdc..9ffc70e6ed 100644 --- a/packages/plugins/documentation/package.json +++ b/packages/plugins/documentation/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-documentation", - "version": "4.5.4", + "version": "4.5.5", "description": "Create an OpenAPI Document and visualize your API with SWAGGER UI.", "repository": { "type": "git", @@ -24,8 +24,8 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "@strapi/helper-plugin": "4.5.4", - "@strapi/utils": "4.5.4", + "@strapi/helper-plugin": "4.5.5", + "@strapi/utils": "4.5.5", "bcryptjs": "2.4.3", "cheerio": "^1.0.0-rc.12", "fs-extra": "10.0.0", diff --git a/packages/plugins/graphql/package.json b/packages/plugins/graphql/package.json index a092186ee1..76fb8c4242 100644 --- a/packages/plugins/graphql/package.json +++ b/packages/plugins/graphql/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-graphql", - "version": "4.5.4", + "version": "4.5.5", "description": "Adds GraphQL endpoint with default API methods.", "repository": { "type": "git", @@ -29,7 +29,7 @@ "dependencies": { "@graphql-tools/schema": "8.5.1", "@graphql-tools/utils": "^8.12.0", - "@strapi/utils": "4.5.4", + "@strapi/utils": "4.5.5", "apollo-server-core": "3.1.2", "apollo-server-koa": "3.10.0", "glob": "^7.1.7", diff --git a/packages/plugins/i18n/package.json b/packages/plugins/i18n/package.json index 5c22ee4679..dcfa6aaef8 100644 --- a/packages/plugins/i18n/package.json +++ b/packages/plugins/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-i18n", - "version": "4.5.4", + "version": "4.5.5", "description": "This plugin enables to create, to read and to update content in different languages, both from the Admin Panel and from the API", "repository": { "type": "git", @@ -24,7 +24,7 @@ "test:unit": "jest --verbose" }, "dependencies": { - "@strapi/utils": "4.5.4", + "@strapi/utils": "4.5.5", "lodash": "4.17.21" }, "devDependencies": { diff --git a/packages/plugins/sentry/package.json b/packages/plugins/sentry/package.json index 45533436b3..1b6667b161 100644 --- a/packages/plugins/sentry/package.json +++ b/packages/plugins/sentry/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-sentry", - "version": "4.5.4", + "version": "4.5.5", "description": "Send Strapi error events to Sentry", "repository": { "type": "git", diff --git a/packages/plugins/users-permissions/package.json b/packages/plugins/users-permissions/package.json index 230919cd86..05108f2c98 100644 --- a/packages/plugins/users-permissions/package.json +++ b/packages/plugins/users-permissions/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-users-permissions", - "version": "4.5.4", + "version": "4.5.5", "description": "Protect your API with a full-authentication process based on JWT", "repository": { "type": "git", @@ -27,8 +27,8 @@ "test:front:watch:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll" }, "dependencies": { - "@strapi/helper-plugin": "4.5.4", - "@strapi/utils": "4.5.4", + "@strapi/helper-plugin": "4.5.5", + "@strapi/utils": "4.5.5", "bcryptjs": "2.4.3", "grant-koa": "5.4.8", "jsonwebtoken": "^8.1.0", diff --git a/packages/providers/email-amazon-ses/package.json b/packages/providers/email-amazon-ses/package.json index 1427feb2c1..7a3f4d82dd 100644 --- a/packages/providers/email-amazon-ses/package.json +++ b/packages/providers/email-amazon-ses/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/provider-email-amazon-ses", - "version": "4.5.4", + "version": "4.5.5", "description": "Amazon SES provider for strapi email", "keywords": [ "email", @@ -36,7 +36,7 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "@strapi/utils": "4.5.4", + "@strapi/utils": "4.5.5", "node-ses": "^3.0.3" }, "engines": { diff --git a/packages/providers/email-mailgun/package.json b/packages/providers/email-mailgun/package.json index 382439d17d..57868096fc 100644 --- a/packages/providers/email-mailgun/package.json +++ b/packages/providers/email-mailgun/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/provider-email-mailgun", - "version": "4.5.4", + "version": "4.5.5", "description": "Mailgun provider for strapi email plugin", "keywords": [ "email", @@ -36,7 +36,7 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "@strapi/utils": "4.5.4", + "@strapi/utils": "4.5.5", "form-data": "^4.0.0", "mailgun.js": "5.2.2" }, diff --git a/packages/providers/email-nodemailer/package.json b/packages/providers/email-nodemailer/package.json index ccefb02e1a..079fc61a80 100644 --- a/packages/providers/email-nodemailer/package.json +++ b/packages/providers/email-nodemailer/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/provider-email-nodemailer", - "version": "4.5.4", + "version": "4.5.5", "description": "Nodemailer provider for Strapi 3", "keywords": [ "strapi", diff --git a/packages/providers/email-sendgrid/package.json b/packages/providers/email-sendgrid/package.json index b3860477d5..edde2eaac0 100644 --- a/packages/providers/email-sendgrid/package.json +++ b/packages/providers/email-sendgrid/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/provider-email-sendgrid", - "version": "4.5.4", + "version": "4.5.5", "description": "Sendgrid provider for strapi email", "keywords": [ "email", @@ -37,7 +37,7 @@ }, "dependencies": { "@sendgrid/mail": "7.7.0", - "@strapi/utils": "4.5.4" + "@strapi/utils": "4.5.5" }, "engines": { "node": ">=14.19.1 <=18.x.x", diff --git a/packages/providers/email-sendmail/package.json b/packages/providers/email-sendmail/package.json index 9e10756505..a531f29ccd 100644 --- a/packages/providers/email-sendmail/package.json +++ b/packages/providers/email-sendmail/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/provider-email-sendmail", - "version": "4.5.4", + "version": "4.5.5", "description": "Sendmail provider for strapi email", "keywords": [ "email", @@ -35,7 +35,7 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "@strapi/utils": "4.5.4", + "@strapi/utils": "4.5.5", "sendmail": "^1.6.1" }, "engines": { diff --git a/packages/providers/upload-aws-s3/package.json b/packages/providers/upload-aws-s3/package.json index ec61986ac1..7972e6921c 100644 --- a/packages/providers/upload-aws-s3/package.json +++ b/packages/providers/upload-aws-s3/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/provider-upload-aws-s3", - "version": "4.5.4", + "version": "4.5.5", "description": "AWS S3 provider for strapi upload", "keywords": [ "upload", diff --git a/packages/providers/upload-cloudinary/package.json b/packages/providers/upload-cloudinary/package.json index f19444985b..9481b090c8 100644 --- a/packages/providers/upload-cloudinary/package.json +++ b/packages/providers/upload-cloudinary/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/provider-upload-cloudinary", - "version": "4.5.4", + "version": "4.5.5", "description": "Cloudinary provider for strapi upload", "keywords": [ "upload", @@ -36,7 +36,7 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "@strapi/utils": "4.5.4", + "@strapi/utils": "4.5.5", "cloudinary": "^1.30.1", "into-stream": "^5.1.0" }, diff --git a/packages/providers/upload-local/package.json b/packages/providers/upload-local/package.json index acbc5609d0..622fcde068 100644 --- a/packages/providers/upload-local/package.json +++ b/packages/providers/upload-local/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/provider-upload-local", - "version": "4.5.4", + "version": "4.5.5", "description": "Local provider for strapi upload", "keywords": [ "upload", @@ -35,7 +35,7 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "@strapi/utils": "4.5.4", + "@strapi/utils": "4.5.5", "fs-extra": "10.0.0" }, "engines": { diff --git a/packages/utils/babel-plugin-switch-ee-ce/package.json b/packages/utils/babel-plugin-switch-ee-ce/package.json index d165807317..5c27a62a15 100644 --- a/packages/utils/babel-plugin-switch-ee-ce/package.json +++ b/packages/utils/babel-plugin-switch-ee-ce/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/babel-plugin-switch-ee-ce", - "version": "4.5.4", + "version": "4.5.5", "private": false, "description": "Babel plugin to switch from CE to EE at runtime", "repository": "git://github.com/strapi/strapi.git", diff --git a/packages/utils/logger/package.json b/packages/utils/logger/package.json index d8b91043ad..20beb4c30a 100644 --- a/packages/utils/logger/package.json +++ b/packages/utils/logger/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/logger", - "version": "4.5.4", + "version": "4.5.5", "description": "Strapi's logger", "homepage": "https://strapi.io", "bugs": { diff --git a/packages/utils/typescript/package.json b/packages/utils/typescript/package.json index 55416bbfa4..0528f800d5 100644 --- a/packages/utils/typescript/package.json +++ b/packages/utils/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/typescript-utils", - "version": "4.5.4", + "version": "4.5.5", "description": "Typescript support for Strapi", "keywords": [ "strapi", From 8fee332a982aeca855b66f3dc65d4d93268a2837 Mon Sep 17 00:00:00 2001 From: Ivan Ha Date: Wed, 28 Dec 2022 22:34:09 +0800 Subject: [PATCH 17/22] fixup! fix: various zh translations in Media Library --- packages/core/upload/admin/src/translations/zh.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/core/upload/admin/src/translations/zh.json b/packages/core/upload/admin/src/translations/zh.json index c9faecc520..e2e3243893 100644 --- a/packages/core/upload/admin/src/translations/zh.json +++ b/packages/core/upload/admin/src/translations/zh.json @@ -87,6 +87,7 @@ "modal.selected-list.sub-header-subtitle": "於此欄位拖曳檔案排序清單", "modal.upload-list.footer.button": "上傳 {number, plural, one {# 個} other {# 個}}素材至媒體庫", "modal.upload-list.sub-header-subtitle": "上傳到媒體庫前管理你的素材", + "modal.upload-list.sub-header.add-folder": "新增資料夾", "modal.upload-list.sub-header.button": "新增更多素材", "modal.upload.cancelled": "上傳遭手動中斷。", "page.title": "設定 - 媒體庫", From ac771047be5a0ec1785c4efb3efaac7f6216167a Mon Sep 17 00:00:00 2001 From: Julie Plantey Date: Wed, 28 Dec 2022 16:24:26 +0100 Subject: [PATCH 18/22] fixed documentation link and bullet list colors --- .../components/GuidedTour/Modal/components/Content.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/core/admin/admin/src/components/GuidedTour/Modal/components/Content.js b/packages/core/admin/admin/src/components/GuidedTour/Modal/components/Content.js index 09bcd0dafc..bf2d0528d6 100644 --- a/packages/core/admin/admin/src/components/GuidedTour/Modal/components/Content.js +++ b/packages/core/admin/admin/src/components/GuidedTour/Modal/components/Content.js @@ -8,6 +8,9 @@ import { useIntl } from 'react-intl'; const LiStyled = styled.li` list-style: disc; + &::marker { + color: ${({ theme }) => theme.colors.neutral800}; + } `; const Content = ({ id, defaultMessage }) => { @@ -19,13 +22,15 @@ const Content = ({ id, defaultMessage }) => { { id, defaultMessage }, { documentationLink: (children) => ( - {children} - + ), b: (children) => {children}, p: (children) => {children}, From 1827fd6f2cfdcef4da31b4753f43f4625e3c58a2 Mon Sep 17 00:00:00 2001 From: Ivan Ha Date: Thu, 29 Dec 2022 12:40:07 +0800 Subject: [PATCH 19/22] fix: zh translations of content-manager.containers.Edit.information.by --- packages/core/admin/admin/src/translations/zh.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/admin/admin/src/translations/zh.json b/packages/core/admin/admin/src/translations/zh.json index c8c28f7084..b49ca3fb8c 100644 --- a/packages/core/admin/admin/src/translations/zh.json +++ b/packages/core/admin/admin/src/translations/zh.json @@ -597,7 +597,7 @@ "content-manager.containers.Edit.delete-entry": "刪除這個項目", "content-manager.containers.Edit.editing": "編輯中...", "content-manager.containers.Edit.information": "資訊", - "content-manager.containers.Edit.information.by": "By", + "content-manager.containers.Edit.information.by": "操作人", "content-manager.containers.Edit.information.created": "已新增", "content-manager.containers.Edit.information.draftVersion": "草稿版本", "content-manager.containers.Edit.information.editing": "編輯中", From 6afb9d7c7ac7b8bd6a234d8f004df3be25567047 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Dec 2022 18:10:49 +0000 Subject: [PATCH 20/22] chore(deps): bump json5 from 2.2.1 to 2.2.2 in /docs Bumps [json5](https://github.com/json5/json5) from 2.2.1 to 2.2.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v2.2.1...v2.2.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- docs/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/yarn.lock b/docs/yarn.lock index 6d9330ee9c..f9c1b27366 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -5201,9 +5201,9 @@ json-schema-traverse@^1.0.0: integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== json5@^2.1.2, json5@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== + version "2.2.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab" + integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ== jsonfile@^6.0.1: version "6.1.0" From d2f4bf4512c4130dd63ff665d5ccaf735a517a73 Mon Sep 17 00:00:00 2001 From: Ben Irvin Date: Mon, 2 Jan 2023 09:56:21 +0100 Subject: [PATCH 21/22] add cache-location --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c4bab69835..1bbb240a6b 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "build": "lerna run --stream build --no-private", "generate": "plop --plopfile ./packages/generators/admin/plopfile.js", "lint": "npm-run-all -p lint:code lint:css", - "lint:code": "eslint --cache --cache-strategy content .", + "lint:code": "eslint --cache --cache-strategy content --cache-location ./node_modules/.cache/eslint .", "lint:css": "stylelint packages/**/admin/src/**/*.js", "lint:fix": "eslint --fix .", "lint:other": "npm run prettier:other -- --check", From 29fcd21cfbe55ef33e811ae2d0f8e11d5df4802a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Jan 2023 09:02:30 +0000 Subject: [PATCH 22/22] chore(deps-dev): bump nx from 14.4.2 to 14.8.6 Bumps [nx](https://github.com/nrwl/nx/tree/HEAD/packages/nx) from 14.4.2 to 14.8.6. - [Release notes](https://github.com/nrwl/nx/releases) - [Commits](https://github.com/nrwl/nx/commits/14.8.6/packages/nx) --- updated-dependencies: - dependency-name: nx dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 127 +++++++++++++++++++++------------------------------ 2 files changed, 54 insertions(+), 75 deletions(-) diff --git a/package.json b/package.json index 10a3909b9f..614c8a489d 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "lint-staged": "13.0.3", "lodash": "4.17.21", "npm-run-all": "4.1.5", - "nx": "14.4.2", + "nx": "14.8.6", "plop": "2.7.6", "prettier": "2.7.1", "qs": "6.11.0", diff --git a/yarn.lock b/yarn.lock index daa48dff91..50a48eebf2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3564,33 +3564,19 @@ read-package-json-fast "^2.0.3" which "^2.0.2" -"@nrwl/cli@14.4.2": - version "14.4.2" - resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-14.4.2.tgz#5ec1a7a10087ef5bdd5b57bf5e3c5221fb7938e0" - integrity sha512-JNV4kP9goZD4BlTQGKdKhCRc1bhiWYp1TaDJHdk4ZfhiLt1NzXNxxgc/eX2obFZ3Hw+KdM/gM5F7KfWBbtSGSw== +"@nrwl/cli@14.8.6": + version "14.8.6" + resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-14.8.6.tgz#56fcfae492a159efe978b7d51dd51f8a18cda0af" + integrity sha512-R4udxekMd4jhoRPEksJu+224DocOIrAqenFo0D2R36epE5FaCnZQX7xg+b3TjRbdS10e426i4D9LuXdQmP5jJg== dependencies: - nx "14.4.2" + nx "14.8.6" -"@nrwl/cli@14.5.6": - version "14.5.6" - resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-14.5.6.tgz#1c1f33fe128234aae92c1fb6cf97317d2835983f" - integrity sha512-twTR2nzA8xtTQHgMOUxNCXutRQ4OWT9eeJID3H6C5Ev5Mhi25fZheodVOQu72MpMWHhdtH7/7kHzULJaRsTjHw== +"@nrwl/tao@14.8.6": + version "14.8.6" + resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-14.8.6.tgz#5055af46942744fae0b88beedbf2ad016ab53b2b" + integrity sha512-CByqrsfSJeonOd7TLAHP8bRYNWgDksxA7j+yncSzgQnFLEbZdJGG/AqqIovx8g6g2v0JS+nRgGC+w5UPf04UrQ== dependencies: - nx "14.5.6" - -"@nrwl/tao@14.4.2": - version "14.4.2" - resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-14.4.2.tgz#36b4d133740abdaf5c222b4e732d0d7020c9def5" - integrity sha512-Ygw3skKZfFhi4MBHZKQ8A67pDQxeyDdY78tFWViMN0SEn9ExL41Q8V9aSMfir8VZYGca6ZOXX5MRhbeHdcgMLQ== - dependencies: - nx "14.4.2" - -"@nrwl/tao@14.5.6": - version "14.5.6" - resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-14.5.6.tgz#4bff203d06478c839cf15b91719aae3b6920f8ff" - integrity sha512-EIbYLhSU85SaYd95t3Mwcy09KVPyPd3DlE7sZBaS3TzFEgOi0o9DLrpHRiZWfUJYgY9ltZHPCQn2hKpd7h7auw== - dependencies: - nx "14.5.6" + nx "14.8.6" "@octokit/auth-token@^2.4.4": version "2.5.0" @@ -7092,6 +7078,26 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== +"@yarnpkg/lockfile@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" + integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== + +"@yarnpkg/parsers@^3.0.0-rc.18": + version "3.0.0-rc.34" + resolved "https://registry.yarnpkg.com/@yarnpkg/parsers/-/parsers-3.0.0-rc.34.tgz#db1d16e082e167db6dbc67f1c264639e0b4c5e1a" + integrity sha512-NhEA0BusInyk7EiJ7i7qF1Mkrb6gGjZcQQ/W1xxGazxapubEmGO7v5WSll6hWxFXE2ngtLj8lflq1Ff5VtqEww== + dependencies: + js-yaml "^3.10.0" + tslib "^2.4.0" + +"@zkochan/js-yaml@0.0.6": + version "0.0.6" + resolved "https://registry.yarnpkg.com/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz#975f0b306e705e28b8068a07737fa46d3fc04826" + integrity sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg== + dependencies: + argparse "^2.0.1" + "@zxing/text-encoding@0.9.0": version "0.9.0" resolved "https://registry.yarnpkg.com/@zxing/text-encoding/-/text-encoding-0.9.0.tgz#fb50ffabc6c7c66a0c96b4c03e3d9be74864b70b" @@ -7891,6 +7897,15 @@ axios@^0.26.0: dependencies: follow-redirects "^1.14.8" +axios@^1.0.0: + version "1.2.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.2.tgz#72681724c6e6a43a9fea860fc558127dbe32f9f1" + integrity sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q== + dependencies: + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + axobject-query@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be" @@ -14955,7 +14970,7 @@ js-yaml@4.1.0, js-yaml@^4.1.0: dependencies: argparse "^2.0.1" -js-yaml@^3.13.1: +js-yaml@^3.10.0, js-yaml@^3.13.1: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -15068,12 +15083,7 @@ json5@^2.1.2, json5@^2.1.3, json5@^2.2.0, json5@^2.2.1: resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== -jsonc-parser@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22" - integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA== - -jsonc-parser@^3.2.0: +jsonc-parser@3.2.0, jsonc-parser@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76" integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w== @@ -17294,14 +17304,18 @@ nwsapi@^2.2.0: resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.1.tgz#10a9f268fbf4c461249ebcfe38e359aa36e2577c" integrity sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg== -nx@14.4.2: - version "14.4.2" - resolved "https://registry.yarnpkg.com/nx/-/nx-14.4.2.tgz#48ac7f82caccdf26ecd77b76e110c550bcafe7ca" - integrity sha512-bYO//HuwQL4X8y+2BjUPtkPLDiYI1zMejQo6+uJl3+VdYPcsjwW/ca581tBPHiPH95XnHiBartnMrMJtn11grw== +nx@14.8.6, "nx@>=14.5.4 < 16": + version "14.8.6" + resolved "https://registry.yarnpkg.com/nx/-/nx-14.8.6.tgz#50bdfde1638478c60d9646d1d23e984a09801d38" + integrity sha512-QLU3sip/g3JdNO8n5Nw2esN+0G26Jsy3u1LlrB9Giu4zf/+KsfN8CcXMbEVqOnPR1FkCS52xliaq7IBQfvvMQA== dependencies: - "@nrwl/cli" "14.4.2" - "@nrwl/tao" "14.4.2" + "@nrwl/cli" "14.8.6" + "@nrwl/tao" "14.8.6" "@parcel/watcher" "2.0.4" + "@yarnpkg/lockfile" "^1.1.0" + "@yarnpkg/parsers" "^3.0.0-rc.18" + "@zkochan/js-yaml" "0.0.6" + axios "^1.0.0" chalk "4.1.0" chokidar "^3.5.1" cli-cursor "3.1.0" @@ -17316,48 +17330,13 @@ nx@14.4.2: glob "7.1.4" ignore "^5.0.4" js-yaml "4.1.0" - jsonc-parser "3.0.0" - minimatch "3.0.5" - npm-run-path "^4.0.1" - open "^8.4.0" - semver "7.3.4" - string-width "^4.2.3" - tar-stream "~2.2.0" - tmp "~0.2.1" - tsconfig-paths "^3.9.0" - tslib "^2.3.0" - v8-compile-cache "2.3.0" - yargs "^17.4.0" - yargs-parser "21.0.1" - -nx@14.5.6, "nx@>=14.5.4 < 16": - version "14.5.6" - resolved "https://registry.yarnpkg.com/nx/-/nx-14.5.6.tgz#c0a24af050ee21979ed4dbe7cc0f7d39925df527" - integrity sha512-HqOCRKBFPyyauZVTHyF7l5x97xYGukTjeQXxZD5LdVxiL1lSyaOtBCTNUmOge/jCPH3crvSeV2Wt58ZF4u0yaw== - dependencies: - "@nrwl/cli" "14.5.6" - "@nrwl/tao" "14.5.6" - "@parcel/watcher" "2.0.4" - chalk "4.1.0" - chokidar "^3.5.1" - cli-cursor "3.1.0" - cli-spinners "2.6.1" - cliui "^7.0.2" - dotenv "~10.0.0" - enquirer "~2.3.6" - fast-glob "3.2.7" - figures "3.2.0" - flat "^5.0.2" - fs-extra "^10.1.0" - glob "7.1.4" - ignore "^5.0.4" - js-yaml "4.1.0" - jsonc-parser "3.0.0" + jsonc-parser "3.2.0" minimatch "3.0.5" npm-run-path "^4.0.1" open "^8.4.0" semver "7.3.4" string-width "^4.2.3" + strong-log-transformer "^2.1.0" tar-stream "~2.2.0" tmp "~0.2.1" tsconfig-paths "^3.9.0"