Fix build issues

.gitignore

@@ -1,10 +1,11 @@
 # top-level and lambda function specific
 /node_modules
 /coverage
-/lambdas/static-asset-uploader/build/config.js
+/lambdas/static-asset-uploader/build
 /lambdas/coverage
 
 # devportal specific
+/dev-portal/build
 
 # we're committing the artifacts, don't need the modules
 # note, though, that we do need our patched version of swagger-ui and not the npm version
@@ -33,4 +34,6 @@ cognito.js
 .idea
 .vscode
 .eslintcache
-*.iml
+*.iml
+
+

dev-portal/.eslintrc.js

@@ -1,7 +1,7 @@
 'use strict'
 
 module.exports = {
-  extends: ['react-app', '../.eslintrc.js'],
+  extends: ['react-app'],
   overrides: [
     {
       files: ['.eslintrc.js', './*.js'],

dev-portal/package.json

@@ -6,6 +6,7 @@
     "chart.js": "^2.9.4",
     "dompurify": "^2.2.8",
     "front-matter": "^3.0.0",
+    "js-yaml": "^4.1.0",
     "jwt-decode": "^2.2.0",
     "lodash": "^4.17.21",
     "marked": "^4.0.10",
@@ -16,10 +17,9 @@
     "react": "^16.8.4",
     "react-dom": "^16.8.4",
     "react-router-dom": "^4.3.1",
-    "semantic-ui-css": "^2.4.1",
+    "semantic-ui-css": "git+https://github.com/Semantic-Org/Semantic-UI-CSS.git",
     "semantic-ui-react": "^0.87.3",
-    "swagger-ui": "github:awslabs/swagger-ui#apigw-fork-v4",
-    "yamljs": "^0.3.0"
+    "swagger-ui": "github:awslabs/swagger-ui#apigw-fork-v4"
   },
   "scripts": {
     "start": "react-scripts start",
@@ -39,6 +39,6 @@
     "@testing-library/jest-dom": "^4.0.0",
     "@testing-library/react": "^8.0.4",
     "node-fetch": "^2.6.7",
-    "react-scripts": "^5.0.0"
+    "react-scripts": "^5.0.1"
   }
 }

dev-portal/src/components/SwaggerUiLayout.jsx

@@ -7,7 +7,7 @@ import React, { useMemo } from 'react'
 import { Button, Header, Image, Container } from 'semantic-ui-react'
 
 // markdown for external docs description
-import marked from 'marked'
+import { marked } from 'marked'
 import DOMPurify from 'dompurify'
 
 // services

dev-portal/src/pages/Admin/ApiManagement.jsx

@@ -6,7 +6,7 @@ import { apiGatewayClientWithCredentials } from 'services/api'
 import { getApi } from 'services/api-catalog'
 import { store } from 'services/state'
 
-import * as YAML from 'yamljs'
+import * as YAML from 'js-yaml'
 
 import hash from 'object-hash'
 import { toJS } from 'mobx'
@@ -98,7 +98,7 @@ export const ApiManagement = observer(class ApiManagement extends React.Componen
 
         reader.onload = (e) => {
           if (file.name.includes('yaml')) {
-            swaggerObject = YAML.parse(e.target.result)
+            swaggerObject = YAML.load(e.target.result)
             swagger = JSON.stringify(swaggerObject)
           } else {
             swaggerObject = JSON.parse(e.target.result)

dev-portal/src/services/get-fragments.jsx

@@ -12,7 +12,7 @@ import { observable } from 'mobx'
 
 // markdown parsing
 import frontmatter from 'front-matter'
-import marked from 'marked'
+import { marked } from 'marked'
 
 export const fragments = observable({})
 

lambdas/static-asset-uploader/build/asset-manifest.json

@@ -1,24 +1,29 @@
 {
   "files": {
-    "main.css": "/static/css/main.4cc12556.chunk.css",
-    "main.js": "/static/js/main.5b203aad.chunk.js",
-    "main.js.map": "/static/js/main.5b203aad.chunk.js.map",
-    "runtime-main.js": "/static/js/runtime-main.013db1f0.js",
-    "runtime-main.js.map": "/static/js/runtime-main.013db1f0.js.map",
-    "static/css/2.0f7c2d19.chunk.css": "/static/css/2.0f7c2d19.chunk.css",
-    "static/js/2.fc541861.chunk.js": "/static/js/2.fc541861.chunk.js",
-    "static/js/2.fc541861.chunk.js.map": "/static/js/2.fc541861.chunk.js.map",
+    "main.css": "/static/css/main.e8fdd11c.css",
+    "main.js": "/static/js/main.b0d99944.js",
+    "static/media/brand-icons.svg": "/static/media/brand-icons.6729d29753e000c17489.svg",
+    "static/media/icons.svg": "/static/media/icons.62d9dae4e0040e81c980.svg",
+    "static/media/outline-icons.svg": "/static/media/outline-icons.9c4845b4b41ef40a22fa.svg",
+    "static/media/icons.eot": "/static/media/icons.a01e3f2d6c83dc3aee17.eot",
+    "static/media/icons.ttf": "/static/media/icons.c656b8caa454ed19b9a2.ttf",
+    "static/media/brand-icons.eot": "/static/media/brand-icons.d68fa3e67dbb653a13ce.eot",
+    "static/media/brand-icons.ttf": "/static/media/brand-icons.65a2fb6d9aaa164b41a0.ttf",
+    "static/media/brand-icons.woff": "/static/media/brand-icons.cac87dc00c87a5d74711.woff",
+    "static/media/brand-icons.woff2": "/static/media/brand-icons.278156e41e0ad908cf7f.woff2",
+    "static/media/icons.woff": "/static/media/icons.425399f81e4ce7cbd967.woff",
+    "static/media/icons.woff2": "/static/media/icons.38c6d8bab26db77d8c80.woff2",
+    "static/media/outline-icons.eot": "/static/media/outline-icons.752905fa5edf21fc52a1.eot",
+    "static/media/outline-icons.ttf": "/static/media/outline-icons.5367103510b27b784827.ttf",
+    "static/media/flags.png": "/static/media/flags.99f63ae7a743f21ab308.png",
+    "static/media/outline-icons.woff": "/static/media/outline-icons.ddae9b1ba9b0b42f5880.woff",
+    "static/media/outline-icons.woff2": "/static/media/outline-icons.687a4990ea22bb1a49d4.woff2",
     "index.html": "/index.html",
-    "static/css/2.0f7c2d19.chunk.css.map": "/static/css/2.0f7c2d19.chunk.css.map",
-    "static/css/main.4cc12556.chunk.css.map": "/static/css/main.4cc12556.chunk.css.map",
-    "static/js/2.fc541861.chunk.js.LICENSE.txt": "/static/js/2.fc541861.chunk.js.LICENSE.txt",
-    "static/media/semantic.css": "/static/media/outline-icons.ddae9b1b.woff"
+    "main.e8fdd11c.css.map": "/static/css/main.e8fdd11c.css.map",
+    "main.b0d99944.js.map": "/static/js/main.b0d99944.js.map"
   },
   "entrypoints": [
-    "static/js/runtime-main.013db1f0.js",
-    "static/css/2.0f7c2d19.chunk.css",
-    "static/js/2.fc541861.chunk.js",
-    "static/css/main.4cc12556.chunk.css",
-    "static/js/main.5b203aad.chunk.js"
+    "static/css/main.e8fdd11c.css",
+    "static/js/main.b0d99944.js"
   ]
 }

lambdas/static-asset-uploader/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="/custom-content/favicon.ico"><script type="text/javascript" src="/config.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/axios/dist/axios.standalone.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/CryptoJS/rollups/hmac-sha256.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/CryptoJS/rollups/sha256.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/CryptoJS/components/hmac.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/CryptoJS/components/enc-base64.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/url-template/url-template.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/apiGatewayCore/sigV4Client.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/apiGatewayCore/apiGatewayClient.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/apiGatewayCore/simpleHttpClient.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/apiGatewayCore/utils.js"></script><script type="text/javascript" src="/apigateway-js-sdk/apigClient.js"></script><link rel="stylesheet" href="/custom-content/styles.css"><title>Developer Portal</title><link href="/static/css/2.0f7c2d19.chunk.css" rel="stylesheet"><link href="/static/css/main.4cc12556.chunk.css" rel="stylesheet"></head><body><div id="root"></div><script>!function(e){function r(r){for(var n,l,a=r[0],p=r[1],f=r[2],c=0,s=[];c<a.length;c++)l=a[c],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in p)Object.prototype.hasOwnProperty.call(p,n)&&(e[n]=p[n]);for(i&&i(r);s.length;)s.shift()();return u.push.apply(u,f||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,a=1;a<t.length;a++){var p=t[a];0!==o[p]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={1:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var a=this["webpackJsonpdev-portal"]=this["webpackJsonpdev-portal"]||[],p=a.push.bind(a);a.push=r,a=a.slice();for(var f=0;f<a.length;f++)r(a[f]);var i=p;t()}([])</script><script src="/static/js/2.fc541861.chunk.js"></script><script src="/static/js/main.5b203aad.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="/custom-content/favicon.ico"><script type="text/javascript" src="/config.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/axios/dist/axios.standalone.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/CryptoJS/rollups/hmac-sha256.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/CryptoJS/rollups/sha256.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/CryptoJS/components/hmac.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/CryptoJS/components/enc-base64.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/url-template/url-template.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/apiGatewayCore/sigV4Client.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/apiGatewayCore/apiGatewayClient.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/apiGatewayCore/simpleHttpClient.js"></script><script type="text/javascript" src="/apigateway-js-sdk/lib/apiGatewayCore/utils.js"></script><script type="text/javascript" src="/apigateway-js-sdk/apigClient.js"></script><link rel="stylesheet" href="/custom-content/styles.css"><title>Developer Portal</title><script defer="defer" src="/static/js/main.b0d99944.js"></script><link href="/static/css/main.e8fdd11c.css" rel="stylesheet"></head><body><div id="root"></div></body></html>