@webiny/api-headless-cms 5.20.0 → 5.22.0-beta.1

package/content/plugins/schema/createPreviewResolvers.js

@@ -19,9 +19,9 @@ var _createTypeName = require("../utils/createTypeName");
 
 var _pluralizedTypeName = require("../utils/pluralizedTypeName");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 const createPreviewResolvers = ({
   models,

package/content/plugins/schema/createReadResolvers.js

@@ -19,9 +19,9 @@ var _createTypeName = require("../utils/createTypeName");
 
 var _pluralizedTypeName = require("../utils/pluralizedTypeName");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 const createReadResolvers = ({
   models,

package/content/plugins/schema/resolvers/preview/resolveGet.js

@@ -13,9 +13,9 @@ var _responses = require("@webiny/handler-graphql/responses");
 
 var _handlerGraphql = require("@webiny/handler-graphql");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 const resolveGet = ({
   model

package/content/plugins/schema/resolvers/read/resolveGet.js

@@ -13,9 +13,9 @@ var _responses = require("@webiny/handler-graphql/responses");
 
 var _handlerGraphql = require("@webiny/handler-graphql");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 const resolveGet = ({
   model

package/content/plugins/storage/object.js

@@ -15,9 +15,9 @@ var _pMap = _interopRequireDefault(require("p-map"));
 
 var _StorageTransformPlugin = require("./StorageTransformPlugin");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 const processValue = async ({
   fields,
@@ -29,6 +29,11 @@ const processValue = async ({
 }) => {
   return await (0, _pReduce.default)(fields, async (values, field) => {
     const plugin = getStoragePlugin(field.type);
+
+    if (!plugin) {
+      throw new Error(`Missing storage plugin for field type "${field.type}".`);
+    }
+
     const value = await plugin[operation]({
       plugins,
       model,

package/content/plugins/utils/entryStorage.js

@@ -13,9 +13,9 @@ var _error = _interopRequireDefault(require("@webiny/error"));
 
 var _StorageTransformPlugin = require("../storage/StorageTransformPlugin");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 const getStoragePluginFactory = context => {
   let defaultStoragePlugin;

package/content/plugins/validators/index.js

@@ -31,6 +31,8 @@ var _timeLte = _interopRequireDefault(require("./timeLte"));
 
 var _timeGte = _interopRequireDefault(require("./timeGte"));
 
-var _default = () => [_gte.default, _in.default, _lte.default, _pattern.default, _required.default, _minLength.default, _maxLength.default, _patternPlugins.default, (0, _dateLte.default)(), (0, _dateGte.default)(), (0, _timeLte.default)(), (0, _timeGte.default)()];
+var _unique = _interopRequireDefault(require("./unique"));
+
+var _default = () => [_gte.default, _in.default, _lte.default, _pattern.default, _required.default, _minLength.default, _maxLength.default, _patternPlugins.default, (0, _dateLte.default)(), (0, _dateGte.default)(), (0, _timeLte.default)(), (0, _timeGte.default)(), (0, _unique.default)()];
 
 exports.default = _default;

package/content/plugins/validators/unique.d.ts

@@ -0,0 +1,7 @@
+import { CmsModelFieldValidatorPlugin } from "../../../types";
+declare const _default: () => CmsModelFieldValidatorPlugin;
+/**
+ * Validation if the field value is unique.
+ * Be aware of using this in DynamoDB only environment as all records will be loaded to check for the unique value.
+ */
+export default _default;

package/content/plugins/validators/unique.js

@@ -0,0 +1,62 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _error = _interopRequireDefault(require("@webiny/error"));
+
+/**
+ * Validation if the field value is unique.
+ * Be aware of using this in DynamoDB only environment as all records will be loaded to check for the unique value.
+ */
+var _default = () => {
+  return {
+    type: "cms-model-field-validator",
+    name: "cms-model-field-validator-unique",
+    validator: {
+      name: "unique",
+      validate: async ({
+        field,
+        value: initialValue,
+        context,
+        model,
+        entry
+      }) => {
+        const manager = await context.cms.getModelManager(model);
+        /**
+         * If there is no value passed, we are assuming that user does not want any value to be validated.
+         * If user needs something to passed into a unique field, they must add "required" validator.
+         */
+
+        const value = (initialValue || "").trim();
+
+        if (!value) {
+          return true;
+        }
+
+        try {
+          const [items] = await manager.listLatest({
+            where: {
+              entryId_not: entry ? entry.entryId : undefined,
+              [field.fieldId]: value
+            },
+            limit: 1
+          });
+          return items.length === 0;
+        } catch (ex) {
+          throw new _error.default("Error while checking if the field value is unique.", "UNIQUE_CHECK_ERROR", {
+            field,
+            value,
+            model
+          });
+        }
+      }
+    }
+  };
+};
+
+exports.default = _default;

package/index.d.ts

@@ -3,10 +3,10 @@ import { Params as CreateContentCrudsParams } from "./content/plugins/crud";
 import { CreateGraphQLHandlerOptions } from "./content/graphQLHandlerFactory";
 import { StorageTransformPlugin } from "./content/plugins/storage/StorageTransformPlugin";
 export declare type AdminContextParams = CreateAdminCrudsParams;
-export declare const createAdminHeadlessCmsContext: (params: AdminContextParams) => (import("@webiny/handler/plugins/ContextPlugin").ContextPlugin<import("./types").CmsContext> | import("@webiny/api-upgrade").UpgradePlugin<import("./types").CmsContext>[])[];
-export declare const createAdminHeadlessCmsGraphQL: () => import("@webiny/handler-graphql/types").GraphQLSchemaPlugin<import("@webiny/handler/types").ContextInterface>;
+export declare const createAdminHeadlessCmsContext: (params: AdminContextParams) => (import("@webiny/handler").ContextPlugin<import("./types").CmsContext> | import("@webiny/api-upgrade").UpgradePlugin<import("./types").CmsContext>[])[];
+export declare const createAdminHeadlessCmsGraphQL: () => import("@webiny/handler-graphql/types").GraphQLSchemaPlugin<import("@webiny/handler/types").Context>;
 export declare type ContentContextParams = CreateContentCrudsParams;
-export declare const createContentHeadlessCmsContext: (params: ContentContextParams) => (import("./types").ModelManagerPlugin | import("./types").CmsModelFieldToGraphQLPlugin[] | StorageTransformPlugin<any, any> | import("@webiny/handler/plugins/ContextPlugin").ContextPlugin<import("./types").CmsContext> | (import("./types").CmsModelFieldValidatorPlugin | import("./types").CmsModelFieldPatternValidatorPlugin[])[])[];
+export declare const createContentHeadlessCmsContext: (params: ContentContextParams) => (import("./types").ModelManagerPlugin | import("./types").CmsModelFieldToGraphQLPlugin[] | StorageTransformPlugin<any, any> | import("@webiny/handler").ContextPlugin<import("./types").CmsContext> | (import("./types").CmsModelFieldValidatorPlugin | import("./types").CmsModelFieldPatternValidatorPlugin[])[])[];
 export declare type ContentGraphQLParams = CreateGraphQLHandlerOptions;
 export declare const createContentHeadlessCmsGraphQL: (params?: ContentGraphQLParams) => import("@webiny/plugins/types").PluginCollection;
 export { StorageTransformPlugin };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms",
-	"version": "5.20.0",
+	"version": "5.22.0-beta.1",
 	"main": "index.js",
 	"keywords": [
 		"cms:base"
@@ -18,26 +18,26 @@
 	],
 	"license": "MIT",
 	"dependencies": {
-		"@babel/runtime": "7.16.3",
+		"@babel/runtime": "7.16.7",
 		"@commodo/fields": "1.1.2-beta.20",
 		"@graphql-tools/schema": "7.1.5",
-		"@webiny/api-file-manager": "5.20.0",
-		"@webiny/api-i18n": "5.20.0",
-		"@webiny/api-i18n-content": "5.20.0",
-		"@webiny/api-i18n-ddb": "5.20.0",
-		"@webiny/api-security": "5.20.0",
-		"@webiny/api-tenancy": "5.20.0",
-		"@webiny/api-upgrade": "5.20.0",
-		"@webiny/error": "5.20.0",
-		"@webiny/handler": "5.20.0",
-		"@webiny/handler-aws": "5.20.0",
-		"@webiny/handler-db": "5.20.0",
-		"@webiny/handler-graphql": "5.20.0",
-		"@webiny/handler-http": "5.20.0",
-		"@webiny/plugins": "5.20.0",
-		"@webiny/pubsub": "5.20.0",
-		"@webiny/utils": "5.20.0",
-		"@webiny/validation": "5.20.0",
+		"@webiny/api-file-manager": "5.22.0-beta.1",
+		"@webiny/api-i18n": "5.22.0-beta.1",
+		"@webiny/api-i18n-content": "5.22.0-beta.1",
+		"@webiny/api-i18n-ddb": "5.22.0-beta.1",
+		"@webiny/api-security": "5.22.0-beta.1",
+		"@webiny/api-tenancy": "5.22.0-beta.1",
+		"@webiny/api-upgrade": "5.22.0-beta.1",
+		"@webiny/error": "5.22.0-beta.1",
+		"@webiny/handler": "5.22.0-beta.1",
+		"@webiny/handler-aws": "5.22.0-beta.1",
+		"@webiny/handler-db": "5.22.0-beta.1",
+		"@webiny/handler-graphql": "5.22.0-beta.1",
+		"@webiny/handler-http": "5.22.0-beta.1",
+		"@webiny/plugins": "5.22.0-beta.1",
+		"@webiny/pubsub": "5.22.0-beta.1",
+		"@webiny/utils": "5.22.0-beta.1",
+		"@webiny/validation": "5.22.0-beta.1",
 		"boolean": "3.1.4",
 		"commodo-fields-object": "1.0.6",
 		"dataloader": "2.0.0",
@@ -47,20 +47,20 @@
 		"p-reduce": "2.1.0",
 		"pluralize": "8.0.0",
 		"shortid": "2.2.16",
-		"slugify": "1.6.2"
+		"slugify": "1.6.5"
 	},
 	"devDependencies": {
-		"@babel/cli": "^7.5.5",
-		"@babel/core": "^7.5.5",
-		"@babel/preset-env": "^7.5.5",
-		"@babel/preset-flow": "^7.0.0",
-		"@webiny/api-security-so-ddb": "^5.20.0",
-		"@webiny/api-tenancy-so-ddb": "^5.20.0",
-		"@webiny/cli": "^5.20.0",
-		"@webiny/project-utils": "^5.20.0",
-		"apollo-graphql": "^0.4.1",
+		"@babel/cli": "^7.16.0",
+		"@babel/core": "^7.16.0",
+		"@babel/preset-env": "^7.16.4",
+		"@babel/preset-flow": "^7.16.0",
+		"@webiny/api-security-so-ddb": "^5.22.0-beta.1",
+		"@webiny/api-tenancy-so-ddb": "^5.22.0-beta.1",
+		"@webiny/cli": "^5.22.0-beta.1",
+		"@webiny/project-utils": "^5.22.0-beta.1",
+		"apollo-graphql": "^0.9.5",
 		"get-yarn-workspaces": "^1.0.2",
-		"graphql": "^14.6.0",
+		"graphql": "^15.7.2",
 		"jest": "^26.6.3",
 		"mdbid": "^1.0.0",
 		"prettier": "^2.3.2",
@@ -77,5 +77,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "816632961750d4ae7f3af0d32d4e8a46c3f287a6"
+	"gitHead": "b651010b23f28b3ce1c27130713322ce65b32dcd"
 }

package/plugins/context.d.ts

@@ -1,4 +1,4 @@
-import { ContextPlugin } from "@webiny/handler/plugins/ContextPlugin";
+import { ContextPlugin } from "@webiny/handler";
 import { CmsContext } from "../types";
 declare const _default: () => ContextPlugin<CmsContext>;
 export default _default;

package/plugins/context.js

@@ -9,14 +9,14 @@ exports.default = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _ContextPlugin = require("@webiny/handler/plugins/ContextPlugin");
+var _handler = require("@webiny/handler");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 var _default = () => {
-  return new _ContextPlugin.ContextPlugin(context => {
+  return new _handler.ContextPlugin(context => {
     const locale = context.i18nContent.getCurrentLocale();
     context.cms = _objectSpread(_objectSpread({}, context.cms || {}), {}, {
       locale: locale ? locale.code : "en-US",

package/plugins/crud/index.d.ts

@@ -1,5 +1,5 @@
 import { CmsContext, HeadlessCmsStorageOperations } from "../../types";
-import { ContextPlugin } from "@webiny/handler/plugins/ContextPlugin";
+import { ContextPlugin } from "@webiny/handler";
 export interface Params {
     storageOperations: HeadlessCmsStorageOperations;
 }

package/plugins/crud/index.js

@@ -13,7 +13,7 @@ var _settings = require("./settings.crud");
 
 var _system = require("./system.crud");
 
-var _ContextPlugin = require("@webiny/handler/plugins/ContextPlugin");
+var _handler = require("@webiny/handler");
 
 var _contentModelGroup = require("../../content/plugins/crud/contentModelGroup.crud");
 
@@ -21,9 +21,9 @@ var _contentModel = require("../../content/plugins/crud/contentModel.crud");
 
 var _contentEntry = require("../../content/plugins/crud/contentEntry.crud");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 const debug = process.env.DEBUG === "true";
 
@@ -31,7 +31,7 @@ const createAdminCruds = params => {
   const {
     storageOperations
   } = params;
-  return new _ContextPlugin.ContextPlugin(async context => {
+  return new _handler.ContextPlugin(async context => {
     /**
      * This should never happen in the actual project.
      * It is to make sure that we load setup context before the CRUD init in our internal code.

package/plugins/crud/settings.crud.js

@@ -15,9 +15,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 const createSettingsCrud = params => {
   const {

package/plugins/crud/system.crud.js

@@ -19,9 +19,9 @@ var _error = _interopRequireDefault(require("@webiny/error"));
 
 var _pubsub = require("@webiny/pubsub");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 const initialContentModelGroup = {
   name: "Ungrouped",
@@ -120,6 +120,10 @@ const createSystemCrud = params => {
       if (version) {
         return;
       }
+      /**
+       * First trigger before install event.
+       */
+
 
       await onBeforeInstall.publish({
         tenant: getTenant().id
@@ -136,9 +140,6 @@ const createSystemCrud = params => {
         });
       }
 
-      await onAfterInstall.publish({
-        tenant: getTenant().id
-      });
       const system = {
         version: context.WEBINY_VERSION,
         readAPIKey: createReadAPIKey(),
@@ -151,6 +152,13 @@ const createSystemCrud = params => {
       await storageOperations.system.create({
         system
       });
+      /**
+       * And trigger after install event.
+       */
+
+      await onAfterInstall.publish({
+        tenant: getTenant().id
+      });
     },
 
     async upgradeSystem(version) {