Merge pull request #2424 from GuessWhoSamFoo/npm-audit-fix

Resolve npm audit dependencies

build.go

@@ -85,6 +85,7 @@ func main() {
 			Short: "client build, skipping tests",
 			Run: func(cmd *cobra.Command, args []string) {
 				verifyRegistry()
+				verifyNpmCache()
 				webDeps("--prefer-offline", "--no-audit")
 				webBuild()
 			},

web/package.json

@@ -82,7 +82,7 @@
     "jscodeshift": "^0.12.0",
     "karma-electron": "^6.3.3",
     "karma-electron-launcher": "^0.3.0",
-    "lodash": "^4.17.20",
+    "lodash": "^4.17.21",
     "lodash-es": "^4.17.15",
     "monaco-editor": "^0.21.2",
     "ngx-highlightjs": "^4.1.2",
@@ -105,16 +105,16 @@
     "@babel/core": "^7.11.6",
     "@compodoc/compodoc": "^1.1.11",
     "@mdx-js/loader": "^1.6.18",
-    "@storybook/addon-a11y": "v6.3.0-alpha.16",
-    "@storybook/addon-actions": "v6.3.0-alpha.16",
-    "@storybook/addon-console": "^1.2.2",
-    "@storybook/addon-controls": "v6.3.0-alpha.16",
-    "@storybook/addon-docs": "v6.3.0-alpha.16",
-    "@storybook/addon-links": "v6.3.0-alpha.16",
-    "@storybook/addons": "v6.3.0-alpha.16",
-    "@storybook/angular": "v6.3.0-alpha.16",
-    "@storybook/codemod": "v6.3.0-alpha.16",
-    "@storybook/theming": "v6.3.0-alpha.16",
+    "@storybook/addon-a11y": "v6.3.0-alpha.21",
+    "@storybook/addon-actions": "v6.3.0-alpha.21",
+    "@storybook/addon-console": "^1.2.3",
+    "@storybook/addon-controls": "v6.3.0-alpha.21",
+    "@storybook/addon-docs": "v6.3.0-alpha.21",
+    "@storybook/addon-links": "v6.3.0-alpha.21",
+    "@storybook/addons": "v6.3.0-alpha.21",
+    "@storybook/angular": "v6.3.0-alpha.21",
+    "@storybook/codemod": "v6.3.0-alpha.21",
+    "@storybook/theming": "v6.3.0-alpha.21",
     "@types/d3": "~5.16.3",
     "@types/graphlib-dot": "^0.6.1",
     "@types/jasmine": "^3.5.14",
@@ -129,7 +129,7 @@
     "electron-builder": "^22.9.1",
     "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~6.0.0",
-    "karma": "^5.2.3",
+    "karma": "^6.3.2",
     "karma-chrome-launcher": "^3.1.0",
     "karma-coverage": "^2.0.3",
     "karma-jasmine": "^4.0.1",
@@ -154,6 +154,9 @@
     "wait-on": "^5.2.0"
   },
   "resolutions": {
-    "marked": "2.0.3"
+    "marked": "2.0.3",
+    "merge": "^2.1.1",
+    "hosted-git-info": "^3.0.8",
+    "yargs-parser": "^18.1.2"
   }
 }

web/src/stories/accordion.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const accordionDocs= { source: { code: `	accordion := component.NewAccordion("Test", []component.AccordionRow{

web/src/stories/annotations.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const annotationsDocs= { source: { code: `annotations := map[string]string{"Label": "Sample annotation"}

web/src/stories/button.group.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const buttonDocs= { source: { code: `buttonGroup := component.NewButtonGroup()

web/src/stories/button.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import {argTypesView} from './helpers/helpers';
 
 export const buttonDocs= [

web/src/stories/card.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import {argTypesView} from "./helpers/helpers";
 
 export const cardDocs= { source: { code: `card := component.NewCard([]component.TitleComponent{component.NewText("Card Title")})

web/src/stories/code.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const codeDocs= { source: { code: `component.NewCodeBlock("package main\n\nimport "fmt"\n\nfunc main() {\n\tfmt.Println("hello world")\n}")`}}

web/src/stories/containers.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const containersDocs= { source: { code: `containers := component.NewContainers()

web/src/stories/docs/about/Intro.story.mdx

@@ -1,4 +1,4 @@
-import { Meta } from '@storybook/addon-docs/blocks';
+import { Meta } from '@storybook/addon-docs';
 
 <Meta
   title="Docs/Intro"

web/src/stories/docs/about/Roadmap.story.mdx

@@ -1,4 +1,4 @@
-import { Meta } from '@storybook/addon-docs/blocks';
+import { Meta } from '@storybook/addon-docs';
 
 <Meta
   title="Docs/About/2. Roadmap"

web/src/stories/docs/about/Why.story.mdx

@@ -1,4 +1,4 @@
-import { Meta } from '@storybook/addon-docs/blocks';
+import { Meta } from '@storybook/addon-docs';
 
 <Meta
   title="Docs/About/1. Why"

web/src/stories/docs/hacking/Electron.story.mdx

@@ -1,4 +1,4 @@
-import { Meta } from '@storybook/addon-docs/blocks';
+import { Meta } from '@storybook/addon-docs';
 
 <Meta
   title="Docs/Hacking/2. Building Electron"

web/src/stories/docs/hacking/ReleaseProcess.story.mdx

@@ -1,4 +1,4 @@
-import { Meta } from '@storybook/addon-docs/blocks';
+import { Meta } from '@storybook/addon-docs';
 
 <Meta
   title="Docs/Hacking/4. Release Process"

web/src/stories/docs/hacking/Requirements.story.mdx

@@ -1,4 +1,4 @@
-import { Meta } from '@storybook/addon-docs/blocks';
+import { Meta } from '@storybook/addon-docs';
 
 <Meta
   title="Docs/Hacking/1. Requirements"

web/src/stories/docs/hacking/TypeScriptGen.story.mdx

@@ -1,4 +1,4 @@
-import { Meta } from '@storybook/addon-docs/blocks';
+import { Meta } from '@storybook/addon-docs';
 
 <Meta
   title="Docs/Hacking/3. Generate TypeScript Components"

web/src/stories/docs/plugins/AppxDebugging.story.mdx

@@ -1,4 +1,4 @@
-import { Meta } from '@storybook/addon-docs/blocks';
+import { Meta } from '@storybook/addon-docs';
 
 <Meta
   title="Docs/Plugins/A3. Debugging"

web/src/stories/docs/plugins/AppxListKnownPlugins.story.mdx

@@ -1,4 +1,4 @@
-import { Meta } from '@storybook/addon-docs/blocks';
+import { Meta } from '@storybook/addon-docs';
 
 <Meta
   title="Docs/Plugins/A1. List of Known Plugins"

web/src/stories/docs/plugins/AppxTerminology.story.mdx

@@ -1,4 +1,4 @@
-import { Meta } from '@storybook/addon-docs/blocks';
+import { Meta } from '@storybook/addon-docs';
 
 <Meta
   title="Docs/Plugins/A2. Terminology"

web/src/stories/docs/plugins/GettingStarted.story.mdx

@@ -1,4 +1,4 @@
-import { Meta } from '@storybook/addon-docs/blocks';
+import { Meta } from '@storybook/addon-docs';
 
 <Meta
   title="Docs/Plugins/1. Getting Started"

web/src/stories/docs/plugins/GoPluginsIntro.story.mdx

@@ -1,4 +1,4 @@
-import { Meta } from '@storybook/addon-docs/blocks';
+import { Meta } from '@storybook/addon-docs';
 
 <Meta
   title="Docs/Plugins/2. Go Plugins"

web/src/stories/donut.chart.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from './helpers/helpers';
 
 export const donutDocs= { source: { code: `component.DonutChart{

web/src/stories/dropdown.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const dropdownDocs= { source: { code: `dropdown := component.NewDropdown("Select item", BottomLeft,

web/src/stories/editor.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const editorDocs= { source: { code: `data := "---\nmetadata:\n  creationTimestamp: null\nspec:\n  containers: null\nstatus: {}\n"

web/src/stories/flex.layout.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const flexDocs= { source: { code: `flexLayout := component.NewFlexLayout("Summary")

web/src/stories/graphviz.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const graphvizDocs= { source: { code: `graph := component.NewGraphviz("digraph {a -> b}`}}

web/src/stories/icon.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const iconDocs= {source: {code: `c := component.NewIcon("user")

web/src/stories/iframe.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const iFrameDocs= { source: { code: `component.NewIFrame("https://octant.dev", "title")`}};

web/src/stories/labels.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const labelsDocs= { source: { code: `labels = map[string]string{"foo": "bar"}

web/src/stories/link.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const linkDocs= { source: { code: `title = "Example Link"

web/src/stories/list.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const listDocs= { source: { code: `cols := component.NewTableCols("ColumnA", "ColumnB")

web/src/stories/logs.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesLogView } from "./helpers/helpers";
 
 export const logsDocs= { source: { code: `component.NewLogs(pod.Namespace, pod.Name, containerNames...)`}}

web/src/stories/modal.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const modalDocs = { source: { code: `modal := component.NewModal(component.TitleFromString("Modal Title"))

web/src/stories/pod.status.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const podStatusDocs= { source: { code: `podStatus := component.NewPodStatus()`}}

web/src/stories/ports.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const portsDocs= { source: { code: `apiVersion, kind := gvk.ToAPIVersionAndKind()

web/src/stories/quadrant.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const quadrantDocs= { source: { code: `quadrant := component.NewQuadrant("Status")

web/src/stories/signpost.stories.mdx

@@ -1,4 +1,4 @@
-import {ArgsTable, Canvas, Meta, Story} from '@storybook/addon-docs/blocks';
+import {ArgsTable, Canvas, Meta, Story} from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const signpostDocs = {

web/src/stories/stepper.stories.mdx

@@ -1,4 +1,4 @@
-import {Meta, Preview, Props, Story} from '@storybook/addon-docs/blocks';
+import {Meta, Preview, Props, Story} from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const stepperDocs = {

web/src/stories/summary.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const summaryDocs= { source: { code: `sections := component.SummarySections{}

web/src/stories/table.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const tableDocs= {source: {code: `cols := component.NewTableCols("A", "B")

web/src/stories/terminal.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const terminalDocs= { source: { code: `details := component.TerminalDetails{

web/src/stories/text.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const textDocs= { source: { code: `text := component.NewText("sampleText")`}}

web/src/stories/timeline.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const timelineDocs= {source: {code: `steps := []component.TimelineStep{

web/src/stories/timestamp.stories.mdx

@@ -1,4 +1,4 @@
-import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs/blocks';
+import { Meta, Story, Canvas, ArgsTable } from '@storybook/addon-docs';
 import { argTypesView } from "./helpers/helpers";
 
 export const docs= { source: { code: "timestamp := component.NewTimestamp(time.Unix(1586469079, 0))"} }