From e6adabb281807e9dab8bac8f3503609f5a15e3a1 Mon Sep 17 00:00:00 2001 From: Kevin Grandon Date: Mon, 6 Aug 2018 15:15:01 -0700 Subject: [PATCH] Move fusion-plugin-react-redux into peer deps The fusion-plugin-react-redux plugin should be a peer dependency since we import tokens which we do a dependency check on. --- .npmrc | 1 + package.json | 14 ++++--- yarn.lock | 108 +++++++++++++++++++++++++++------------------------ 3 files changed, 68 insertions(+), 55 deletions(-) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..9841c0b --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +registry=https://registry.yarnpkg.com diff --git a/package.json b/package.json index 978ae23..671604a 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,10 @@ "version": "1.0.0", "license": "MIT", "repository": "fusionjs/fusion-plugin-connected-react-router", - "files": ["dist", "src"], + "files": [ + "dist", + "src" + ], "main": "./dist/index.js", "module": "./dist/index.es.js", "browser": { @@ -19,23 +22,23 @@ "./dist/browser.es2015.es.js": "./dist/browser.es2017.es.js" }, "dependencies": { - "fusion-plugin-react-redux": "^1.0.8", "react-redux": "^5.0.7" }, "peerDependencies": { "connected-react-router": "^4.3.0", "fusion-core": "^1.3.1", + "fusion-plugin-react-redux": "^1.0.8", "fusion-plugin-react-router": "^1.2.0-0", "react": "14.x - 16.x", "react-dom": "14.x - 16.x", "redux": "^4.0.0" }, "devDependencies": { - "@babel/preset-react": "^7.0.0-beta.51", + "@babel/preset-react": "^7.0.0-beta.56", "babel-eslint": "8.2.6", "connected-react-router": "^4.3.0", "create-universal-package": "3.4.6", - "eslint": "5.2.0", + "eslint": "5.3.0", "eslint-config-fusion": "^4.0.0", "eslint-plugin-cup": "2.0.0", "eslint-plugin-flowtype": "2.50.0", @@ -43,8 +46,9 @@ "eslint-plugin-jest": "^21.18.0", "eslint-plugin-prettier": "2.6.2", "eslint-plugin-react": "7.10.0", - "flow-bin": "0.77.0", + "flow-bin": "0.78.0", "fusion-core": "^1.4.1", + "fusion-plugin-react-redux": "^1.0.8", "fusion-plugin-react-router": "1.2.0-0", "fusion-plugin-universal-events": "^1.0.5", "fusion-react": "^1.1.0", diff --git a/yarn.lock b/yarn.lock index 3c39f86..2da4c4d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -90,11 +90,11 @@ "@babel/helper-explode-assignable-expression" "7.0.0-beta.31" "@babel/types" "7.0.0-beta.31" -"@babel/helper-builder-react-jsx@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.0.0-beta.51.tgz#86c72d6683bd2597c938a12153a6e480bf140128" +"@babel/helper-builder-react-jsx@7.0.0-beta.56": + version "7.0.0-beta.56" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.0.0-beta.56.tgz#4e3e3be02f006a89452a2e4541e1db53468c763e" dependencies: - "@babel/types" "7.0.0-beta.51" + "@babel/types" "7.0.0-beta.56" esutils "^2.0.0" "@babel/helper-call-delegate@7.0.0-beta.31": @@ -218,14 +218,14 @@ dependencies: "@babel/types" "7.0.0-beta.55" -"@babel/helper-plugin-utils@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.51.tgz#0f6a5f2b6d1c6444413f8fab60940d79b63c2031" - "@babel/helper-plugin-utils@7.0.0-beta.55": version "7.0.0-beta.55" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.55.tgz#31f40777efd6b961da8496a923c22d2b062b3f73" +"@babel/helper-plugin-utils@7.0.0-beta.56": + version "7.0.0-beta.56" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0-beta.56.tgz#e5f63cae8b3b716825d64e69ad8b59d71cd2080c" + "@babel/helper-regex@7.0.0-beta.31": version "7.0.0-beta.31" resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.0.0-beta.31.tgz#dc56f1e5bc6dff5d496dc2ac6c4cd435ee704769" @@ -423,11 +423,11 @@ dependencies: "@babel/helper-plugin-utils" "7.0.0-beta.55" -"@babel/plugin-syntax-jsx@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.0.0-beta.51.tgz#f672a3371c6ba3fe53bffd2e8ab5dc40495382cf" +"@babel/plugin-syntax-jsx@7.0.0-beta.56": + version "7.0.0-beta.56" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.0.0-beta.56.tgz#d018279f6fc3cae489f72022fa449c568d913681" dependencies: - "@babel/helper-plugin-utils" "7.0.0-beta.51" + "@babel/helper-plugin-utils" "7.0.0-beta.56" "@babel/plugin-syntax-object-rest-spread@7.0.0-beta.31": version "7.0.0-beta.31" @@ -571,33 +571,33 @@ "@babel/traverse" "7.0.0-beta.31" "@babel/types" "7.0.0-beta.31" -"@babel/plugin-transform-react-display-name@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.0.0-beta.51.tgz#1b48bd34dfa9087252c8707d29bd1df2e8821cbe" +"@babel/plugin-transform-react-display-name@7.0.0-beta.56": + version "7.0.0-beta.56" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.0.0-beta.56.tgz#fc833da81d558d43fda061a1e3e833600555380c" dependencies: - "@babel/helper-plugin-utils" "7.0.0-beta.51" + "@babel/helper-plugin-utils" "7.0.0-beta.56" -"@babel/plugin-transform-react-jsx-self@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.0.0-beta.51.tgz#a4f098597fe70985544366f893ac47389864d894" +"@babel/plugin-transform-react-jsx-self@7.0.0-beta.56": + version "7.0.0-beta.56" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.0.0-beta.56.tgz#739a1eec00954e066e382b2a0670abc48957b8c9" dependencies: - "@babel/helper-plugin-utils" "7.0.0-beta.51" - "@babel/plugin-syntax-jsx" "7.0.0-beta.51" + "@babel/helper-plugin-utils" "7.0.0-beta.56" + "@babel/plugin-syntax-jsx" "7.0.0-beta.56" -"@babel/plugin-transform-react-jsx-source@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.0.0-beta.51.tgz#6999dc491c8b4602efb4d0bd1bafc936ad696ecf" +"@babel/plugin-transform-react-jsx-source@7.0.0-beta.56": + version "7.0.0-beta.56" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.0.0-beta.56.tgz#fca2cbf49dad9d44188d804905223ab3fddfa9d5" dependencies: - "@babel/helper-plugin-utils" "7.0.0-beta.51" - "@babel/plugin-syntax-jsx" "7.0.0-beta.51" + "@babel/helper-plugin-utils" "7.0.0-beta.56" + "@babel/plugin-syntax-jsx" "7.0.0-beta.56" -"@babel/plugin-transform-react-jsx@7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.0.0-beta.51.tgz#7af8498518b83906405438370198808ca6e63b10" +"@babel/plugin-transform-react-jsx@7.0.0-beta.56": + version "7.0.0-beta.56" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.0.0-beta.56.tgz#d1d92fa3ff51670f4174660fe7a649c7e4067338" dependencies: - "@babel/helper-builder-react-jsx" "7.0.0-beta.51" - "@babel/helper-plugin-utils" "7.0.0-beta.51" - "@babel/plugin-syntax-jsx" "7.0.0-beta.51" + "@babel/helper-builder-react-jsx" "7.0.0-beta.56" + "@babel/helper-plugin-utils" "7.0.0-beta.56" + "@babel/plugin-syntax-jsx" "7.0.0-beta.56" "@babel/plugin-transform-regenerator@7.0.0-beta.31": version "7.0.0-beta.31" @@ -639,15 +639,15 @@ "@babel/helper-regex" "7.0.0-beta.31" regexpu-core "^4.1.3" -"@babel/preset-react@^7.0.0-beta.51": - version "7.0.0-beta.51" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0-beta.51.tgz#957d812a86d96c89214928b79800748f51935e49" +"@babel/preset-react@^7.0.0-beta.56": + version "7.0.0-beta.56" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0-beta.56.tgz#1c0914d968f3ff4d11bf91fd86857b965c528bb3" dependencies: - "@babel/helper-plugin-utils" "7.0.0-beta.51" - "@babel/plugin-transform-react-display-name" "7.0.0-beta.51" - "@babel/plugin-transform-react-jsx" "7.0.0-beta.51" - "@babel/plugin-transform-react-jsx-self" "7.0.0-beta.51" - "@babel/plugin-transform-react-jsx-source" "7.0.0-beta.51" + "@babel/helper-plugin-utils" "7.0.0-beta.56" + "@babel/plugin-transform-react-display-name" "7.0.0-beta.56" + "@babel/plugin-transform-react-jsx" "7.0.0-beta.56" + "@babel/plugin-transform-react-jsx-self" "7.0.0-beta.56" + "@babel/plugin-transform-react-jsx-source" "7.0.0-beta.56" "@babel/template@7.0.0-beta.31": version "7.0.0-beta.31" @@ -774,6 +774,14 @@ lodash "^4.17.10" to-fast-properties "^2.0.0" +"@babel/types@7.0.0-beta.56": + version "7.0.0-beta.56" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.56.tgz#df456947a82510ec30361971e566110d89489056" + dependencies: + esutils "^2.0.2" + lodash "^4.17.10" + to-fast-properties "^2.0.0" + "@rtsao/babel-preset-env@^7.0.0-beta.31": version "7.0.0-beta.31" resolved "https://registry.yarnpkg.com/@rtsao/babel-preset-env/-/babel-preset-env-7.0.0-beta.31.tgz#ac7e56227a41af3aa3a06d352c9ea6b8fb2f620a" @@ -2160,9 +2168,9 @@ eslint-visitor-keys@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" -eslint@5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.2.0.tgz#3901ae249195d473e633c4acbc370068b1c964dc" +eslint@5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.3.0.tgz#53695aca5213968aacdf970ccb231e42a2b285f8" dependencies: ajv "^6.5.0" babel-code-frame "^6.26.0" @@ -2195,7 +2203,7 @@ eslint@5.2.0: path-is-inside "^1.0.2" pluralize "^7.0.0" progress "^2.0.0" - regexpp "^1.1.0" + regexpp "^2.0.0" require-uncached "^1.0.3" semver "^5.5.0" string.prototype.matchall "^2.0.0" @@ -2462,9 +2470,9 @@ flat-cache@^1.2.1: graceful-fs "^4.1.2" write "^0.2.1" -flow-bin@0.77.0: - version "0.77.0" - resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.77.0.tgz#4e5c93929f289a0c28e08fb361a9734944a11297" +flow-bin@0.78.0: + version "0.78.0" + resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.78.0.tgz#df9fe7f9c9a2dfaff39083949fe2d831b41627b7" for-each@~0.3.2: version "0.3.2" @@ -4629,9 +4637,9 @@ regexp.prototype.flags@^1.2.0: dependencies: define-properties "^1.1.2" -regexpp@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab" +regexpp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.0.tgz#b2a7534a85ca1b033bcf5ce9ff8e56d4e0755365" regexpu-core@^4.1.3: version "4.1.3"