From 3c1b4132484cc84ba6efe9f5fe3f75a194d6b3b3 Mon Sep 17 00:00:00 2001 From: Pavel Denisjuk Date: Sun, 17 Mar 2019 13:45:03 +0100 Subject: [PATCH] fix: cleanup dependencies. (#480) --- .../init/template/packages/admin/package.json | 1 + packages/webiny-admin/package.json | 10 ++++++---- packages/webiny-app-cms/package.json | 14 +++++++------- .../plugins/elements/pagesList/PagesList.js | 1 + packages/webiny-app-security/package.json | 16 ++++++++-------- packages/webiny-app/package.json | 4 ++-- packages/webiny-ui/package.json | 6 +++--- 7 files changed, 28 insertions(+), 24 deletions(-) diff --git a/independent/webiny-cli/src/init/template/packages/admin/package.json b/independent/webiny-cli/src/init/template/packages/admin/package.json index b6a1b40a6ac..0b2002e1f09 100644 --- a/independent/webiny-cli/src/init/template/packages/admin/package.json +++ b/independent/webiny-cli/src/init/template/packages/admin/package.json @@ -9,6 +9,7 @@ "webiny-app": "^1", "webiny-app-cms": "^1", "webiny-app-security": "^1", + "webiny-form": "^1", "webiny-integration-cookie-policy": "^1", "webiny-integration-google-tag-manager": "^1", "webiny-integration-mailchimp": "^1", diff --git a/packages/webiny-admin/package.json b/packages/webiny-admin/package.json index a1ad696a939..6282c25bfb1 100644 --- a/packages/webiny-admin/package.json +++ b/packages/webiny-admin/package.json @@ -14,8 +14,6 @@ "emotion": "^9.2.5", "invariant": "^2.2.4", "is-hotkey": "^0.1.3", - "react": "^16.4.0", - "react-dom": "^16.4.0", "react-emotion": "^9.2.5", "react-transition-group": "^2.5.1", "recompose": "^0.27.1", @@ -23,8 +21,8 @@ "store": "^2.0.12", "@svgr/webpack": "^4.1.0", "webiny-app": "0.0.0", - "webiny-ui": "0.0.0", - "webiny-plugins": "0.0.0" + "webiny-plugins": "0.0.0", + "webiny-ui": "0.0.0" }, "devDependencies": { "@babel/cli": "^7.0.0", @@ -40,6 +38,10 @@ "babel-plugin-module-resolver": "^3.1.1", "babel-plugin-named-asset-import": "^1.0.0-next.3e165448" }, + "peerDependencies": { + "react": "^16.6.0", + "react-dom": "^16.6.0" + }, "scripts": { "build": "babel src -d ${DEST:-build} --source-maps --copy-files", "flow-copy-source": "flow-copy-source src ${DEST:-build}", diff --git a/packages/webiny-app-cms/package.json b/packages/webiny-app-cms/package.json index ed799e6a288..8e403519761 100644 --- a/packages/webiny-app-cms/package.json +++ b/packages/webiny-app-cms/package.json @@ -48,7 +48,12 @@ "slugify": "^1.2.9", "timeago-react": "^2.0.0", "uniqid": "^5.0.3", - "webfontloader": "^1.6.28" + "webfontloader": "^1.6.28", + "webiny-app": "0.0.0", + "webiny-app-security": "0.0.0", + "webiny-form": "0.0.0", + "webiny-plugins": "0.0.0", + "webiny-ui": "0.0.0" }, "devDependencies": { "@babel/cli": "^7.0.0", @@ -66,12 +71,7 @@ }, "peerDependencies": { "react": "^16.6.0", - "react-dom": "^16.6.0", - "react-helmet": "^5.2.0", - "webiny-app": "0.0.0", - "webiny-app-security": "0.0.0", - "webiny-plugins": "0.0.0", - "webiny-ui": "0.0.0" + "react-dom": "^16.6.0" }, "scripts": { "build": "babel src -d ${DEST:-build} --source-maps --copy-files", diff --git a/packages/webiny-app-cms/src/render/plugins/elements/pagesList/PagesList.js b/packages/webiny-app-cms/src/render/plugins/elements/pagesList/PagesList.js index 976f378aa09..6a289f89960 100644 --- a/packages/webiny-app-cms/src/render/plugins/elements/pagesList/PagesList.js +++ b/packages/webiny-app-cms/src/render/plugins/elements/pagesList/PagesList.js @@ -26,6 +26,7 @@ const PagesList = pure((props: Object = {}) => { let sort = null; if (vars.sortBy) { + // $FlowFixMe sort = { [vars.sortBy]: vars.sortDirection || -1 }; } diff --git a/packages/webiny-app-security/package.json b/packages/webiny-app-security/package.json index 1e8160853da..67149201954 100644 --- a/packages/webiny-app-security/package.json +++ b/packages/webiny-app-security/package.json @@ -15,9 +15,15 @@ "dependencies": { "@babel/runtime": "^7.0.0", "dot-prop-immutable": "^1.4.0", + "graphql-tag": "^2.8.0", "lodash": "^4.17.11", "react-apollo": "^2.2.4", - "recompose": "^0.27.1" + "react-helmet": "^5.2.0", + "recompose": "^0.27.1", + "webiny-app": "0.0.0", + "webiny-form": "0.0.0", + "webiny-plugins": "0.0.0", + "webiny-ui": "0.0.0" }, "devDependencies": { "@babel/cli": "^7.0.0", @@ -34,14 +40,8 @@ "babel-plugin-named-asset-import": "^1.0.0-next.3e165448" }, "peerDependencies": { - "graphql-tag": "^2.8.0", "react": "^16.6.0", - "react-dom": "^16.6.0", - "react-helmet": "^5.2.0", - "webiny-app": "0.0.0", - "webiny-form": "0.0.0", - "webiny-plugins": "0.0.0", - "webiny-ui": "0.0.0" + "react-dom": "^16.6.0" }, "scripts": { "build": "babel src -d ${DEST:-build} --source-maps --copy-files", diff --git a/packages/webiny-app/package.json b/packages/webiny-app/package.json index 7eb4bc5ccc3..e0049178957 100644 --- a/packages/webiny-app/package.json +++ b/packages/webiny-app/package.json @@ -31,8 +31,8 @@ "is-hotkey": "^0.1.4", "js-cookie": "^2.2.0", "lodash": "^4.17.4", - "react": "^16.4.0", - "react-dom": "^16.4.0", + "react": "^16.6.0", + "react-dom": "^16.6.0", "react-error-boundary": "^1.2.3", "react-apollo": "^2.3.2", "recompose": "^0.30.0", diff --git a/packages/webiny-ui/package.json b/packages/webiny-ui/package.json index 4a3f1ee0b9f..6d974230b1f 100644 --- a/packages/webiny-ui/package.json +++ b/packages/webiny-ui/package.json @@ -59,8 +59,6 @@ "react-spinner-material": "^1.0.19", "react-transition-group": "^2.5.1", "react-visibility-sensor": "^5.0.2", - "webiny-form": "0.0.0", - "webiny-storybook-utils": "0.0.0", "withinviewport": "^2.1.0" }, "devDependencies": { @@ -80,7 +78,9 @@ "babel-plugin-emotion": "^9.2.8", "node-sass": "^4.9.3", "raw-loader": "^0.5.1", - "sass-loader": "^7.1.0" + "sass-loader": "^7.1.0", + "webiny-form": "0.0.0", + "webiny-storybook-utils": "0.0.0" }, "peerDependencies": { "react": "^16.4.0",