From b73e3561f5e3ba9974f807a59a69d93819dc4ff8 Mon Sep 17 00:00:00 2001 From: Nikolay Tsenkov Date: Tue, 24 Jul 2018 10:28:44 +0300 Subject: [PATCH 1/7] Add: plugin: strapi-email-amazon-ses. --- .../strapi-email-amazon-ses/.editorconfig | 16 +++ packages/strapi-email-amazon-ses/.gitignore | 96 ++++++++++++++++ packages/strapi-email-amazon-ses/.npmignore | 104 ++++++++++++++++++ packages/strapi-email-amazon-ses/LICENSE.md | 7 ++ packages/strapi-email-amazon-ses/README.md | 11 ++ packages/strapi-email-amazon-ses/lib/index.js | 77 +++++++++++++ packages/strapi-email-amazon-ses/package.json | 45 ++++++++ 7 files changed, 356 insertions(+) create mode 100644 packages/strapi-email-amazon-ses/.editorconfig create mode 100644 packages/strapi-email-amazon-ses/.gitignore create mode 100644 packages/strapi-email-amazon-ses/.npmignore create mode 100644 packages/strapi-email-amazon-ses/LICENSE.md create mode 100644 packages/strapi-email-amazon-ses/README.md create mode 100644 packages/strapi-email-amazon-ses/lib/index.js create mode 100644 packages/strapi-email-amazon-ses/package.json diff --git a/packages/strapi-email-amazon-ses/.editorconfig b/packages/strapi-email-amazon-ses/.editorconfig new file mode 100644 index 0000000000..473e45184b --- /dev/null +++ b/packages/strapi-email-amazon-ses/.editorconfig @@ -0,0 +1,16 @@ +root = true + +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[{package.json,*.yml}] +indent_style = space +indent_size = 2 + +[*.md] +trim_trailing_whitespace = false diff --git a/packages/strapi-email-amazon-ses/.gitignore b/packages/strapi-email-amazon-ses/.gitignore new file mode 100644 index 0000000000..ab74240ce1 --- /dev/null +++ b/packages/strapi-email-amazon-ses/.gitignore @@ -0,0 +1,96 @@ +############################ +# OS X +############################ + +.DS_Store +.AppleDouble +.LSOverride +Icon +.Spotlight-V100 +.Trashes +._* + + +############################ +# Linux +############################ + +*~ + + +############################ +# Windows +############################ + +Thumbs.db +ehthumbs.db +Desktop.ini +$RECYCLE.BIN/ +*.cab +*.msi +*.msm +*.msp + + +############################ +# Packages +############################ + +*.7z +*.csv +*.dat +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip +*.com +*.class +*.dll +*.exe +*.o +*.seed +*.so +*.swo +*.swp +*.swn +*.swm +*.out +*.pid + + +############################ +# Logs and databases +############################ + +.tmp +*.log +*.sql +*.sqlite + + +############################ +# Misc. +############################ + +*# +.idea +nbproject + + +############################ +# Node.js +############################ + +lib-cov +lcov.info +pids +logs +results +build +node_modules +.node_history +package-lock.json +yarn.lock diff --git a/packages/strapi-email-amazon-ses/.npmignore b/packages/strapi-email-amazon-ses/.npmignore new file mode 100644 index 0000000000..af4e0054dd --- /dev/null +++ b/packages/strapi-email-amazon-ses/.npmignore @@ -0,0 +1,104 @@ +############################ +# OS X +############################ + +.DS_Store +.AppleDouble +.LSOverride +Icon +.Spotlight-V100 +.Trashes +._* + + +############################ +# Linux +############################ + +*~ + + +############################ +# Windows +############################ + +Thumbs.db +ehthumbs.db +Desktop.ini +$RECYCLE.BIN/ +*.cab +*.msi +*.msm +*.msp + + +############################ +# Packages +############################ + +*.7z +*.csv +*.dat +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip +*.com +*.class +*.dll +*.exe +*.o +*.seed +*.so +*.swo +*.swp +*.swn +*.swm +*.out +*.pid + + +############################ +# Logs and databases +############################ + +.tmp +*.log +*.sql +*.sqlite + + +############################ +# Misc. +############################ + +*# +ssl +.editorconfig +.gitattributes +.idea +nbproject + + +############################ +# Node.js +############################ + +lib-cov +lcov.info +pids +logs +results +build +node_modules +.node_history + + +############################ +# Tests +############################ + +test diff --git a/packages/strapi-email-amazon-ses/LICENSE.md b/packages/strapi-email-amazon-ses/LICENSE.md new file mode 100644 index 0000000000..6865b7e33f --- /dev/null +++ b/packages/strapi-email-amazon-ses/LICENSE.md @@ -0,0 +1,7 @@ +Copyright (c) 2018 Nikolay Tsenkov (nikolay@tsenkov.net). + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/packages/strapi-email-amazon-ses/README.md b/packages/strapi-email-amazon-ses/README.md new file mode 100644 index 0000000000..b6c41e6f2e --- /dev/null +++ b/packages/strapi-email-amazon-ses/README.md @@ -0,0 +1,11 @@ +# strapi-email-amazon-ses + +## Resources + +- [MIT License](LICENSE.md) + +## Links + +- [Strapi website](http://strapi.io/) +- [Strapi community on Slack](http://slack.strapi.io) +- [Strapi news on Twitter](https://twitter.com/strapijs) diff --git a/packages/strapi-email-amazon-ses/lib/index.js b/packages/strapi-email-amazon-ses/lib/index.js new file mode 100644 index 0000000000..4aacf0a9e4 --- /dev/null +++ b/packages/strapi-email-amazon-ses/lib/index.js @@ -0,0 +1,77 @@ +'use strict'; + +/** + * Module dependencies + */ + +/* eslint-disable import/no-unresolved */ +/* eslint-disable prefer-template */ +// Public node modules. +const _ = require('lodash'); +const nodeSES = require('node-ses'); + +/* eslint-disable no-unused-vars */ +module.exports = { + provider: 'amazon-ses', + name: 'Amazon SES', + auth: { + amazon_ses_default_from: { + label: 'Amazon SES Default From', + type: 'text' + }, + amazon_ses_default_replyto: { + label: 'Amazon SES Default Reply-To', + type: 'text' + }, + amazon_ses_api_key: { + label: 'Amazon SES API Key', + type: 'text' + }, + amazon_ses_secret: { + label: 'Amazon SES Secret', + type: 'text' + }, + amazon_ses_endpoint: { + label: 'Amazon SES Endpoint', + type: 'text' + } + }, + init: (config) => { + + var client = nodeSES.createClient({ + key: config.amazon_ses_api_key, + secret: config.amazon_ses_secret, + amazon: config.amazon_ses_endpoint || null + }); + + return { + send: (options, cb) => { + return new Promise((resolve, reject) => { + // Default values. + options = _.isObject(options) ? options : {}; + options.from = options.from || config.amazon_ses_default_from; + options.replyTo = options.replyTo || config.amazon_ses_default_replyto; + options.text = options.text || options.html; + options.html = options.html || options.text; + + let msg = { + from: options.from, + to: options.to, + replyTo: options.replyTo, + subject: options.subject, + altText: options.text, + message: options.html + }; + + nodeSES.sendEmail(msg, function (err) { + if (err) { + reject([{ messages: [{ id: 'Auth.form.error.email.invalid' }] }]); + } else { + resolve(); + } + }); + }); + } + }; + } +}; diff --git a/packages/strapi-email-amazon-ses/package.json b/packages/strapi-email-amazon-ses/package.json new file mode 100644 index 0000000000..e42797abe7 --- /dev/null +++ b/packages/strapi-email-amazon-ses/package.json @@ -0,0 +1,45 @@ +{ + "name": "strapi-email-amazon-ses", + "version": "3.0.0-alpha.12.7.1", + "description": "Amazon SES provider for strapi email", + "homepage": "http://strapi.io", + "keywords": [ + "email", + "strapi", + "amazon", + "ses" + ], + "directories": { + "lib": "./lib" + }, + "main": "./lib", + "dependencies": { + "node-ses": "^2.1.0" + }, + "strapi": { + "isProvider": true + }, + "author": { + "email": "nikolay@tsenkov.net", + "name": "Nikolay tsenkov" + }, + "maintainers": [ + { + "name": "Strapi team", + "email": "hi@strapi.io", + "url": "http://strapi.io" + } + ], + "repository": { + "type": "git", + "url": "git://github.com/strapi/strapi.git" + }, + "bugs": { + "url": "https://github.com/strapi/strapi/issues" + }, + "engines": { + "node": ">= 9.0.0", + "npm": ">= 5.3.0" + }, + "license": "MIT" +} \ No newline at end of file From c8b9b272f1744ba6f7f9b2fed6ec78cdaa09469c Mon Sep 17 00:00:00 2001 From: Nikolay Tsenkov Date: Tue, 24 Jul 2018 12:54:25 +0300 Subject: [PATCH 2/7] Improve: plugin: strapi-email-amazon-ses: setting labels; Remove: plugin: strapi-email-amazon-ses: unnecessary setting. --- packages/strapi-email-amazon-ses/lib/index.js | 16 ++++++---------- packages/strapi-email-amazon-ses/package.json | 4 ++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/packages/strapi-email-amazon-ses/lib/index.js b/packages/strapi-email-amazon-ses/lib/index.js index 4aacf0a9e4..21c82394ad 100644 --- a/packages/strapi-email-amazon-ses/lib/index.js +++ b/packages/strapi-email-amazon-ses/lib/index.js @@ -16,32 +16,28 @@ module.exports = { name: 'Amazon SES', auth: { amazon_ses_default_from: { - label: 'Amazon SES Default From', + label: 'Default From', type: 'text' }, amazon_ses_default_replyto: { - label: 'Amazon SES Default Reply-To', + label: 'Default Reply-To', type: 'text' }, amazon_ses_api_key: { - label: 'Amazon SES API Key', + label: 'Amazon Access key ID', type: 'text' }, amazon_ses_secret: { - label: 'Amazon SES Secret', - type: 'text' - }, - amazon_ses_endpoint: { - label: 'Amazon SES Endpoint', + label: 'Amazon Secret access key', type: 'text' } }, + init: (config) => { var client = nodeSES.createClient({ key: config.amazon_ses_api_key, - secret: config.amazon_ses_secret, - amazon: config.amazon_ses_endpoint || null + secret: config.amazon_ses_secret }); return { diff --git a/packages/strapi-email-amazon-ses/package.json b/packages/strapi-email-amazon-ses/package.json index e42797abe7..866f37d6ce 100644 --- a/packages/strapi-email-amazon-ses/package.json +++ b/packages/strapi-email-amazon-ses/package.json @@ -1,6 +1,6 @@ { "name": "strapi-email-amazon-ses", - "version": "3.0.0-alpha.12.7.1", + "version": "3.0.0-alpha.12.6", "description": "Amazon SES provider for strapi email", "homepage": "http://strapi.io", "keywords": [ @@ -42,4 +42,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} From ff0652b35e11bfd5a28d6452dff42ae2899a3403 Mon Sep 17 00:00:00 2001 From: Nikolay Tsenkov Date: Tue, 24 Jul 2018 13:41:22 +0300 Subject: [PATCH 3/7] Fix: plugin: strapi-email-amazon-ses: error on sending an email. --- packages/strapi-email-amazon-ses/lib/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-email-amazon-ses/lib/index.js b/packages/strapi-email-amazon-ses/lib/index.js index 21c82394ad..5b0532820a 100644 --- a/packages/strapi-email-amazon-ses/lib/index.js +++ b/packages/strapi-email-amazon-ses/lib/index.js @@ -59,7 +59,7 @@ module.exports = { message: options.html }; - nodeSES.sendEmail(msg, function (err) { + client.sendEmail(msg, function (err) { if (err) { reject([{ messages: [{ id: 'Auth.form.error.email.invalid' }] }]); } else { From 927a900f5be75c332189eb96089dcbce7a1b3d3b Mon Sep 17 00:00:00 2001 From: Jim LAURIE Date: Wed, 25 Jul 2018 17:31:16 +0200 Subject: [PATCH 4/7] 3.0.0-alpha.13 --- package.json | 2 +- packages/strapi-admin/package.json | 8 +++---- packages/strapi-email-mailgun/package.json | 2 +- packages/strapi-email-sendgrid/package.json | 2 +- packages/strapi-email-sendmail/package.json | 2 +- packages/strapi-generate-admin/package.json | 6 ++--- packages/strapi-generate-api/package.json | 4 ++-- .../strapi-generate-controller/package.json | 4 ++-- packages/strapi-generate-model/package.json | 4 ++-- packages/strapi-generate-new/package.json | 6 ++--- packages/strapi-generate-plugin/package.json | 4 ++-- packages/strapi-generate-policy/package.json | 4 ++-- packages/strapi-generate-service/package.json | 4 ++-- packages/strapi-generate/package.json | 4 ++-- packages/strapi-helper-plugin/package.json | 2 +- packages/strapi-hook-bookshelf/package.json | 8 +++---- packages/strapi-hook-ejs/package.json | 4 ++-- packages/strapi-hook-knex/package.json | 2 +- packages/strapi-hook-mongoose/package.json | 4 ++-- packages/strapi-hook-redis/package.json | 4 ++-- packages/strapi-lint/package.json | 2 +- packages/strapi-middleware-views/package.json | 2 +- .../package.json | 6 ++--- .../package.json | 10 ++++----- packages/strapi-plugin-email/package.json | 8 +++---- packages/strapi-plugin-graphql/package.json | 4 ++-- .../package.json | 6 ++--- packages/strapi-plugin-upload/package.json | 8 +++---- .../package.json | 6 ++--- packages/strapi-upload-aws-s3/package.json | 2 +- .../strapi-upload-cloudinary/package.json | 2 +- packages/strapi-upload-local/package.json | 2 +- packages/strapi-upload-rackspace/package.json | 2 +- packages/strapi-utils/package.json | 2 +- packages/strapi/package.json | 22 +++++++++---------- 35 files changed, 82 insertions(+), 82 deletions(-) diff --git a/package.json b/package.json index dc4f8cb9d2..d155c12821 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "version": "3.0.0-alpha.12.7.1", + "version": "3.0.0-alpha.13", "dependencies": {}, "devDependencies": { "assert": "~1.3.0", diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json index a5c6276164..4c90d5d1ef 100755 --- a/packages/strapi-admin/package.json +++ b/packages/strapi-admin/package.json @@ -1,6 +1,6 @@ { "name": "strapi-admin", - "version": "3.0.0-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Strapi Admin", "repository": { "type": "git", @@ -31,8 +31,8 @@ }, "devDependencies": { "sanitize.css": "^4.1.0", - "strapi-helper-plugin": "3.0.0-alpha.12.7.1", - "strapi-utils": "3.0.0-alpha.12.7.1" + "strapi-helper-plugin": "3.0.0-alpha.13", + "strapi-utils": "3.0.0-alpha.13" }, "author": { "name": "Strapi", @@ -51,4 +51,4 @@ "npm": ">= 5.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-email-mailgun/package.json b/packages/strapi-email-mailgun/package.json index 6ba14565a8..f2a359c0fd 100644 --- a/packages/strapi-email-mailgun/package.json +++ b/packages/strapi-email-mailgun/package.json @@ -1,6 +1,6 @@ { "name": "strapi-email-mailgun", - "version": "3.0.0-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Mailgun provider for strapi email plugin", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-email-sendgrid/package.json b/packages/strapi-email-sendgrid/package.json index 70881c48f9..6ba279c9fc 100644 --- a/packages/strapi-email-sendgrid/package.json +++ b/packages/strapi-email-sendgrid/package.json @@ -1,6 +1,6 @@ { "name": "strapi-email-sendgrid", - "version": "3.0.0-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Sendgrid provider for strapi email", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-email-sendmail/package.json b/packages/strapi-email-sendmail/package.json index 9a5fffc717..387be2e3f8 100644 --- a/packages/strapi-email-sendmail/package.json +++ b/packages/strapi-email-sendmail/package.json @@ -1,6 +1,6 @@ { "name": "strapi-email-sendmail", - "version": "3.0.0-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Sendmail provider for strapi email", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-generate-admin/package.json b/packages/strapi-generate-admin/package.json index 1b32ebedc8..63354c05de 100755 --- a/packages/strapi-generate-admin/package.json +++ b/packages/strapi-generate-admin/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate-admin", - "version": "3.0.0-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Generate the default admin panel for a Strapi application.", "homepage": "http://strapi.io", "keywords": [ @@ -15,8 +15,8 @@ "dependencies": { "fs-extra": "^4.0.1", "lodash": "^4.17.4", - "strapi-admin": "3.0.0-alpha.12.7.1", - "strapi-utils": "3.0.0-alpha.12.7.1" + "strapi-admin": "3.0.0-alpha.13", + "strapi-utils": "3.0.0-alpha.13" }, "author": { "email": "hi@strapi.io", diff --git a/packages/strapi-generate-api/package.json b/packages/strapi-generate-api/package.json index 525227d876..554c31f102 100755 --- 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Generate an API for a Strapi application.", "homepage": "http://strapi.io", "keywords": [ @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-generate-controller/package.json b/packages/strapi-generate-controller/package.json index 3ccc09b29b..1d9f4854b7 100755 --- 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Generate a controller for a Strapi API.", "homepage": "http://strapi.io", "keywords": [ @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-generate-model/package.json b/packages/strapi-generate-model/package.json index e438755b1d..e6b4636ee1 100755 --- 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Generate a model for a Strapi API.", "homepage": "http://strapi.io", "keywords": [ @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-generate-new/package.json b/packages/strapi-generate-new/package.json index a57f5d9971..5fb0fb93fe 100755 --- 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Generate a new Strapi application.", "homepage": "http://strapi.io", "keywords": [ @@ -19,7 +19,7 @@ "listr": "^0.14.1", "lodash": "^4.17.4", "ora": "^2.1.0", - "strapi-utils": "3.0.0-alpha.12.7.1", + "strapi-utils": "3.0.0-alpha.13", "uuid": "^3.1.0" }, "scripts": { @@ -49,4 +49,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-generate-plugin/package.json b/packages/strapi-generate-plugin/package.json index 9249e29b27..5d7d1673bc 100755 --- 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Generate an plugin for a Strapi application.", "homepage": "http://strapi.io", "keywords": [ @@ -44,4 +44,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-generate-policy/package.json b/packages/strapi-generate-policy/package.json index 34aa032a44..4063ad2c9a 100755 --- 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Generate a policy for a Strapi API.", "homepage": "http://strapi.io", "keywords": [ @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-generate-service/package.json b/packages/strapi-generate-service/package.json index 1c31534206..9a12c7c0ba 100755 --- 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Generate a service for a Strapi API.", "homepage": "http://strapi.io", "keywords": [ @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-generate/package.json b/packages/strapi-generate/package.json index 86b993c988..e98e3eeae6 100755 --- a/packages/strapi-generate/package.json +++ b/packages/strapi-generate/package.json @@ -1,6 +1,6 @@ { "name": "strapi-generate", - "version": "3.0.0-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Master of ceremonies for the Strapi generators.", "homepage": "http://strapi.io", "keywords": [ @@ -17,7 +17,7 @@ "fs-extra": "^4.0.0", "lodash": "^4.17.4", "reportback": "^2.0.1", - "strapi-utils": "3.0.0-alpha.12.7.1" + "strapi-utils": "3.0.0-alpha.13" }, "author": { "name": "Strapi team", diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json index 9b759b157d..7560dc3736 100755 --- 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Helper for Strapi plugins development", "engines": { "node": ">= 9.0.0", diff --git a/packages/strapi-hook-bookshelf/package.json b/packages/strapi-hook-bookshelf/package.json index 6db9ad31c2..620b3a9bd1 100755 --- 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Bookshelf hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ @@ -20,8 +20,8 @@ "inquirer": "^5.2.0", "lodash": "^4.17.4", "pluralize": "^6.0.0", - "strapi-hook-knex": "3.0.0-alpha.12.7.1", - "strapi-utils": "3.0.0-alpha.12.7.1" + "strapi-hook-knex": "3.0.0-alpha.13", + "strapi-utils": "3.0.0-alpha.13" }, "strapi": { "dependencies": [ @@ -55,4 +55,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-hook-ejs/package.json b/packages/strapi-hook-ejs/package.json index 8d2e9af34f..d0c3e04a5a 100755 --- 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "EJS hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ @@ -43,4 +43,4 @@ "npm": ">= 5.3.0" }, "license": "MIT" -} \ No newline at end of file +} diff --git a/packages/strapi-hook-knex/package.json b/packages/strapi-hook-knex/package.json index b6dc3c3df5..29f2fda139 100755 --- 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "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 9386fbfa8d..0dd6f2c8e0 100755 --- 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Mongoose hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ @@ -19,7 +19,7 @@ "mongoose": "^5.0.16", "mongoose-float": "^1.0.2", "pluralize": "^6.0.0", - "strapi-utils": "3.0.0-alpha.12.7.1" + "strapi-utils": "3.0.0-alpha.13" }, "author": { "email": "hi@strapi.io", diff --git a/packages/strapi-hook-redis/package.json b/packages/strapi-hook-redis/package.json index bd0487a8ff..0ad8ca9530 100755 --- 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Redis hook for the Strapi framework", "homepage": "http://strapi.io", "keywords": [ @@ -18,7 +18,7 @@ "ioredis": "^3.1.2", "lodash": "^4.17.4", "stack-trace": "0.0.10", - "strapi-utils": "3.0.0-alpha.12.7.1" + "strapi-utils": "3.0.0-alpha.13" }, "author": { "email": "hi@strapi.io", diff --git a/packages/strapi-lint/package.json b/packages/strapi-lint/package.json index 63cd9e66f6..963c82b6e0 100644 --- a/packages/strapi-lint/package.json +++ b/packages/strapi-lint/package.json @@ -1,6 +1,6 @@ { "name": "strapi-lint", - "version": "3.0.0-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Strapi eslint and prettier configurations", "directories": { "lib": "lib" diff --git a/packages/strapi-middleware-views/package.json b/packages/strapi-middleware-views/package.json index 77852a7944..763c3dd124 100755 --- 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "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 af4cfd290f..82381522f7 100755 --- 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "A powerful UI to easily manage your data.", "strapi": { "name": "Content Manager", @@ -28,7 +28,7 @@ "react-dnd-html5-backend": "^5.0.1", "react-select": "^1.2.1", "showdown": "^1.8.6", - "strapi-helper-plugin": "3.0.0-alpha.12.7.1" + "strapi-helper-plugin": "3.0.0-alpha.13" }, "author": { "name": "Strapi team", @@ -51,4 +51,4 @@ "npm": ">= 5.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-content-type-builder/package.json b/packages/strapi-plugin-content-type-builder/package.json index 7032e53d24..cba78254dd 100755 --- 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Strapi plugin to create content type (API).", "strapi": { "name": "Content Type Builder", @@ -23,11 +23,11 @@ }, "dependencies": { "pluralize": "^7.0.0", - "strapi-generate": "3.0.0-alpha.12.7.1", - "strapi-generate-api": "3.0.0-alpha.12.7.1" + "strapi-generate": "3.0.0-alpha.13", + "strapi-generate-api": "3.0.0-alpha.13" }, "devDependencies": { - "strapi-helper-plugin": "3.0.0-alpha.12.7.1" + "strapi-helper-plugin": "3.0.0-alpha.13" }, "author": { "name": "Strapi team", @@ -50,4 +50,4 @@ "npm": ">= 5.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-email/package.json b/packages/strapi-plugin-email/package.json index bb57c49c09..f52a5eb5f5 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "This is the description of the plugin.", "strapi": { "name": "Email", @@ -22,11 +22,11 @@ "prepublishOnly": "IS_MONOREPO=true npm run build" }, "dependencies": { - "strapi-email-sendmail": "3.0.0-alpha.12.7.1" + "strapi-email-sendmail": "3.0.0-alpha.13" }, "devDependencies": { "react-copy-to-clipboard": "5.0.1", - "strapi-helper-plugin": "3.0.0-alpha.12.7.1" + "strapi-helper-plugin": "3.0.0-alpha.13" }, "author": { "name": "Strapi team", @@ -49,4 +49,4 @@ "npm": ">= 5.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-graphql/package.json b/packages/strapi-plugin-graphql/package.json index bd3731a2a2..80b22052a3 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "This is the description of the plugin.", "strapi": { "name": "graphql", @@ -30,7 +30,7 @@ "graphql-type-json": "^0.2.1", "graphql-type-datetime": "^0.2.2", "pluralize": "^7.0.0", - "strapi-utils": "3.0.0-alpha.12.7.1" + "strapi-utils": "3.0.0-alpha.13" }, "author": { "name": "A Strapi developer", diff --git a/packages/strapi-plugin-settings-manager/package.json b/packages/strapi-plugin-settings-manager/package.json index b5454b6336..2a760e11a2 100755 --- a/packages/strapi-plugin-settings-manager/package.json +++ b/packages/strapi-plugin-settings-manager/package.json @@ -1,6 +1,6 @@ { "name": "strapi-plugin-settings-manager", - "version": "3.0.0-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Strapi plugin to manage settings.", "strapi": { "name": "Settings Manager", @@ -25,7 +25,7 @@ "devDependencies": { "flag-icon-css": "^2.8.0", "react-select": "^1.0.0-rc.5", - "strapi-helper-plugin": "3.0.0-alpha.12.7.1" + "strapi-helper-plugin": "3.0.0-alpha.13" }, "author": { "name": "Strapi team", @@ -48,4 +48,4 @@ "npm": ">= 5.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-upload/package.json b/packages/strapi-plugin-upload/package.json index a2fadbc155..de550356f9 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "This is the description of the plugin.", "strapi": { "name": "Files Upload", @@ -23,12 +23,12 @@ }, "dependencies": { "react-copy-to-clipboard": "^5.0.1", - "strapi-upload-local": "3.0.0-alpha.12.7.1", + "strapi-upload-local": "3.0.0-alpha.13", "stream-to-array": "^2.3.0", "uuid": "^3.2.1" }, "devDependencies": { - "strapi-helper-plugin": "3.0.0-alpha.12.7.1" + "strapi-helper-plugin": "3.0.0-alpha.13" }, "author": { "name": "A Strapi developer", @@ -47,4 +47,4 @@ "npm": ">= 3.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-users-permissions/package.json b/packages/strapi-plugin-users-permissions/package.json index e0181e37e2..c574975097 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-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Protect your API with a full-authentication process based on JWT", "strapi": { "name": "Roles & Permissions", @@ -31,7 +31,7 @@ "uuid": "^3.1.0" }, "devDependencies": { - "strapi-helper-plugin": "3.0.0-alpha.12.7.1" + "strapi-helper-plugin": "3.0.0-alpha.13" }, "author": { "name": "Strapi team", @@ -54,4 +54,4 @@ "npm": ">= 5.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-upload-aws-s3/package.json b/packages/strapi-upload-aws-s3/package.json index 0517d57175..d763296024 100644 --- a/packages/strapi-upload-aws-s3/package.json +++ b/packages/strapi-upload-aws-s3/package.json @@ -1,6 +1,6 @@ { "name": "strapi-upload-aws-s3", - "version": "3.0.0-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "AWS S3 provider for strapi upload", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-upload-cloudinary/package.json b/packages/strapi-upload-cloudinary/package.json index 46eb0a008e..7e967b7379 100644 --- a/packages/strapi-upload-cloudinary/package.json +++ b/packages/strapi-upload-cloudinary/package.json @@ -1,6 +1,6 @@ { "name": "strapi-upload-cloudinary", - "version": "3.0.0-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Cloudinary provider for strapi upload", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-upload-local/package.json b/packages/strapi-upload-local/package.json index a6fedda903..de84a8539b 100644 --- a/packages/strapi-upload-local/package.json +++ b/packages/strapi-upload-local/package.json @@ -1,6 +1,6 @@ { "name": "strapi-upload-local", - "version": "3.0.0-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Local provider for strapi upload", "homepage": "http://strapi.io", "keywords": [ diff --git a/packages/strapi-upload-rackspace/package.json b/packages/strapi-upload-rackspace/package.json index 37f37c3597..d517ef0ff1 100644 --- a/packages/strapi-upload-rackspace/package.json +++ b/packages/strapi-upload-rackspace/package.json @@ -1,6 +1,6 @@ { "name": "strapi-upload-rackspace", - "version": "3.0.0-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "Rackspace provider for strapi upload", "main": "./lib", "scripts": { diff --git a/packages/strapi-utils/package.json b/packages/strapi-utils/package.json index e40163b296..5d7fa3af9a 100755 --- a/packages/strapi-utils/package.json +++ b/packages/strapi-utils/package.json @@ -1,6 +1,6 @@ { "name": "strapi-utils", - "version": "3.0.0-alpha.12.7.1", + "version": "3.0.0-alpha.13", "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 c507406ca6..2b51644bc5 100755 --- a/packages/strapi/package.json +++ b/packages/strapi/package.json @@ -1,6 +1,6 @@ { "name": "strapi", - "version": "3.0.0-alpha.12.7.1", + "version": "3.0.0-alpha.13", "description": "An open source solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier.", "homepage": "http://strapi.io", "keywords": [ @@ -55,16 +55,16 @@ "rimraf": "^2.6.2", "semver": "^5.4.1", "stack-trace": "0.0.10", - "strapi-generate": "3.0.0-alpha.12.7.1", - "strapi-generate-admin": "3.0.0-alpha.12.7.1", - "strapi-generate-api": "3.0.0-alpha.12.7.1", - "strapi-generate-controller": "3.0.0-alpha.12.7.1", - "strapi-generate-model": "3.0.0-alpha.12.7.1", - "strapi-generate-new": "3.0.0-alpha.12.7.1", - "strapi-generate-plugin": "3.0.0-alpha.12.7.1", - "strapi-generate-policy": "3.0.0-alpha.12.7.1", - "strapi-generate-service": "3.0.0-alpha.12.7.1", - "strapi-utils": "3.0.0-alpha.12.7.1" + "strapi-generate": "3.0.0-alpha.13", + "strapi-generate-admin": "3.0.0-alpha.13", + "strapi-generate-api": "3.0.0-alpha.13", + "strapi-generate-controller": "3.0.0-alpha.13", + "strapi-generate-model": "3.0.0-alpha.13", + "strapi-generate-new": "3.0.0-alpha.13", + "strapi-generate-plugin": "3.0.0-alpha.13", + "strapi-generate-policy": "3.0.0-alpha.13", + "strapi-generate-service": "3.0.0-alpha.13", + "strapi-utils": "3.0.0-alpha.13" }, "author": { "email": "hi@strapi.io", From c38112ed56424446332a88189e7050bbe316fac6 Mon Sep 17 00:00:00 2001 From: DMehaffy Date: Wed, 25 Jul 2018 11:04:22 -0700 Subject: [PATCH 5/7] change mysql from text to longtext --- packages/strapi-hook-bookshelf/lib/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-hook-bookshelf/lib/index.js b/packages/strapi-hook-bookshelf/lib/index.js index 39214f7cc8..f91837dcc3 100755 --- a/packages/strapi-hook-bookshelf/lib/index.js +++ b/packages/strapi-hook-bookshelf/lib/index.js @@ -402,7 +402,7 @@ module.exports = function(strapi) { } else { switch (attribute.type) { case 'text': - type = 'text'; + type = definition.client === 'pg' ? type = 'text' : 'longtext'; break; case 'json': type = definition.client === 'pg' ? 'jsonb' : 'longtext'; From 4d10278395667cfcd34b9499f1cbe605a73ac6fb Mon Sep 17 00:00:00 2001 From: Jim LAURIE Date: Thu, 26 Jul 2018 10:25:27 +0200 Subject: [PATCH 6/7] Update version --- packages/strapi-email-amazon-ses/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-email-amazon-ses/package.json b/packages/strapi-email-amazon-ses/package.json index 866f37d6ce..74c181aa1c 100644 --- a/packages/strapi-email-amazon-ses/package.json +++ b/packages/strapi-email-amazon-ses/package.json @@ -1,6 +1,6 @@ { "name": "strapi-email-amazon-ses", - "version": "3.0.0-alpha.12.6", + "version": "3.0.0-alpha.13", "description": "Amazon SES provider for strapi email", "homepage": "http://strapi.io", "keywords": [ From f6f65aa2706061bcf1d6f7330a8c90ca50e589f1 Mon Sep 17 00:00:00 2001 From: Jim LAURIE Date: Thu, 26 Jul 2018 14:19:47 +0200 Subject: [PATCH 7/7] Fix #1645 --- packages/strapi-hook-bookshelf/lib/relations.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/strapi-hook-bookshelf/lib/relations.js b/packages/strapi-hook-bookshelf/lib/relations.js index 4b3083bad9..09a6a26291 100644 --- a/packages/strapi-hook-bookshelf/lib/relations.js +++ b/packages/strapi-hook-bookshelf/lib/relations.js @@ -381,7 +381,7 @@ module.exports = { [`${params.alias}_id`]: params.refId, [`${params.alias}_type`]: params.ref, field: params.field - }, _.isEmpty)) + }, _.isUndefined)) .destroy(); } };