Skip to content

Commit

Permalink
chore(devdeps): devdeps to latest (#209)
Browse files Browse the repository at this point in the history
  • Loading branch information
@STRML
STRML authored Dec 30, 2019
1 parent ba8e79b commit 308b40a
Show file tree
Hide file tree
Showing 9 changed files with 2,668 additions and 1,828 deletions.
11 changes: 9 additions & 2 deletions .babelrc
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
{
"presets": ["react", "es2015"],
"presets": [
"@babel/preset-react",
["@babel/preset-env", {
targets: {
node: true
}
}]
],
"env": {
"test": {
"plugins": [
// Makes power-assert work
"espower"
"babel-plugin-espower"
]
}
}
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ test: test-unit test-server
@echo "The browser test suite should be run before commit. Run 'make test-local' to run it."

test-unit:
@env NODE_ENV=test ./node_modules/.bin/mocha -R spec --compilers js:babel-register -b tests/unit/*.js
@env NODE_ENV=test ./node_modules/.bin/mocha -R spec --require @babel/register -b tests/unit/*.js

test-server:
@env NODE_ENV=test ./node_modules/.bin/mocha -R spec --compilers js:babel-register -b tests/server/*.js
@env NODE_ENV=test ./node_modules/.bin/mocha -R spec --require @babel/register -b tests/server/*.js

test-local:
@env NODE_ENV=test ./node_modules/.bin/babel -f tests/browser/browser-jsx.jsx tests/browser/browser-jsx.jsx -o tests/browser/browser-jsx.js
Expand Down
2 changes: 1 addition & 1 deletion lib/matchRoutes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ function Match(path, route, match, query, valueDecoders) {
match[key] = valueDecoders(key, match[key]);
return;
}
var fn = valueDecoders.hasOwnProperty(key) && valueDecoders[key];
var fn = Object.prototype.hasOwnProperty.call(valueDecoders, key) && valueDecoders[key];
if (typeof fn === 'function') {
match[key] = fn(match[key]);
}
Expand Down
32 changes: 17 additions & 15 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,24 @@
"urllite": "~0.5.0"
},
"devDependencies": {
"babel-cli": "^6.26.0",
"babel-eslint": "^8.0.1",
"babel-plugin-espower": "^2.2.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.7.4",
"@babel/register": "^7.7.7",
"babel-eslint": "^10.0.3",
"babel-plugin-espower": "^3.0.1",
"envify": "^4.1.0",
"eslint": "^4.7.2",
"eslint-plugin-react": "^7.4.0",
"mocha": "^3.5.3",
"power-assert": "^1.4.4",
"eslint": "^6.8.0",
"eslint-plugin-react": "^7.17.0",
"mocha": "^6.2.2",
"power-assert": "^1.6.1",
"pre-commit": "^1.2.2",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-test-renderer": "^16.2.0",
"semver": "^5.4.1",
"zuul": "^3.11.1"
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react-test-renderer": "^16.12.0",
"semver": "^7.1.1",
"zuul": "^3.12.0"
},
"browserify": {
"transform": [
Expand Down Expand Up @@ -71,4 +73,4 @@
"lint",
"test"
]
}
}
93 changes: 47 additions & 46 deletions tests/browser/browser-jsx.js
View file

Large diffs are not rendered by default.

54 changes: 27 additions & 27 deletions tests/server/server.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,31 +43,31 @@ describe('react-router-component (on server)', function() {
}

it('renders to /', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/" />);
assert(markup.match(/class="App"/));
assert(markup.match(/mainpage/));
});

it('renders to /:slug', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/x/hello" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/x/hello" />);
assert(markup.match(/class="App"/));
assert(markup.match(/hello/));
});

it('renders with regex', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/y/ohhai" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/y/ohhai" />);
assert(markup.match(/class="App"/));
assert(markup.match(/ohhai/));
});

it('renders with regex and urlPatternOptions(matchKeys)', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/z/one/two" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/z/one/two" />);
assert(markup.match(/class="App"/));
assert(markup.match(/onetwo/));
});

it('renders to empty on notfound', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/notfound" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/notfound" />);
assert(markup.match(/class="App"/));
assert(markup.match(/not_found/));
});
Expand All @@ -83,7 +83,7 @@ describe('react-router-component (on server)', function() {
}

it('renders to <body>', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/" />);
assert.equal(markup, '<body class="App"><div>mainpage</div></body>');
});
});
Expand All @@ -106,12 +106,12 @@ describe('react-router-component (on server)', function() {
}

it('renders to <section>', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<AppSection path="/" />);
const markup = ReactDOMServer.renderToStaticMarkup(<AppSection path="/" />);
assert.equal(markup, '<section class="App"><div>mainpage</div></section>');
});

it('removes wrapper with falsy value', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<AppNoWrapper path="/" />);
const markup = ReactDOMServer.renderToStaticMarkup(<AppNoWrapper path="/" />);
assert.equal(markup, '<div>mainpage</div>');
});
});
Expand Down Expand Up @@ -143,21 +143,21 @@ describe('react-router-component (on server)', function() {
}

it('renders Link component with href scoped to its prefix', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/x/nice/hello" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/x/nice/hello" />);
assert(markup.match(/class="App"/));
assert(markup.match(/class="X"/));
assert(markup.match(/href="\/x\/nice\/hi"/));
});

it('renders global Link component with correct href (not scoped to a router)', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/x/nice/hello2" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/x/nice/hello2" />);
assert(markup.match(/class="App"/));
assert(markup.match(/class="X"/));
assert(markup.match(/href="\/hi"/));
});

it('renders Link component with href scoped to its nested context prefix', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/x/nice/hello3/welcome" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/x/nice/hello3/welcome" />);
assert(markup.match(/class="App"/));
assert(markup.match(/class="X"/));
assert(markup.match(/class="Y"/));
Expand All @@ -173,7 +173,7 @@ describe('react-router-component (on server)', function() {
}
class Level2 extends React.Component {
render() {
var thisSlug = this.props.slug;
const thisSlug = this.props.slug;
return <Locations className="L2" contextual={true}>
<Location path="/" handler={<Link href="/hello" data-slug={thisSlug} />} />
<Location path="/:slug" handler={RendersLinkSlug} />
Expand All @@ -183,7 +183,7 @@ describe('react-router-component (on server)', function() {

class Level1 extends React.Component {
render() {
var thisSlug = this.props.slug;
const thisSlug = this.props.slug;
return <Locations className="L1" contextual={true}>
<Location path="/" handler={<Link href="/l2" data-slug={thisSlug} />} />
<Location path="/:slug(/*)" handler={Level2} />
Expand All @@ -200,23 +200,23 @@ describe('react-router-component (on server)', function() {
}

it('renders Link component with href scoped to its prefix', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/l1/nice" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/l1/nice" />);
assert(markup.match(/class="App"/));
assert(markup.match(/class="L1"/));
assert(markup.match(/href="\/l1\/nice\/l2"/));
assert(markup.match(/data-slug="nice"/));
});

it('renders Link component with href scoped to its prefix - trailing slash', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/l1/nice/" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/l1/nice/" />);
assert(markup.match(/class="App"/));
assert(markup.match(/class="L1"/));
assert(markup.match(/href="\/l1\/nice\/l2"/));
assert(markup.match(/data-slug="nice"/));
});

it('renders nested Link component with href scoped to its prefix', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/l1/nice/l2" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/l1/nice/l2" />);
assert(markup.match(/class="App"/));
assert(markup.match(/class="L1"/));
assert(markup.match(/class="L2"/));
Expand All @@ -225,7 +225,7 @@ describe('react-router-component (on server)', function() {
});

it('renders global Link component with correct href (not scoped to a router)', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/l1/nice/l2/foo" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/l1/nice/l2/foo" />);
assert(markup.match(/class="App"/));
assert(markup.match(/class="L2"/));
assert(markup.match(/href="\/hi"/));
Expand Down Expand Up @@ -267,7 +267,7 @@ describe('react-router-component (on server)', function() {
}

render() {
var routes = this.getRoutes();
const routes = this.getRoutes();

return <div className="App">
<div>
Expand All @@ -282,7 +282,7 @@ describe('react-router-component (on server)', function() {
};

it('renders to / with context intact', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/" />);
assert(markup.match(/class="App"/));
assert(markup.match(/flux_value/));
});
Expand Down Expand Up @@ -331,24 +331,24 @@ describe('react-router-component (on server)', function() {
}

it('passes urlPatternOptions from parent <Locations>', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/start/1/biff/baz" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/start/1/biff/baz" />);
assert(markup.match(/biff\|baz/));
});

it('merges urlPatternOptions from parent <Locations> and a <Location>', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/start/2/BIFF/BA" />);
let markup = ReactDOMServer.renderToStaticMarkup(<App path="/start/2/BIFF/BA" />);
assert(markup.match(/BIFF\|BA/));
markup = ReactDOMServer.renderToStaticMarkup(<App path="/start/2/biff/ba" />);
assert(markup.match(/not found/));
});

it('gives urlPatternOptions on route precedence over router', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/start/3/biff/boff" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/start/3/biff/boff" />);
assert(markup.match(/biff\|boff/));
});

it('inherits from parent contextual router', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/start/4/foobar" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/start/4/foobar" />);
assert(markup.match(/undefined\|undefinedbar/));
});
});
Expand Down Expand Up @@ -376,23 +376,23 @@ describe('react-router-component (on server)', function() {
}

it('passes className', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/" />);
assert(markup.match(/<div class="A" [^>]*>mainpage/));
});

it('does not override child classname', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/hasclassname" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/hasclassname" />);
assert(markup.match(/<div class="ownClassname"/));
});

it('passes childProps to contextual children, but inner childProps have priority', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/nested/foo" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/nested/foo" />);
assert.equal(markup, '<div class="X"><div class="Y" data-own-prop="true" data-from-first="A">' +
'<div class="B" data-from-first="A" data-from-second="B">foo</div></div></div>');
});

it('keeps going and going', function() {
var markup = ReactDOMServer.renderToStaticMarkup(<App path="/nested/nestedAgain/bar" />);
const markup = ReactDOMServer.renderToStaticMarkup(<App path="/nested/nestedAgain/bar" />);
assert.equal(markup, '<div class="X"><div class="Y" data-own-prop="true" data-from-first="A">' +
'<div class="Z" data-own-prop="true" data-from-first="A" data-from-second="B">' +
'<div class="C" data-from-first="A" data-from-second="B" data-from-third="C">bar' +
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/RouterMixin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {Location, Locations} from '../../';
describe('RouterMixin', function() {
it('RouterMixin join() ensures slash', function () {
return new Promise(function (done, fail) {
var component = renderer.create(
const component = renderer.create(
<Locations path="/foo/baz">
<Location path='/foo/:bar(/*)' handler={Sub}/>
</Locations>
Expand Down
Loading

0 comments on commit 308b40a

Please sign in to comment.