fix: dependencies (#403)

* fix: update deps

* fix: packages

* fix: re-add react-typography

* fix: rollup external dependencies and add peer dependencies

* fix: add classnames package to crane

* fix: content circular dependency fix

* fix: pretty

* fix: content props; remove rollup-plugin-auto-external

* fix: remove proxy package

* fix: svg circular dependency

* fix: remove onLoad from MobiledocRenderer

packages/crane-jsonschema-form/rollup.config.js

@@ -2,6 +2,12 @@ import babel from 'rollup-plugin-babel';
 import commonjs from 'rollup-plugin-commonjs';
 import pkg from './package.json';
 
+const externals = [
+  ...Object.keys(pkg.dependencies),
+  ...Object.keys(pkg.devDependencies),
+  ...Object.keys(pkg.peerDependencies),
+];
+
 export default [
   {
     input: 'src/index.js',
@@ -10,7 +16,7 @@ export default [
       file: pkg.main,
       format: 'cjs',
     },
-    external: ['react', 'react-dom', 'styled-components'],
+    external: id => externals.some(dep => id.startsWith(dep)),
     plugins: [
       commonjs({
         include: '../../node_modules/**',

packages/crane/package.json

@@ -24,10 +24,12 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.7.7",
-    "color": "^3.1.2",
-    "recompose": "^0.30.0"
+    "classnames": "^2.2.6",
+    "color": "^3.1.2"
   },
   "peerDependencies": {
+    "prop-types": "^15",
+    "react": "^16",
     "styled-components": "^3 || ^4"
   },
   "gitHead": "43fafcf5fe488c6dd436110f388219024aebef20"

packages/crane/rollup.config.js

@@ -2,6 +2,12 @@ import babel from 'rollup-plugin-babel';
 import commonjs from 'rollup-plugin-commonjs';
 import pkg from './package.json';
 
+const externals = [
+  ...Object.keys(pkg.dependencies),
+  ...Object.keys(pkg.devDependencies),
+  ...Object.keys(pkg.peerDependencies),
+];
+
 export default [
   {
     input: 'src/index.js',
@@ -10,7 +16,7 @@ export default [
       file: pkg.main,
       format: 'cjs',
     },
-    external: ['react', 'react-dom', 'prop-types', 'styled-components'],
+    external: id => externals.some(dep => id.startsWith(dep)),
     plugins: [
       commonjs({
         include: '../../node_modules/**',

packages/crane/src/lib/utils/SvgIcon.js → packages/crane/src/components/SvgIcon.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { classNameFromString, randomString } from '../utils';
+import classNameFromString from '../lib/utils/classNameFromString';
+import randomString from '../lib/utils/randomString';
 
 function SvgIcon(props) {
   const { children, component: Component, title, viewBox, ...other } = props;

packages/crane/src/lib/utils/createSvgIcon.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import SvgIcon from './SvgIcon';
+import SvgIcon from '../../components/SvgIcon';
 
 export default (path, displayName, viewBox) => {
   const Icon = props => (

packages/crane/src/lib/utils/index.js

@@ -5,4 +5,4 @@ export { default as getIntentColor } from './getIntentColor';
 export { default as getContrastColor } from './getContrastColor';
 export { default as randomString } from './randomString';
 export { default as separateUnit } from './separateUnit';
-export { default as SvgIcon } from './SvgIcon';
+export { default as SvgIcon } from '../../components/SvgIcon';

packages/hummingbird/package.json

@@ -11,10 +11,7 @@
     "babel-preset-gatsby": "0.2.20",
     "browser-locale": "1.0.3",
     "classnames": "2.2.6",
-    "cloudinary-react": "1.2.1",
-    "deepmerge": "4.1.1",
     "filter-invalid-dom-props": "2.0.0",
-    "format-number": "3.0.0",
     "gatsby": "2.18.18",
     "gatsby-link": "2.2.22",
     "gatsby-paginate": "1.1.1",
@@ -30,22 +27,12 @@
     "gatsby-plugin-sitemap": "2.2.19",
     "gatsby-plugin-styled-components": "3.1.11",
     "gatsby-plugin-typography": "2.3.14",
-    "gatsby-source-filesystem": "2.1.33",
     "gatsby-source-graphql": "2.1.20",
-    "in-viewport": "3.6.0",
-    "node-fetch": "2.6.0",
     "qs": "6.9.0",
-    "react-countup": "4.2.2",
     "react-helmet": "5.2.1",
     "react-intl": "3.3.2",
-    "react-jsonschema-form": "1.8.0",
-    "react-reveal": "1.2.2",
     "react-scroll-to-element": "0.2.0",
-    "react-sticky": "6.0.3",
-    "react-twitter-embed": "2.0.8",
-    "react-typography": "0.16.19",
-    "recompose": "0.30.0",
-    "styled-components": "4.4.0",
+    "react-typography": "^0.16.19",
     "typography": "0.16.19",
     "widont": "0.3.3"
   },
@@ -54,5 +41,8 @@
     "babel-preset-gatsby": "0.1.11",
     "eslint-plugin-jsx-a11y": "6.2.3"
   },
+  "peerDependencies": {
+    "styled-components": "^4"
+  },
   "gitHead": "2051165cacab59ebf43dc82a64fa444ffa72a7b8"
 }

packages/react/package.json

@@ -27,11 +27,17 @@
     "@wingscms/crane": "^0.20.2",
     "@wingscms/crane-jsonschema-form": "^0.3.3",
     "classnames": "^2.2.6",
+    "deepmerge": "^4.2.2",
     "filter-invalid-dom-props": "^2.0.0",
     "lodash.includes": "^4.3.0",
     "mobiledoc-dom-renderer": "^0.7.0",
     "mobiledoc-kit": "^0.12.1",
+    "qs": "^6.9.1",
+    "react-countup": "^4.3.3",
     "react-mobiledoc-editor": "^0.8.0",
+    "react-reveal": "^1.2.2",
+    "react-sticky": "^6.0.3",
+    "recompose": "^0.30.0",
     "slugify": "^1.3.1"
   },
   "gitHead": "2051165cacab59ebf43dc82a64fa444ffa72a7b8"

packages/react/rollup.config.js

@@ -2,6 +2,12 @@ import babel from 'rollup-plugin-babel';
 import commonjs from 'rollup-plugin-commonjs';
 import pkg from './package.json';
 
+const externals = [
+  ...Object.keys(pkg.dependencies),
+  ...Object.keys(pkg.devDependencies),
+  ...Object.keys(pkg.peerDependencies),
+];
+
 export default [
   {
     input: 'src/index.js',
@@ -10,7 +16,7 @@ export default [
       file: pkg.main,
       format: 'cjs',
     },
-    external: ['react', 'react-dom', 'styled-components'],
+    external: id => externals.some(dep => id.startsWith(dep)),
     plugins: [
       commonjs({
         include: '../../node_modules/**',