From 48a07d4008a9ef54a64e5415c900f6aa097ec2c4 Mon Sep 17 00:00:00 2001 From: Max Helmetag Date: Wed, 30 Oct 2019 00:40:31 -0700 Subject: [PATCH 01/20] remove old admin panel warning --- CONTRIBUTING.md | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f02f223283..e10268beb5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -88,16 +88,7 @@ yarn develop The server (API) is available at http://localhost:1337 -**WARNING** ⚠️ If you've followed the recommended setup, you should not be able to reach the administration panel at http://localhost:1337/admin. - -**Start the administration panel server** - -```bash -cd strapi/packages/strapi-admin -yarn develop -``` - -The administration panel is available at http://localhost:4000/admin +The administration panel is available at http://localhost:1337/admin **Awesome! You are now able to contribute to Strapi.** From 378f8426406d54f409aa200e35351b3f347f8fef Mon Sep 17 00:00:00 2001 From: Sulakin Vadim Date: Sat, 23 Nov 2019 23:38:41 +0300 Subject: [PATCH 02/20] Update Russian translation for admin panel --- .../admin/src/translations/ru.json | 108 ++++++++++-------- 1 file changed, 61 insertions(+), 47 deletions(-) diff --git a/packages/strapi-admin/admin/src/translations/ru.json b/packages/strapi-admin/admin/src/translations/ru.json index 33eaed1a3d..c4fa7e45e8 100644 --- a/packages/strapi-admin/admin/src/translations/ru.json +++ b/packages/strapi-admin/admin/src/translations/ru.json @@ -1,47 +1,47 @@ { "Analytics": "Аналитика", "Content Manager": "Редактор контента", - "Content Type Builder": "Типы Контента", + "Content Type Builder": "Конструктор типов контента", "Documentation": "Документация", - "Email": "Email", + "Email": "E-mail", "Files Upload": "Загрузка файлов", - "HomePage.notification.newsLetter.success": "Успешная подписка на рассылку новостей", + "HomePage.notification.newsLetter.success": "Успешная подписка на новостную рассылку", "New entry": "Новая запись", "Password": "Пароль", "Provider": "Провайдер", - "ResetPasswordToken": "Сбросить токен пароля", + "ResetPasswordToken": "Сброс токена пароля", "Role": "Роль", "Roles & Permissions": "Роли и доступы", "Settings Manager": "Менеджер Настроек", "Username": "Имя пользователя", "Users": "Пользователи", - "Users & Permissions": "Пользователи & Доступы", + "Users & Permissions": "Пользователи и доступы", "app.components.BlockLink.code": "Примеры кода", "app.components.BlockLink.code.content": "Обучайтесь на реальных проектах, разработанных в сообществе.", - "app.components.BlockLink.documentation": "Прочитать документацию", + "app.components.BlockLink.documentation": "Читать документацию", "app.components.BlockLink.documentation.content": "Ознакомьтесь с концепциями, справочниками и обучающими материалами.", "app.components.Button.cancel": "Отменить", "app.components.Button.save": "Сохранить", "app.components.ComingSoonPage.comingSoon": "Скоро", - "app.components.ComingSoonPage.featuresNotAvailable": "Этот функционал все еще находится в стадии активной разработки.", + "app.components.ComingSoonPage.featuresNotAvailable": "Этот функционал все еще находится в активной разработке.", "app.components.DownloadInfo.download": "Выполняется загрузка...", "app.components.DownloadInfo.text": "Это может занять около минуты. Спасибо за ваше терпение.", "app.components.EmptyAttributes.title": "Пока нет полей", "app.components.HomePage.button.blog": "СМОТРИТЕ БОЛЬШЕ В БЛОГЕ", "app.components.HomePage.button.quickStart": "ОЗНАКОМИТЬСЯ С РУКОВОДСТВОМ ПО БЫСТРОМУ СТАРТУ", "app.components.HomePage.community": "Найдите сообщество в интернете", - "app.components.HomePage.community.content": "Обсуждайте с членами команды и разработчиками в разных каналах", + "app.components.HomePage.community.content": "Обсуждайте с членами команды и разработчиками в разных каналах.", "app.components.HomePage.create": "Создайте ваш первый Тип Контента", "app.components.HomePage.createBlock.content.first": " ", - "app.components.HomePage.createBlock.content.second": " — плагин, который поможет вам определить структуру ваших данных. Если вы новичок, мы настоятельно рекомендуем вам изучить наше ", + "app.components.HomePage.createBlock.content.second": " — плагин, который поможет вам определить структуру ваших моделей данных. Если вы новичок, мы настоятельно рекомендуем вам изучить наше ", "app.components.HomePage.createBlock.content.tutorial": " руководство.", - "app.components.HomePage.cta": "ПОДПИСАТЬСЯ", + "app.components.HomePage.cta": "ПОДТВЕРДИТЬ", "app.components.HomePage.newsLetter": "Подпишитесь на рассылку, чтобы быть в курсе новостей Strapi", "app.components.HomePage.support": "ПОДДЕРЖИТЕ НАС", "app.components.HomePage.support.content": "Покупая футболку, вы помогаете нам продолжать работу над проектом и предоставлять вам наилучшее из возможных решений!", "app.components.HomePage.support.link": "ЗАКАЗАТЬ ФУТБОЛКУ СЕЙЧАС", - "app.components.HomePage.welcome": "Добро пожаловать!", - "app.components.HomePage.welcome.again": "Добро пожаловать, ", + "app.components.HomePage.welcome": "Добро пожаловать на борт!", + "app.components.HomePage.welcome.again": "Добро пожаловать ", "app.components.HomePage.welcomeBlock.content": "Мы рады, что вы присоединились к сообществу. Нам необходима обратная связь для развития проекта, поэтому не стесняйтесь писать нам в ", "app.components.HomePage.welcomeBlock.content.again": "Надеемся, что вы делаете успехи в вашем проекте... Следите за последними новостями Strapi. Мы стараемся изо всех сил, чтобы улучшить продукт, основываясь на ваших пожеланиях.", "app.components.HomePage.welcomeBlock.content.issues": "проблемах.", @@ -50,14 +50,14 @@ "app.components.ImgPreview.hint.browse": "выберите", "app.components.InputFile.newFile": "Добавить новый файл", "app.components.InputFileDetails.open": "Открыть в новой вкладке", - "app.components.InputFileDetails.originalName": "Первоначальное название:", + "app.components.InputFileDetails.originalName": "Оригинальное название:", "app.components.InputFileDetails.remove": "Удалить этот файл", "app.components.InputFileDetails.size": "Размер:", "app.components.InstallPluginPage.Download.title": "Загрузка...", "app.components.InstallPluginPage.Download.description": "Для загрузки и установки плагина может потребоваться несколько секунд.", "app.components.InstallPluginPage.InputSearch.label": " ", - "app.components.InstallPluginPage.InputSearch.placeholder": "Искать плагин... (ex: authentication)", - "app.components.InstallPluginPage.description": "Расширяйте ваше приложение без усилий.", + "app.components.InstallPluginPage.InputSearch.placeholder": "Поиск плагина... (например: аутентификация)", + "app.components.InstallPluginPage.description": "Расширяйте ваше приложение без особых усилий.", "app.components.InstallPluginPage.helmet": "Магазин - Плагины", "app.components.InstallPluginPage.plugin.support-us.description": "Поддержите нас, купив футболку Strapi. Это поможет нам продолжать работу над проектом, чтобы предоставить вам наилучшее из возможных решений!", "app.components.InstallPluginPage.title": "Магазин - Плагины", @@ -65,9 +65,9 @@ "app.components.InstallPluginPopup.navLink.avis": "avis", "app.components.InstallPluginPopup.navLink.changelog": "журнал изменений", "app.components.InstallPluginPopup.navLink.description": "Описание", - "app.components.InstallPluginPopup.navLink.faq": "faq", + "app.components.InstallPluginPopup.navLink.faq": "ФАК", "app.components.InstallPluginPopup.navLink.screenshots": "Скриншоты", - "app.components.InstallPluginPopup.noDescription": "Нет описания", + "app.components.InstallPluginPopup.noDescription": "Нет доступного описания", "app.components.LeftMenuFooter.documentation": "Документация", "app.components.LeftMenuFooter.help": "Помощь", "app.components.LeftMenuFooter.poweredBy": "Работает на ", @@ -77,7 +77,7 @@ "app.components.LeftMenuLinkContainer.listPlugins": "Плагины", "app.components.LeftMenuLinkContainer.noPluginsInstalled": "Нет установленных плагинов", "app.components.LeftMenuLinkContainer.plugins": "Плагины", - "app.components.ListPluginsPage.description": "Список установленных плагинов.", + "app.components.ListPluginsPage.description": "Список установленных плагинов в проекте.", "app.components.ListPluginsPage.helmet.title": "Список плагинов", "app.components.ListPluginsPage.title": "Плагины", "app.components.Logout.admin": "Управлять администраторами", @@ -94,8 +94,8 @@ "app.components.PluginCard.compatible": "Совместимо с вашим приложением", "app.components.PluginCard.compatibleCommunity": "Совместимо с сообществом", "app.components.PluginCard.more-details": "Больше деталей", - "app.components.PluginCard.PopUpWarning.install.impossible.autoReload.needed": "Функция автоматической перезагрузки должна быть отключена. Пожалуйста, запустите ваше приложение с помощью `yarn develop`.", - "app.components.PluginCard.PopUpWarning.install.impossible.environment": "В целях безопасности плагин может быть загружен только в develop-окружении.", + "app.components.PluginCard.PopUpWarning.install.impossible.autoReload.needed": "Функция autoReload (автоматической перезагрузки) должна быть отключена. Пожалуйста, запустите ваше приложение с помощью `yarn develop`.", + "app.components.PluginCard.PopUpWarning.install.impossible.environment": "В целях безопасности плагин может быть загружен только в среде разработки.", "app.components.PluginCard.PopUpWarning.install.impossible.confirm": "Я понимаю!", "app.components.PluginCard.PopUpWarning.install.impossible.title": "Загрузка невозможна", "app.components.PluginCard.price.free": "Бесплатно", @@ -104,7 +104,7 @@ "app.components.listPlugins.title.none": "Нет установленных плагинов", "app.components.listPlugins.title.plural": "{number} плагинов установлено", "app.components.listPlugins.title.singular": "{number} плагин установлен", - "app.components.listPluginsPage.deletePlugin.error": "Возникла ошибка при установке плагина", + "app.components.listPluginsPage.deletePlugin.error": "Произошла ошибка при удалении плагина", "app.utils.SelectOption.defaultMessage": " ", "app.utils.defaultMessage": " ", "app.utils.placeholder.defaultMessage": " ", @@ -118,23 +118,24 @@ "components.Input.error.custom-error": "{errorMessage} ", "components.Input.error.validation.email": "Это не адрес электронной почты", "components.Input.error.validation.json": "Не соответствует JSON формату", - "components.Input.error.validation.max": "Слишком большое.", - "components.Input.error.validation.maxLength": "Слишком длинное.", - "components.Input.error.validation.min": "Слишком маленькое.", - "components.Input.error.validation.minLength": "Слишком короткое.", + "components.Input.error.validation.max": "Значение слишком большое.", + "components.Input.error.validation.maxLength": "Значение слишком длинное.", + "components.Input.error.validation.min": "Значение слишком маленькое.", + "components.Input.error.validation.minLength": "Значение слишком короткое.", "components.Input.error.validation.minSupMax": "Не может быть выше", - "components.Input.error.validation.regex": "Не соответствует регулярному выражению.", - "components.Input.error.validation.required": "Необходимое поле для заполнения.", + "components.Input.error.validation.regex": "Значение не соответствует регулярному выражению.", + "components.Input.error.validation.required": "Обязательное значение.", + "components.InputSelect.option.placeholder": "Выберите здесь", "components.ListRow.empty": "Нет данных для отображения.", - "components.OverlayBlocker.description": "Вы воспользовались функционалом, который требует перезапуска сервера. Пожалуйста, подождите.", + "components.OverlayBlocker.description": "Вы воспользовались функционалом, который требует перезапуска сервера. Пожалуйста, подождите, пока сервер не будет запущен.", "components.OverlayBlocker.description.serverError": "Сервер должен был перезагрузиться, пожалуйста, проверьте ваши логи в терминале.", "components.OverlayBlocker.title": "Ожидание перезапуска...", "components.OverlayBlocker.title.serverError": "Перезапуск занимает больше времени, чем ожидалось", "components.PageFooter.select": "записей на странице", - "components.ProductionBlocker.description": "Для безопасности мы должны заблокировать его для других вариантов.", + "components.ProductionBlocker.description": "В целях безопасности мы должны отключить этот плагин в других средах.", "components.ProductionBlocker.header": "Этот плагин доступен только на стадии разработки.", - "components.Wysiwyg.ToggleMode.markdown": "Переключить в режим markdown", - "components.Wysiwyg.ToggleMode.preview": "Переключить в режим предпросмотра", + "components.Wysiwyg.ToggleMode.markdown": "Переключиться в режим markdown", + "components.Wysiwyg.ToggleMode.preview": "Переключиться в режим предпросмотра", "components.Wysiwyg.collapse": "Свернуть", "components.Wysiwyg.selectOptions.H1": "Заголовок H1", "components.Wysiwyg.selectOptions.H2": "Заголовок H2", @@ -143,7 +144,7 @@ "components.Wysiwyg.selectOptions.H5": "Заголовок H5", "components.Wysiwyg.selectOptions.H6": "Заголовок H6", "components.Wysiwyg.selectOptions.title": "Добавить заголовок", - "components.WysiwygBottomControls.charactersIndicators": "букв", + "components.WysiwygBottomControls.charactersIndicators": "символов", "components.WysiwygBottomControls.fullscreen": "Развернуть", "components.WysiwygBottomControls.uploadFiles": "Перетащите файлы в эту область, вставьте из буфера обмена или {browse}.", "components.WysiwygBottomControls.uploadFiles.browse": "выберите их", @@ -155,31 +156,41 @@ "notification.error.layout": "Не удалось получить макет", "request.error.model.unknown": "Модель данных не существует", "app.utils.delete": "Удалить", + "HomePage.helmet.title": "Домашняя страница", + "HomePage.welcome.congrats": "Поздравляем!", + "HomePage.welcome.congrats.content": "Вы вошли как первый администратор. Чтобы открыть для себя мощные функции, предоставляемые Strapi,", + "HomePage.welcome.congrats.content.bold": "мы рекомендуем вам создать свой первый тип контента.", + "HomePage.community": "Присоединяйтесь к сообществу", + "HomePage.roadmap": "Смотрите нашу дорожную карту", + "HomePage.greetings": "Привет {name}!", + "Auth.advanced.allow_register": "", + "Auth.privacy-policy-agreement.terms": "условия", + "Auth.privacy-policy-agreement.policy": "политика конфиденциальности", "Auth.form.button.forgot-password": "Отправить письмо", "Auth.form.button.forgot-password.success": "Отправить еще раз", "Auth.form.button.login": "Войти", "Auth.form.button.register": "Готов начать", "Auth.form.button.register-success": "Отправить еще раз", "Auth.form.button.reset-password": "Сменить пароль", - "Auth.form.error.blocked": "Ваш аккаунт заблокирован администратором.", - "Auth.form.error.code.provide": "Неверный код.", - "Auth.form.error.confirmed": "Адрес электронной почты не подтвержден.", - "Auth.form.error.email.invalid": "Неправильный адрес электронной почты.", - "Auth.form.error.email.provide": "Укажите свое имя пользователя или адрес электронной почты.", - "Auth.form.error.email.taken": "Данный email уже используется", + "Auth.form.error.blocked": "Ваш аккаунт был заблокирован администратором.", + "Auth.form.error.code.provide": "Указан неверный код.", + "Auth.form.error.confirmed": "Ваш e-mail не подтвержден.", + "Auth.form.error.email.invalid": "Неправильный e-mail.", + "Auth.form.error.email.provide": "Укажите свое имя пользователя или e-mail.", + "Auth.form.error.email.taken": "Данный e-mail уже используется", "Auth.form.error.invalid": "Неверный логин или пароль.", "Auth.form.error.noAdminAccess": "У вас нет доступа к панели администрирования.", - "Auth.form.error.params.provide": "Неправильные параметры.", + "Auth.form.error.params.provide": "Предоставлены неверные параметры.", "Auth.form.error.password.format": "Пароль не может содержать символ `$` больше трех раз.", "Auth.form.error.password.local": "Этот пользователь никогда не задавал пароль, пожалуйста, войдите в систему через провайдера, используемого при создании учетной записи.", "Auth.form.error.password.matching": "Пароль не соответствует.", "Auth.form.error.password.provide": "Укажите свой пароль.", - "Auth.form.error.ratelimit": "Слишком много попыток. Пожалуйста, попробуйте позже.", - "Auth.form.error.user.not-exist": "Этот email не существует.", + "Auth.form.error.ratelimit": "Слишком много попыток, повторите через минуту", + "Auth.form.error.user.not-exist": "Этот e-mail не существует.", "Auth.form.error.username.taken": "Имя пользователя уже используется", - "Auth.form.forgot-password.email.label": "Введите ваш email", - "Auth.form.forgot-password.email.label.success": "Письмо успешно отправлено", + "Auth.form.forgot-password.email.label": "Введите ваш e-mail", + "Auth.form.forgot-password.email.label.success": "Письмо успешно отправлено на адрес", "Auth.form.forgot-password.email.placeholder": "mysuperemail@gmail.com", "Auth.form.header.forgot-password": "strapi", "Auth.form.header.login": "strapi", @@ -189,17 +200,20 @@ "Auth.form.login.rememberMe.label": "Запомнить меня", "Auth.form.login.username.label": "Имя пользователя", "Auth.form.login.username.placeholder": "John Doe", - "Auth.form.register-success.email.label": "Письмо успешно отправлено", + "Auth.form.register-success.email.label": "Письмо успешно отправлено на адрес", "Auth.form.register-success.email.placeholder": "mysuperemail@gmail.com", "Auth.form.register.confirmPassword.label": "Подтверждение пароля", - "Auth.form.register.email.label": "Email", + "Auth.form.register.email.label": "E-mail", "Auth.form.register.email.placeholder": "johndoe@gmail.com", - + "Auth.form.register.news.label": "Держите меня в курсе о новых функциях и предстоящих улучшениях (делая это, вы принимаете {terms} и {policy}).", "Auth.form.register.password.label": "Пароль", "Auth.form.register.username.label": "Имя пользователя", "Auth.form.register.username.placeholder": "John Doe", "Auth.header.register.description": "Для завершения установки и обеспечения безопасности приложения, создайте вашего первого пользователя (root admin), заполнив форму ниже.", "Auth.link.forgot-password": "Забыли пароль?", "Auth.link.ready": "Готовы войти?", - "components.Input.error.password.noMatch": "Пароль не совпадает" + "app.containers.App.notification.error.init": "Произошла ошибка при запросе к API", + "components.Input.error.password.noMatch": "Пароль не совпадает", + "form.button.done": "Выполнено", + "notification.form.error.fields": "Форма содержит некоторые ошибки" } From 708f713ab8a3a75d6a35dcd653a114c3459e0636 Mon Sep 17 00:00:00 2001 From: Prakash Rajendran Date: Sat, 23 Nov 2019 23:58:11 +0100 Subject: [PATCH 03/20] update link to pm2 guide --- docs/3.0.0-beta.x/guides/deployment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/3.0.0-beta.x/guides/deployment.md b/docs/3.0.0-beta.x/guides/deployment.md index f636028d97..7e96143cb1 100644 --- a/docs/3.0.0-beta.x/guides/deployment.md +++ b/docs/3.0.0-beta.x/guides/deployment.md @@ -995,7 +995,7 @@ npm install pm2@latest -g ### The ecosystem.config.js file -- You will need to configure an `ecosystem.config.js` file. This file will manage the **database connection variables** Strapi needs to connect to your database. The `ecosystem.config.js` will also be used by `pm2` to restart your project whenever any changes are made to files within the Strapi file system itself (such as when an update arrives from GitHub). You can read more about this file [here](https://pm2.io/doc/en/runtime/guide/development-tools/). +- You will need to configure an `ecosystem.config.js` file. This file will manage the **database connection variables** Strapi needs to connect to your database. The `ecosystem.config.js` will also be used by `pm2` to restart your project whenever any changes are made to files within the Strapi file system itself (such as when an update arrives from GitHub). You can read more about this file [here](https://pm2.keymetrics.io/docs/usage/pm2-doc-single-page/). - You will need to open your `nano` editor and then `copy/paste` the following: From 3fe87ffcc74abac4194b971b32433cfb3a9e8092 Mon Sep 17 00:00:00 2001 From: Jim LAURIE Date: Tue, 26 Nov 2019 16:03:06 +0100 Subject: [PATCH 04/20] Fix #4559 lowercase the email in the forgot password function --- .../controllers/Auth.js | 63 ++++++++++++++----- 1 file changed, 47 insertions(+), 16 deletions(-) diff --git a/packages/strapi-plugin-users-permissions/controllers/Auth.js b/packages/strapi-plugin-users-permissions/controllers/Auth.js index 655b3b9230..1b0b4f73f2 100644 --- a/packages/strapi-plugin-users-permissions/controllers/Auth.js +++ b/packages/strapi-plugin-users-permissions/controllers/Auth.js @@ -272,7 +272,22 @@ module.exports = { }, async forgotPassword(ctx) { - const { email } = ctx.request.body; + let { email } = ctx.request.body; + + // Check if the provided email is valid or not. + const isEmail = emailRegExp.test(email); + + if (isEmail) { + email = email.toLowerCase(); + } else { + return ctx.badRequest( + null, + formatError({ + id: 'Auth.form.error.email.format', + message: 'Please provide valid email address.', + }) + ); + } const pluginStore = await strapi.store({ environment: '', @@ -620,7 +635,7 @@ module.exports = { } const user = await strapi.query('user', 'users-permissions').findOne({ - email: params.email + email: params.email, }); if (user.confirmed) { @@ -635,22 +650,38 @@ module.exports = { _.pick(user.toJSON ? user.toJSON() : user, ['id']) ); - const settings = await pluginStore.get({ key: 'email' }).then(storeEmail => { - try { - return storeEmail['email_confirmation'].options; - } catch (err) { - return {}; - } - }); + const settings = await pluginStore + .get({ key: 'email' }) + .then(storeEmail => { + try { + return storeEmail['email_confirmation'].options; + } catch (err) { + return {}; + } + }); - settings.message = await strapi.plugins['users-permissions'].services.userspermissions.template(settings.message, { + settings.message = await strapi.plugins[ + 'users-permissions' + ].services.userspermissions.template(settings.message, { URL: new URL('/auth/email-confirmation', strapi.config.url).toString(), - USER: _.omit(user.toJSON ? user.toJSON() : user, ['password', 'resetPasswordToken', 'role', 'provider']), - CODE: jwt + USER: _.omit(user.toJSON ? user.toJSON() : user, [ + 'password', + 'resetPasswordToken', + 'role', + 'provider', + ]), + CODE: jwt, }); - settings.object = await strapi.plugins['users-permissions'].services.userspermissions.template(settings.object, { - USER: _.omit(user.toJSON ? user.toJSON() : user, ['password', 'resetPasswordToken', 'role', 'provider']), + settings.object = await strapi.plugins[ + 'users-permissions' + ].services.userspermissions.template(settings.object, { + USER: _.omit(user.toJSON ? user.toJSON() : user, [ + 'password', + 'resetPasswordToken', + 'role', + 'provider', + ]), }); try { @@ -663,11 +694,11 @@ module.exports = { replyTo: settings.response_email, subject: settings.object, text: settings.message, - html: settings.message + html: settings.message, }); ctx.send({ email: (user.toJSON ? user.toJSON() : user).email, - sent: true + sent: true, }); } catch (err) { return ctx.badRequest(null, err); From 9eb1490a7a21c567a05ff3f9d8522501454a5612 Mon Sep 17 00:00:00 2001 From: Jim LAURIE Date: Tue, 26 Nov 2019 16:58:35 +0100 Subject: [PATCH 05/20] Fix #4576 docs website link --- docs/.vuepress/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 17ec6bea68..beed27f202 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -116,7 +116,7 @@ module.exports = { }, { text: 'Website', - link: 'https://strapi', + link: 'https://strapi.io', }, { text: 'Slack', From c5d91ed514e59ae08ec35aa27ac943aff5b6afe7 Mon Sep 17 00:00:00 2001 From: Sulakin Vadim Date: Wed, 27 Nov 2019 16:41:39 +0300 Subject: [PATCH 06/20] Update ru.json --- packages/strapi-admin/admin/src/translations/ru.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/strapi-admin/admin/src/translations/ru.json b/packages/strapi-admin/admin/src/translations/ru.json index c4fa7e45e8..c5e6b36cf5 100644 --- a/packages/strapi-admin/admin/src/translations/ru.json +++ b/packages/strapi-admin/admin/src/translations/ru.json @@ -190,7 +190,7 @@ "Auth.form.error.user.not-exist": "Этот e-mail не существует.", "Auth.form.error.username.taken": "Имя пользователя уже используется", "Auth.form.forgot-password.email.label": "Введите ваш e-mail", - "Auth.form.forgot-password.email.label.success": "Письмо успешно отправлено на адрес", + "Auth.form.forgot-password.email.label.success": "Письмо успешно отправлено e-mail", "Auth.form.forgot-password.email.placeholder": "mysuperemail@gmail.com", "Auth.form.header.forgot-password": "strapi", "Auth.form.header.login": "strapi", @@ -200,7 +200,7 @@ "Auth.form.login.rememberMe.label": "Запомнить меня", "Auth.form.login.username.label": "Имя пользователя", "Auth.form.login.username.placeholder": "John Doe", - "Auth.form.register-success.email.label": "Письмо успешно отправлено на адрес", + "Auth.form.register-success.email.label": "Письмо успешно отправлено e-mail", "Auth.form.register-success.email.placeholder": "mysuperemail@gmail.com", "Auth.form.register.confirmPassword.label": "Подтверждение пароля", "Auth.form.register.email.label": "E-mail", From bb2a54525dfd0ef043e4d85a36dc54c0b0cd17ac Mon Sep 17 00:00:00 2001 From: Jim LAURIE Date: Wed, 27 Nov 2019 16:25:36 +0100 Subject: [PATCH 07/20] Add a docker ref in the docs --- docs/3.0.0-beta.x/guides/deployment.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/3.0.0-beta.x/guides/deployment.md b/docs/3.0.0-beta.x/guides/deployment.md index 7e96143cb1..84da298667 100644 --- a/docs/3.0.0-beta.x/guides/deployment.md +++ b/docs/3.0.0-beta.x/guides/deployment.md @@ -97,6 +97,12 @@ strapi(/* {...} */).start(); If you want to host the administration on another server than the API, [please take a look at this dedicated section](../admin-panel/deploy.md). +## Docker + +In this section, you will not find a specific guide to deploy your app with [Docker](https://www.docker.com/). + +We recently updated the [strapi/strapi-docker](https://github.com/strapi/strapi-docker) GitHub repository that contains all informations needed to user Strapi with Docker. + ## Amazon AWS This is a step-by-step guide for deploying a Strapi project to [Amazon AWS EC2](https://aws.amazon.com/ec2/). This guide will connect to an [Amazon AWS RDS](https://aws.amazon.com/rds/) for managing and hosting the database. Optionally, this guide will show you how to connect host and serve images on [Amazon AWS S3](https://aws.amazon.com/s3/). Prior to starting this guide, you should have created a [Strapi project](../getting-started/quick-start.md), to use for deploying on AWS. From 93130a16769da38dc91a274fbb31db4df67d8324 Mon Sep 17 00:00:00 2001 From: Jim LAURIE Date: Wed, 27 Nov 2019 17:26:30 +0100 Subject: [PATCH 08/20] Display a deprecated message docs alpha --- docs/.vuepress/theme/components/Navbar.vue | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/docs/.vuepress/theme/components/Navbar.vue b/docs/.vuepress/theme/components/Navbar.vue index 88113a3ad2..11b26da69c 100644 --- a/docs/.vuepress/theme/components/Navbar.vue +++ b/docs/.vuepress/theme/components/Navbar.vue @@ -20,6 +20,18 @@ >{{ $siteTitle }} + + Deprecated docs - + + current version + + +
- Deprecated docs - - - current version - - -
{{ $siteTitle }} + + Deprecated docs - + + current version + + +
Date: Thu, 28 Nov 2019 18:29:35 +0100 Subject: [PATCH 14/20] Hotfix mongo aggregate policy verifications --- .../services/Aggregator.js | 55 +++- .../services/Resolvers.js | 272 +++++++++--------- 2 files changed, 194 insertions(+), 133 deletions(-) diff --git a/packages/strapi-plugin-graphql/services/Aggregator.js b/packages/strapi-plugin-graphql/services/Aggregator.js index 09a9139fa3..5ad0a32fcc 100644 --- a/packages/strapi-plugin-graphql/services/Aggregator.js +++ b/packages/strapi-plugin-graphql/services/Aggregator.js @@ -7,6 +7,8 @@ const _ = require('lodash'); const pluralize = require('pluralize'); const { convertRestQueryParams, buildQuery } = require('strapi-utils'); +const policyUtils = require('strapi-utils').policy; +const compose = require('koa-compose'); const Schema = require('./Schema.js'); const GraphQLQuery = require('./Query.js'); @@ -470,7 +472,13 @@ const formatConnectionAggregator = function(fields, model, modelName) { * } * */ -const formatModelConnectionsGQL = function(fields, model, name, modelResolver) { +const formatModelConnectionsGQL = function( + fields, + model, + name, + modelResolver, + plugin +) { const { globalId } = model; const connectionGlobalId = `${globalId}Connection`; @@ -501,7 +509,50 @@ const formatModelConnectionsGQL = function(fields, model, name, modelResolver) { }, resolver: { Query: { - [`${pluralName}Connection`](obj, options, context) { + async [`${pluralName}Connection`](obj, options, { context }) { + // need to check + + const ctx = Object.assign(_.clone(context), { + request: Object.assign(_.clone(context.request), { + graphql: null, + }), + }); + + const policiesFn = [ + policyUtils.globalPolicy( + undefined, + { + handler: `${name}.find`, + }, + undefined, + plugin + ), + ]; + + policyUtils.get( + 'plugins.users-permissions.permissions', + plugin, + policiesFn, + `GraphQL connection "${name}" `, + name + ); + + // Execute policies stack. + const policy = await compose(policiesFn)(ctx); + + // Policy doesn't always return errors but they update the current context. + if ( + _.isError(ctx.request.graphql) || + _.get(ctx.request.graphql, 'isBoom') + ) { + return ctx.request.graphql; + } + + // Something went wrong in the policy. + if (policy) { + return policy; + } + return options; }, }, diff --git a/packages/strapi-plugin-graphql/services/Resolvers.js b/packages/strapi-plugin-graphql/services/Resolvers.js index 340e835f4f..442cb4823d 100644 --- a/packages/strapi-plugin-graphql/services/Resolvers.js +++ b/packages/strapi-plugin-graphql/services/Resolvers.js @@ -60,152 +60,161 @@ const buildAssocResolvers = (model, name, { plugin }) => { const { primaryKey, associations = [] } = model; return associations - .filter(association => model.attributes[association.alias].private !== true) - .reduce((resolver, association) => { - switch (association.nature) { - case 'oneToManyMorph': { - resolver[association.alias] = async obj => { - const entry = await contentManager.fetch( - { - id: obj[primaryKey], - model: name, - }, - plugin, - [association.alias] - ); - - // Set the _type only when the value is defined - if (entry[association.alias]) { - entry[association.alias]._type = _.upperFirst(association.model); - } - - return entry[association.alias]; - }; - break; - } - case 'manyMorphToOne': - case 'manyMorphToMany': - case 'manyToManyMorph': { - resolver[association.alias] = async obj => { - // eslint-disable-line no-unused-vars - const [withRelated, withoutRelated] = await Promise.all([ - contentManager.fetch( + .filter(association => model.attributes[association.alias].private !== true) + .reduce((resolver, association) => { + switch (association.nature) { + case 'oneToManyMorph': { + resolver[association.alias] = async obj => { + const entry = await contentManager.fetch( { id: obj[primaryKey], model: name, }, plugin, - [association.alias], - false - ), - contentManager.fetch( - { - id: obj[primaryKey], - model: name, - }, - plugin, - [] - ), - ]); - - const entry = - withRelated && withRelated.toJSON - ? withRelated.toJSON() - : withRelated; - - entry[association.alias].map((entry, index) => { - const type = - _.get(withoutRelated, `${association.alias}.${index}.kind`) || - _.upperFirst( - _.camelCase( - _.get( - withoutRelated, - `${association.alias}.${index}.${association.alias}_type` - ) - ) - ) || - _.upperFirst(_.camelCase(association[association.type])); - - entry._type = type; - - return entry; - }); - - return entry[association.alias]; - }; - break; - } - - default: { - resolver[association.alias] = async (obj, options) => { - // Construct parameters object to retrieve the correct related entries. - const params = { - model: association.model || association.collection, - }; - - let queryOpts = { - source: association.plugin, - }; - - // Get refering model. - const ref = association.plugin - ? strapi.plugins[association.plugin].models[params.model] - : strapi.models[params.model]; - - if (association.type === 'model') { - params[ref.primaryKey] = _.get( - obj, - [association.alias, ref.primaryKey], - obj[association.alias] + [association.alias] ); - } else { - const queryParams = Query.amountLimiting(options); - queryOpts = { - ...queryOpts, - ...Query.convertToParams(_.omit(queryParams, 'where')), // Convert filters (sort, limit and start/skip) - ...Query.convertToQuery(queryParams.where), + + // Set the _type only when the value is defined + if (entry[association.alias]) { + entry[association.alias]._type = _.upperFirst(association.model); + } + + return entry[association.alias]; + }; + break; + } + case 'manyMorphToOne': + case 'manyMorphToMany': + case 'manyToManyMorph': { + resolver[association.alias] = async obj => { + // eslint-disable-line no-unused-vars + const [withRelated, withoutRelated] = await Promise.all([ + contentManager.fetch( + { + id: obj[primaryKey], + model: name, + }, + plugin, + [association.alias], + false + ), + contentManager.fetch( + { + id: obj[primaryKey], + model: name, + }, + plugin, + [] + ), + ]); + + const entry = + withRelated && withRelated.toJSON + ? withRelated.toJSON() + : withRelated; + + entry[association.alias].map((entry, index) => { + const type = + _.get(withoutRelated, `${association.alias}.${index}.kind`) || + _.upperFirst( + _.camelCase( + _.get( + withoutRelated, + `${association.alias}.${index}.${association.alias}_type` + ) + ) + ) || + _.upperFirst(_.camelCase(association[association.type])); + + entry._type = type; + + return entry; + }); + + return entry[association.alias]; + }; + break; + } + + default: { + resolver[association.alias] = async (obj, options) => { + // Construct parameters object to retrieve the correct related entries. + const params = { + model: association.model || association.collection, }; - if ( - ((association.nature === 'manyToMany' && association.dominant) || - association.nature === 'manyWay') && - _.has(obj, association.alias) // if populated - ) { - _.set( - queryOpts, - ['query', ref.primaryKey], + let queryOpts = { + source: association.plugin, + }; + + // Get refering model. + const ref = association.plugin + ? strapi.plugins[association.plugin].models[params.model] + : strapi.models[params.model]; + + if (association.type === 'model') { + params[ref.primaryKey] = _.get( + obj, + [association.alias, ref.primaryKey], obj[association.alias] - ? obj[association.alias] - .map(val => val[ref.primaryKey] || val) - .sort() - : [] ); } else { - _.set(queryOpts, ['query', association.via], obj[ref.primaryKey]); + const queryParams = Query.amountLimiting(options); + queryOpts = { + ...queryOpts, + ...Query.convertToParams(_.omit(queryParams, 'where')), // Convert filters (sort, limit and start/skip) + ...Query.convertToQuery(queryParams.where), + }; + + if ( + ((association.nature === 'manyToMany' && + association.dominant) || + association.nature === 'manyWay') && + _.has(obj, association.alias) // if populated + ) { + _.set( + queryOpts, + ['query', ref.primaryKey], + obj[association.alias] + ? obj[association.alias] + .map(val => val[ref.primaryKey] || val) + .sort() + : [] + ); + } else { + _.set( + queryOpts, + ['query', association.via], + obj[ref.primaryKey] + ); + } } - } - const loaderName = association.plugin - ? `${association.plugin}__${params.model}` - : params.model; + const loaderName = association.plugin + ? `${association.plugin}__${params.model}` + : params.model; - return association.model - ? strapi.plugins.graphql.services.loaders.loaders[loaderName].load({ - params, - options: queryOpts, - single: true, - }) - : strapi.plugins.graphql.services.loaders.loaders[loaderName].load({ - options: queryOpts, - association, - }); - }; - break; + return association.model + ? strapi.plugins.graphql.services.loaders.loaders[ + loaderName + ].load({ + params, + options: queryOpts, + single: true, + }) + : strapi.plugins.graphql.services.loaders.loaders[ + loaderName + ].load({ + options: queryOpts, + association, + }); + }; + break; + } } - } - return resolver; - }, {}); + return resolver; + }, {}); }; const buildModel = (model, name, { plugin, isGroup = false } = {}) => { @@ -475,7 +484,8 @@ const buildShadowCRUD = (models, plugin) => { attributes, model, name, - queries.plural + queries.plural, + plugin ); if (modelAggregator) { acc.definition += modelAggregator.type; From 8199f2d59cf53b43116c9eeb719738dae46f01e2 Mon Sep 17 00:00:00 2001 From: Jim LAURIE Date: Fri, 29 Nov 2019 17:36:51 +0100 Subject: [PATCH 15/20] v3.0.0-beta.17.7 --- examples/getstarted/package.json | 34 +++++++++---------- lerna.json | 2 +- packages/create-strapi-app/package.json | 4 +-- packages/strapi-admin/package.json | 6 ++-- packages/strapi-generate-api/package.json | 2 +- .../strapi-generate-controller/package.json | 2 +- packages/strapi-generate-model/package.json | 2 +- packages/strapi-generate-new/package.json | 2 +- packages/strapi-generate-plugin/package.json | 2 +- packages/strapi-generate-policy/package.json | 2 +- packages/strapi-generate-service/package.json | 2 +- packages/strapi-generate/package.json | 4 +-- packages/strapi-helper-plugin/package.json | 2 +- packages/strapi-hook-bookshelf/package.json | 6 ++-- packages/strapi-hook-ejs/package.json | 2 +- packages/strapi-hook-knex/package.json | 2 +- packages/strapi-hook-mongoose/package.json | 4 +-- packages/strapi-hook-redis/package.json | 4 +-- packages/strapi-middleware-views/package.json | 2 +- .../package.json | 6 ++-- .../package.json | 8 ++--- .../strapi-plugin-documentation/package.json | 4 +-- packages/strapi-plugin-email/package.json | 8 ++--- packages/strapi-plugin-graphql/package.json | 4 +-- packages/strapi-plugin-upload/package.json | 8 ++--- .../package.json | 6 ++-- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../strapi-provider-upload-local/package.json | 2 +- .../package.json | 2 +- packages/strapi-utils/package.json | 2 +- packages/strapi/package.json | 20 +++++------ 36 files changed, 84 insertions(+), 84 deletions(-) diff --git a/examples/getstarted/package.json b/examples/getstarted/package.json index c90db0c2dc..239a4eb9e7 100644 --- a/examples/getstarted/package.json +++ b/examples/getstarted/package.json @@ -1,7 +1,7 @@ { "name": "getstarted", "private": true, - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "A Strapi application.", "scripts": { "develop": "strapi develop", @@ -15,22 +15,22 @@ "mysql": "^2.17.1", "pg": "^7.10.0", "sqlite3": "^4.0.6", - "strapi": "3.0.0-beta.17.6", - "strapi-admin": "3.0.0-beta.17.6", - "strapi-hook-bookshelf": "3.0.0-beta.17.6", - "strapi-hook-knex": "3.0.0-beta.17.6", - "strapi-hook-mongoose": "3.0.0-beta.17.6", - "strapi-middleware-views": "3.0.0-beta.17.6", - "strapi-plugin-content-manager": "3.0.0-beta.17.6", - "strapi-plugin-content-type-builder": "3.0.0-beta.17.6", - "strapi-plugin-documentation": "3.0.0-beta.17.6", - "strapi-plugin-email": "3.0.0-beta.17.6", - "strapi-plugin-graphql": "3.0.0-beta.17.6", - "strapi-plugin-upload": "3.0.0-beta.17.6", - "strapi-plugin-users-permissions": "3.0.0-beta.17.6", - "strapi-provider-email-mailgun": "3.0.0-beta.17.6", - "strapi-provider-upload-aws-s3": "3.0.0-beta.17.6", - "strapi-utils": "3.0.0-beta.17.6" + "strapi": "3.0.0-beta.17.7", + "strapi-admin": "3.0.0-beta.17.7", + "strapi-hook-bookshelf": "3.0.0-beta.17.7", + "strapi-hook-knex": "3.0.0-beta.17.7", + "strapi-hook-mongoose": "3.0.0-beta.17.7", + "strapi-middleware-views": "3.0.0-beta.17.7", + "strapi-plugin-content-manager": "3.0.0-beta.17.7", + "strapi-plugin-content-type-builder": "3.0.0-beta.17.7", + "strapi-plugin-documentation": "3.0.0-beta.17.7", + "strapi-plugin-email": "3.0.0-beta.17.7", + "strapi-plugin-graphql": "3.0.0-beta.17.7", + "strapi-plugin-upload": "3.0.0-beta.17.7", + "strapi-plugin-users-permissions": "3.0.0-beta.17.7", + "strapi-provider-email-mailgun": "3.0.0-beta.17.7", + "strapi-provider-upload-aws-s3": "3.0.0-beta.17.7", + "strapi-utils": "3.0.0-beta.17.7" }, "strapi": { "uuid": "getstarted" diff --git a/lerna.json b/lerna.json index e023f00d95..78d2792217 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "packages": [ "packages/*", "examples/*" diff --git a/packages/create-strapi-app/package.json b/packages/create-strapi-app/package.json index 189ede7a88..69a2464231 100644 --- a/packages/create-strapi-app/package.json +++ b/packages/create-strapi-app/package.json @@ -1,6 +1,6 @@ { "name": "create-strapi-app", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Generate a new Strapi application.", "license": "MIT", "homepage": "http://strapi.io", @@ -21,7 +21,7 @@ ], "dependencies": { "commander": "^2.20.0", - "strapi-generate-new": "3.0.0-beta.17.6" + "strapi-generate-new": "3.0.0-beta.17.7" }, "scripts": { "test": "echo \"no tests yet\"" diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json index c1a140ce0c..c780d6f7a5 100644 --- a/packages/strapi-admin/package.json +++ b/packages/strapi-admin/package.json @@ -1,6 +1,6 @@ { "name": "strapi-admin", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Strapi Admin", "repository": { "type": "git", @@ -69,8 +69,8 @@ "reselect": "^3.0.1", "sanitize.css": "^4.1.0", "shelljs": "^0.7.8", - "strapi-helper-plugin": "3.0.0-beta.17.6", - "strapi-utils": "3.0.0-beta.17.6", + "strapi-helper-plugin": "3.0.0-beta.17.7", + "strapi-utils": "3.0.0-beta.17.7", "style-loader": "^0.23.1", "styled-components": "^4.2.0", "terser-webpack-plugin": "^1.2.3", diff --git a/packages/strapi-generate-api/package.json b/packages/strapi-generate-api/package.json index 76c7ceff2a..a7dead4ef8 100644 --- a/packages/strapi-generate-api/package.json +++ b/packages/strapi-generate-api/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-api", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Generate an API for a Strapi application.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-controller/package.json b/packages/strapi-generate-controller/package.json index 34dce765d4..faebe6af0e 100644 --- a/packages/strapi-generate-controller/package.json +++ b/packages/strapi-generate-controller/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-controller", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Generate a controller for a Strapi API.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-model/package.json b/packages/strapi-generate-model/package.json index cf8ba329b6..26b078fc2b 100644 --- a/packages/strapi-generate-model/package.json +++ b/packages/strapi-generate-model/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-model", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Generate a model for a Strapi API.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-new/package.json b/packages/strapi-generate-new/package.json index 39f46bc344..546a347e96 100644 --- a/packages/strapi-generate-new/package.json +++ b/packages/strapi-generate-new/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-new", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Generate a new Strapi application.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-plugin/package.json b/packages/strapi-generate-plugin/package.json index 360db7c26c..6a5dedc206 100644 --- a/packages/strapi-generate-plugin/package.json +++ b/packages/strapi-generate-plugin/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-plugin", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Generate an plugin for a Strapi application.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-policy/package.json b/packages/strapi-generate-policy/package.json index 87cd37c59d..d605ba5c9a 100644 --- a/packages/strapi-generate-policy/package.json +++ b/packages/strapi-generate-policy/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-policy", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Generate a policy for a Strapi API.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-service/package.json b/packages/strapi-generate-service/package.json index dbbfdefdc9..12a1cb67fa 100644 --- a/packages/strapi-generate-service/package.json +++ b/packages/strapi-generate-service/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-service", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Generate a service for a Strapi API.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate/package.json b/packages/strapi-generate/package.json index 99d873147d..b16d36b22f 100644 --- a/packages/strapi-generate/package.json +++ b/packages/strapi-generate/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Master of ceremonies for the Strapi generators.", "homepage": "http://strapi.io", "keywords": [ @@ -20,7 +20,7 @@ "fs-extra": "^8.0.1", "lodash": "^4.17.11", "reportback": "^2.0.2", - "strapi-utils": "3.0.0-beta.17.6" + "strapi-utils": "3.0.0-beta.17.7" }, "author": { "name": "Strapi team", diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json index 0ea3b12419..618839262d 100644 --- a/packages/strapi-helper-plugin/package.json +++ b/packages/strapi-helper-plugin/package.json @@ -1,6 +1,6 @@ { "name": "strapi-helper-plugin", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Helper for Strapi plugins development", "files": [ "dist" diff --git a/packages/strapi-hook-bookshelf/package.json b/packages/strapi-hook-bookshelf/package.json index 605e5bdc22..855a815425 100644 --- a/packages/strapi-hook-bookshelf/package.json +++ b/packages/strapi-hook-bookshelf/package.json @@ -1,6 +1,6 @@ { "name": "strapi-hook-bookshelf", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Bookshelf hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ @@ -22,8 +22,8 @@ "lodash": "^4.17.11", "pluralize": "^7.0.0", "rimraf": "^2.6.3", - "strapi-hook-knex": "3.0.0-beta.17.6", - "strapi-utils": "3.0.0-beta.17.6" + "strapi-hook-knex": "3.0.0-beta.17.7", + "strapi-utils": "3.0.0-beta.17.7" }, "strapi": { "dependencies": [ diff --git a/packages/strapi-hook-ejs/package.json b/packages/strapi-hook-ejs/package.json index b92d68ef06..0dc2454fa6 100644 --- a/packages/strapi-hook-ejs/package.json +++ b/packages/strapi-hook-ejs/package.json @@ -1,6 +1,6 @@ { "name": "strapi-hook-ejs", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "EJS hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-hook-knex/package.json b/packages/strapi-hook-knex/package.json index 8ec8a53361..5848cb1739 100644 --- a/packages/strapi-hook-knex/package.json +++ b/packages/strapi-hook-knex/package.json @@ -1,6 +1,6 @@ { "name": "strapi-hook-knex", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Knex hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-hook-mongoose/package.json b/packages/strapi-hook-mongoose/package.json index c527eda986..57a8feebc2 100644 --- a/packages/strapi-hook-mongoose/package.json +++ b/packages/strapi-hook-mongoose/package.json @@ -1,6 +1,6 @@ { "name": "strapi-hook-mongoose", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Mongoose hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ @@ -20,7 +20,7 @@ "mongoose-float": "^1.0.4", "mongoose-long": "^0.2.1", "pluralize": "^7.0.0", - "strapi-utils": "3.0.0-beta.17.6" + "strapi-utils": "3.0.0-beta.17.7" }, "author": { "email": "hi@strapi.io", diff --git a/packages/strapi-hook-redis/package.json b/packages/strapi-hook-redis/package.json index 6e965b6715..58c9b40892 100644 --- a/packages/strapi-hook-redis/package.json +++ b/packages/strapi-hook-redis/package.json @@ -1,6 +1,6 @@ { "name": "strapi-hook-redis", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Redis hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ @@ -19,7 +19,7 @@ "lodash": "^4.17.11", "rimraf": "^2.6.3", "stack-trace": "0.0.10", - "strapi-utils": "3.0.0-beta.17.6" + "strapi-utils": "3.0.0-beta.17.7" }, "author": { "email": "hi@strapi.io", diff --git a/packages/strapi-middleware-views/package.json b/packages/strapi-middleware-views/package.json index 0ec24fbf13..c2630982f0 100644 --- a/packages/strapi-middleware-views/package.json +++ b/packages/strapi-middleware-views/package.json @@ -1,6 +1,6 @@ { "name": "strapi-middleware-views", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Views middleware to enable server-side rendering for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json index 82092dab7d..db51f0b06c 100644 --- a/packages/strapi-plugin-content-manager/package.json +++ b/packages/strapi-plugin-content-manager/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-content-manager", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "A powerful UI to easily manage your data.", "strapi": { "name": "Content Manager", @@ -32,8 +32,8 @@ "redux-immutable": "^4.0.0", "reselect": "^3.0.1", "showdown": "^1.9.0", - "strapi-helper-plugin": "3.0.0-beta.17.6", - "strapi-utils": "3.0.0-beta.17.6", + "strapi-helper-plugin": "3.0.0-beta.17.7", + "strapi-utils": "3.0.0-beta.17.7", "styled-components": "^4.2.0", "yup": "^0.27.0" }, diff --git a/packages/strapi-plugin-content-type-builder/package.json b/packages/strapi-plugin-content-type-builder/package.json index 9e10b98225..a1aefb9846 100644 --- a/packages/strapi-plugin-content-type-builder/package.json +++ b/packages/strapi-plugin-content-type-builder/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-content-type-builder", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Strapi plugin to create content type (API).", "strapi": { "name": "Content Type Builder", @@ -29,9 +29,9 @@ "redux": "^4.0.1", "redux-immutable": "^4.0.0", "reselect": "^3.0.1", - "strapi-generate": "3.0.0-beta.17.6", - "strapi-generate-api": "3.0.0-beta.17.6", - "strapi-helper-plugin": "3.0.0-beta.17.6", + "strapi-generate": "3.0.0-beta.17.7", + "strapi-generate-api": "3.0.0-beta.17.7", + "strapi-helper-plugin": "3.0.0-beta.17.7", "yup": "^0.27.0" }, "author": { diff --git a/packages/strapi-plugin-documentation/package.json b/packages/strapi-plugin-documentation/package.json index 2b329e2876..8d6efdf552 100755 --- a/packages/strapi-plugin-documentation/package.json +++ b/packages/strapi-plugin-documentation/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-documentation", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "This is the description of the plugin.", "strapi": { "name": "Documentation", @@ -32,7 +32,7 @@ "redux": "^4.0.1", "redux-immutable": "^4.0.0", "reselect": "^4.0.0", - "strapi-helper-plugin": "3.0.0-beta.17.6", + "strapi-helper-plugin": "3.0.0-beta.17.7", "swagger-ui-dist": "3.22.1" }, "author": { diff --git a/packages/strapi-plugin-email/package.json b/packages/strapi-plugin-email/package.json index 536c9d9a95..55fc67dbac 100644 --- a/packages/strapi-plugin-email/package.json +++ b/packages/strapi-plugin-email/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-email", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "This is the description of the plugin.", "strapi": { "name": "Email", @@ -12,13 +12,13 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "strapi-provider-email-sendmail": "3.0.0-beta.17.6", - "strapi-utils": "3.0.0-beta.17.6" + "strapi-provider-email-sendmail": "3.0.0-beta.17.7", + "strapi-utils": "3.0.0-beta.17.7" }, "devDependencies": { "react-copy-to-clipboard": "5.0.1", "rimraf": "^2.6.3", - "strapi-helper-plugin": "3.0.0-beta.17.6" + "strapi-helper-plugin": "3.0.0-beta.17.7" }, "author": { "name": "Strapi team", diff --git a/packages/strapi-plugin-graphql/package.json b/packages/strapi-plugin-graphql/package.json index 2c1354c865..b81b3fc4a1 100644 --- a/packages/strapi-plugin-graphql/package.json +++ b/packages/strapi-plugin-graphql/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-graphql", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "This is the description of the plugin.", "strapi": { "name": "graphql", @@ -23,7 +23,7 @@ "graphql-type-long": "^0.1.1", "koa-compose": "^4.1.0", "pluralize": "^7.0.0", - "strapi-utils": "3.0.0-beta.17.6" + "strapi-utils": "3.0.0-beta.17.7" }, "devDependencies": { "cross-env": "^5.2.0", diff --git a/packages/strapi-plugin-upload/package.json b/packages/strapi-plugin-upload/package.json index edc296d5cb..fd5b04f657 100644 --- a/packages/strapi-plugin-upload/package.json +++ b/packages/strapi-plugin-upload/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-upload", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "This is the description of the plugin.", "strapi": { "name": "Files Upload", @@ -23,9 +23,9 @@ "react-router-dom": "^5.0.0", "react-transition-group": "^2.5.0", "reactstrap": "^5.0.0", - "strapi-helper-plugin": "3.0.0-beta.17.6", - "strapi-provider-upload-local": "3.0.0-beta.17.6", - "strapi-utils": "3.0.0-beta.17.6", + "strapi-helper-plugin": "3.0.0-beta.17.7", + "strapi-provider-upload-local": "3.0.0-beta.17.7", + "strapi-utils": "3.0.0-beta.17.7", "stream-to-array": "^2.3.0", "uuid": "^3.2.1" }, diff --git a/packages/strapi-plugin-users-permissions/package.json b/packages/strapi-plugin-users-permissions/package.json index 2b9d5cc7b9..e902132494 100644 --- a/packages/strapi-plugin-users-permissions/package.json +++ b/packages/strapi-plugin-users-permissions/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-users-permissions", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Protect your API with a full-authentication process based on JWT", "strapi": { "name": "Roles & Permissions", @@ -31,8 +31,8 @@ "reactstrap": "^5.0.0", "redux-saga": "^0.16.0", "request": "^2.83.0", - "strapi-helper-plugin": "3.0.0-beta.17.6", - "strapi-utils": "3.0.0-beta.17.6", + "strapi-helper-plugin": "3.0.0-beta.17.7", + "strapi-utils": "3.0.0-beta.17.7", "uuid": "^3.1.0" }, "devDependencies": { diff --git a/packages/strapi-provider-email-amazon-ses/package.json b/packages/strapi-provider-email-amazon-ses/package.json index 8145a27c61..65fa8290e6 100644 --- a/packages/strapi-provider-email-amazon-ses/package.json +++ b/packages/strapi-provider-email-amazon-ses/package.json @@ -1,6 +1,6 @@ { "name": "strapi-provider-email-amazon-ses", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Amazon SES provider for strapi email", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-provider-email-mailgun/package.json b/packages/strapi-provider-email-mailgun/package.json index 4f4725aa99..691623ddf6 100644 --- a/packages/strapi-provider-email-mailgun/package.json +++ b/packages/strapi-provider-email-mailgun/package.json @@ -1,6 +1,6 @@ { "name": "strapi-provider-email-mailgun", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Mailgun provider for strapi email plugin", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-provider-email-sendgrid/package.json b/packages/strapi-provider-email-sendgrid/package.json index 049382a2c5..94d8b583d1 100644 --- a/packages/strapi-provider-email-sendgrid/package.json +++ b/packages/strapi-provider-email-sendgrid/package.json @@ -1,6 +1,6 @@ { "name": "strapi-provider-email-sendgrid", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Sendgrid provider for strapi email", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-provider-email-sendmail/package.json b/packages/strapi-provider-email-sendmail/package.json index 0cc3b73b7a..4b669c72e7 100644 --- a/packages/strapi-provider-email-sendmail/package.json +++ b/packages/strapi-provider-email-sendmail/package.json @@ -1,6 +1,6 @@ { "name": "strapi-provider-email-sendmail", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Sendmail provider for strapi email", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-provider-upload-aws-s3/package.json b/packages/strapi-provider-upload-aws-s3/package.json index 9cccb184ff..bd96b6125d 100644 --- a/packages/strapi-provider-upload-aws-s3/package.json +++ b/packages/strapi-provider-upload-aws-s3/package.json @@ -1,6 +1,6 @@ { "name": "strapi-provider-upload-aws-s3", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "AWS S3 provider for strapi upload", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-provider-upload-cloudinary/package.json b/packages/strapi-provider-upload-cloudinary/package.json index 817c216099..3974154d17 100644 --- a/packages/strapi-provider-upload-cloudinary/package.json +++ b/packages/strapi-provider-upload-cloudinary/package.json @@ -1,6 +1,6 @@ { "name": "strapi-provider-upload-cloudinary", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Cloudinary provider for strapi upload", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-provider-upload-local/package.json b/packages/strapi-provider-upload-local/package.json index 845eb6110e..f9bc5fe940 100644 --- a/packages/strapi-provider-upload-local/package.json +++ b/packages/strapi-provider-upload-local/package.json @@ -1,6 +1,6 @@ { "name": "strapi-provider-upload-local", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Local provider for strapi upload", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-provider-upload-rackspace/package.json b/packages/strapi-provider-upload-rackspace/package.json index 2b452f45cf..201a49e616 100644 --- a/packages/strapi-provider-upload-rackspace/package.json +++ b/packages/strapi-provider-upload-rackspace/package.json @@ -1,6 +1,6 @@ { "name": "strapi-provider-upload-rackspace", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Rackspace provider for strapi upload", "main": "./lib", "keywords": [], diff --git a/packages/strapi-utils/package.json b/packages/strapi-utils/package.json index 404c5e5294..735a868a73 100644 --- a/packages/strapi-utils/package.json +++ b/packages/strapi-utils/package.json @@ -1,6 +1,6 @@ { "name": "strapi-utils", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "description": "Shared utilities for the Strapi packages", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi/package.json b/packages/strapi/package.json index 174b5acb15..11d43af419 100644 --- a/packages/strapi/package.json +++ b/packages/strapi/package.json @@ -1,6 +1,6 @@ { "name": "strapi", - "version": "3.0.0-beta.17.6", + "version": "3.0.0-beta.17.7", "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: MongoDB, MySQL, MariaDB, PostgreSQL, SQLite", "homepage": "http://strapi.io", "directories": { @@ -48,15 +48,15 @@ "resolve-cwd": "^3.0.0", "rimraf": "^2.6.2", "shelljs": "^0.8.3", - "strapi-generate": "3.0.0-beta.17.6", - "strapi-generate-api": "3.0.0-beta.17.6", - "strapi-generate-controller": "3.0.0-beta.17.6", - "strapi-generate-model": "3.0.0-beta.17.6", - "strapi-generate-new": "3.0.0-beta.17.6", - "strapi-generate-plugin": "3.0.0-beta.17.6", - "strapi-generate-policy": "3.0.0-beta.17.6", - "strapi-generate-service": "3.0.0-beta.17.6", - "strapi-utils": "3.0.0-beta.17.6" + "strapi-generate": "3.0.0-beta.17.7", + "strapi-generate-api": "3.0.0-beta.17.7", + "strapi-generate-controller": "3.0.0-beta.17.7", + "strapi-generate-model": "3.0.0-beta.17.7", + "strapi-generate-new": "3.0.0-beta.17.7", + "strapi-generate-plugin": "3.0.0-beta.17.7", + "strapi-generate-policy": "3.0.0-beta.17.7", + "strapi-generate-service": "3.0.0-beta.17.7", + "strapi-utils": "3.0.0-beta.17.7" }, "scripts": { "test": "jest --verbose", From 773b89bc790e9c6a50ffce4fe6e63bca3672deb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Georget?= Date: Fri, 29 Nov 2019 18:10:32 +0100 Subject: [PATCH 16/20] Add parameter to identify Docker projects --- packages/strapi-generate-new/lib/index.js | 1 + packages/strapi-generate-new/lib/utils/usage.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/packages/strapi-generate-new/lib/index.js b/packages/strapi-generate-new/lib/index.js index d8f01cee4e..c92aa2283e 100644 --- a/packages/strapi-generate-new/lib/index.js +++ b/packages/strapi-generate-new/lib/index.js @@ -39,6 +39,7 @@ module.exports = (projectDirectory, cliArguments) => { strapiVersion: require('../package.json').version, debug: cliArguments.debug !== undefined, quick: cliArguments.quickstart !== undefined, + docker: cliArguments.docker !== undefined, uuid: uuid(), deviceId: machineIdSync(), tmpPath, diff --git a/packages/strapi-generate-new/lib/utils/usage.js b/packages/strapi-generate-new/lib/utils/usage.js index 4c3c9a3b4d..7ab53581fa 100644 --- a/packages/strapi-generate-new/lib/utils/usage.js +++ b/packages/strapi-generate-new/lib/utils/usage.js @@ -70,6 +70,7 @@ function trackError({ scope, error }) { release: os.release(), version: scope.strapiVersion, nodeVersion: process.version, + docker: scope.docker, }, }); } catch (err) { @@ -90,6 +91,7 @@ function trackUsage({ event, scope, error }) { os_release: os.release(), node_version: process.version, version: scope.strapiVersion, + docker: scope.docker, }, }); } catch (err) { From 1500b4f49a747990ee6951c0c32bff308121feb4 Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Sun, 1 Dec 2019 23:05:58 +0100 Subject: [PATCH 17/20] Valid plugin name --- packages/strapi-admin/controllers/Admin.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/strapi-admin/controllers/Admin.js b/packages/strapi-admin/controllers/Admin.js index c6bbd5edf3..d888e95d7a 100644 --- a/packages/strapi-admin/controllers/Admin.js +++ b/packages/strapi-admin/controllers/Admin.js @@ -66,6 +66,11 @@ module.exports = { async installPlugin(ctx) { try { const { plugin } = ctx.request.body; + + if (!/^[A-Za-z0-9_-]+$/.test(plugin)) { + return ctx.badRequest('Invalid plugin name'); + } + strapi.reload.isWatching = false; strapi.log.info(`Installing ${plugin}...`); @@ -101,6 +106,11 @@ module.exports = { async uninstallPlugin(ctx) { try { const { plugin } = ctx.params; + + if (!/^[A-Za-z0-9_-]+$/.test(plugin)) { + return ctx.badRequest('Invalid plugin name'); + } + strapi.reload.isWatching = false; strapi.log.info(`Uninstalling ${plugin}...`); From cf6ecbff4f38ef4ad8718670f28b8b69d4cae01b Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Sun, 1 Dec 2019 23:20:50 +0100 Subject: [PATCH 18/20] v3.0.0-beta.17.8 --- examples/getstarted/package.json | 34 +++++++++---------- lerna.json | 2 +- packages/create-strapi-app/package.json | 4 +-- packages/strapi-admin/package.json | 6 ++-- packages/strapi-generate-api/package.json | 2 +- .../strapi-generate-controller/package.json | 2 +- packages/strapi-generate-model/package.json | 2 +- packages/strapi-generate-new/package.json | 2 +- packages/strapi-generate-plugin/package.json | 2 +- packages/strapi-generate-policy/package.json | 2 +- packages/strapi-generate-service/package.json | 2 +- packages/strapi-generate/package.json | 4 +-- packages/strapi-helper-plugin/package.json | 2 +- packages/strapi-hook-bookshelf/package.json | 6 ++-- packages/strapi-hook-ejs/package.json | 2 +- packages/strapi-hook-knex/package.json | 2 +- packages/strapi-hook-mongoose/package.json | 4 +-- packages/strapi-hook-redis/package.json | 4 +-- packages/strapi-middleware-views/package.json | 2 +- .../package.json | 6 ++-- .../package.json | 8 ++--- .../strapi-plugin-documentation/package.json | 4 +-- packages/strapi-plugin-email/package.json | 8 ++--- packages/strapi-plugin-graphql/package.json | 4 +-- packages/strapi-plugin-upload/package.json | 8 ++--- .../package.json | 6 ++-- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- .../strapi-provider-upload-local/package.json | 2 +- .../package.json | 2 +- packages/strapi-utils/package.json | 2 +- packages/strapi/package.json | 20 +++++------ 36 files changed, 84 insertions(+), 84 deletions(-) diff --git a/examples/getstarted/package.json b/examples/getstarted/package.json index 239a4eb9e7..ee6560cf5e 100644 --- a/examples/getstarted/package.json +++ b/examples/getstarted/package.json @@ -1,7 +1,7 @@ { "name": "getstarted", "private": true, - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "A Strapi application.", "scripts": { "develop": "strapi develop", @@ -15,22 +15,22 @@ "mysql": "^2.17.1", "pg": "^7.10.0", "sqlite3": "^4.0.6", - "strapi": "3.0.0-beta.17.7", - "strapi-admin": "3.0.0-beta.17.7", - "strapi-hook-bookshelf": "3.0.0-beta.17.7", - "strapi-hook-knex": "3.0.0-beta.17.7", - "strapi-hook-mongoose": "3.0.0-beta.17.7", - "strapi-middleware-views": "3.0.0-beta.17.7", - "strapi-plugin-content-manager": "3.0.0-beta.17.7", - "strapi-plugin-content-type-builder": "3.0.0-beta.17.7", - "strapi-plugin-documentation": "3.0.0-beta.17.7", - "strapi-plugin-email": "3.0.0-beta.17.7", - "strapi-plugin-graphql": "3.0.0-beta.17.7", - "strapi-plugin-upload": "3.0.0-beta.17.7", - "strapi-plugin-users-permissions": "3.0.0-beta.17.7", - "strapi-provider-email-mailgun": "3.0.0-beta.17.7", - "strapi-provider-upload-aws-s3": "3.0.0-beta.17.7", - "strapi-utils": "3.0.0-beta.17.7" + "strapi": "3.0.0-beta.17.8", + "strapi-admin": "3.0.0-beta.17.8", + "strapi-hook-bookshelf": "3.0.0-beta.17.8", + "strapi-hook-knex": "3.0.0-beta.17.8", + "strapi-hook-mongoose": "3.0.0-beta.17.8", + "strapi-middleware-views": "3.0.0-beta.17.8", + "strapi-plugin-content-manager": "3.0.0-beta.17.8", + "strapi-plugin-content-type-builder": "3.0.0-beta.17.8", + "strapi-plugin-documentation": "3.0.0-beta.17.8", + "strapi-plugin-email": "3.0.0-beta.17.8", + "strapi-plugin-graphql": "3.0.0-beta.17.8", + "strapi-plugin-upload": "3.0.0-beta.17.8", + "strapi-plugin-users-permissions": "3.0.0-beta.17.8", + "strapi-provider-email-mailgun": "3.0.0-beta.17.8", + "strapi-provider-upload-aws-s3": "3.0.0-beta.17.8", + "strapi-utils": "3.0.0-beta.17.8" }, "strapi": { "uuid": "getstarted" diff --git a/lerna.json b/lerna.json index 78d2792217..e84efb0906 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "packages": [ "packages/*", "examples/*" diff --git a/packages/create-strapi-app/package.json b/packages/create-strapi-app/package.json index 69a2464231..220e97f926 100644 --- a/packages/create-strapi-app/package.json +++ b/packages/create-strapi-app/package.json @@ -1,6 +1,6 @@ { "name": "create-strapi-app", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Generate a new Strapi application.", "license": "MIT", "homepage": "http://strapi.io", @@ -21,7 +21,7 @@ ], "dependencies": { "commander": "^2.20.0", - "strapi-generate-new": "3.0.0-beta.17.7" + "strapi-generate-new": "3.0.0-beta.17.8" }, "scripts": { "test": "echo \"no tests yet\"" diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json index c780d6f7a5..f04f5f3aa6 100644 --- a/packages/strapi-admin/package.json +++ b/packages/strapi-admin/package.json @@ -1,6 +1,6 @@ { "name": "strapi-admin", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Strapi Admin", "repository": { "type": "git", @@ -69,8 +69,8 @@ "reselect": "^3.0.1", "sanitize.css": "^4.1.0", "shelljs": "^0.7.8", - "strapi-helper-plugin": "3.0.0-beta.17.7", - "strapi-utils": "3.0.0-beta.17.7", + "strapi-helper-plugin": "3.0.0-beta.17.8", + "strapi-utils": "3.0.0-beta.17.8", "style-loader": "^0.23.1", "styled-components": "^4.2.0", "terser-webpack-plugin": "^1.2.3", diff --git a/packages/strapi-generate-api/package.json b/packages/strapi-generate-api/package.json index a7dead4ef8..31830ccaaa 100644 --- a/packages/strapi-generate-api/package.json +++ b/packages/strapi-generate-api/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-api", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Generate an API for a Strapi application.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-controller/package.json b/packages/strapi-generate-controller/package.json index faebe6af0e..10b5561be8 100644 --- a/packages/strapi-generate-controller/package.json +++ b/packages/strapi-generate-controller/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-controller", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Generate a controller for a Strapi API.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-model/package.json b/packages/strapi-generate-model/package.json index 26b078fc2b..0fb86ec788 100644 --- a/packages/strapi-generate-model/package.json +++ b/packages/strapi-generate-model/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-model", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Generate a model for a Strapi API.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-new/package.json b/packages/strapi-generate-new/package.json index 546a347e96..bfc67c4357 100644 --- a/packages/strapi-generate-new/package.json +++ b/packages/strapi-generate-new/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-new", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Generate a new Strapi application.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-plugin/package.json b/packages/strapi-generate-plugin/package.json index 6a5dedc206..7fa8e4ad97 100644 --- a/packages/strapi-generate-plugin/package.json +++ b/packages/strapi-generate-plugin/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-plugin", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Generate an plugin for a Strapi application.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-policy/package.json b/packages/strapi-generate-policy/package.json index d605ba5c9a..fc5246fdcd 100644 --- a/packages/strapi-generate-policy/package.json +++ b/packages/strapi-generate-policy/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-policy", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Generate a policy for a Strapi API.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-service/package.json b/packages/strapi-generate-service/package.json index 12a1cb67fa..50217ee290 100644 --- a/packages/strapi-generate-service/package.json +++ b/packages/strapi-generate-service/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-service", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Generate a service for a Strapi API.", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate/package.json b/packages/strapi-generate/package.json index b16d36b22f..eb82a5fea3 100644 --- a/packages/strapi-generate/package.json +++ b/packages/strapi-generate/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Master of ceremonies for the Strapi generators.", "homepage": "http://strapi.io", "keywords": [ @@ -20,7 +20,7 @@ "fs-extra": "^8.0.1", "lodash": "^4.17.11", "reportback": "^2.0.2", - "strapi-utils": "3.0.0-beta.17.7" + "strapi-utils": "3.0.0-beta.17.8" }, "author": { "name": "Strapi team", diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json index 618839262d..26eb6ed971 100644 --- a/packages/strapi-helper-plugin/package.json +++ b/packages/strapi-helper-plugin/package.json @@ -1,6 +1,6 @@ { "name": "strapi-helper-plugin", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Helper for Strapi plugins development", "files": [ "dist" diff --git a/packages/strapi-hook-bookshelf/package.json b/packages/strapi-hook-bookshelf/package.json index 855a815425..f2dba45204 100644 --- a/packages/strapi-hook-bookshelf/package.json +++ b/packages/strapi-hook-bookshelf/package.json @@ -1,6 +1,6 @@ { "name": "strapi-hook-bookshelf", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Bookshelf hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ @@ -22,8 +22,8 @@ "lodash": "^4.17.11", "pluralize": "^7.0.0", "rimraf": "^2.6.3", - "strapi-hook-knex": "3.0.0-beta.17.7", - "strapi-utils": "3.0.0-beta.17.7" + "strapi-hook-knex": "3.0.0-beta.17.8", + "strapi-utils": "3.0.0-beta.17.8" }, "strapi": { "dependencies": [ diff --git a/packages/strapi-hook-ejs/package.json b/packages/strapi-hook-ejs/package.json index 0dc2454fa6..d0bae85197 100644 --- a/packages/strapi-hook-ejs/package.json +++ b/packages/strapi-hook-ejs/package.json @@ -1,6 +1,6 @@ { "name": "strapi-hook-ejs", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "EJS hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-hook-knex/package.json b/packages/strapi-hook-knex/package.json index 5848cb1739..a81cab5d41 100644 --- a/packages/strapi-hook-knex/package.json +++ b/packages/strapi-hook-knex/package.json @@ -1,6 +1,6 @@ { "name": "strapi-hook-knex", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Knex hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-hook-mongoose/package.json b/packages/strapi-hook-mongoose/package.json index 57a8feebc2..6e04d4f9b8 100644 --- a/packages/strapi-hook-mongoose/package.json +++ b/packages/strapi-hook-mongoose/package.json @@ -1,6 +1,6 @@ { "name": "strapi-hook-mongoose", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Mongoose hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ @@ -20,7 +20,7 @@ "mongoose-float": "^1.0.4", "mongoose-long": "^0.2.1", "pluralize": "^7.0.0", - "strapi-utils": "3.0.0-beta.17.7" + "strapi-utils": "3.0.0-beta.17.8" }, "author": { "email": "hi@strapi.io", diff --git a/packages/strapi-hook-redis/package.json b/packages/strapi-hook-redis/package.json index 58c9b40892..f73e558607 100644 --- a/packages/strapi-hook-redis/package.json +++ b/packages/strapi-hook-redis/package.json @@ -1,6 +1,6 @@ { "name": "strapi-hook-redis", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Redis hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ @@ -19,7 +19,7 @@ "lodash": "^4.17.11", "rimraf": "^2.6.3", "stack-trace": "0.0.10", - "strapi-utils": "3.0.0-beta.17.7" + "strapi-utils": "3.0.0-beta.17.8" }, "author": { "email": "hi@strapi.io", diff --git a/packages/strapi-middleware-views/package.json b/packages/strapi-middleware-views/package.json index c2630982f0..c6a3fd70ec 100644 --- a/packages/strapi-middleware-views/package.json +++ b/packages/strapi-middleware-views/package.json @@ -1,6 +1,6 @@ { "name": "strapi-middleware-views", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Views middleware to enable server-side rendering for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json index db51f0b06c..6e4d6ea4e4 100644 --- a/packages/strapi-plugin-content-manager/package.json +++ b/packages/strapi-plugin-content-manager/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-content-manager", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "A powerful UI to easily manage your data.", "strapi": { "name": "Content Manager", @@ -32,8 +32,8 @@ "redux-immutable": "^4.0.0", "reselect": "^3.0.1", "showdown": "^1.9.0", - "strapi-helper-plugin": "3.0.0-beta.17.7", - "strapi-utils": "3.0.0-beta.17.7", + "strapi-helper-plugin": "3.0.0-beta.17.8", + "strapi-utils": "3.0.0-beta.17.8", "styled-components": "^4.2.0", "yup": "^0.27.0" }, diff --git a/packages/strapi-plugin-content-type-builder/package.json b/packages/strapi-plugin-content-type-builder/package.json index a1aefb9846..2b91a886fe 100644 --- a/packages/strapi-plugin-content-type-builder/package.json +++ b/packages/strapi-plugin-content-type-builder/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-content-type-builder", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Strapi plugin to create content type (API).", "strapi": { "name": "Content Type Builder", @@ -29,9 +29,9 @@ "redux": "^4.0.1", "redux-immutable": "^4.0.0", "reselect": "^3.0.1", - "strapi-generate": "3.0.0-beta.17.7", - "strapi-generate-api": "3.0.0-beta.17.7", - "strapi-helper-plugin": "3.0.0-beta.17.7", + "strapi-generate": "3.0.0-beta.17.8", + "strapi-generate-api": "3.0.0-beta.17.8", + "strapi-helper-plugin": "3.0.0-beta.17.8", "yup": "^0.27.0" }, "author": { diff --git a/packages/strapi-plugin-documentation/package.json b/packages/strapi-plugin-documentation/package.json index 8d6efdf552..f6d716f11f 100755 --- a/packages/strapi-plugin-documentation/package.json +++ b/packages/strapi-plugin-documentation/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-documentation", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "This is the description of the plugin.", "strapi": { "name": "Documentation", @@ -32,7 +32,7 @@ "redux": "^4.0.1", "redux-immutable": "^4.0.0", "reselect": "^4.0.0", - "strapi-helper-plugin": "3.0.0-beta.17.7", + "strapi-helper-plugin": "3.0.0-beta.17.8", "swagger-ui-dist": "3.22.1" }, "author": { diff --git a/packages/strapi-plugin-email/package.json b/packages/strapi-plugin-email/package.json index 55fc67dbac..131bf58b23 100644 --- a/packages/strapi-plugin-email/package.json +++ b/packages/strapi-plugin-email/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-email", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "This is the description of the plugin.", "strapi": { "name": "Email", @@ -12,13 +12,13 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "strapi-provider-email-sendmail": "3.0.0-beta.17.7", - "strapi-utils": "3.0.0-beta.17.7" + "strapi-provider-email-sendmail": "3.0.0-beta.17.8", + "strapi-utils": "3.0.0-beta.17.8" }, "devDependencies": { "react-copy-to-clipboard": "5.0.1", "rimraf": "^2.6.3", - "strapi-helper-plugin": "3.0.0-beta.17.7" + "strapi-helper-plugin": "3.0.0-beta.17.8" }, "author": { "name": "Strapi team", diff --git a/packages/strapi-plugin-graphql/package.json b/packages/strapi-plugin-graphql/package.json index b81b3fc4a1..b3042aa002 100644 --- a/packages/strapi-plugin-graphql/package.json +++ b/packages/strapi-plugin-graphql/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-graphql", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "This is the description of the plugin.", "strapi": { "name": "graphql", @@ -23,7 +23,7 @@ "graphql-type-long": "^0.1.1", "koa-compose": "^4.1.0", "pluralize": "^7.0.0", - "strapi-utils": "3.0.0-beta.17.7" + "strapi-utils": "3.0.0-beta.17.8" }, "devDependencies": { "cross-env": "^5.2.0", diff --git a/packages/strapi-plugin-upload/package.json b/packages/strapi-plugin-upload/package.json index fd5b04f657..c89d24c312 100644 --- a/packages/strapi-plugin-upload/package.json +++ b/packages/strapi-plugin-upload/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-upload", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "This is the description of the plugin.", "strapi": { "name": "Files Upload", @@ -23,9 +23,9 @@ "react-router-dom": "^5.0.0", "react-transition-group": "^2.5.0", "reactstrap": "^5.0.0", - "strapi-helper-plugin": "3.0.0-beta.17.7", - "strapi-provider-upload-local": "3.0.0-beta.17.7", - "strapi-utils": "3.0.0-beta.17.7", + "strapi-helper-plugin": "3.0.0-beta.17.8", + "strapi-provider-upload-local": "3.0.0-beta.17.8", + "strapi-utils": "3.0.0-beta.17.8", "stream-to-array": "^2.3.0", "uuid": "^3.2.1" }, diff --git a/packages/strapi-plugin-users-permissions/package.json b/packages/strapi-plugin-users-permissions/package.json index e902132494..19e7873cfc 100644 --- a/packages/strapi-plugin-users-permissions/package.json +++ b/packages/strapi-plugin-users-permissions/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-users-permissions", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Protect your API with a full-authentication process based on JWT", "strapi": { "name": "Roles & Permissions", @@ -31,8 +31,8 @@ "reactstrap": "^5.0.0", "redux-saga": "^0.16.0", "request": "^2.83.0", - "strapi-helper-plugin": "3.0.0-beta.17.7", - "strapi-utils": "3.0.0-beta.17.7", + "strapi-helper-plugin": "3.0.0-beta.17.8", + "strapi-utils": "3.0.0-beta.17.8", "uuid": "^3.1.0" }, "devDependencies": { diff --git a/packages/strapi-provider-email-amazon-ses/package.json b/packages/strapi-provider-email-amazon-ses/package.json index 65fa8290e6..c167c87e19 100644 --- a/packages/strapi-provider-email-amazon-ses/package.json +++ b/packages/strapi-provider-email-amazon-ses/package.json @@ -1,6 +1,6 @@ { "name": "strapi-provider-email-amazon-ses", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Amazon SES provider for strapi email", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-provider-email-mailgun/package.json b/packages/strapi-provider-email-mailgun/package.json index 691623ddf6..7261cafac0 100644 --- a/packages/strapi-provider-email-mailgun/package.json +++ b/packages/strapi-provider-email-mailgun/package.json @@ -1,6 +1,6 @@ { "name": "strapi-provider-email-mailgun", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Mailgun provider for strapi email plugin", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-provider-email-sendgrid/package.json b/packages/strapi-provider-email-sendgrid/package.json index 94d8b583d1..254a08d77c 100644 --- a/packages/strapi-provider-email-sendgrid/package.json +++ b/packages/strapi-provider-email-sendgrid/package.json @@ -1,6 +1,6 @@ { "name": "strapi-provider-email-sendgrid", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Sendgrid provider for strapi email", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-provider-email-sendmail/package.json b/packages/strapi-provider-email-sendmail/package.json index 4b669c72e7..30464a75d5 100644 --- a/packages/strapi-provider-email-sendmail/package.json +++ b/packages/strapi-provider-email-sendmail/package.json @@ -1,6 +1,6 @@ { "name": "strapi-provider-email-sendmail", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Sendmail provider for strapi email", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-provider-upload-aws-s3/package.json b/packages/strapi-provider-upload-aws-s3/package.json index bd96b6125d..6f5837e8b4 100644 --- a/packages/strapi-provider-upload-aws-s3/package.json +++ b/packages/strapi-provider-upload-aws-s3/package.json @@ -1,6 +1,6 @@ { "name": "strapi-provider-upload-aws-s3", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "AWS S3 provider for strapi upload", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-provider-upload-cloudinary/package.json b/packages/strapi-provider-upload-cloudinary/package.json index 3974154d17..5f72068e07 100644 --- a/packages/strapi-provider-upload-cloudinary/package.json +++ b/packages/strapi-provider-upload-cloudinary/package.json @@ -1,6 +1,6 @@ { "name": "strapi-provider-upload-cloudinary", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Cloudinary provider for strapi upload", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-provider-upload-local/package.json b/packages/strapi-provider-upload-local/package.json index f9bc5fe940..e14b1b7a54 100644 --- a/packages/strapi-provider-upload-local/package.json +++ b/packages/strapi-provider-upload-local/package.json @@ -1,6 +1,6 @@ { "name": "strapi-provider-upload-local", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Local provider for strapi upload", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-provider-upload-rackspace/package.json b/packages/strapi-provider-upload-rackspace/package.json index 201a49e616..606af36d06 100644 --- a/packages/strapi-provider-upload-rackspace/package.json +++ b/packages/strapi-provider-upload-rackspace/package.json @@ -1,6 +1,6 @@ { "name": "strapi-provider-upload-rackspace", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Rackspace provider for strapi upload", "main": "./lib", "keywords": [], diff --git a/packages/strapi-utils/package.json b/packages/strapi-utils/package.json index 735a868a73..35046b5b0b 100644 --- a/packages/strapi-utils/package.json +++ b/packages/strapi-utils/package.json @@ -1,6 +1,6 @@ { "name": "strapi-utils", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.8", "description": "Shared utilities for the Strapi packages", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi/package.json b/packages/strapi/package.json index 11d43af419..2f7f34ff3c 100644 --- a/packages/strapi/package.json +++ b/packages/strapi/package.json @@ -1,6 +1,6 @@ { "name": "strapi", - "version": "3.0.0-beta.17.7", + "version": "3.0.0-beta.17.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: MongoDB, MySQL, MariaDB, PostgreSQL, SQLite", "homepage": "http://strapi.io", "directories": { @@ -48,15 +48,15 @@ "resolve-cwd": "^3.0.0", "rimraf": "^2.6.2", "shelljs": "^0.8.3", - "strapi-generate": "3.0.0-beta.17.7", - "strapi-generate-api": "3.0.0-beta.17.7", - "strapi-generate-controller": "3.0.0-beta.17.7", - "strapi-generate-model": "3.0.0-beta.17.7", - "strapi-generate-new": "3.0.0-beta.17.7", - "strapi-generate-plugin": "3.0.0-beta.17.7", - "strapi-generate-policy": "3.0.0-beta.17.7", - "strapi-generate-service": "3.0.0-beta.17.7", - "strapi-utils": "3.0.0-beta.17.7" + "strapi-generate": "3.0.0-beta.17.8", + "strapi-generate-api": "3.0.0-beta.17.8", + "strapi-generate-controller": "3.0.0-beta.17.8", + "strapi-generate-model": "3.0.0-beta.17.8", + "strapi-generate-new": "3.0.0-beta.17.8", + "strapi-generate-plugin": "3.0.0-beta.17.8", + "strapi-generate-policy": "3.0.0-beta.17.8", + "strapi-generate-service": "3.0.0-beta.17.8", + "strapi-utils": "3.0.0-beta.17.8" }, "scripts": { "test": "jest --verbose", From cf9bcc2337b45a6ff2d1141b95999b43492298e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Georget?= Date: Mon, 2 Dec 2019 15:30:22 +0100 Subject: [PATCH 19/20] Use environment variable instead of argument --- packages/strapi-generate-new/lib/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/strapi-generate-new/lib/index.js b/packages/strapi-generate-new/lib/index.js index c92aa2283e..bad74c5701 100644 --- a/packages/strapi-generate-new/lib/index.js +++ b/packages/strapi-generate-new/lib/index.js @@ -39,7 +39,7 @@ module.exports = (projectDirectory, cliArguments) => { strapiVersion: require('../package.json').version, debug: cliArguments.debug !== undefined, quick: cliArguments.quickstart !== undefined, - docker: cliArguments.docker !== undefined, + docker: process.env.DOCKER === 'true', uuid: uuid(), deviceId: machineIdSync(), tmpPath, @@ -66,6 +66,7 @@ module.exports = (projectDirectory, cliArguments) => { os_release: os.release(), strapi_version: scope.strapiVersion, node_version: process.version, + docker: scope.docker, }; Object.keys(tags).forEach(tag => { From 509f7a60e5c7185abe5473ccff7015001c2d786e Mon Sep 17 00:00:00 2001 From: Jim LAURIE Date: Tue, 3 Dec 2019 13:59:34 +0100 Subject: [PATCH 20/20] Fix soupette feedback --- CONTRIBUTING.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e10268beb5..9544cd1e84 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -88,7 +88,16 @@ yarn develop The server (API) is available at http://localhost:1337 -The administration panel is available at http://localhost:1337/admin +The built administration panel is available at http://localhost:1337/admin + +**Start the administration panel server for development** + +```bash +cd strapi/packages/strapi-admin +yarn develop +``` + +The administration panel will be available at http://localhost:4000/admin **Awesome! You are now able to contribute to Strapi.**