ssr

Author: MacKentoch

package.json

@@ -116,12 +116,12 @@
  "json-loader": "^0.5.7",
  "node-sass": "^4.7.2",
  "nodemon": "^1.11.0",
- "postcss": "^6.0.17",
+ "postcss": "^6.0.21",
  "postcss-cssnext": "^3.1.0",
  "postcss-focus": "^3.0.0",
- "postcss-import": "^11.0.0",
+ "postcss-import": "^11.1.0",
  "postcss-load-config": "^1.2.0",
- "postcss-loader": "^2.1.0",
+ "postcss-loader": "^2.1.3",
  "postcss-reporter": "^5.0.0",
  "precss": "^3.1.0",
  "react-addons-test-utils": "^15.6.2",
@@ -191,7 +191,8 @@
  "redux": "^3.7.2",
  "redux-thunk": "^2.2.0",
  "serialize-javascript": "^1.4.0",
- "smoothscroll-polyfill": "^0.4.0"
+ "smoothscroll-polyfill": "^0.4.0",
+ "styled-components": "^3.2.5"
  },
  "jest": {
  "setupTestFrameworkScriptFile": "<rootDir>/__TESTS__/setupTests.js",

src/app/components/navigation/NavigationBar.js

@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import React, { type SyntheticEvent } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import Humburger from './humburger/Humburger';
 import LeftNav from './leftNav/LeftNav';

src/app/components/navigation/rightNav/RightNav.js

@@ -1,7 +1,7 @@
 // @flow
 
 // #region imports
-import React, { SyntheticEvent } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import RightNavButton from './rightNavButton/RightNavButton';
 // #endregion
@@ -12,10 +12,7 @@ export type Props = {
  link: string,
  label: string,
  viewName: string,
- btnLink: {
- showWhenUserAuth: boolean,
- alwaysShows: boolean,
- },
+ btnLink: { showWhenUserAuth: boolean, alwaysShows: boolean },
  }>,
  onRightNavButtonClick: (event: SyntheticEvent<>) => any,
  userIsAuthenticated: boolean,

src/app/hoc/withEnterAnimation/withEnterAnimation.js

@@ -13,7 +13,7 @@ import cx from 'classnames';
 // #endregion
 
 function withEnterAnimation() {
- return BaseComponent => {
+ return (BaseComponent: any) => {
  class WithEnterAnimation extends Component<any, any> {
  render() {
  const { ...passProps } = this.props;

src/server/SSR/src/lib/expressServer.js

@@ -3,7 +3,6 @@
 // #region imports
 const express = require('express');
 const path = require('path');
-// const { promisify } = require('util');
 const chalk = require('chalk');
 const ssr = require('../middleware/ssr');
 const { error404, error500 } = require('../middleware/errors');

yarn.lock

@@ -2034,6 +2034,13 @@ buffer@^4.3.0:
  ieee754 "^1.1.4"
  isarray "^1.0.0"
 
+buffer@^5.0.3:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.1.0.tgz#c913e43678c7cb7c8bd16afbcddb6c5505e8f9fe"
+ dependencies:
+ base64-js "^1.0.2"
+ ieee754 "^1.1.4"
+
 builtin-modules@^1.0.0:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -2680,6 +2687,10 @@ css-color-function@^1.3.0:
  debug "~0.7.4"
  rgb "~0.1.0"
 
+css-color-keywords@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05"
+
 css-color-names@0.0.4:
  version "0.0.4"
  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
@@ -2724,6 +2735,14 @@ css-selector-tokenizer@^0.7.0:
  fastparse "^1.1.1"
  regexpu-core "^1.0.0"
 
+css-to-react-native@^2.0.3:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-2.1.2.tgz#c06d628467ef961c85ec358a90f3c87469fb0095"
+ dependencies:
+ css-color-keywords "^1.0.0"
+ fbjs "^0.8.5"
+ postcss-value-parser "^3.3.0"
+
 css-unit-converter@^1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996"
@@ -3803,7 +3822,7 @@ fb-watchman@^2.0.0:
  dependencies:
  bser "^2.0.0"
 
-fbjs@^0.8.1, fbjs@^0.8.16:
+fbjs@^0.8.1, fbjs@^0.8.16, fbjs@^0.8.5:
  version "0.8.16"
  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
  dependencies:
@@ -4540,6 +4559,10 @@ hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.3.0, hoist-non-react-
  version "2.3.1"
  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0"
 
+hoist-non-react-statics@^2.5.0:
+ version "2.5.0"
+ resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40"
+
 home-or-tmp@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
@@ -7322,9 +7345,9 @@ postcss-image-set-polyfill@^0.4:
  postcss-media-query-parser "0.2.3"
  postcss-value-parser "3.3.0"
 
-postcss-import@^11.0.0:
- version "11.0.0"
- resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-11.0.0.tgz#a962e2df82d3bc5a6da6a386841747204f41ef5b"
+postcss-import@^11.1.0:
+ version "11.1.0"
+ resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-11.1.0.tgz#55c9362c9192994ec68865d224419df1db2981f0"
  dependencies:
  postcss "^6.0.1"
  postcss-value-parser "^3.2.3"
@@ -7361,9 +7384,9 @@ postcss-load-plugins@^2.3.0:
  cosmiconfig "^2.1.1"
  object-assign "^4.1.0"
 
-postcss-loader@^2.1.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.0.tgz#038c2d6d59753fef4667827fd3ae03f5dc5e6a7a"
+postcss-loader@^2.1.3:
+ version "2.1.3"
+ resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.3.tgz#eb210da734e475a244f76ccd61f9860f5bb3ee09"
  dependencies:
  loader-utils "^1.1.0"
  postcss "^6.0.0"
@@ -7691,7 +7714,7 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
  source-map "^0.5.6"
  supports-color "^3.1.2"
 
-postcss@^6.0, postcss@^6.0.11, postcss@^6.0.13, postcss@^6.0.14, postcss@^6.0.17, postcss@^6.0.9:
+postcss@^6.0, postcss@^6.0.11, postcss@^6.0.13, postcss@^6.0.14, postcss@^6.0.9:
  version "6.0.17"
  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.17.tgz#e259a051ca513f81e9afd0c21f7f82eda50c65c5"
  dependencies:
@@ -7707,6 +7730,14 @@ postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.3, postcss@^6.0.5, postcss@^6.0.6,
  source-map "^0.5.6"
  supports-color "^4.2.0"
 
+postcss@^6.0.21:
+ version "6.0.21"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.21.tgz#8265662694eddf9e9a5960db6da33c39e4cd069d"
+ dependencies:
+ chalk "^2.3.2"
+ source-map "^0.6.1"
+ supports-color "^5.3.0"
+
 precss@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/precss/-/precss-3.1.0.tgz#d9698550d2f763c52b800bfa1c6ba54fb023313c"
@@ -9376,6 +9407,28 @@ style-loader@^0.20.1:
  loader-utils "^1.1.0"
  schema-utils "^0.4.3"
 
+styled-components@^3.2.5:
+ version "3.2.5"
+ resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-3.2.5.tgz#b5d5d7d618ab240ff10602b5ca5886b8db3d0a0d"
+ dependencies:
+ buffer "^5.0.3"
+ css-to-react-native "^2.0.3"
+ fbjs "^0.8.16"
+ hoist-non-react-statics "^2.5.0"
+ is-plain-object "^2.0.1"
+ prop-types "^15.5.4"
+ stylis "^3.5.0"
+ stylis-rule-sheet "^0.0.10"
+ supports-color "^3.2.3"
+
+stylis-rule-sheet@^0.0.10:
+ version "0.0.10"
+ resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430"
+
+stylis@^3.5.0:
+ version "3.5.0"
+ resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.0.tgz#016fa239663d77f868fef5b67cf201c4b7c701e1"
+
 supports-color@^0.2.0:
  version "0.2.0"
  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"