Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
Pavel910 committed Jan 8, 2019
2 parents 10977c3 + 45061a7 commit b404004
Show file tree
Hide file tree
Showing 853 changed files with 31,774 additions and 5,105 deletions.
9 changes: 8 additions & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.name_mapper='^webiny-\(.*\)/types$' -> '<PROJECT_ROOT>/packages/webiny-\1
module.name_mapper='^webiny-api/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-api/src/\1'
module.name_mapper='^webiny-api-cms/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-api-cms/src/\1'
module.name_mapper='^webiny-app/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-app/src/\1'
module.name_mapper='^webiny-app-admin/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-app-admin/src/\1'
module.name_mapper='^webiny-admin/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-admin/src/\1'
module.name_mapper='^webiny-app-cms/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-app-cms/src/\1'
module.name_mapper='^webiny-cms-editor/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-cms-editor/src/\1'
module.name_mapper='^webiny-ui/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-ui/src/\1'
Expand All @@ -39,18 +39,25 @@ module.name_mapper='^webiny-file-storage/?\(.*\)$' -> '<PROJECT_ROOT>/packages/w
module.name_mapper='^webiny-form/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-form/src/\1'
module.name_mapper='^webiny-i18n-react/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-i18n-react/src/\1'
module.name_mapper='^webiny-i18n/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-i18n/src/\1'
module.name_mapper='^webiny-install/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-install/src/\1'
module.name_mapper='^webiny-jimp/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-jimp/src/\1'
module.name_mapper='^webiny-load-assets/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-load-assets/src/\1'
module.name_mapper='^webiny-model/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-model/src/\1'
module.name_mapper='^webiny-mysql-connection/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-mysql-connection/src/\1'
module.name_mapper='^webiny-plugins/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-plugins/src/\1'
module.name_mapper='^webiny-react-router/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-react-router/src/\1'
module.name_mapper='^webiny-api-security/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-api-security/src/\1'
module.name_mapper='^webiny-app-security/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-app-security/src/\1'
module.name_mapper='^webiny-service-manager/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-service-manager/src/\1'
module.name_mapper='^webiny-sql-table-mysql/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-sql-table-mysql/src/\1'
module.name_mapper='^webiny-sql-table-sync/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-sql-table-sync/src/\1'
module.name_mapper='^webiny-sql-table/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-sql-table/src/\1'
module.name_mapper='^webiny-storybook-utils/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-storybook-utils/src/\1'
module.name_mapper='^webiny-validation/?\(.*\)$' -> '<PROJECT_ROOT>/packages/webiny-validation/src/\1'
module.name_mapper='^webiny-integration-cookie-policy/?\(.*\)$' -> '<PROJECT_ROOT>/addons/webiny-integration-cookie-policy/src/\1'
module.name_mapper='^webiny-integration-google-tag-manager/?\(.*\)$' -> '<PROJECT_ROOT>/addons/webiny-integration-google-tag-manager/src/\1'
module.name_mapper='^webiny-integration-mailchimp/?\(.*\)$' -> '<PROJECT_ROOT>/addons/webiny-integration-mailchimp/src/\1'
module.name_mapper='^webiny-integration-typeform/?\(.*\)$' -> '<PROJECT_ROOT>/addons/webiny-integration-typeform/src/\1'

[strict]

Expand Down
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@ jobs:
include:
- stage: test
script: yarn build && yarn test:build
- stage: release
- stage: release-core
if: branch = "master" AND type = "push"
script: yarn build && yarn release
- stage: release-addons
if: branch = "master" AND type = "push"
script: yarn build && yarn release-addons
notifications:
slack:
on_success: change
Expand Down
25 changes: 25 additions & 0 deletions addons/webiny-integration-cookie-policy/.babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"presets": [
["@babel/preset-env", {
"targets": {
"browsers": ["last 2 versions", "safari >= 7"]
}
}],
"@babel/preset-react",
"@babel/preset-flow"
],
"plugins": [
["babel-plugin-emotion", { "autoLabel": true }],
["@babel/plugin-proposal-object-rest-spread", {"useBuiltIns": true}],
["@babel/plugin-transform-runtime"],
["@babel/plugin-proposal-class-properties"],
["babel-plugin-named-asset-import", {
"loaderMap": {
"svg": {
"ReactComponent": "@svgr/webpack![path]"
}
}
}]
]
}

File renamed without changes.
42 changes: 42 additions & 0 deletions addons/webiny-integration-cookie-policy/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# webiny-integration-cookie-policy

Renders a simple cookie policy info banner. Powered by Cookie Consent (https://cookieconsent.insites.com/).

## Installation
`yarn add webiny-integration-cookie policy`

## Setup
To setup, you must register a set of plugins. For more information on plugins, please visit Webiny documentation.

#### API
```
import cookiePolicyPlugins from "webiny-integration-cookie-policy/plugins/api"
import { registerPlugins } from "webiny-plugins";
registerPlugins(cookiePolicyPlugins);
```

Exposes necessary GraphQL fields for updating integration settings.


#### Admin
```
import cookiePolicyPlugins from "webiny-integration-cookie-policy/plugins/admin"
import { registerPlugins } from "webiny-plugins";
registerPlugins(cookiePolicyPlugins);
```

Enables management of cookie policy settings, which can be accessed via Settings section in the main menu. Here you
can edit things like banner position, colors and labels.


#### Site
```
import cookiePolicyPlugins from "webiny-integration-cookie-policy/plugins/render"
import { registerPlugins } from "webiny-plugins";
registerPlugins(cookiePolicyPlugins);
```

Renders cookie policy banner. Use in your public website.
Empty file.
34 changes: 34 additions & 0 deletions addons/webiny-integration-cookie-policy/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"name": "webiny-integration-cookie-policy",
"version": "0.0.0",
"main": "index.js",
"repository": {
"type": "git",
"url": "https://github.com/webiny/webiny-js.git"
},
"author": "Adrian Smijulj",
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.0.0",
"react": "^16.4.0",
"react-dom": "^16.4.0"
},
"devDependencies": {
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@babel/plugin-proposal-class-properties": "^7.0.0",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"@babel/plugin-transform-runtime": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-flow": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@svgr/webpack": "^2.1.1",
"babel-plugin-module-resolver": "^3.1.1",
"babel-plugin-named-asset-import": "^1.0.0-next.3e165448"
},
"scripts": {
"build": "babel src -d ${DEST:-build} --source-maps --copy-files",
"flow-copy-source": "flow-copy-source src ${DEST:-build}",
"postbuild": "yarn flow-copy-source"
}
}
Loading

0 comments on commit b404004

Please sign in to comment.