From a01e04cbbfe510baf23d5af37d4925623c2d9aff Mon Sep 17 00:00:00 2001 From: zFernand0 Date: Mon, 18 Nov 2019 12:40:35 -0500 Subject: [PATCH 01/16] first attempt to move to zowe-cli Signed-off-by: zFernand0 --- .npmrc | 1 - .../{@brightside/core.ts => @zowe/cli.ts} | 4 +- .../{@brightside => @zowe}/imperative.ts | 0 __mocks__/Session.ts | 3 +- .../DatasetTree.integration.test.ts | 2 +- .../USSTree.integration.test.ts | 4 +- .../ZoweNode.integration.test.ts | 2 +- .../ZoweUSSNode.integration.test.ts | 2 +- .../extension.integration.test.ts | 4 +- .../uss/ussNodeActions.integration.test.ts | 4 +- __tests__/__unit__/DatasetTree.unit.test.ts | 6 +- __tests__/__unit__/ProfileLoader.unit.test.ts | 4 +- __tests__/__unit__/Profiles.unit.test.ts | 2 +- __tests__/__unit__/SpoolProvider.unit.test.ts | 6 +- __tests__/__unit__/USSTree.unit.test.ts | 5 +- __tests__/__unit__/ZoweJobNode.unit.test.ts | 24 +-- __tests__/__unit__/ZoweNode.unit.test.ts | 8 +- __tests__/__unit__/ZoweUSSNode.unit.test.ts | 5 +- __tests__/__unit__/extension.unit.test.ts | 40 ++-- .../__unit__/jes/jesNodeActions.unit.test.ts | 6 +- .../__unit__/uss/ussNodeActions.unit.test.ts | 6 +- docs/README.md | 4 +- package-lock.json | 187 +++++++++++------- package.json | 2 +- resources/testProfileData.example.ts | 2 +- scripts/systemTestEnv.ts | 4 +- src/DatasetTree.ts | 4 +- src/ProfileLoader.ts | 2 +- src/Profiles.ts | 12 +- src/SpoolProvider.ts | 2 +- src/USSTree.ts | 5 +- src/ZosJobsProvider.ts | 5 +- src/ZoweJobNode.ts | 11 +- src/ZoweNode.ts | 4 +- src/ZoweUSSNode.ts | 4 +- src/extension.ts | 8 +- src/getAllProfiles.ts | 8 +- src/getDefaultProfile.ts | 8 +- src/jes/jesNodeActions.ts | 2 +- src/mvs/mvsNodeActions.ts | 2 +- src/uss/ussNodeActions.ts | 2 +- src/utils.ts | 3 - tslint.json | 2 +- 43 files changed, 227 insertions(+), 194 deletions(-) delete mode 100644 .npmrc rename __mocks__/{@brightside/core.ts => @zowe/cli.ts} (97%) rename __mocks__/{@brightside => @zowe}/imperative.ts (100%) diff --git a/.npmrc b/.npmrc deleted file mode 100644 index 9c99d49ed6..0000000000 --- a/.npmrc +++ /dev/null @@ -1 +0,0 @@ -@brightside:registry=https://api.bintray.com/npm/ca/brightside/ \ No newline at end of file diff --git a/__mocks__/@brightside/core.ts b/__mocks__/@zowe/cli.ts similarity index 97% rename from __mocks__/@brightside/core.ts rename to __mocks__/@zowe/cli.ts index b612a5a582..f67e21b727 100644 --- a/__mocks__/@brightside/core.ts +++ b/__mocks__/@zowe/cli.ts @@ -10,8 +10,8 @@ */ import { Session } from "../Session"; -import { IListOptions } from "@brightside/core"; -import * as imperative from "../@brightside/imperative"; +import { IListOptions } from "@zowe/cli"; +import * as imperative from "./imperative"; // tslint:disable-next-line:no-namespace export namespace ZosmfSession { diff --git a/__mocks__/@brightside/imperative.ts b/__mocks__/@zowe/imperative.ts similarity index 100% rename from __mocks__/@brightside/imperative.ts rename to __mocks__/@zowe/imperative.ts diff --git a/__mocks__/Session.ts b/__mocks__/Session.ts index 01824d9cf0..3fe41285de 100644 --- a/__mocks__/Session.ts +++ b/__mocks__/Session.ts @@ -9,8 +9,7 @@ * * */ -import { AbstractSession } from "@brightside/imperative/lib/rest/src/session/AbstractSession"; -import { ISession } from "@brightside/imperative/lib/rest/src/session/doc/ISession"; +import { AbstractSession, ISession } from "@zowe/imperative"; /** * Non-abstract session class diff --git a/__tests__/__integration__/DatasetTree.integration.test.ts b/__tests__/__integration__/DatasetTree.integration.test.ts index 4a2138cbc5..4d63b68bec 100644 --- a/__tests__/__integration__/DatasetTree.integration.test.ts +++ b/__tests__/__integration__/DatasetTree.integration.test.ts @@ -10,7 +10,7 @@ */ // tslint:disable:no-magic-numbers -import * as zowe from "@brightside/core"; +import * as zowe from "@zowe/cli"; // tslint:disable-next-line:no-implicit-dependencies import * as expect from "expect"; import * as vscode from "vscode"; diff --git a/__tests__/__integration__/USSTree.integration.test.ts b/__tests__/__integration__/USSTree.integration.test.ts index 428d92e025..dc163b3a61 100644 --- a/__tests__/__integration__/USSTree.integration.test.ts +++ b/__tests__/__integration__/USSTree.integration.test.ts @@ -10,8 +10,8 @@ */ // tslint:disable:no-magic-numbers -import * as zowe from "@brightside/core"; -import { Logger } from "@brightside/imperative"; +import * as zowe from "@zowe/cli"; +import { Logger } from "@zowe/imperative"; import * as chai from "chai"; import * as sinon from "sinon"; import * as chaiAsPromised from "chai-as-promised"; diff --git a/__tests__/__integration__/ZoweNode.integration.test.ts b/__tests__/__integration__/ZoweNode.integration.test.ts index ed216156ed..daf06185fe 100644 --- a/__tests__/__integration__/ZoweNode.integration.test.ts +++ b/__tests__/__integration__/ZoweNode.integration.test.ts @@ -9,7 +9,7 @@ * * */ -import * as zowe from "@brightside/core"; +import * as zowe from "@zowe/cli"; import * as chai from "chai"; import * as chaiAsPromised from "chai-as-promised"; // tslint:disable-next-line:no-implicit-dependencies diff --git a/__tests__/__integration__/ZoweUSSNode.integration.test.ts b/__tests__/__integration__/ZoweUSSNode.integration.test.ts index ea2d8c8721..b70145b40f 100644 --- a/__tests__/__integration__/ZoweUSSNode.integration.test.ts +++ b/__tests__/__integration__/ZoweUSSNode.integration.test.ts @@ -9,7 +9,7 @@ * * */ -import * as zowe from "@brightside/core"; +import * as zowe from "@zowe/cli"; import * as chai from "chai"; import * as chaiAsPromised from "chai-as-promised"; // tslint:disable-next-line:no-implicit-dependencies diff --git a/__tests__/__integration__/extension.integration.test.ts b/__tests__/__integration__/extension.integration.test.ts index df3956ba67..c35c21d695 100644 --- a/__tests__/__integration__/extension.integration.test.ts +++ b/__tests__/__integration__/extension.integration.test.ts @@ -10,8 +10,8 @@ */ // tslint:disable:no-magic-numbers -import * as zowe from "@brightside/core"; -import { Logger, CliProfileManager } from "@brightside/imperative"; +import * as zowe from "@zowe/cli"; +import { Logger, CliProfileManager } from "@zowe/imperative"; import * as chai from "chai"; import * as chaiAsPromised from "chai-as-promised"; import * as extension from "../../src/extension"; diff --git a/__tests__/__integration__/uss/ussNodeActions.integration.test.ts b/__tests__/__integration__/uss/ussNodeActions.integration.test.ts index 2d95e73671..50969cd72a 100644 --- a/__tests__/__integration__/uss/ussNodeActions.integration.test.ts +++ b/__tests__/__integration__/uss/ussNodeActions.integration.test.ts @@ -10,8 +10,8 @@ */ // tslint:disable:no-magic-numbers -import * as zowe from "@brightside/core"; -import { Logger } from "@brightside/imperative"; +import * as zowe from "@zowe/cli"; +import { Logger } from "@zowe/imperative"; import * as chai from "chai"; import * as chaiAsPromised from "chai-as-promised"; import * as sinon from "sinon"; diff --git a/__tests__/__unit__/DatasetTree.unit.test.ts b/__tests__/__unit__/DatasetTree.unit.test.ts index 1bce7470b9..f8d43965c0 100644 --- a/__tests__/__unit__/DatasetTree.unit.test.ts +++ b/__tests__/__unit__/DatasetTree.unit.test.ts @@ -12,14 +12,12 @@ jest.mock("vscode"); jest.mock("fs"); jest.mock("Session"); -jest.mock("@brightside/core"); -jest.mock("@brightside/imperative"); +jest.mock("@zowe/imperative"); jest.mock("../../src/Profiles"); import * as vscode from "vscode"; import { DatasetTree } from "../../src/DatasetTree"; import { ZoweNode } from "../../src/ZoweNode"; -import { Session, Logger } from "@brightside/imperative"; -import * as zowe from "@brightside/core"; +import { Session, Logger } from "@zowe/imperative"; import * as utils from "../../src/utils"; import { Profiles } from "../../src/Profiles"; import * as extension from "../../src/extension"; diff --git a/__tests__/__unit__/ProfileLoader.unit.test.ts b/__tests__/__unit__/ProfileLoader.unit.test.ts index 528e018768..5326fd55cd 100644 --- a/__tests__/__unit__/ProfileLoader.unit.test.ts +++ b/__tests__/__unit__/ProfileLoader.unit.test.ts @@ -11,10 +11,10 @@ jest.mock("vscode"); jest.mock("child_process"); -jest.mock("@brightside/imperative"); +jest.mock("@zowe/imperative"); import * as vscode from "vscode"; import * as child_process from "child_process"; -import { Logger } from "@brightside/imperative"; +import { Logger } from "@zowe/imperative"; import { loadAllProfiles, loadDefaultProfile } from "../../src/ProfileLoader"; diff --git a/__tests__/__unit__/Profiles.unit.test.ts b/__tests__/__unit__/Profiles.unit.test.ts index a57d1f781f..5dd6fd0420 100644 --- a/__tests__/__unit__/Profiles.unit.test.ts +++ b/__tests__/__unit__/Profiles.unit.test.ts @@ -13,7 +13,7 @@ jest.mock("vscode"); jest.mock("child_process"); import * as vscode from "vscode"; import * as child_process from "child_process"; -import { Logger, profileLoadError } from "@brightside/imperative"; +import { Logger } from "@zowe/imperative"; import { Profiles } from "../../src/Profiles"; import * as loader from "../../src/ProfileLoader"; diff --git a/__tests__/__unit__/SpoolProvider.unit.test.ts b/__tests__/__unit__/SpoolProvider.unit.test.ts index ea2cd7948d..6efe48c407 100644 --- a/__tests__/__unit__/SpoolProvider.unit.test.ts +++ b/__tests__/__unit__/SpoolProvider.unit.test.ts @@ -10,12 +10,12 @@ */ import * as spoolprovider from "../../src/SpoolProvider"; -import * as brightside from "@brightside/core"; +import * as zowe from "@zowe/cli"; import * as vscode from "vscode"; import { Profiles } from "../../src/Profiles"; describe("SpoolProvider Unit Tests", () => { - const iJobFile: brightside.IJobFile = { + const iJobFile: zowe.IJobFile = { "byte-count": 128, "job-correlator": "", "record-count": 1, @@ -108,7 +108,7 @@ describe("SpoolProvider Unit Tests", () => { }; }) }); - Object.defineProperty(brightside, "GetJobs", { value: GetJobs }); + Object.defineProperty(zowe, "GetJobs", { value: GetJobs }); Object.defineProperty(GetJobs, "getSpoolContentById", { value: getSpoolContentById }); getSpoolContentById.mockReturnValue("spool content"); diff --git a/__tests__/__unit__/USSTree.unit.test.ts b/__tests__/__unit__/USSTree.unit.test.ts index c51e0cafbf..e04f2b32ae 100644 --- a/__tests__/__unit__/USSTree.unit.test.ts +++ b/__tests__/__unit__/USSTree.unit.test.ts @@ -11,11 +11,10 @@ // tslint:disable:no-shadowed-variable jest.mock("vscode"); -jest.mock("@brightside/imperative"); -jest.mock("@brightside/core/lib/zosfiles/src/api/methods/list/doc/IListOptions"); +jest.mock("@zowe/imperative"); jest.mock("Session"); jest.mock("../../src/Profiles"); -import { Session, Logger } from "@brightside/imperative"; +import { Session, Logger } from "@zowe/imperative"; import * as vscode from "vscode"; import { USSTree, createUSSTree } from "../../src/USSTree"; import * as utils from "../../src/utils"; diff --git a/__tests__/__unit__/ZoweJobNode.unit.test.ts b/__tests__/__unit__/ZoweJobNode.unit.test.ts index 0dc8742da2..fc20d8aa44 100644 --- a/__tests__/__unit__/ZoweJobNode.unit.test.ts +++ b/__tests__/__unit__/ZoweJobNode.unit.test.ts @@ -11,11 +11,11 @@ jest.mock("vscode"); jest.mock("Session"); -jest.mock("@brightside/core"); -jest.mock("@brightside/imperative"); +jest.mock("@zowe/cli"); +jest.mock("@zowe/imperative"); import * as vscode from "vscode"; -import * as brightside from "@brightside/core"; -import { Session, Logger } from "@brightside/imperative"; +import * as zowe from "@zowe/cli"; +import { Session, Logger } from "@zowe/imperative"; import * as extension from "../../src/extension"; import * as profileLoader from "../../src/Profiles"; import * as utils from "../../src/utils"; @@ -49,7 +49,7 @@ describe("Zos Jobs Unit Tests", () => { Object.defineProperty(vscode, "ConfigurationTarget", {value: enums}); beforeAll(() => { - Object.defineProperty(brightside, "GetJobs", { value: GetJobs }); + Object.defineProperty(zowe, "GetJobs", { value: GetJobs }); }); afterAll(() => { @@ -64,7 +64,7 @@ describe("Zos Jobs Unit Tests", () => { const getJobsByOwnerAndPrefix = jest.fn(); const getJob = jest.fn(); - Object.defineProperty(brightside, "ZosmfSession", { value: ZosmfSession }); + Object.defineProperty(zowe, "ZosmfSession", { value: ZosmfSession }); Object.defineProperty(ZosmfSession, "createBasicZosmfSession", { value: createBasicZosmfSession }); Object.defineProperty(GetJobs, "getJobsByOwnerAndPrefix", { value: getJobsByOwnerAndPrefix }); Object.defineProperty(GetJobs, "getJob", { value: getJob }); @@ -93,7 +93,7 @@ describe("Zos Jobs Unit Tests", () => { }) }); - const iJob: brightside.IJob = { + const iJob: zowe.IJob = { "jobid": "JOB1234", "jobname": "TESTJOB", "files-url": "fake/files", @@ -119,7 +119,7 @@ describe("Zos Jobs Unit Tests", () => { "url": "fake/url" }; - const iJobComplete: brightside.IJob = { + const iJobComplete: zowe.IJob = { "jobid": "JOB1235", "jobname": "TESTJOB", "files-url": "fake/files", @@ -160,7 +160,7 @@ describe("Zos Jobs Unit Tests", () => { Object.defineProperty(vscode.window, "createQuickPick", {value: createQuickPick}); Object.defineProperty(vscode.window, "showInputBox", {value: showInputBox}); Object.defineProperty(filters, "getFilters", { value: getFilters }); - Object.defineProperty(brightside, "DeleteJobs", {value: DeleteJobs}); + Object.defineProperty(zowe, "DeleteJobs", {value: DeleteJobs}); Object.defineProperty(DeleteJobs, "deleteJob", {value: deleteJob}); const jobNode = new Job("jobtest", vscode.TreeItemCollapsibleState.Expanded, null, session, iJob); @@ -563,7 +563,7 @@ describe("Zos Jobs Unit Tests", () => { describe("JobSpool Unit Test", () => { const getSpoolFiles = jest.fn(); - Object.defineProperty(brightside, "GetJobs", { value: GetJobs }); + Object.defineProperty(zowe, "GetJobs", { value: GetJobs }); Object.defineProperty(GetJobs, "getSpoolFiles", { value: getSpoolFiles }); const session = new Session({ @@ -574,7 +574,7 @@ describe("Zos Jobs Unit Tests", () => { type: "basic", }); - const iJob: brightside.IJob = { + const iJob: zowe.IJob = { "jobid": "JOB1234", "jobname": "TESTJOB", "files-url": "fake/files", @@ -600,7 +600,7 @@ describe("Zos Jobs Unit Tests", () => { "url": "fake/url" }; - const iJobFile: brightside.IJobFile = { + const iJobFile: zowe.IJobFile = { "byte-count": 128, "job-correlator": "", "record-count": 1, diff --git a/__tests__/__unit__/ZoweNode.unit.test.ts b/__tests__/__unit__/ZoweNode.unit.test.ts index 265ed87929..bacd95f6c7 100644 --- a/__tests__/__unit__/ZoweNode.unit.test.ts +++ b/__tests__/__unit__/ZoweNode.unit.test.ts @@ -11,16 +11,16 @@ // tslint:disable:no-shadowed-variable jest.mock("vscode"); -jest.mock("@brightside/imperative"); -jest.mock("@brightside/core/lib/zosfiles/src/api/methods/list/doc/IListOptions"); +jest.mock("@zowe/imperative"); +jest.mock("@zowe/cli"); jest.mock("Session"); jest.mock("../../src/ProfileLoader"); import * as vscode from "vscode"; import { ZoweNode } from "../../src/ZoweNode"; -import { Session } from "@brightside/imperative"; +import { Session } from "@zowe/imperative"; import * as extension from "../../src/extension"; import * as profileLoader from "../../src/ProfileLoader"; -import { List } from "@brightside/core"; +import { List } from "@zowe/cli"; describe("Unit Tests (Jest)", () => { // Globals diff --git a/__tests__/__unit__/ZoweUSSNode.unit.test.ts b/__tests__/__unit__/ZoweUSSNode.unit.test.ts index 781f7e1151..7f649de80b 100644 --- a/__tests__/__unit__/ZoweUSSNode.unit.test.ts +++ b/__tests__/__unit__/ZoweUSSNode.unit.test.ts @@ -11,10 +11,9 @@ // tslint:disable:no-shadowed-variable jest.mock("vscode"); -jest.mock("@brightside/imperative"); -jest.mock("@brightside/core/lib/zosfiles/src/api/methods/list/doc/IListOptions"); +jest.mock("@zowe/imperative"); jest.mock("Session"); -import { Session } from "@brightside/imperative"; +import { Session } from "@zowe/imperative"; import * as vscode from "vscode"; import { ZoweUSSNode } from "../../src/ZoweUSSNode"; import * as utils from "../../src/utils"; diff --git a/__tests__/__unit__/extension.unit.test.ts b/__tests__/__unit__/extension.unit.test.ts index 277b6d3f28..761d2d014a 100644 --- a/__tests__/__unit__/extension.unit.test.ts +++ b/__tests__/__unit__/extension.unit.test.ts @@ -14,10 +14,10 @@ import * as treeMock from "../../src/DatasetTree"; import * as treeUSSMock from "../../src/USSTree"; import { ZoweUSSNode } from "../../src/ZoweUSSNode"; import { ZoweNode } from "../../src/ZoweNode"; -import * as brtimperative from "@brightside/imperative"; +import * as imperative from "@zowe/imperative"; import * as extension from "../../src/extension"; import * as path from "path"; -import * as brightside from "@brightside/core"; +import * as zowe from "@zowe/cli"; import * as fs from "fs"; import * as fsextra from "fs-extra"; import * as profileLoader from "../../src/Profiles"; @@ -27,8 +27,8 @@ import * as utils from "../../src/utils"; jest.mock("vscode"); jest.mock("Session"); -jest.mock("@brightside/core"); -jest.mock("@brightside/imperative"); +jest.mock("@zowe/cli"); +jest.mock("@zowe/imperative"); jest.mock("fs"); jest.mock("fs-extra"); jest.mock("DatasetTree"); @@ -36,7 +36,7 @@ jest.mock("USSTree"); describe("Extension Unit Tests", () => { // Globals - const session = new brtimperative.Session({ + const session = new imperative.Session({ user: "fake", password: "fake", hostname: "fake", @@ -44,7 +44,7 @@ describe("Extension Unit Tests", () => { type: "basic", }); - const iJob: brightside.IJob = { + const iJob: zowe.IJob = { "jobid": "JOB1234", "jobname": "TESTJOB", "files-url": "fake/files", @@ -70,7 +70,7 @@ describe("Extension Unit Tests", () => { "url": "fake/url" }; - const iJobFile: brightside.IJobFile = { + const iJobFile: zowe.IJobFile = { "byte-count": 128, "job-correlator": "", "record-count": 1, @@ -267,7 +267,7 @@ describe("Extension Unit Tests", () => { }); Object.defineProperty(fs, "mkdirSync", {value: mkdirSync}); - Object.defineProperty(brtimperative, "CliProfileManager", {value: CliProfileManager}); + Object.defineProperty(imperative, "CliProfileManager", {value: CliProfileManager}); Object.defineProperty(vscode.window, "createTreeView", {value: createTreeView}); Object.defineProperty(vscode.window, "createWebviewPanel", {value: createWebviewPanel}); Object.defineProperty(vscode, "Uri", {value: Uri}); @@ -293,15 +293,15 @@ describe("Extension Unit Tests", () => { Object.defineProperty(document, "save", {value: save}); Object.defineProperty(document, "getText", {value: getText}); Object.defineProperty(vscode.commands, "executeCommand", {value: executeCommand}); - Object.defineProperty(brightside, "ZosmfSession", {value: ZosmfSession}); + Object.defineProperty(zowe, "ZosmfSession", {value: ZosmfSession}); Object.defineProperty(ZosmfSession, "createBasicZosmfSession", {value: createBasicZosmfSession}); - Object.defineProperty(brightside, "Upload", {value: Upload}); + Object.defineProperty(zowe, "Upload", {value: Upload}); Object.defineProperty(Upload, "bufferToDataSet", {value: bufferToDataSet}); Object.defineProperty(Upload, "pathToDataSet", {value: pathToDataSet}); Object.defineProperty(Upload, "fileToUSSFile", {value: fileToUSSFile}); - Object.defineProperty(brightside, "Create", {value: Create}); + Object.defineProperty(zowe, "Create", {value: Create}); Object.defineProperty(Create, "dataSet", {value: dataSetCreate}); - Object.defineProperty(brightside, "List", {value: List}); + Object.defineProperty(zowe, "List", {value: List}); Object.defineProperty(List, "dataSet", {value: dataSetList}); Object.defineProperty(List, "fileList", {value: fileList}); Object.defineProperty(vscode.workspace, "openTextDocument", {value: openTextDocument}); @@ -312,25 +312,25 @@ describe("Extension Unit Tests", () => { Object.defineProperty(vscode.window, "showQuickPick", {value: showQuickPick}); Object.defineProperty(vscode.window, "withProgress", {value: withProgress}); Object.defineProperty(vscode.window, "createOutputChannel", {value: createOutputChannel}); - Object.defineProperty(brightside, "Download", {value: Download}); + Object.defineProperty(zowe, "Download", {value: Download}); Object.defineProperty(Download, "dataSet", {value: dataSet}); Object.defineProperty(treeMock, "DatasetTree", {value: DatasetTree}); Object.defineProperty(treeUSSMock, "USSTree", {value: USSTree}); - Object.defineProperty(brightside, "Delete", {value: Delete}); + Object.defineProperty(zowe, "Delete", {value: Delete}); Object.defineProperty(Delete, "dataSet", {value: delDataset}); - Object.defineProperty(brightside, "CreateDataSetTypeEnum", {value: CreateDataSetTypeEnum}); - Object.defineProperty(brightside, "Utilities", {value: Utilities}); + Object.defineProperty(zowe, "CreateDataSetTypeEnum", {value: CreateDataSetTypeEnum}); + Object.defineProperty(zowe, "Utilities", {value: Utilities}); Object.defineProperty(Download, "ussFile", {value: ussFile}); Object.defineProperty(Utilities, "isFileTagBinOrAscii", {value: isFileTagBinOrAscii}); - Object.defineProperty(brightside, "GetJobs", {value: GetJobs}); + Object.defineProperty(zowe, "GetJobs", {value: GetJobs}); Object.defineProperty(GetJobs, "getSpoolContentById", {value: getSpoolContentById}); Object.defineProperty(GetJobs, "getJclForJob", {value: getJclForJob}); - Object.defineProperty(brightside, "DownloadJobs", {value: DownloadJobs}); + Object.defineProperty(zowe, "DownloadJobs", {value: DownloadJobs}); Object.defineProperty(DownloadJobs, "downloadAllSpoolContentCommon", {value: downloadAllSpoolContentCommon}); - Object.defineProperty(brightside, "SubmitJobs", {value: SubmitJobs}); + Object.defineProperty(zowe, "SubmitJobs", {value: SubmitJobs}); Object.defineProperty(SubmitJobs, "submitJcl", {value: submitJcl}); Object.defineProperty(SubmitJobs, "submitJob", {value: submitJob}); - Object.defineProperty(brightside, "IssueCommand", {value: IssueCommand}); + Object.defineProperty(zowe, "IssueCommand", {value: IssueCommand}); Object.defineProperty(IssueCommand, "issueSimple", {value: issueSimple}); Object.defineProperty(vscode.workspace, "registerTextDocumentContentProvider", { value: registerTextDocumentContentProvider}); Object.defineProperty(vscode.Disposable, "from", {value: from}); diff --git a/__tests__/__unit__/jes/jesNodeActions.unit.test.ts b/__tests__/__unit__/jes/jesNodeActions.unit.test.ts index c2575fd110..a0352064f9 100644 --- a/__tests__/__unit__/jes/jesNodeActions.unit.test.ts +++ b/__tests__/__unit__/jes/jesNodeActions.unit.test.ts @@ -9,9 +9,9 @@ * * */ -jest.mock("@brightside/core"); +jest.mock("@zowe/cli"); import * as jesNodeActions from "../../../src/jes/jesNodeActions"; -import * as brightside from "@brightside/core"; +import * as zowe from "@zowe/cli"; describe("jesNodeActions", () => { @@ -23,7 +23,7 @@ describe("jesNodeActions", () => { const JESMSGLG = "JESMSGLG"; const JESJCL = "JESJCL"; const JESYSMSG = "JESYSMSG"; - const iJobFile: brightside.IJobFile = { + const iJobFile: zowe.IJobFile = { "byte-count": 128, "job-correlator": "", "record-count": 1, diff --git a/__tests__/__unit__/uss/ussNodeActions.unit.test.ts b/__tests__/__unit__/uss/ussNodeActions.unit.test.ts index bffc45b4a2..21cf0db3f5 100644 --- a/__tests__/__unit__/uss/ussNodeActions.unit.test.ts +++ b/__tests__/__unit__/uss/ussNodeActions.unit.test.ts @@ -11,8 +11,8 @@ import * as vscode from "vscode"; import { ZoweUSSNode } from "../../../src/ZoweUSSNode"; -import * as brtimperative from "@brightside/imperative"; -import * as zowe from "@brightside/core"; +import * as imperative from "@zowe/imperative"; +import * as zowe from "@zowe/cli"; import * as ussNodeActions from "../../../src/uss/ussNodeActions"; import * as extension from "../../../src/extension"; import * as path from "path"; @@ -72,7 +72,7 @@ function getUSSTree() { return testUSSTree1; } -const session = new brtimperative.Session({ +const session = new imperative.Session({ user: "fake", password: "fake", hostname: "fake", diff --git a/docs/README.md b/docs/README.md index 96038a1265..eefc646ffc 100644 --- a/docs/README.md +++ b/docs/README.md @@ -10,7 +10,7 @@ Developers can install the Visual Studio Code Extension for Zowe, which lets use ## Install to VSC from source -You can build the extension (VSIX file) from this source repository and install it to VSC. +You can build the extension (VSIX file) from this source repository and install it to VSC. **Important!** Follow the [instructions for creating testProfileData.ts](#run-system-tests) before performing these steps. @@ -41,7 +41,7 @@ The following topics describe how to run system tests on the Visual Studio Code In your copy of this repository, create a `testProfileData.ts` file in the `resources` directory. In this file, include the following text with your credentials: ```typescript -import { IProfile } from "@brightside/imperative"; +import { IProfile } from "@zowe/imperative"; export const profile: IProfile = { type : "zosmf", diff --git a/package-lock.json b/package-lock.json index 989c880ae4..029a749779 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "vscode-extension-for-zowe", - "version": "0.27.0", + "version": "0.28.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -177,60 +177,6 @@ "to-fast-properties": "^2.0.0" } }, - "@brightside/core": { - "version": "2.32.1", - "resolved": "https://dl.bintray.com//ca/brightside/@brightside/core/-/@brightside/core-2.32.1.tgz", - "integrity": "sha1-jNMh4v3l4ELoIHFLpvqCmS9crv0=", - "requires": { - "@brightside/imperative": "2.7.3", - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", - "ssh2": "^0.8.2", - "string-width": "2.1.1" - } - }, - "@brightside/imperative": { - "version": "2.7.3", - "resolved": "https://dl.bintray.com//ca/brightside/@brightside/imperative/-/@brightside/imperative-2.7.3.tgz", - "integrity": "sha1-q3vMuEl8g78q9XJ/p1BOxhACkmA=", - "requires": { - "@types/lodash-deep": "^2.0.0", - "@types/yargs": "8.0.2", - "chalk": "2.4.2", - "cli-table3": "0.5.1", - "dataobject-parser": "1.2.1", - "deepmerge": "3.0.0", - "find-up": "2.1.0", - "fs-extra": "8.1.0", - "glob": "7.1.4", - "js-yaml": "3.13.1", - "jsonfile": "4.0.0", - "jsonschema": "1.1.1", - "levenshtein": "1.0.5", - "lodash-deep": "^2.0.0", - "log4js": "3.0.5", - "marked": "0.7.0", - "mkdirp": "0.5.1", - "moment": "2.20.1", - "mustache": "2.3.0", - "opener": "1.5.1", - "prettyjson": "1.2.1", - "progress": "2.0.0", - "rimraf": "2.6.3", - "semver": "5.7.0", - "stack-trace": "0.0.10", - "wrap-ansi": "3.0.1", - "yamljs": "0.3.0", - "yargs": "8.0.2" - }, - "dependencies": { - "@types/yargs": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-8.0.2.tgz", - "integrity": "sha512-Upj9YsBZRgjEVPvsaeGru48d2JiyzBNZkmkebHyoaQ+UM9wqj/rp5mkilRjSq/Ga45yfd/zwrNuML9f2gGfVpw==" - } - } - }, "@cnakazawa/watch": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz", @@ -724,6 +670,105 @@ "integrity": "sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==", "dev": true }, + "@zowe/cli": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@zowe/cli/-/cli-6.4.1.tgz", + "integrity": "sha512-zItj/LX6/bI6zMwo5IWKzaRC67hCEYhsM27IEo4laMLfsnfj6NQViUlz8cujgEASUn6lwdX2TYfL4mB2+fSQyA==", + "requires": { + "@zowe/imperative": "4.4.4", + "@zowe/perf-timing": "^1.0.3-alpha.201902201448", + "get-stdin": "^7.0.0", + "js-yaml": "^3.13.1", + "minimatch": "^3.0.4", + "ssh2": "^0.8.2", + "string-width": "2.1.1" + }, + "dependencies": { + "get-stdin": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz", + "integrity": "sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==" + } + } + }, + "@zowe/imperative": { + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/@zowe/imperative/-/imperative-4.4.4.tgz", + "integrity": "sha512-yzQTb1dkreLlojOHQ/20n4wrs2f2542XY6mKONSKeQdnGUNdDwzGQY3iCSkMwSzwl95pns+HQX5q9Nf/l1fYKA==", + "requires": { + "@types/lodash-deep": "^2.0.0", + "@types/yargs": "8.0.2", + "@zowe/perf-timing": "1.0.3", + "chalk": "2.4.2", + "cli-table3": "0.5.1", + "dataobject-parser": "1.2.1", + "deepmerge": "3.0.0", + "find-up": "2.1.0", + "fs-extra": "8.1.0", + "glob": "7.1.1", + "js-yaml": "3.13.1", + "jsonfile": "4.0.0", + "jsonschema": "1.1.1", + "levenshtein": "1.0.5", + "lodash-deep": "^2.0.0", + "log4js": "3.0.5", + "marked": "^0.7.0", + "mkdirp": "0.5.1", + "moment": "2.20.1", + "mustache": "2.3.0", + "opener": "1.5.1", + "prettyjson": "1.2.1", + "progress": "2.0.0", + "readline-sync": "1.4.9", + "rimraf": "2.6.3", + "semver": "5.7.0", + "stack-trace": "0.0.10", + "wrap-ansi": "3.0.1", + "yamljs": "0.3.0", + "yargs": "8.0.2" + }, + "dependencies": { + "@types/yargs": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-8.0.2.tgz", + "integrity": "sha512-Upj9YsBZRgjEVPvsaeGru48d2JiyzBNZkmkebHyoaQ+UM9wqj/rp5mkilRjSq/Ga45yfd/zwrNuML9f2gGfVpw==" + }, + "glob": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", + "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.2", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + } + } + }, + "@zowe/perf-timing": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@zowe/perf-timing/-/perf-timing-1.0.3.tgz", + "integrity": "sha512-pMwNBg6WvSm7SGpE8Rdo5ztaN4ymVoghPGg3PLBVn5ur9blwpSFywJQ7bv5LLKhBwJrhoEckOcc9Ric3dcSs5Q==", + "requires": { + "fs-extra": "7.0.1", + "pkg-up": "2.0.0" + }, + "dependencies": { + "fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + } + } + }, "abab": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz", @@ -3799,10 +3844,9 @@ } }, "handlebars": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.2.tgz", - "integrity": "sha512-29Zxv/cynYB7mkT1rVWQnV7mGX6v7H/miQ6dbEpYTKq5eJBN7PsRB+ViYJlcT6JINTSu4dVB9kOqEun78h6Exg==", - "dev": true, + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz", + "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==", "requires": { "neo-async": "^2.6.0", "optimist": "^0.6.1", @@ -3813,8 +3857,7 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } }, @@ -6106,8 +6149,7 @@ "neo-async": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", - "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", - "dev": true + "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==" }, "next-tick": { "version": "1.0.0", @@ -6359,7 +6401,6 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, "requires": { "minimist": "~0.0.1", "wordwrap": "~0.0.2" @@ -6728,6 +6769,14 @@ } } }, + "pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz", + "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=", + "requires": { + "find-up": "^2.1.0" + } + }, "plugin-error": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz", @@ -6999,6 +7048,11 @@ "readable-stream": "^2.0.2" } }, + "readline-sync": { + "version": "1.4.9", + "resolved": "https://registry.npmjs.org/readline-sync/-/readline-sync-1.4.9.tgz", + "integrity": "sha1-PtqOZfI80qF+YTAbHwADOWr17No=" + }, "realpath-native": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz", @@ -8323,7 +8377,6 @@ "version": "3.6.9", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.9.tgz", "integrity": "sha512-pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw==", - "dev": true, "optional": true, "requires": { "commander": "~2.20.3", @@ -8334,7 +8387,6 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, "optional": true } } @@ -8906,8 +8958,7 @@ "wordwrap": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", - "dev": true + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" }, "wrap-ansi": { "version": "3.0.1", diff --git a/package.json b/package.json index 71da322771..432256a774 100644 --- a/package.json +++ b/package.json @@ -1141,7 +1141,7 @@ "vscode-nls-dev": "^3.2.6" }, "dependencies": { - "@brightside/core": "2.32.1", + "@zowe/cli": "6.4.1", "@types/fs-extra": "^7.0.0", "fs-extra": "^8.0.1", "gulp-cli": "^2.2.0", diff --git a/resources/testProfileData.example.ts b/resources/testProfileData.example.ts index c3ce536d0a..4f97bbbcc2 100644 --- a/resources/testProfileData.example.ts +++ b/resources/testProfileData.example.ts @@ -1,4 +1,4 @@ -import { IProfile } from "@brightside/imperative"; +import { IProfile } from "@zowe/imperative"; export const profile: IProfile = { type : "zosmf", diff --git a/scripts/systemTestEnv.ts b/scripts/systemTestEnv.ts index a868ad0cfc..1121e84b82 100755 --- a/scripts/systemTestEnv.ts +++ b/scripts/systemTestEnv.ts @@ -1,6 +1,6 @@ import { profile, normalPattern, ussPattern } from "../resources/testProfileData"; -import { Create, CreateDataSetTypeEnum, Upload, Delete } from "@brightside/core"; -import { Session, Logger } from "@brightside/imperative"; +import { Create, CreateDataSetTypeEnum, Upload, Delete } from "@zowe/cli"; +import { Session, Logger } from "@zowe/imperative"; const session: Session = new Session({ hostname: profile.host, diff --git a/src/DatasetTree.ts b/src/DatasetTree.ts index 4d19564681..29054dc8e0 100644 --- a/src/DatasetTree.ts +++ b/src/DatasetTree.ts @@ -9,8 +9,8 @@ * * */ -import * as zowe from "@brightside/core"; -import { IProfileLoaded, Logger } from "@brightside/imperative"; +import * as zowe from "@zowe/cli"; +import { IProfileLoaded, Logger } from "@zowe/imperative"; import * as path from "path"; import * as vscode from "vscode"; import * as nls from "vscode-nls"; diff --git a/src/ProfileLoader.ts b/src/ProfileLoader.ts index 1e3f6d4c1b..2d7993baac 100644 --- a/src/ProfileLoader.ts +++ b/src/ProfileLoader.ts @@ -11,7 +11,7 @@ import { spawnSync } from "child_process"; import * as path from "path"; -import { IProfileLoaded, Logger } from "@brightside/imperative"; +import { IProfileLoaded, Logger } from "@zowe/imperative"; import * as vscode from "vscode"; import * as nls from "vscode-nls"; const localize = nls.config({ messageFormat: nls.MessageFormat.file })(); diff --git a/src/Profiles.ts b/src/Profiles.ts index cc838b738c..08a4d184fb 100644 --- a/src/Profiles.ts +++ b/src/Profiles.ts @@ -9,7 +9,7 @@ * * */ -import { IProfileLoaded, Logger, CliProfileManager, Imperative, ImperativeConfig, IProfile } from "@brightside/imperative"; +import { IProfileLoaded, Logger, CliProfileManager, Imperative, ImperativeConfig, IProfile } from "@zowe/imperative"; import * as nls from "vscode-nls"; import * as os from "os"; import * as fs from "fs"; @@ -17,9 +17,7 @@ import * as path from "path"; import * as ProfileLoader from "./ProfileLoader"; import { URL } from "url"; import * as vscode from "vscode"; -import * as zowe from "@brightside/core"; -import { DatasetTree } from "./DatasetTree"; -import { addSession } from "./extension"; +import * as zowe from "@zowe/cli"; const localize = nls.config({ messageFormat: nls.MessageFormat.file })(); let url: URL; let validURL: string; @@ -230,10 +228,10 @@ export class Profiles { // Processing stops if there are no profiles detected } private async saveProfile(ProfileInfo, ProfileName, ProfileType) { - const mainZoweDir = path.join(require.resolve("@brightside/core"), "..", "..", "..", ".."); + const mainZoweDir = path.join(require.resolve("@zowe/cli"), "..", "..", "..", ".."); // we have to mock a few things to get the Imperative.init to work properly try { - (process.mainModule as any).filename = require.resolve("@brightside/core"); + (process.mainModule as any).filename = require.resolve("@zowe/cli"); } catch (error) { vscode.window.showErrorMessage(error.message); } @@ -244,7 +242,7 @@ export class Profiles { // Processing stops if there are no profiles detected } try { // we need to call Imperative.init so that any installed credential manager plugins are loaded - await Imperative.init({ configurationModule: require.resolve("@brightside/core/lib/imperative.js") }); + await Imperative.init({ configurationModule: require.resolve("@zowe/cli/lib/imperative.js") }); } catch (error) { vscode.window.showErrorMessage(error.message); } diff --git a/src/SpoolProvider.ts b/src/SpoolProvider.ts index 2be1184f3c..d7ceb8c840 100644 --- a/src/SpoolProvider.ts +++ b/src/SpoolProvider.ts @@ -10,7 +10,7 @@ */ import * as vscode from "vscode"; -import * as zowe from "@brightside/core"; +import * as zowe from "@zowe/cli"; import { Profiles } from "./Profiles"; export default class SpoolProvider implements vscode.TextDocumentContentProvider { diff --git a/src/USSTree.ts b/src/USSTree.ts index d862c8707c..bdea9ce3cd 100644 --- a/src/USSTree.ts +++ b/src/USSTree.ts @@ -9,9 +9,8 @@ * * */ -import * as zowe from "@brightside/core"; -// tslint:disable-next-line: no-implicit-dependencies -import { IProfileLoaded, Logger } from "@brightside/imperative"; +import * as zowe from "@zowe/cli"; +import { IProfileLoaded, Logger } from "@zowe/imperative"; import { applyIcons, FilterItem, FilterDescriptor, resolveQuickPickHelper, sortTreeItems } from "./utils"; import * as vscode from "vscode"; import { ZoweUSSNode } from "./ZoweUSSNode"; diff --git a/src/ZosJobsProvider.ts b/src/ZosJobsProvider.ts index f78100be61..48b7f731d7 100644 --- a/src/ZosJobsProvider.ts +++ b/src/ZosJobsProvider.ts @@ -10,9 +10,8 @@ */ import * as vscode from "vscode"; -import { ZosmfSession, IJob, DeleteJobs, Utilities } from "@brightside/core"; -import { IProfileLoaded, Logger } from "@brightside/imperative"; -// tslint:disable-next-line: no-duplicate-imports +import { ZosmfSession, IJob, DeleteJobs } from "@zowe/cli"; +import { IProfileLoaded, Logger } from "@zowe/imperative"; import { Profiles } from "./Profiles"; import { PersistentFilters } from "./PersistentFilters"; import { Job } from "./ZoweJobNode"; diff --git a/src/ZoweJobNode.ts b/src/ZoweJobNode.ts index e834335a55..9daaac4fb9 100644 --- a/src/ZoweJobNode.ts +++ b/src/ZoweJobNode.ts @@ -10,12 +10,9 @@ */ import * as vscode from "vscode"; -import * as zowe from "@brightside/core"; -import { Session, IProfileLoaded, Logger } from "@brightside/imperative"; -// tslint:disable-next-line: no-duplicate-imports -import { IJob, IJobFile } from "@brightside/core"; +import * as zowe from "@zowe/cli"; +import { Session } from "@zowe/imperative"; import * as extension from "./extension"; -import { ZosJobsProvider } from "./ZosJobsProvider"; import * as utils from "./utils"; // tslint:disable-next-line: max-classes-per-file @@ -34,7 +31,7 @@ export class Job extends vscode.TreeItem { private _searchId: string; constructor(public label: string, public mCollapsibleState: vscode.TreeItemCollapsibleState, - public mParent: Job, public session: Session, public job: IJob) { + public mParent: Job, public session: Session, public job: zowe.IJob) { super(label, mCollapsibleState); if (session) { this._owner = session.ISession.user; @@ -182,7 +179,7 @@ export class Job extends vscode.TreeItem { // tslint:disable-next-line: max-classes-per-file class Spool extends Job { constructor(public label: string, public mCollapsibleState: vscode.TreeItemCollapsibleState, public mParent: Job, - public session: Session, public spool: IJobFile, public job: IJob, public parent: Job) { + public session: Session, public spool: zowe.IJobFile, public job: zowe.IJob, public parent: Job) { super(label, mCollapsibleState, mParent, session, job); this.contextValue = extension.JOBS_SPOOL_CONTEXT; utils.applyIcons(this); diff --git a/src/ZoweNode.ts b/src/ZoweNode.ts index c495192fa4..488963e38d 100644 --- a/src/ZoweNode.ts +++ b/src/ZoweNode.ts @@ -9,9 +9,9 @@ * * */ -import * as zowe from "@brightside/core"; +import * as zowe from "@zowe/cli"; import * as vscode from "vscode"; -import { Session } from "@brightside/imperative"; +import { Session } from "@zowe/imperative"; import * as nls from "vscode-nls"; import * as utils from "./utils"; import * as extension from "../src/extension"; diff --git a/src/ZoweUSSNode.ts b/src/ZoweUSSNode.ts index 69e8ab7c24..a58678b950 100644 --- a/src/ZoweUSSNode.ts +++ b/src/ZoweUSSNode.ts @@ -9,8 +9,8 @@ * * */ -import * as zowe from "@brightside/core"; -import { Session } from "@brightside/imperative"; +import * as zowe from "@zowe/cli"; +import { Session } from "@zowe/imperative"; import * as vscode from "vscode"; import * as nls from "vscode-nls"; const localize = nls.config({ messageFormat: nls.MessageFormat.file })(); diff --git a/src/extension.ts b/src/extension.ts index b089feb465..893fa3e274 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -9,13 +9,13 @@ * * */ -import * as zowe from "@brightside/core"; +import * as zowe from "@zowe/cli"; import * as fs from "fs"; import { moveSync } from "fs-extra"; import * as path from "path"; import * as vscode from "vscode"; import { ZoweNode } from "./ZoweNode"; -import { Logger, TextUtils, IProfileLoaded } from "@brightside/imperative"; +import { Logger, TextUtils, IProfileLoaded } from "@zowe/imperative"; import { DatasetTree, createDatasetTree } from "./DatasetTree"; import { ZosJobsProvider, createJobsTree } from "./ZosJobsProvider"; import { Job } from "./ZoweJobNode"; @@ -23,8 +23,6 @@ import { USSTree, createUSSTree } from "./USSTree"; import { ZoweUSSNode } from "./ZoweUSSNode"; import * as ussActions from "./uss/ussNodeActions"; import * as mvsActions from "./mvs/mvsNodeActions"; -// tslint:disable-next-line: no-duplicate-imports -import { IJobFile } from "@brightside/core"; import { Profiles } from "./Profiles"; import * as nls from "vscode-nls"; import * as utils from "./utils"; @@ -1518,7 +1516,7 @@ export async function stopCommand(job: Job) { } } -export async function getSpoolContent(session: string, spool: IJobFile) { +export async function getSpoolContent(session: string, spool: zowe.IJobFile) { try { const uri = encodeJobFile(session, spool); const document = await vscode.workspace.openTextDocument(uri); diff --git a/src/getAllProfiles.ts b/src/getAllProfiles.ts index c7faefaf7c..b376db8cd8 100644 --- a/src/getAllProfiles.ts +++ b/src/getAllProfiles.ts @@ -9,7 +9,7 @@ * * */ -import { Imperative, CliProfileManager, ImperativeConfig } from "@brightside/imperative"; +import { Imperative, CliProfileManager, ImperativeConfig } from "@zowe/imperative"; import * as path from "path"; /** @@ -17,12 +17,12 @@ import * as path from "path"; * We will then parse the output from the extension to load the profiles */ (async () => { - const mainZoweDir = path.join(require.resolve("@brightside/core"), "..", "..", "..", ".."); + const mainZoweDir = path.join(require.resolve("@zowe/cli"), "..", "..", "..", ".."); // we have to mock a few things to get the Imperative.init to work properly - (process.mainModule as any).filename = require.resolve("@brightside/core"); + (process.mainModule as any).filename = require.resolve("@zowe/cli"); ((process.mainModule as any).paths as any).unshift(mainZoweDir); // we need to call Imperative.init so that any installed credential manager plugins are loaded - await Imperative.init({ configurationModule: require.resolve("@brightside/core/lib/imperative.js") }); + await Imperative.init({ configurationModule: require.resolve("@zowe/cli/lib/imperative.js") }); const zosmfProfiles = (await new CliProfileManager({ profileRootDirectory: path.join(ImperativeConfig.instance.cliHome, "profiles"), type: "zosmf" diff --git a/src/getDefaultProfile.ts b/src/getDefaultProfile.ts index 409d30efb9..d80c2c7895 100644 --- a/src/getDefaultProfile.ts +++ b/src/getDefaultProfile.ts @@ -9,7 +9,7 @@ * * */ -import { Imperative, CliProfileManager, ImperativeConfig } from "@brightside/imperative"; +import { Imperative, CliProfileManager, ImperativeConfig } from "@zowe/imperative"; import * as path from "path"; /** @@ -17,12 +17,12 @@ import * as path from "path"; * We will then parse the output from the extension to load the profile */ (async () => { - const mainZoweDir = path.join(require.resolve("@brightside/core"), "..", "..", "..", ".."); + const mainZoweDir = path.join(require.resolve("@zowe/cli"), "..", "..", "..", ".."); // we have to mock a few things to get the Imperative.init to work properly - (process.mainModule as any).filename = require.resolve("@brightside/core"); + (process.mainModule as any).filename = require.resolve("@zowe/cli"); ((process.mainModule as any).paths as any).unshift(mainZoweDir); // we need to call Imperative.init so that any installed credential manager plugins are loaded - await Imperative.init({ configurationModule: require.resolve("@brightside/core/lib/imperative.js") }); + await Imperative.init({ configurationModule: require.resolve("@zowe/cli/lib/imperative.js") }); const zosmfProfiles = await new CliProfileManager({ profileRootDirectory: path.join(ImperativeConfig.instance.cliHome, "profiles"), type: "zosmf" diff --git a/src/jes/jesNodeActions.ts b/src/jes/jesNodeActions.ts index eb01583e8e..2c2decdd5c 100644 --- a/src/jes/jesNodeActions.ts +++ b/src/jes/jesNodeActions.ts @@ -9,7 +9,7 @@ * * */ -import { IJobFile } from "@brightside/core"; +import { IJobFile } from "@zowe/cli"; export function getSpoolLanguage(spool: IJobFile) { const name = spool.ddname.toLocaleUpperCase(); diff --git a/src/mvs/mvsNodeActions.ts b/src/mvs/mvsNodeActions.ts index b626560685..119b3344d8 100644 --- a/src/mvs/mvsNodeActions.ts +++ b/src/mvs/mvsNodeActions.ts @@ -9,7 +9,7 @@ * * */ -import * as zowe from "@brightside/core"; +import * as zowe from "@zowe/cli"; import * as vscode from "vscode"; import { ZoweNode } from "../ZoweNode"; import { DatasetTree } from "../DatasetTree"; diff --git a/src/uss/ussNodeActions.ts b/src/uss/ussNodeActions.ts index 01d58861f6..65b32f45ce 100644 --- a/src/uss/ussNodeActions.ts +++ b/src/uss/ussNodeActions.ts @@ -12,7 +12,7 @@ import { USSTree } from "../USSTree"; import { ZoweUSSNode } from "../ZoweUSSNode"; import * as vscode from "vscode"; -import * as zowe from "@brightside/core"; +import * as zowe from "@zowe/cli"; import * as fs from "fs"; import * as utils from "../utils"; import * as nls from "vscode-nls"; diff --git a/src/utils.ts b/src/utils.ts index 7ebd50ca0a..4bad6f39f6 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -10,9 +10,6 @@ */ import * as path from "path"; -import * as os from "os"; -import * as zowe from "@brightside/core"; -import { CliProfileManager } from "@brightside/imperative"; import { TreeItem, QuickPickItem, QuickPick } from "vscode"; import * as extension from "../src/extension"; import * as nls from "vscode-nls"; diff --git a/tslint.json b/tslint.json index e69cf0a068..c79a925023 100644 --- a/tslint.json +++ b/tslint.json @@ -39,7 +39,7 @@ "no-implicit-dependencies": [ true, "dev", - ["@brightside/imperative"] + ["@zowe/imperative"] ] }, "linterOptions": { From 33dd1e41aefc05cb9c81b42bf2c78c6fcc2b75bf Mon Sep 17 00:00:00 2001 From: zFernand0 Date: Wed, 20 Nov 2019 13:24:59 -0500 Subject: [PATCH 02/16] Handle Imperative breaking change Signed-off-by: zFernand0 --- src/Profiles.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Profiles.ts b/src/Profiles.ts index 08a4d184fb..4cd128ce0f 100644 --- a/src/Profiles.ts +++ b/src/Profiles.ts @@ -265,8 +265,12 @@ export class Profiles { // Processing stops if there are no profiles detected try { const fileName = path.join(homedir, ".zowe", "settings", "imperative.json"); const settings = JSON.parse(fs.readFileSync(fileName).toString()); - const value = settings.overrides.CredentialManager; - this.spawnValue = value !== false ? 0 : 1; + + if (settings.overrides.CredentialManager !== null && settings.overrides.CredentialManager !== undefined) { + this.spawnValue = settings.overrides.CredentialManager !== false ? 0 : 1; + } else if (settings.overrides["credential-manager"] !== null && settings.overrides["credential-manager"] !== undefined) { + this.spawnValue = settings.overrides["credential-manager"] !== false ? 0 : 1; + } } catch (error) { // default to spawn this.spawnValue = 0; From d0b3cbffafa05cf1ab8189b5a86564b5d658915c Mon Sep 17 00:00:00 2001 From: zFernand0 Date: Wed, 20 Nov 2019 13:41:24 -0500 Subject: [PATCH 03/16] updating some files Signed-off-by: zFernand0 --- i18n/sample/package.i18n.json | 8 +++- i18n/sample/src/ProfileLoader.i18n.json | 7 ++-- i18n/sample/src/extension.i18n.json | 20 +++------- package-lock.json | 49 +++++++++++++++++-------- package.json | 2 +- 5 files changed, 51 insertions(+), 35 deletions(-) diff --git a/i18n/sample/package.i18n.json b/i18n/sample/package.i18n.json index 91e8517f23..b663ff7c9c 100644 --- a/i18n/sample/package.i18n.json +++ b/i18n/sample/package.i18n.json @@ -66,5 +66,11 @@ "Zowe-Default-USS-Persistent-Favorites": "Toggle if USS favorite files persist locally", "Zowe-Default-Jobs-Persistent-Favorites": "Toggle if Jobs favorite files persist locally", "Zowe-Environment": "Environment where the extension is running, default is VSCode", - "issueTsoCmd": "Zowe: Issue TSO Command..." + "issueTsoCmd": "Zowe: Issue TSO Command...", + "renameDataSet": "Rename Data Set", + "profile.configuration.title": "Zowe z/OSMF Profiles", + "profile.configuration.name": "Profile Name", + "profile.configuration.url": "z/OSMF URL", + "profile.configuration.user": "z/OSMF User Name", + "profile.configuration.ru": "Profile Reject Unauthorize" } \ No newline at end of file diff --git a/i18n/sample/src/ProfileLoader.i18n.json b/i18n/sample/src/ProfileLoader.i18n.json index aaf74b0fbe..a565b67952 100644 --- a/i18n/sample/src/ProfileLoader.i18n.json +++ b/i18n/sample/src/ProfileLoader.i18n.json @@ -4,8 +4,9 @@ "loadAllProfiles.error.loadAll2": "Please ensure that you have created at least one profile with Zowe CLI before attempting to use this extension. Error text:", "loadDefaultProfile.error.spawnProcess": "Failed to spawn process to retrieve default profile contents!\n", "loadDefaultProfile.error.profile1": "No default zosmf profile found for Zowe CLI.", - "loadDefaultProfile.error.profile2": " A default zosmf profile created with Zowe CLI is required to use the Zowe extension.", - "loadDefaultProfile.error.profile3": " Please [create at least one profile with Zowe CLI]", - "loadDefaultProfile.error.profile4": "(https://docs.zowe.org/stable/user-guide/cli-configuringcli.html#creating-zowe-cli-profiles).", + "loadDefaultProfile.error.profile2": " A default zosmf profile is required to use the Zowe extension.", + "loadDefaultProfile.error.profile3": " Please create at least one using the plus (+) sign in the", + "loadDefaultProfile.error.profile4": " Dataset, Jobs or USS tree or create a profile using ZOWE CLI ", + "loadDefaultProfile.error.profile5": "(https://docs.zowe.org/stable/user-guide/cli-configuringcli.html#creating-zowe-cli-profiles).", "loadDefaultProfile.debug.errorText": "Error text:" } \ No newline at end of file diff --git a/i18n/sample/src/extension.i18n.json b/i18n/sample/src/extension.i18n.json index f78fb0fb4a..f310482b81 100644 --- a/i18n/sample/src/extension.i18n.json +++ b/i18n/sample/src/extension.i18n.json @@ -22,16 +22,12 @@ "submitMember.error.invalidNode": "submitMember() called from invalid node.", "submitMember.jobSubmitted": "Job submitted ", "submitMember.jobSubmissionFailed": "Job submission failed\n", - "addSession.noProfile": "No profiles detected", - "addSession.quickPickOption": "Select a Profile to Add to the Data Set Explorer", + "addSession.quickPickOption": "Choose \"Create new...\" to define a new profile or select an existing profile to Add to the Jobs Explorer", + "addSession.log.debug.createNewProfile": "User created a new profile", "addSession.log.debug.selectedProfile": "User selected profile ", "addSession.log.debug.cancelledSelection": "User cancelled profile selection", - "addSession.noProfilesAdd": "No more profiles to add", - "addUSSSession.noProfile": "No profiles detected", - "addUSSSession.quickPickOption": "Select a Profile to Add to the USS Explorer", "addUSSSession.log.debug.selectProfile": "User selected profile ", "addUSSSession.log.debug.cancelledSelection": "User cancelled profile selection", - "addUSSSession.noProfileAdd": "No more profiles to add", "createFile.quickPickOption.dataSetType": "Type of Data Set to be Created", "createFile.dataSetBinary": "Data Set Binary", "createFile.dataSetC": "Data Set C", @@ -51,6 +47,9 @@ "showDSAttributes.log.error": "Error encountered when listing attributes! ", "showDSAttributes.error": "Unable to list attributes: ", "attributes.title": "Attributes", + "renameDataSet.log.debug": "Renaming data set ", + "renameDataSet.log.error": "Error encountered when renaming data set! ", + "renameDataSet.error": "Unable to rename data set: ", "deactivate.error": "Unable to delete temporary folder. ", "deleteDataset.log.debug": "Deleting data set ", "deleteDataset.quickPickOption": "Are you sure you want to delete ", @@ -105,13 +104,6 @@ "stopCommand.response": "Command response: ", "setOwner.newOwner.prompt.owner": "Owner", "setOwner.newOwner.prompt.prefix": "Prefix", - "addJobsSession.error.load": "Unable to load all profiles: ", - "addJobsSession.noProfilesDetected": "No profiles detected", - "addJobsSession.quickPickOptions.profileAdd": "Select a Profile to Add to the Jobs Explorer", "addJobsSession.log.debug.selectedProfile": "User selected profile ", - "addJobsSession.log.debug.cancelledProfile": "User cancelled profile selection", - "addJobsSession.noProfilesAdd": "No more profiles to add", - "renameDataSet.log.debug": "Renaming data set ", - "renameDataSet.log.error": "Error encountered when renaming data set! ", - "renameDataSet.error": "Unable to rename data set: " + "addJobsSession.log.debug.cancelledProfile": "User cancelled profile selection" } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 029a749779..4032c1b21e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "vscode-extension-for-zowe", - "version": "0.28.0", + "version": "0.29.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -8,6 +8,7 @@ "version": "7.5.5", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz", "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==", + "dev": true, "requires": { "@babel/highlight": "^7.0.0" } @@ -107,6 +108,7 @@ "version": "7.5.0", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz", "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==", + "dev": true, "requires": { "chalk": "^2.0.0", "esutils": "^2.0.2", @@ -1451,7 +1453,8 @@ "builtin-modules": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=" + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "dev": true }, "cache-base": { "version": "1.0.1", @@ -1784,7 +1787,8 @@ "commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true }, "component-emitter": { "version": "1.3.0", @@ -2159,9 +2163,10 @@ "dev": true }, "diff": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz", - "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==" + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", + "dev": true }, "diff-sequences": { "version": "24.9.0", @@ -2410,7 +2415,8 @@ "esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true }, "event-emitter": { "version": "0.3.5", @@ -3847,6 +3853,7 @@ "version": "4.5.3", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz", "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==", + "dev": true, "requires": { "neo-async": "^2.6.0", "optimist": "^0.6.1", @@ -3857,7 +3864,8 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true } } }, @@ -5310,7 +5318,8 @@ "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true }, "js-yaml": { "version": "3.13.1", @@ -6149,7 +6158,8 @@ "neo-async": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", - "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==" + "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", + "dev": true }, "next-tick": { "version": "1.0.0", @@ -6401,6 +6411,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "dev": true, "requires": { "minimist": "~0.0.1", "wordwrap": "~0.0.2" @@ -8269,18 +8280,20 @@ "tslib": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", - "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" + "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==", + "dev": true }, "tslint": { - "version": "5.20.0", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.0.tgz", - "integrity": "sha512-2vqIvkMHbnx8acMogAERQ/IuINOq6DFqgF8/VDvhEkBqQh/x6SP0Y+OHnKth9/ZcHQSroOZwUQSN18v8KKF0/g==", + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.17.0.tgz", + "integrity": "sha512-pflx87WfVoYepTet3xLfDOLDm9Jqi61UXIKePOuca0qoAZyrGWonDG9VTbji58Fy+8gciUn8Bt7y69+KEVjc/w==", + "dev": true, "requires": { "@babel/code-frame": "^7.0.0", "builtin-modules": "^1.1.1", "chalk": "^2.3.0", "commander": "^2.12.1", - "diff": "^4.0.1", + "diff": "^3.2.0", "glob": "^7.1.1", "js-yaml": "^3.13.1", "minimatch": "^3.0.4", @@ -8295,6 +8308,7 @@ "version": "2.29.0", "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", + "dev": true, "requires": { "tslib": "^1.8.1" } @@ -8377,6 +8391,7 @@ "version": "3.6.9", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.9.tgz", "integrity": "sha512-pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw==", + "dev": true, "optional": true, "requires": { "commander": "~2.20.3", @@ -8387,6 +8402,7 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, "optional": true } } @@ -8958,7 +8974,8 @@ "wordwrap": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", + "dev": true }, "wrap-ansi": { "version": "3.0.1", diff --git a/package.json b/package.json index 1d2785922c..3294c6a114 100644 --- a/package.json +++ b/package.json @@ -1159,6 +1159,7 @@ "run-sequence": "^2.2.1", "sinon": "^6.1.0", "ts-jest": "^24.0.2", + "tslint": "5.17.0", "typescript": "^3.5.1", "vsce": "^1.60.0", "vscode": "^1.1.30", @@ -1171,7 +1172,6 @@ "gulp-cli": "^2.2.0", "gulp-fs": "0.0.2", "jsdoc": "^3.6.3", - "tslint": "^5.17.0", "vscode-nls": "^4.1.1" }, "jest": { From 3ebf77b1260564ddb1b30804b9e4ec09d27145e2 Mon Sep 17 00:00:00 2001 From: zFernand0 Date: Wed, 20 Nov 2019 13:43:46 -0500 Subject: [PATCH 04/16] fix tslint issue Signed-off-by: zFernand0 --- src/ZosJobsProvider.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ZosJobsProvider.ts b/src/ZosJobsProvider.ts index 48b7f731d7..bc2e05c0a8 100644 --- a/src/ZosJobsProvider.ts +++ b/src/ZosJobsProvider.ts @@ -15,7 +15,15 @@ import { IProfileLoaded, Logger } from "@zowe/imperative"; import { Profiles } from "./Profiles"; import { PersistentFilters } from "./PersistentFilters"; import { Job } from "./ZoweJobNode"; -import { OwnerFilterDescriptor, JobIdFilterDescriptor, applyIcons, FilterItem, FilterDescriptor, resolveQuickPickHelper, sortTreeItems } from "./utils"; +import { + OwnerFilterDescriptor, + JobIdFilterDescriptor, + applyIcons, + FilterItem, + FilterDescriptor, + resolveQuickPickHelper, + sortTreeItems +} from "./utils"; import * as extension from "../src/extension"; import * as nls from "vscode-nls"; const localize = nls.config({ messageFormat: nls.MessageFormat.file })(); From dded5689671a4e8ac63eb224171f8b94da826ba4 Mon Sep 17 00:00:00 2001 From: zFernand0 Date: Thu, 21 Nov 2019 09:42:56 -0500 Subject: [PATCH 05/16] there was never a `credential-manager` porperty on the `IImperativeOverride` interface Signed-off-by: zFernand0 --- src/Profiles.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Profiles.ts b/src/Profiles.ts index 228652c604..5c2bf46b5f 100644 --- a/src/Profiles.ts +++ b/src/Profiles.ts @@ -299,12 +299,7 @@ export class Profiles { // Processing stops if there are no profiles detected try { const fileName = path.join(homedir, ".zowe", "settings", "imperative.json"); const settings = JSON.parse(fs.readFileSync(fileName).toString()); - - if (settings.overrides.CredentialManager !== null && settings.overrides.CredentialManager !== undefined) { - this.spawnValue = settings.overrides.CredentialManager !== false ? 0 : 1; - } else if (settings.overrides["credential-manager"] !== null && settings.overrides["credential-manager"] !== undefined) { - this.spawnValue = settings.overrides["credential-manager"] !== false ? 0 : 1; - } + this.spawnValue = settings.overrides.CredentialManager !== false ? 0 : 1; } catch (error) { // default to spawn this.spawnValue = 0; From 302920e9dff1ce2a9fffa1bc00729ddbc747a8ff Mon Sep 17 00:00:00 2001 From: zFernand0 Date: Wed, 27 Nov 2019 09:11:53 -0500 Subject: [PATCH 06/16] Simplify redentialManagerFactory initialization Signed-off-by: zFernand0 --- src/getAllProfiles.ts | 24 ++++++++++++++++++++++-- src/getDefaultProfile.ts | 21 ++++++++++++++++++++- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/src/getAllProfiles.ts b/src/getAllProfiles.ts index b376db8cd8..47abdeb7a2 100644 --- a/src/getAllProfiles.ts +++ b/src/getAllProfiles.ts @@ -9,7 +9,7 @@ * * */ -import { Imperative, CliProfileManager, ImperativeConfig } from "@zowe/imperative"; +import { Imperative, CliProfileManager, ImperativeConfig, CredentialManagerFactory, ImperativeError } from "@zowe/imperative"; import * as path from "path"; /** @@ -21,8 +21,25 @@ import * as path from "path"; // we have to mock a few things to get the Imperative.init to work properly (process.mainModule as any).filename = require.resolve("@zowe/cli"); ((process.mainModule as any).paths as any).unshift(mainZoweDir); + + // We need the credential manager factory to allow different instances of the AbstractCredentialManager + // @brightside/imperative vs. @zowe/imperative + const originalFactoryInitialize = CredentialManagerFactory.initialize; + ((CredentialManagerFactory as any).initialize as any) = async (params: any): Promise => { + try { + const displayName = (params.displayName == null) ? params.service : params.displayName; + (CredentialManagerFactory as any).mManager = new params.Manager(params.service, displayName); + if ((CredentialManagerFactory as any).mManager.initialize) { + await (CredentialManagerFactory as any).mManager.initialize(); + } + } catch (err) { + throw new ImperativeError({msg: err.toString()}); + } + }; + // we need to call Imperative.init so that any installed credential manager plugins are loaded - await Imperative.init({ configurationModule: require.resolve("@zowe/cli/lib/imperative.js") }); + await Imperative.init({ configurationModule: path.join(mainZoweDir, "@zowe/cli/lib/imperative.js") }); + const zosmfProfiles = (await new CliProfileManager({ profileRootDirectory: path.join(ImperativeConfig.instance.cliHome, "profiles"), type: "zosmf" @@ -32,4 +49,7 @@ import * as path from "path"; }); process.stdout.write(JSON.stringify(zosmfProfiles, null, 2)); + + // Revert back to the original implementation + ((CredentialManagerFactory as any).initialize as any) = originalFactoryInitialize; })(); diff --git a/src/getDefaultProfile.ts b/src/getDefaultProfile.ts index d80c2c7895..30c9ad6ce6 100644 --- a/src/getDefaultProfile.ts +++ b/src/getDefaultProfile.ts @@ -9,7 +9,7 @@ * * */ -import { Imperative, CliProfileManager, ImperativeConfig } from "@zowe/imperative"; +import { Imperative, CliProfileManager, ImperativeConfig, CredentialManagerFactory, ImperativeError } from "@zowe/imperative"; import * as path from "path"; /** @@ -21,6 +21,22 @@ import * as path from "path"; // we have to mock a few things to get the Imperative.init to work properly (process.mainModule as any).filename = require.resolve("@zowe/cli"); ((process.mainModule as any).paths as any).unshift(mainZoweDir); + + // We need the credential manager factory to allow different instances of the AbstractCredentialManager + // @brightside/imperative vs. @zowe/imperative + const originalFactoryInitialize = CredentialManagerFactory.initialize; + ((CredentialManagerFactory as any).initialize as any) = async (params: any): Promise => { + try { + const displayName = (params.displayName == null) ? params.service : params.displayName; + (CredentialManagerFactory as any).mManager = new params.Manager(params.service, displayName); + if ((CredentialManagerFactory as any).mManager.initialize) { + await (CredentialManagerFactory as any).mManager.initialize(); + } + } catch (err) { + throw new ImperativeError({msg: err.toString()}); + } + }; + // we need to call Imperative.init so that any installed credential manager plugins are loaded await Imperative.init({ configurationModule: require.resolve("@zowe/cli/lib/imperative.js") }); const zosmfProfiles = await new CliProfileManager({ @@ -29,4 +45,7 @@ import * as path from "path"; }).load({ loadDefault: true }); process.stdout.write(JSON.stringify(zosmfProfiles, null, 2)); + + // Revert back to the original implementation + ((CredentialManagerFactory as any).initialize as any) = originalFactoryInitialize; })(); From bb6675c971a929e9353cd9e953b41182f20cbeb0 Mon Sep 17 00:00:00 2001 From: zFernand0 Date: Wed, 27 Nov 2019 09:17:15 -0500 Subject: [PATCH 07/16] change comments from brightside to zowe :smile: Signed-off-by: zFernand0 --- __tests__/__integration__/DatasetTree.integration.test.ts | 2 +- __tests__/__integration__/USSTree.integration.test.ts | 2 +- __tests__/__integration__/ZoweNode.integration.test.ts | 2 +- __tests__/__integration__/ZoweUSSNode.integration.test.ts | 2 +- __tests__/__unit__/ZoweNode.unit.test.ts | 2 +- __tests__/__unit__/ZoweUSSNode.unit.test.ts | 2 +- src/DatasetTree.ts | 2 +- src/USSTree.ts | 2 +- src/ZosJobsProvider.ts | 2 +- src/ZoweNode.ts | 2 +- src/ZoweUSSNode.ts | 2 +- src/extension.ts | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/__tests__/__integration__/DatasetTree.integration.test.ts b/__tests__/__integration__/DatasetTree.integration.test.ts index 4d63b68bec..372eb4173d 100644 --- a/__tests__/__integration__/DatasetTree.integration.test.ts +++ b/__tests__/__integration__/DatasetTree.integration.test.ts @@ -27,7 +27,7 @@ describe("DatasetTree Integration Tests", async () => { const TIMEOUT = 120000; chai.use(chaiAsPromised); - // Uses loaded profile to create a zosmf session with brightside + // Uses loaded profile to create a zosmf session with Zowe const session = zowe.ZosmfSession.createBasicZosmfSession(testConst.profile); const sessNode = new ZoweNode(testConst.profile.name, vscode.TreeItemCollapsibleState.Expanded, null, session); sessNode.contextValue = extension.DS_SESSION_CONTEXT; diff --git a/__tests__/__integration__/USSTree.integration.test.ts b/__tests__/__integration__/USSTree.integration.test.ts index dc163b3a61..7cd01ce54a 100644 --- a/__tests__/__integration__/USSTree.integration.test.ts +++ b/__tests__/__integration__/USSTree.integration.test.ts @@ -28,7 +28,7 @@ describe("USSTree Integration Tests", async () => { const TIMEOUT = 120000; chai.use(chaiAsPromised); - // Uses loaded profile to create a zosmf session with brightside + // Uses loaded profile to create a zosmf session with Zowe const session = zowe.ZosmfSession.createBasicZosmfSession(testConst.profile); const sessNode = new ZoweUSSNode(testConst.profile.name, vscode.TreeItemCollapsibleState.Expanded, null, session, "", false, testConst.profile.name); diff --git a/__tests__/__integration__/ZoweNode.integration.test.ts b/__tests__/__integration__/ZoweNode.integration.test.ts index daf06185fe..e38833106e 100644 --- a/__tests__/__integration__/ZoweNode.integration.test.ts +++ b/__tests__/__integration__/ZoweNode.integration.test.ts @@ -23,7 +23,7 @@ declare var it: any; describe("ZoweNode Integration Tests", async () => { const TIMEOUT = 120000; chai.use(chaiAsPromised); - // Uses loaded profile to create a zosmf session with brightside + // Uses loaded profile to create a zosmf session with Zowe const session = zowe.ZosmfSession.createBasicZosmfSession(testConst.profile); const sessNode = new ZoweNode(testConst.profile.name, vscode.TreeItemCollapsibleState.Expanded, null, session); sessNode.contextValue = extension.DS_SESSION_CONTEXT; diff --git a/__tests__/__integration__/ZoweUSSNode.integration.test.ts b/__tests__/__integration__/ZoweUSSNode.integration.test.ts index b70145b40f..d16413f390 100644 --- a/__tests__/__integration__/ZoweUSSNode.integration.test.ts +++ b/__tests__/__integration__/ZoweUSSNode.integration.test.ts @@ -24,7 +24,7 @@ declare var it: any; describe("ZoweUSSNode Integration Tests", async () => { const TIMEOUT = 120000; chai.use(chaiAsPromised); - // Uses loaded profile to create a zosmf session with brightside + // Uses loaded profile to create a zosmf session with Zowe const session = zowe.ZosmfSession.createBasicZosmfSession(testConst.profile); const sessNode = new ZoweUSSNode(testConst.profile.name, vscode.TreeItemCollapsibleState.Expanded, null, session,null); sessNode.contextValue = extension.USS_SESSION_CONTEXT; diff --git a/__tests__/__unit__/ZoweNode.unit.test.ts b/__tests__/__unit__/ZoweNode.unit.test.ts index bacd95f6c7..045225de9f 100644 --- a/__tests__/__unit__/ZoweNode.unit.test.ts +++ b/__tests__/__unit__/ZoweNode.unit.test.ts @@ -125,7 +125,7 @@ describe("Unit Tests (Jest)", () => { /************************************************************************************************************* * Checks that the catch block is reached when an error is thrown *************************************************************************************************************/ - it("Checks that when bright.List.dataSet/allMembers() causes an error on the brightside call, " + + it("Checks that when bright.List.dataSet/allMembers() causes an error on the zowe call, " + "it throws an error and the catch block is reached", async () => { // Creating a rootNode const rootNode = new ZoweNode("root", vscode.TreeItemCollapsibleState.Collapsed, null, session); diff --git a/__tests__/__unit__/ZoweUSSNode.unit.test.ts b/__tests__/__unit__/ZoweUSSNode.unit.test.ts index 7f649de80b..2e930531f3 100644 --- a/__tests__/__unit__/ZoweUSSNode.unit.test.ts +++ b/__tests__/__unit__/ZoweUSSNode.unit.test.ts @@ -107,7 +107,7 @@ describe("Unit Tests (Jest)", () => { /************************************************************************************************************* * Checks that the catch block is reached when an error is thrown *************************************************************************************************************/ - it("Checks that when bright.List. causes an error on the brightside call, " + + it("Checks that when bright.List. causes an error on the zowe call, " + "it throws an error and the catch block is reached", async () => { // Creating a rootNode const rootNode = new ZoweUSSNode("toot", vscode.TreeItemCollapsibleState.Collapsed, null, session, "root"); diff --git a/src/DatasetTree.ts b/src/DatasetTree.ts index 6892a41b9b..eeff833560 100644 --- a/src/DatasetTree.ts +++ b/src/DatasetTree.ts @@ -425,7 +425,7 @@ export class DatasetTree implements vscode.TreeDataProvider { if (this.mSessionNodes.find((tempNode) => tempNode.label.trim() === zosmfProfile.name)) { return; } - // Uses loaded profile to create a zosmf session with brightside + // Uses loaded profile to create a zosmf session with Zowe const session = zowe.ZosmfSession.createBasicZosmfSession(zosmfProfile.profile); // Creates ZoweNode to track new session and pushes it to mSessionNodes const node = new ZoweNode(zosmfProfile.name, vscode.TreeItemCollapsibleState.Collapsed, null, session); diff --git a/src/USSTree.ts b/src/USSTree.ts index 179d8fe113..23d65d072c 100644 --- a/src/USSTree.ts +++ b/src/USSTree.ts @@ -412,7 +412,7 @@ export class USSTree implements vscode.TreeDataProvider { if (this.mSessionNodes.find((tempNode) => tempNode.label.trim() === zosmfProfile.name)) { return; } - // Uses loaded profile to create a zosmf session with brightside + // Uses loaded profile to create a zosmf session with Zowe const session = zowe.ZosmfSession.createBasicZosmfSession(zosmfProfile.profile); // Creates ZoweNode to track new session and pushes it to mSessionNodes const node = new ZoweUSSNode(zosmfProfile.name, vscode.TreeItemCollapsibleState.Collapsed, null, session, "", false, diff --git a/src/ZosJobsProvider.ts b/src/ZosJobsProvider.ts index bc2e05c0a8..0d5b8a92e0 100644 --- a/src/ZosJobsProvider.ts +++ b/src/ZosJobsProvider.ts @@ -542,7 +542,7 @@ export class ZosJobsProvider implements vscode.TreeDataProvider { if (this.mSessionNodes.find((tempNode) => tempNode.label.trim() === zosmfProfile.name)) { return; } - // Uses loaded profile to create a zosmf session with brightside + // Uses loaded profile to create a zosmf session with Zowe const session = ZosmfSession.createBasicZosmfSession(zosmfProfile.profile); // Creates ZoweNode to track new session and pushes it to mSessionNodes const node = new Job(zosmfProfile.name, vscode.TreeItemCollapsibleState.Collapsed, null, session, null); diff --git a/src/ZoweNode.ts b/src/ZoweNode.ts index 488963e38d..82840f2772 100644 --- a/src/ZoweNode.ts +++ b/src/ZoweNode.ts @@ -107,7 +107,7 @@ export class ZoweNode extends vscode.TreeItem { // push nodes to an object with property names to avoid duplicates const elementChildren = {}; responses.forEach((response) => { - // Throws reject if the brightside command does not throw an error but does not succeed + // Throws reject if the Zowe command does not throw an error but does not succeed if (!response.success) { throw Error(localize("getChildren.responses.error", "The response from Zowe CLI was not successful")); } diff --git a/src/ZoweUSSNode.ts b/src/ZoweUSSNode.ts index aa711e935b..555b204a4f 100644 --- a/src/ZoweUSSNode.ts +++ b/src/ZoweUSSNode.ts @@ -113,7 +113,7 @@ export class ZoweUSSNode extends vscode.TreeItem { // push nodes to an object with property names to avoid duplicates const elementChildren = {}; responses.forEach((response) => { - // Throws reject if the brightside command does not throw an error but does not succeed + // Throws reject if the Zowe command does not throw an error but does not succeed if (!response.success) { throw Error( localize("getChildren.responses.error.response", "The response from Zowe CLI was not successful")); diff --git a/src/extension.ts b/src/extension.ts index 1db39acdcd..6aa3c82def 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -667,7 +667,7 @@ export async function addUSSSession(ussFileProvider: USSTree) { * TODO: Consider changing configuration to allow "custom" data set specifications * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! * @export - * @param {ZoweNode} node - Desired Brightside session + * @param {ZoweNode} node - Desired Zowe session * @param {DatasetTree} datasetProvider - the tree which contains the nodes */ export async function createFile(node: ZoweNode, datasetProvider: DatasetTree) { From de24282f4e35d99b1abc90949d88c2e04e03c865 Mon Sep 17 00:00:00 2001 From: "Andrew W. Harn" Date: Wed, 29 Jan 2020 14:24:32 +0000 Subject: [PATCH 08/16] Fix lint errors. Signed-off-by: Andrew W. Harn --- i18n/sample/src/ZoweNode.i18n.json | 4 +- package-lock.json | 323 ++++++++++++++++++++++++++++- src/DatasetTree.ts | 6 +- src/USSTree.ts | 6 +- src/ZoweJobNode.ts | 2 +- src/uss/ussNodeActions.ts | 3 +- 6 files changed, 334 insertions(+), 10 deletions(-) diff --git a/i18n/sample/src/ZoweNode.i18n.json b/i18n/sample/src/ZoweNode.i18n.json index 18cb86b33c..878421c64a 100644 --- a/i18n/sample/src/ZoweNode.i18n.json +++ b/i18n/sample/src/ZoweNode.i18n.json @@ -1,8 +1,8 @@ { "getChildren.search": "Use the search button to display datasets", "getChildren.error.invalidNode": "Invalid node", - "getChildren.error.response": "Retrieving response from ", "ZoweJobNode.getJobs.progress": "Get Dataset list command submitted.", "getChildren.responses.error": "The response from Zowe CLI was not successful", - "getChildren.noDataset": "No datasets found" + "getChildren.noDataset": "No datasets found", + "getChildren.error.response": "Retrieving response from " } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 0a9219592c..4c37350b48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -871,11 +871,27 @@ "buffer-equal": "^1.0.0" } }, + "aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", + "dev": true + }, "archy": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=" }, + "are-we-there-yet": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", + "dev": true, + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } + }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -1315,6 +1331,28 @@ "file-uri-to-path": "1.0.0" } }, + "bl": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-3.0.0.tgz", + "integrity": "sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==", + "dev": true, + "requires": { + "readable-stream": "^3.0.1" + }, + "dependencies": { + "readable-stream": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz", + "integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -1574,6 +1612,12 @@ } } }, + "chownr": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz", + "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==", + "dev": true + }, "ci-info": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", @@ -1811,6 +1855,12 @@ "typedarray": "^0.0.6" } }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", + "dev": true + }, "convert-source-map": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", @@ -2018,6 +2068,15 @@ "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" }, + "decompress-response": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz", + "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==", + "dev": true, + "requires": { + "mimic-response": "^2.0.0" + } + }, "deep-eql": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", @@ -2138,6 +2197,12 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", + "dev": true + }, "denodeify": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/denodeify/-/denodeify-1.2.1.tgz", @@ -2149,6 +2214,12 @@ "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=" }, + "detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", + "dev": true + }, "detect-newline": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz", @@ -2508,6 +2579,12 @@ } } }, + "expand-template": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", + "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", + "dev": true + }, "expand-tilde": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", @@ -2809,6 +2886,12 @@ "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=", "dev": true }, + "fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "dev": true + }, "fs-extra": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", @@ -3398,6 +3481,59 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "dev": true, + "requires": { + "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" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } + } + } + }, "gensync": { "version": "1.0.0-beta.1", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", @@ -3455,6 +3591,12 @@ "assert-plus": "^1.0.0" } }, + "github-from-package": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", + "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=", + "dev": true + }, "glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", @@ -3899,6 +4041,12 @@ "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", "dev": true }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", + "dev": true + }, "has-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", @@ -5405,6 +5553,16 @@ "integrity": "sha512-FrLwOgm+iXrPV+5zDU6Jqu4gCRXbWEQg2O3SKONsWE4w7AXFRkryS53bpWdaL9cNol+AmR3AEYz6kn+o0fCPnw==", "dev": true }, + "keytar": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/keytar/-/keytar-5.1.0.tgz", + "integrity": "sha512-SptCrRDqLbTeOMB2Z9UmVOS+OKguIrMft+EUaCB8xJPiFMjy6Jnmjgv/LA0rg1ENgLelzwSsC5PSQXF0uoqNDQ==", + "dev": true, + "requires": { + "nan": "2.14.0", + "prebuild-install": "5.3.3" + } + }, "kind-of": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", @@ -5896,6 +6054,12 @@ "integrity": "sha512-PiVO95TKvhiwgSwg1IdLYlCTdul38yZxZMIcnDSFIBUm4BNZha2qpQ4GpJ++15bHoKDtrW2D69lMfFwdFYtNZQ==", "dev": true }, + "mimic-response": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.0.0.tgz", + "integrity": "sha512-8ilDoEapqA4uQ3TwS0jakGONKXVJqpy+RpM+3b7pLdOjghCrEiGp9SRkFbUHAmZW9vdnrENWHjaweIoTIJExSQ==", + "dev": true + }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", @@ -6043,8 +6207,7 @@ "version": "2.14.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", - "dev": true, - "optional": true + "dev": true }, "nanomatch": { "version": "1.2.13", @@ -6071,6 +6234,12 @@ } } }, + "napi-build-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.1.tgz", + "integrity": "sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA==", + "dev": true + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -6112,6 +6281,15 @@ } } }, + "node-abi": { + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.13.0.tgz", + "integrity": "sha512-9HrZGFVTR5SOu3PZAnAY2hLO36aW1wmA+FDsVkr85BTST32TLCA1H/AEcatVRAsWLyXS3bqUDYCAjq5/QGuSTA==", + "dev": true, + "requires": { + "semver": "^5.4.1" + } + }, "node-int64": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", @@ -6137,6 +6315,12 @@ "which": "^1.3.0" } }, + "noop-logger": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz", + "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=", + "dev": true + }, "normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -6175,6 +6359,18 @@ "path-key": "^2.0.0" } }, + "npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "dev": true, + "requires": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, "nth-check": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", @@ -6740,6 +6936,47 @@ "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, + "prebuild-install": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.3.tgz", + "integrity": "sha512-GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g==", + "dev": true, + "requires": { + "detect-libc": "^1.0.3", + "expand-template": "^2.0.3", + "github-from-package": "0.0.0", + "minimist": "^1.2.0", + "mkdirp": "^0.5.1", + "napi-build-utils": "^1.0.1", + "node-abi": "^2.7.0", + "noop-logger": "^0.1.1", + "npmlog": "^4.0.1", + "pump": "^3.0.0", + "rc": "^1.2.7", + "simple-get": "^3.0.3", + "tar-fs": "^2.0.0", + "tunnel-agent": "^0.6.0", + "which-pm-runs": "^1.0.0" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + } + } + }, "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", @@ -7373,6 +7610,23 @@ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, + "simple-concat": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz", + "integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=", + "dev": true + }, + "simple-get": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz", + "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==", + "dev": true, + "requires": { + "decompress-response": "^4.2.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + } + }, "sinon": { "version": "6.3.5", "resolved": "https://registry.npmjs.org/sinon/-/sinon-6.3.5.tgz", @@ -7844,6 +8098,56 @@ "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz", "integrity": "sha1-fLy2S1oUG2ou/CxdLGe04VCyomg=" }, + "tar-fs": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.0.tgz", + "integrity": "sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==", + "dev": true, + "requires": { + "chownr": "^1.1.1", + "mkdirp": "^0.5.1", + "pump": "^3.0.0", + "tar-stream": "^2.0.0" + }, + "dependencies": { + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + } + } + }, + "tar-stream": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.0.tgz", + "integrity": "sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==", + "dev": true, + "requires": { + "bl": "^3.0.0", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "dependencies": { + "readable-stream": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz", + "integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, "test-exclude": { "version": "5.2.3", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz", @@ -8810,6 +9114,21 @@ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" }, + "which-pm-runs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz", + "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=", + "dev": true + }, + "wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "dev": true, + "requires": { + "string-width": "^1.0.2 || 2" + } + }, "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", diff --git a/src/DatasetTree.ts b/src/DatasetTree.ts index 9957d8166f..de58880855 100644 --- a/src/DatasetTree.ts +++ b/src/DatasetTree.ts @@ -400,7 +400,8 @@ export class DatasetTree implements IZoweTree { baseEncd = values [2]; } } catch (error) { - await errorHandling(error, node.getProfileName(), localize("datasetTree.error", "Error encountered in ") + `datasetFilterPrompt.optionalProfiles!`); + await errorHandling(error, node.getProfileName(), + localize("datasetTree.error", "Error encountered in ") + `datasetFilterPrompt.optionalProfiles!`); } if (usrNme !== undefined && passWrd !== undefined && baseEncd !== undefined) { node.getSession().ISession.user = usrNme; @@ -516,7 +517,8 @@ export class DatasetTree implements IZoweTree { baseEncd = values [2]; } } catch (error) { - await errorHandling(error, element.getProfileName(), localize("datasetTree.error", "Error encountered in ") + `flipState.optionalProfiles!`); + await errorHandling(error, element.getProfileName(), + localize("datasetTree.error", "Error encountered in ") + `flipState.optionalProfiles!`); } if (usrNme !== undefined && passWrd !== undefined && baseEncd !== undefined) { element.getSession().ISession.user = usrNme; diff --git a/src/USSTree.ts b/src/USSTree.ts index 56e9a9d9b5..3b38f18e90 100644 --- a/src/USSTree.ts +++ b/src/USSTree.ts @@ -260,7 +260,8 @@ export class USSTree implements IZoweTree { baseEncd = values [2]; } } catch (error) { - await errorHandling(error, element.getProfileName(), localize("ussTree.error", "Error encountered in ") + `flipState.optionalProfiles!`); + await errorHandling(error, element.getProfileName(), + localize("ussTree.error", "Error encountered in ") + `flipState.optionalProfiles!`); } if (usrNme !== undefined && passWrd !== undefined && baseEncd !== undefined) { element.getSession().ISession.user = usrNme; @@ -326,7 +327,8 @@ export class USSTree implements IZoweTree { baseEncd = values [2]; } } catch (error) { - await errorHandling(error, node.getProfileName(), localize("ussTree.error", "Error encountered in ") + `ussFilterPrompt.optionalProfiles!`); + await errorHandling(error, node.getProfileName(), + localize("ussTree.error", "Error encountered in ") + `ussFilterPrompt.optionalProfiles!`); } if (usrNme !== undefined && passWrd !== undefined && baseEncd !== undefined) { node.getSession().ISession.user = usrNme; diff --git a/src/ZoweJobNode.ts b/src/ZoweJobNode.ts index 52858ba1a0..c742e6201c 100644 --- a/src/ZoweJobNode.ts +++ b/src/ZoweJobNode.ts @@ -193,7 +193,7 @@ export class Job extends vscode.TreeItem implements IZoweTreeNode { return this._searchId; } - private async getJobs(session, owner, prefix, searchId): Promise { + private async getJobs(session, owner, prefix, searchId): Promise { let jobsInternal: zowe.IJob[] = []; if (this.searchId.length > 0 ) { jobsInternal.push(await zowe.GetJobs.getJob(session, searchId)); diff --git a/src/uss/ussNodeActions.ts b/src/uss/ussNodeActions.ts index 6dc6a1c8d8..3914a1e68d 100644 --- a/src/uss/ussNodeActions.ts +++ b/src/uss/ussNodeActions.ts @@ -65,7 +65,8 @@ export async function createUSSNodeDialog(node: ZoweUSSNode, ussFileProvider: US baseEncd = values[2]; } } catch (error) { - utils.errorHandling(error, node.mProfileName, localize("ussNodeActions.error", "Error encountered in ") + `createUSSNodeDialog.optionalProfiles!`); + utils.errorHandling(error, node.mProfileName, + localize("ussNodeActions.error", "Error encountered in ") + `createUSSNodeDialog.optionalProfiles!`); return; } if (usrNme !== undefined && passWrd !== undefined && baseEncd !== undefined) { From e295d91ad73d2d2376b4d743bc485ee17b51c072 Mon Sep 17 00:00:00 2001 From: CForrest97 Date: Fri, 14 Feb 2020 15:54:09 +0000 Subject: [PATCH 09/16] change rename, copy and paste labels for data sets Signed-off-by: CForrest97 --- i18n/sample/package.i18n.json | 6 +++--- package.json | 8 ++++---- package.nls.json | 7 +++---- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/i18n/sample/package.i18n.json b/i18n/sample/package.i18n.json index 9e9baddc37..e3fd881ce9 100644 --- a/i18n/sample/package.i18n.json +++ b/i18n/sample/package.i18n.json @@ -68,9 +68,9 @@ "Zowe-Default-Commands-Persistent-Favorites": "Toggle if Commands persist locally", "Zowe-Environment": "Environment where the extension is running, default is VSCode", "issueMvsCmd": "Zowe: Issue MVS Command...", - "renameDataSet": "Rename Data Set", - "copyDataSet": "Copy Data Set", - "pasteDataSet": "Paste Data Set", + "rename": "Rename", + "copy": "Copy", + "paste": "Paste", "renameDataSetMember": "Rename Member", "profile.configuration.title": "Zowe z/OSMF Profiles", "profile.configuration.name": "Profile Name", diff --git a/package.json b/package.json index 710f098fd1..96a2415772 100644 --- a/package.json +++ b/package.json @@ -113,19 +113,19 @@ }, { "command": "zowe.renameDataSet", - "title": "%renameDataSet%" + "title": "%rename%" }, { "command": "zowe.copyDataSet", - "title": "%copyDataSet%" + "title": "%copy%" }, { "command": "zowe.pasteDataSet", - "title": "%pasteDataSet%" + "title": "%paste%" }, { "command": "zowe.renameDataSetMember", - "title": "%renameDataSetMember%" + "title": "%rename%" }, { "command": "zowe.deleteDataset", diff --git a/package.nls.json b/package.nls.json index 200bce368a..9c999cc605 100644 --- a/package.nls.json +++ b/package.nls.json @@ -68,10 +68,9 @@ "Zowe-Default-Commands-Persistent-Favorites": "Toggle if Commands persist locally", "Zowe-Environment": "Environment where the extension is running, default is VSCode", "issueMvsCmd" : "Zowe: Issue MVS Command...", - "renameDataSet" : "Rename Data Set", - "copyDataSet" : "Copy Data Set", - "pasteDataSet" : "Paste Data Set", - "renameDataSetMember" : "Rename Member", + "rename" : "Rename", + "copy" : "Copy", + "paste" : "Paste", "profile.configuration.title": "Zowe z/OSMF Profiles", "profile.configuration.name": "Profile Name", "profile.configuration.url": "z/OSMF URL", From f6f66e3e743a700989f6711d3e1f01a27792f828 Mon Sep 17 00:00:00 2001 From: zFernand0 Date: Wed, 19 Feb 2020 09:15:37 -0500 Subject: [PATCH 10/16] Fixing merge from master Signed-off-by: zFernand0 --- .../__unit__/mvs/mvsNodeActions.unit.test.ts | 6 ++-- src/api/ZoweExplorerApi.ts | 4 +-- src/api/ZoweExplorerZosmfApi.ts | 28 ++++++++++++------- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/__tests__/__unit__/mvs/mvsNodeActions.unit.test.ts b/__tests__/__unit__/mvs/mvsNodeActions.unit.test.ts index b9fd5d1f22..9dc788f8aa 100644 --- a/__tests__/__unit__/mvs/mvsNodeActions.unit.test.ts +++ b/__tests__/__unit__/mvs/mvsNodeActions.unit.test.ts @@ -13,7 +13,7 @@ import * as vscode from "vscode"; import * as mvsNodeActions from "../../../src/mvs/mvsNodeActions"; import { ZoweDatasetNode } from "../../../src/ZoweDatasetNode"; import * as extension from "../../../src/extension"; -import * as brtimperative from "@brightside/imperative"; +import { Session, IProfileLoaded } from "@zowe/imperative"; const mockRefresh = jest.fn(); const showOpenDialog = jest.fn(); @@ -35,7 +35,7 @@ const DatasetTree = jest.fn().mockImplementation(() => { }; }); -const session = new brtimperative.Session({ +const session = new Session({ user: "fake", password: "fake", hostname: "fake", @@ -44,7 +44,7 @@ const session = new brtimperative.Session({ }); const testTree = DatasetTree(); -const profileOne: brtimperative.IProfileLoaded = { name: "profile1", profile: {}, type: "zosmf", message: "", failNotFound: false }; +const profileOne: IProfileLoaded = { name: "profile1", profile: {}, type: "zosmf", message: "", failNotFound: false }; const sessNode = new ZoweDatasetNode("sestest", vscode.TreeItemCollapsibleState.Expanded, null, session, undefined, undefined, profileOne); describe("mvsNodeActions", () => { diff --git a/src/api/ZoweExplorerApi.ts b/src/api/ZoweExplorerApi.ts index f48f8c06e3..5829754b57 100644 --- a/src/api/ZoweExplorerApi.ts +++ b/src/api/ZoweExplorerApi.ts @@ -127,13 +127,13 @@ export namespace ZoweExplorerApi { * Either "file" or "directory". * @param {string} [mode] * An optional Unix string representation of the permissions. - * @returns {Promise} + * @returns {Promise} */ create( ussPath: string, type: string, mode?: string - ): Promise; + ): Promise; /** * Deletes the USS directory or file at the given path. diff --git a/src/api/ZoweExplorerZosmfApi.ts b/src/api/ZoweExplorerZosmfApi.ts index e76694f5ec..51beed1127 100644 --- a/src/api/ZoweExplorerZosmfApi.ts +++ b/src/api/ZoweExplorerZosmfApi.ts @@ -10,9 +10,12 @@ */ import * as zowe from "@zowe/cli"; -import * as imperative from "@zowe/imperative"; - +import { Session, IProfileLoaded, ITaskWithStatus, TaskStage } from "@zowe/imperative"; import { ZoweExplorerApi } from "./ZoweExplorerApi"; +import * as nls from "vscode-nls"; + +// Localization support +const localize = nls.config({messageFormat: nls.MessageFormat.file})(); // tslint:disable: max-classes-per-file @@ -24,15 +27,15 @@ class ZosmfApiCommon implements ZoweExplorerApi.ICommon { return "zosmf"; } - private session: imperative.Session; - constructor(public profile?: imperative.IProfileLoaded) { + private session: Session; + constructor(public profile?: IProfileLoaded) { } public getProfileTypeName(): string { return ZosmfUssApi.getProfileTypeName(); } - public getSession(profile?: imperative.IProfileLoaded): imperative.Session { + public getSession(profile?: IProfileLoaded): Session { if (!this.session) { this.session = zowe.ZosmfSession.createBasicZosmfSession((profile||this.profile).profile); } @@ -61,7 +64,12 @@ export class ZosmfUssApi extends ZosmfApiCommon implements ZoweExplorerApi.IUss public async putContents(inputFilePath: string, ussFilePath: string, binary?: boolean, localEncoding?: string, etag?: string, returnEtag?: boolean): Promise { - return zowe.Upload.fileToUSSFile(this.getSession(), inputFilePath, ussFilePath, binary, localEncoding, etag, returnEtag); + const task: ITaskWithStatus = { + percentComplete: 0, + statusMessage: localize("api.zosmfUSSApi.putContents", "Uploading USS file"), + stageName: TaskStage.IN_PROGRESS + }; + return zowe.Upload.fileToUSSFile(this.getSession(), inputFilePath, ussFilePath, binary, localEncoding, task, etag, returnEtag); } public async uploadDirectory( @@ -73,7 +81,7 @@ export class ZosmfUssApi extends ZosmfApiCommon implements ZoweExplorerApi.IUss ); } - public async create(ussPath: string, type: string, mode?: string): Promise { + public async create(ussPath: string, type: string, mode?: string): Promise { return zowe.Create.uss(this.getSession(), ussPath, type); } @@ -131,12 +139,12 @@ export class ZosmfMvsApi extends ZosmfApiCommon implements ZoweExplorerApi.IMvs public async copyDataSetMember( { dataSetName: fromDataSetName, memberName: fromMemberName }: zowe.IDataSet, { dataSetName: toDataSetName, memberName: toMemberName }: zowe.IDataSet, - options?: {replace?: boolean} + options?: any // Needs typed. See https://github.com/zowe/zowe-cli/issues/676 ): Promise { return zowe.Copy.dataSet(this.getSession(), { dataSetName: fromDataSetName, memberName: fromMemberName }, - { dataSetName: toDataSetName, memberName: toMemberName }, - options + // If we decide to match 1:1 the Zowe.Copy.dataSet implementation, we will need to break the interface definition in the ZoweExploreApi + options.fromDataSet ? options : {...options, ...{fromDataSet: { dataSetName: toDataSetName, memberName: toMemberName }}} ); } From 8a6da62889e102d4f7c6d3b82ba63b88dd5f3685 Mon Sep 17 00:00:00 2001 From: zFernand0 Date: Wed, 19 Feb 2020 10:42:45 -0500 Subject: [PATCH 11/16] missed the fact that options can be undefined Signed-off-by: zFernand0 --- src/api/ZoweExplorerZosmfApi.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/api/ZoweExplorerZosmfApi.ts b/src/api/ZoweExplorerZosmfApi.ts index 51beed1127..f97cdcce86 100644 --- a/src/api/ZoweExplorerZosmfApi.ts +++ b/src/api/ZoweExplorerZosmfApi.ts @@ -141,10 +141,20 @@ export class ZosmfMvsApi extends ZosmfApiCommon implements ZoweExplorerApi.IMvs { dataSetName: toDataSetName, memberName: toMemberName }: zowe.IDataSet, options?: any // Needs typed. See https://github.com/zowe/zowe-cli/issues/676 ): Promise { + let newOptions: any = {}; // Needs typed. See https://github.com/zowe/zowe-cli/issues/676 + if (options) { + if (options.fromDataSet) { + newOptions = options; + } else { + // If we decide to match 1:1 the Zowe.Copy.dataSet implementation, we will need to break the interface definition in the ZoweExploreApi + newOptions = {...options, ...{fromDataSet: { dataSetName: toDataSetName, memberName: toMemberName }}}; + } + } else { + newOptions = {fromDataSet: { dataSetName: toDataSetName, memberName: toMemberName }}; + } return zowe.Copy.dataSet(this.getSession(), { dataSetName: fromDataSetName, memberName: fromMemberName }, - // If we decide to match 1:1 the Zowe.Copy.dataSet implementation, we will need to break the interface definition in the ZoweExploreApi - options.fromDataSet ? options : {...options, ...{fromDataSet: { dataSetName: toDataSetName, memberName: toMemberName }}} + newOptions ); } From fd2e92a9a252e2595825d2f4050c4881894926da Mon Sep 17 00:00:00 2001 From: zFernand0 Date: Wed, 19 Feb 2020 10:49:31 -0500 Subject: [PATCH 12/16] fix lint issue because of a comment :cry: Signed-off-by: zFernand0 --- src/api/ZoweExplorerZosmfApi.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/ZoweExplorerZosmfApi.ts b/src/api/ZoweExplorerZosmfApi.ts index f97cdcce86..39c5054cb6 100644 --- a/src/api/ZoweExplorerZosmfApi.ts +++ b/src/api/ZoweExplorerZosmfApi.ts @@ -146,10 +146,10 @@ export class ZosmfMvsApi extends ZosmfApiCommon implements ZoweExplorerApi.IMvs if (options.fromDataSet) { newOptions = options; } else { - // If we decide to match 1:1 the Zowe.Copy.dataSet implementation, we will need to break the interface definition in the ZoweExploreApi - newOptions = {...options, ...{fromDataSet: { dataSetName: toDataSetName, memberName: toMemberName }}}; + newOptions = {...options, ...{fromDataSet: { dataSetName: toDataSetName, memberName: toMemberName }}}; } - } else { + } else { + // If we decide to match 1:1 the Zowe.Copy.dataSet implementation, we will need to break the interface definition in the ZoweExploreApi newOptions = {fromDataSet: { dataSetName: toDataSetName, memberName: toMemberName }}; } return zowe.Copy.dataSet(this.getSession(), From 6ad6b886a982b9d4301c3877489f3c15c5f25385 Mon Sep 17 00:00:00 2001 From: zFernand0 Date: Wed, 19 Feb 2020 11:30:00 -0500 Subject: [PATCH 13/16] Forgot to swap from and to based on the API implementation. Signed-off-by: zFernand0 --- src/api/ZoweExplorerZosmfApi.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/ZoweExplorerZosmfApi.ts b/src/api/ZoweExplorerZosmfApi.ts index 39c5054cb6..3f20afd78f 100644 --- a/src/api/ZoweExplorerZosmfApi.ts +++ b/src/api/ZoweExplorerZosmfApi.ts @@ -146,14 +146,14 @@ export class ZosmfMvsApi extends ZosmfApiCommon implements ZoweExplorerApi.IMvs if (options.fromDataSet) { newOptions = options; } else { - newOptions = {...options, ...{fromDataSet: { dataSetName: toDataSetName, memberName: toMemberName }}}; + newOptions = {...options, ...{fromDataSet: { dataSetName: fromDataSetName, memberName: fromMemberName }}}; } } else { // If we decide to match 1:1 the Zowe.Copy.dataSet implementation, we will need to break the interface definition in the ZoweExploreApi - newOptions = {fromDataSet: { dataSetName: toDataSetName, memberName: toMemberName }}; + newOptions = {fromDataSet: { dataSetName: fromDataSetName, memberName: fromMemberName }}; } return zowe.Copy.dataSet(this.getSession(), - { dataSetName: fromDataSetName, memberName: fromMemberName }, + { dataSetName: toDataSetName, memberName: toMemberName }, newOptions ); } From 3dcd6ecd4b945693b02582517f89f56e17c0d2d7 Mon Sep 17 00:00:00 2001 From: CForrest97 Date: Thu, 20 Feb 2020 11:24:24 +0000 Subject: [PATCH 14/16] remove renameMember Signed-off-by: CForrest97 --- i18n/sample/package.i18n.json | 1 - 1 file changed, 1 deletion(-) diff --git a/i18n/sample/package.i18n.json b/i18n/sample/package.i18n.json index e3fd881ce9..68b69021d6 100644 --- a/i18n/sample/package.i18n.json +++ b/i18n/sample/package.i18n.json @@ -71,7 +71,6 @@ "rename": "Rename", "copy": "Copy", "paste": "Paste", - "renameDataSetMember": "Rename Member", "profile.configuration.title": "Zowe z/OSMF Profiles", "profile.configuration.name": "Profile Name", "profile.configuration.url": "z/OSMF URL", From dcc2d06eefa9e40ee12f50dafd01495cd9eef6a8 Mon Sep 17 00:00:00 2001 From: zFernand0 Date: Wed, 19 Feb 2020 13:14:10 -0500 Subject: [PATCH 15/16] Properly type the options parameter Signed-off-by: zFernand0 (cherry picked from commit a0cf1cfc041e327fb91c166e603ef4f6547695d1) (cherry picked from commit f8f9eecaf04d686e769838d33b60db0f6aa56749) --- package-lock.json | 3423 ++++++++++++++++--------------- package.json | 10 +- src/api/ZoweExplorerZosmfApi.ts | 4 +- 3 files changed, 1723 insertions(+), 1714 deletions(-) diff --git a/package-lock.json b/package-lock.json index 51cb59b7cd..9cf854a756 100644 --- a/package-lock.json +++ b/package-lock.json @@ -655,9 +655,9 @@ "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==" }, "@zowe/cli": { - "version": "6.8.1", - "resolved": "https://registry.npmjs.org/@zowe/cli/-/cli-6.8.1.tgz", - "integrity": "sha512-Qbm7BMXXkVpxGMjhhj8o3NHOeCm1FdcODg/085hFu1BQEnbx7huzHsdvOymZqfO7c5dwYhN0/DVdTzU8sONb8Q==", + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/@zowe/cli/-/cli-6.8.2.tgz", + "integrity": "sha512-0p+yLwsfVvNWhCn7gpkyEtp7qmvAonuHUp8teJNna0XfSlQePUbooa3VM9lhSkcGBvVOchkfgJLn/Kae7Jympg==", "requires": { "@zowe/imperative": "4.5.0", "@zowe/perf-timing": "1.0.6", @@ -713,11 +713,6 @@ "@types/yargs-parser": "*" } }, - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" - }, "date-format": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/date-format/-/date-format-3.0.0.tgz", @@ -731,30 +726,14 @@ "ms": "^2.1.1" } }, - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "requires": { - "p-locate": "^4.1.0" + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" } }, "log4js": { @@ -779,37 +758,6 @@ "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz", "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg==" }, - "p-limit": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz", - "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==", - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "requires": { - "p-limit": "^2.2.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" - }, - "progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==" - }, "streamroller": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-2.2.3.tgz", @@ -826,53 +774,6 @@ "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==" } } - }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "requires": { - "ansi-regex": "^5.0.0" - } - }, - "yargs": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz", - "integrity": "sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==", - "requires": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^16.1.0" - }, - "dependencies": { - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - } - } } } }, @@ -883,6 +784,18 @@ "requires": { "fs-extra": "8.1.0", "pkg-up": "2.0.0" + }, + "dependencies": { + "fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + } } }, "abab": { @@ -1779,1100 +1692,1094 @@ "upath": "^1.1.1" }, "dependencies": { - "fsevents": { - "version": "1.2.11", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz", - "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==", + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true + } + } + }, + "chownr": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz", + "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==", + "dev": true + }, + "ci-info": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", + "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", + "dev": true + }, + "circular-json": { + "version": "0.5.9", + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz", + "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==", + "dev": true + }, + "class-utils": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", + "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "dev": true, + "requires": { + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, - "optional": true, "requires": { - "bindings": "^1.5.0", - "nan": "^2.12.1", - "node-pre-gyp": "*" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.1.3", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "debug": { - "version": "3.2.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "^2.1.1" - } - }, - "deep-extend": { - "version": "0.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "^2.6.0" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "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" - } - }, - "glob": { - "version": "7.1.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.24", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ignore-walk": { - "version": "3.0.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimatch": "^3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "bundled": true, - "dev": true, - "optional": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true, - "optional": true - }, - "minipass": { - "version": "2.9.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } - }, - "minizlib": { - "version": "1.3.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "^2.9.0" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "needle": { - "version": "2.4.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "^3.2.6", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.14.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "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": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - }, - "npm-bundled": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "npm-normalize-package-bin": "^1.0.1" - } - }, - "npm-normalize-package-bin": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "npm-packlist": { - "version": "1.4.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "wrappy": "1" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "rimraf": { - "version": "2.7.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "glob": "^7.1.3" - } - }, - "safe-buffer": { - "version": "5.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "dev": true, - "optional": true - }, - "semver": { - "version": "5.7.1", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "4.4.13", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "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" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "wide-align": { - "version": "1.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "^1.0.2 || 2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "yallist": { - "version": "3.1.1", - "bundled": true, - "dev": true, - "optional": true - } + "is-descriptor": "^0.1.0" + } + } + } + }, + "cli-table3": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz", + "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==", + "requires": { + "colors": "^1.1.2", + "object-assign": "^4.1.0", + "string-width": "^2.1.1" + } + }, + "cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + }, + "wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + } + } + }, + "clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", + "dev": true + }, + "clone-buffer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz", + "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=", + "dev": true + }, + "clone-stats": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", + "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=", + "dev": true + }, + "cloneable-readable": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz", + "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==", + "dev": true, + "requires": { + "inherits": "^2.0.1", + "process-nextick-args": "^2.0.0", + "readable-stream": "^2.3.5" + } + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "dev": true + }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "dev": true + }, + "collection-map": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz", + "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=", + "dev": true, + "requires": { + "arr-map": "^2.0.2", + "for-own": "^1.0.0", + "make-iterator": "^1.0.0" + } + }, + "collection-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", + "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", + "dev": true, + "requires": { + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + }, + "color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "dev": true + }, + "colors": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", + "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "requires": { + "delayed-stream": "~1.0.0" + } + }, + "commander": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", + "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", + "dev": true, + "requires": { + "graceful-readlink": ">= 1.0.0" + } + }, + "component-emitter": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "concat-stream": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" + } + }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", + "dev": true + }, + "convert-source-map": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.1" + } + }, + "copy-descriptor": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", + "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", + "dev": true + }, + "copy-props": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz", + "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==", + "dev": true, + "requires": { + "each-props": "^1.3.0", + "is-plain-object": "^2.0.1" + } + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true + }, + "cross-env": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.1.tgz", + "integrity": "sha512-1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.5" + } + }, + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "css": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz", + "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "source-map": "^0.6.1", + "source-map-resolve": "^0.5.2", + "urix": "^0.1.0" + } + }, + "css-select": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", + "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", + "dev": true, + "requires": { + "boolbase": "~1.0.0", + "css-what": "2.1", + "domutils": "1.5.1", + "nth-check": "~1.0.1" + } + }, + "css-what": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz", + "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==", + "dev": true + }, + "cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", + "dev": true + }, + "cssstyle": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.3.1.tgz", + "integrity": "sha512-tNvaxM5blOnxanyxI6panOsnfiyLRj3HV4qjqqS45WPNS1usdYWRUQjqTEEELK73lpeP/1KoIGYUwrBn/VcECA==", + "dev": true, + "requires": { + "cssom": "0.3.x" + } + }, + "d": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", + "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", + "dev": true, + "requires": { + "es5-ext": "^0.10.50", + "type": "^1.0.1" + } + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dev": true, + "requires": { + "assert-plus": "^1.0.0" + } + }, + "data-urls": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz", + "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==", + "dev": true, + "requires": { + "abab": "^2.0.0", + "whatwg-mimetype": "^2.2.0", + "whatwg-url": "^7.0.0" + }, + "dependencies": { + "abab": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz", + "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==", + "dev": true + }, + "whatwg-url": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", + "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", + "dev": true, + "requires": { + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true } } }, - "chownr": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz", - "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==", + "dataobject-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/dataobject-parser/-/dataobject-parser-1.2.1.tgz", + "integrity": "sha512-1XMF0e8Dkfano8WY9TOCWLUQqosXI/Hf6GQrPESCnIn+NbYwy5kVUto0l2L6EVOIRflq8D820QnfQgVapckmTQ==" + }, + "date-format": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz", + "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=", "dev": true }, - "ci-info": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", + "dateformat": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.2.tgz", + "integrity": "sha1-mk30v/FYrC80vGN6vbFUcWB+Flk=", "dev": true }, - "circular-json": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz", - "integrity": "sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==", + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "debug-fabulous": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz", + "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==", + "dev": true, + "requires": { + "debug": "3.X", + "memoizee": "0.4.X", + "object-assign": "4.X" + } + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + }, + "decode-uri-component": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", "dev": true }, - "class-utils": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "decompress-response": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz", + "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==", "dev": true, "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" + "mimic-response": "^2.0.0" + } + }, + "deep-eql": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", + "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "dev": true, + "requires": { + "type-detect": "^4.0.0" + } + }, + "deep-extend": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", + "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==", + "dev": true + }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, + "deepmerge": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.0.0.tgz", + "integrity": "sha512-a8z8bkgHsAML+uHLqmMS83HHlpy3PvZOOuiTQqaa3wu8ZVg3h0hqHk6aCsGdOnZV2XMM/FRimNGjUh0KCcmHBw==" + }, + "default-compare": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz", + "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==", + "dev": true, + "requires": { + "kind-of": "^5.0.2" }, "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true } } }, - "cli-table3": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz", - "integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==", + "default-resolution": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz", + "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=", + "dev": true + }, + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, "requires": { - "colors": "^1.1.2", - "object-assign": "^4.1.0", - "string-width": "^2.1.1" + "object-keys": "^1.0.12" } }, - "cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "define-property": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "dev": true, "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" }, "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" - }, - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "kind-of": "^6.0.0" } }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, "requires": { - "ansi-regex": "^5.0.0" + "kind-of": "^6.0.0" } }, - "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } }, - "clone": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", - "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", + "del": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz", + "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", + "dev": true, + "requires": { + "@types/glob": "^7.1.1", + "globby": "^6.1.0", + "is-path-cwd": "^2.0.0", + "is-path-in-cwd": "^2.0.0", + "p-map": "^2.0.0", + "pify": "^4.0.1", + "rimraf": "^2.6.3" + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "dev": true + }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", + "dev": true + }, + "denodeify": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/denodeify/-/denodeify-1.2.1.tgz", + "integrity": "sha1-OjYof1A05pnnV3kBBSwubJQlFjE=", "dev": true }, - "clone-buffer": { + "detect-file": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz", - "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=", + "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", + "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=", "dev": true }, - "clone-stats": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", - "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=", + "detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "dev": true }, - "cloneable-readable": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz", - "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "process-nextick-args": "^2.0.0", - "readable-stream": "^2.3.5" - } + "detect-newline": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz", + "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=", + "dev": true }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "didyoumean": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.1.tgz", + "integrity": "sha1-6S7f2tplN9SE1zwBcv0eugxJdv8=", "dev": true }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", "dev": true }, - "collection-map": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz", - "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=", + "diff-sequences": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz", + "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==", + "dev": true + }, + "dom-serializer": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz", + "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==", "dev": true, "requires": { - "arr-map": "^2.0.2", - "for-own": "^1.0.0", - "make-iterator": "^1.0.0" + "domelementtype": "^1.3.0", + "entities": "^1.1.1" } }, - "collection-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", - "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", + "domelementtype": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", + "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", + "dev": true + }, + "domexception": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz", + "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==", "dev": true, "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" + "webidl-conversions": "^4.0.2" } }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "domhandler": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", + "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", + "dev": true, "requires": { - "color-name": "1.1.3" + "domelementtype": "1" } }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + "domutils": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "dev": true, + "requires": { + "dom-serializer": "0", + "domelementtype": "1" + } }, - "color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "duplexer": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", + "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", "dev": true }, - "colors": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz", - "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==" - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "duplexify": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", + "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", "dev": true, "requires": { - "delayed-stream": "~1.0.0" + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" } }, - "commander": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", - "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", + "each-props": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz", + "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==", "dev": true, "requires": { - "graceful-readlink": ">= 1.0.0" + "is-plain-object": "^2.0.1", + "object.defaults": "^1.1.0" } }, - "component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", - "dev": true + "ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "dev": true, + "requires": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, - "concat-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", + "end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", "dev": true, "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" + "once": "^1.4.0" } }, - "console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", + "entities": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", + "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==", "dev": true }, - "convert-source-map": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", - "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, "requires": { - "safe-buffer": "~5.1.1" + "is-arrayish": "^0.2.1" } }, - "copy-descriptor": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", - "dev": true + "es-abstract": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0.tgz", + "integrity": "sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.1.5", + "is-regex": "^1.0.5", + "object-inspect": "^1.7.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimleft": "^2.1.1", + "string.prototype.trimright": "^2.1.1" + } }, - "copy-props": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz", - "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==", + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "es5-ext": { + "version": "0.10.53", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz", + "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==", + "dev": true, + "requires": { + "es6-iterator": "~2.0.3", + "es6-symbol": "~3.1.3", + "next-tick": "~1.0.0" + } + }, + "es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "dev": true, "requires": { - "each-props": "^1.3.0", - "is-plain-object": "^2.0.1" + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" } }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "es6-promise": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", "dev": true }, - "cross-env": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.1.tgz", - "integrity": "sha512-1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ==", + "es6-promisify": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", + "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", "dev": true, "requires": { - "cross-spawn": "^6.0.5" + "es6-promise": "^4.0.3" } }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "es6-symbol": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", + "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", "dev": true, "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "d": "^1.0.1", + "ext": "^1.1.2" } }, - "css": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz", - "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==", + "es6-weak-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz", + "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==", "dev": true, "requires": { - "inherits": "^2.0.3", - "source-map": "^0.6.1", - "source-map-resolve": "^0.5.2", - "urix": "^0.1.0" + "d": "1", + "es5-ext": "^0.10.46", + "es6-iterator": "^2.0.3", + "es6-symbol": "^3.1.1" } }, - "css-select": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", - "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + }, + "escodegen": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.1.tgz", + "integrity": "sha512-Q8t2YZ+0e0pc7NRVj3B4tSQ9rim1oi4Fh46k2xhJ2qOiEwhQfdjyEQddWdj7ZFaKmU+5104vn1qrcjEPWq+bgQ==", "dev": true, "requires": { - "boolbase": "~1.0.0", - "css-what": "2.1", - "domutils": "1.5.1", - "nth-check": "~1.0.1" + "esprima": "^3.1.3", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" + }, + "dependencies": { + "esprima": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", + "dev": true + } } }, - "css-what": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz", - "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==", + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + }, + "estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", "dev": true }, - "cssom": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", - "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", + "esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true }, - "cssstyle": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.3.1.tgz", - "integrity": "sha512-tNvaxM5blOnxanyxI6panOsnfiyLRj3HV4qjqqS45WPNS1usdYWRUQjqTEEELK73lpeP/1KoIGYUwrBn/VcECA==", + "event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", "dev": true, "requires": { - "cssom": "0.3.x" + "d": "1", + "es5-ext": "~0.10.14" } }, - "d": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", - "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", + "event-stream": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz", + "integrity": "sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA==", "dev": true, "requires": { - "es5-ext": "^0.10.50", - "type": "^1.0.1" + "duplexer": "^0.1.1", + "from": "^0.1.7", + "map-stream": "0.0.7", + "pause-stream": "^0.0.11", + "split": "^1.0.1", + "stream-combiner": "^0.2.2", + "through": "^2.3.8" } }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "exec-sh": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz", + "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==", + "dev": true + }, + "execa": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { - "assert-plus": "^1.0.0" + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" } }, - "data-urls": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz", - "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==", + "exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", + "dev": true + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { - "abab": "^2.0.0", - "whatwg-mimetype": "^2.2.0", - "whatwg-url": "^7.0.0" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { - "abab": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz", - "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==", - "dev": true + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } }, - "whatwg-url": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", - "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "lodash.sortby": "^4.7.0", - "tr46": "^1.0.1", - "webidl-conversions": "^4.0.2" + "is-descriptor": "^0.1.0" } - } - } - }, - "dataobject-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/dataobject-parser/-/dataobject-parser-1.2.1.tgz", - "integrity": "sha512-1XMF0e8Dkfano8WY9TOCWLUQqosXI/Hf6GQrPESCnIn+NbYwy5kVUto0l2L6EVOIRflq8D820QnfQgVapckmTQ==" - }, - "date-format": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz", - "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=", - "dev": true - }, - "dateformat": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.2.tgz", - "integrity": "sha1-mk30v/FYrC80vGN6vbFUcWB+Flk=", - "dev": true - }, - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "debug-fabulous": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz", - "integrity": "sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==", - "dev": true, - "requires": { - "debug": "3.X", - "memoizee": "0.4.X", - "object-assign": "4.X" + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } } }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" - }, - "decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "expand-template": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", + "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", "dev": true }, - "decompress-response": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz", - "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==", + "expand-tilde": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", + "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", "dev": true, "requires": { - "mimic-response": "^2.0.0" + "homedir-polyfill": "^1.0.1" } }, - "deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "expect": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz", + "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==", "dev": true, "requires": { - "type-detect": "^4.0.0" + "@jest/types": "^24.9.0", + "ansi-styles": "^3.2.0", + "jest-get-type": "^24.9.0", + "jest-matcher-utils": "^24.9.0", + "jest-message-util": "^24.9.0", + "jest-regex-util": "^24.9.0" } }, - "deep-extend": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", - "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==", - "dev": true - }, - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true - }, - "deepmerge": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.0.0.tgz", - "integrity": "sha512-a8z8bkgHsAML+uHLqmMS83HHlpy3PvZOOuiTQqaa3wu8ZVg3h0hqHk6aCsGdOnZV2XMM/FRimNGjUh0KCcmHBw==" - }, - "default-compare": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz", - "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==", + "ext": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz", + "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==", "dev": true, "requires": { - "kind-of": "^5.0.2" + "type": "^2.0.0" }, "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz", + "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==", "dev": true } } }, - "default-resolution": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz", - "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=", + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", "dev": true }, - "define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "object-keys": "^1.0.12" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4" + } + } } }, - "define-property": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "dev": true, "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "^1.0.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + }, "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", @@ -2900,778 +2807,784 @@ "is-accessor-descriptor": "^1.0.0", "is-data-descriptor": "^1.0.0", "kind-of": "^6.0.2" - } - } - } - }, - "del": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz", - "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", - "dev": true, - "requires": { - "@types/glob": "^7.1.1", - "globby": "^6.1.0", - "is-path-cwd": "^2.0.0", - "is-path-in-cwd": "^2.0.0", - "p-map": "^2.0.0", - "pify": "^4.0.1", - "rimraf": "^2.6.3" - } - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true - }, - "delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "dev": true - }, - "denodeify": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/denodeify/-/denodeify-1.2.1.tgz", - "integrity": "sha1-OjYof1A05pnnV3kBBSwubJQlFjE=", - "dev": true - }, - "detect-file": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=", - "dev": true - }, - "detect-libc": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", - "dev": true - }, - "detect-newline": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz", - "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=", - "dev": true - }, - "didyoumean": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.1.tgz", - "integrity": "sha1-6S7f2tplN9SE1zwBcv0eugxJdv8=", - "dev": true - }, - "diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", - "dev": true - }, - "diff-sequences": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz", - "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==", - "dev": true - }, - "dom-serializer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz", - "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==", - "dev": true, - "requires": { - "domelementtype": "^1.3.0", - "entities": "^1.1.1" - } - }, - "domelementtype": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", - "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", - "dev": true - }, - "domexception": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz", - "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==", - "dev": true, - "requires": { - "webidl-conversions": "^4.0.2" - } - }, - "domhandler": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", - "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", - "dev": true, - "requires": { - "domelementtype": "1" - } - }, - "domutils": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", - "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", - "dev": true, - "requires": { - "dom-serializer": "0", - "domelementtype": "1" + } + } } }, - "duplexer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", - "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", "dev": true }, - "duplexify": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", - "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", - "dev": true, - "requires": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" - } - }, - "each-props": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz", - "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==", - "dev": true, - "requires": { - "is-plain-object": "^2.0.1", - "object.defaults": "^1.1.0" - } - }, - "ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "fancy-log": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", + "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==", "dev": true, "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" + "ansi-gray": "^0.1.1", + "color-support": "^1.1.3", + "parse-node-version": "^1.0.0", + "time-stamp": "^1.0.0" } }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "fast-deep-equal": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "dev": true }, - "end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, - "requires": { - "once": "^1.4.0" - } + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true }, - "entities": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", - "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==", + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "dev": true }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "fb-watchman": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz", + "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==", "dev": true, "requires": { - "is-arrayish": "^0.2.1" + "bser": "2.1.1" } }, - "es-abstract": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0.tgz", - "integrity": "sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==", + "fd-slicer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", "dev": true, "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.1.5", - "is-regex": "^1.0.5", - "object-inspect": "^1.7.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.0", - "string.prototype.trimleft": "^2.1.1", - "string.prototype.trimright": "^2.1.1" + "pend": "~1.2.0" } }, - "es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", "dev": true, - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - } + "optional": true }, - "es5-ext": { - "version": "0.10.53", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz", - "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==", + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "es6-iterator": "~2.0.3", - "es6-symbol": "~3.1.3", - "next-tick": "~1.0.0" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } } }, - "es6-iterator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", - "dev": true, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "requires": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" + "locate-path": "^2.0.0" } }, - "es6-promise": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", - "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", - "dev": true - }, - "es6-promisify": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", - "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", + "findup-sync": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz", + "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==", "dev": true, "requires": { - "es6-promise": "^4.0.3" + "detect-file": "^1.0.0", + "is-glob": "^4.0.0", + "micromatch": "^3.0.4", + "resolve-dir": "^1.0.1" } }, - "es6-symbol": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", - "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", + "fined": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz", + "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==", "dev": true, "requires": { - "d": "^1.0.1", - "ext": "^1.1.2" + "expand-tilde": "^2.0.2", + "is-plain-object": "^2.0.3", + "object.defaults": "^1.1.0", + "object.pick": "^1.2.0", + "parse-filepath": "^1.0.1" } }, - "es6-weak-map": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz", - "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "^0.10.46", - "es6-iterator": "^2.0.3", - "es6-symbol": "^3.1.1" - } + "flagged-respawn": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz", + "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==", + "dev": true }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + "flatted": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz", + "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==" }, - "escodegen": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.1.tgz", - "integrity": "sha512-Q8t2YZ+0e0pc7NRVj3B4tSQ9rim1oi4Fh46k2xhJ2qOiEwhQfdjyEQddWdj7ZFaKmU+5104vn1qrcjEPWq+bgQ==", + "flush-write-stream": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", + "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", "dev": true, "requires": { - "esprima": "^3.1.3", - "estraverse": "^4.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" - }, - "dependencies": { - "esprima": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", - "dev": true - } + "inherits": "^2.0.3", + "readable-stream": "^2.3.6" } }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" - }, - "estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", "dev": true }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "for-own": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", + "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", + "dev": true, + "requires": { + "for-in": "^1.0.1" + } + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", "dev": true }, - "event-emitter": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", - "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", + "form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", "dev": true, "requires": { - "d": "1", - "es5-ext": "~0.10.14" + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" } }, - "event-stream": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-4.0.1.tgz", - "integrity": "sha512-qACXdu/9VHPBzcyhdOWR5/IahhGMf0roTeZJfzz077GwylcDd90yOHLouhmv7GJ5XzPi6ekaQWd8AvPP2nOvpA==", + "fragment-cache": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", + "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "dev": true, "requires": { - "duplexer": "^0.1.1", - "from": "^0.1.7", - "map-stream": "0.0.7", - "pause-stream": "^0.0.11", - "split": "^1.0.1", - "stream-combiner": "^0.2.2", - "through": "^2.3.8" + "map-cache": "^0.2.2" } }, - "exec-sh": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz", - "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==", + "from": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", + "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=", "dev": true }, - "execa": { + "fs-constants": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "dev": true + }, + "fs-extra": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.0.1.tgz", + "integrity": "sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==", + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "fs-mkdirp-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz", + "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=", "dev": true, "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "graceful-fs": "^4.1.11", + "through2": "^2.0.3" } }, - "exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", - "dev": true + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "fsevents": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz", + "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==", "dev": true, + "optional": true, "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "bindings": "^1.5.0", + "nan": "^2.12.1", + "node-pre-gyp": "*" }, "dependencies": { + "abbrev": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "aproba": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "optional": true + }, + "are-we-there-yet": { + "version": "1.1.5", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "brace-expansion": { + "version": "1.1.11", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "chownr": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "optional": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "optional": true + }, + "concat-map": { + "version": "0.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "optional": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "3.2.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ms": "^2.1.1" + } + }, + "deep-extend": { + "version": "0.6.0", + "bundled": true, + "dev": true, + "optional": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "detect-libc": { + "version": "1.0.3", + "bundled": true, + "dev": true, + "optional": true + }, + "fs-minipass": { + "version": "1.2.7", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minipass": "^2.6.0" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "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" + } + }, + "glob": { + "version": "7.1.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "iconv-lite": { + "version": "0.4.24", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ignore-walk": { + "version": "3.0.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minimatch": "^3.0.4" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "bundled": true, + "dev": true, + "optional": true + }, + "ini": { + "version": "1.3.5", + "bundled": true, + "dev": true, + "optional": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "isarray": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true, + "dev": true, + "optional": true + }, + "minipass": { + "version": "2.9.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + }, + "minizlib": { + "version": "1.3.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minipass": "^2.9.0" + } + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "needle": { + "version": "2.4.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "debug": "^3.2.6", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + } + }, + "node-pre-gyp": { + "version": "0.14.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "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": { + "version": "4.0.1", + "bundled": true, "dev": true, + "optional": true, "requires": { - "ms": "2.0.0" + "abbrev": "1", + "osenv": "^0.1.4" } }, - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "npm-bundled": { + "version": "1.1.1", + "bundled": true, "dev": true, + "optional": true, "requires": { - "is-descriptor": "^0.1.0" + "npm-normalize-package-bin": "^1.0.1" } }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "npm-normalize-package-bin": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "npm-packlist": { + "version": "1.4.7", + "bundled": true, "dev": true, + "optional": true, "requires": { - "is-extendable": "^0.1.0" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "expand-template": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", - "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", - "dev": true - }, - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", - "dev": true, - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, - "expect": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz", - "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==", - "dev": true, - "requires": { - "@jest/types": "^24.9.0", - "ansi-styles": "^3.2.0", - "jest-get-type": "^24.9.0", - "jest-matcher-utils": "^24.9.0", - "jest-message-util": "^24.9.0", - "jest-regex-util": "^24.9.0" - } - }, - "ext": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz", - "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==", - "dev": true, - "requires": { - "type": "^2.0.0" - }, - "dependencies": { - "type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz", - "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==", - "dev": true - } - } - }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "dev": true, - "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "npmlog": { + "version": "4.1.2", + "bundled": true, "dev": true, + "optional": true, "requires": { - "is-plain-object": "^2.0.4" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, - "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "once": { + "version": "1.4.0", + "bundled": true, "dev": true, + "optional": true, "requires": { - "is-descriptor": "^1.0.0" + "wrappy": "1" } }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "osenv": { + "version": "0.1.5", + "bundled": true, "dev": true, + "optional": true, "requires": { - "is-extendable": "^0.1.0" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "path-is-absolute": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "process-nextick-args": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "rc": { + "version": "1.2.8", + "bundled": true, "dev": true, + "optional": true, "requires": { - "kind-of": "^6.0.0" + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "optional": true + } } }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "readable-stream": { + "version": "2.3.6", + "bundled": true, "dev": true, + "optional": true, "requires": { - "kind-of": "^6.0.0" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "rimraf": { + "version": "2.7.1", + "bundled": true, "dev": true, + "optional": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "glob": "^7.1.3" } - } - } - }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true - }, - "fancy-log": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", - "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==", - "dev": true, - "requires": { - "ansi-gray": "^0.1.1", - "color-support": "^1.1.3", - "parse-node-version": "^1.0.0", - "time-stamp": "^1.0.0" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true - }, - "fb-watchman": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz", - "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==", - "dev": true, - "requires": { - "bser": "2.1.1" - } - }, - "fd-slicer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", - "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", - "dev": true, - "requires": { - "pend": "~1.2.0" - } - }, - "file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", - "dev": true, - "optional": true - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "dependencies": { - "extend-shallow": { + }, + "safe-buffer": { + "version": "5.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "safer-buffer": { + "version": "2.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "sax": { + "version": "1.2.4", + "bundled": true, + "dev": true, + "optional": true + }, + "semver": { + "version": "5.7.1", + "bundled": true, + "dev": true, + "optional": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "~5.1.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "strip-json-comments": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "bundled": true, + "dev": true, + "optional": true + }, + "tar": { + "version": "4.4.13", + "bundled": true, "dev": true, + "optional": true, "requires": { - "is-extendable": "^0.1.0" + "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" + } + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "wide-align": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "string-width": "^1.0.2 || 2" } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "yallist": { + "version": "3.1.1", + "bundled": true, + "dev": true, + "optional": true } } }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "requires": { - "locate-path": "^2.0.0" - } - }, - "findup-sync": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz", - "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==", - "dev": true, - "requires": { - "detect-file": "^1.0.0", - "is-glob": "^4.0.0", - "micromatch": "^3.0.4", - "resolve-dir": "^1.0.1" - } - }, - "fined": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz", - "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==", - "dev": true, - "requires": { - "expand-tilde": "^2.0.2", - "is-plain-object": "^2.0.3", - "object.defaults": "^1.1.0", - "object.pick": "^1.2.0", - "parse-filepath": "^1.0.1" - } - }, - "flagged-respawn": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz", - "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==", - "dev": true - }, - "flatted": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz", - "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==" - }, - "flush-write-stream": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", - "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "readable-stream": "^2.3.6" - } - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", - "dev": true - }, - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", - "dev": true, - "requires": { - "for-in": "^1.0.1" - } - }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true - }, - "form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - } - }, - "fragment-cache": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", - "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "dev": true, - "requires": { - "map-cache": "^0.2.2" - } - }, - "from": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", - "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=", - "dev": true - }, - "fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "dev": true - }, - "fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "fs-mkdirp-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz", - "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.11", - "through2": "^2.0.3" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" - }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -7830,6 +7743,11 @@ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "dev": true }, + "progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==" + }, "prompts": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.0.tgz", @@ -10080,6 +9998,97 @@ "glob": "^7.0.5" } }, + "yargs": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz", + "integrity": "sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==", + "requires": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^16.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-limit": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz", + "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==", + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "requires": { + "p-limit": "^2.2.0" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, "yargs-parser": { "version": "16.1.0", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz", diff --git a/package.json b/package.json index 90d8884a50..48e0590095 100644 --- a/package.json +++ b/package.json @@ -1210,11 +1210,11 @@ "vscode-nls-dev": "^3.2.6" }, "dependencies": { - "@zowe/cli": "^6.8.1", - "isbinaryfile": "^4.0.4", - "fs-extra": "^8.0.1", - "moment": "^2.24.0", - "vscode-nls": "^4.1.1" + "@zowe/cli": "6.8.2", + "isbinaryfile": "4.0.4", + "fs-extra": "8.0.1", + "moment": "2.24.0", + "vscode-nls": "4.1.1" }, "jest": { "moduleFileExtensions": [ diff --git a/src/api/ZoweExplorerZosmfApi.ts b/src/api/ZoweExplorerZosmfApi.ts index 3f20afd78f..2f53dc52a2 100644 --- a/src/api/ZoweExplorerZosmfApi.ts +++ b/src/api/ZoweExplorerZosmfApi.ts @@ -139,9 +139,9 @@ export class ZosmfMvsApi extends ZosmfApiCommon implements ZoweExplorerApi.IMvs public async copyDataSetMember( { dataSetName: fromDataSetName, memberName: fromMemberName }: zowe.IDataSet, { dataSetName: toDataSetName, memberName: toMemberName }: zowe.IDataSet, - options?: any // Needs typed. See https://github.com/zowe/zowe-cli/issues/676 + options?: zowe.ICopyDatasetOptions ): Promise { - let newOptions: any = {}; // Needs typed. See https://github.com/zowe/zowe-cli/issues/676 + let newOptions: zowe.ICopyDatasetOptions; if (options) { if (options.fromDataSet) { newOptions = options; From 497ad05262b056dbbf953298a5902da5c868a195 Mon Sep 17 00:00:00 2001 From: Colin Stone <30794003+Colin-Stone@users.noreply.github.com> Date: Thu, 20 Feb 2020 10:42:26 +0000 Subject: [PATCH 16/16] Create tmp folder for our own downloads Signed-off-by: Colin Stone <30794003+Colin-Stone@users.noreply.github.com> (cherry picked from commit d8ee84ae87e278b4ff7719b6d71d59a31b24dae8) (cherry picked from commit de99dd6319f7ca834ca59006d5b9dacd775bc876) --- __tests__/__unit__/extension.unit.test.ts | 10 +++++----- src/extension.ts | 8 +++++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/__tests__/__unit__/extension.unit.test.ts b/__tests__/__unit__/extension.unit.test.ts index 5f042af0dc..cc3bb27bf7 100644 --- a/__tests__/__unit__/extension.unit.test.ts +++ b/__tests__/__unit__/extension.unit.test.ts @@ -594,7 +594,7 @@ describe("Extension Unit Tests", () => { light: path.join(__dirname, "..", "..", "..", "resources", "light", "pattern.svg") }; // tslint:disable-next-line: no-magic-numbers - expect(mkdirSync.mock.calls.length).toBe(3); + expect(mkdirSync.mock.calls.length).toBe(4); // tslint:disable-next-line: no-magic-numbers expect(createTreeView.mock.calls.length).toBe(3); expect(createTreeView.mock.calls[0][0]).toBe("zowe.explorer"); @@ -3669,7 +3669,7 @@ describe("Extension Unit Tests", () => { extension.moveTempFolder(originalPreferencePath, updatedPreferencePath); // tslint:disable-next-line: no-magic-numbers - expect(mkdirSync.mock.calls.length).toBe(3); + expect(mkdirSync.mock.calls.length).toBe(4); expect(mkdirSync.mock.calls[0][0]).toBe(extension.ZOWETEMPFOLDER); expect(moveSync.mock.calls.length).toBe(1); expect(moveSync.mock.calls[0][0]).toBe(defaultPreference); @@ -3687,7 +3687,7 @@ describe("Extension Unit Tests", () => { extension.moveTempFolder(originalPreferencePath, updatedPreferencePath); // tslint:disable-next-line: no-magic-numbers - expect(mkdirSync.mock.calls.length).toBe(3); + expect(mkdirSync.mock.calls.length).toBe(4); expect(mkdirSync.mock.calls[0][0]).toBe(extension.ZOWETEMPFOLDER); expect(moveSync.mock.calls.length).toBe(1); expect(moveSync.mock.calls[0][0]).toBe(path.join(path.sep, "test", "path", "temp")); @@ -3739,7 +3739,7 @@ describe("Extension Unit Tests", () => { extension.moveTempFolder(originalPreferencePath, updatedPreferencePath); // tslint:disable-next-line: no-magic-numbers - expect(mkdirSync.mock.calls.length).toBe(3); + expect(mkdirSync.mock.calls.length).toBe(4); expect(mkdirSync.mock.calls[0][0]).toBe(extension.ZOWETEMPFOLDER); expect(moveSync.mock.calls.length).toBe(0); }); @@ -3760,7 +3760,7 @@ describe("Extension Unit Tests", () => { extension.moveTempFolder(originalPreferencePath, updatedPreferencePath); // tslint:disable-next-line: no-magic-numbers - expect(mkdirSync.mock.calls.length).toBe(3); + expect(mkdirSync.mock.calls.length).toBe(4); expect(moveSync.mock.calls.length).toBe(0); }); diff --git a/src/extension.ts b/src/extension.ts index 52064f48be..e9260685d0 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -40,6 +40,7 @@ const localize = nls.config({messageFormat: nls.MessageFormat.file})(); // Globals export let ZOWETEMPFOLDER; +export let ZOWE_TMP_FOLDER; export let USS_DIR; export let DS_DIR; export let ISTHEIA: boolean = false; // set during activate @@ -102,6 +103,7 @@ export async function activate(context: vscode.ExtensionContext): Promise