From 1352c1fb82bae3a48bb8bbc717d2b55da6edcf64 Mon Sep 17 00:00:00 2001 From: soupette Date: Tue, 22 Mar 2022 12:01:17 +0100 Subject: [PATCH] Fixes #12896 Signed-off-by: soupette --- examples/getstarted/package.json | 22 +- examples/kitchensink-ts/package.json | 12 +- packages/core/admin/index.js | 2 +- packages/core/admin/utils/create-cache-dir.js | 25 +- .../admin/utils/get-custom-app-config-file.js | 23 ++ .../core/admin/utils/should-build-admin.js | 7 +- yarn.lock | 371 ++++++++++++++++++ 7 files changed, 429 insertions(+), 33 deletions(-) create mode 100644 packages/core/admin/utils/get-custom-app-config-file.js diff --git a/examples/getstarted/package.json b/examples/getstarted/package.json index f3633ecf9b..4dd6089316 100644 --- a/examples/getstarted/package.json +++ b/examples/getstarted/package.json @@ -12,17 +12,17 @@ "strapi": "strapi" }, "dependencies": { - "@strapi/admin": "4.2.0-beta.0", - "@strapi/plugin-documentation": "4.2.0-beta.0", - "@strapi/plugin-graphql": "4.2.0-beta.0", - "@strapi/plugin-i18n": "4.2.0-beta.0", - "@strapi/plugin-sentry": "4.2.0-beta.0", - "@strapi/plugin-users-permissions": "4.2.0-beta.0", - "@strapi/provider-email-mailgun": "4.2.0-beta.0", - "@strapi/provider-upload-aws-s3": "4.2.0-beta.0", - "@strapi/provider-upload-cloudinary": "4.2.0-beta.0", - "@strapi/strapi": "4.2.0-beta.0", - "@strapi/utils": "4.2.0-beta.0", + "@strapi/admin": "4.1.4", + "@strapi/plugin-documentation": "4.1.4", + "@strapi/plugin-graphql": "4.1.4", + "@strapi/plugin-i18n": "4.1.4", + "@strapi/plugin-sentry": "4.1.4", + "@strapi/plugin-users-permissions": "4.1.4", + "@strapi/provider-email-mailgun": "4.1.4", + "@strapi/provider-upload-aws-s3": "4.1.4", + "@strapi/provider-upload-cloudinary": "4.1.4", + "@strapi/strapi": "4.1.4", + "@strapi/utils": "4.1.4", "lodash": "4.17.21", "mysql": "2.18.1", "passport-google-oauth2": "0.2.0", diff --git a/examples/kitchensink-ts/package.json b/examples/kitchensink-ts/package.json index 7f79933b26..cc2f27a9e7 100644 --- a/examples/kitchensink-ts/package.json +++ b/examples/kitchensink-ts/package.json @@ -12,12 +12,12 @@ "strapi": "strapi" }, "dependencies": { - "@strapi/admin": "4.2.0-beta.0", - "@strapi/provider-email-mailgun": "4.2.0-beta.0", - "@strapi/provider-upload-aws-s3": "4.2.0-beta.0", - "@strapi/provider-upload-cloudinary": "4.2.0-beta.0", - "@strapi/strapi": "4.2.0-beta.0", - "@strapi/utils": "4.2.0-beta.0", + "@strapi/admin": "4.1.4", + "@strapi/provider-email-mailgun": "4.1.4", + "@strapi/provider-upload-aws-s3": "4.1.4", + "@strapi/provider-upload-cloudinary": "4.1.4", + "@strapi/strapi": "4.1.4", + "@strapi/utils": "4.1.4", "lodash": "4.17.21", "mysql": "2.18.1", "passport-google-oauth2": "0.2.0", diff --git a/packages/core/admin/index.js b/packages/core/admin/index.js index 03a237e909..cf76b298a6 100644 --- a/packages/core/admin/index.js +++ b/packages/core/admin/index.js @@ -41,7 +41,7 @@ async function build({ ceRoot: path.resolve(cacheDir, 'admin', 'src'), }; - const pluginsPath = Object.keys(plugins).map(pluginName => plugins[pluginName].appPathToPlugin ); + const pluginsPath = Object.keys(plugins).map(pluginName => plugins[pluginName].appPathToPlugin); const config = getCustomWebpackConfig(appDir, { appDir, diff --git a/packages/core/admin/utils/create-cache-dir.js b/packages/core/admin/utils/create-cache-dir.js index fc3af70281..c5a94d6233 100644 --- a/packages/core/admin/utils/create-cache-dir.js +++ b/packages/core/admin/utils/create-cache-dir.js @@ -3,6 +3,7 @@ const path = require('path'); const _ = require('lodash'); const fs = require('fs-extra'); +const getCustomAppConfigFile = require('./get-custom-app-config-file'); const getPkgPath = name => path.dirname(require.resolve(`${name}/package.json`)); @@ -82,26 +83,26 @@ async function createCacheDir({ appDir, plugins, useTypeScript }) { // copy admin core code await copyAdmin(cacheDir); - // Copy app.js or app.tsx if typescript is enabled - const customAdminConfigJSFilePath = path.join(appDir, 'src', 'admin', 'app.js'); - const customAdminConfigTSXFilePath = path.join(appDir, 'src', 'admin', 'app.tsx'); - const customAdminConfigFilePath = useTypeScript - ? customAdminConfigTSXFilePath - : customAdminConfigJSFilePath; + // Retrieve the custom config file extension + const customAdminAppConfigFile = await getCustomAppConfigFile(appDir, useTypeScript); - if (fs.existsSync(customAdminConfigFilePath)) { + if (customAdminAppConfigFile !== undefined) { const defaultAdminConfigFilePath = path.resolve(cacheDir, 'admin', 'src', 'app.js'); + const customAdminAppConfigFilePath = path.join( + appDir, + 'src', + 'admin', + customAdminAppConfigFile + ); + const dest = path.resolve(cacheDir, 'admin', 'src', customAdminAppConfigFile); if (useTypeScript) { // Remove the default config file await fs.remove(defaultAdminConfigFilePath); // Copy the custom one - await fs.copy( - customAdminConfigTSXFilePath, - path.resolve(cacheDir, 'admin', 'src', 'app.tsx') - ); + await fs.copy(customAdminAppConfigFilePath, dest); } else { - await fs.copy(customAdminConfigFilePath, path.resolve(cacheDir, 'admin', 'src', 'app.js')); + await fs.copy(customAdminAppConfigFilePath, dest); } } diff --git a/packages/core/admin/utils/get-custom-app-config-file.js b/packages/core/admin/utils/get-custom-app-config-file.js new file mode 100644 index 0000000000..1c3fc53364 --- /dev/null +++ b/packages/core/admin/utils/get-custom-app-config-file.js @@ -0,0 +1,23 @@ +'use strict'; + +const { join } = require('path'); +const fse = require('fs-extra'); + +/** + * Retrieve the custom admin entry file name + * @param {String} dir + * @param {Boolean} useTypeScript + * @returns String + */ +const getCustomAppConfigFile = async (dir, useTypeScript) => { + const adminSrcPath = join(dir, 'src', 'admin'); + const files = await fse.readdir(adminSrcPath); + + if (useTypeScript) { + return files.find(file => file.match(/app.tsx?$/)); + } + + return files.find(file => file.match(/app.jsx?$/)); +}; + +module.exports = getCustomAppConfigFile; diff --git a/packages/core/admin/utils/should-build-admin.js b/packages/core/admin/utils/should-build-admin.js index 6f8993ef37..3e841273d4 100644 --- a/packages/core/admin/utils/should-build-admin.js +++ b/packages/core/admin/utils/should-build-admin.js @@ -2,6 +2,7 @@ const path = require('path'); const fs = require('fs-extra'); +const getCustomAppConfigFile = require('./get-custom-app-config-file'); const DEFAULT_PLUGINS = [ 'content-type-builder', @@ -31,11 +32,11 @@ const hasNonDefaultPlugins = plugins => { const hasCustomAdminCode = async (dir, useTypeScript) => { const customAdminPath = path.join(dir, 'src', 'admin'); - const customAdminConfigFileExtension = useTypeScript ? 'app.tsx' : 'app.js'; - const customAdminConfigFile = path.join(customAdminPath, customAdminConfigFileExtension); + + const customAdminAppConfigFile = await getCustomAppConfigFile(dir, useTypeScript); const customAdminWebpackFile = path.join(customAdminPath, 'webpack.config.js'); - const hasCustomConfigFile = await fs.pathExists(customAdminConfigFile); + const hasCustomConfigFile = customAdminAppConfigFile !== undefined; const hasCustomWebpackFile = await fs.pathExists(customAdminWebpackFile); return hasCustomConfigFile || hasCustomWebpackFile; diff --git a/yarn.lock b/yarn.lock index bbed4cef75..911020b1d6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4973,6 +4973,130 @@ resolve-from "^5.0.0" store2 "^2.12.0" +"@strapi/admin@4.2.0-beta.0": + version "4.2.0-beta.0" + resolved "https://registry.yarnpkg.com/@strapi/admin/-/admin-4.2.0-beta.0.tgz#537a5d1dae20acb2c0881b4cd2847a264f0e2b0f" + integrity sha512-zNK5jopdnfpwWZ6qHFOSNXenrKIlW1oMzYM6H//SITFD5SH2sMINcJvlyejXGujxvb8Cxm6dKD9HQHlN8wotfw== + dependencies: + "@babel/core" "7.16.7" + "@babel/plugin-proposal-async-generator-functions" "7.16.7" + "@babel/plugin-proposal-class-properties" "7.16.7" + "@babel/plugin-syntax-dynamic-import" "7.8.3" + "@babel/plugin-transform-modules-commonjs" "7.16.7" + "@babel/plugin-transform-runtime" "7.16.7" + "@babel/preset-env" "7.16.7" + "@babel/preset-react" "7.16.7" + "@babel/runtime" "7.16.7" + "@casl/ability" "^5.4.3" + "@fingerprintjs/fingerprintjs" "3.3.2" + "@fortawesome/fontawesome-free" "^5.15.3" + "@fortawesome/fontawesome-svg-core" "^1.2.35" + "@fortawesome/free-brands-svg-icons" "^5.15.3" + "@fortawesome/free-solid-svg-icons" "^5.15.3" + "@fortawesome/react-fontawesome" "^0.1.14" + "@strapi/babel-plugin-switch-ee-ce" "4.2.0-beta.0" + "@strapi/design-system" "0.0.1-alpha.79" + "@strapi/helper-plugin" "4.2.0-beta.0" + "@strapi/icons" "0.0.1-alpha.79" + "@strapi/utils" "4.2.0-beta.0" + axios "0.24.0" + babel-loader "8.2.3" + babel-plugin-styled-components "2.0.2" + bcryptjs "2.4.3" + chalk "^4.1.1" + chokidar "^3.5.1" + codemirror "^5.61.0" + cross-env "^7.0.3" + css-loader "6.5.1" + date-fns "2.22.1" + dotenv "8.5.1" + esbuild-loader "2.18.0" + execa "^1.0.0" + fast-deep-equal "3.1.3" + font-awesome "^4.7.0" + fork-ts-checker-webpack-plugin "7.2.1" + formik "^2.2.6" + fs-extra "10.0.0" + highlight.js "^10.4.1" + history "^4.9.0" + hoist-non-react-statics "^3.3.0" + html-loader "3.0.1" + html-webpack-plugin "5.5.0" + immer "9.0.6" + invariant "^2.2.4" + is-wsl "2.2.0" + js-cookie "2.2.1" + jsonwebtoken "8.5.1" + koa-compose "4.1.0" + koa-passport "4.1.4" + koa-static "5.0.0" + lodash "4.17.21" + markdown-it "^12.3.2" + markdown-it-abbr "^1.0.4" + markdown-it-container "^3.0.0" + markdown-it-deflist "^2.1.0" + markdown-it-emoji "^2.0.0" + markdown-it-footnote "^3.0.3" + markdown-it-ins "^3.0.1" + markdown-it-mark "^3.0.1" + markdown-it-sub "^1.0.0" + markdown-it-sup "1.0.0" + match-sorter "^4.0.2" + mini-css-extract-plugin "2.4.4" + moment "^2.29.1" + node-polyfill-webpack-plugin "1.1.4" + p-map "4.0.0" + passport-local "1.0.0" + prop-types "^15.7.2" + qs "6.10.1" + react "^17.0.2" + react-copy-to-clipboard "^5.0.3" + react-dnd "^14.0.2" + react-dnd-html5-backend "^14.0.0" + react-dom "^17.0.2" + react-error-boundary "3.1.1" + react-fast-compare "^3.2.0" + react-helmet "^6.1.0" + react-intl "5.20.2" + react-query "3.24.3" + react-redux "7.2.3" + react-router "5.2.0" + react-router-dom "5.2.0" + react-select "^4.0.2" + react-virtualized "^9.22.3" + redux "^4.0.1" + redux-saga "^0.16.0" + reselect "^4.0.0" + rimraf "3.0.2" + sanitize-html "2.4.0" + semver "7.3.5" + sift "13.5.0" + style-loader "3.3.1" + styled-components "^5.2.3" + terser-webpack-plugin "5.3.0" + webpack "5.65.0" + webpack-cli "4.9.1" + webpack-dev-server "4.7.3" + webpackbar "5.0.0-3" + yup "^0.32.9" + +"@strapi/babel-plugin-switch-ee-ce@4.2.0-beta.0": + version "4.2.0-beta.0" + resolved "https://registry.yarnpkg.com/@strapi/babel-plugin-switch-ee-ce/-/babel-plugin-switch-ee-ce-4.2.0-beta.0.tgz#4ae4f725bd39fc5bea89d78804541ed2f0809868" + integrity sha512-pWvsbGTcuCvpnUZhNpAUsbAZ0OShvVOgzub+le27PbscHuC244MpGwwtyjVmhNFGGXVd+wr6Hk5nKogA48wLmw== + +"@strapi/database@4.2.0-beta.0": + version "4.2.0-beta.0" + resolved "https://registry.yarnpkg.com/@strapi/database/-/database-4.2.0-beta.0.tgz#518df716f96d4f3776567e3dccb19f05f8a1660b" + integrity sha512-HTVlQP3+e++pCnQviRHaL/xy60SEKuVV+BDDKorEvN6O5tqYPXkx1ZkZXhypL8vfP3JQd7j6ZSJm1RQ3uM+tCw== + dependencies: + date-fns "2.22.1" + debug "4.3.1" + fs-extra "10.0.0" + knex "0.95.6" + lodash "4.17.21" + umzug "2.3.0" + "@strapi/design-system@0.0.1-alpha.79": version "0.0.1-alpha.79" resolved "https://registry.yarnpkg.com/@strapi/design-system/-/design-system-0.0.1-alpha.79.tgz#23e6a7f73383b72148c926fa74ed0ba1acc32f0a" @@ -4982,6 +5106,64 @@ compute-scroll-into-view "^1.0.17" prop-types "^15.7.2" +"@strapi/generate-new@4.2.0-beta.0": + version "4.2.0-beta.0" + resolved "https://registry.yarnpkg.com/@strapi/generate-new/-/generate-new-4.2.0-beta.0.tgz#86862d7713f54b56cb737856ffa0a6c3f55de53e" + integrity sha512-uiJrlUmYDX8461LJ/vIdLlEbRxYZuySPdwK3mGRXqtwqYBHZI7HgiHj/o5rWVkXXcWJywOZaoZNGLAu4p0uwTA== + dependencies: + "@sentry/node" "6.3.0" + chalk "^4.1.1" + execa "^1.0.0" + fs-extra "10.0.0" + inquirer "8.2.0" + lodash "4.17.21" + node-fetch "^2.6.1" + node-machine-id "^1.1.10" + ora "^5.4.0" + tar "6.1.11" + uuid "^3.3.2" + +"@strapi/generators@4.2.0-beta.0": + version "4.2.0-beta.0" + resolved "https://registry.yarnpkg.com/@strapi/generators/-/generators-4.2.0-beta.0.tgz#4d35a1dcc00c6d7771a8509c7f0e777a0fdc587f" + integrity sha512-KePrXfpxJNzPFAAR3S/jdyVlsY4eVwMvwRmXVmhQmXBSIMJMzzdahgG0a7zRTkCcog4dQTPwC9VGADcQJD20pw== + dependencies: + "@sindresorhus/slugify" "1.1.0" + "@strapi/typescript-utils" "4.2.0-beta.0" + "@strapi/utils" "4.2.0-beta.0" + chalk "4.1.2" + fs-extra "10.0.0" + node-plop "0.26.3" + plop "2.7.6" + pluralize "8.0.0" + +"@strapi/helper-plugin@4.2.0-beta.0": + version "4.2.0-beta.0" + resolved "https://registry.yarnpkg.com/@strapi/helper-plugin/-/helper-plugin-4.2.0-beta.0.tgz#787268de66956466fe3f0fbf77c491add3f495cc" + integrity sha512-tDn9ggXlLOLWFYKbW5j85p1wPNa7WH61c4TLAWwF16ouhcv/zx6jKe2jNSHWfpflKBKwUtQsh3eSh3c5RjmXqw== + dependencies: + "@fortawesome/fontawesome-free" "^5.15.2" + "@fortawesome/fontawesome-svg-core" "^1.2.35" + "@fortawesome/free-brands-svg-icons" "^5.15.2" + "@fortawesome/free-solid-svg-icons" "^5.15.3" + "@fortawesome/react-fontawesome" "^0.1.14" + axios "0.25.0" + babel-plugin-styled-components "2.0.2" + formik "2.2.9" + invariant "^2.2.1" + lodash "4.17.21" + match-sorter "^4.0.2" + mini-css-extract-plugin "2.4.4" + moment "^2.29.1" + react "^17.0.2" + react-dom "^17.0.2" + react-helmet "^6.1.0" + react-intl "5.20.2" + react-router "^5.2.0" + react-router-dom "5.2.0" + styled-components "^5.2.3" + whatwg-fetch "^3.6.2" + "@strapi/icons@0.0.1-alpha.79": version "0.0.1-alpha.79" resolved "https://registry.yarnpkg.com/@strapi/icons/-/icons-0.0.1-alpha.79.tgz#eff8790ea3897419489a61cbfd72a436661d1420" @@ -4989,6 +5171,195 @@ dependencies: rimraf "^3.0.2" +"@strapi/logger@4.2.0-beta.0": + version "4.2.0-beta.0" + resolved "https://registry.yarnpkg.com/@strapi/logger/-/logger-4.2.0-beta.0.tgz#bdb6d08b90ee2a2199804d931e8a493222056972" + integrity sha512-yIJa9w2kbzLYMyU/NFB3Ss4bB9D+Z6LK+NVWGXdtaaPQ0pFXYOgaFY1t/kE3BY9xL6exB34gizwNLaQJ58dZqQ== + dependencies: + lodash "4.17.21" + winston "3.3.3" + +"@strapi/plugin-content-manager@4.2.0-beta.0": + version "4.2.0-beta.0" + resolved "https://registry.yarnpkg.com/@strapi/plugin-content-manager/-/plugin-content-manager-4.2.0-beta.0.tgz#c9844b556df12c49654f3e8e3718b0df51014e38" + integrity sha512-zPXNxqpCYyDk1yNqRb3jIemWqWrlrtEOQ7CiBSGKzRC1PTbvidrVQroPRVTgEHBfNTQVTfq+LDLvOt0wGJpyig== + dependencies: + "@sindresorhus/slugify" "1.1.0" + "@strapi/utils" "4.2.0-beta.0" + lodash "4.17.21" + +"@strapi/plugin-content-type-builder@4.2.0-beta.0": + version "4.2.0-beta.0" + resolved "https://registry.yarnpkg.com/@strapi/plugin-content-type-builder/-/plugin-content-type-builder-4.2.0-beta.0.tgz#5ce112f520b24b5b8152718341b489ed1689ac58" + integrity sha512-uiQZJgoTAKN3MCB9l4BXAkBjmM3TuwVXpwgcaQxS1ybHo2SGFX9w1cq4y2z3Xt3uFGjJT7gGXjOAuLvgriD15w== + dependencies: + "@sindresorhus/slugify" "1.1.0" + "@strapi/generators" "4.2.0-beta.0" + "@strapi/helper-plugin" "4.2.0-beta.0" + "@strapi/utils" "4.2.0-beta.0" + fs-extra "10.0.0" + lodash "4.17.21" + pluralize "^8.0.0" + react "^17.0.2" + react-dom "^17.0.2" + react-intl "5.20.2" + react-redux "7.2.3" + react-router "^5.2.0" + react-router-dom "5.2.0" + redux "^4.0.1" + reselect "^4.0.0" + yup "^0.32.9" + +"@strapi/plugin-email@4.2.0-beta.0": + version "4.2.0-beta.0" + resolved "https://registry.yarnpkg.com/@strapi/plugin-email/-/plugin-email-4.2.0-beta.0.tgz#2fe0a40b02e72df04062831ec8d7ea9f4d9bb315" + integrity sha512-9iUO5stOiwfYQQXaK/acdMqJY0OxlZkRbR8F3UfWDeMXELCzCD/YLn3YsKw6qVvnlYg5RnI/9yqgP32oRhKx2A== + dependencies: + "@strapi/provider-email-sendmail" "4.2.0-beta.0" + "@strapi/utils" "4.2.0-beta.0" + lodash "4.17.21" + +"@strapi/plugin-upload@4.2.0-beta.0": + version "4.2.0-beta.0" + resolved "https://registry.yarnpkg.com/@strapi/plugin-upload/-/plugin-upload-4.2.0-beta.0.tgz#d4f766491b43570c32159295918ed1ecd5786d76" + integrity sha512-eipDx3BASomnM8zE8bQoeI/x8bD+mJdKaZzQZcNz2I7gqXTX28ODOAdxDFfQnSq4+9JiL2teQfeLEvz6N2bf/g== + dependencies: + "@strapi/helper-plugin" "4.2.0-beta.0" + "@strapi/provider-upload-local" "4.2.0-beta.0" + "@strapi/utils" "4.2.0-beta.0" + byte-size "7.0.1" + cropperjs "1.5.11" + fs-extra "10.0.0" + immer "9.0.6" + koa-range "0.3.0" + koa-static "5.0.0" + lodash "4.17.21" + react "^17.0.2" + react-copy-to-clipboard "^5.0.3" + react-dom "^17.0.2" + react-intl "5.20.2" + react-redux "7.2.3" + react-router "^5.2.0" + react-router-dom "5.2.0" + sharp "0.30.1" + +"@strapi/provider-email-mailgun@4.2.0-beta.0": + version "4.2.0-beta.0" + resolved "https://registry.yarnpkg.com/@strapi/provider-email-mailgun/-/provider-email-mailgun-4.2.0-beta.0.tgz#aef92ee50841300215e0cc79edfeba6d0b4e0dd4" + integrity sha512-OQ/k0hjxw2STlPPjK/uhmYiAU8aVEAn9zJMQo/5ehBpKXUO71fqQsSOIT6k/uUYBV6tmgZC/fkzObh/SgzaOEQ== + dependencies: + "@strapi/utils" "4.2.0-beta.0" + mailgun-js "0.22.0" + +"@strapi/provider-email-sendmail@4.2.0-beta.0": + version "4.2.0-beta.0" + resolved "https://registry.yarnpkg.com/@strapi/provider-email-sendmail/-/provider-email-sendmail-4.2.0-beta.0.tgz#534e4a21e913e51c469be0e4739ba83b3045e345" + integrity sha512-HXhP/zPU/3e58SKiOkm30o/kmvhEsKjZrRr82j48JDbkgGxZWg29KqOFb2lq4GREXkl2xvVZQ2brwOVk+ZgN9A== + dependencies: + "@strapi/utils" "4.2.0-beta.0" + sendmail "^1.6.1" + +"@strapi/provider-upload-aws-s3@4.2.0-beta.0": + version "4.2.0-beta.0" + resolved "https://registry.yarnpkg.com/@strapi/provider-upload-aws-s3/-/provider-upload-aws-s3-4.2.0-beta.0.tgz#4a1b73b09f59496f5b818cb19cfddd6990f64738" + integrity sha512-l4QvHb1mupnhNLmhQgujFzYbWYJoec0ifRLpKDXnzVfXSN/PH908h+6lNbiMCnXfbfCjKrVZpxlQCpGKZlgcmg== + dependencies: + aws-sdk "2.892.0" + lodash "4.17.21" + +"@strapi/provider-upload-cloudinary@4.2.0-beta.0": + version "4.2.0-beta.0" + resolved "https://registry.yarnpkg.com/@strapi/provider-upload-cloudinary/-/provider-upload-cloudinary-4.2.0-beta.0.tgz#190728ddf3ad1f1e352d2734771779befa338a6d" + integrity sha512-GsUC6NzW7DbQCBcKy9FjiM5Ezj1ng3qKBqDV8EiEEXJUDigjiLJHGqUbquIJrP1OMSn1oGl3qxYcBHj1z31+7w== + dependencies: + "@strapi/utils" "4.2.0-beta.0" + cloudinary "^1.25.1" + into-stream "^5.1.0" + +"@strapi/provider-upload-local@4.2.0-beta.0": + version "4.2.0-beta.0" + resolved "https://registry.yarnpkg.com/@strapi/provider-upload-local/-/provider-upload-local-4.2.0-beta.0.tgz#16e3e174543a617963e6110a9d0a78d7500f5a50" + integrity sha512-NQjbRtBaYX7jcgQoZo4/iIKwAjpGhSzQ+mpLDVf/C0eGeGO0S2cE1Zpf3FAybnt295pqmghCjm7XVL/euz+Ozg== + dependencies: + "@strapi/utils" "4.2.0-beta.0" + +"@strapi/strapi@4.2.0-beta.0": + version "4.2.0-beta.0" + resolved "https://registry.yarnpkg.com/@strapi/strapi/-/strapi-4.2.0-beta.0.tgz#c44f7ad611ce1cef40532c3a6c406fb6b740e688" + integrity sha512-m1fEP8CfcyEnHvjFsikHmbtWeHw58dRIieVHdWTOfZyIZVaizmUyFqhGbRlfUcpQ8zR6c25wtLUoo0oJvM0l8Q== + dependencies: + "@koa/cors" "3.1.0" + "@koa/router" "10.1.1" + "@strapi/admin" "4.2.0-beta.0" + "@strapi/database" "4.2.0-beta.0" + "@strapi/generate-new" "4.2.0-beta.0" + "@strapi/generators" "4.2.0-beta.0" + "@strapi/logger" "4.2.0-beta.0" + "@strapi/plugin-content-manager" "4.2.0-beta.0" + "@strapi/plugin-content-type-builder" "4.2.0-beta.0" + "@strapi/plugin-email" "4.2.0-beta.0" + "@strapi/plugin-upload" "4.2.0-beta.0" + "@strapi/typescript-utils" "4.2.0-beta.0" + "@strapi/utils" "4.2.0-beta.0" + bcryptjs "2.4.3" + boxen "5.1.2" + chalk "4.1.2" + chokidar "3.5.2" + ci-info "3.2.0" + cli-table3 "0.6.1" + 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" + http-errors "1.8.0" + inquirer "8.2.0" + 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.7" + 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" + statuses "2.0.1" + uuid "^3.3.2" + +"@strapi/typescript-utils@4.2.0-beta.0": + version "4.2.0-beta.0" + resolved "https://registry.yarnpkg.com/@strapi/typescript-utils/-/typescript-utils-4.2.0-beta.0.tgz#9e667bb370df396e2ee52a8588fa8b64724f42b9" + integrity sha512-bTk3F6UxmBMRFaNtX8COSii3kChZohN1A/Juq3kAR3nh7z2zClWfWUlfBvbVgx7N41Xl0mfg75WKSRnyCT3kHw== + dependencies: + fs-extra "10.0.1" + lodash "4.17.21" + typescript "4.6.2" + +"@strapi/utils@4.2.0-beta.0": + version "4.2.0-beta.0" + resolved "https://registry.yarnpkg.com/@strapi/utils/-/utils-4.2.0-beta.0.tgz#312bfb67aa895c1a11e1a7a9cbdb3275791cb760" + integrity sha512-si6xLONWeRZdayOAVNcLodbGJlv4KwC96XGUViQgdHx1fNh5+ar/BcH7DF9uG4U7t7RVS5LiPtr3rZfB9BlGzw== + dependencies: + "@sindresorhus/slugify" "1.1.0" + date-fns "2.24.0" + http-errors "1.8.0" + lodash "4.17.21" + yup "0.32.9" + "@stylelint/postcss-css-in-js@^0.37.2": version "0.37.2" resolved "https://registry.yarnpkg.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz#7e5a84ad181f4234a2480803422a47b8749af3d2"