scalable-react#81 WIP. WelcomeModal disabled temporarily

vhmartinezm · Feb 27, 2017 · 27b30a7 · 27b30a7
1 parent a9750bb
commit 27b30a7
Show file tree

Hide file tree

Showing 8 changed files with 152 additions and 101 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,3 +46,4 @@ jspm_packages
 /server/public/**/*.css
 /server/public/**/*.map
 /server/public/**/*.json
+/server/public/__offline_serviceworker
diff --git a/app/src/containers/LandingContainer/index.js b/app/src/containers/LandingContainer/index.js
@@ -15,7 +15,7 @@ import { reduxForm } from 'redux-form';
 import {
   LoadingIndicator,
   Divider,
-  WelcomeModal,
+  // WelcomeModal,
   Contributor,
 } from 'components';
 import * as LandingActionCreators from './actions';
@@ -43,21 +43,21 @@ class LandingContainer extends Component {
     const {
       isLoading,
       actions,
-      isShowingModal,
+      // isShowingModal,
       contributors,
       name,
-      fields: {
-        nameInput,
-      },
+      // fields: {
+        // nameInput,
+      // },
     } = this.props;
     return (
       <Box className={styles.container} colorIndex="light-2">
-        <WelcomeModal
-          onSubmit={this.handleSubmit}
-          nameInput={nameInput}
-          onClose={actions.closeModal}
-          isVisible={isShowingModal}
-        />
+        {/* <WelcomeModal */}
+        {/* onSubmit={this.handleSubmit} */}
+        {/* nameInput={nameInput} */}
+        {/* onClose={actions.closeModal} */}
+        {/* isVisible={true} */}
+        {/* /> */}
         <Maybe predicate={isLoading}>
           <Section
             align="center"

diff --git a/app/styles/styles.scss b/app/styles/styles.scss
@@ -1,5 +1,5 @@
 // Included if you are using grommet.  Otherwise, just erase this next line.
-@import 'grommet/scss/grommet-core/index';
+@import 'grommet/scss/grommet-core/index.scss';
 
 // Add globally used utility styles here.
 // Or import scss libraries that are to be used without CSS modules.

diff --git a/devServer.js b/devServer.js
@@ -11,7 +11,10 @@ const serverUrl = process.env.BASE_URL || 'http://localhost:1337';
 const PORT = serverUrl.match(/\d+/g)[0];
 const IP = serverUrl.match(/\w+/g)[1];
 
-new WebpackDevServer(webpack(config), {
+new WebpackDevServer(
+  webpack(
+    config
+  ), {
   publicPath: config.output.publicPath,
   hot: true,
   historyApiFallback: true,

diff --git a/package.json b/package.json
@@ -106,49 +106,49 @@
   },
   "homepage": "https://github.com/RyanCCollins/scalable-react-boilerplate#readme",
   "dependencies": {
-    "apollo-client": "^0.5.20",
-    "babel-plugin-flow-react-proptypes": "^0.19.0",
+    "apollo-client": "0.5.26",
+    "babel-plugin-flow-react-proptypes": "^0.21.0",
     "babel-plugin-transform-flow-strip-types": "^6.21.0",
-    "cross-env": "^2.0.0",
+    "cross-env": "^3.1.4",
     "enzyme": "^2.4.1",
     "enzyme-to-json": "^1.0.3",
     "eslint-plugin-flowtype": "^2.30.0",
-    "eslint-plugin-flowtype-errors": "^2.0.3",
+    "eslint-plugin-flowtype-errors": "^3.0.0",
     "expect": "^1.20.2",
     "express": "^4.14.0",
-    "flow-bin": "^0.38.0",
+    "flow-bin": "^0.40.0",
     "functional-components": "0.0.5",
     "graphql-tag": "^1.1.2",
     "grommet": "v1.2.1",
-    "history": "^1.14.0",
+    "history": "^4.5.1",
     "immutable": "^3.7.5",
     "isomorphic-fetch": "^2.2.0",
     "jest": "18.1.0",
     "jest-cli": "18.1.0",
     "json-loader": "^0.5.4",
-    "markdown-loader": "^0.1.7",
+    "markdown-loader": "^2.0.0",
     "minimist": "^1.2.0",
     "morgan": "^1.7.0",
     "node-env-file": "^0.1.8",
-    "offline-plugin": "^3.4.2",
+    "offline-plugin": "^4.6.1",
     "react": "^15.1.0",
     "react-addons-css-transition-group": "^15.2.1",
     "react-addons-test-utils": "^15.3.2",
     "react-addons-update": "^15.3.2",
-    "react-apollo": "^0.5.13",
-    "react-css-modules": "^3.7.6",
+    "react-apollo": "0.5.16",
+    "react-css-modules": "^4.1.0",
     "react-dom": "^15.0.1",
     "react-hot-loader": "^3.0.0-beta.6",
     "react-intl": "^2.1.3",
-    "react-redux": "^4.4.5",
-    "react-router": "^2.3.0",
+    "react-redux": "^5.0.3",
+    "react-router": "^3.0.2",
     "react-router-redux": "^4.0.4",
     "redux": "^3.5.2",
-    "redux-auth-wrapper": "^0.8.0",
-    "redux-form": "^5.2.5",
+    "redux-auth-wrapper": "^1.0.0",
+    "redux-form": "^6.5.0",
     "redux-logger": "^2.6.1",
     "redux-mock-store": "^1.1.4",
-    "redux-thunk": "^1.0.0",
+    "redux-thunk": "^2.2.0",
     "reselect": "^2.5.4",
     "serialize-javascript": "^1.3.0",
     "sinon": "2.0.0-pre",
@@ -159,43 +159,43 @@
     "autoprefixer": "^6.5.1",
     "babel-core": "^6.3.15",
     "babel-eslint": "^7.1.1",
-    "babel-jest": "^18.0.0",
+    "babel-jest": "^19.0.0",
     "babel-loader": "^6.2.0",
     "babel-plugin-webpack-alias": "^2.1.1",
-    "babel-plugin-webpack-loaders": "^0.7.1",
+    "babel-plugin-webpack-loaders": "^0.8.0",
     "babel-polyfill": "latest",
     "babel-preset-es2015": "^6.9.0",
     "babel-preset-react": "^6.3.13",
     "babel-preset-stage-0": "^6.3.13",
     "babel-register": "^6.16.3",
     "babel-runtime": "^6.11.6",
-    "css-loader": "^0.23.0",
+    "css-loader": "^0.26.2",
     "eslint": "^3.15.0",
     "eslint-config-airbnb": "^14.1.0",
-    "eslint-import-resolver-webpack": "0.8.0",
+    "eslint-import-resolver-webpack": "0.8.1",
     "eslint-loader": "^1.1.1",
-    "eslint-plugin-graphql": "^0.4.0",
+    "eslint-plugin-graphql": "^0.6.1",
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-jsx-a11y": "^4.0.0",
     "eslint-plugin-react": "^6.9.0",
-    "expect-jsx": "^2.6.0",
-    "extract-text-webpack-plugin": "v2.0.0-beta.4",
-    "file-loader": "^0.9.0",
+    "expect-jsx": "^3.0.0",
+    "extract-text-webpack-plugin": "v2.0.0",
+    "file-loader": "^0.10.1",
     "html-loader": "^0.4.4",
     "html-webpack-plugin": "^2.7.1",
-    "node-sass": "^3.4.2",
+    "node-sass": "^4.5.0",
     "npm-install-webpack-plugin": "^4.0.3",
     "null-loader": "0.1.1",
-    "plop": "1.5.0",
+    "plop": "1.7.4",
     "postcss-loader": "^1.1.0",
     "precss": "^1.4.0",
     "redux-devtools": "^3.0.1",
-    "resolve-url-loader": "^1.4.4",
+    "resolve-url-loader": "^2.0.0",
     "rimraf": "^2.5.4",
-    "sass-loader": "^3.1.2",
+    "sass-loader": "^6.0.2",
     "style-loader": "^0.13.0",
-    "webpack": "2.1.0-beta.19",
-    "webpack-dev-server": "2.1.0-beta.3",
+    "webpack": "2.2.1",
+    "webpack-dev-server": "2.4.1",
     "webpack-hot-middleware": "^2.10.0",
     "webpack-manifest-plugin": "^1.1.0"
   }

diff --git a/postcss.config.js b/postcss.config.js
@@ -0,0 +1 @@
+module.exports = {};
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,5 +1,6 @@
 const webpack = require('webpack');
 const path = require('path');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const HtmlwebpackPlugin = require('html-webpack-plugin');
 const NpmInstallPlugin = require('npm-install-webpack-plugin');
 const autoprefixer = require('autoprefixer');
@@ -21,29 +22,28 @@ module.exports = {
     filename: 'bundle.js',
   },
   module: {
-    preLoaders: [
-      {
-        test: /\.jsx?$/,
-        loaders: ['eslint'],
-        include: path.resolve(ROOT_PATH, './app')
-      }
-    ],
-    loaders: [{
+    rules: [{
       test: /\.jsx?$/,
       exclude: /node_modules/,
-      loaders: ['babel']
+      loaders: ['babel-loader']
+    },
+    {
+      test: /\.jsx?$/,
+      loaders: ['eslint-loader'],
+      enforce: 'pre',
+      include: path.resolve(ROOT_PATH, './app')
     },
     {
       test: /\.md$/,
-      loader: "html!markdown"
+      use: ['html-loader','markdown-loader']
     },
     {
       test: /\.svg$/,
-      loader: 'babel!svg-react'
+      use: ['babel-loader','svg-react-loader']
     },
     {
       test: /\.json$/,
-      loader: 'json'
+      use: 'json-loader'
     },
     {
       test: /\.module\.scss$/,
@@ -55,7 +55,22 @@ module.exports = {
     {
       test: /\.scss$/,
       exclude: [/\.module\.scss$/],
-      loader: 'style-loader!css-loader!postcss-loader!sass-loader'
+      use: ExtractTextPlugin.extract({
+        use: [
+          'css-loader',
+          'postcss-loader',
+          {
+            loader: 'sass-loader',
+            options: {
+              sourceMap: true,
+              includePaths: [
+                path.join(ROOT_PATH, 'node_modules')
+              ],
+              outputStyle: 'compressed'
+            }
+          }
+        ]
+      })
     },
     {
       test: /\.css$/,
@@ -71,36 +86,29 @@ module.exports = {
     },
     {
       test: /\.(jpg|png)$/,
-      loader: 'file?name=[path][name].[hash].[ext]'
+      loader: 'file-loader?name=[path][name].[hash].[ext]'
     }
   ]
   },
-  sassLoader: {
-    includePaths: [
-      './node_modules',
-    ]
-  },
   resolve: {
-    extensions: ['', '.js', '.jsx', '.json'],
+    extensions: ['.js', '.jsx', '.json', '.scss', '.css'],
     alias: {
       components: path.resolve(ROOT_PATH, 'app/src/components'),
       containers: path.resolve(ROOT_PATH, 'app/src/containers'),
       pages: path.resolve(ROOT_PATH, 'app/src/pages'),
       utils: path.resolve(ROOT_PATH, 'app/src/utils')
     },
-  },
-  postcss: function () {
-    return {
-      defaults: [precss, autoprefixer],
-      cleaner:  [autoprefixer({ browsers: [] })]
-    };
+    modules: [
+      path.join(__dirname, 'src'), 'node_modules'
+    ],
   },
   plugins: [
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || 'development')
     }),
+    new ExtractTextPlugin('[name].[contenthash].css'),
     new webpack.HotModuleReplacementPlugin(),
-    new NpmInstallPlugin(),
+    // new NpmInstallPlugin(),
     new HtmlwebpackPlugin({
       title: 'Scalable React Boilerplate',
       template: 'config/templates/_index.dev.html',