Merge branch 'master' into dev

Author: maxceem

.vscode/settings.json

@@ -20,7 +20,7 @@ This is a [single-spa](https://single-spa.js.org/) example React microapp.
 
 ## Config
 
-For available variables config which depend on the running environment (`APPENV=dev` or `APPENV=prod`), please refer to `config/dev.js` and `config/prod.js`.
+For available variables config which depend on the running environment (`development` or `production`), please refer to `config/development.js` and `config/production.js`.
 
 For application constants which don't depend on the running environment use `src/constants/index.js`.
 

README.md

@@ -0,0 +1,51 @@
+{
+  "presets": [
+    "@babel/preset-env",
+    "@babel/preset-react"
+  ],
+  "plugins": [
+    [
+      "@babel/plugin-transform-runtime",
+      {
+        "useESModules": true,
+        "regenerator": false
+      }
+    ],
+    [
+      "react-css-modules",
+      {
+        "filetypes": {
+          ".scss": {
+            "syntax": "postcss-scss"
+          }
+        },
+        "generateScopedName": "teams_[path][name]___[local]___[hash:base64:6]"
+      }
+    ],
+    "inline-react-svg"
+  ],
+  "env": {
+    "test": {
+      "presets": [
+        [
+          "@babel/preset-env",
+          {
+            "targets": "current node"
+          }
+        ]
+      ],
+      "plugins": [
+        ["module-resolver", {
+          "alias": {
+            "styles": "./src/styles",
+            "components": "./src/components",
+            "hooks": "./src/hooks",
+            "utils": "./src/utils",
+            "constants": "./src/constants",
+            "services": "./src/services"
+          }
+        }]
+      ]
+    }
+  }
+}

babel.config.js

@@ -1,11 +1,11 @@
 /* global process */
 
 module.exports = (() => {
-  const env = process.env.APPENV || "dev";
+  const env = process.env.NODE_ENV || "development";
 
   // for security reason don't let to require any arbitrary file defined in process.env
-  if (["prod", "dev"].indexOf(env) < 0) {
-    return require("./dev");
+  if (["production", "development"].indexOf(env) < 0) {
+    return require("./development");
   }
 
   return require("./" + env);

babel.config.json

@@ -2,14 +2,11 @@
 
 .pagination {
   display: flex;
-  flex-wrap: wrap;
-  margin-bottom: -10px;
 
   .page {
     padding: 0 10px;
-    margin: 0 5px 10px;
+    margin: 0 5px;
     min-width: 30px;
-
   }
 
   .current {
@@ -20,7 +17,6 @@
 
   .next {
     margin-left: 5px;
-    margin-bottom: 10px;
 
     > svg {
       transform: rotate(-90deg);
@@ -33,7 +29,6 @@
 
   .prev {
     margin-right: 5px;
-    margin-bottom: 10px;
 
     > svg {
       margin-right: 3px;

config/dev.js renamed to config/development.js

@@ -101,7 +101,6 @@ const SkillsList = ({ requiredSkills, skills, limit = 3 }) => {
                     <div styleName="skills-section">
                       <div styleName="skills-title">Required Job Skills</div>
                       <ul styleName="skills-list">
-                        {!requiredSkills.length && <li>None</li>}
                         {requiredSkills.map((skill) => (
                           <li key={skill.id}>
                             {_.find(skills, { id: skill.id }) ? (

config/index.js

@@ -22,12 +22,10 @@
 
 .popover-content {
   display: flex;
-  flex-wrap: wrap;
-  padding: 4px 24px 24px;
+  padding: 24px;
 }
 
 .skills-section {
-  margin-top: 20px;
   padding-right: 32px;
 }
 

config/prod.js renamed to config/production.js

@@ -161,9 +161,5 @@ export const formatDateRange = (startDate, endDate) => {
   const startDateStr = startDate ? moment(startDate).format(DAY_FORMAT) : "";
   const endDateStr = endDate ? moment(endDate).format(DAY_FORMAT) : "";
 
-  if (!startDateStr && !endDateStr) {
-    return "TBD";
-  }
-
   return `${startDateStr} - ${endDateStr}`;
 };

src/components/Pagination/styles.module.scss

@@ -1,14 +1,10 @@
 /* global __dirname */
-const webpack = require("webpack");
 const webpackMerge = require("webpack-merge");
 const singleSpaDefaults = require("webpack-config-single-spa-react");
 const path = require("path");
 const autoprefixer = require("autoprefixer");
 
-
-const cssLocalIdent = process.env.APPMODE === "production"  
-  ? "[hash:base64:6]"
-  : "teams_[path][name]___[local]___[hash:base64:6]";
+const cssLocalIdent = "teams_[path][name]___[local]___[hash:base64:6]";
 
 module.exports = (webpackConfigEnv) => {
   const defaultConfig = singleSpaDefaults({
@@ -69,10 +65,5 @@ module.exports = (webpackConfigEnv) => {
         services: path.resolve(__dirname, "src/services"),
       },
     },
-    plugins: [
-      // ignore moment locales to reduce bundle size by 64kb gzipped
-      // see solution details https://stackoverflow.com/questions/25384360/how-to-prevent-moment-js-from-loading-locales-with-webpack/25426019#25426019
-      new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
-    ],
   });
 };