Merge pull request #11070 from strapi/v4/dependencies-updates

Update package dependencies

.gitignore

@@ -133,3 +133,5 @@ packages/generators/app/files/public/
 ############################
 
 front-workspace.code-workspace
+.yarn
+.yarnrc

package.json

@@ -18,7 +18,7 @@
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-prettier": "^6.15.0",
     "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsdoc": "35.4.0",
+    "eslint-plugin-jsdoc": "36.1.0",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-react": "^7.23.2",
@@ -34,7 +34,7 @@
     "jest-circus": "26.6.3",
     "jest-cli": "^26.0.1",
     "jest-styled-components": "^7.0.2",
-    "lerna": "^3.13.1",
+    "lerna": "4.0.0",
     "lint-staged": "^10.5.4",
     "lodash": "4.17.21",
     "npm-run-all": "^4.1.5",
@@ -51,7 +51,6 @@
     "stylelint-config-styled-components": "0.1.1",
     "stylelint-processor-styled-components": "1.10.0",
     "supertest": "5.0.0",
-    "wait-on": "^3.2.0",
     "yargs": "^13.2.2"
   },
   "scripts": {

packages/cli/create-strapi-app/package.json

@@ -16,7 +16,6 @@
     "create-strapi-app": "./index.js"
   },
   "dependencies": {
-    "chalk": "4.1.1",
     "commander": "6.1.0",
     "inquirer": "8.1.0",
     "js-yaml": "4.1.0",

packages/cli/create-strapi-starter/package.json

@@ -27,7 +27,7 @@
     "node-fetch": "^2.6.1",
     "ora": "5.4.0",
     "@strapi/generate-new": "3.6.8",
-    "tar": "6.1.4"
+    "tar": "6.1.11"
   },
   "scripts": {
     "test": "echo \"no tests yet\""

packages/core/content-manager/package.json

@@ -12,11 +12,9 @@
   },
   "dependencies": {
     "@sindresorhus/slugify": "1.1.0",
-    "@strapi/helper-plugin": "3.6.8",
     "@strapi/utils": "3.6.8",
     "lodash": "4.17.21",
-    "pluralize": "^8.0.0",
+    "pluralize": "^8.0.0"
-    "yup": "^0.32.9"
   },
   "author": {
     "name": "Strapi team",

packages/core/database/package.json

@@ -34,8 +34,5 @@
     "knex": "0.95.6",
     "lodash": "4.17.21",
     "umzug": "2.3.0"
-  },
-  "devDependencies": {
-    "sqlite3": "5.0.2"
   }
 }

packages/core/email/package.json

@@ -15,11 +15,9 @@
   },
   "dependencies": {
     "lodash": "4.17.21",
-    "@strapi/provider-email-sendmail": "3.6.8",
+    "@strapi/provider-email-sendmail": "3.6.8"
-    "@strapi/utils": "3.6.8"
   },
   "devDependencies": {
-    "rimraf": "3.0.2",
     "@strapi/helper-plugin": "3.6.8"
   },
   "author": {

packages/core/strapi/bin/strapi.js

@@ -58,10 +58,7 @@ const getLocalScript = name => (...args) => {
 };
 
 // Initial program setup
-program
+program.storeOptionsAsProperties(false).allowUnknownOption(true);
-  .storeOptionsAsProperties(false)
-  .passCommandToAction(false)
-  .allowUnknownOption(true);
 
 program.helpOption('-h, --help', 'Display help for command');
 program.addHelpCommand('help [command]', 'Display help for command');

packages/core/strapi/lib/commands/console.js

@@ -10,7 +10,7 @@ module.exports = () => {
   // Now load up the Strapi framework for real.
   const app = strapi();
 
-  app.start(() => {
+  app.start().then(() => {
     const repl = REPL.start(app.config.info.name + ' > ' || 'strapi > '); // eslint-disable-line prefer-template
 
     repl.on('exit', function(err) {

packages/core/strapi/lib/commands/develop.js

@@ -27,8 +27,9 @@ module.exports = async function({ build, watchAdmin, polling, browser }) {
   // Don't run the build process if the admin is in watch mode
   if (build && !watchAdmin && serveAdminPanel && !buildExists) {
     try {
-      execa.shellSync('npm run -s build -- --no-optimization', {
+      execa.sync('npm run -s build -- --no-optimization', {
         stdio: 'inherit',
+        shell: true,
       });
     } catch (err) {
       process.exit(1);

packages/core/strapi/lib/middlewares/error/defaults.json

@@ -1,5 +1,5 @@
 {
-  "boom": {
+  "error": {
     "enabled": true
   }
 }

packages/core/strapi/lib/middlewares/error/index.js

@@ -6,7 +6,7 @@
 
 // Public node modules.
 const _ = require('lodash');
-const Boom = require('boom');
+const Boom = require('@hapi/boom');
 const delegate = require('delegates');
 
 const boomMethods = [

packages/core/strapi/lib/middlewares/index.js

@@ -7,7 +7,7 @@ const requiredMiddlewares = [
   'responses',
   'router',
   'logger',
-  'boom',
+  'error',
   'cors',
   'cron',
   'xframe',

packages/core/strapi/lib/middlewares/language/defaults.json

@@ -1,9 +0,0 @@
-{
-  "language": {
-    "enabled": false,
-    "defaultLocale": "en_us",
-    "locales": ["en_us"],
-    "modes": ["query", "subdomain", "cookie", "header", "url", "tld"],
-    "cookieName": "locale"
-  }
-}

packages/core/strapi/lib/middlewares/language/index.js

@@ -1,40 +0,0 @@
-'use strict';
-
-/**
- * Module dependencies
- */
-
-// Node.js core.
-const { resolve } = require('path');
-const locale = require('koa-locale');
-const i18n = require('koa-i18n');
-/**
- * Language hook
- */
-
-module.exports = strapi => {
-  return {
-    /**
-     * Initialize the hook
-     */
-
-    initialize() {
-      locale(strapi.server.app);
-
-      const { defaultLocale, modes, cookieName } = strapi.config.middleware.settings.language;
-
-      const directory = resolve(strapi.config.appPath, strapi.config.paths.config, 'locales');
-
-      strapi.server.use(
-        i18n(strapi.server.app, {
-          directory,
-          locales: strapi.config.get('middleware.settings.language.locales', []),
-          defaultLocale,
-          modes,
-          cookieName,
-          extension: '.json',
-        })
-      );
-    },
-  };
-};

packages/core/strapi/lib/utils/update-notifier/index.js

@@ -67,6 +67,7 @@ const createUpdateNotifier = strapi => {
     const now = Date.now();
     const latestVersion = config.get('latest');
     const lastNotification = config.get('lastNotification') || 0;
+
     if (
       !process.stdout.isTTY ||
       lastNotification + notifInterval > now ||

packages/core/strapi/package.json

@@ -2,101 +2,6 @@
   "name": "@strapi/strapi",
   "version": "3.6.8",
   "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",
-  "homepage": "https://strapi.io",
-  "directories": {
-    "lib": "./lib",
-    "bin": "./bin"
-  },
-  "main": "./lib",
-  "types": "./lib/index.d.ts",
-  "bin": {
-    "strapi": "./bin/strapi.js"
-  },
-  "dependencies": {
-    "@koa/cors": "^3.0.0",
-    "@koa/router": "10.1.1",
-    "@strapi/admin": "3.6.8",
-    "@strapi/database": "3.6.8",
-    "@strapi/generate-new": "3.6.8",
-    "@strapi/generators": "3.6.8",
-    "@strapi/logger": "3.6.8",
-    "@strapi/plugin-content-manager": "3.6.8",
-    "@strapi/plugin-content-type-builder": "3.6.8",
-    "@strapi/plugin-email": "3.6.8",
-    "@strapi/plugin-upload": "3.6.8",
-    "@strapi/utils": "3.6.8",
-    "async": "^2.1.2",
-    "boom": "^7.3.0",
-    "boxen": "4.2.0",
-    "chalk": "^4.1.1",
-    "chokidar": "3.5.1",
-    "ci-info": "3.1.1",
-    "cli-table3": "^0.6.0",
-    "commander": "6.1.0",
-    "configstore": "5.0.1",
-    "cross-spawn": "^7.0.3",
-    "debug": "^4.1.1",
-    "delegates": "^1.0.0",
-    "dotenv": "10.0.0",
-    "execa": "^1.0.0",
-    "fs-extra": "^9.1.0",
-    "glob": "^7.1.2",
-    "inquirer": "^6.2.1",
-    "is-docker": "2.2.1",
-    "koa": "^2.13.1",
-    "koa-body": "^4.2.0",
-    "koa-compose": "^4.1.0",
-    "koa-compress": "^5.0.1",
-    "koa-convert": "^2.0.0",
-    "koa-favicon": "^2.0.0",
-    "koa-helmet": "6.1.0",
-    "koa-i18n": "^2.1.0",
-    "koa-ip": "^2.0.0",
-    "koa-locale": "~1.3.0",
-    "koa-mount": "4.0.0",
-    "koa-session": "^6.2.0",
-    "koa-static": "^5.0.0",
-    "lodash": "4.17.21",
-    "node-fetch": "2.6.1",
-    "node-machine-id": "1.1.12",
-    "node-schedule": "2.0.0",
-    "open": "8.2.1",
-    "ora": "^5.4.0",
-    "package-json": "6.5.0",
-    "plop": "2.7.4",
-    "pluralize": "8.0.0",
-    "qs": "^6.10.1",
-    "resolve-cwd": "^3.0.0",
-    "rimraf": "^3.0.2",
-    "semver": "7.3.5"
-  },
-  "scripts": {
-    "postinstall": "node lib/utils/success.js"
-  },
-  "author": {
-    "email": "hi@strapi.io",
-    "name": "Strapi team",
-    "url": "https://strapi.io"
-  },
-  "maintainers": [
-    {
-      "name": "Strapi team",
-      "email": "hi@strapi.io",
-      "url": "https://strapi.io"
-    }
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/strapi/strapi.git"
-  },
-  "bugs": {
-    "url": "https://github.com/strapi/strapi/issues"
-  },
-  "engines": {
-    "node": ">=12.x.x <=16.x.x",
-    "npm": ">=6.0.0"
-  },
-  "license": "SEE LICENSE IN LICENSE",
   "keywords": [
     "strapi",
     "cms",
@@ -133,11 +38,95 @@
     "backend",
     "open source",
     "self hosted",
-    "javascript",
     "lerna",
     "lernajs",
     "react",
     "reactjs"
   ],
-  "gitHead": "231263a3535658bab1e9492c6aaaed8692d62a53"
+  "homepage": "https://strapi.io",
+  "bugs": {
+    "url": "https://github.com/strapi/strapi/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/strapi/strapi.git"
+  },
+  "license": "SEE LICENSE IN LICENSE",
+  "author": {
+    "name": "Strapi team",
+    "email": "hi@strapi.io",
+    "url": "https://strapi.io"
+  },
+  "maintainers": [
+    {
+      "name": "Strapi team",
+      "email": "hi@strapi.io",
+      "url": "https://strapi.io"
+    }
+  ],
+  "main": "./lib",
+  "types": "./lib/index.d.ts",
+  "bin": {
+    "strapi": "./bin/strapi.js"
+  },
+  "directories": {
+    "lib": "./lib",
+    "bin": "./bin"
+  },
+  "scripts": {
+    "postinstall": "node lib/utils/success.js"
+  },
+  "dependencies": {
+    "@hapi/boom": "9.1.4",
+    "@koa/cors": "3.1.0",
+    "@koa/router": "10.1.1",
+    "@strapi/admin": "3.6.8",
+    "@strapi/database": "3.6.8",
+    "@strapi/generate-new": "3.6.8",
+    "@strapi/generators": "3.6.8",
+    "@strapi/logger": "3.6.8",
+    "@strapi/plugin-content-manager": "3.6.8",
+    "@strapi/plugin-content-type-builder": "3.6.8",
+    "@strapi/plugin-email": "3.6.8",
+    "@strapi/plugin-upload": "3.6.8",
+    "@strapi/utils": "3.6.8",
+    "boxen": "5.1.2",
+    "chalk": "4.1.2",
+    "chokidar": "3.5.2",
+    "ci-info": "3.2.0",
+    "cli-table3": "0.6.0",
+    "commander": "8.2.0",
+    "configstore": "5.0.1",
+    "debug": "4.3.2",
+    "delegates": "1.0.0",
+    "dotenv": "10.0.0",
+    "execa": "5.1.1",
+    "fs-extra": "10.0.0",
+    "glob": "7.2.0",
+    "inquirer": "8.1.5",
+    "is-docker": "2.2.1",
+    "koa": "2.13.3",
+    "koa-body": "4.2.0",
+    "koa-compose": "4.1.0",
+    "koa-compress": "5.1.0",
+    "koa-favicon": "2.1.0",
+    "koa-helmet": "6.1.0",
+    "koa-ip": "2.1.0",
+    "koa-session": "6.2.0",
+    "koa-static": "5.0.0",
+    "lodash": "4.17.21",
+    "node-fetch": "2.6.5",
+    "node-machine-id": "1.1.12",
+    "node-schedule": "2.0.0",
+    "open": "8.2.1",
+    "ora": "5.4.1",
+    "package-json": "7.0.0",
+    "qs": "6.10.1",
+    "resolve-cwd": "3.0.0",
+    "semver": "7.3.5"
+  },
+  "engines": {
+    "node": ">=12.x.x <=16.x.x",
+    "npm": ">=6.0.0"
+  }
 }

packages/core/upload/package.json

@@ -17,14 +17,12 @@
     "@strapi/helper-plugin": "3.6.8",
     "@strapi/provider-upload-local": "3.6.8",
     "@strapi/utils": "3.6.8",
-    "byte-size": "^7.0.1",
+    "byte-size": "7.0.1",
-    "cropperjs": "^1.5.11",
+    "cropperjs": "1.5.11",
     "immer": "9.0.5",
-    "is-valid-domain": "0.0.17",
     "koa-range": "0.3.0",
-    "koa-static": "^5.0.0",
+    "koa-static": "5.0.0",
     "lodash": "4.17.21",
-    "node-fetch": "2.6.1",
     "react": "^17.0.2",
     "react-copy-to-clipboard": "^5.0.3",
     "react-dom": "^17.0.2",
@@ -33,9 +31,7 @@
     "react-router": "^5.2.0",
     "react-router-dom": "^5.0.0",
     "reactstrap": "8.4.1",
-    "sharp": "0.28.1",
+    "sharp": "0.28.1"
-    "stream-to-array": "^2.3.0",
-    "uuid": "^3.2.1"
   },
   "author": {
     "name": "Strapi team",

packages/core/utils/package.json

@@ -5,9 +5,7 @@
   "homepage": "https://strapi.io",
   "keywords": [
     "strapi",
-    "utilities",
+    "utils"
-    "utils",
-    "winston"
   ],
   "directories": {
     "lib": "./lib"
@@ -15,11 +13,9 @@
   "main": "./lib",
   "dependencies": {
     "@sindresorhus/slugify": "1.1.0",
-    "date-fns": "^2.19.0",
+    "date-fns": "2.24.0",
     "lodash": "4.17.21",
-    "pino": "^4.7.1",
+    "yup": "0.32.9"
-    "pluralize": "^8.0.0",
-    "yup": "^0.32.9"
   },
   "author": {
     "email": "hi@strapi.io",
@@ -44,6 +40,5 @@
     "node": ">=12.x.x <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "license": "SEE LICENSE IN LICENSE",
+  "license": "SEE LICENSE IN LICENSE"
-  "gitHead": "231263a3535658bab1e9492c6aaaed8692d62a53"
 }

packages/generators/app/package.json

@@ -23,7 +23,7 @@
     "node-fetch": "^2.6.1",
     "node-machine-id": "^1.1.10",
     "ora": "^5.4.0",
-    "tar": "6.1.4",
+    "tar": "6.1.11",
     "uuid": "^3.3.2"
   },
   "scripts": {

packages/plugins/graphql/package.json

@@ -33,8 +33,7 @@
   },
   "devDependencies": {
     "cross-env": "^7.0.3",
-    "koa": "^2.13.1",
+    "koa": "^2.13.1"
-    "rimraf": "3.0.2"
   },
   "author": {
     "name": "A Strapi developer",

packages/plugins/i18n/package.json

@@ -11,10 +11,8 @@
     "kind": "plugin"
   },
   "dependencies": {
-    "lodash": "4.17.20",
+    "@strapi/utils": "3.6.8",
-    "p-map": "4.0.0",
+    "lodash": "4.17.21"
-    "pluralize": "8.0.0",
-    "@strapi/utils": "3.6.8"
   },
   "author": {
     "name": "A Strapi developer",

packages/providers/email-sendgrid/package.json

@@ -13,7 +13,7 @@
   },
   "main": "./lib",
   "dependencies": {
-    "@sendgrid/mail": "6.4.0",
+    "@sendgrid/mail": "7.4.7",
     "@strapi/utils": "3.6.8"
   },
   "strapi": {

packages/providers/upload-rackspace/package.json

@@ -10,8 +10,8 @@
     "test": "echo \"no tests yet\""
   },
   "dependencies": {
-    "pkgcloud": "^2.0.0",
+    "pkgcloud": "2.2.0",
-    "streamifier": "^0.1.1"
+    "streamifier": "0.1.1"
   },
   "engines": {
     "node": ">=12.x.x <=16.x.x",