Merge pull request #34 from predix-apphub/fix/babelupdate

Fix/babelupdate

.eslintrc

@@ -1,45 +1,57 @@
 {
-  "extends": "airbnb",
-  "parser": "babel-eslint",
-  "globals": {
-    "before": true,
-    "after" : true,
-    "describe" : true,
-    "it": true
-  },
-  "env": {
-    "browser": true,
-    "jest": true,
-    "es6": true
-  },
-  "plugins": [
-    "react"
-  ],
-  "rules": {
-    "no-plusplus": "warn",
-    "no-console": "warn",
-    "comma-dangle": ["error", "never"],
-    "jsx-a11y/href-no-hash": 0,
-    "global-require": 0,
-    "prefer-arrow-callback": 0,
-    "experimentalDecorators": 0,
-    "func-names": 0,
-    "import/no-extraneous-dependencies": 0,
-    "no-underscore-dangle": 0,
-    "no-unused-expressions": 0,
-    "no-use-before-define": 0,
-    "react/jsx-filename-extension": 0,
-    "react/sort-comp": 0,
-    "react/no-multi-comp": 0,
-    "react/require-extension": 0
-  },
-  "overrides": [
-    {
-      "files": [
-        "src/**/*.js",
-        "src/**/*.jsx"
-      ],
-      "excludedFiles": []
-    }
-  ]
+	"extends": ["airbnb", "prettier"],
+	"plugins": ["prettier", "react"],
+	"parser": "babel-eslint",
+	"globals": {
+		"before": true,
+		"after": true,
+		"describe": true,
+		"it": true
+	},
+	"env": {
+		"browser": true,
+		"jest": true,
+		"es6": true
+	},
+	"rules": {
+		"prettier/prettier": [
+			"error",
+			{},
+			{
+				"usePrettierrc": true
+			}
+		],
+		"max-len": 1,
+		"no-plusplus": "warn",
+		"no-console": "warn",
+		"comma-dangle": ["warn", "never"],
+		"jsx-a11y/href-no-hash": 0,
+		"no-case-declarations": 1,
+		"global-require": 0,
+		"prefer-arrow-callback": 0,
+		"experimentalDecorators": 0,
+		"func-names": 0,
+		"import/no-extraneous-dependencies": 0,
+		"no-underscore-dangle": 0,
+		"space-before-function-paren": 0,
+		"arrow-parens": 1,
+		"no-unused-expressions": 0,
+		"no-use-before-define": 0,
+		"react/jsx-filename-extension": 0,
+		"react/sort-comp": 0,
+		"react/no-multi-comp": 0,
+		"react/require-extension": 0,
+		"react/require-default-props": 1,
+		"react/forbid-prop-types": 1,
+		"react/prop-types": 1,
+		"react/no-this-in-sfc": 1,
+		"react/prefer-stateless-function": 1,
+		"react/destructuring-assignment": 1
+	},
+	"overrides": [
+		{
+			"files": ["src/**/*.js", "src/**/*.jsx"],
+			"excludedFiles": []
+		}
+	]
 }

.gitignore

@@ -37,3 +37,4 @@ stats.json
 .tar
 temp-db.json
 .eslintcache
+.predix-ci*

.storybook/addons.js

@@ -1,4 +1,9 @@
-import '@storybook/addon-knobs/register'
+import '@storybook/addon-knobs/register';
+import '@storybook/addon-storysource/register';
 import '@storybook/addon-actions/register';
-import '@storybook/addon-viewport/register';
+import '@storybook/addon-links/register';
+import '@storybook/addon-notes/register';
+
+
+//import '@storybook/addon-viewport/register';
 //import 'storybook-addon-jsx/register';

.storybook/config.js

@@ -4,7 +4,7 @@ import { configure, setAddon} from '@storybook/react';
 //setAddon(JSXAddon);
 
 const path = require('path');
-const req = require.context('../src', true, /\.stories\.js$/)
+const req = require.context('../src', true, /\.stories\.js?(x)$/)
 
 function loadStories() {
   req.keys().forEach((filename) => req(filename))

.storybook/webpack.config.js

@@ -1,22 +1,45 @@
 const path = require('path');
 const glob = require('glob');
 const merge = require('webpack-merge');
-const genDefaultConfig = require('@storybook/react/dist/server/config/defaults/webpack.config.js');
 const pkg = require('../package.json');
 const ROOT_PATH = path.resolve(__dirname, '../');
 
 // Export a function. Accept the base config as the only param.
-module.exports = (storybookBaseConfig, configType) => {
-  const config = genDefaultConfig(storybookBaseConfig, configType);
-  // configType has a value of 'DEVELOPMENT' or 'PRODUCTION'
+module.exports = async ({
+                          config,
+                          mode
+                        }) => {
+  // `mode` has a value of 'DEVELOPMENT' or 'PRODUCTION'
   // You can change the configuration based on that.
   // 'PRODUCTION' is used when building the static version of storybook.
-  config.resolve.modules.push('node_modules');
-  config.resolve.extensions.push('.scss');
 
   // Make whatever fine-grained changes you need
-  //config.plugins.push(extractSass);
-  //config.module.rules.push(sassRules);
+  config.module.rules.push({
+    test: /\.scss$/,
+    loaders: ['style-loader', 'css-loader',
+      {
+        loader: 'sass-loader',
+        options: {
+          importer: require('node-sass-import-once'),
+          importOnce: {
+            index: true,
+            css: true,
+            bower: true
+          },
+          includePaths: ['node_modules', 'bower_components']
+        }
+      }
+    ],
+    include: path.resolve(__dirname, '../'),
+  });
 
+  config.module.rules.push({
+    test: /\.stories\.js?(x)$/,
+    loaders: [require.resolve('@storybook/addon-storysource/loader')],
+    enforce: 'pre'
+  });
+
+
+  // Return the altered config
   return config;
 };

.webpack/frontend.dev.js

@@ -14,10 +14,7 @@ const developmentConfig = merge([{
     extends: 'base',
     target: 'web',
     entry: [
-
-
       'main'
-
     ],
     node: {
       global: true,
@@ -44,8 +41,6 @@ const developmentConfig = merge([{
   parts.loadDevCss({
     exclude: /typography/,
     options: {
-      sourceMap: true,
-      minimize: true
     }
   }),
   parts.loadImages(),

.webpack/frontend.prod.js

@@ -3,11 +3,10 @@
  */
 const pkg = require('../package.json');
 const path = require('path');
-const glob = require('glob-all');
+const glob = require('glob');
 const webpack = require('webpack');
 const merge = require('webpack-merge');
 const parts = require('./webpack.parts');
-
 const publicPath = 'build';
 
 // This is an exact copy of the NodeJS ’path’ module published to the NPM registry.
@@ -134,19 +133,14 @@ const productionConfig = merge([{
   parts.minifyJavaScript(),
   parts.minifyCSS({
     options: {
-      discardComments: {
-        removeAll: true
-      },
-      safe: true
+
     }
   }),
   parts.criticalCSS(),
   parts.purifyCSS({
     verbose: true,
     moduleExtensions: ['.html', '.js'],
-    paths: glob.sync([
-      path.resolve(__dirname, '../dist/**')
-    ])
+    paths: glob.sync(path.resolve(__dirname, '../dist/**'))
   })
 ]);
 

Procfile

@@ -0,0 +1 @@
+web: node dist/server.js

package.json

@@ -29,7 +29,7 @@
     "pretest": "rimraf coverage && npm run lint",
     "test": "cross-env NODE_ENV=test jest --coverage",
     "test:e2e": "cross-env NODE_ENV=test nightwatch --config ./test/e2e/nightwatch.conf.js",
-    "lint": "eslint ./src ./test --cache",
+    "lint": "prettier --write ./src/**/*.js",
     "zip": "cd dist && bestzip ../$npm_package_name-$npm_package_version.zip *",
     "storybook": "start-storybook -p 9090 -c .storybook",
     "storybook:build": "build-storybook -c .storybook -o .out"
@@ -82,9 +82,11 @@
     "esdoc-standard-plugin": "^1.0.0",
     "eslint": "^5.13.0",
     "eslint-config-airbnb": "^17.1.0",
+    "eslint-config-prettier": "^6.1.0",
     "eslint-loader": "^2.1.2",
     "eslint-plugin-import": "^2.1.0",
     "eslint-plugin-jsx-a11y": "^6.0.3",
+    "eslint-plugin-prettier": "^3.1.0",
     "eslint-plugin-react": "^7.7.0",
     "exports-loader": "^0.7.0",
     "file-loader": "^1.1.6",
@@ -110,6 +112,7 @@
     "postcss-loader": "^3.0.0",
     "postcss-preset-env": "^6.5.0",
     "postcss-reporter": "^6.0.1",
+    "prettier": "^1.18.2",
     "promise-polyfill": "^8.1.0",
     "prop-types": "^15.6.1",
     "purify-css": "^1.2.5",
@@ -169,20 +172,21 @@
     "i18next-express-middleware": "^1.0.2",
     "ioredis": "^4.6.2",
     "lowdb": "^1.0.0",
+    "morgan": "^1.9.1",
     "pascal-case": "^2.0.1",
     "passport": "^0.4.0",
     "passport-oauth2-middleware": "^1.0.3",
     "passport-predix-oauth": "^0.1.15",
     "predix-fast-token": "^1.2.1",
     "predix-ui": "^0.0.22",
-    "react": "^16.2.0",
-    "react-dom": "^16.2.0",
+    "react": "^16.8.1",
+    "react-dom": "^16.8.1",
     "react-hot-loader": "^4.0.0",
     "react-router-dom": "^4.2.2",
     "request": "^2.79.0",
     "serve-static": "^1.10.2",
     "socket.io": "^2.2.0",
-    "swagger-express-middleware": "^2.0.0",
+    "swagger-express-middleware": "^2.0.2",
     "swagger-parser": "^6.0.3",
     "swagger-stats": "^0.95.6",
     "uuid": "^3.2.1",

predix-ci.yml

@@ -0,0 +1,6 @@
+nodejs:
+  version: '8.10.0'
+hooks:
+  pre_setup: npm install
+tests:
+  - npm test

src/app.js

@@ -4,7 +4,9 @@
  * But in development it will load the middleware.
  */
 const express = require('express');
+const morgan = require('morgan');
 const routesList = require('express-api-routes-list');
+
 const server = require('./server');
 const log = require('./server/common/logger')('app');
 
@@ -16,6 +18,7 @@ if (process.env.NODE_ENV === 'development') {
   require('./server/common/dev')(app);
 }
 
+app.use(morgan('dev'));
 app.use(server.getExpressApp());
 app.listen(port, () => {
   log.debug(routesList(app).toString());