Skip to content
This repository has been archived by the owner on May 17, 2019. It is now read-only.

Commit

Permalink
Upgrade eslint-config-fusion@0.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
KevinGrandon authored and fusion-bot[bot] committed Jan 12, 2018
1 parent 7d748e4 commit 2d62d5c
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 17 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@
"babel-eslint": "8.2.1",
"create-universal-package": "2.1.1",
"eslint": "4.15.0",
"eslint-config-fusion": "0.1.2",
"eslint-config-fusion": "^0.2.1",
"eslint-plugin-cup": "1.0.0",
"eslint-plugin-flowtype": "2.41.0",
"eslint-plugin-import": "^2.8.0",
"eslint-plugin-prettier": "2.4.0",
"eslint-plugin-react": "7.5.1",
"flow-bin": "0.63.1",
Expand Down
7 changes: 4 additions & 3 deletions src/__tests__/plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@
// SOFTWARE.

import React from 'react';
import test from 'tape-cup';
import {Route} from '../modules/Route';
import getRouter from '../plugin';
import {withRouter} from 'react-router-dom';
import ReactDOMServer from 'react-dom/server';
import ReactDOM from 'react-dom';
import test from 'tape-cup';
import {Route} from '../modules/Route';
import getRouter from '../plugin';

const {renderToString} = ReactDOMServer;
const {render} = ReactDOM;

Expand Down
6 changes: 3 additions & 3 deletions src/modules/BrowserRouter.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@

import React from 'react';
import PropTypes from 'prop-types';
export {Status, NotFound} from './Status';
export {Redirect} from './Redirect';

import {Router as BaseRouter} from 'react-router-dom';
import createHistory from 'history/createBrowserHistory';

export {Status, NotFound} from './Status';
export {Redirect} from './Redirect';

class BrowserRouter extends React.Component {
constructor(props = {}) {
super(props);
Expand Down
1 change: 1 addition & 0 deletions src/modules/Route.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import {Route as ReactRouterRoute} from 'react-router-dom';

function Route(props, context) {
const {trackingId, component, children, ...remainingProps} = props;
if (remainingProps.render) {
Expand Down
2 changes: 1 addition & 1 deletion src/plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
// SOFTWARE.

import React from 'react';
import {html, unescape} from 'fusion-core';
import {Router as ServerRouter} from './server';
import {Router as BrowserRouter} from './browser';
import {html, unescape} from 'fusion-core';

const Router = __NODE__ ? ServerRouter : BrowserRouter;
export default function getRouter({UniversalEvents} = {}) {
Expand Down
62 changes: 53 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1193,7 +1193,7 @@ buffer@^4.3.0:
ieee754 "^1.1.4"
isarray "^1.0.0"

builtin-modules@^1.0.0:
builtin-modules@^1.0.0, builtin-modules@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"

Expand Down Expand Up @@ -1423,6 +1423,10 @@ constants-browserify@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"

contains-path@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"

content-disposition@~0.5.0:
version "0.5.2"
resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
Expand Down Expand Up @@ -1572,7 +1576,7 @@ debug@*, debug@^3.0.1, debug@^3.1.0:
dependencies:
ms "2.0.0"

debug@^2.2.0, debug@^2.6.8:
debug@^2.2.0, debug@^2.6.8, debug@^2.6.9:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
dependencies:
Expand Down Expand Up @@ -1664,6 +1668,13 @@ diffie-hellman@^5.0.0:
miller-rabin "^4.0.0"
randombytes "^2.0.0"

doctrine@1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
dependencies:
esutils "^2.0.2"
isarray "^1.0.0"

doctrine@^2.0.0, doctrine@^2.0.2:
version "2.1.0"
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
Expand Down Expand Up @@ -1836,11 +1847,11 @@ eslint-config-cup@^1.0.0-rc.4:
version "1.0.0"
resolved "https://registry.yarnpkg.com/eslint-config-cup/-/eslint-config-cup-1.0.0.tgz#0fcdb787fe254fc9458ec5258143cb0d47052896"

eslint-config-fusion@0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/eslint-config-fusion/-/eslint-config-fusion-0.1.2.tgz#cf380a75090d3cee0c9c086165b86fd60619e0aa"
eslint-config-fusion@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/eslint-config-fusion/-/eslint-config-fusion-0.2.1.tgz#39db6979719dab00953e561b2ff0af66981397bb"
dependencies:
eslint-config-uber-universal-stage-3 "^1.0.0-rc.6"
eslint-config-uber-universal-stage-3 "^1.0.0-rc.7"

eslint-config-prettier@^2.0.0:
version "2.9.0"
Expand All @@ -1860,13 +1871,27 @@ eslint-config-uber-base@^1.0.0-rc.7:
dependencies:
eslint-config-prettier "^2.0.0"

eslint-config-uber-universal-stage-3@^1.0.0-rc.6:
eslint-config-uber-universal-stage-3@^1.0.0-rc.7:
version "1.0.0-rc.7"
resolved "https://registry.yarnpkg.com/eslint-config-uber-universal-stage-3/-/eslint-config-uber-universal-stage-3-1.0.0-rc.7.tgz#bd4de38543d3c27cf48d82925bfccb5efb5b541f"
dependencies:
eslint-config-cup "^1.0.0-rc.4"
eslint-config-uber-base-stage-3 "^1.0.0-rc.7"

eslint-import-resolver-node@^0.3.1:
version "0.3.2"
resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
dependencies:
debug "^2.6.9"
resolve "^1.5.0"

eslint-module-utils@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.1.1.tgz#abaec824177613b8a95b299639e1b6facf473449"
dependencies:
debug "^2.6.8"
pkg-dir "^1.0.0"

eslint-plugin-cup@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-cup/-/eslint-plugin-cup-1.0.0.tgz#6ceced9a06d29e6e7bdc76ca9e398c9bf53072be"
Expand All @@ -1879,6 +1904,21 @@ eslint-plugin-flowtype@2.41.0:
dependencies:
lodash "^4.15.0"

eslint-plugin-import@^2.8.0:
version "2.8.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.8.0.tgz#fa1b6ef31fcb3c501c09859c1b86f1fc5b986894"
dependencies:
builtin-modules "^1.1.1"
contains-path "^0.1.0"
debug "^2.6.8"
doctrine "1.5.0"
eslint-import-resolver-node "^0.3.1"
eslint-module-utils "^2.1.1"
has "^1.0.1"
lodash.cond "^4.3.0"
minimatch "^3.0.3"
read-pkg-up "^2.0.0"

eslint-plugin-prettier@2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-2.4.0.tgz#85cab0775c6d5e3344ef01e78d960f166fb93aae"
Expand Down Expand Up @@ -3066,6 +3106,10 @@ locate-path@^2.0.0:
p-locate "^2.0.0"
path-exists "^3.0.0"

lodash.cond@^4.3.0:
version "4.5.2"
resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"

lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
Expand Down Expand Up @@ -3210,7 +3254,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"

minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
version "3.0.4"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
dependencies:
Expand Down Expand Up @@ -4016,7 +4060,7 @@ resolve-pathname@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879"

resolve@^1.3.2:
resolve@^1.3.2, resolve@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
dependencies:
Expand Down

0 comments on commit 2d62d5c

Please sign in to comment.