Merge pull request #302 from GraysonNull/kustomize-merged-overlays

Kustomize merged overlays

Author: GraysonNull

web/Makefile

@@ -23,7 +23,7 @@ serve_ship:
 
 .state/build_ship: .state/package webpack* postcss* $(shell find src -type f)
 	rm -rf dist
-	`yarn bin`/webpack --config webpack.config.js --env ship --mode production
+	`yarn bin`/webpack --config webpack.config.js --env production --mode production
 	@mkdir -p .state
 	@touch .state/build_ship
 

web/env/production.js

@@ -0,0 +1,8 @@
+module.exports = {
+  ENVIRONMENT: "production",
+  API_ENDPOINT: "/api/v1",
+  WEBPACK_SCRIPTS: [
+    "https://unpkg.com/react@16/umd/react.production.min.js",
+    "https://unpkg.com/react-dom@16/umd/react-dom.production.min.js"
+  ]
+};

web/env/ship.js

@@ -32,7 +32,7 @@ export default class Linter extends React.Component {
 
   linkFor(error) {
     return error.links && error.links.length > 0 ? (
-      <a target="_blank" href={error.links[0]}>
+      <a target="_blank" href={error.links[0]} rel="noopener noreferrer">
         <span className={`icon u-linkIcon--blue flex-auto u-marginLeft--small clickable`}></span>
       </a>
     ) : null;

web/src/components/shared/Linter.jsx

@@ -43,7 +43,6 @@ class NavBar extends React.Component {
 
   getNavItems() {
     const token = true;
-
     return[ !token ? null :
       {
         id: 0,

web/src/components/shared/NavBar.jsx

@@ -53,7 +53,7 @@ export default class NavItem extends React.Component {
       return linkTo
         ? <Link className={linkClassName} to={linkTo} tabIndex="-1">{linkContent}</Link>
         : href ?
-          <a href={href} target="_blank" tabIndex="-1">{linkContent}</a>
+          <a href={href} target="_blank" tabIndex="-1" rel="noopener noreferrer">{linkContent}</a>
           : options.isButton ?
             <button className={`Button ${options.buttonClassName || ""}`} tabIndex="-1">{linkContent}</button>
             : <a tabIndex="-1">{linkContent}</a>;

web/src/components/shared/NavItem.jsx

@@ -30,7 +30,7 @@ export default class PopoverItem extends React.Component {
               {label}
             </Link>
             :
-            <a className="PopoverLabel u-noSelect" href={href} target="_blank">
+            <a className="PopoverLabel u-noSelect" href={href} target="_blank" rel="noopener noreferrer">
               {label}
             </a>
         }

web/src/components/shared/PopoverItem.jsx

@@ -127,7 +127,7 @@ module.exports = function (env) {
   } else if (env === "shipDev" || env === "configOnly") {
     var configEnv = require("./webpack.config.configOnly");
     return webpackMerge(common, configEnv);
-  } else if (env === "ship") {
+  } else if (env === "production") {
     var configEnv = require("./webpack.config.distConfigOnly");
     return webpackMerge(common, configEnv);
   } else {