Skip to content

Commit

Permalink
Merge branch 'master' into releases/4.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
alexandrebodin committed Jun 7, 2022
2 parents a797514 + 86e57e1 commit c12bde7
Show file tree
Hide file tree
Showing 50 changed files with 856 additions and 336 deletions.
4 changes: 2 additions & 2 deletions .github/actions/check-pr-status/package.json
@@ -1,6 +1,6 @@
{
"name": "check-pr-status",
"version": "4.1.11",
"version": "4.1.12",
"main": "dist/index.js",
"license": "MIT",
"private": true,
Expand All @@ -11,6 +11,6 @@
"devDependencies": {
"@actions/core": "1.8.1",
"@actions/github": "5.0.0",
"@vercel/ncc": "0.33.3"
"@vercel/ncc": "0.34.0"
}
}
17 changes: 17 additions & 0 deletions .github/workflows/addToProject.yml
@@ -0,0 +1,17 @@
name: Add bugs to bugs project

on:
issues:
types:
- opened
- transferred

jobs:
add-to-project:
name: Add issue to Support Team project
runs-on: ubuntu-latest
steps:
- uses: actions/add-to-project@main
with:
project-url: https://github.com/orgs/strapi/projects/15
github-token: ${{ secrets.PROJECT_TRANSFER_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Expand Up @@ -65,7 +65,7 @@ jobs:
- name: Build
run: yarn build
- name: Run test
run: yarn run -s test:front && codecov -C -F front
run: yarn run -s test:front --coverage && codecov -C -F front

e2e_ce_pg:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion examples/getstarted/.gitignore
Expand Up @@ -100,7 +100,7 @@ node_modules
############################

testApp
coverage
/coverage/

############################
# Strapi
Expand Down
24 changes: 12 additions & 12 deletions examples/getstarted/package.json
@@ -1,7 +1,7 @@
{
"name": "getstarted",
"private": true,
"version": "4.1.11",
"version": "4.1.12",
"description": "A Strapi application.",
"scripts": {
"develop": "strapi develop",
Expand All @@ -12,17 +12,17 @@
"strapi": "strapi"
},
"dependencies": {
"@strapi/admin": "4.1.11",
"@strapi/plugin-documentation": "4.1.11",
"@strapi/plugin-graphql": "4.1.11",
"@strapi/plugin-i18n": "4.1.11",
"@strapi/plugin-sentry": "4.1.11",
"@strapi/plugin-users-permissions": "4.1.11",
"@strapi/provider-email-mailgun": "4.1.11",
"@strapi/provider-upload-aws-s3": "4.1.11",
"@strapi/provider-upload-cloudinary": "4.1.11",
"@strapi/strapi": "4.1.11",
"@strapi/utils": "4.1.11",
"@strapi/admin": "4.1.12",
"@strapi/plugin-documentation": "4.1.12",
"@strapi/plugin-graphql": "4.1.12",
"@strapi/plugin-i18n": "4.1.12",
"@strapi/plugin-sentry": "4.1.12",
"@strapi/plugin-users-permissions": "4.1.12",
"@strapi/provider-email-mailgun": "4.1.12",
"@strapi/provider-upload-aws-s3": "4.1.12",
"@strapi/provider-upload-cloudinary": "4.1.12",
"@strapi/strapi": "4.1.12",
"@strapi/utils": "4.1.12",
"@vscode/sqlite3": "5.0.8",
"better-sqlite3": "7.4.6",
"lodash": "4.17.21",
Expand Down
14 changes: 7 additions & 7 deletions examples/kitchensink/package.json
@@ -1,7 +1,7 @@
{
"name": "kitchensink",
"private": true,
"version": "4.1.11",
"version": "4.1.12",
"description": "A Strapi application.",
"scripts": {
"develop": "strapi develop",
Expand All @@ -12,12 +12,12 @@
"strapi": "strapi"
},
"dependencies": {
"@strapi/admin": "4.1.11",
"@strapi/provider-email-mailgun": "4.1.11",
"@strapi/provider-upload-aws-s3": "4.1.11",
"@strapi/provider-upload-cloudinary": "4.1.11",
"@strapi/strapi": "4.1.11",
"@strapi/utils": "4.1.11",
"@strapi/admin": "4.1.12",
"@strapi/provider-email-mailgun": "4.1.12",
"@strapi/provider-upload-aws-s3": "4.1.12",
"@strapi/provider-upload-cloudinary": "4.1.12",
"@strapi/strapi": "4.1.12",
"@strapi/utils": "4.1.12",
"lodash": "4.17.21",
"mysql": "2.18.1",
"passport-google-oauth2": "0.2.0",
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
@@ -1,5 +1,5 @@
{
"version": "4.1.11",
"version": "4.1.12",
"packages": [
"packages/*",
"examples/*"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -108,7 +108,7 @@
"npm-run-all": "4.1.5",
"plop": "2.7.6",
"prettier": "1.19.1",
"qs": "6.10.3",
"qs": "6.10.5",
"react-test-renderer": "17.0.2",
"request": "2.88.2",
"request-promise-native": "1.0.9",
Expand Down
2 changes: 1 addition & 1 deletion packages/admin-test-utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@strapi/admin-test-utils",
"version": "4.1.11",
"version": "4.1.12",
"private": true,
"description": "Test utilities for the Strapi administration panel",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/create-strapi-app/package.json
@@ -1,6 +1,6 @@
{
"name": "create-strapi-app",
"version": "4.1.11",
"version": "4.1.12",
"description": "Generate a new Strapi application.",
"keywords": [
"create-strapi-app",
Expand Down Expand Up @@ -38,7 +38,7 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"@strapi/generate-new": "4.1.11",
"@strapi/generate-new": "4.1.12",
"commander": "6.1.0",
"inquirer": "8.2.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/create-strapi-starter/package.json
@@ -1,6 +1,6 @@
{
"name": "create-strapi-starter",
"version": "4.1.11",
"version": "4.1.12",
"description": "Generate a new Strapi application.",
"keywords": [
"create-strapi-starter",
Expand Down Expand Up @@ -38,7 +38,7 @@
"test": "echo \"no tests yet\""
},
"dependencies": {
"@strapi/generate-new": "4.1.11",
"@strapi/generate-new": "4.1.12",
"chalk": "4.1.1",
"ci-info": "3.1.1",
"commander": "7.1.0",
Expand Down

0 comments on commit c12bde7

Please sign in to comment.