From 3dd062fb1483f970c7fcb1eb3ae2950bbb335023 Mon Sep 17 00:00:00 2001 From: Sean Condon Date: Tue, 14 Apr 2020 09:25:00 +0100 Subject: [PATCH] GUI2 Change gui2-fw-lib refs to abs paths Change-Id: Iddc121c70ddf9fa69c8d9f99e9768de6c2143eab --- .../alarmdetails.component.spec.ts | 2 +- .../alarmdetails/alarmdetails.component.ts | 2 +- .../alarmtable/alarmtable.component.spec.ts | 2 +- .../lib/alarmtable/alarmtable.component.ts | 2 +- .../fm-gui2-lib/lib/fm-gui2-lib.module.ts | 2 +- .../web/roadm-gui/lib/port/port.component.ts | 2 +- .../web/roadm-gui/lib/roadm-gui-lib.module.ts | 2 +- .../roadm/roadm.component.disabled.spec.ts | 2 +- .../roadm-gui/lib/roadm/roadm.component.ts | 2 +- .../yang-gui2-lib/lib/yang-gui2-lib.module.ts | 2 +- .../lib/yangdetails/yangdetails.component.ts | 2 +- .../lib/yangtable/yangtable.component.ts | 2 +- web/gui2-fw-lib/BUILD.bazel | 12 +- web/gui2-fw-lib/index.ts | 17 + web/gui2-topo-lib/lib/gui2-topo-lib.module.ts | 2 +- .../backgroundsvg.component.spec.ts | 2 +- .../backgroundsvg/backgroundsvg.component.ts | 2 +- .../draggable/draggable.directive.spec.ts | 2 +- .../forcesvg/draggable/draggable.directive.ts | 2 +- .../layer/forcesvg/forcesvg.component.spec.ts | 2 +- .../lib/layer/forcesvg/forcesvg.component.ts | 2 +- .../models/force-directed-graph.spec.ts | 2 +- .../forcesvg/models/force-directed-graph.ts | 2 +- .../lib/layer/forcesvg/models/node.ts | 2 +- .../devicenodesvg.component.spec.ts | 2 +- .../devicenodesvg/devicenodesvg.component.ts | 2 +- .../hostnodesvg/hostnodesvg.component.spec.ts | 2 +- .../hostnodesvg/hostnodesvg.component.ts | 2 +- .../visuals/linksvg/linksvg.component.spec.ts | 2 +- .../visuals/linksvg/linksvg.component.ts | 2 +- .../lib/layer/mapsvg/mapsvg.component.spec.ts | 2 +- .../lib/layer/mapsvg/mapsvg.component.ts | 2 +- .../nodeviceconnectedsvg.component.spec.ts | 2 +- .../nodeviceconnectedsvg.component.ts | 2 +- web/gui2-topo-lib/lib/layer/viewcontroller.ts | 2 +- web/gui2-topo-lib/lib/layout.service.spec.ts | 2 +- web/gui2-topo-lib/lib/layout.service.ts | 2 +- .../panel/details/details.component.spec.ts | 2 +- .../lib/panel/details/details.component.ts | 2 +- .../panel/instance/instance.component.spec.ts | 2 +- .../lib/panel/instance/instance.component.ts | 2 +- .../mapselector/mapselector.component.spec.ts | 2 +- .../mapselector/mapselector.component.ts | 2 +- .../panel/summary/summary.component.spec.ts | 2 +- .../lib/panel/summary/summary.component.ts | 2 +- .../panel/toolbar/toolbar.component.spec.ts | 2 +- .../lib/panel/toolbar/toolbar.component.ts | 2 +- web/gui2-topo-lib/lib/panel/topopanel.base.ts | 2 +- .../lib/topology.service.spec.ts | 2 +- web/gui2-topo-lib/lib/topology.service.ts | 2 +- .../lib/topology/topology.component.spec.ts | 2 +- .../lib/topology/topology.component.ts | 4 +- web/gui2-topo-lib/lib/traffic.service.spec.ts | 2 +- web/gui2-topo-lib/lib/traffic.service.ts | 2 +- web/gui2/BUILD | 7 +- web/gui2/package.json | 1 - .../main/webapp/app/nav/nav.component.spec.ts | 2 +- .../src/main/webapp/app/nav/nav.component.ts | 2 +- .../main/webapp/app/onos.component.spec.ts | 2 +- .../src/main/webapp/app/onos.component.ts | 2 +- web/gui2/src/main/webapp/app/onos.module.ts | 2 +- .../src/main/webapp/app/onos.service.spec.ts | 2 +- web/gui2/src/main/webapp/app/onos.service.ts | 2 +- .../main/webapp/app/view/apps/apps.module.ts | 2 +- .../app/view/apps/apps/apps.component.ts | 2 +- .../apps/appsdetails/appsdetails.component.ts | 2 +- .../view/cluster/cluster-details.directive.ts | 2 +- .../webapp/app/view/cluster/cluster.module.ts | 2 +- .../view/cluster/cluster/cluster.component.ts | 2 +- .../webapp/app/view/device/device.module.ts | 2 +- .../view/device/device/device.component.ts | 2 +- .../devicedetails/devicedetails.component.ts | 2 +- .../main/webapp/app/view/flow/flow.module.ts | 2 +- .../app/view/flow/flow/flow.component.ts | 2 +- .../flowdetails/flowdetails.component.ts | 2 +- .../webapp/app/view/group/group.module.ts | 2 +- .../app/view/group/group/group.component.ts | 2 +- .../main/webapp/app/view/host/host.module.ts | 2 +- .../app/view/host/host/host.component.ts | 2 +- .../host/hostdetails/hostdetails.component.ts | 2 +- .../webapp/app/view/intent/intent.module.ts | 2 +- .../view/intent/intent/intent.component.ts | 2 +- .../main/webapp/app/view/link/link.module.ts | 2 +- .../app/view/link/link/link.component.ts | 2 +- .../webapp/app/view/meter/meter.module.ts | 2 +- .../app/view/meter/meter/meter.component.ts | 2 +- .../app/view/partition/partition.module.ts | 2 +- .../partition/partition.component.ts | 2 +- .../app/view/pipeconf/pipeconf.module.ts | 2 +- .../pipeconf/pipeconf/pipeconf.component.ts | 2 +- .../pipeconfdetails.component.ts | 2 +- .../main/webapp/app/view/port/port.module.ts | 2 +- .../app/view/port/port/port.component.ts | 2 +- .../port/portdetails/portdetails.component.ts | 2 +- .../app/view/processor/processor.module.ts | 2 +- .../processor/processor.component.ts | 2 +- .../app/view/settings/settings.module.ts | 2 +- .../settings/settings/settings.component.ts | 2 +- .../settingsdetails.component.ts | 2 +- .../webapp/app/view/tunnel/tunnel.module.ts | 2 +- .../view/tunnel/tunnel/tunnel.component.ts | 2 +- web/gui2/tsconfig.json | 2 +- web/gui2/yarn.lock | 299 +++++++++++++++--- 103 files changed, 372 insertions(+), 162 deletions(-) create mode 100644 web/gui2-fw-lib/index.ts diff --git a/apps/faultmanagement/fm-gui2-lib/lib/alarmdetails/alarmdetails.component.spec.ts b/apps/faultmanagement/fm-gui2-lib/lib/alarmdetails/alarmdetails.component.spec.ts index 928c81e788..dd18b8cd2e 100644 --- a/apps/faultmanagement/fm-gui2-lib/lib/alarmdetails/alarmdetails.component.spec.ts +++ b/apps/faultmanagement/fm-gui2-lib/lib/alarmdetails/alarmdetails.component.spec.ts @@ -23,7 +23,7 @@ import { LogService, WebSocketService, IconComponent -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { DebugElement } from '@angular/core'; diff --git a/apps/faultmanagement/fm-gui2-lib/lib/alarmdetails/alarmdetails.component.ts b/apps/faultmanagement/fm-gui2-lib/lib/alarmdetails/alarmdetails.component.ts index 63006839da..5efe0a8c9a 100644 --- a/apps/faultmanagement/fm-gui2-lib/lib/alarmdetails/alarmdetails.component.ts +++ b/apps/faultmanagement/fm-gui2-lib/lib/alarmdetails/alarmdetails.component.ts @@ -21,7 +21,7 @@ import { LogService, DetailsPanelBaseImpl, WebSocketService, -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; /** * ONOS GUI -- Alarm Details Component extends TableBaseImpl diff --git a/apps/faultmanagement/fm-gui2-lib/lib/alarmtable/alarmtable.component.spec.ts b/apps/faultmanagement/fm-gui2-lib/lib/alarmtable/alarmtable.component.spec.ts index 5d95f04511..843bbc6a5c 100644 --- a/apps/faultmanagement/fm-gui2-lib/lib/alarmtable/alarmtable.component.spec.ts +++ b/apps/faultmanagement/fm-gui2-lib/lib/alarmtable/alarmtable.component.spec.ts @@ -25,7 +25,7 @@ import { IconComponent, LogService, TableFilterPipe, LoadingComponent, -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { of } from 'rxjs'; import { } from 'jasmine'; diff --git a/apps/faultmanagement/fm-gui2-lib/lib/alarmtable/alarmtable.component.ts b/apps/faultmanagement/fm-gui2-lib/lib/alarmtable/alarmtable.component.ts index 7298cd247f..1e007a7750 100644 --- a/apps/faultmanagement/fm-gui2-lib/lib/alarmtable/alarmtable.component.ts +++ b/apps/faultmanagement/fm-gui2-lib/lib/alarmtable/alarmtable.component.ts @@ -20,7 +20,7 @@ import { LogService, WebSocketService, SortDir, TableBaseImpl, TableResponse -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; /** * Model of the response from the WebSocket diff --git a/apps/faultmanagement/fm-gui2-lib/lib/fm-gui2-lib.module.ts b/apps/faultmanagement/fm-gui2-lib/lib/fm-gui2-lib.module.ts index 0c4ddcd519..56f47b08a7 100644 --- a/apps/faultmanagement/fm-gui2-lib/lib/fm-gui2-lib.module.ts +++ b/apps/faultmanagement/fm-gui2-lib/lib/fm-gui2-lib.module.ts @@ -19,7 +19,7 @@ import {FormsModule} from '@angular/forms'; import {RouterModule} from '@angular/router'; import { Gui2FwLibModule, -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {AlarmTableComponent} from './alarmtable/alarmtable.component'; import {AlarmDetailsComponent} from './alarmdetails/alarmdetails.component'; diff --git a/apps/roadm/web/roadm-gui/lib/port/port.component.ts b/apps/roadm/web/roadm-gui/lib/port/port.component.ts index 51547b3dfc..128f508175 100644 --- a/apps/roadm/web/roadm-gui/lib/port/port.component.ts +++ b/apps/roadm/web/roadm-gui/lib/port/port.component.ts @@ -21,7 +21,7 @@ import { WebSocketService, IconService, SortDir, TableBaseImpl, TableResponse -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { ActivatedRoute } from '@angular/router'; import {FormGroup, FormControl} from '@angular/forms'; diff --git a/apps/roadm/web/roadm-gui/lib/roadm-gui-lib.module.ts b/apps/roadm/web/roadm-gui/lib/roadm-gui-lib.module.ts index ac23047db8..b007d5cd44 100644 --- a/apps/roadm/web/roadm-gui/lib/roadm-gui-lib.module.ts +++ b/apps/roadm/web/roadm-gui/lib/roadm-gui-lib.module.ts @@ -17,7 +17,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import {RouterModule} from '@angular/router'; -import { Gui2FwLibModule } from 'gui2-fw-lib/public_api'; +import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { RoadmDeviceComponent } from './roadm/roadm.component'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { RoadmPortComponent } from './port/port.component'; diff --git a/apps/roadm/web/roadm-gui/lib/roadm/roadm.component.disabled.spec.ts b/apps/roadm/web/roadm-gui/lib/roadm/roadm.component.disabled.spec.ts index 43b4f9ebc8..32788f0c77 100644 --- a/apps/roadm/web/roadm-gui/lib/roadm/roadm.component.disabled.spec.ts +++ b/apps/roadm/web/roadm-gui/lib/roadm/roadm.component.disabled.spec.ts @@ -25,7 +25,7 @@ import { IconService, LogService, Gui2FwLibModule, -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {FormsModule} from '@angular/forms'; import {RouterTestingModule} from '@angular/router/testing'; diff --git a/apps/roadm/web/roadm-gui/lib/roadm/roadm.component.ts b/apps/roadm/web/roadm-gui/lib/roadm/roadm.component.ts index 112dd1bb42..f616332fb3 100644 --- a/apps/roadm/web/roadm-gui/lib/roadm/roadm.component.ts +++ b/apps/roadm/web/roadm-gui/lib/roadm/roadm.component.ts @@ -20,7 +20,7 @@ import { LogService, WebSocketService, SortDir, TableBaseImpl, TableResponse -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { ActivatedRoute, Router } from '@angular/router'; diff --git a/apps/yang-gui/yang-gui2-lib/lib/yang-gui2-lib.module.ts b/apps/yang-gui/yang-gui2-lib/lib/yang-gui2-lib.module.ts index 2e670d4f62..138c80e67c 100644 --- a/apps/yang-gui/yang-gui2-lib/lib/yang-gui2-lib.module.ts +++ b/apps/yang-gui/yang-gui2-lib/lib/yang-gui2-lib.module.ts @@ -20,7 +20,7 @@ import {FormsModule} from '@angular/forms'; import {RouterModule} from '@angular/router'; import { Gui2FwLibModule, -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {YangTableComponent} from "./yangtable/yangtable.component"; import {YangDetailsComponent} from "./yangdetails/yangdetails.component"; diff --git a/apps/yang-gui/yang-gui2-lib/lib/yangdetails/yangdetails.component.ts b/apps/yang-gui/yang-gui2-lib/lib/yangdetails/yangdetails.component.ts index a7de1397a5..33178b55b7 100644 --- a/apps/yang-gui/yang-gui2-lib/lib/yangdetails/yangdetails.component.ts +++ b/apps/yang-gui/yang-gui2-lib/lib/yangdetails/yangdetails.component.ts @@ -29,7 +29,7 @@ import { LogService, DetailsPanelBaseImpl, WebSocketService, -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; @Component({ selector: 'onos-yangdetails', diff --git a/apps/yang-gui/yang-gui2-lib/lib/yangtable/yangtable.component.ts b/apps/yang-gui/yang-gui2-lib/lib/yangtable/yangtable.component.ts index f47ec8715f..0b39ca2f2a 100644 --- a/apps/yang-gui/yang-gui2-lib/lib/yangtable/yangtable.component.ts +++ b/apps/yang-gui/yang-gui2-lib/lib/yangtable/yangtable.component.ts @@ -15,7 +15,7 @@ */ import {Component, OnInit, OnDestroy, Inject} from '@angular/core'; -import {WebSocketService, LogService, FnService, SortDir, TableBaseImpl} from 'gui2-fw-lib/public_api'; +import {WebSocketService, LogService, FnService, SortDir, TableBaseImpl} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { HttpClient } from '@angular/common/http'; /** diff --git a/web/gui2-fw-lib/BUILD.bazel b/web/gui2-fw-lib/BUILD.bazel index 3a42f63b11..97a86f3e74 100644 --- a/web/gui2-fw-lib/BUILD.bazel +++ b/web/gui2-fw-lib/BUILD.bazel @@ -40,11 +40,10 @@ ng_module( ], ), assets = glob([ - "src/lib/**/*.css", - "src/lib/**/*.html", + "lib/**/*.css", + "lib/**/*.html", ]), - entry_point = ":src/public_api.ts", - module_name = "gui2-fw-lib", + entry_point = ":public_api.ts", tsconfig = "//web/gui2:tsconfig.json", deps = [ "@npm//@angular/animations", @@ -106,7 +105,7 @@ karma_web_test( ], ) -# bazel run //web/gui2-fw-lib:gui2-fw-lib-pkg.pack to create a tgz +# bazel run //web/gui2-fw-lib:npm_package.pack to create a tgz ng_package( name = "npm_package", srcs = ["package.json"], @@ -114,8 +113,7 @@ ng_package( "**/*.css", "**/*.html", ]), - entry_point = ":index.ts", - entry_point_name = "gui2-fw-lib", + entry_point = ":public_api.ts", include_devmode_srcs = False, readme_md = ":README.md", deps = [ diff --git a/web/gui2-fw-lib/index.ts b/web/gui2-fw-lib/index.ts new file mode 100644 index 0000000000..68d937cbc3 --- /dev/null +++ b/web/gui2-fw-lib/index.ts @@ -0,0 +1,17 @@ +/* + * Copyright 2020-present Open Networking Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export * from './public_api'; diff --git a/web/gui2-topo-lib/lib/gui2-topo-lib.module.ts b/web/gui2-topo-lib/lib/gui2-topo-lib.module.ts index 70e262803b..22c896880c 100644 --- a/web/gui2-topo-lib/lib/gui2-topo-lib.module.ts +++ b/web/gui2-topo-lib/lib/gui2-topo-lib.module.ts @@ -22,7 +22,7 @@ import { InstanceComponent } from './panel/instance/instance.component'; import { SummaryComponent } from './panel/summary/summary.component'; import { ToolbarComponent } from './panel/toolbar/toolbar.component'; import { DetailsComponent } from './panel/details/details.component'; -import { Gui2FwLibModule } from 'gui2-fw-lib/public_api'; +import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { BackgroundSvgComponent } from './layer/backgroundsvg/backgroundsvg.component'; import { ForceSvgComponent } from './layer/forcesvg/forcesvg.component'; import { MapSvgComponent } from './layer/mapsvg/mapsvg.component'; diff --git a/web/gui2-topo-lib/lib/layer/backgroundsvg/backgroundsvg.component.spec.ts b/web/gui2-topo-lib/lib/layer/backgroundsvg/backgroundsvg.component.spec.ts index 19025052a1..5c5c4fb731 100644 --- a/web/gui2-topo-lib/lib/layer/backgroundsvg/backgroundsvg.component.spec.ts +++ b/web/gui2-topo-lib/lib/layer/backgroundsvg/backgroundsvg.component.spec.ts @@ -19,7 +19,7 @@ import { BackgroundSvgComponent } from './backgroundsvg.component'; import {MapSvgComponent, TopoData} from '../mapsvg/mapsvg.component'; import {from} from 'rxjs'; import {HttpClient} from '@angular/common/http'; -import {LocMeta, LogService, ZoomUtils} from 'gui2-fw-lib/public_api'; +import {LocMeta, LogService, ZoomUtils} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {MapObject} from '../maputils'; import {ForceSvgComponent} from '../forcesvg/forcesvg.component'; diff --git a/web/gui2-topo-lib/lib/layer/backgroundsvg/backgroundsvg.component.ts b/web/gui2-topo-lib/lib/layer/backgroundsvg/backgroundsvg.component.ts index f985cad83d..6a2439dfdb 100644 --- a/web/gui2-topo-lib/lib/layer/backgroundsvg/backgroundsvg.component.ts +++ b/web/gui2-topo-lib/lib/layer/backgroundsvg/backgroundsvg.component.ts @@ -15,7 +15,7 @@ */ import {Component, EventEmitter, Input, Output} from '@angular/core'; import {MapObject} from '../maputils'; -import {MapBounds, TopoZoomPrefs, LogService, ZoomUtils} from 'gui2-fw-lib/public_api'; +import {MapBounds, TopoZoomPrefs, LogService, ZoomUtils} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; /** * model of the topo2CurrentLayout attrs from BgZoom below diff --git a/web/gui2-topo-lib/lib/layer/forcesvg/draggable/draggable.directive.spec.ts b/web/gui2-topo-lib/lib/layer/forcesvg/draggable/draggable.directive.spec.ts index a2015efc63..136fb6b5e9 100644 --- a/web/gui2-topo-lib/lib/layer/forcesvg/draggable/draggable.directive.spec.ts +++ b/web/gui2-topo-lib/lib/layer/forcesvg/draggable/draggable.directive.spec.ts @@ -16,7 +16,7 @@ import { DraggableDirective } from './draggable.directive'; import {inject, TestBed} from '@angular/core/testing'; import {ElementRef} from '@angular/core'; -import {LogService} from 'gui2-fw-lib/public_api'; +import {LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; export class MockElementRef extends ElementRef { nativeElement = {}; diff --git a/web/gui2-topo-lib/lib/layer/forcesvg/draggable/draggable.directive.ts b/web/gui2-topo-lib/lib/layer/forcesvg/draggable/draggable.directive.ts index c8c4643289..d5248b02ce 100644 --- a/web/gui2-topo-lib/lib/layer/forcesvg/draggable/draggable.directive.ts +++ b/web/gui2-topo-lib/lib/layer/forcesvg/draggable/draggable.directive.ts @@ -22,7 +22,7 @@ import { } from '@angular/core'; import {ForceDirectedGraph, Node} from '../models'; import * as d3 from 'd3'; -import {LogService, MetaUi, ZoomUtils} from 'gui2-fw-lib/public_api'; +import {LogService, MetaUi, ZoomUtils} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {BackgroundSvgComponent} from '../../backgroundsvg/backgroundsvg.component'; @Directive({ diff --git a/web/gui2-topo-lib/lib/layer/forcesvg/forcesvg.component.spec.ts b/web/gui2-topo-lib/lib/layer/forcesvg/forcesvg.component.spec.ts index 81fe7cee17..ba9c996ab9 100644 --- a/web/gui2-topo-lib/lib/layer/forcesvg/forcesvg.component.spec.ts +++ b/web/gui2-topo-lib/lib/layer/forcesvg/forcesvg.component.spec.ts @@ -22,7 +22,7 @@ import { LogService, SvgUtilService, UrlFnService, WebSocketService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {DraggableDirective} from './draggable/draggable.directive'; import {ActivatedRoute, Params} from '@angular/router'; import {of} from 'rxjs'; diff --git a/web/gui2-topo-lib/lib/layer/forcesvg/forcesvg.component.ts b/web/gui2-topo-lib/lib/layer/forcesvg/forcesvg.component.ts index e824e2060f..dc67bc242d 100644 --- a/web/gui2-topo-lib/lib/layer/forcesvg/forcesvg.component.ts +++ b/web/gui2-topo-lib/lib/layer/forcesvg/forcesvg.component.ts @@ -28,7 +28,7 @@ import { SimpleChanges, ViewChildren } from '@angular/core'; -import {LocMeta, LogService, MetaUi, WebSocketService, ZoomUtils} from 'gui2-fw-lib/public_api'; +import {LocMeta, LogService, MetaUi, WebSocketService, ZoomUtils} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { Badge, Device, DeviceHighlight, diff --git a/web/gui2-topo-lib/lib/layer/forcesvg/models/force-directed-graph.spec.ts b/web/gui2-topo-lib/lib/layer/forcesvg/models/force-directed-graph.spec.ts index 876cab5fca..76630cc5f0 100644 --- a/web/gui2-topo-lib/lib/layer/forcesvg/models/force-directed-graph.spec.ts +++ b/web/gui2-topo-lib/lib/layer/forcesvg/models/force-directed-graph.spec.ts @@ -16,7 +16,7 @@ import {ForceDirectedGraph, Options} from './force-directed-graph'; import {Node} from './node'; import {Link} from './link'; -import {LogService} from 'gui2-fw-lib/public_api'; +import {LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {TestBed} from '@angular/core/testing'; export class TestNode extends Node { diff --git a/web/gui2-topo-lib/lib/layer/forcesvg/models/force-directed-graph.ts b/web/gui2-topo-lib/lib/layer/forcesvg/models/force-directed-graph.ts index 2f316cbcd8..3407482e14 100644 --- a/web/gui2-topo-lib/lib/layer/forcesvg/models/force-directed-graph.ts +++ b/web/gui2-topo-lib/lib/layer/forcesvg/models/force-directed-graph.ts @@ -17,7 +17,7 @@ import { EventEmitter } from '@angular/core'; import { Link } from './link'; import { Node } from './node'; import * as d3 from 'd3-force'; -import {LogService} from 'gui2-fw-lib/public_api'; +import {LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; const FORCES = { COLLISION: 1, diff --git a/web/gui2-topo-lib/lib/layer/forcesvg/models/node.ts b/web/gui2-topo-lib/lib/layer/forcesvg/models/node.ts index 6a47ce3e77..f39b0e3da4 100644 --- a/web/gui2-topo-lib/lib/layer/forcesvg/models/node.ts +++ b/web/gui2-topo-lib/lib/layer/forcesvg/models/node.ts @@ -16,7 +16,7 @@ import * as d3 from 'd3'; import {LocationType} from '../../backgroundsvg/backgroundsvg.component'; import {LayerType, Location, NodeType, RegionProps} from './regions'; -import {LocMeta, MetaUi, ZoomUtils} from 'gui2-fw-lib/public_api'; +import {LocMeta, MetaUi, ZoomUtils} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; export interface UiElement { index?: number; diff --git a/web/gui2-topo-lib/lib/layer/forcesvg/visuals/devicenodesvg/devicenodesvg.component.spec.ts b/web/gui2-topo-lib/lib/layer/forcesvg/visuals/devicenodesvg/devicenodesvg.component.spec.ts index cd53c5fa17..d9ee960aec 100644 --- a/web/gui2-topo-lib/lib/layer/forcesvg/visuals/devicenodesvg/devicenodesvg.component.spec.ts +++ b/web/gui2-topo-lib/lib/layer/forcesvg/visuals/devicenodesvg/devicenodesvg.component.spec.ts @@ -16,7 +16,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { DeviceNodeSvgComponent } from './devicenodesvg.component'; -import {FnService, IconService, LogService, SvgUtilService} from 'gui2-fw-lib/public_api'; +import {FnService, IconService, LogService, SvgUtilService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {ActivatedRoute, Params} from '@angular/router'; import {of} from 'rxjs'; import {ChangeDetectorRef} from '@angular/core'; diff --git a/web/gui2-topo-lib/lib/layer/forcesvg/visuals/devicenodesvg/devicenodesvg.component.ts b/web/gui2-topo-lib/lib/layer/forcesvg/visuals/devicenodesvg/devicenodesvg.component.ts index a41804ce41..2079003c7e 100644 --- a/web/gui2-topo-lib/lib/layer/forcesvg/visuals/devicenodesvg/devicenodesvg.component.ts +++ b/web/gui2-topo-lib/lib/layer/forcesvg/visuals/devicenodesvg/devicenodesvg.component.ts @@ -27,7 +27,7 @@ import { Device, LabelToggle, } from '../../models'; -import {IconService, LogService, SvgUtilService} from 'gui2-fw-lib/public_api'; +import {IconService, LogService, SvgUtilService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {NodeVisual, SelectedEvent} from '../nodevisual'; import {animate, state, style, transition, trigger} from '@angular/animations'; import {TopologyService} from '../../../../topology.service'; diff --git a/web/gui2-topo-lib/lib/layer/forcesvg/visuals/hostnodesvg/hostnodesvg.component.spec.ts b/web/gui2-topo-lib/lib/layer/forcesvg/visuals/hostnodesvg/hostnodesvg.component.spec.ts index ab5fff076d..08412b4d5b 100644 --- a/web/gui2-topo-lib/lib/layer/forcesvg/visuals/hostnodesvg/hostnodesvg.component.spec.ts +++ b/web/gui2-topo-lib/lib/layer/forcesvg/visuals/hostnodesvg/hostnodesvg.component.spec.ts @@ -18,7 +18,7 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing'; import {HostNodeSvgComponent} from './hostnodesvg.component'; import {ActivatedRoute, Params} from '@angular/router'; import {of} from 'rxjs'; -import {LogService} from 'gui2-fw-lib/public_api'; +import {LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {Host, HostLabelToggle} from '../../models'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {ChangeDetectorRef} from '@angular/core'; diff --git a/web/gui2-topo-lib/lib/layer/forcesvg/visuals/hostnodesvg/hostnodesvg.component.ts b/web/gui2-topo-lib/lib/layer/forcesvg/visuals/hostnodesvg/hostnodesvg.component.ts index dc132d73e6..8940f3702f 100644 --- a/web/gui2-topo-lib/lib/layer/forcesvg/visuals/hostnodesvg/hostnodesvg.component.ts +++ b/web/gui2-topo-lib/lib/layer/forcesvg/visuals/hostnodesvg/hostnodesvg.component.ts @@ -22,7 +22,7 @@ import { SimpleChanges } from '@angular/core'; import {Badge, Host, HostLabelToggle, Node} from '../../models'; -import {LogService} from 'gui2-fw-lib/public_api'; +import {LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {NodeVisual, SelectedEvent} from '../nodevisual'; /** diff --git a/web/gui2-topo-lib/lib/layer/forcesvg/visuals/linksvg/linksvg.component.spec.ts b/web/gui2-topo-lib/lib/layer/forcesvg/visuals/linksvg/linksvg.component.spec.ts index 11bc4644dc..644ceac02f 100644 --- a/web/gui2-topo-lib/lib/layer/forcesvg/visuals/linksvg/linksvg.component.spec.ts +++ b/web/gui2-topo-lib/lib/layer/forcesvg/visuals/linksvg/linksvg.component.spec.ts @@ -16,7 +16,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { LinkSvgComponent } from './linksvg.component'; -import {LogService} from 'gui2-fw-lib/public_api'; +import {LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {ActivatedRoute, Params} from '@angular/router'; import {of} from 'rxjs'; import {Device, Link, RegionLink, LinkType} from '../../models'; diff --git a/web/gui2-topo-lib/lib/layer/forcesvg/visuals/linksvg/linksvg.component.ts b/web/gui2-topo-lib/lib/layer/forcesvg/visuals/linksvg/linksvg.component.ts index 6e1d2198ed..f154e31ff1 100644 --- a/web/gui2-topo-lib/lib/layer/forcesvg/visuals/linksvg/linksvg.component.ts +++ b/web/gui2-topo-lib/lib/layer/forcesvg/visuals/linksvg/linksvg.component.ts @@ -19,7 +19,7 @@ import { Input, OnChanges, Output, SimpleChanges, } from '@angular/core'; import {Link, LinkHighlight, UiElement} from '../../models'; -import {LogService} from 'gui2-fw-lib/public_api'; +import {LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {NodeVisual, SelectedEvent} from '../nodevisual'; import {animate, state, style, transition, trigger} from '@angular/animations'; diff --git a/web/gui2-topo-lib/lib/layer/mapsvg/mapsvg.component.spec.ts b/web/gui2-topo-lib/lib/layer/mapsvg/mapsvg.component.spec.ts index b2cca6f86b..5796ea927a 100644 --- a/web/gui2-topo-lib/lib/layer/mapsvg/mapsvg.component.spec.ts +++ b/web/gui2-topo-lib/lib/layer/mapsvg/mapsvg.component.spec.ts @@ -18,7 +18,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { MapSvgComponent } from './mapsvg.component'; import {HttpClient} from '@angular/common/http'; import {from} from 'rxjs'; -import {LogService} from 'gui2-fw-lib/public_api'; +import {LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; class MockHttpClient { get() { diff --git a/web/gui2-topo-lib/lib/layer/mapsvg/mapsvg.component.ts b/web/gui2-topo-lib/lib/layer/mapsvg/mapsvg.component.ts index 28ece5e246..b036d8304e 100644 --- a/web/gui2-topo-lib/lib/layer/mapsvg/mapsvg.component.ts +++ b/web/gui2-topo-lib/lib/layer/mapsvg/mapsvg.component.ts @@ -20,7 +20,7 @@ import { SimpleChanges } from '@angular/core'; import { MapObject } from '../maputils'; -import {LogService, MapBounds} from 'gui2-fw-lib/public_api'; +import {LogService, MapBounds} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {HttpClient} from '@angular/common/http'; import * as d3 from 'd3'; import * as topojson from 'topojson-client'; diff --git a/web/gui2-topo-lib/lib/layer/nodeviceconnectedsvg/nodeviceconnectedsvg.component.spec.ts b/web/gui2-topo-lib/lib/layer/nodeviceconnectedsvg/nodeviceconnectedsvg.component.spec.ts index 494bed5762..e9735f04f1 100644 --- a/web/gui2-topo-lib/lib/layer/nodeviceconnectedsvg/nodeviceconnectedsvg.component.spec.ts +++ b/web/gui2-topo-lib/lib/layer/nodeviceconnectedsvg/nodeviceconnectedsvg.component.spec.ts @@ -27,7 +27,7 @@ import { TableFilterPipe, IconComponent, WebSocketService, SvgUtilService, PrefsService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { of } from 'rxjs'; class MockActivatedRoute extends ActivatedRoute { diff --git a/web/gui2-topo-lib/lib/layer/nodeviceconnectedsvg/nodeviceconnectedsvg.component.ts b/web/gui2-topo-lib/lib/layer/nodeviceconnectedsvg/nodeviceconnectedsvg.component.ts index 24e3af140f..fe3fafdcb2 100644 --- a/web/gui2-topo-lib/lib/layer/nodeviceconnectedsvg/nodeviceconnectedsvg.component.ts +++ b/web/gui2-topo-lib/lib/layer/nodeviceconnectedsvg/nodeviceconnectedsvg.component.ts @@ -27,7 +27,7 @@ import { LogService, PrefsService, SvgUtilService, LionService, ZoomUtils, TopoZoomPrefs -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; /** * ONOS GUI -- Topology No Connected Devices View. diff --git a/web/gui2-topo-lib/lib/layer/viewcontroller.ts b/web/gui2-topo-lib/lib/layer/viewcontroller.ts index 8f4bac6d33..0410f87f43 100644 --- a/web/gui2-topo-lib/lib/layer/viewcontroller.ts +++ b/web/gui2-topo-lib/lib/layer/viewcontroller.ts @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { FnService, LogService, PrefsService } from 'gui2-fw-lib/public_api'; +import { FnService, LogService, PrefsService } from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; export interface ViewControllerPrefs { visible: string; diff --git a/web/gui2-topo-lib/lib/layout.service.spec.ts b/web/gui2-topo-lib/lib/layout.service.spec.ts index 943404ee7e..14ad396fcf 100644 --- a/web/gui2-topo-lib/lib/layout.service.spec.ts +++ b/web/gui2-topo-lib/lib/layout.service.spec.ts @@ -18,7 +18,7 @@ import { TestBed } from '@angular/core/testing'; import { LayoutService } from './layout.service'; import {ActivatedRoute, Params} from '@angular/router'; import {of} from 'rxjs'; -import {FnService, LogService} from 'gui2-fw-lib/public_api'; +import {FnService, LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; class MockActivatedRoute extends ActivatedRoute { constructor(params: Params) { diff --git a/web/gui2-topo-lib/lib/layout.service.ts b/web/gui2-topo-lib/lib/layout.service.ts index f3d5c52e94..a09c04ee8b 100644 --- a/web/gui2-topo-lib/lib/layout.service.ts +++ b/web/gui2-topo-lib/lib/layout.service.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { Injectable } from '@angular/core'; -import {LogService, WebSocketService} from 'gui2-fw-lib/public_api'; +import {LogService, WebSocketService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; export enum LayoutType { LAYOUT_DEFAULT = 'default', diff --git a/web/gui2-topo-lib/lib/panel/details/details.component.spec.ts b/web/gui2-topo-lib/lib/panel/details/details.component.spec.ts index e1db5fd46c..f49673997f 100644 --- a/web/gui2-topo-lib/lib/panel/details/details.component.spec.ts +++ b/web/gui2-topo-lib/lib/panel/details/details.component.spec.ts @@ -22,7 +22,7 @@ import { DetailsComponent } from './details.component'; import { FnService, LionService, LogService, IconComponent -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {RouterTestingModule} from '@angular/router/testing'; class MockActivatedRoute extends ActivatedRoute { diff --git a/web/gui2-topo-lib/lib/panel/details/details.component.ts b/web/gui2-topo-lib/lib/panel/details/details.component.ts index ce2116b0d0..e20f9fd779 100644 --- a/web/gui2-topo-lib/lib/panel/details/details.component.ts +++ b/web/gui2-topo-lib/lib/panel/details/details.component.ts @@ -15,7 +15,7 @@ */ import {Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges} from '@angular/core'; import {animate, state, style, transition, trigger} from '@angular/animations'; -import {DetailsPanelBaseImpl, FnService, LionService, LogService, WebSocketService} from 'gui2-fw-lib/public_api'; +import {DetailsPanelBaseImpl, FnService, LionService, LogService, WebSocketService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {Host, Link, LinkType, NodeType, UiElement} from '../../layer/forcesvg/models'; import {Params, Router} from '@angular/router'; diff --git a/web/gui2-topo-lib/lib/panel/instance/instance.component.spec.ts b/web/gui2-topo-lib/lib/panel/instance/instance.component.spec.ts index b53adfe951..170c04bac6 100644 --- a/web/gui2-topo-lib/lib/panel/instance/instance.component.spec.ts +++ b/web/gui2-topo-lib/lib/panel/instance/instance.component.spec.ts @@ -22,7 +22,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { FnService, LogService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; class MockActivatedRoute extends ActivatedRoute { constructor(params: Params) { diff --git a/web/gui2-topo-lib/lib/panel/instance/instance.component.ts b/web/gui2-topo-lib/lib/panel/instance/instance.component.ts index 4fe97ba519..1dbcd7fd0c 100644 --- a/web/gui2-topo-lib/lib/panel/instance/instance.component.ts +++ b/web/gui2-topo-lib/lib/panel/instance/instance.component.ts @@ -26,7 +26,7 @@ import { PanelBaseImpl, IconService, SvgUtilService, LionService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; /** * A model of instance information that drives each panel diff --git a/web/gui2-topo-lib/lib/panel/mapselector/mapselector.component.spec.ts b/web/gui2-topo-lib/lib/panel/mapselector/mapselector.component.spec.ts index 72caea7ce5..87affe153a 100644 --- a/web/gui2-topo-lib/lib/panel/mapselector/mapselector.component.spec.ts +++ b/web/gui2-topo-lib/lib/panel/mapselector/mapselector.component.spec.ts @@ -19,7 +19,7 @@ import { MapSelectorComponent } from './mapselector.component'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {ActivatedRoute, Params} from '@angular/router'; import {of} from 'rxjs'; -import {FnService, LogService} from 'gui2-fw-lib/public_api'; +import {FnService, LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; class MockActivatedRoute extends ActivatedRoute { constructor(params: Params) { diff --git a/web/gui2-topo-lib/lib/panel/mapselector/mapselector.component.ts b/web/gui2-topo-lib/lib/panel/mapselector/mapselector.component.ts index 1b1b9387aa..a2ae6300f2 100644 --- a/web/gui2-topo-lib/lib/panel/mapselector/mapselector.component.ts +++ b/web/gui2-topo-lib/lib/panel/mapselector/mapselector.component.ts @@ -10,7 +10,7 @@ import { LionService, LogService, WebSocketService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {FormControl, FormGroup} from '@angular/forms'; import { MapObject } from '../../layer/maputils'; diff --git a/web/gui2-topo-lib/lib/panel/summary/summary.component.spec.ts b/web/gui2-topo-lib/lib/panel/summary/summary.component.spec.ts index e26ea2a11e..c246428757 100644 --- a/web/gui2-topo-lib/lib/panel/summary/summary.component.spec.ts +++ b/web/gui2-topo-lib/lib/panel/summary/summary.component.spec.ts @@ -22,7 +22,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { FnService, LogService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; class MockActivatedRoute extends ActivatedRoute { constructor(params: Params) { diff --git a/web/gui2-topo-lib/lib/panel/summary/summary.component.ts b/web/gui2-topo-lib/lib/panel/summary/summary.component.ts index 0eede5b5b7..036e3bfdba 100644 --- a/web/gui2-topo-lib/lib/panel/summary/summary.component.ts +++ b/web/gui2-topo-lib/lib/panel/summary/summary.component.ts @@ -28,7 +28,7 @@ import { FnService, WebSocketService, GlyphService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; export interface SummaryResponse { title: string; diff --git a/web/gui2-topo-lib/lib/panel/toolbar/toolbar.component.spec.ts b/web/gui2-topo-lib/lib/panel/toolbar/toolbar.component.spec.ts index 79a4c6d488..41c192510f 100644 --- a/web/gui2-topo-lib/lib/panel/toolbar/toolbar.component.spec.ts +++ b/web/gui2-topo-lib/lib/panel/toolbar/toolbar.component.spec.ts @@ -21,7 +21,7 @@ import { ToolbarComponent } from './toolbar.component'; import { FnService, LionService, LogService, IconComponent -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; class MockActivatedRoute extends ActivatedRoute { diff --git a/web/gui2-topo-lib/lib/panel/toolbar/toolbar.component.ts b/web/gui2-topo-lib/lib/panel/toolbar/toolbar.component.ts index d53720e2e5..a5e5025db7 100644 --- a/web/gui2-topo-lib/lib/panel/toolbar/toolbar.component.ts +++ b/web/gui2-topo-lib/lib/panel/toolbar/toolbar.component.ts @@ -18,7 +18,7 @@ import { LogService, FnService, PanelBaseImpl, LionService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {animate, state, style, transition, trigger} from '@angular/animations'; diff --git a/web/gui2-topo-lib/lib/panel/topopanel.base.ts b/web/gui2-topo-lib/lib/panel/topopanel.base.ts index 3915c24da7..40864ca1df 100644 --- a/web/gui2-topo-lib/lib/panel/topopanel.base.ts +++ b/web/gui2-topo-lib/lib/panel/topopanel.base.ts @@ -17,7 +17,7 @@ import { FnService, LogService, PanelBaseImpl -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; /** * Base model of panel view - implemented by Topology Panel components diff --git a/web/gui2-topo-lib/lib/topology.service.spec.ts b/web/gui2-topo-lib/lib/topology.service.spec.ts index 72832de00c..f5a768074a 100644 --- a/web/gui2-topo-lib/lib/topology.service.spec.ts +++ b/web/gui2-topo-lib/lib/topology.service.spec.ts @@ -21,7 +21,7 @@ import { TopologyService } from './topology.service'; import { LogService, FnService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; class MockActivatedRoute extends ActivatedRoute { constructor(params: Params) { diff --git a/web/gui2-topo-lib/lib/topology.service.ts b/web/gui2-topo-lib/lib/topology.service.ts index c2beae7857..dcf4c890eb 100644 --- a/web/gui2-topo-lib/lib/topology.service.ts +++ b/web/gui2-topo-lib/lib/topology.service.ts @@ -16,7 +16,7 @@ import {Injectable, SimpleChange} from '@angular/core'; import { LogService, WebSocketService, -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {Instance, InstanceComponent} from './panel/instance/instance.component'; import { BackgroundSvgComponent } from './layer/backgroundsvg/backgroundsvg.component'; import { ForceSvgComponent } from './layer/forcesvg/forcesvg.component'; diff --git a/web/gui2-topo-lib/lib/topology/topology.component.spec.ts b/web/gui2-topo-lib/lib/topology/topology.component.spec.ts index af96483d9c..2e41858132 100644 --- a/web/gui2-topo-lib/lib/topology/topology.component.spec.ts +++ b/web/gui2-topo-lib/lib/topology/topology.component.spec.ts @@ -35,7 +35,7 @@ import { FnService, LogService, IconService, IconComponent, PrefsService, KeysService, LionService, ZoomableDirective -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {RouterTestingModule} from '@angular/router/testing'; import {TrafficService} from '../traffic.service'; import {ForceSvgComponent} from '../layer/forcesvg/forcesvg.component'; diff --git a/web/gui2-topo-lib/lib/topology/topology.component.ts b/web/gui2-topo-lib/lib/topology/topology.component.ts index 0a3ae5ac0b..10f961b278 100644 --- a/web/gui2-topo-lib/lib/topology/topology.component.ts +++ b/web/gui2-topo-lib/lib/topology/topology.component.ts @@ -33,7 +33,7 @@ import { TopoZoomPrefs, WebSocketService, ZoomUtils -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {InstanceComponent} from '../panel/instance/instance.component'; import {DetailsComponent} from '../panel/details/details.component'; import {BackgroundSvgComponent} from '../layer/backgroundsvg/backgroundsvg.component'; @@ -67,7 +67,7 @@ import { ALARMS_TOGGLE } from '../panel/toolbar/toolbar.component'; import {TrafficService, TrafficType} from '../traffic.service'; -import {ZoomableDirective} from 'gui2-fw-lib/public_api'; +import {ZoomableDirective} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {MapObject} from '../layer/maputils'; import {LayoutService, LayoutType} from '../layout.service'; import {SelectedEvent} from '../layer/forcesvg/visuals/nodevisual'; diff --git a/web/gui2-topo-lib/lib/traffic.service.spec.ts b/web/gui2-topo-lib/lib/traffic.service.spec.ts index e15f8a513d..0203e27f47 100644 --- a/web/gui2-topo-lib/lib/traffic.service.spec.ts +++ b/web/gui2-topo-lib/lib/traffic.service.spec.ts @@ -16,7 +16,7 @@ import { TestBed } from '@angular/core/testing'; import { TrafficService } from './traffic.service'; -import {FnService, LogService} from 'gui2-fw-lib/public_api'; +import {FnService, LogService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {ActivatedRoute, Params} from '@angular/router'; import {of} from 'rxjs'; diff --git a/web/gui2-topo-lib/lib/traffic.service.ts b/web/gui2-topo-lib/lib/traffic.service.ts index 8cc6070964..96f4583628 100644 --- a/web/gui2-topo-lib/lib/traffic.service.ts +++ b/web/gui2-topo-lib/lib/traffic.service.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { Injectable } from '@angular/core'; -import {LogService, WebSocketService} from 'gui2-fw-lib/public_api'; +import {LogService, WebSocketService} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {ForceSvgComponent} from './layer/forcesvg/forcesvg.component'; export namespace TrafficType { diff --git a/web/gui2/BUILD b/web/gui2/BUILD index 3fdc59d24b..7ecf797ea1 100644 --- a/web/gui2/BUILD +++ b/web/gui2/BUILD @@ -42,9 +42,10 @@ TEST_DEPS = TEST + [ # This export allows targets in other packages to reference files that live # in this package. # TODO Try to move this in to /web/gui2-fw-lib when possible -exports_files([ - "tsconfig.json", -]) +exports_files( + ["tsconfig.json"], + visibility = ["//visibility:public"], +) ts_config( name = "tsconfig-test", diff --git a/web/gui2/package.json b/web/gui2/package.json index 7fa3474d4a..c995fc2d9d 100644 --- a/web/gui2/package.json +++ b/web/gui2/package.json @@ -51,7 +51,6 @@ "rollup": "^1.21.4", "rollup-plugin-commonjs": "^10.1.0", "rollup-plugin-node-resolve": "^5.2.0", - "rollup-plugin-sourcemaps": "~0.5.0", "terser": "4.3.1", "typescript": "3.8.3" } diff --git a/web/gui2/src/main/webapp/app/nav/nav.component.spec.ts b/web/gui2/src/main/webapp/app/nav/nav.component.spec.ts index 126d4e2fcf..572482db61 100644 --- a/web/gui2/src/main/webapp/app/nav/nav.component.spec.ts +++ b/web/gui2/src/main/webapp/app/nav/nav.component.spec.ts @@ -28,7 +28,7 @@ import { IconService, LionService, LogService, - NavService } from 'gui2-fw-lib/public_api'; + NavService } from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { NavComponent } from './nav.component'; class MockActivatedRoute extends ActivatedRoute { diff --git a/web/gui2/src/main/webapp/app/nav/nav.component.ts b/web/gui2/src/main/webapp/app/nav/nav.component.ts index 95808b2f60..57bc25fbd3 100644 --- a/web/gui2/src/main/webapp/app/nav/nav.component.ts +++ b/web/gui2/src/main/webapp/app/nav/nav.component.ts @@ -20,7 +20,7 @@ import { LionService, LogService, NavService, -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; /** * ONOS GUI -- Navigation Module diff --git a/web/gui2/src/main/webapp/app/onos.component.spec.ts b/web/gui2/src/main/webapp/app/onos.component.spec.ts index 4937618794..aa2bec10c7 100644 --- a/web/gui2/src/main/webapp/app/onos.component.spec.ts +++ b/web/gui2/src/main/webapp/app/onos.component.spec.ts @@ -40,7 +40,7 @@ import { ThemeService, WebSocketService, WsOptions -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; class MockActivatedRoute extends ActivatedRoute { constructor(params: Params) { diff --git a/web/gui2/src/main/webapp/app/onos.component.ts b/web/gui2/src/main/webapp/app/onos.component.ts index 30c4d2b2ad..6d65b759e2 100644 --- a/web/gui2/src/main/webapp/app/onos.component.ts +++ b/web/gui2/src/main/webapp/app/onos.component.ts @@ -30,7 +30,7 @@ import { WebSocketService, WsOptions, KeysService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { OnosService, View } from './onos.service'; // secret sauce diff --git a/web/gui2/src/main/webapp/app/onos.module.ts b/web/gui2/src/main/webapp/app/onos.module.ts index f7b1a3ccfb..0b6f4cb3bb 100644 --- a/web/gui2/src/main/webapp/app/onos.module.ts +++ b/web/gui2/src/main/webapp/app/onos.module.ts @@ -25,7 +25,7 @@ import { Gui2FwLibModule, ConsoleLoggerService, LogService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { OnosService } from './onos.service'; /** diff --git a/web/gui2/src/main/webapp/app/onos.service.spec.ts b/web/gui2/src/main/webapp/app/onos.service.spec.ts index 26e7193651..c7729a21a2 100644 --- a/web/gui2/src/main/webapp/app/onos.service.spec.ts +++ b/web/gui2/src/main/webapp/app/onos.service.spec.ts @@ -15,7 +15,7 @@ */ import { TestBed, inject } from '@angular/core/testing'; -import { LogService, ConsoleLoggerService } from 'gui2-fw-lib/public_api'; +import { LogService, ConsoleLoggerService } from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { OnosService } from './onos.service'; /** diff --git a/web/gui2/src/main/webapp/app/onos.service.ts b/web/gui2/src/main/webapp/app/onos.service.ts index ef34c22678..1159eadedc 100644 --- a/web/gui2/src/main/webapp/app/onos.service.ts +++ b/web/gui2/src/main/webapp/app/onos.service.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import {Inject, Injectable} from '@angular/core'; -import { LogService } from 'gui2-fw-lib/public_api'; +import { LogService } from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; /** * A structure of View elements for the OnosService diff --git a/web/gui2/src/main/webapp/app/view/apps/apps.module.ts b/web/gui2/src/main/webapp/app/view/apps/apps.module.ts index cc34c580bd..c31df7c479 100644 --- a/web/gui2/src/main/webapp/app/view/apps/apps.module.ts +++ b/web/gui2/src/main/webapp/app/view/apps/apps.module.ts @@ -19,7 +19,7 @@ import { FormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; import { AppsComponent } from './apps/apps.component'; import { AppsDetailsComponent } from './appsdetails/appsdetails.component'; -import { Gui2FwLibModule } from 'gui2-fw-lib/public_api'; +import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; /** * ONOS GUI -- Apps View Module diff --git a/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.ts b/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.ts index 7760d22c55..4568a68a5b 100644 --- a/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.ts +++ b/web/gui2/src/main/webapp/app/view/apps/apps/apps.component.ts @@ -24,7 +24,7 @@ import { TableBaseImpl, TableResponse, SortDir, UrlFnService, WebSocketService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; const INSTALLED = 'INSTALLED'; const ACTIVE = 'ACTIVE'; diff --git a/web/gui2/src/main/webapp/app/view/apps/appsdetails/appsdetails.component.ts b/web/gui2/src/main/webapp/app/view/apps/appsdetails/appsdetails.component.ts index bee217bea1..f95fd77c44 100644 --- a/web/gui2/src/main/webapp/app/view/apps/appsdetails/appsdetails.component.ts +++ b/web/gui2/src/main/webapp/app/view/apps/appsdetails/appsdetails.component.ts @@ -21,7 +21,7 @@ import { LogService, DetailsPanelBaseImpl, WebSocketService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { App, APPURLPREFIX, ICONURLSUFFIX } from '../apps/apps.component'; diff --git a/web/gui2/src/main/webapp/app/view/cluster/cluster-details.directive.ts b/web/gui2/src/main/webapp/app/view/cluster/cluster-details.directive.ts index 7363788f9f..db0b1e129d 100644 --- a/web/gui2/src/main/webapp/app/view/cluster/cluster-details.directive.ts +++ b/web/gui2/src/main/webapp/app/view/cluster/cluster-details.directive.ts @@ -23,7 +23,7 @@ import { LionService, PanelService, WebSocketService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import * as d3 from 'd3'; import {HostListener} from '@angular/core'; diff --git a/web/gui2/src/main/webapp/app/view/cluster/cluster.module.ts b/web/gui2/src/main/webapp/app/view/cluster/cluster.module.ts index adf7d412a8..7957c91bf1 100644 --- a/web/gui2/src/main/webapp/app/view/cluster/cluster.module.ts +++ b/web/gui2/src/main/webapp/app/view/cluster/cluster.module.ts @@ -15,7 +15,7 @@ */ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { Gui2FwLibModule } from 'gui2-fw-lib/public_api'; +import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { ClusterComponent } from './cluster/cluster.component'; import { ClusterDetailsDirective } from './cluster-details.directive'; import {RouterModule} from '@angular/router'; diff --git a/web/gui2/src/main/webapp/app/view/cluster/cluster/cluster.component.ts b/web/gui2/src/main/webapp/app/view/cluster/cluster/cluster.component.ts index 9b42c12860..d76dfae864 100644 --- a/web/gui2/src/main/webapp/app/view/cluster/cluster/cluster.component.ts +++ b/web/gui2/src/main/webapp/app/view/cluster/cluster/cluster.component.ts @@ -20,7 +20,7 @@ import { WebSocketService, LionService, SortDir, TableBaseImpl, TableResponse -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; /** * Model of the response from WebSocket diff --git a/web/gui2/src/main/webapp/app/view/device/device.module.ts b/web/gui2/src/main/webapp/app/view/device/device.module.ts index 535b8bb80f..9499623f95 100644 --- a/web/gui2/src/main/webapp/app/view/device/device.module.ts +++ b/web/gui2/src/main/webapp/app/view/device/device.module.ts @@ -17,7 +17,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; import { DeviceComponent } from './device/device.component'; -import { Gui2FwLibModule } from 'gui2-fw-lib/public_api'; +import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { FormsModule } from '@angular/forms'; import { DeviceDetailsComponent } from './devicedetails/devicedetails.component'; diff --git a/web/gui2/src/main/webapp/app/view/device/device/device.component.ts b/web/gui2/src/main/webapp/app/view/device/device/device.component.ts index c81f07233e..d67e4b4d80 100644 --- a/web/gui2/src/main/webapp/app/view/device/device/device.component.ts +++ b/web/gui2/src/main/webapp/app/view/device/device/device.component.ts @@ -20,7 +20,7 @@ import { LogService, WebSocketService, SortDir, TableBaseImpl, TableResponse -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { ActivatedRoute, Router } from '@angular/router'; diff --git a/web/gui2/src/main/webapp/app/view/device/devicedetails/devicedetails.component.ts b/web/gui2/src/main/webapp/app/view/device/devicedetails/devicedetails.component.ts index e0819bb1d7..201ca99cae 100644 --- a/web/gui2/src/main/webapp/app/view/device/devicedetails/devicedetails.component.ts +++ b/web/gui2/src/main/webapp/app/view/device/devicedetails/devicedetails.component.ts @@ -21,7 +21,7 @@ import { LogService, DetailsPanelBaseImpl, WebSocketService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; /** * The details view when a device row is clicked from the Device view diff --git a/web/gui2/src/main/webapp/app/view/flow/flow.module.ts b/web/gui2/src/main/webapp/app/view/flow/flow.module.ts index 19f77209d1..320deacf3f 100644 --- a/web/gui2/src/main/webapp/app/view/flow/flow.module.ts +++ b/web/gui2/src/main/webapp/app/view/flow/flow.module.ts @@ -16,7 +16,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FlowComponent } from './flow/flow.component'; -import { Gui2FwLibModule } from 'gui2-fw-lib/public_api'; +import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { FormsModule } from '@angular/forms'; import { FlowDetailsComponent } from './flowdetails/flowdetails/flowdetails.component'; import {RouterModule} from '@angular/router'; diff --git a/web/gui2/src/main/webapp/app/view/flow/flow/flow.component.ts b/web/gui2/src/main/webapp/app/view/flow/flow/flow.component.ts index 84790db2d4..ed376c5eb9 100644 --- a/web/gui2/src/main/webapp/app/view/flow/flow/flow.component.ts +++ b/web/gui2/src/main/webapp/app/view/flow/flow/flow.component.ts @@ -21,7 +21,7 @@ import { WebSocketService, LionService, SortDir, TableBaseImpl, TableResponse -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { ActivatedRoute } from '@angular/router'; /** diff --git a/web/gui2/src/main/webapp/app/view/flow/flowdetails/flowdetails/flowdetails.component.ts b/web/gui2/src/main/webapp/app/view/flow/flowdetails/flowdetails/flowdetails.component.ts index 180bac9bfa..86f49ff00d 100644 --- a/web/gui2/src/main/webapp/app/view/flow/flowdetails/flowdetails/flowdetails.component.ts +++ b/web/gui2/src/main/webapp/app/view/flow/flowdetails/flowdetails/flowdetails.component.ts @@ -20,7 +20,7 @@ import { LogService, DetailsPanelBaseImpl, WebSocketService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { trigger, state, style, transition, animate } from '@angular/animations'; /** diff --git a/web/gui2/src/main/webapp/app/view/group/group.module.ts b/web/gui2/src/main/webapp/app/view/group/group.module.ts index b7000dbbd6..6e5d0aba03 100644 --- a/web/gui2/src/main/webapp/app/view/group/group.module.ts +++ b/web/gui2/src/main/webapp/app/view/group/group.module.ts @@ -16,7 +16,7 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {GroupComponent} from './group/group.component'; -import { Gui2FwLibModule } from 'gui2-fw-lib/public_api'; +import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {FormsModule} from '@angular/forms'; import {RouterModule} from '@angular/router'; diff --git a/web/gui2/src/main/webapp/app/view/group/group/group.component.ts b/web/gui2/src/main/webapp/app/view/group/group/group.component.ts index 8d7b9f8253..f8c3be9aca 100644 --- a/web/gui2/src/main/webapp/app/view/group/group/group.component.ts +++ b/web/gui2/src/main/webapp/app/view/group/group/group.component.ts @@ -19,7 +19,7 @@ import { LogService, WebSocketService, SortDir, TableBaseImpl, TableResponse -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { ActivatedRoute } from '@angular/router'; /** diff --git a/web/gui2/src/main/webapp/app/view/host/host.module.ts b/web/gui2/src/main/webapp/app/view/host/host.module.ts index 33ad58929c..52ecdecf3c 100644 --- a/web/gui2/src/main/webapp/app/view/host/host.module.ts +++ b/web/gui2/src/main/webapp/app/view/host/host.module.ts @@ -17,7 +17,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { HostComponent } from './host/host.component'; -import { Gui2FwLibModule } from 'gui2-fw-lib/public_api'; +import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { HostDetailsComponent } from './hostdetails/hostdetails.component'; import {RouterModule} from '@angular/router'; diff --git a/web/gui2/src/main/webapp/app/view/host/host/host.component.ts b/web/gui2/src/main/webapp/app/view/host/host/host.component.ts index f2ddaf5ecd..1692690317 100644 --- a/web/gui2/src/main/webapp/app/view/host/host/host.component.ts +++ b/web/gui2/src/main/webapp/app/view/host/host/host.component.ts @@ -19,7 +19,7 @@ import { LogService, WebSocketService, SortDir, TableBaseImpl, TableResponse -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; interface HostTableResponse extends TableResponse { hosts: Host[]; diff --git a/web/gui2/src/main/webapp/app/view/host/hostdetails/hostdetails.component.ts b/web/gui2/src/main/webapp/app/view/host/hostdetails/hostdetails.component.ts index 945f7232c6..eb6aae149f 100644 --- a/web/gui2/src/main/webapp/app/view/host/hostdetails/hostdetails.component.ts +++ b/web/gui2/src/main/webapp/app/view/host/hostdetails/hostdetails.component.ts @@ -21,7 +21,7 @@ import { LogService, DetailsPanelBaseImpl, WebSocketService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; /** * The details view when a host row is clicked from the Host view diff --git a/web/gui2/src/main/webapp/app/view/intent/intent.module.ts b/web/gui2/src/main/webapp/app/view/intent/intent.module.ts index 22fb9328eb..3907f52c60 100644 --- a/web/gui2/src/main/webapp/app/view/intent/intent.module.ts +++ b/web/gui2/src/main/webapp/app/view/intent/intent.module.ts @@ -17,7 +17,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { IntentComponent } from './intent/intent.component'; -import { Gui2FwLibModule } from 'gui2-fw-lib/public_api'; +import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { RouterModule } from '@angular/router'; @NgModule({ diff --git a/web/gui2/src/main/webapp/app/view/intent/intent/intent.component.ts b/web/gui2/src/main/webapp/app/view/intent/intent/intent.component.ts index b45f65275d..83e6acf4af 100644 --- a/web/gui2/src/main/webapp/app/view/intent/intent/intent.component.ts +++ b/web/gui2/src/main/webapp/app/view/intent/intent/intent.component.ts @@ -19,7 +19,7 @@ import { LogService, WebSocketService, SortDir, TableBaseImpl, TableResponse -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; const RESUBMITINTENT = 'resubmitIntent'; const REMOVEINTENT = 'removeIntent'; diff --git a/web/gui2/src/main/webapp/app/view/link/link.module.ts b/web/gui2/src/main/webapp/app/view/link/link.module.ts index 4c1e020173..45a012da4d 100644 --- a/web/gui2/src/main/webapp/app/view/link/link.module.ts +++ b/web/gui2/src/main/webapp/app/view/link/link.module.ts @@ -16,7 +16,7 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {LinkComponent} from './link/link.component'; -import {Gui2FwLibModule} from 'gui2-fw-lib/public_api'; +import {Gui2FwLibModule} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {RouterModule} from '@angular/router'; @NgModule({ diff --git a/web/gui2/src/main/webapp/app/view/link/link/link.component.ts b/web/gui2/src/main/webapp/app/view/link/link/link.component.ts index 90c0e64e5c..9429064f46 100644 --- a/web/gui2/src/main/webapp/app/view/link/link/link.component.ts +++ b/web/gui2/src/main/webapp/app/view/link/link/link.component.ts @@ -19,7 +19,7 @@ import { LogService, WebSocketService, SortDir, TableBaseImpl, TableResponse -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; /** * Model of the response from WebSocket diff --git a/web/gui2/src/main/webapp/app/view/meter/meter.module.ts b/web/gui2/src/main/webapp/app/view/meter/meter.module.ts index 5bebc19d6e..062e1515f5 100644 --- a/web/gui2/src/main/webapp/app/view/meter/meter.module.ts +++ b/web/gui2/src/main/webapp/app/view/meter/meter.module.ts @@ -15,7 +15,7 @@ */ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; -import {Gui2FwLibModule} from 'gui2-fw-lib/public_api'; +import {Gui2FwLibModule} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {MeterComponent} from './meter/meter.component'; import {FormsModule} from '@angular/forms'; import {RouterModule} from '@angular/router'; diff --git a/web/gui2/src/main/webapp/app/view/meter/meter/meter.component.ts b/web/gui2/src/main/webapp/app/view/meter/meter/meter.component.ts index 8d9f0b02d4..7b92ec8b02 100644 --- a/web/gui2/src/main/webapp/app/view/meter/meter/meter.component.ts +++ b/web/gui2/src/main/webapp/app/view/meter/meter/meter.component.ts @@ -19,7 +19,7 @@ import { LogService, WebSocketService, SortDir, TableBaseImpl, TableResponse -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { ActivatedRoute } from '@angular/router'; /** diff --git a/web/gui2/src/main/webapp/app/view/partition/partition.module.ts b/web/gui2/src/main/webapp/app/view/partition/partition.module.ts index e7b8069113..1098f973da 100644 --- a/web/gui2/src/main/webapp/app/view/partition/partition.module.ts +++ b/web/gui2/src/main/webapp/app/view/partition/partition.module.ts @@ -15,7 +15,7 @@ */ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import {Gui2FwLibModule} from 'gui2-fw-lib/public_api'; +import {Gui2FwLibModule} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { PartitionComponent } from './partition/partition.component'; import {RouterModule} from '@angular/router'; diff --git a/web/gui2/src/main/webapp/app/view/partition/partition/partition.component.ts b/web/gui2/src/main/webapp/app/view/partition/partition/partition.component.ts index 0bf87d033c..214efaef15 100644 --- a/web/gui2/src/main/webapp/app/view/partition/partition/partition.component.ts +++ b/web/gui2/src/main/webapp/app/view/partition/partition/partition.component.ts @@ -19,7 +19,7 @@ import { LogService, WebSocketService, SortDir, TableBaseImpl -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { ActivatedRoute } from '@angular/router'; /** diff --git a/web/gui2/src/main/webapp/app/view/pipeconf/pipeconf.module.ts b/web/gui2/src/main/webapp/app/view/pipeconf/pipeconf.module.ts index 3e0c5c6751..08f1c9e66f 100644 --- a/web/gui2/src/main/webapp/app/view/pipeconf/pipeconf.module.ts +++ b/web/gui2/src/main/webapp/app/view/pipeconf/pipeconf.module.ts @@ -18,7 +18,7 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {PipeconfComponent} from './pipeconf/pipeconf.component'; import {PipeconfDetailsComponent} from './pipeconfdetails/pipeconfdetails.component'; -import { Gui2FwLibModule } from 'gui2-fw-lib/public_api'; +import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {FormsModule} from '@angular/forms'; import {RouterModule} from '@angular/router'; diff --git a/web/gui2/src/main/webapp/app/view/pipeconf/pipeconf/pipeconf.component.ts b/web/gui2/src/main/webapp/app/view/pipeconf/pipeconf/pipeconf.component.ts index 50141c7d14..dc5e564aae 100644 --- a/web/gui2/src/main/webapp/app/view/pipeconf/pipeconf/pipeconf.component.ts +++ b/web/gui2/src/main/webapp/app/view/pipeconf/pipeconf/pipeconf.component.ts @@ -20,7 +20,7 @@ import { LogService, SortDir, TableBaseImpl, WebSocketService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {ActivatedRoute, Router} from '@angular/router'; const pipeconfReq = 'pipeconfRequest'; diff --git a/web/gui2/src/main/webapp/app/view/pipeconf/pipeconfdetails/pipeconfdetails.component.ts b/web/gui2/src/main/webapp/app/view/pipeconf/pipeconfdetails/pipeconfdetails.component.ts index e5539f8370..d4c31b0362 100644 --- a/web/gui2/src/main/webapp/app/view/pipeconf/pipeconfdetails/pipeconfdetails.component.ts +++ b/web/gui2/src/main/webapp/app/view/pipeconf/pipeconfdetails/pipeconfdetails.component.ts @@ -26,7 +26,7 @@ import { FnService, IconService, LogService, WebSocketService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {PipeconfAction, PipeconfTable} from '../pipeconf/pipeconf.component'; import {animate, state, style, transition, trigger} from '@angular/animations'; diff --git a/web/gui2/src/main/webapp/app/view/port/port.module.ts b/web/gui2/src/main/webapp/app/view/port/port.module.ts index 1cb44b49c9..aafdb29edf 100644 --- a/web/gui2/src/main/webapp/app/view/port/port.module.ts +++ b/web/gui2/src/main/webapp/app/view/port/port.module.ts @@ -16,7 +16,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { PortComponent } from './port/port.component'; -import { Gui2FwLibModule } from 'gui2-fw-lib/public_api'; +import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { FormsModule } from '@angular/forms'; import { PortDetailsComponent } from './portdetails/portdetails.component'; import {RouterModule} from '@angular/router'; diff --git a/web/gui2/src/main/webapp/app/view/port/port/port.component.ts b/web/gui2/src/main/webapp/app/view/port/port/port.component.ts index a0482ae3be..3c431b33bc 100644 --- a/web/gui2/src/main/webapp/app/view/port/port/port.component.ts +++ b/web/gui2/src/main/webapp/app/view/port/port/port.component.ts @@ -20,7 +20,7 @@ import { PrefsService, WebSocketService, SortDir, TableBaseImpl, TableResponse -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { ActivatedRoute } from '@angular/router'; /** diff --git a/web/gui2/src/main/webapp/app/view/port/portdetails/portdetails.component.ts b/web/gui2/src/main/webapp/app/view/port/portdetails/portdetails.component.ts index d2479ac528..83eb5161c4 100644 --- a/web/gui2/src/main/webapp/app/view/port/portdetails/portdetails.component.ts +++ b/web/gui2/src/main/webapp/app/view/port/portdetails/portdetails.component.ts @@ -21,7 +21,7 @@ import { LogService, DetailsPanelBaseImpl, WebSocketService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; /** * The details view when a port row is clicked from the Port view diff --git a/web/gui2/src/main/webapp/app/view/processor/processor.module.ts b/web/gui2/src/main/webapp/app/view/processor/processor.module.ts index d73fbfc720..008b656560 100644 --- a/web/gui2/src/main/webapp/app/view/processor/processor.module.ts +++ b/web/gui2/src/main/webapp/app/view/processor/processor.module.ts @@ -15,7 +15,7 @@ */ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { Gui2FwLibModule } from 'gui2-fw-lib/public_api'; +import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { ProcessorComponent } from './processor/processor.component'; import {RouterModule} from '@angular/router'; diff --git a/web/gui2/src/main/webapp/app/view/processor/processor/processor.component.ts b/web/gui2/src/main/webapp/app/view/processor/processor/processor.component.ts index af63504fe4..438417f6a0 100644 --- a/web/gui2/src/main/webapp/app/view/processor/processor/processor.component.ts +++ b/web/gui2/src/main/webapp/app/view/processor/processor/processor.component.ts @@ -19,7 +19,7 @@ import { LogService, WebSocketService, TableBaseImpl -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { ActivatedRoute } from '@angular/router'; /** diff --git a/web/gui2/src/main/webapp/app/view/settings/settings.module.ts b/web/gui2/src/main/webapp/app/view/settings/settings.module.ts index 1c66849d7d..2b4380faf9 100644 --- a/web/gui2/src/main/webapp/app/view/settings/settings.module.ts +++ b/web/gui2/src/main/webapp/app/view/settings/settings.module.ts @@ -17,7 +17,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SettingsComponent } from './settings/settings.component'; -import { Gui2FwLibModule } from 'gui2-fw-lib/public_api'; +import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { SettingsDetailsComponent } from './settingsdetails/settingsdetails.component'; import {RouterModule} from '@angular/router'; diff --git a/web/gui2/src/main/webapp/app/view/settings/settings/settings.component.ts b/web/gui2/src/main/webapp/app/view/settings/settings/settings.component.ts index fd6429b101..112051d583 100644 --- a/web/gui2/src/main/webapp/app/view/settings/settings/settings.component.ts +++ b/web/gui2/src/main/webapp/app/view/settings/settings/settings.component.ts @@ -19,7 +19,7 @@ import { LogService, WebSocketService, SortDir, TableBaseImpl, TableResponse -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; /** * Model of the data returned through the Web Socket about settings. diff --git a/web/gui2/src/main/webapp/app/view/settings/settingsdetails/settingsdetails.component.ts b/web/gui2/src/main/webapp/app/view/settings/settingsdetails/settingsdetails.component.ts index f0fd6e94b9..13c939fa1b 100644 --- a/web/gui2/src/main/webapp/app/view/settings/settingsdetails/settingsdetails.component.ts +++ b/web/gui2/src/main/webapp/app/view/settings/settingsdetails/settingsdetails.component.ts @@ -19,7 +19,7 @@ import { LogService, DetailsPanelBaseImpl, WebSocketService -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import { trigger, state, style, transition, animate } from '@angular/animations'; import { Settings } from '../settings/settings.component'; diff --git a/web/gui2/src/main/webapp/app/view/tunnel/tunnel.module.ts b/web/gui2/src/main/webapp/app/view/tunnel/tunnel.module.ts index 48f5cdb56f..6a8f69f434 100644 --- a/web/gui2/src/main/webapp/app/view/tunnel/tunnel.module.ts +++ b/web/gui2/src/main/webapp/app/view/tunnel/tunnel.module.ts @@ -17,7 +17,7 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {TunnelComponent} from './tunnel/tunnel.component'; -import { Gui2FwLibModule } from 'gui2-fw-lib/public_api'; +import { Gui2FwLibModule } from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; import {RouterModule} from '@angular/router'; @NgModule({ diff --git a/web/gui2/src/main/webapp/app/view/tunnel/tunnel/tunnel.component.ts b/web/gui2/src/main/webapp/app/view/tunnel/tunnel/tunnel.component.ts index 93f2735568..7eee445a29 100644 --- a/web/gui2/src/main/webapp/app/view/tunnel/tunnel/tunnel.component.ts +++ b/web/gui2/src/main/webapp/app/view/tunnel/tunnel/tunnel.component.ts @@ -19,7 +19,7 @@ import { LogService, WebSocketService, SortDir, TableBaseImpl, TableResponse -} from 'gui2-fw-lib/public_api'; +} from 'org_onosproject_onos/web/gui2-fw-lib/public_api'; /** * Model of the response from WebSocket diff --git a/web/gui2/tsconfig.json b/web/gui2/tsconfig.json index 6073c03a14..b4b4ac70a6 100644 --- a/web/gui2/tsconfig.json +++ b/web/gui2/tsconfig.json @@ -19,7 +19,7 @@ // using the /// syntax. "types": [], "paths": { - "org_onosproject_onos/web/gui2-fw-lib": ["../gui2-fw-lib"] + "org_onosproject_onos/*": ["*"] } } } diff --git a/web/gui2/yarn.lock b/web/gui2/yarn.lock index a778e81a68..96426f0f6b 100644 --- a/web/gui2/yarn.lock +++ b/web/gui2/yarn.lock @@ -276,15 +276,6 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= -"@rollup/pluginutils@^3.0.1": - version "3.0.9" - resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.0.9.tgz#aa6adca2c45e5a1b950103a999e3cddfe49fd775" - integrity sha512-TLZavlfPAZYI7v33wQh4mTP6zojne14yok3DNSLcjoG/Hirxfkonn6icP5rrNWRn8nZsirJBFFpijVOJzkUHDg== - dependencies: - "@types/estree" "0.0.39" - estree-walker "^1.0.1" - micromatch "^4.0.2" - "@rushstack/node-core-library@3.19.7": version "3.19.7" resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-3.19.7.tgz#8d8a193fd6f99536c92dd797ab50fd5fcb7630ea" @@ -407,6 +398,11 @@ resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== +abbrev@1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + accepts@~1.3.4, accepts@~1.3.7: version "1.3.7" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" @@ -488,6 +484,11 @@ ansi-regex@^2.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= +ansi-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" + integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + ansi-regex@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" @@ -529,11 +530,19 @@ anymatch@~3.1.1: normalize-path "^3.0.0" picomatch "^2.0.4" -aproba@^1.1.1: +aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== +are-we-there-yet@~1.1.2: + version "1.1.5" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" + integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + dependencies: + delegates "^1.0.0" + readable-stream "^2.0.6" + argparse@~1.0.9: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -768,7 +777,7 @@ braces@^2.3.1, braces@^2.3.2: split-string "^3.0.2" to-regex "^3.0.1" -braces@^3.0.1, braces@~3.0.2: +braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== @@ -945,7 +954,7 @@ chokidar@^3.0.0: optionalDependencies: fsevents "~2.1.2" -chownr@^1.1.2, chownr@^1.1.3, chownr@^1.1.4: +chownr@^1.1.1, chownr@^1.1.2, chownr@^1.1.3, chownr@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== @@ -996,6 +1005,11 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= +code-point-at@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" + integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" @@ -1085,6 +1099,11 @@ connect@^3.6.0: parseurl "~1.3.3" utils-merge "1.0.1" +console-control-strings@^1.0.0, console-control-strings@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + content-disposition@0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" @@ -1459,6 +1478,11 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + defaults@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" @@ -1513,6 +1537,11 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + depd@^1.1.2, depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" @@ -1528,6 +1557,11 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + dezalgo@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456" @@ -1684,11 +1718,6 @@ estree-walker@^0.6.1: resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362" integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w== -estree-walker@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" - integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== - etag@~1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" @@ -1939,6 +1968,13 @@ fs-extra@^7.0.1, fs-extra@~7.0.1: jsonfile "^4.0.0" universalify "^0.1.0" +fs-minipass@^1.2.5: + version "1.2.7" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" + integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== + dependencies: + minipass "^2.6.0" + fs-minipass@^2.0.0, fs-minipass@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" @@ -1979,6 +2015,20 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +gauge@~2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" + integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + dependencies: + aproba "^1.0.3" + console-control-strings "^1.0.0" + has-unicode "^2.0.0" + object-assign "^4.1.0" + signal-exit "^3.0.0" + string-width "^1.0.1" + strip-ansi "^3.0.1" + wide-align "^1.1.0" + get-caller-file@^2.0.1: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" @@ -2087,6 +2137,11 @@ has-symbols@^1.0.0, has-symbols@^1.0.1: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== +has-unicode@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -2231,7 +2286,7 @@ humanize-ms@^1.2.1: dependencies: ms "^2.0.0" -iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13: +iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -2243,7 +2298,7 @@ iferr@^0.1.5: resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= -ignore-walk@^3.0.3: +ignore-walk@^3.0.1, ignore-walk@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37" integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== @@ -2293,7 +2348,7 @@ inherits@2.0.3: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= -ini@1.3.5, ini@^1.3.4: +ini@1.3.5, ini@^1.3.4, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== @@ -2429,6 +2484,18 @@ is-extglob@^2.1.0, is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= +is-fullwidth-code-point@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" + integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + dependencies: + number-is-nan "^1.0.0" + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" @@ -2902,14 +2969,6 @@ micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" -micromatch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" - integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== - dependencies: - braces "^3.0.1" - picomatch "^2.0.5" - mime-db@1.43.0: version "1.43.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" @@ -3002,6 +3061,14 @@ minipass-sized@^1.0.3: dependencies: minipass "^3.0.0" +minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" + integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== + dependencies: + safe-buffer "^5.1.2" + yallist "^3.0.0" + minipass@^3.0.0, minipass@^3.0.1, minipass@^3.1.0, minipass@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5" @@ -3009,6 +3076,13 @@ minipass@^3.0.0, minipass@^3.0.1, minipass@^3.1.0, minipass@^3.1.1: dependencies: yallist "^4.0.0" +minizlib@^1.2.1: + version "1.3.3" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" + integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== + dependencies: + minipass "^2.9.0" + minizlib@^2.0.0, minizlib@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.0.tgz#fd52c645301ef09a63a2c209697c294c6ce02cf3" @@ -3025,7 +3099,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@^0.5.1: +mkdirp@^0.5.0, mkdirp@^0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -3091,11 +3165,44 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" +needle@^2.2.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.1.tgz#14af48732463d7475696f937626b1b993247a56a" + integrity sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g== + dependencies: + debug "^3.2.6" + iconv-lite "^0.4.4" + sax "^1.2.4" + negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== +node-pre-gyp@*: + version "0.14.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" + integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.1" + needle "^2.2.1" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4.4.2" + +nopt@^4.0.1: + version "4.0.3" + resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48" + integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== + dependencies: + abbrev "1" + osenv "^0.1.4" + normalize-package-data@^2.0.0: version "2.5.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -3118,7 +3225,7 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -npm-bundled@^1.1.1: +npm-bundled@^1.0.1, npm-bundled@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b" integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== @@ -3146,6 +3253,15 @@ npm-package-arg@8.0.1, npm-package-arg@^8.0.0, npm-package-arg@^8.0.1: semver "^7.0.0" validate-npm-package-name "^3.0.0" +npm-packlist@^1.1.6: + version "1.4.8" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" + integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== + dependencies: + ignore-walk "^3.0.1" + npm-bundled "^1.0.1" + npm-normalize-package-bin "^1.0.1" + npm-packlist@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.1.1.tgz#08806a1df79acdc43d02d20c83a3d5472d96c90c" @@ -3188,17 +3304,32 @@ npm-registry-fetch@^8.0.0: minizlib "^2.0.0" npm-package-arg "^8.0.0" +npmlog@^4.0.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" + integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + dependencies: + are-we-there-yet "~1.1.2" + console-control-strings "~1.1.0" + gauge "~2.7.3" + set-blocking "~2.0.0" + null-check@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd" integrity sha1-l33/1xdgErnsMNKjnbXPcqBDnt0= +number-is-nan@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" + integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + oauth-sign@~0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -object-assign@^4.0.1: +object-assign@^4.0.1, object-assign@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -3310,11 +3441,24 @@ ora@4.0.3: strip-ansi "^6.0.0" wcwidth "^1.0.1" -os-tmpdir@~1.0.1, os-tmpdir@~1.0.2: +os-homedir@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" + integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= + +os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= +osenv@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + p-limit@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" @@ -3439,7 +3583,7 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.0.7: +picomatch@^2.0.4, picomatch@^2.0.7: version "2.2.2" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== @@ -3587,6 +3731,16 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" +rc@^1.2.7: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + read-package-json-fast@^1.1.1, read-package-json-fast@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-1.1.3.tgz#3b78464ea8f3c4447f3358635390b6946dc0737e" @@ -3616,7 +3770,7 @@ read-package-tree@5.3.1: readdir-scoped-modules "^1.0.0" util-promisify "^2.1.0" -"readable-stream@1 || 2", readable-stream@^2.0.2, readable-stream@~2.3.6: +"readable-stream@1 || 2", readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -3785,7 +3939,7 @@ rimraf@3.0.2: dependencies: glob "^7.1.3" -rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.3, rimraf@^2.7.1: +rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -3814,14 +3968,6 @@ rollup-plugin-node-resolve@^5.2.0: resolve "^1.11.1" rollup-pluginutils "^2.8.1" -rollup-plugin-sourcemaps@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.5.0.tgz#898e8411c9b5b7b524b4d96c3b41d5c43f9da77e" - integrity sha512-xp2vvRvgnYiXydgf/JFFFgYxrqMaQaOrK/g6yZvgwT9R1TSYjD3HKku1pD7iQNjQHkl5yGpokvJLp7cP/lR+aQ== - dependencies: - "@rollup/pluginutils" "^3.0.1" - source-map-resolve "^0.5.3" - rollup-pluginutils@^2.8.1: version "2.8.2" resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e" @@ -3900,7 +4046,7 @@ saucelabs@^1.5.0: dependencies: https-proxy-agent "^2.2.1" -sax@>=0.6.0: +sax@>=0.6.0, sax@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -3943,9 +4089,9 @@ semver@^6.3.0: integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== semver@^7.0.0, semver@^7.1.1, semver@^7.1.3: - version "7.2.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.2.2.tgz#d01432d74ed3010a20ffaf909d63a691520521cd" - integrity sha512-Zo84u6o2PebMSK3zjJ6Zp5wi8VnQZnEaCP13Ul/lt1ANsLACxnJxq4EEm1PY94/por1Hm9+7xpIswdS5AkieMA== + version "7.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.0.tgz#91f7c70ec944a63e5dc7a74cde2da375d8e0853c" + integrity sha512-uyvgU/igkrMgNHwLgXvlpD9jEADbJhB0+JXSywoO47JgJ6c16iau9F9cjtc/E5o0PoqRYTiTIAPRKaYe84z6eQ== semver@~5.3.0: version "5.3.0" @@ -3981,7 +4127,7 @@ serve-static@1.14.1: parseurl "~1.3.3" send "0.17.1" -set-blocking@^2.0.0: +set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= @@ -4015,7 +4161,7 @@ shelljs@0.8.2: interpret "^1.0.0" rechoir "^0.6.2" -signal-exit@^3.0.2: +signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== @@ -4118,7 +4264,7 @@ socks@^2.3.3: ip "1.1.5" smart-buffer "^4.1.0" -source-map-resolve@^0.5.0, source-map-resolve@^0.5.3: +source-map-resolve@^0.5.0: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== @@ -4261,6 +4407,23 @@ streamroller@^1.0.6: fs-extra "^7.0.1" lodash "^4.17.14" +string-width@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" + integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + dependencies: + code-point-at "^1.0.0" + is-fullwidth-code-point "^1.0.0" + strip-ansi "^3.0.0" + +"string-width@^1.0.2 || 2": + version "2.1.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" + integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + dependencies: + is-fullwidth-code-point "^2.0.0" + strip-ansi "^4.0.0" + string-width@^4.1.0, string-width@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" @@ -4311,13 +4474,20 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@^3.0.0: +strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= dependencies: ansi-regex "^2.0.0" +strip-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + dependencies: + ansi-regex "^3.0.0" + strip-ansi@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" @@ -4325,6 +4495,11 @@ strip-ansi@^6.0.0: dependencies: ansi-regex "^5.0.0" +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -4349,6 +4524,19 @@ symbol-observable@1.2.0: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== +tar@^4.4.2: + version "4.4.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" + integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== + dependencies: + chownr "^1.1.1" + fs-minipass "^1.2.5" + minipass "^2.8.6" + minizlib "^1.2.1" + mkdirp "^0.5.0" + safe-buffer "^5.1.2" + yallist "^3.0.3" + tar@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.1.tgz#7b3bd6c313cb6e0153770108f8d70ac298607efa" @@ -4718,6 +4906,13 @@ which@^2.0.2: dependencies: isexe "^2.0.0" +wide-align@^1.1.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" + integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== + dependencies: + string-width "^1.0.2 || 2" + wordwrap@~0.0.2: version "0.0.3" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" @@ -4774,7 +4969,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.2: +yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==