commit 3c3e18ec571a88a2f8430b4a2bacecf720f14b03
parent 39dfad685c6e8cf221ece74ab7df71412efad291
Author: Konstantin Tarkus <hello@tarkus.me>
Date: Tue, 8 Nov 2016 17:36:04 +0300
Update npm modules
Diffstat:
8 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
},
"dependencies": {
"babel-polyfill": "6.16.0",
- "babel-runtime": "6.11.6",
+ "babel-runtime": "6.18.0",
"bluebird": "3.4.6",
"body-parser": "1.15.2",
"classnames": "2.2.5",
@@ -20,10 +20,10 @@
"front-matter": "2.1.0",
"graphiql": "0.7.8",
"graphql": "0.7.2",
- "history": "4.3.0",
- "isomorphic-style-loader": "1.0.0",
+ "history": "4.4.0",
+ "isomorphic-style-loader": "1.1.0",
"jsonwebtoken": "7.1.9",
- "markdown-it": "8.0.1",
+ "markdown-it": "8.1.0",
"node-fetch": "1.6.3",
"normalize.css": "5.0.0",
"passport": "0.3.2",
@@ -32,19 +32,19 @@
"query-string": "4.2.3",
"react": "15.3.2",
"react-dom": "15.3.2",
- "sequelize": "3.24.5",
- "source-map-support": "0.4.5",
- "sqlite3": "3.1.6",
+ "sequelize": "3.24.8",
+ "source-map-support": "0.4.6",
+ "sqlite3": "3.1.8",
"universal-router": "2.0.0",
"whatwg-fetch": "1.0.0"
},
"devDependencies": {
"assets-webpack-plugin": "^3.5.0",
- "autoprefixer": "^6.5.1",
- "babel-cli": "^6.16.0",
- "babel-core": "^6.17.0",
- "babel-eslint": "^7.0.0",
- "babel-loader": "^6.2.5",
+ "autoprefixer": "^6.5.2",
+ "babel-cli": "^6.18.0",
+ "babel-core": "^6.18.2",
+ "babel-eslint": "^7.1.0",
+ "babel-loader": "^6.2.7",
"babel-plugin-rewire": "^1.0.0",
"babel-plugin-transform-react-constant-elements": "^6.9.1",
"babel-plugin-transform-react-inline-elements": "^6.8.0",
@@ -53,19 +53,19 @@
"babel-preset-latest": "^6.16.0",
"babel-preset-react": "^6.16.0",
"babel-preset-stage-0": "^6.16.0",
- "babel-register": "^6.16.3",
+ "babel-register": "^6.18.0",
"babel-template": "^6.16.0",
- "babel-types": "^6.16.0",
+ "babel-types": "^6.18.0",
"browser-sync": "^2.17.5",
"chai": "^3.5.0",
"css-loader": "^0.25.0",
"enzyme": "^2.5.1",
- "eslint": "^3.8.1",
- "eslint-config-airbnb": "^12.0.0",
- "eslint-loader": "^1.6.0",
- "eslint-plugin-import": "^1.16.0",
+ "eslint": "^3.9.1",
+ "eslint-config-airbnb": "^13.0.0",
+ "eslint-loader": "^1.6.1",
+ "eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^2.2.3",
- "eslint-plugin-react": "^6.4.1",
+ "eslint-plugin-react": "^6.6.0",
"extend": "^3.0.0",
"file-loader": "^0.9.0",
"gaze": "^1.1.2",
@@ -83,7 +83,7 @@
"postcss-custom-properties": "^5.0.1",
"postcss-custom-selectors": "^3.0.0",
"postcss-flexbugs-fixes": "^2.0.0",
- "postcss-loader": "^1.0.0",
+ "postcss-loader": "^1.1.0",
"postcss-media-minmax": "^2.1.2",
"postcss-nested": "^1.0.0",
"postcss-nesting": "^2.3.1",
@@ -100,10 +100,10 @@
"rimraf": "^2.5.4",
"sinon": "^2.0.0-pre.3",
"stylelint": "^7.5.0",
- "stylelint-config-standard": "^13.0.2",
+ "stylelint-config-standard": "^14.0.0",
"url-loader": "^0.5.7",
- "webpack": "^1.13.2",
- "webpack-hot-middleware": "^2.13.0",
+ "webpack": "^1.13.3",
+ "webpack-hot-middleware": "^2.13.2",
"webpack-middleware": "^1.5.1"
},
"babel": {
diff --git a/src/client.js b/src/client.js
@@ -148,7 +148,7 @@ async function onLocationChange(location) {
appInstance = ReactDOM.render(
<App context={context}>{route.component}</App>,
container,
- () => onRenderComplete(route, location)
+ () => onRenderComplete(route, location),
);
} catch (error) {
console.error(error); // eslint-disable-line no-console
diff --git a/src/components/Layout/Layout.js b/src/components/Layout/Layout.js
@@ -18,7 +18,7 @@ function Layout({ children }) {
return (
<div>
<Header />
- {React.Children.only(children)}
+ {children}
<Feedback />
<Footer />
</div>
@@ -26,7 +26,7 @@ function Layout({ children }) {
}
Layout.propTypes = {
- children: PropTypes.element.isRequired,
+ children: PropTypes.node.isRequired,
};
export default withStyles(s)(Layout);
diff --git a/src/components/Layout/Layout.test.js b/src/components/Layout/Layout.test.js
@@ -24,7 +24,7 @@ describe('Layout', () => {
<Layout>
<div className="child" />
</Layout>
- </App>
+ </App>,
);
expect(wrapper.find('div.child').length).to.eq(1);
});
diff --git a/src/data/queries/content.js b/src/data/queries/content.js
@@ -71,7 +71,8 @@ async function resolveExtension(path, extension) {
async function resolveFileName(path) {
const extensions = ['.md', '.html'];
- for (const extension of extensions) {
+ for (let i = 0; i < extensions.length; i += 1) {
+ const extension = extensions[i];
const maybeFileName = await resolveExtension(path, extension);
if (maybeFileName.success) {
return { success: true, fileName: maybeFileName.fileName, extension };
diff --git a/src/server.js b/src/server.js
@@ -58,7 +58,7 @@ app.use(expressJwt({
app.use(passport.initialize());
app.get('/login/facebook',
- passport.authenticate('facebook', { scope: ['email', 'user_location'], session: false })
+ passport.authenticate('facebook', { scope: ['email', 'user_location'], session: false }),
);
app.get('/login/facebook/return',
passport.authenticate('facebook', { failureRedirect: '/login', session: false }),
@@ -67,7 +67,7 @@ app.get('/login/facebook/return',
const token = jwt.sign(req.user, auth.jwt.secret, { expiresIn });
res.cookie('id_token', token, { maxAge: 1000 * expiresIn, httpOnly: true });
res.redirect('/');
- }
+ },
);
//
@@ -138,7 +138,7 @@ app.use((err, req, res, next) => { // eslint-disable-line no-unused-vars
style={errorPageStyle._getCss()} // eslint-disable-line no-underscore-dangle
>
{ReactDOM.renderToString(<ErrorPageWithoutStyle error={err} />)}
- </Html>
+ </Html>,
);
res.status(err.status || 500);
res.send(`<!doctype html>${html}`);
diff --git a/tools/lib/fs.js b/tools/lib/fs.js
@@ -43,7 +43,7 @@ export const copyFile = (source, target) => new Promise((resolve, reject) => {
});
export const readDir = (pattern, options) => new Promise((resolve, reject) =>
- glob(pattern, options, (err, result) => (err ? reject(err) : resolve(result)))
+ glob(pattern, options, (err, result) => (err ? reject(err) : resolve(result))),
);
export const makeDir = (name) => new Promise((resolve, reject) => {
@@ -65,5 +65,5 @@ export const copyDir = async (source, target) => {
};
export const cleanDir = (pattern, options) => new Promise((resolve, reject) =>
- rimraf(pattern, { glob: options }, (err, result) => (err ? reject(err) : resolve(result)))
+ rimraf(pattern, { glob: options }, (err, result) => (err ? reject(err) : resolve(result))),
);
diff --git a/tools/run.js b/tools/run.js
@@ -15,13 +15,13 @@ function run(fn, options) {
const task = typeof fn.default === 'undefined' ? fn : fn.default;
const start = new Date();
console.log(
- `[${format(start)}] Starting '${task.name}${options ? ` (${options})` : ''}'...`
+ `[${format(start)}] Starting '${task.name}${options ? ` (${options})` : ''}'...`,
);
return task(options).then(resolution => {
const end = new Date();
const time = end.getTime() - start.getTime();
console.log(
- `[${format(end)}] Finished '${task.name}${options ? ` (${options})` : ''}' after ${time} ms`
+ `[${format(end)}] Finished '${task.name}${options ? ` (${options})` : ''}' after ${time} ms`,
);
return resolution;
});
