diff --git a/.babelrc b/.babelrc index 16e4e6f..3a62257 100644 --- a/.babelrc +++ b/.babelrc @@ -3,9 +3,21 @@ [ "@babel/preset-env", { +<<<<<<< HEAD + "targets": { + "browsers": [ + ">0.25%", + "not ie 11", + "not op_mini all" + ] + } + } + ] +======= "useBuiltIns": "entry" } ] +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b ], "plugins": [ "@babel/plugin-transform-flow-strip-types", diff --git a/@eaDir/.babelrc/SYNO_DTIME b/@eaDir/.babelrc/SYNO_DTIME new file mode 100755 index 0000000..2fa0c09 --- /dev/null +++ b/@eaDir/.babelrc/SYNO_DTIME @@ -0,0 +1 @@ +1605034026 \ No newline at end of file diff --git a/@eaDir/.gitignore/SYNO_DTIME b/@eaDir/.gitignore/SYNO_DTIME new file mode 100755 index 0000000..4570d3a --- /dev/null +++ b/@eaDir/.gitignore/SYNO_DTIME @@ -0,0 +1 @@ +1548599202 \ No newline at end of file diff --git a/@eaDir/LICENSE/SYNO_DTIME b/@eaDir/LICENSE/SYNO_DTIME new file mode 100755 index 0000000..2fa0c09 --- /dev/null +++ b/@eaDir/LICENSE/SYNO_DTIME @@ -0,0 +1 @@ +1605034026 \ No newline at end of file diff --git a/@eaDir/README.md/SYNO_DTIME b/@eaDir/README.md/SYNO_DTIME new file mode 100755 index 0000000..b5e8265 --- /dev/null +++ b/@eaDir/README.md/SYNO_DTIME @@ -0,0 +1 @@ +1605034125 \ No newline at end of file diff --git a/@eaDir/about.tid/SYNO_DTIME b/@eaDir/about.tid/SYNO_DTIME new file mode 100755 index 0000000..2f4b1ac --- /dev/null +++ b/@eaDir/about.tid/SYNO_DTIME @@ -0,0 +1 @@ +1605034126 \ No newline at end of file diff --git a/@eaDir/config.tid/SYNO_DTIME b/@eaDir/config.tid/SYNO_DTIME new file mode 100755 index 0000000..b5e8265 --- /dev/null +++ b/@eaDir/config.tid/SYNO_DTIME @@ -0,0 +1 @@ +1605034125 \ No newline at end of file diff --git a/@eaDir/main.js/SYNO_DTIME b/@eaDir/main.js/SYNO_DTIME new file mode 100755 index 0000000..2fa0c09 --- /dev/null +++ b/@eaDir/main.js/SYNO_DTIME @@ -0,0 +1 @@ +1605034026 \ No newline at end of file diff --git a/@eaDir/package-lock.json/SYNO_DTIME b/@eaDir/package-lock.json/SYNO_DTIME new file mode 100755 index 0000000..b5e8265 --- /dev/null +++ b/@eaDir/package-lock.json/SYNO_DTIME @@ -0,0 +1 @@ +1605034125 \ No newline at end of file diff --git a/@eaDir/package.json/SYNO_DTIME b/@eaDir/package.json/SYNO_DTIME new file mode 100755 index 0000000..b5e8265 --- /dev/null +++ b/@eaDir/package.json/SYNO_DTIME @@ -0,0 +1 @@ +1605034125 \ No newline at end of file diff --git a/@eaDir/plugin.info/SYNO_DTIME b/@eaDir/plugin.info/SYNO_DTIME new file mode 100755 index 0000000..b5e8265 --- /dev/null +++ b/@eaDir/plugin.info/SYNO_DTIME @@ -0,0 +1 @@ +1605034125 \ No newline at end of file diff --git a/config.tid b/config.tid index 9f5d921..7bd6fda 100644 --- a/config.tid +++ b/config.tid @@ -7,13 +7,45 @@ tags: [[$:/tags/ControlPanel/Saving]] !! Choose a container URI to save your tiddlers into. !! it should be read/write for your webid. +<<<<<<< HEAD +|''Pod Name'' | <$edit-text tiddler="$:/plugins/bourgeoa/nodesolidserver/containeruri" tag="input" /> | for example : https://xyz.solid.community| +======= +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b |''Root Folder''| <$reveal type="nomatch" state="$:/plugins/bourgeoa/nodesolidserver/private" text="yes">public<$reveal type="match" state="$:/plugins/bourgeoa/nodesolidserver/private" text="yes">private | yes : public no : private| |''tiddlers'' | tiddlers | not editable| |''wiki folder'' | <$edit-text tiddler="$:/plugins/bourgeoa/nodesolidserver/namespace" tag="input" default="main" /> | main is the default| The actual path in your solid server will be: {{$:/plugins/bourgeoa/node-solid-server/containeruri}}/<$reveal type="nomatch" state="$:/plugins/bourgeoa/nodesolidserver/private" text="yes">public<$reveal type="match" state="$:/plugins/bourgeoa/nodesolidserver/private" text="yes">private/tiddlers/{{$:/plugins/bourgeoa/nodesolidserver/namespace}} +<<<<<<< HEAD + + +<$reveal type="match" state="$:/plugins/bourgeoa/nodesolidserver/loggedin" text="yes-yes"> + <$button set="$:/plugins/bourgeoa/nodesolidserver/loggedin" setTo="yes-no"> + You are connected : Make Logout + + +<$reveal type="match" state="$:/plugins/bourgeoa/nodesolidserver/loggedin" text="yes-no"> + <$button set="$:/plugins/bourgeoa/nodesolidserver/loggedin" setTo="yes-yes"> + You are connected : Stay Logged in + + +<$reveal type="match" state="$:/plugins/bourgeoa/nodesolidserver/loggedin" text="no-no" default="no-no"> + <$button set="$:/plugins/bourgeoa/nodesolidserver/loggedin" setTo="no-yes"> + You are not logged in : Make Login + + +<$reveal type="match" state="$:/plugins/bourgeoa/nodesolidserver/loggedin" text="no-yes"> + <$button set="$:/plugins/bourgeoa/nodesolidserver/loggedin" setTo="no-no"> + You are not logged in : stay logged out + + + + +---"Please close the tiddler to save the path to your Solid Pod."--- +======= ---"Please close the tiddler to save the path to your Solid Pod."--- -------------------"And reload your browser"------------------------ +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b diff --git a/main.js b/main.js index b0d5d68..ad710a9 100644 --- a/main.js +++ b/main.js @@ -3,7 +3,12 @@ title: $:/plugins/tiddlywiki/nodesolidserver/syncadaptor.js type: application/javascript module-type: syncadaptor +<<<<<<< HEAD +Saves tiddlers as .ttl ressources under containerUri on node-solid-server. +??? Migration : Replace .json tiddler by .ttl ones on firdt save. +======= Saves tiddlers as ressources under containerUri on node-solid-server. +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b \*/ @@ -19,6 +24,70 @@ class RSSyncer { this.wiki = options.wiki; this.ls = localStorage; +<<<<<<< HEAD + this.rs = require("solid-file-client"); // ./scripts/solid-file-client.bundle.js"); // + const Widget = require("solid-file-widget"); + this.jsonld = require("jsonld"); + + this.indexFile = null; // if true use __index__.json or create it +// if( confirm("Do you want to test performance \nwith an index file ???")) this.indexFile = true; + this._index = null; + this._syncedSkinny = null; + + // ontology + this.ontology = { + "dc":"http://purl.org/dc/elements/1.1/", + "dcterms":"http://purl.org/dc/terms/", + "schema":"https://schema.org/", + "ex":"http://example.org/vocab#" // "ex" is needed : used as default tiddlywiki ontology + } + + this.prefix = ""; + Object.entries(this.ontology).forEach( + ([key, value]) => {this.prefix = this.prefix+"\n@prefix "+key+": <"+value+"> ."} + ) + + // subject + this.subject = "\n\n" ; + + // tidlerKeys to turtle predicate + this.tiddlerKeys = { + "created":"schema:dateCreated", + "creator":"schema:creator", + "text":"schema:text", + "title":"dc:title", + "type":"dc:type", + "tags":"schema:keywords", + "modified":"schema:dateModified", + "modifier":"schema:contributor", + "_canonical_uri":"schema:url", + "draft.of":"ex:draft_of", // dot not allowed in RDF vocab + "draft.title":"ex:draft_title"} // dot not allowed in RDF vocab + + // extended .ttl predicate to tiddlywiki tiddlerKeys .json vocab + this.convertKeys = {} + Object.entries(this.tiddlerKeys).forEach( + ([key, value]) => { + var pred = value.split(":") + this.convertKeys[this.ontology[pred[0]]+pred[1]] = key + } + ) + + + +// init widget + let widget = new Widget(this.rs, { + leaveOpen: false, + autoCloseAfter: 4000, + windowReload : false, + solidAppName : "tiddlywiki", + appFolder : "/public/tiddlers" + + }) + + widget.attach() + +======= this.rs = require("solid-file-client"); const Widget = require("solid-file-widget"); @@ -37,6 +106,7 @@ class RSSyncer { widget.attach() +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b let style = document.createElement('style') style.innerHTML = `#remotestorage-widget { position: fixed; @@ -52,7 +122,11 @@ class RSSyncer { this.ls.setItem(NAMESPACE_KEY, ns); this.wiki.setText(NAMESPACE_KEY, null, null, ns); +<<<<<<< HEAD +// alert("You can work on different tiddlywiki's on your pod.\nOne at a time. Default 'wiki folder is 'main'.\nTo change go to 'Options', 'saving', 'nodesolidserver syncadaptor'\nBeware : Reload or disconnect after a change\n\nYou are actually linked to : "+this.getTiddlerText(NAMESPACE_KEY)); +======= alert("You can work on different tiddlywiki's on your pod.\nOne at a time. Default 'wiki folder is 'main'.\nTo change go to 'Options', 'saving', 'nodesolidserver syncadaptor'\nBeware : Reload or disconnect after a change\n\nYou are actually linked to : "+this.getTiddlerText(NAMESPACE_KEY)); +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b let priv = this.getTiddlerText(PRIVATENESS_KEY) || this.ls.getItem(PRIVATENESS_KEY) || @@ -70,6 +144,41 @@ alert("You can work on different tiddlywiki's on your pod.\nOne at a time. Defau return baseUri } +<<<<<<< HEAD + getIndex () { + if (this._index !== null) { return Promise.resolve(this._index)} + else if (this.indexFile === true) { + return this.rs.readFile(this.getClient()+"/__index__.json") + .then( body => { + let index = JSON.parse(body) || JSON.parse('{}'); + this._index = index; + return Promise.resolve(index) + }, err => { + alert("this.getClient() "+this.getClient()+"\nbody erreur "+body); + }) + }else{ + return this.createIndexJson(this.getClient()+"/").then( index => { + this._index = index +// alert("getIndex "+JSON.stringify(this._index)) + return Promise.resolve(index) // why and why not this._index + }) + } + + } + + saveIndex () { + if (this.indexFile !== true) { return} + return this.getIndex().then( index => { +// alert('saveIndex appRootUri ' + localStorage.getItem('appRootUri')) + if (localStorage.getItem('appRootUri') == null) { + alert('You are not connected you cannot create tiddlers') + window.location.reload(false) + return + } + this.rs.updateFile( + this.getClient()+"/__index__.json", + JSON.stringify(index), 'application/json') +======= getIndex () { if (this._index !== null) { return Promise.resolve(this._index)} return this.rs.readFile(this.getClient()+"/__index__.json") @@ -87,6 +196,7 @@ alert("You can work on different tiddlywiki's on your pod.\nOne at a time. Defau this.rs.updateFile( this.getClient()+"/__index__.json", JSON.stringify(index)) +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b .then( success => console.log("saved Index :"+JSON.stringify(index) ), err => { alert("Index not saved :"+JSON.stringify(index)) @@ -102,6 +212,10 @@ alert("You can work on different tiddlywiki's on your pod.\nOne at a time. Defau getStatus(callback) { this.checkFileSystem = true; this.rs.checkSession() +<<<<<<< HEAD + // check session +======= +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b .then( session => { if (localStorage.getItem("appRootUri") == null){ this.rs.logout().then( success => { @@ -127,6 +241,37 @@ alert("You can work on different tiddlywiki's on your pod.\nOne at a time. Defau this.wiki.setText("$:/status/IsLoggedIn", null, null, "no"); callback(null,"no"); }) +<<<<<<< HEAD + // check tiddlywikifolder + .then( () => { + if ( this.connected) { + return this.rs.readFolder(this.uri).then( folder => {} + , err => { + return this.rs.createFolder(this.uri).then( success => {}) + }) + } + }) + // check getIndex() method : __index__.json or build from tiddliwiki folder + .then( () => { + if ( this.connected) { + if (this.indexFile !== true ) { + this.checkFileSystem = false + this.rs.deleteFile(this.getClient()+"/__index__.json").then(success => {}) + return + }else{ + return this.rs.readFile(this.uri+"/__index__.json").then( body => { + this.checkFileSystem = false; + } + , err => { + return this.createIndexJson(this.uri+"/").then( success => { + return this.rs.createFile(this.uri+"/__index__.json", JSON.stringify(this.index), 'application/json').then( success => {this.checkFileSystem = false}) + }) + }) + } + } + }) + // set status IsLoggedIn +======= // checkFileSystem() .then( () => { if ( this.connected) { @@ -145,6 +290,7 @@ alert("You can work on different tiddlywiki's on your pod.\nOne at a time. Defau }) } }) +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b .then( () => { if (this.connected && (this.checkFileSystem === false)) { this.wiki.setText("$:/status/IsLoggedIn", null, null, "yes"); @@ -173,8 +319,18 @@ alert("You can work on different tiddlywiki's on your pod.\nOne at a time. Defau callback(null, tiddlers); return true } +<<<<<<< HEAD + if ( this._syncedSkinny != true ) { + if( confirm("Do you want to test performance \nwith an index file ???")) this.indexFile = true; + alert("You can work on different tiddlywiki's on your pod.\nOne at a time. Default 'wiki folder is 'main'.\nTo change go to 'Options', 'saving', 'nodesolidserver syncadaptor'\nBeware : Reload or disconnect after a change\n\nYou are actually linked to : "+this.getTiddlerText(NAMESPACE_KEY)); + alert("'synced with Pod'\n\n - click on + to create a tiddler\n - click on then to find your tiddlers\n (including untagged ones)") + } + this._syncedSkinny = true; +// alert('getSkinnyTiddlers ' + this.getClient()) +======= if ( this._syncedSkinny != true ) { alert("'synced with Pod'\n\n - click on + to create a tidller\n - click on then to find your tiddlers\n (including untagged ones)") } this._syncedSkinny = true; +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b var tiddlers = Object.keys(index) .map(title => Object.assign({title}, index[title])) tiddlers.push({title: NAMESPACE_KEY}) @@ -185,9 +341,12 @@ alert("You can work on different tiddlywiki's on your pod.\nOne at a time. Defau }) .catch(e => { this._syncedSkinny = false; +<<<<<<< HEAD +======= // alert("11. e : "+e+"\this.count "+this.count); // window.location.reload(true); // callback(e) +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b }) return true } @@ -208,10 +367,48 @@ alert("You can work on different tiddlywiki's on your pod.\nOne at a time. Defau } return } +<<<<<<< HEAD + this.rs.fetchAndParse(this.getClient()+"/"+encodeURIComponent(title)+".ttl", 'text/turtle') + .then(graph => { + this.tiddlerJson = {}; + this.jsonTiddler(graph) + }, err => { +// incomplet et à replacer dans status + this.rs.readFile(this.getClient()+"/"+encodeURIComponent(title)+".json").then(body => { + // we suppose error comes from the need to migrate old format .json to .ttl + if (confirm ("*".repeat(60)+"\n** We shall migrate the tiddlers from .json to .ttl files.\n** This will make you tiddlers RDF compliants.\n** It is only done once.\n"+"*".repeat(60))) { + return this.migrateTiddlers(this.getClient()+"/") + } + else { + alert("*".repeat(30)+"\n** The migration is needed\n"+"*".repeat(30)) + callback("Reload and accept migration") +// window.location.reload(true); + } + },err => { + if (err.slice(0,3) == "404") callback("Discrepancy between index and list of tiddlers !!!!\nIf you delete the __index__.json, we shall rebuild it at next login"+err); + else callback(err) + }) + }) + .then( () => { + callback(null, parseTiddlerDates(this.tiddlerJson || JSON.parse("{}"))); + }) + .catch(e => alert(e)) +// }) + +/* +// read tiddler from .json file + this.rs.readFile(this.getClient()+"/"+encodeURIComponent(title)+".json") + .then( body => { callback(null, parseTiddlerDates(JSON.parse(body) || JSON.parse("{}"))); // a confirmer + }, err => { + alert("readFile "+title+" "+err) + }) +*/ +======= this.rs.readFile(this.getClient()+"/"+encodeURIComponent(title)+".json") .then( body => { callback(null, parseTiddlerDates(JSON.parse(body) || JSON.parse("{}"))); // a confirmer }) +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b return true } @@ -225,27 +422,52 @@ alert("You can work on different tiddlywiki's on your pod.\nOne at a time. Defau callback(null) return } +<<<<<<< HEAD + this.getIndex().then( index => { +======= this.getIndex().then( index => { +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b var skinny = Object.assign({}, tiddler.fields) delete skinny.text delete skinny.title index[tiddler.fields.title] = skinny }); +<<<<<<< HEAD + this.ttlTiddler(tiddler.fields) +// alert('saveTiddler ' + this.getClient()) + if (localStorage.getItem('appRootUri') == null) { + alert('You are not connected, you cannot create tiddlers') + window.location.reload(false) + return + } + this.rs.updateFile( + this.getClient()+"/"+encodeURIComponent(tiddler.fields.title)+".ttl", + this.tiddlerTtl, 'text/turtle') +======= this.rs.updateFile( this.getClient()+"/"+encodeURIComponent(tiddler.fields.title)+".json", JSON.stringify(tiddler.fields) ) +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b .then( success => { this.saveIndex(); callback(null); return }, err => { +<<<<<<< HEAD + alert("Error saving tiddler : "+err); + }) + return true + } + +======= alert("Error saved tiddler : "+err); }) return true } +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b deleteTiddler (title, callback, tiddlerInfo) { if (this.readonly) return callback(null); @@ -256,7 +478,11 @@ alert("You can work on different tiddlywiki's on your pod.\nOne at a time. Defau this.getIndex().then(index => { delete index[title]; +<<<<<<< HEAD + this.rs.deleteFile(this.getClient()+"/"+encodeURIComponent(title)+".ttl").then( success => { +======= this.rs.deleteFile(this.getClient()+"/"+encodeURIComponent(title)+".json").then( success => { +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b this.saveIndex(); callback(null); }, err => alert("deleteTiddler : "+err)) @@ -274,6 +500,131 @@ alert("You can work on different tiddlywiki's on your pod.\nOne at a time. Defau } return text || deft } + + ttlPrefix() { + + } + + //*** + //*** build RDF .ttl files from tiddlywiki internal json format + //*** + ttlTiddler(tiddler) { + // list of keys and values + let keys = Object.keys(tiddler); + let values = Object.values(tiddler); + this.tiddlerTtl = this.prefix + this.subject; + for (var i = 0; i < keys.length; i++){ + var sep = ' ;'; + this.convertedKey = "ex:"+keys[i]; + for (var j = 0; j < Object.keys(this.tiddlerKeys).length; j++){ + if (keys[i] == Object.keys(this.tiddlerKeys)[j]) { this.convertedKey = Object.values(this.tiddlerKeys)[j]} + } + if (Array.isArray(values[i])) { + var tag = ""; + for (var k = 0; k < values[i].length; k++){ + tag = tag+","+JSON.stringify(values[i][k]); + } + if (tag !== "") this.tiddlerTtl = this.tiddlerTtl +"\n "+this.convertedKey+" "+tag.substr(1)+sep // .replace("draft.","draft_") + } + else this.tiddlerTtl = this.tiddlerTtl +"\n "+this.convertedKey+" "+JSON.stringify(values[i])+sep ; // .replace("draft.","draft_") + } + // replace last ; by . + this.tiddlerTtl = this.tiddlerTtl.substr(0,this.tiddlerTtl.length-1)+"." ; + } + + //*** + //*** rebuild __index__.json from .ttl folder.files + //*** + createIndexJson(url) { + return this.rs.readFolder(url).then(folder => { + var promises = []; + this.index = {}; + if (folder.files.length == 0) { + promises.push(this.index) + }else{ + let i + for ( i = 0; i < folder.files.length ; i ++) { + let file = folder.files[i].name.split("."); + if (file.pop() == "ttl") { + var title = file.join(".") + promises.push( + this.rs.fetchAndParse(url+title+".ttl", 'text/turtle') + .then(graph => { + this.jsonTiddler(graph) + delete this.tiddlerJson["text"] + this.index[this.tiddlerJson["title"]] = this.tiddlerJson; + },err => {alert("title "+err)}) + ) + } + } + } + return Promise.all(promises).then( success => { + return this.index + },err => {alert("Are some .ttl files not tiddlers ??? \n"+err)}) + }) + } + + //*** + //*** build tiddler json from ttl graph + //*** + jsonTiddler(graph) { + var res = graph.match(null, null); + this.tiddlerJson = {}; +// var j=0; + var tag = []; + res.forEach( row => { + // convert ontology to tiddlywiki keys + let pred = row.predicate.uri; + // find key for listed oncology vocab + let key = this.convertKeys[pred] + // find key for default ontology vocab + if (key == undefined) {key = pred.split(this.ontology["ex"])[1]} + let valeur = row.object; // subject.uri predicate.uri object + if (key === undefined) { return callback("unknown ontology "+pred)} //; key = pred.split("#")[1] || pred.split("/"].pop()} + this.tiddlerJson[key] = valeur.value; // valeur.value; + // exception to treat multiple tags + if (key == "tags" ) { tag.push(valeur.value); this.tiddlerJson[key] = tag}; + }) + + } + + //*** + //*** migrate all tiddlers files tiddlywiki .json to RDF .ttl : find list + //*** + migrateTiddlers(url) { +// return thid.rs.readFolder(url).then( folder => { +// return this.backupFolder(url+"/migrateBackup").then( success => { + return this.rs.readFile(url+"__index__.json").then(body => { + var promises = []; + var nb = 0; + var Index = Object.keys(JSON.parse(body)); + for (var n=0; n < Index.length ; n++) { + this.title = Index[n]; // encodeURI + nb += 1; + promises.push(this.migrateTiddler(url, encodeURIComponent(this.title))) + } + + return Promise.all(promises).then(success => { + alert("\n"+"*".repeat(40)+"\n** success "+nb+" tiddler files\n** converted from .json to RDF .ttl\n"+"*".repeat(40)) + }, err => {alert(err)}) + }) + } + + //*** + //*** migrate tiddler file from internal .json to RDF .ttl + //*** + migrateTiddler(url, title) { + this.rs.readFile(url+title+".json") + .then( body => { + var tiddler = JSON.parse(body); + this.rs.updateFile(url+"/migrateBackup/"+title+".json", tiddler, 'application/json').then(success => { + this.ttlTiddler(tiddler) + this.rs.updateFile(url+title+".ttl", this.tiddlerTtl, 'text/turtle').then( success => { + this.rs.deleteFile(url+title+".json").then() + }) + }) + }) + } } function parseTiddlerDates (fields) { diff --git a/package-lock.json b/package-lock.json index 4dcecf6..74b2617 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,13 @@ { +<<<<<<< HEAD + "name": "Tiddlywiki-node-solid-server", + "version": "0.2.0", + "lockfileVersion": 1, + "requires": true, +======= "requires": true, "lockfileVersion": 1, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dependencies": { "@babel/code-frame": { "version": "7.0.0", @@ -12,6 +19,20 @@ } }, "@babel/core": { +<<<<<<< HEAD + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.4.tgz", + "integrity": "sha512-lQgGX3FPRgbz2SKmhMtYgJvVzGZrmjaF4apZ2bLwofAKiSjxU0drPh4S/VasyYXwaTs+A1gvQ45BN8SQJzHsQQ==", + "dev": true, + "requires": { + "@babel/code-frame": "7.0.0", + "@babel/generator": "7.4.4", + "@babel/helpers": "7.4.4", + "@babel/parser": "7.4.4", + "@babel/template": "7.4.4", + "@babel/traverse": "7.4.4", + "@babel/types": "7.4.4", +======= "version": "7.2.2", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.2.2.tgz", "integrity": "sha512-59vB0RWt09cAct5EIe58+NzGP4TFSD3Bz//2/ELy3ZeTeKF6VTD1AXlH8BGGbCX0PuobZBsIzO7IAI9PH67eKw==", @@ -24,11 +45,38 @@ "@babel/template": "7.2.2", "@babel/traverse": "7.2.3", "@babel/types": "7.3.0", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "convert-source-map": "1.6.0", "debug": "4.1.1", "json5": "2.1.0", "lodash": "4.17.11", "resolve": "1.10.0", +<<<<<<< HEAD + "semver": "5.7.0", + "source-map": "0.5.7" + }, + "dependencies": { + "@babel/types": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", + "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "dev": true, + "requires": { + "esutils": "2.0.2", + "lodash": "4.17.11", + "to-fast-properties": "2.0.0" + } + } + } + }, + "@babel/generator": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz", + "integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==", + "dev": true, + "requires": { + "@babel/types": "7.4.4", +======= "semver": "5.6.0", "source-map": "0.5.7" } @@ -40,10 +88,27 @@ "dev": true, "requires": { "@babel/types": "7.3.0", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "jsesc": "2.5.2", "lodash": "4.17.11", "source-map": "0.5.7", "trim-right": "1.0.1" +<<<<<<< HEAD + }, + "dependencies": { + "@babel/types": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", + "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "dev": true, + "requires": { + "esutils": "2.0.2", + "lodash": "4.17.11", + "to-fast-properties": "2.0.0" + } + } +======= +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "@babel/helper-annotate-as-pure": { @@ -52,7 +117,11 @@ "integrity": "sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==", "dev": true, "requires": { +<<<<<<< HEAD + "@babel/types": "7.4.0" +======= "@babel/types": "7.3.0" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "@babel/helper-builder-binary-assignment-operator-visitor": { @@ -62,6 +131,57 @@ "dev": true, "requires": { "@babel/helper-explode-assignable-expression": "7.1.0", +<<<<<<< HEAD + "@babel/types": "7.4.0" + } + }, + "@babel/helper-call-delegate": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz", + "integrity": "sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==", + "dev": true, + "requires": { + "@babel/helper-hoist-variables": "7.4.4", + "@babel/traverse": "7.4.4", + "@babel/types": "7.4.4" + }, + "dependencies": { + "@babel/types": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", + "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "dev": true, + "requires": { + "esutils": "2.0.2", + "lodash": "4.17.11", + "to-fast-properties": "2.0.0" + } + } + } + }, + "@babel/helper-define-map": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.4.4.tgz", + "integrity": "sha512-IX3Ln8gLhZpSuqHJSnTNBWGDE9kdkTEWl21A/K7PQ00tseBwbqCHTvNLHSBd9M0R5rER4h5Rsvj9vw0R5SieBg==", + "dev": true, + "requires": { + "@babel/helper-function-name": "7.1.0", + "@babel/types": "7.4.4", + "lodash": "4.17.11" + }, + "dependencies": { + "@babel/types": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", + "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "dev": true, + "requires": { + "esutils": "2.0.2", + "lodash": "4.17.11", + "to-fast-properties": "2.0.0" + } + } +======= "@babel/types": "7.3.0" } }, @@ -85,6 +205,7 @@ "@babel/helper-function-name": "7.1.0", "@babel/types": "7.3.0", "lodash": "4.17.11" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "@babel/helper-explode-assignable-expression": { @@ -93,8 +214,13 @@ "integrity": "sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==", "dev": true, "requires": { +<<<<<<< HEAD + "@babel/traverse": "7.4.4", + "@babel/types": "7.4.0" +======= "@babel/traverse": "7.2.3", "@babel/types": "7.3.0" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "@babel/helper-function-name": { @@ -104,8 +230,13 @@ "dev": true, "requires": { "@babel/helper-get-function-arity": "7.0.0", +<<<<<<< HEAD + "@babel/template": "7.4.4", + "@babel/types": "7.4.0" +======= "@babel/template": "7.2.2", "@babel/types": "7.3.0" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "@babel/helper-get-function-arity": { @@ -114,6 +245,31 @@ "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==", "dev": true, "requires": { +<<<<<<< HEAD + "@babel/types": "7.4.0" + } + }, + "@babel/helper-hoist-variables": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz", + "integrity": "sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==", + "dev": true, + "requires": { + "@babel/types": "7.4.4" + }, + "dependencies": { + "@babel/types": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", + "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "dev": true, + "requires": { + "esutils": "2.0.2", + "lodash": "4.17.11", + "to-fast-properties": "2.0.0" + } + } +======= "@babel/types": "7.3.0" } }, @@ -124,6 +280,7 @@ "dev": true, "requires": { "@babel/types": "7.3.0" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "@babel/helper-member-expression-to-functions": { @@ -132,7 +289,11 @@ "integrity": "sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==", "dev": true, "requires": { +<<<<<<< HEAD + "@babel/types": "7.4.0" +======= "@babel/types": "7.3.0" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "@babel/helper-module-imports": { @@ -141,6 +302,15 @@ "integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==", "dev": true, "requires": { +<<<<<<< HEAD + "@babel/types": "7.4.0" + } + }, + "@babel/helper-module-transforms": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.4.4.tgz", + "integrity": "sha512-3Z1yp8TVQf+B4ynN7WoHPKS8EkdTbgAEy0nU0rs/1Kw4pDgmvYH3rz3aI11KgxKCba2cn7N+tqzV1mY2HMN96w==", +======= "@babel/types": "7.3.0" } }, @@ -148,14 +318,35 @@ "version": "7.2.2", "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.2.2.tgz", "integrity": "sha512-YRD7I6Wsv+IHuTPkAmAS4HhY0dkPobgLftHp0cRGZSdrRvmZY8rFvae/GVu3bD00qscuvK3WPHB3YdNpBXUqrA==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true, "requires": { "@babel/helper-module-imports": "7.0.0", "@babel/helper-simple-access": "7.1.0", +<<<<<<< HEAD + "@babel/helper-split-export-declaration": "7.4.4", + "@babel/template": "7.4.4", + "@babel/types": "7.4.4", + "lodash": "4.17.11" + }, + "dependencies": { + "@babel/types": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", + "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "dev": true, + "requires": { + "esutils": "2.0.2", + "lodash": "4.17.11", + "to-fast-properties": "2.0.0" + } + } +======= "@babel/helper-split-export-declaration": "7.0.0", "@babel/template": "7.2.2", "@babel/types": "7.3.0", "lodash": "4.17.11" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "@babel/helper-optimise-call-expression": { @@ -164,7 +355,11 @@ "integrity": "sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==", "dev": true, "requires": { +<<<<<<< HEAD + "@babel/types": "7.4.0" +======= "@babel/types": "7.3.0" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "@babel/helper-plugin-utils": { @@ -174,9 +369,15 @@ "dev": true }, "@babel/helper-regex": { +<<<<<<< HEAD + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.4.4.tgz", + "integrity": "sha512-Y5nuB/kESmR3tKjU8Nkn1wMGEx1tjJX076HBMeL3XLQCu6vA/YRzuTW0bbb+qRnXvQGn+d6Rx953yffl8vEy7Q==", +======= "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.0.0.tgz", "integrity": "sha512-TR0/N0NDCcUIUEbqV6dCO+LptmmSQFQ7q70lfcEB4URsjD0E1HzicrwUH+ap6BAQ2jhCX9Q4UqZy4wilujWlkg==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true, "requires": { "lodash": "4.17.11" @@ -190,6 +391,17 @@ "requires": { "@babel/helper-annotate-as-pure": "7.0.0", "@babel/helper-wrap-function": "7.2.0", +<<<<<<< HEAD + "@babel/template": "7.4.4", + "@babel/traverse": "7.4.4", + "@babel/types": "7.4.0" + } + }, + "@babel/helper-replace-supers": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.4.4.tgz", + "integrity": "sha512-04xGEnd+s01nY1l15EuMS1rfKktNF+1CkKmHoErDppjAAZL+IUBZpzT748x262HF7fibaQPhbvWUl5HeSt1EXg==", +======= "@babel/template": "7.2.2", "@babel/traverse": "7.2.3", "@babel/types": "7.3.0" @@ -199,12 +411,31 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.2.3.tgz", "integrity": "sha512-GyieIznGUfPXPWu0yLS6U55Mz67AZD9cUk0BfirOWlPrXlBcan9Gz+vHGz+cPfuoweZSnPzPIm67VtQM0OWZbA==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true, "requires": { "@babel/helper-member-expression-to-functions": "7.0.0", "@babel/helper-optimise-call-expression": "7.0.0", +<<<<<<< HEAD + "@babel/traverse": "7.4.4", + "@babel/types": "7.4.4" + }, + "dependencies": { + "@babel/types": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", + "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "dev": true, + "requires": { + "esutils": "2.0.2", + "lodash": "4.17.11", + "to-fast-properties": "2.0.0" + } + } +======= "@babel/traverse": "7.2.3", "@babel/types": "7.3.0" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "@babel/helper-simple-access": { @@ -213,6 +444,32 @@ "integrity": "sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==", "dev": true, "requires": { +<<<<<<< HEAD + "@babel/template": "7.4.4", + "@babel/types": "7.4.0" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz", + "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==", + "dev": true, + "requires": { + "@babel/types": "7.4.4" + }, + "dependencies": { + "@babel/types": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", + "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "dev": true, + "requires": { + "esutils": "2.0.2", + "lodash": "4.17.11", + "to-fast-properties": "2.0.0" + } + } +======= "@babel/template": "7.2.2", "@babel/types": "7.3.0" } @@ -224,6 +481,7 @@ "dev": true, "requires": { "@babel/types": "7.3.0" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "@babel/helper-wrap-function": { @@ -233,6 +491,35 @@ "dev": true, "requires": { "@babel/helper-function-name": "7.1.0", +<<<<<<< HEAD + "@babel/template": "7.4.4", + "@babel/traverse": "7.4.4", + "@babel/types": "7.4.0" + } + }, + "@babel/helpers": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.4.tgz", + "integrity": "sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==", + "dev": true, + "requires": { + "@babel/template": "7.4.4", + "@babel/traverse": "7.4.4", + "@babel/types": "7.4.4" + }, + "dependencies": { + "@babel/types": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", + "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "dev": true, + "requires": { + "esutils": "2.0.2", + "lodash": "4.17.11", + "to-fast-properties": "2.0.0" + } + } +======= "@babel/template": "7.2.2", "@babel/traverse": "7.2.3", "@babel/types": "7.3.0" @@ -247,6 +534,7 @@ "@babel/template": "7.2.2", "@babel/traverse": "7.2.3", "@babel/types": "7.3.0" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "@babel/highlight": { @@ -261,9 +549,15 @@ } }, "@babel/parser": { +<<<<<<< HEAD + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.4.tgz", + "integrity": "sha512-5pCS4mOsL+ANsFZGdvNLybx4wtqAZJ0MJjMHxvzI3bvIsz6sQvzW8XX92EYIkiPtIvcfG3Aj+Ir5VNyjnZhP7w==", +======= "version": "7.3.1", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.3.1.tgz", "integrity": "sha512-ATz6yX/L8LEnC3dtLQnIx4ydcPxhLcoy9Vl6re00zb2w5lG6itY6Vhnr1KFRPq/FHNsgl/gh2mjNN20f9iJTTA==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true }, "@babel/plugin-proposal-async-generator-functions": { @@ -288,9 +582,15 @@ } }, "@babel/plugin-proposal-object-rest-spread": { +<<<<<<< HEAD + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.4.tgz", + "integrity": "sha512-dMBG6cSPBbHeEBdFXeQ2QLc5gUpg4Vkaz8octD4aoW/ISO+jBOcsuxYL7bsb5WSu8RLP6boxrBIALEHgoHtO9g==", +======= "version": "7.3.1", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.1.tgz", "integrity": "sha512-Nmmv1+3LqxJu/V5jU9vJmxR/KIRWFk2qLHmbB56yRRRFhlaSuOVXscX3gUmhaKgUhzA3otOHVubbIEVYsZ0eZg==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true, "requires": { "@babel/helper-plugin-utils": "7.0.0", @@ -308,6 +608,16 @@ } }, "@babel/plugin-proposal-unicode-property-regex": { +<<<<<<< HEAD + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz", + "integrity": "sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "7.0.0", + "@babel/helper-regex": "7.4.4", + "regexpu-core": "4.5.4" +======= "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.2.0.tgz", "integrity": "sha512-LvRVYb7kikuOtIoUeWTkOxQEV1kYvL5B6U3iWEGCzPNRus1MzJweFqORTj+0jkxozkTSYNJozPOddxmqdqsRpw==", @@ -316,6 +626,7 @@ "@babel/helper-plugin-utils": "7.0.0", "@babel/helper-regex": "7.0.0", "regexpu-core": "4.4.0" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "@babel/plugin-syntax-async-generators": { @@ -373,9 +684,15 @@ } }, "@babel/plugin-transform-async-to-generator": { +<<<<<<< HEAD + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.4.tgz", + "integrity": "sha512-YiqW2Li8TXmzgbXw+STsSqPBPFnGviiaSp6CYOq55X8GQ2SGVLrXB6pNid8HkqkZAzOH6knbai3snhP7v0fNwA==", +======= "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.2.0.tgz", "integrity": "sha512-CEHzg4g5UraReozI9D4fblBYABs7IM6UerAVG7EJVrTLC5keh00aEuLUT+O40+mJCEzaXkYfTCUKIyeDfMOFFQ==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true, "requires": { "@babel/helper-module-imports": "7.0.0", @@ -393,9 +710,15 @@ } }, "@babel/plugin-transform-block-scoping": { +<<<<<<< HEAD + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.4.tgz", + "integrity": "sha512-jkTUyWZcTrwxu5DD4rWz6rDB5Cjdmgz6z7M7RLXOJyCUkFBawssDGcGh8M/0FTSB87avyJI1HsTwUXp9nKA1PA==", +======= "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.2.0.tgz", "integrity": "sha512-vDTgf19ZEV6mx35yiPJe4fS02mPQUUcBNwWQSZFXSzTSbsJFQvHt7DqyS3LK8oOWALFOsJ+8bbqBgkirZteD5Q==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true, "requires": { "@babel/helper-plugin-utils": "7.0.0", @@ -403,6 +726,21 @@ } }, "@babel/plugin-transform-classes": { +<<<<<<< HEAD + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.4.tgz", + "integrity": "sha512-/e44eFLImEGIpL9qPxSRat13I5QNRgBLu2hOQJCF7VLy/otSM/sypV1+XaIw5+502RX/+6YaSAPmldk+nhHDPw==", + "dev": true, + "requires": { + "@babel/helper-annotate-as-pure": "7.0.0", + "@babel/helper-define-map": "7.4.4", + "@babel/helper-function-name": "7.1.0", + "@babel/helper-optimise-call-expression": "7.0.0", + "@babel/helper-plugin-utils": "7.0.0", + "@babel/helper-replace-supers": "7.4.4", + "@babel/helper-split-export-declaration": "7.4.4", + "globals": "11.12.0" +======= "version": "7.2.2", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.2.2.tgz", "integrity": "sha512-gEZvgTy1VtcDOaQty1l10T3jQmJKlNVxLDCs+3rCVPr6nMkODLELxViq5X9l+rfxbie3XrfrMCYYY6eX3aOcOQ==", @@ -416,6 +754,7 @@ "@babel/helper-replace-supers": "7.2.3", "@babel/helper-split-export-declaration": "7.0.0", "globals": "11.10.0" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "@babel/plugin-transform-computed-properties": { @@ -428,15 +767,31 @@ } }, "@babel/plugin-transform-destructuring": { +<<<<<<< HEAD + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.4.tgz", + "integrity": "sha512-/aOx+nW0w8eHiEHm+BTERB2oJn5D127iye/SUQl7NjHy0lf+j7h4MKMMSOwdazGq9OxgiNADncE+SRJkCxjZpQ==", +======= "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.2.0.tgz", "integrity": "sha512-coVO2Ayv7g0qdDbrNiadE4bU7lvCd9H539m2gMknyVjjMdwF/iCOM7R+E8PkntoqLkltO0rk+3axhpp/0v68VQ==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true, "requires": { "@babel/helper-plugin-utils": "7.0.0" } }, "@babel/plugin-transform-dotall-regex": { +<<<<<<< HEAD + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz", + "integrity": "sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "7.0.0", + "@babel/helper-regex": "7.4.4", + "regexpu-core": "4.5.4" +======= "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.2.0.tgz", "integrity": "sha512-sKxnyHfizweTgKZf7XsXu/CNupKhzijptfTM+bozonIuyVrLWVUvYjE2bhuSBML8VQeMxq4Mm63Q9qvcvUcciQ==", @@ -445,6 +800,7 @@ "@babel/helper-plugin-utils": "7.0.0", "@babel/helper-regex": "7.0.0", "regexpu-core": "4.4.0" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "@babel/plugin-transform-duplicate-keys": { @@ -467,9 +823,15 @@ } }, "@babel/plugin-transform-flow-strip-types": { +<<<<<<< HEAD + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz", + "integrity": "sha512-WyVedfeEIILYEaWGAUWzVNyqG4sfsNooMhXWsu/YzOvVGcsnPb5PguysjJqI3t3qiaYj0BR8T2f5njdjTGe44Q==", +======= "version": "7.2.3", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.2.3.tgz", "integrity": "sha512-xnt7UIk9GYZRitqCnsVMjQK1O2eKZwFB3CvvHjf5SGx6K6vr/MScCKQDnf1DxRaj501e3pXjti+inbSXX2ZUoQ==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true, "requires": { "@babel/helper-plugin-utils": "7.0.0", @@ -477,18 +839,30 @@ } }, "@babel/plugin-transform-for-of": { +<<<<<<< HEAD + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz", + "integrity": "sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==", +======= "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.2.0.tgz", "integrity": "sha512-Kz7Mt0SsV2tQk6jG5bBv5phVbkd0gd27SgYD4hH1aLMJRchM0dzHaXvrWhVZ+WxAlDoAKZ7Uy3jVTW2mKXQ1WQ==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true, "requires": { "@babel/helper-plugin-utils": "7.0.0" } }, "@babel/plugin-transform-function-name": { +<<<<<<< HEAD + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz", + "integrity": "sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==", +======= "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.2.0.tgz", "integrity": "sha512-kWgksow9lHdvBC2Z4mxTsvc7YdY7w/V6B2vy9cTIPtLEE9NhwoWivaxdNM/S37elu5bqlLP/qOY906LukO9lkQ==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true, "requires": { "@babel/helper-function-name": "7.1.0", @@ -504,34 +878,68 @@ "@babel/helper-plugin-utils": "7.0.0" } }, +<<<<<<< HEAD + "@babel/plugin-transform-member-expression-literals": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz", + "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "7.0.0" + } + }, +======= +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "@babel/plugin-transform-modules-amd": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz", "integrity": "sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==", "dev": true, "requires": { +<<<<<<< HEAD + "@babel/helper-module-transforms": "7.4.4", +======= "@babel/helper-module-transforms": "7.2.2", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "@babel/helper-plugin-utils": "7.0.0" } }, "@babel/plugin-transform-modules-commonjs": { +<<<<<<< HEAD + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.4.tgz", + "integrity": "sha512-4sfBOJt58sEo9a2BQXnZq+Q3ZTSAUXyK3E30o36BOGnJ+tvJ6YSxF0PG6kERvbeISgProodWuI9UVG3/FMY6iw==", + "dev": true, + "requires": { + "@babel/helper-module-transforms": "7.4.4", +======= "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.2.0.tgz", "integrity": "sha512-V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ==", "dev": true, "requires": { "@babel/helper-module-transforms": "7.2.2", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "@babel/helper-plugin-utils": "7.0.0", "@babel/helper-simple-access": "7.1.0" } }, "@babel/plugin-transform-modules-systemjs": { +<<<<<<< HEAD + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.4.tgz", + "integrity": "sha512-MSiModfILQc3/oqnG7NrP1jHaSPryO6tA2kOMmAQApz5dayPxWiHqmq4sWH2xF5LcQK56LlbKByCd8Aah/OIkQ==", + "dev": true, + "requires": { + "@babel/helper-hoist-variables": "7.4.4", +======= "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.2.0.tgz", "integrity": "sha512-aYJwpAhoK9a+1+O625WIjvMY11wkB/ok0WClVwmeo3mCjcNRjt+/8gHWrB5i+00mUju0gWsBkQnPpdvQ7PImmQ==", "dev": true, "requires": { "@babel/helper-hoist-variables": "7.0.0", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "@babel/helper-plugin-utils": "7.0.0" } }, @@ -541,11 +949,29 @@ "integrity": "sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==", "dev": true, "requires": { +<<<<<<< HEAD + "@babel/helper-module-transforms": "7.4.4", +======= "@babel/helper-module-transforms": "7.2.2", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "@babel/helper-plugin-utils": "7.0.0" } }, "@babel/plugin-transform-named-capturing-groups-regex": { +<<<<<<< HEAD + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.4.tgz", + "integrity": "sha512-Ki+Y9nXBlKfhD+LXaRS7v95TtTGYRAf9Y1rTDiE75zf8YQz4GDaWRXosMfJBXxnk88mGFjWdCRIeqDbon7spYA==", + "dev": true, + "requires": { + "regexp-tree": "0.1.6" + } + }, + "@babel/plugin-transform-new-target": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz", + "integrity": "sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==", +======= "version": "7.3.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.3.0.tgz", "integrity": "sha512-NxIoNVhk9ZxS+9lSoAQ/LM0V2UEvARLttEHUrRDGKFaAxOYQcrkN/nLRE+BbbicCAvZPl7wMP0X60HsHE5DtQw==", @@ -558,6 +984,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz", "integrity": "sha512-yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true, "requires": { "@babel/helper-plugin-utils": "7.0.0" @@ -570,6 +997,28 @@ "dev": true, "requires": { "@babel/helper-plugin-utils": "7.0.0", +<<<<<<< HEAD + "@babel/helper-replace-supers": "7.4.4" + } + }, + "@babel/plugin-transform-parameters": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz", + "integrity": "sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==", + "dev": true, + "requires": { + "@babel/helper-call-delegate": "7.4.4", + "@babel/helper-get-function-arity": "7.0.0", + "@babel/helper-plugin-utils": "7.0.0" + } + }, + "@babel/plugin-transform-property-literals": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz", + "integrity": "sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==", + "dev": true, + "requires": { +======= "@babel/helper-replace-supers": "7.2.3" } }, @@ -581,10 +1030,34 @@ "requires": { "@babel/helper-call-delegate": "7.1.0", "@babel/helper-get-function-arity": "7.0.0", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "@babel/helper-plugin-utils": "7.0.0" } }, "@babel/plugin-transform-regenerator": { +<<<<<<< HEAD + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.4.tgz", + "integrity": "sha512-Zz3w+pX1SI0KMIiqshFZkwnVGUhDZzpX2vtPzfJBKQQq8WsP/Xy9DNdELWivxcKOCX/Pywge4SiEaPaLtoDT4g==", + "dev": true, + "requires": { + "regenerator-transform": "0.13.4" + } + }, + "@babel/plugin-transform-reserved-words": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz", + "integrity": "sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "7.0.0" + } + }, + "@babel/plugin-transform-runtime": { + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.4.3.tgz", + "integrity": "sha512-7Q61bU+uEI7bCUFReT1NKn7/X6sDQsZ7wL1sJ9IYMAO7cI+eg6x9re1cEw2fCRMbbTVyoeUKWSV1M6azEfKCfg==", +======= "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz", "integrity": "sha512-sj2qzsEx8KDVv1QuJc/dEfilkg3RRPvPYx/VnKLtItVQRWt1Wqf5eVCOLZm29CiGFfYYsA3VPjfizTCV0S0Dlw==", @@ -597,12 +1070,17 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.2.0.tgz", "integrity": "sha512-jIgkljDdq4RYDnJyQsiWbdvGeei/0MOTtSHKO/rfbd/mXBxNpdlulMx49L0HQ4pug1fXannxoqCI+fYSle9eSw==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true, "requires": { "@babel/helper-module-imports": "7.0.0", "@babel/helper-plugin-utils": "7.0.0", "resolve": "1.10.0", +<<<<<<< HEAD + "semver": "5.7.0" +======= "semver": "5.6.0" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "@babel/plugin-transform-shorthand-properties": { @@ -630,6 +1108,15 @@ "dev": true, "requires": { "@babel/helper-plugin-utils": "7.0.0", +<<<<<<< HEAD + "@babel/helper-regex": "7.4.4" + } + }, + "@babel/plugin-transform-template-literals": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz", + "integrity": "sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==", +======= "@babel/helper-regex": "7.0.0" } }, @@ -637,6 +1124,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.2.0.tgz", "integrity": "sha512-FkPix00J9A/XWXv4VoKJBMeSkyY9x/TqIh76wzcdfl57RJJcf8CehQ08uwfhCDNtRQYtHQKBTwKZDEyjE13Lwg==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true, "requires": { "@babel/helper-annotate-as-pure": "7.0.0", @@ -653,6 +1141,22 @@ } }, "@babel/plugin-transform-unicode-regex": { +<<<<<<< HEAD + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz", + "integrity": "sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "7.0.0", + "@babel/helper-regex": "7.4.4", + "regexpu-core": "4.5.4" + } + }, + "@babel/preset-env": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.4.tgz", + "integrity": "sha512-FU1H+ACWqZZqfw1x2G1tgtSSYSfxJLkpaUQL37CenULFARDo+h4xJoVHzRoHbK+85ViLciuI7ME4WTIhFRBBlw==", +======= "version": "7.2.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.2.0.tgz", "integrity": "sha512-m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA==", @@ -667,20 +1171,146 @@ "version": "7.3.1", "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.3.1.tgz", "integrity": "sha512-FHKrD6Dxf30e8xgHQO0zJZpUPfVZg+Xwgz5/RdSWCbza9QLNk4Qbp40ctRoqDxml3O8RMzB1DU55SXeDG6PqHQ==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true, "requires": { "@babel/helper-module-imports": "7.0.0", "@babel/helper-plugin-utils": "7.0.0", "@babel/plugin-proposal-async-generator-functions": "7.2.0", "@babel/plugin-proposal-json-strings": "7.2.0", +<<<<<<< HEAD + "@babel/plugin-proposal-object-rest-spread": "7.4.4", + "@babel/plugin-proposal-optional-catch-binding": "7.2.0", + "@babel/plugin-proposal-unicode-property-regex": "7.4.4", +======= "@babel/plugin-proposal-object-rest-spread": "7.3.1", "@babel/plugin-proposal-optional-catch-binding": "7.2.0", "@babel/plugin-proposal-unicode-property-regex": "7.2.0", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "@babel/plugin-syntax-async-generators": "7.2.0", "@babel/plugin-syntax-json-strings": "7.2.0", "@babel/plugin-syntax-object-rest-spread": "7.2.0", "@babel/plugin-syntax-optional-catch-binding": "7.2.0", "@babel/plugin-transform-arrow-functions": "7.2.0", +<<<<<<< HEAD + "@babel/plugin-transform-async-to-generator": "7.4.4", + "@babel/plugin-transform-block-scoped-functions": "7.2.0", + "@babel/plugin-transform-block-scoping": "7.4.4", + "@babel/plugin-transform-classes": "7.4.4", + "@babel/plugin-transform-computed-properties": "7.2.0", + "@babel/plugin-transform-destructuring": "7.4.4", + "@babel/plugin-transform-dotall-regex": "7.4.4", + "@babel/plugin-transform-duplicate-keys": "7.2.0", + "@babel/plugin-transform-exponentiation-operator": "7.2.0", + "@babel/plugin-transform-for-of": "7.4.4", + "@babel/plugin-transform-function-name": "7.4.4", + "@babel/plugin-transform-literals": "7.2.0", + "@babel/plugin-transform-member-expression-literals": "7.2.0", + "@babel/plugin-transform-modules-amd": "7.2.0", + "@babel/plugin-transform-modules-commonjs": "7.4.4", + "@babel/plugin-transform-modules-systemjs": "7.4.4", + "@babel/plugin-transform-modules-umd": "7.2.0", + "@babel/plugin-transform-named-capturing-groups-regex": "7.4.4", + "@babel/plugin-transform-new-target": "7.4.4", + "@babel/plugin-transform-object-super": "7.2.0", + "@babel/plugin-transform-parameters": "7.4.4", + "@babel/plugin-transform-property-literals": "7.2.0", + "@babel/plugin-transform-regenerator": "7.4.4", + "@babel/plugin-transform-reserved-words": "7.2.0", + "@babel/plugin-transform-shorthand-properties": "7.2.0", + "@babel/plugin-transform-spread": "7.2.2", + "@babel/plugin-transform-sticky-regex": "7.2.0", + "@babel/plugin-transform-template-literals": "7.4.4", + "@babel/plugin-transform-typeof-symbol": "7.2.0", + "@babel/plugin-transform-unicode-regex": "7.4.4", + "@babel/types": "7.4.4", + "browserslist": "4.5.6", + "core-js-compat": "3.0.1", + "invariant": "2.2.4", + "js-levenshtein": "1.1.6", + "semver": "5.7.0" + }, + "dependencies": { + "@babel/types": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", + "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "dev": true, + "requires": { + "esutils": "2.0.2", + "lodash": "4.17.11", + "to-fast-properties": "2.0.0" + } + } + } + }, + "@babel/runtime": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.4.tgz", + "integrity": "sha512-w0+uT71b6Yi7i5SE0co4NioIpSYS6lLiXvCzWzGSKvpK5vdQtCbICHMj+gbAKAOtxiV6HsVh/MBdaF9EQ6faSg==", + "requires": { + "regenerator-runtime": "0.13.2" + } + }, + "@babel/template": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz", + "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==", + "dev": true, + "requires": { + "@babel/code-frame": "7.0.0", + "@babel/parser": "7.4.4", + "@babel/types": "7.4.4" + }, + "dependencies": { + "@babel/types": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", + "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "dev": true, + "requires": { + "esutils": "2.0.2", + "lodash": "4.17.11", + "to-fast-properties": "2.0.0" + } + } + } + }, + "@babel/traverse": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.4.tgz", + "integrity": "sha512-Gw6qqkw/e6AGzlyj9KnkabJX7VcubqPtkUQVAwkc0wUMldr3A/hezNB3Rc5eIvId95iSGkGIOe5hh1kMKf951A==", + "dev": true, + "requires": { + "@babel/code-frame": "7.0.0", + "@babel/generator": "7.4.4", + "@babel/helper-function-name": "7.1.0", + "@babel/helper-split-export-declaration": "7.4.4", + "@babel/parser": "7.4.4", + "@babel/types": "7.4.4", + "debug": "4.1.1", + "globals": "11.12.0", + "lodash": "4.17.11" + }, + "dependencies": { + "@babel/types": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", + "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", + "dev": true, + "requires": { + "esutils": "2.0.2", + "lodash": "4.17.11", + "to-fast-properties": "2.0.0" + } + } + } + }, + "@babel/types": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.0.tgz", + "integrity": "sha512-aPvkXyU2SPOnztlgo8n9cEiXW755mgyvueUPcpStqdzoSPm0fjO0vQBjLkt3JKJW7ufikfcnMTTPsN1xaTsBPA==", +======= "@babel/plugin-transform-async-to-generator": "7.2.0", "@babel/plugin-transform-block-scoped-functions": "7.2.0", "@babel/plugin-transform-block-scoping": "7.2.0", @@ -754,6 +1384,7 @@ "version": "7.3.0", "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.3.0.tgz", "integrity": "sha512-QkFPw68QqWU1/RVPyBe8SO7lXbPfjtqAxRYQKpFpaB8yMq7X2qAqfwK5LKoQufEkSmO5NQ70O6Kc3Afk03RwXw==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true, "requires": { "esutils": "2.0.2", @@ -778,6 +1409,28 @@ "@trust/webcrypto": "0.9.2", "base64url": "3.0.1", "text-encoding": "0.6.4" +<<<<<<< HEAD + }, + "dependencies": { + "@trust/webcrypto": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/@trust/webcrypto/-/webcrypto-0.9.2.tgz", + "integrity": "sha512-5iMAVcGYKhqLJGjefB1nzuQSqUJTru0nG4CytpBT/GGp1Piz/MVnj2jORdYf4JBYzggCIa8WZUr2rchP2Ngn/w==", + "requires": { + "@trust/keyto": "0.3.7", + "base64url": "3.0.1", + "elliptic": "6.4.1", + "node-rsa": "0.4.2", + "text-encoding": "0.6.4" + } + }, + "base64url": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz", + "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==" + } +======= +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "@solid/oidc-rp": { @@ -789,10 +1442,41 @@ "@trust/json-document": "0.1.4", "@trust/webcrypto": "0.9.2", "base64url": "3.0.1", +<<<<<<< HEAD + "node-fetch": "2.6.0", + "standard-http-error": "2.0.1", + "text-encoding": "0.6.4", + "whatwg-url": "6.5.0" + }, + "dependencies": { + "@trust/webcrypto": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/@trust/webcrypto/-/webcrypto-0.9.2.tgz", + "integrity": "sha512-5iMAVcGYKhqLJGjefB1nzuQSqUJTru0nG4CytpBT/GGp1Piz/MVnj2jORdYf4JBYzggCIa8WZUr2rchP2Ngn/w==", + "requires": { + "@trust/keyto": "0.3.7", + "base64url": "3.0.1", + "elliptic": "6.4.1", + "node-rsa": "0.4.2", + "text-encoding": "0.6.4" + } + }, + "base64url": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz", + "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==" + }, + "node-fetch": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + } +======= "node-fetch": "2.3.0", "standard-http-error": "2.0.1", "text-encoding": "0.6.4", "whatwg-url": "6.5.0" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "@trust/jose": { @@ -816,11 +1500,14 @@ "pem-jwk": "1.5.1", "text-encoding": "0.6.4" } +<<<<<<< HEAD +======= }, "base64url": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz", "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } } }, @@ -830,6 +1517,32 @@ "integrity": "sha1-sgI7HhRbp2hb0fNux7aRKJQAc+k=" }, "@trust/keyto": { +<<<<<<< HEAD + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/@trust/keyto/-/keyto-0.3.7.tgz", + "integrity": "sha512-t5kWWCTkPgg24JWVuCTPMx7l13F7YHdxBeJkT1vmoHjROgiOIEAN8eeY+iRmP1Hwsx+S7U55HyuqSsECr08a8A==", + "requires": { + "asn1.js": "5.0.1", + "base64url": "3.0.1", + "elliptic": "6.4.1" + }, + "dependencies": { + "asn1.js": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.0.1.tgz", + "integrity": "sha512-aO8EaEgbgqq77IEw+1jfx5c9zTbzvkfuRBuZsSsPnTHMkmd5AI4J6OtITLZFa381jReeaQL67J0GBTUu0+ZTVw==", + "requires": { + "bn.js": "4.11.8", + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1" + } + }, + "base64url": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz", + "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==" + } +======= "version": "0.3.4", "resolved": "https://registry.npmjs.org/@trust/keyto/-/keyto-0.3.4.tgz", "integrity": "sha512-OAqKvuSEPIu2zCnIHzBthvGnV8nKmpv7cBlRMngLzJZzZI9CanyuSfnEI1xC4sH4TwqA0XJR7Mb0oX4bwymXIw==", @@ -837,6 +1550,7 @@ "asn1.js": "4.10.1", "base64url": "3.0.1", "elliptic": "6.4.1" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "@trust/oidc-rp": { @@ -851,8 +1565,19 @@ "node-fetch": "1.7.3", "text-encoding": "0.6.4", "whatwg-url": "6.5.0" - }, - "dependencies": { +<<<<<<< HEAD + } + }, + "@trust/webcrypto": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@trust/webcrypto/-/webcrypto-0.4.0.tgz", + "integrity": "sha1-zIcSyomn5x01P877ZrJwemec9jU=", + "requires": { + "@trust/keyto": "0.3.7", + "base64url": "2.0.0", +======= + }, + "dependencies": { "@trust/webcrypto": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/@trust/webcrypto/-/webcrypto-0.4.0.tgz", @@ -888,6 +1613,7 @@ "@trust/keyto": "0.3.4", "base64url": "3.0.1", "elliptic": "6.4.1", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "node-rsa": "0.4.2", "text-encoding": "0.6.4" } @@ -903,9 +1629,15 @@ } }, "acorn": { +<<<<<<< HEAD + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz", + "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==", +======= "version": "6.0.6", "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.6.tgz", "integrity": "sha512-5M3G/A4uBSMIlfJ+h9W125vJvPFH/zirISsW5qfxF5YzEvXJCtolLoQvM5yZft0DvMcUrPGKPOlgEu55I6iUtA==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true }, "acorn-dynamic-import": { @@ -920,7 +1652,11 @@ "integrity": "sha512-rIhNEZuNI8ibQcL7ANm/mGyPukIaZsRNX9psFNQURyJW0nu6k8wjSDld20z6v2mDBWqX13pIEnk9gGZJHIlEXg==", "dev": true, "requires": { +<<<<<<< HEAD + "acorn": "6.1.1", +======= "acorn": "6.0.6", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "acorn-dynamic-import": "4.0.0", "acorn-walk": "6.1.1", "xtend": "4.0.1" @@ -933,9 +1669,15 @@ "dev": true }, "ajv": { +<<<<<<< HEAD + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", + "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", +======= "version": "6.7.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz", "integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "requires": { "fast-deep-equal": "2.0.1", "fast-json-stable-stringify": "2.0.0", @@ -943,12 +1685,15 @@ "uri-js": "4.2.2" } }, +<<<<<<< HEAD +======= "ansi-regex": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", @@ -985,6 +1730,23 @@ } }, "asn1.js": { +<<<<<<< HEAD + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-1.0.3.tgz", + "integrity": "sha1-KBuj7B8kSP52X5Kk7s+IP+E2S1Q=", + "requires": { + "bn.js": "1.3.0", + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1" + }, + "dependencies": { + "bn.js": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz", + "integrity": "sha1-DbTL+W+PI7dC9by50ap6mZSgXoM=", + "optional": true + } +======= "version": "4.10.1", "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", @@ -992,6 +1754,7 @@ "bn.js": "4.11.8", "inherits": "2.0.3", "minimalistic-assert": "1.0.1" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "assert": { @@ -1069,9 +1832,15 @@ "dev": true }, "base64url": { +<<<<<<< HEAD + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz", + "integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs=" +======= "version": "3.0.1", "resolved": "https://registry.npmjs.org/base64url/-/base64url-3.0.1.tgz", "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b }, "bcrypt-pbkdf": { "version": "1.0.2", @@ -1188,11 +1957,55 @@ "xtend": "4.0.1" }, "dependencies": { +<<<<<<< HEAD + "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.1.1", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "typedarray": "0.0.6" + } + }, +======= +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "punycode": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", "dev": true +<<<<<<< HEAD + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + }, + "dependencies": { + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "5.1.2" + } + } + } +======= +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } } }, @@ -1240,7 +2053,11 @@ "dev": true, "requires": { "bn.js": "4.11.8", +<<<<<<< HEAD + "randombytes": "2.1.0" +======= "randombytes": "2.0.6" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "browserify-sign": { @@ -1255,7 +2072,11 @@ "create-hmac": "1.1.7", "elliptic": "6.4.1", "inherits": "2.0.3", +<<<<<<< HEAD + "parse-asn1": "5.1.4" +======= "parse-asn1": "5.1.3" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "browserify-zlib": { @@ -1264,6 +2085,20 @@ "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", "dev": true, "requires": { +<<<<<<< HEAD + "pako": "1.0.10" + } + }, + "browserslist": { + "version": "4.5.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.6.tgz", + "integrity": "sha512-o/hPOtbU9oX507lIqon+UvPYqpx3mHc8cV3QemSBTXwkG8gSQSK6UKvXcE/DcleU3+A59XTUHyCvZ5qGy8xVAg==", + "dev": true, + "requires": { + "caniuse-lite": "1.0.30000966", + "electron-to-chromium": "1.3.131", + "node-releases": "1.1.17" +======= "pako": "1.0.8" } }, @@ -1276,6 +2111,7 @@ "caniuse-lite": "1.0.30000933", "electron-to-chromium": "1.3.110", "node-releases": "1.1.6" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "buffer": { @@ -1285,14 +2121,22 @@ "dev": true, "requires": { "base64-js": "1.3.0", +<<<<<<< HEAD + "ieee754": "1.1.13" +======= "ieee754": "1.1.12" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "buffer-from": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", +<<<<<<< HEAD + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" +======= "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", "dev": true +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b }, "buffer-xor": { "version": "1.0.3", @@ -1312,6 +2156,12 @@ "integrity": "sha512-5r2GqsoEb4qMTTN9J+WzXfjov+hjxT+j3u5K+kIVNIwAd99DLCJE9pBIMP1qVeybV6JiijL385Oz0DcYxfbOIg==", "dev": true }, +<<<<<<< HEAD + "caniuse-lite": { + "version": "1.0.30000966", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000966.tgz", + "integrity": "sha512-qqLQ/uYrpZmFhPY96VuBkMEo8NhVFBZ9y/Bh+KnvGzGJ5I8hvpIaWlF2pw5gqe4PLAL+ZjsPgMOvoXSpX21Keg==", +======= "camelcase": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz", @@ -1322,6 +2172,7 @@ "version": "1.0.30000933", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000933.tgz", "integrity": "sha512-d3QXv7eFTU40DSedSP81dV/ajcGSKpT+GW+uhtWmLvQm9bPk0KK++7i1e2NSW/CXGZhWFt2mFbFtCJ5I5bMuVA==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true }, "caseless": { @@ -1350,6 +2201,8 @@ "safe-buffer": "5.1.2" } }, +<<<<<<< HEAD +======= "cli-table3": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz", @@ -1378,6 +2231,7 @@ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", @@ -1393,12 +2247,15 @@ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "dev": true }, +<<<<<<< HEAD +======= "colors": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz", "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==", "dev": true }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "combine-source-map": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz", @@ -1420,17 +2277,29 @@ } }, "combined-stream": { +<<<<<<< HEAD + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", +======= "version": "1.0.7", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "requires": { "delayed-stream": "1.0.0" } }, "commander": { +<<<<<<< HEAD + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", + "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==" +======= "version": "2.19.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b }, "concat-map": { "version": "0.0.1", @@ -1439,6 +2308,15 @@ "dev": true }, "concat-stream": { +<<<<<<< HEAD + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", + "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", + "requires": { + "buffer-from": "1.1.1", + "inherits": "2.0.3", + "readable-stream": "3.3.0", +======= "version": "1.6.2", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", @@ -1447,6 +2325,7 @@ "buffer-from": "1.1.1", "inherits": "2.0.3", "readable-stream": "2.3.6", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "typedarray": "0.0.6" } }, @@ -1474,6 +2353,41 @@ "safe-buffer": "5.1.2" } }, +<<<<<<< HEAD + "core-js": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.0.1.tgz", + "integrity": "sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==", + "dev": true + }, + "core-js-compat": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.0.1.tgz", + "integrity": "sha512-2pC3e+Ht/1/gD7Sim/sqzvRplMiRnFQVlPpDVaHtY9l7zZP7knamr3VRD6NyGfHd84MrDC0tAM9ulNxYMW0T3g==", + "dev": true, + "requires": { + "browserslist": "4.5.6", + "core-js": "3.0.1", + "core-js-pure": "3.0.1", + "semver": "6.0.0" + }, + "dependencies": { + "semver": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz", + "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==", + "dev": true + } + } + }, + "core-js-pure": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.0.1.tgz", + "integrity": "sha512-mSxeQ6IghKW3MoyF4cz19GJ1cMm7761ON+WObSyLfTu/Jn3x7w4NwNFnrZxgl4MTSvYYepVLNuRtlB4loMwJ5g==", + "dev": true + }, +======= +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -1516,6 +2430,8 @@ "sha.js": "2.4.11" } }, +<<<<<<< HEAD +======= "cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", @@ -1529,6 +2445,7 @@ "which": "1.3.1" } }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "crypto-browserify": { "version": "3.12.0", "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", @@ -1544,10 +2461,23 @@ "inherits": "2.0.3", "pbkdf2": "3.0.17", "public-encrypt": "4.0.3", +<<<<<<< HEAD + "randombytes": "2.1.0", + "randomfill": "1.0.4" + } + }, + "dash-ast": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz", + "integrity": "sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA==", + "dev": true + }, +======= "randombytes": "2.0.6", "randomfill": "1.0.4" } }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -1571,12 +2501,15 @@ "ms": "2.1.1" } }, +<<<<<<< HEAD +======= "decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", "dev": true }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "defined": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", @@ -1629,7 +2562,11 @@ "requires": { "bn.js": "4.11.8", "miller-rabin": "4.0.1", +<<<<<<< HEAD + "randombytes": "2.1.0" +======= "randombytes": "2.0.6" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "domain-browser": { @@ -1645,6 +2582,35 @@ "dev": true, "requires": { "readable-stream": "2.3.6" +<<<<<<< HEAD + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "5.1.2" + } + } +======= +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "ecc-jsbn": { @@ -1657,9 +2623,15 @@ } }, "electron-to-chromium": { +<<<<<<< HEAD + "version": "1.3.131", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.131.tgz", + "integrity": "sha512-NSO4jLeyGLWrT4mzzfYX8vt1MYCoMI5LxSYAjt0H9+LF/14JyiKJSyyjA6AJTxflZlEM5v3QU33F0ohbPMCAPg==", +======= "version": "1.3.110", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.110.tgz", "integrity": "sha512-LS2Osf3ags8xVmcgRcH06fQjVbSEPhFtMfmjXDv5jHUzg73sNsEflv9rltZ33IAe0RLgU+7ln+1r+U7d6/k0KQ==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true }, "elliptic": { @@ -1684,6 +2656,8 @@ "iconv-lite": "0.4.24" } }, +<<<<<<< HEAD +======= "end-of-stream": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", @@ -1693,6 +2667,7 @@ "once": "1.4.0" } }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "es6-promise": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz", @@ -1726,6 +2701,8 @@ "safe-buffer": "5.1.2" } }, +<<<<<<< HEAD +======= "execa": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", @@ -1741,6 +2718,7 @@ "strip-eof": "1.0.0" } }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -1761,6 +2739,24 @@ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" }, +<<<<<<< HEAD + "file-fetch": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/file-fetch/-/file-fetch-1.2.0.tgz", + "integrity": "sha512-DzwKhcH/afS7thk5hao1kVJXIqMNB2pz0DFpjpA5IlIAA0nSqi/fqFQpX++NP9IK+Te7Z1ZxA5KTWKmdzio+tA==", + "requires": { + "concat-stream": "2.0.0", + "mime-types": "2.1.24", + "node-fetch": "2.6.0", + "readable-error": "1.0.0" + }, + "dependencies": { + "node-fetch": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + } +======= "find-up": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", @@ -1768,6 +2764,7 @@ "dev": true, "requires": { "locate-path": "3.0.0" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "forever-agent": { @@ -1781,10 +2778,22 @@ "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", "requires": { "asynckit": "0.4.0", +<<<<<<< HEAD + "combined-stream": "1.0.8", + "mime-types": "2.1.24" + } + }, + "fs": { + "version": "0.0.1-security", + "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz", + "integrity": "sha1-invTcYa23d84E/I4WLV+yq9eQdQ=" + }, +======= "combined-stream": "1.0.7", "mime-types": "2.1.21" } }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -1803,6 +2812,8 @@ "integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==", "dev": true }, +<<<<<<< HEAD +======= "get-caller-file": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", @@ -1818,6 +2829,7 @@ "pump": "3.0.0" } }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", @@ -1841,9 +2853,15 @@ } }, "globals": { +<<<<<<< HEAD + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", +======= "version": "11.10.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.10.0.tgz", "integrity": "sha512-0GZF1RiPKU97IHUO5TORo9w1PwrH/NBPl+fS7oMLdaTRiYmYbwK4NWoZWrAdd0/abG9R2BU+OiwyQpTpE6pdfQ==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true }, "har-schema": { @@ -1856,7 +2874,11 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", "requires": { +<<<<<<< HEAD + "ajv": "6.10.0", +======= "ajv": "6.7.0", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "har-schema": "2.0.0" } }, @@ -1935,9 +2957,15 @@ } }, "ieee754": { +<<<<<<< HEAD + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==", +======= "version": "1.1.12", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz", "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true }, "inflight": { @@ -1978,8 +3006,51 @@ "path-is-absolute": "1.0.1", "process": "0.11.10", "through2": "2.0.5", +<<<<<<< HEAD + "undeclared-identifiers": "1.1.3", + "xtend": "4.0.1" + }, + "dependencies": { + "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.1.1", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "typedarray": "0.0.6" + } + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "5.1.2" + } + } +======= "undeclared-identifiers": "1.1.2", "xtend": "4.0.1" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "invariant": { @@ -1991,24 +3062,30 @@ "loose-envify": "1.4.0" } }, +<<<<<<< HEAD +======= "invert-kv": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", "dev": true }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", "dev": true }, +<<<<<<< HEAD +======= "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", @@ -2022,6 +3099,9 @@ "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +<<<<<<< HEAD + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" +======= "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, @@ -2030,6 +3110,7 @@ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b }, "isomorphic-fetch": { "version": "2.2.1", @@ -2038,6 +3119,8 @@ "requires": { "node-fetch": "1.7.3", "whatwg-fetch": "3.0.0" +<<<<<<< HEAD +======= }, "dependencies": { "node-fetch": { @@ -2049,6 +3132,7 @@ "is-stream": "1.1.0" } } +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "isstream": { @@ -2172,6 +3256,8 @@ } } }, +<<<<<<< HEAD +======= "lcid": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", @@ -2191,6 +3277,7 @@ "path-exists": "3.0.0" } }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "lodash": { "version": "4.17.11", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", @@ -2216,6 +3303,8 @@ "js-tokens": "4.0.0" } }, +<<<<<<< HEAD +======= "map-age-cleaner": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", @@ -2225,6 +3314,7 @@ "p-defer": "1.0.0" } }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", @@ -2236,6 +3326,8 @@ "safe-buffer": "5.1.2" } }, +<<<<<<< HEAD +======= "mem": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/mem/-/mem-4.1.0.tgz", @@ -2247,6 +3339,7 @@ "p-is-promise": "2.0.0" } }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "miller-rabin": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", @@ -2258,6 +3351,20 @@ } }, "mime-db": { +<<<<<<< HEAD + "version": "1.40.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" + }, + "mime-types": { + "version": "2.1.24", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", + "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", + "requires": { + "mime-db": "1.40.0" + } + }, +======= "version": "1.37.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz", "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==" @@ -2276,6 +3383,7 @@ "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", "dev": true }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "minimalistic-assert": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", @@ -2339,6 +3447,47 @@ "subarg": "1.0.0", "through2": "2.0.5", "xtend": "4.0.1" +<<<<<<< HEAD + }, + "dependencies": { + "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.1.1", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "typedarray": "0.0.6" + } + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "5.1.2" + } + } +======= +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "ms": { @@ -2347,51 +3496,3215 @@ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "dev": true }, - "n3": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/n3/-/n3-0.4.5.tgz", - "integrity": "sha1-W3DTq2ohyejUyb2io9TZCQm+tQg=" - }, - "nice-try": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", + "n3": { + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/n3/-/n3-0.4.5.tgz", + "integrity": "sha1-W3DTq2ohyejUyb2io9TZCQm+tQg=" + }, +<<<<<<< HEAD + "node-fetch": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", + "requires": { + "encoding": "0.1.12", + "is-stream": "1.1.0" + } + }, + "node-forge": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.8.3.tgz", + "integrity": "sha512-5lv9UKmvTBog+m4AWL8XpZnr3WbNKxYL2M77i903ylY/huJIooSTDHyUWQ/OppFuKQpAGMk6qNtDymSJNRIEIg==" + }, + "node-releases": { + "version": "1.1.17", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.17.tgz", + "integrity": "sha512-/SCjetyta1m7YXLgtACZGDYJdCSIBAWorDWkGCGZlydP2Ll7J48l7j/JxNYZ+xsgSPbWfdulVS/aY+GdjUsQ7Q==", + "dev": true, + "requires": { + "semver": "5.7.0" +======= + "nice-try": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", + "dev": true + }, + "node-fetch": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz", + "integrity": "sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA==" + }, + "node-forge": { + "version": "0.7.6", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.6.tgz", + "integrity": "sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==" + }, + "node-releases": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.6.tgz", + "integrity": "sha512-lODUVHEIZutZx+TDdOk47qLik8FJMXzJ+WnyUGci1MTvTOyzZrz5eVPIIpc5Hb3NfHZGeGHeuwrRYVI1PEITWg==", + "dev": true, + "requires": { + "semver": "5.6.0" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b + } + }, + "node-rsa": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/node-rsa/-/node-rsa-0.4.2.tgz", + "integrity": "sha1-1jkXKewWqDDtWjgEKzFX0tXXJTA=", + "requires": { + "asn1": "0.2.3" + }, + "dependencies": { + "asn1": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", + "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" + } + } + }, +<<<<<<< HEAD + "npm": { + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/npm/-/npm-6.9.0.tgz", + "integrity": "sha512-91V+zB5hDxO+Jyp2sUKS7juHlIM95dGQxTeQtmZI1nAI/7kjWXFipPrtwwKjhyKmV4GsS2LzJhrxRjGWsU9z/w==", + "requires": { + "JSONStream": "1.3.5", + "abbrev": "1.1.1", + "ansicolors": "0.3.2", + "ansistyles": "0.1.3", + "aproba": "2.0.0", + "archy": "1.0.0", + "bin-links": "1.1.2", + "bluebird": "3.5.3", + "byte-size": "5.0.1", + "cacache": "11.3.2", + "call-limit": "1.1.0", + "chownr": "1.1.1", + "ci-info": "2.0.0", + "cli-columns": "3.1.2", + "cli-table3": "0.5.1", + "cmd-shim": "2.0.2", + "columnify": "1.5.4", + "config-chain": "1.1.12", + "debuglog": "1.0.1", + "detect-indent": "5.0.0", + "detect-newline": "2.1.0", + "dezalgo": "1.0.3", + "editor": "1.0.0", + "figgy-pudding": "3.5.1", + "find-npm-prefix": "1.0.2", + "fs-vacuum": "1.2.10", + "fs-write-stream-atomic": "1.0.10", + "gentle-fs": "2.0.1", + "glob": "7.1.3", + "graceful-fs": "4.1.15", + "has-unicode": "2.0.1", + "hosted-git-info": "2.7.1", + "iferr": "1.0.2", + "imurmurhash": "0.1.4", + "inflight": "1.0.6", + "inherits": "2.0.3", + "ini": "1.3.5", + "init-package-json": "1.10.3", + "is-cidr": "3.0.0", + "json-parse-better-errors": "1.0.2", + "lazy-property": "1.0.0", + "libcipm": "3.0.3", + "libnpm": "2.0.1", + "libnpmaccess": "3.0.1", + "libnpmhook": "5.0.2", + "libnpmorg": "1.0.0", + "libnpmsearch": "2.0.0", + "libnpmteam": "1.0.1", + "libnpx": "10.2.0", + "lock-verify": "2.1.0", + "lockfile": "1.0.4", + "lodash._baseindexof": "3.1.0", + "lodash._baseuniq": "4.6.0", + "lodash._bindcallback": "3.0.1", + "lodash._cacheindexof": "3.0.2", + "lodash._createcache": "3.1.2", + "lodash._getnative": "3.9.1", + "lodash.clonedeep": "4.5.0", + "lodash.restparam": "3.6.1", + "lodash.union": "4.6.0", + "lodash.uniq": "4.5.0", + "lodash.without": "4.4.0", + "lru-cache": "4.1.5", + "meant": "1.0.1", + "mississippi": "3.0.0", + "mkdirp": "0.5.1", + "move-concurrently": "1.0.1", + "node-gyp": "3.8.0", + "nopt": "4.0.1", + "normalize-package-data": "2.5.0", + "npm-audit-report": "1.3.2", + "npm-cache-filename": "1.0.2", + "npm-install-checks": "3.0.0", + "npm-lifecycle": "2.1.0", + "npm-package-arg": "6.1.0", + "npm-packlist": "1.4.1", + "npm-pick-manifest": "2.2.3", + "npm-profile": "4.0.1", + "npm-registry-fetch": "3.9.0", + "npm-user-validate": "1.0.0", + "npmlog": "4.1.2", + "once": "1.4.0", + "opener": "1.5.1", + "osenv": "0.1.5", + "pacote": "9.5.0", + "path-is-inside": "1.0.2", + "promise-inflight": "1.0.1", + "qrcode-terminal": "0.12.0", + "query-string": "6.2.0", + "qw": "1.0.1", + "read": "1.0.7", + "read-cmd-shim": "1.0.1", + "read-installed": "4.0.3", + "read-package-json": "2.0.13", + "read-package-tree": "5.2.2", + "readable-stream": "3.1.1", + "readdir-scoped-modules": "1.0.2", + "request": "2.88.0", + "retry": "0.12.0", + "rimraf": "2.6.3", + "safe-buffer": "5.1.2", + "semver": "5.6.0", + "sha": "2.0.1", + "slide": "1.1.6", + "sorted-object": "2.0.1", + "sorted-union-stream": "2.1.3", + "ssri": "6.0.1", + "stringify-package": "1.0.0", + "tar": "4.4.8", + "text-table": "0.2.0", + "tiny-relative-date": "1.3.0", + "uid-number": "0.0.6", + "umask": "1.1.0", + "unique-filename": "1.1.1", + "unpipe": "1.0.0", + "update-notifier": "2.5.0", + "uuid": "3.3.2", + "validate-npm-package-license": "3.0.4", + "validate-npm-package-name": "3.0.0", + "which": "1.3.1", + "worker-farm": "1.6.0", + "write-file-atomic": "2.4.2" + }, + "dependencies": { + "JSONStream": { + "version": "1.3.5", + "bundled": true, + "requires": { + "jsonparse": "1.3.1", + "through": "2.3.8" + } + }, + "abbrev": { + "version": "1.1.1", + "bundled": true + }, + "agent-base": { + "version": "4.2.1", + "bundled": true, + "requires": { + "es6-promisify": "5.0.0" + } + }, + "agentkeepalive": { + "version": "3.4.1", + "bundled": true, + "requires": { + "humanize-ms": "1.2.1" + } + }, + "ajv": { + "version": "5.5.2", + "bundled": true, + "requires": { + "co": "4.6.0", + "fast-deep-equal": "1.1.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" + } + }, + "ansi-align": { + "version": "2.0.0", + "bundled": true, + "requires": { + "string-width": "2.1.1" + } + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true + }, + "ansi-styles": { + "version": "3.2.1", + "bundled": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "ansicolors": { + "version": "0.3.2", + "bundled": true + }, + "ansistyles": { + "version": "0.1.3", + "bundled": true + }, + "aproba": { + "version": "2.0.0", + "bundled": true + }, + "archy": { + "version": "1.0.0", + "bundled": true + }, + "are-we-there-yet": { + "version": "1.1.4", + "bundled": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.3.6" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "requires": { + "safe-buffer": "5.1.2" + } + } + } + }, + "asap": { + "version": "2.0.6", + "bundled": true + }, + "asn1": { + "version": "0.2.4", + "bundled": true, + "requires": { + "safer-buffer": "2.1.2" + } + }, + "assert-plus": { + "version": "1.0.0", + "bundled": true + }, + "asynckit": { + "version": "0.4.0", + "bundled": true + }, + "aws-sign2": { + "version": "0.7.0", + "bundled": true + }, + "aws4": { + "version": "1.8.0", + "bundled": true + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true + }, + "bcrypt-pbkdf": { + "version": "1.0.2", + "bundled": true, + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, + "bin-links": { + "version": "1.1.2", + "bundled": true, + "requires": { + "bluebird": "3.5.3", + "cmd-shim": "2.0.2", + "gentle-fs": "2.0.1", + "graceful-fs": "4.1.15", + "write-file-atomic": "2.4.2" + } + }, + "block-stream": { + "version": "0.0.9", + "bundled": true, + "requires": { + "inherits": "2.0.3" + } + }, + "bluebird": { + "version": "3.5.3", + "bundled": true + }, + "boxen": { + "version": "1.3.0", + "bundled": true, + "requires": { + "ansi-align": "2.0.0", + "camelcase": "4.1.0", + "chalk": "2.4.1", + "cli-boxes": "1.0.0", + "string-width": "2.1.1", + "term-size": "1.2.0", + "widest-line": "2.0.0" + } + }, + "brace-expansion": { + "version": "1.1.11", + "bundled": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "buffer-from": { + "version": "1.0.0", + "bundled": true + }, + "builtins": { + "version": "1.0.3", + "bundled": true + }, + "byline": { + "version": "5.0.0", + "bundled": true + }, + "byte-size": { + "version": "5.0.1", + "bundled": true + }, + "cacache": { + "version": "11.3.2", + "bundled": true, + "requires": { + "bluebird": "3.5.3", + "chownr": "1.1.1", + "figgy-pudding": "3.5.1", + "glob": "7.1.3", + "graceful-fs": "4.1.15", + "lru-cache": "5.1.1", + "mississippi": "3.0.0", + "mkdirp": "0.5.1", + "move-concurrently": "1.0.1", + "promise-inflight": "1.0.1", + "rimraf": "2.6.3", + "ssri": "6.0.1", + "unique-filename": "1.1.1", + "y18n": "4.0.0" + }, + "dependencies": { + "chownr": { + "version": "1.1.1", + "bundled": true + }, + "lru-cache": { + "version": "5.1.1", + "bundled": true, + "requires": { + "yallist": "3.0.3" + } + }, + "unique-filename": { + "version": "1.1.1", + "bundled": true, + "requires": { + "unique-slug": "2.0.0" + } + }, + "yallist": { + "version": "3.0.3", + "bundled": true + } + } + }, + "call-limit": { + "version": "1.1.0", + "bundled": true + }, + "camelcase": { + "version": "4.1.0", + "bundled": true + }, + "capture-stack-trace": { + "version": "1.0.0", + "bundled": true + }, + "caseless": { + "version": "0.12.0", + "bundled": true + }, + "chalk": { + "version": "2.4.1", + "bundled": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "chownr": { + "version": "1.1.1", + "bundled": true + }, + "ci-info": { + "version": "2.0.0", + "bundled": true + }, + "cidr-regex": { + "version": "2.0.10", + "bundled": true, + "requires": { + "ip-regex": "2.1.0" + } + }, + "cli-boxes": { + "version": "1.0.0", + "bundled": true + }, + "cli-columns": { + "version": "3.1.2", + "bundled": true, + "requires": { + "string-width": "2.1.1", + "strip-ansi": "3.0.1" + } + }, + "cli-table3": { + "version": "0.5.1", + "bundled": true, + "requires": { + "colors": "1.3.3", + "object-assign": "4.1.1", + "string-width": "2.1.1" + } + }, + "cliui": { + "version": "4.1.0", + "bundled": true, + "requires": { + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "wrap-ansi": "2.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "bundled": true + }, + "strip-ansi": { + "version": "4.0.0", + "bundled": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "clone": { + "version": "1.0.4", + "bundled": true + }, + "cmd-shim": { + "version": "2.0.2", + "bundled": true, + "requires": { + "graceful-fs": "4.1.15", + "mkdirp": "0.5.1" + } + }, + "co": { + "version": "4.6.0", + "bundled": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true + }, + "color-convert": { + "version": "1.9.1", + "bundled": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "bundled": true + }, + "colors": { + "version": "1.3.3", + "bundled": true, + "optional": true + }, + "columnify": { + "version": "1.5.4", + "bundled": true, + "requires": { + "strip-ansi": "3.0.1", + "wcwidth": "1.0.1" + } + }, + "combined-stream": { + "version": "1.0.6", + "bundled": true, + "requires": { + "delayed-stream": "1.0.0" + } + }, + "concat-map": { + "version": "0.0.1", + "bundled": true + }, + "concat-stream": { + "version": "1.6.2", + "bundled": true, + "requires": { + "buffer-from": "1.0.0", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "typedarray": "0.0.6" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "requires": { + "safe-buffer": "5.1.2" + } + } + } + }, + "config-chain": { + "version": "1.1.12", + "bundled": true, + "requires": { + "ini": "1.3.5", + "proto-list": "1.2.4" + } + }, + "configstore": { + "version": "3.1.2", + "bundled": true, + "requires": { + "dot-prop": "4.2.0", + "graceful-fs": "4.1.15", + "make-dir": "1.3.0", + "unique-string": "1.0.0", + "write-file-atomic": "2.4.2", + "xdg-basedir": "3.0.0" + } + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true + }, + "copy-concurrently": { + "version": "1.0.5", + "bundled": true, + "requires": { + "aproba": "1.2.0", + "fs-write-stream-atomic": "1.0.10", + "iferr": "0.1.5", + "mkdirp": "0.5.1", + "rimraf": "2.6.3", + "run-queue": "1.0.3" + }, + "dependencies": { + "aproba": { + "version": "1.2.0", + "bundled": true + }, + "iferr": { + "version": "0.1.5", + "bundled": true + } + } + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true + }, + "create-error-class": { + "version": "3.0.2", + "bundled": true, + "requires": { + "capture-stack-trace": "1.0.0" + } + }, + "cross-spawn": { + "version": "5.1.0", + "bundled": true, + "requires": { + "lru-cache": "4.1.5", + "shebang-command": "1.2.0", + "which": "1.3.1" + } + }, + "crypto-random-string": { + "version": "1.0.0", + "bundled": true + }, + "cyclist": { + "version": "0.2.2", + "bundled": true + }, + "dashdash": { + "version": "1.14.1", + "bundled": true, + "requires": { + "assert-plus": "1.0.0" + } + }, + "debug": { + "version": "3.1.0", + "bundled": true, + "requires": { + "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "bundled": true + } + } + }, + "debuglog": { + "version": "1.0.1", + "bundled": true + }, + "decamelize": { + "version": "1.2.0", + "bundled": true + }, + "decode-uri-component": { + "version": "0.2.0", + "bundled": true + }, + "deep-extend": { + "version": "0.5.1", + "bundled": true + }, + "defaults": { + "version": "1.0.3", + "bundled": true, + "requires": { + "clone": "1.0.4" + } + }, + "delayed-stream": { + "version": "1.0.0", + "bundled": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true + }, + "detect-indent": { + "version": "5.0.0", + "bundled": true + }, + "detect-newline": { + "version": "2.1.0", + "bundled": true + }, + "dezalgo": { + "version": "1.0.3", + "bundled": true, + "requires": { + "asap": "2.0.6", + "wrappy": "1.0.2" + } + }, + "dot-prop": { + "version": "4.2.0", + "bundled": true, + "requires": { + "is-obj": "1.0.1" + } + }, + "dotenv": { + "version": "5.0.1", + "bundled": true + }, + "duplexer3": { + "version": "0.1.4", + "bundled": true + }, + "duplexify": { + "version": "3.6.0", + "bundled": true, + "requires": { + "end-of-stream": "1.4.1", + "inherits": "2.0.3", + "readable-stream": "2.3.6", + "stream-shift": "1.0.0" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "requires": { + "safe-buffer": "5.1.2" + } + } + } + }, + "ecc-jsbn": { + "version": "0.1.2", + "bundled": true, + "optional": true, + "requires": { + "jsbn": "0.1.1", + "safer-buffer": "2.1.2" + } + }, + "editor": { + "version": "1.0.0", + "bundled": true + }, + "encoding": { + "version": "0.1.12", + "bundled": true, + "requires": { + "iconv-lite": "0.4.23" + } + }, + "end-of-stream": { + "version": "1.4.1", + "bundled": true, + "requires": { + "once": "1.4.0" + } + }, + "err-code": { + "version": "1.1.2", + "bundled": true + }, + "errno": { + "version": "0.1.7", + "bundled": true, + "requires": { + "prr": "1.0.1" + } + }, + "es6-promise": { + "version": "4.2.6", + "bundled": true + }, + "es6-promisify": { + "version": "5.0.0", + "bundled": true, + "requires": { + "es6-promise": "4.2.6" + } + }, + "escape-string-regexp": { + "version": "1.0.5", + "bundled": true + }, + "execa": { + "version": "0.7.0", + "bundled": true, + "requires": { + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + }, + "dependencies": { + "get-stream": { + "version": "3.0.0", + "bundled": true + } + } + }, + "extend": { + "version": "3.0.2", + "bundled": true + }, + "extsprintf": { + "version": "1.3.0", + "bundled": true + }, + "fast-deep-equal": { + "version": "1.1.0", + "bundled": true + }, + "fast-json-stable-stringify": { + "version": "2.0.0", + "bundled": true + }, + "figgy-pudding": { + "version": "3.5.1", + "bundled": true + }, + "find-npm-prefix": { + "version": "1.0.2", + "bundled": true + }, + "find-up": { + "version": "2.1.0", + "bundled": true, + "requires": { + "locate-path": "2.0.0" + } + }, + "flush-write-stream": { + "version": "1.0.3", + "bundled": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.6" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "requires": { + "safe-buffer": "5.1.2" + } + } + } + }, + "forever-agent": { + "version": "0.6.1", + "bundled": true + }, + "form-data": { + "version": "2.3.2", + "bundled": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.6", + "mime-types": "2.1.19" + } + }, + "from2": { + "version": "2.3.0", + "bundled": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.6" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "requires": { + "safe-buffer": "5.1.2" + } + } + } + }, + "fs-minipass": { + "version": "1.2.5", + "bundled": true, + "requires": { + "minipass": "2.3.3" + } + }, + "fs-vacuum": { + "version": "1.2.10", + "bundled": true, + "requires": { + "graceful-fs": "4.1.15", + "path-is-inside": "1.0.2", + "rimraf": "2.6.3" + } + }, + "fs-write-stream-atomic": { + "version": "1.0.10", + "bundled": true, + "requires": { + "graceful-fs": "4.1.15", + "iferr": "0.1.5", + "imurmurhash": "0.1.4", + "readable-stream": "2.3.6" + }, + "dependencies": { + "iferr": { + "version": "0.1.5", + "bundled": true + }, + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "requires": { + "safe-buffer": "5.1.2" + } + } + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true + }, + "fstream": { + "version": "1.0.11", + "bundled": true, + "requires": { + "graceful-fs": "4.1.15", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.3" + } + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "requires": { + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + }, + "dependencies": { + "aproba": { + "version": "1.2.0", + "bundled": true + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + } + } + }, + "genfun": { + "version": "5.0.0", + "bundled": true + }, + "gentle-fs": { + "version": "2.0.1", + "bundled": true, + "requires": { + "aproba": "1.2.0", + "fs-vacuum": "1.2.10", + "graceful-fs": "4.1.15", + "iferr": "0.1.5", + "mkdirp": "0.5.1", + "path-is-inside": "1.0.2", + "read-cmd-shim": "1.0.1", + "slide": "1.1.6" + }, + "dependencies": { + "aproba": { + "version": "1.2.0", + "bundled": true + }, + "iferr": { + "version": "0.1.5", + "bundled": true + } + } + }, + "get-caller-file": { + "version": "1.0.2", + "bundled": true + }, + "get-stream": { + "version": "4.1.0", + "bundled": true, + "requires": { + "pump": "3.0.0" + } + }, + "getpass": { + "version": "0.1.7", + "bundled": true, + "requires": { + "assert-plus": "1.0.0" + } + }, + "glob": { + "version": "7.1.3", + "bundled": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "global-dirs": { + "version": "0.1.1", + "bundled": true, + "requires": { + "ini": "1.3.5" + } + }, + "got": { + "version": "6.7.1", + "bundled": true, + "requires": { + "create-error-class": "3.0.2", + "duplexer3": "0.1.4", + "get-stream": "3.0.0", + "is-redirect": "1.0.0", + "is-retry-allowed": "1.1.0", + "is-stream": "1.1.0", + "lowercase-keys": "1.0.1", + "safe-buffer": "5.1.2", + "timed-out": "4.0.1", + "unzip-response": "2.0.1", + "url-parse-lax": "1.0.0" + }, + "dependencies": { + "get-stream": { + "version": "3.0.0", + "bundled": true + } + } + }, + "graceful-fs": { + "version": "4.1.15", + "bundled": true + }, + "har-schema": { + "version": "2.0.0", + "bundled": true + }, + "har-validator": { + "version": "5.1.0", + "bundled": true, + "requires": { + "ajv": "5.5.2", + "har-schema": "2.0.0" + } + }, + "has-flag": { + "version": "3.0.0", + "bundled": true + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true + }, + "hosted-git-info": { + "version": "2.7.1", + "bundled": true + }, + "http-cache-semantics": { + "version": "3.8.1", + "bundled": true + }, + "http-proxy-agent": { + "version": "2.1.0", + "bundled": true, + "requires": { + "agent-base": "4.2.1", + "debug": "3.1.0" + } + }, + "http-signature": { + "version": "1.2.0", + "bundled": true, + "requires": { + "assert-plus": "1.0.0", + "jsprim": "1.4.1", + "sshpk": "1.14.2" + } + }, + "https-proxy-agent": { + "version": "2.2.1", + "bundled": true, + "requires": { + "agent-base": "4.2.1", + "debug": "3.1.0" + } + }, + "humanize-ms": { + "version": "1.2.1", + "bundled": true, + "requires": { + "ms": "2.1.1" + } + }, + "iconv-lite": { + "version": "0.4.23", + "bundled": true, + "requires": { + "safer-buffer": "2.1.2" + } + }, + "iferr": { + "version": "1.0.2", + "bundled": true + }, + "ignore-walk": { + "version": "3.0.1", + "bundled": true, + "requires": { + "minimatch": "3.0.4" + } + }, + "import-lazy": { + "version": "2.1.0", + "bundled": true + }, + "imurmurhash": { + "version": "0.1.4", + "bundled": true + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true + }, + "ini": { + "version": "1.3.5", + "bundled": true + }, + "init-package-json": { + "version": "1.10.3", + "bundled": true, + "requires": { + "glob": "7.1.3", + "npm-package-arg": "6.1.0", + "promzard": "0.3.0", + "read": "1.0.7", + "read-package-json": "2.0.13", + "semver": "5.6.0", + "validate-npm-package-license": "3.0.4", + "validate-npm-package-name": "3.0.0" + } + }, + "invert-kv": { + "version": "1.0.0", + "bundled": true + }, + "ip": { + "version": "1.1.5", + "bundled": true + }, + "ip-regex": { + "version": "2.1.0", + "bundled": true + }, + "is-ci": { + "version": "1.1.0", + "bundled": true, + "requires": { + "ci-info": "1.6.0" + }, + "dependencies": { + "ci-info": { + "version": "1.6.0", + "bundled": true + } + } + }, + "is-cidr": { + "version": "3.0.0", + "bundled": true, + "requires": { + "cidr-regex": "2.0.10" + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-installed-globally": { + "version": "0.1.0", + "bundled": true, + "requires": { + "global-dirs": "0.1.1", + "is-path-inside": "1.0.1" + } + }, + "is-npm": { + "version": "1.0.0", + "bundled": true + }, + "is-obj": { + "version": "1.0.1", + "bundled": true + }, + "is-path-inside": { + "version": "1.0.1", + "bundled": true, + "requires": { + "path-is-inside": "1.0.2" + } + }, + "is-redirect": { + "version": "1.0.0", + "bundled": true + }, + "is-retry-allowed": { + "version": "1.1.0", + "bundled": true + }, + "is-stream": { + "version": "1.1.0", + "bundled": true + }, + "is-typedarray": { + "version": "1.0.0", + "bundled": true + }, + "isarray": { + "version": "1.0.0", + "bundled": true + }, + "isexe": { + "version": "2.0.0", + "bundled": true + }, + "isstream": { + "version": "0.1.2", + "bundled": true + }, + "jsbn": { + "version": "0.1.1", + "bundled": true, + "optional": true + }, + "json-parse-better-errors": { + "version": "1.0.2", + "bundled": true + }, + "json-schema": { + "version": "0.2.3", + "bundled": true + }, + "json-schema-traverse": { + "version": "0.3.1", + "bundled": true + }, + "json-stringify-safe": { + "version": "5.0.1", + "bundled": true + }, + "jsonparse": { + "version": "1.3.1", + "bundled": true + }, + "jsprim": { + "version": "1.4.1", + "bundled": true, + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "latest-version": { + "version": "3.1.0", + "bundled": true, + "requires": { + "package-json": "4.0.1" + } + }, + "lazy-property": { + "version": "1.0.0", + "bundled": true + }, + "lcid": { + "version": "1.0.0", + "bundled": true, + "requires": { + "invert-kv": "1.0.0" + } + }, + "libcipm": { + "version": "3.0.3", + "bundled": true, + "requires": { + "bin-links": "1.1.2", + "bluebird": "3.5.3", + "figgy-pudding": "3.5.1", + "find-npm-prefix": "1.0.2", + "graceful-fs": "4.1.15", + "ini": "1.3.5", + "lock-verify": "2.1.0", + "mkdirp": "0.5.1", + "npm-lifecycle": "2.1.0", + "npm-logical-tree": "1.2.1", + "npm-package-arg": "6.1.0", + "pacote": "9.5.0", + "read-package-json": "2.0.13", + "rimraf": "2.6.3", + "worker-farm": "1.6.0" + } + }, + "libnpm": { + "version": "2.0.1", + "bundled": true, + "requires": { + "bin-links": "1.1.2", + "bluebird": "3.5.3", + "find-npm-prefix": "1.0.2", + "libnpmaccess": "3.0.1", + "libnpmconfig": "1.2.1", + "libnpmhook": "5.0.2", + "libnpmorg": "1.0.0", + "libnpmpublish": "1.1.1", + "libnpmsearch": "2.0.0", + "libnpmteam": "1.0.1", + "lock-verify": "2.1.0", + "npm-lifecycle": "2.1.0", + "npm-logical-tree": "1.2.1", + "npm-package-arg": "6.1.0", + "npm-profile": "4.0.1", + "npm-registry-fetch": "3.9.0", + "npmlog": "4.1.2", + "pacote": "9.5.0", + "read-package-json": "2.0.13", + "stringify-package": "1.0.0" + } + }, + "libnpmaccess": { + "version": "3.0.1", + "bundled": true, + "requires": { + "aproba": "2.0.0", + "get-stream": "4.1.0", + "npm-package-arg": "6.1.0", + "npm-registry-fetch": "3.9.0" + }, + "dependencies": { + "aproba": { + "version": "2.0.0", + "bundled": true + } + } + }, + "libnpmconfig": { + "version": "1.2.1", + "bundled": true, + "requires": { + "figgy-pudding": "3.5.1", + "find-up": "3.0.0", + "ini": "1.3.5" + }, + "dependencies": { + "find-up": { + "version": "3.0.0", + "bundled": true, + "requires": { + "locate-path": "3.0.0" + } + }, + "locate-path": { + "version": "3.0.0", + "bundled": true, + "requires": { + "p-locate": "3.0.0", + "path-exists": "3.0.0" + } + }, + "p-limit": { + "version": "2.1.0", + "bundled": true, + "requires": { + "p-try": "2.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "bundled": true, + "requires": { + "p-limit": "2.1.0" + } + }, + "p-try": { + "version": "2.0.0", + "bundled": true + } + } + }, + "libnpmhook": { + "version": "5.0.2", + "bundled": true, + "requires": { + "aproba": "2.0.0", + "figgy-pudding": "3.5.1", + "get-stream": "4.1.0", + "npm-registry-fetch": "3.9.0" + } + }, + "libnpmorg": { + "version": "1.0.0", + "bundled": true, + "requires": { + "aproba": "2.0.0", + "figgy-pudding": "3.5.1", + "get-stream": "4.1.0", + "npm-registry-fetch": "3.9.0" + }, + "dependencies": { + "aproba": { + "version": "2.0.0", + "bundled": true + } + } + }, + "libnpmpublish": { + "version": "1.1.1", + "bundled": true, + "requires": { + "aproba": "2.0.0", + "figgy-pudding": "3.5.1", + "get-stream": "4.1.0", + "lodash.clonedeep": "4.5.0", + "normalize-package-data": "2.5.0", + "npm-package-arg": "6.1.0", + "npm-registry-fetch": "3.9.0", + "semver": "5.6.0", + "ssri": "6.0.1" + } + }, + "libnpmsearch": { + "version": "2.0.0", + "bundled": true, + "requires": { + "figgy-pudding": "3.5.1", + "get-stream": "4.1.0", + "npm-registry-fetch": "3.9.0" + } + }, + "libnpmteam": { + "version": "1.0.1", + "bundled": true, + "requires": { + "aproba": "2.0.0", + "figgy-pudding": "3.5.1", + "get-stream": "4.1.0", + "npm-registry-fetch": "3.9.0" + }, + "dependencies": { + "aproba": { + "version": "2.0.0", + "bundled": true + } + } + }, + "libnpx": { + "version": "10.2.0", + "bundled": true, + "requires": { + "dotenv": "5.0.1", + "npm-package-arg": "6.1.0", + "rimraf": "2.6.3", + "safe-buffer": "5.1.2", + "update-notifier": "2.5.0", + "which": "1.3.1", + "y18n": "4.0.0", + "yargs": "11.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "bundled": true, + "requires": { + "p-locate": "2.0.0", + "path-exists": "3.0.0" + } + }, + "lock-verify": { + "version": "2.1.0", + "bundled": true, + "requires": { + "npm-package-arg": "6.1.0", + "semver": "5.6.0" + } + }, + "lockfile": { + "version": "1.0.4", + "bundled": true, + "requires": { + "signal-exit": "3.0.2" + } + }, + "lodash._baseindexof": { + "version": "3.1.0", + "bundled": true + }, + "lodash._baseuniq": { + "version": "4.6.0", + "bundled": true, + "requires": { + "lodash._createset": "4.0.3", + "lodash._root": "3.0.1" + } + }, + "lodash._bindcallback": { + "version": "3.0.1", + "bundled": true + }, + "lodash._cacheindexof": { + "version": "3.0.2", + "bundled": true + }, + "lodash._createcache": { + "version": "3.1.2", + "bundled": true, + "requires": { + "lodash._getnative": "3.9.1" + } + }, + "lodash._createset": { + "version": "4.0.3", + "bundled": true + }, + "lodash._getnative": { + "version": "3.9.1", + "bundled": true + }, + "lodash._root": { + "version": "3.0.1", + "bundled": true + }, + "lodash.clonedeep": { + "version": "4.5.0", + "bundled": true + }, + "lodash.restparam": { + "version": "3.6.1", + "bundled": true + }, + "lodash.union": { + "version": "4.6.0", + "bundled": true + }, + "lodash.uniq": { + "version": "4.5.0", + "bundled": true + }, + "lodash.without": { + "version": "4.4.0", + "bundled": true + }, + "lowercase-keys": { + "version": "1.0.1", + "bundled": true + }, + "lru-cache": { + "version": "4.1.5", + "bundled": true, + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, + "make-dir": { + "version": "1.3.0", + "bundled": true, + "requires": { + "pify": "3.0.0" + } + }, + "make-fetch-happen": { + "version": "4.0.1", + "bundled": true, + "requires": { + "agentkeepalive": "3.4.1", + "cacache": "11.3.2", + "http-cache-semantics": "3.8.1", + "http-proxy-agent": "2.1.0", + "https-proxy-agent": "2.2.1", + "lru-cache": "4.1.5", + "mississippi": "3.0.0", + "node-fetch-npm": "2.0.2", + "promise-retry": "1.1.1", + "socks-proxy-agent": "4.0.1", + "ssri": "6.0.1" + } + }, + "meant": { + "version": "1.0.1", + "bundled": true + }, + "mem": { + "version": "1.1.0", + "bundled": true, + "requires": { + "mimic-fn": "1.2.0" + } + }, + "mime-db": { + "version": "1.35.0", + "bundled": true + }, + "mime-types": { + "version": "2.1.19", + "bundled": true, + "requires": { + "mime-db": "1.35.0" + } + }, + "mimic-fn": { + "version": "1.2.0", + "bundled": true + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "requires": { + "brace-expansion": "1.1.11" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true + }, + "minipass": { + "version": "2.3.3", + "bundled": true, + "requires": { + "safe-buffer": "5.1.2", + "yallist": "3.0.2" + }, + "dependencies": { + "yallist": { + "version": "3.0.2", + "bundled": true + } + } + }, + "minizlib": { + "version": "1.1.1", + "bundled": true, + "requires": { + "minipass": "2.3.3" + } + }, + "mississippi": { + "version": "3.0.0", + "bundled": true, + "requires": { + "concat-stream": "1.6.2", + "duplexify": "3.6.0", + "end-of-stream": "1.4.1", + "flush-write-stream": "1.0.3", + "from2": "2.3.0", + "parallel-transform": "1.1.0", + "pump": "3.0.0", + "pumpify": "1.5.1", + "stream-each": "1.2.2", + "through2": "2.0.3" + } + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "requires": { + "minimist": "0.0.8" + } + }, + "move-concurrently": { + "version": "1.0.1", + "bundled": true, + "requires": { + "aproba": "1.2.0", + "copy-concurrently": "1.0.5", + "fs-write-stream-atomic": "1.0.10", + "mkdirp": "0.5.1", + "rimraf": "2.6.3", + "run-queue": "1.0.3" + }, + "dependencies": { + "aproba": { + "version": "1.2.0", + "bundled": true + } + } + }, + "ms": { + "version": "2.1.1", + "bundled": true + }, + "mute-stream": { + "version": "0.0.7", + "bundled": true + }, + "node-fetch-npm": { + "version": "2.0.2", + "bundled": true, + "requires": { + "encoding": "0.1.12", + "json-parse-better-errors": "1.0.2", + "safe-buffer": "5.1.2" + } + }, + "node-gyp": { + "version": "3.8.0", + "bundled": true, + "requires": { + "fstream": "1.0.11", + "glob": "7.1.3", + "graceful-fs": "4.1.15", + "mkdirp": "0.5.1", + "nopt": "3.0.6", + "npmlog": "4.1.2", + "osenv": "0.1.5", + "request": "2.88.0", + "rimraf": "2.6.3", + "semver": "5.3.0", + "tar": "2.2.1", + "which": "1.3.1" + }, + "dependencies": { + "nopt": { + "version": "3.0.6", + "bundled": true, + "requires": { + "abbrev": "1.1.1" + } + }, + "semver": { + "version": "5.3.0", + "bundled": true + }, + "tar": { + "version": "2.2.1", + "bundled": true, + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } + } + } + }, + "nopt": { + "version": "4.0.1", + "bundled": true, + "requires": { + "abbrev": "1.1.1", + "osenv": "0.1.5" + } + }, + "normalize-package-data": { + "version": "2.5.0", + "bundled": true, + "requires": { + "hosted-git-info": "2.7.1", + "resolve": "1.10.0", + "semver": "5.6.0", + "validate-npm-package-license": "3.0.4" + }, + "dependencies": { + "resolve": { + "version": "1.10.0", + "bundled": true, + "requires": { + "path-parse": "1.0.6" + } + } + } + }, + "npm-audit-report": { + "version": "1.3.2", + "bundled": true, + "requires": { + "cli-table3": "0.5.1", + "console-control-strings": "1.1.0" + } + }, + "npm-bundled": { + "version": "1.0.6", + "bundled": true + }, + "npm-cache-filename": { + "version": "1.0.2", + "bundled": true + }, + "npm-install-checks": { + "version": "3.0.0", + "bundled": true, + "requires": { + "semver": "5.6.0" + } + }, + "npm-lifecycle": { + "version": "2.1.0", + "bundled": true, + "requires": { + "byline": "5.0.0", + "graceful-fs": "4.1.15", + "node-gyp": "3.8.0", + "resolve-from": "4.0.0", + "slide": "1.1.6", + "uid-number": "0.0.6", + "umask": "1.1.0", + "which": "1.3.1" + } + }, + "npm-logical-tree": { + "version": "1.2.1", + "bundled": true + }, + "npm-package-arg": { + "version": "6.1.0", + "bundled": true, + "requires": { + "hosted-git-info": "2.7.1", + "osenv": "0.1.5", + "semver": "5.6.0", + "validate-npm-package-name": "3.0.0" + } + }, + "npm-packlist": { + "version": "1.4.1", + "bundled": true, + "requires": { + "ignore-walk": "3.0.1", + "npm-bundled": "1.0.6" + } + }, + "npm-pick-manifest": { + "version": "2.2.3", + "bundled": true, + "requires": { + "figgy-pudding": "3.5.1", + "npm-package-arg": "6.1.0", + "semver": "5.6.0" + } + }, + "npm-profile": { + "version": "4.0.1", + "bundled": true, + "requires": { + "aproba": "2.0.0", + "figgy-pudding": "3.5.1", + "npm-registry-fetch": "3.9.0" + } + }, + "npm-registry-fetch": { + "version": "3.9.0", + "bundled": true, + "requires": { + "JSONStream": "1.3.5", + "bluebird": "3.5.3", + "figgy-pudding": "3.5.1", + "lru-cache": "4.1.5", + "make-fetch-happen": "4.0.1", + "npm-package-arg": "6.1.0" + } + }, + "npm-run-path": { + "version": "2.0.2", + "bundled": true, + "requires": { + "path-key": "2.0.1" + } + }, + "npm-user-validate": { + "version": "1.0.0", + "bundled": true + }, + "npmlog": { + "version": "4.1.2", + "bundled": true, + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true + }, + "oauth-sign": { + "version": "0.9.0", + "bundled": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "opener": { + "version": "1.5.1", + "bundled": true + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true + }, + "os-locale": { + "version": "2.1.0", + "bundled": true, + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true + }, + "osenv": { + "version": "0.1.5", + "bundled": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "p-finally": { + "version": "1.0.0", + "bundled": true + }, + "p-limit": { + "version": "1.2.0", + "bundled": true, + "requires": { + "p-try": "1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "bundled": true, + "requires": { + "p-limit": "1.2.0" + } + }, + "p-try": { + "version": "1.0.0", + "bundled": true + }, + "package-json": { + "version": "4.0.1", + "bundled": true, + "requires": { + "got": "6.7.1", + "registry-auth-token": "3.3.2", + "registry-url": "3.1.0", + "semver": "5.6.0" + } + }, + "pacote": { + "version": "9.5.0", + "bundled": true, + "requires": { + "bluebird": "3.5.3", + "cacache": "11.3.2", + "figgy-pudding": "3.5.1", + "get-stream": "4.1.0", + "glob": "7.1.3", + "lru-cache": "5.1.1", + "make-fetch-happen": "4.0.1", + "minimatch": "3.0.4", + "minipass": "2.3.5", + "mississippi": "3.0.0", + "mkdirp": "0.5.1", + "normalize-package-data": "2.5.0", + "npm-package-arg": "6.1.0", + "npm-packlist": "1.4.1", + "npm-pick-manifest": "2.2.3", + "npm-registry-fetch": "3.9.0", + "osenv": "0.1.5", + "promise-inflight": "1.0.1", + "promise-retry": "1.1.1", + "protoduck": "5.0.1", + "rimraf": "2.6.3", + "safe-buffer": "5.1.2", + "semver": "5.6.0", + "ssri": "6.0.1", + "tar": "4.4.8", + "unique-filename": "1.1.1", + "which": "1.3.1" + }, + "dependencies": { + "lru-cache": { + "version": "5.1.1", + "bundled": true, + "requires": { + "yallist": "3.0.3" + } + }, + "minipass": { + "version": "2.3.5", + "bundled": true, + "requires": { + "safe-buffer": "5.1.2", + "yallist": "3.0.3" + } + }, + "yallist": { + "version": "3.0.3", + "bundled": true + } + } + }, + "parallel-transform": { + "version": "1.1.0", + "bundled": true, + "requires": { + "cyclist": "0.2.2", + "inherits": "2.0.3", + "readable-stream": "2.3.6" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "requires": { + "safe-buffer": "5.1.2" + } + } + } + }, + "path-exists": { + "version": "3.0.0", + "bundled": true + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true + }, + "path-is-inside": { + "version": "1.0.2", + "bundled": true + }, + "path-key": { + "version": "2.0.1", + "bundled": true + }, + "path-parse": { + "version": "1.0.6", + "bundled": true + }, + "performance-now": { + "version": "2.1.0", + "bundled": true + }, + "pify": { + "version": "3.0.0", + "bundled": true + }, + "prepend-http": { + "version": "1.0.4", + "bundled": true + }, + "process-nextick-args": { + "version": "2.0.0", + "bundled": true + }, + "promise-inflight": { + "version": "1.0.1", + "bundled": true + }, + "promise-retry": { + "version": "1.1.1", + "bundled": true, + "requires": { + "err-code": "1.1.2", + "retry": "0.10.1" + }, + "dependencies": { + "retry": { + "version": "0.10.1", + "bundled": true + } + } + }, + "promzard": { + "version": "0.3.0", + "bundled": true, + "requires": { + "read": "1.0.7" + } + }, + "proto-list": { + "version": "1.2.4", + "bundled": true + }, + "protoduck": { + "version": "5.0.1", + "bundled": true, + "requires": { + "genfun": "5.0.0" + } + }, + "prr": { + "version": "1.0.1", + "bundled": true + }, + "pseudomap": { + "version": "1.0.2", + "bundled": true + }, + "psl": { + "version": "1.1.29", + "bundled": true + }, + "pump": { + "version": "3.0.0", + "bundled": true, + "requires": { + "end-of-stream": "1.4.1", + "once": "1.4.0" + } + }, + "pumpify": { + "version": "1.5.1", + "bundled": true, + "requires": { + "duplexify": "3.6.0", + "inherits": "2.0.3", + "pump": "2.0.1" + }, + "dependencies": { + "pump": { + "version": "2.0.1", + "bundled": true, + "requires": { + "end-of-stream": "1.4.1", + "once": "1.4.0" + } + } + } + }, + "punycode": { + "version": "1.4.1", + "bundled": true + }, + "qrcode-terminal": { + "version": "0.12.0", + "bundled": true + }, + "qs": { + "version": "6.5.2", + "bundled": true + }, + "query-string": { + "version": "6.2.0", + "bundled": true, + "requires": { + "decode-uri-component": "0.2.0", + "strict-uri-encode": "2.0.0" + } + }, + "qw": { + "version": "1.0.1", + "bundled": true + }, + "rc": { + "version": "1.2.7", + "bundled": true, + "requires": { + "deep-extend": "0.5.1", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true + } + } + }, + "read": { + "version": "1.0.7", + "bundled": true, + "requires": { + "mute-stream": "0.0.7" + } + }, + "read-cmd-shim": { + "version": "1.0.1", + "bundled": true, + "requires": { + "graceful-fs": "4.1.15" + } + }, + "read-installed": { + "version": "4.0.3", + "bundled": true, + "requires": { + "debuglog": "1.0.1", + "graceful-fs": "4.1.15", + "read-package-json": "2.0.13", + "readdir-scoped-modules": "1.0.2", + "semver": "5.6.0", + "slide": "1.1.6", + "util-extend": "1.0.3" + } + }, + "read-package-json": { + "version": "2.0.13", + "bundled": true, + "requires": { + "glob": "7.1.3", + "graceful-fs": "4.1.15", + "json-parse-better-errors": "1.0.2", + "normalize-package-data": "2.5.0", + "slash": "1.0.0" + } + }, + "read-package-tree": { + "version": "5.2.2", + "bundled": true, + "requires": { + "debuglog": "1.0.1", + "dezalgo": "1.0.3", + "once": "1.4.0", + "read-package-json": "2.0.13", + "readdir-scoped-modules": "1.0.2" + } + }, + "readable-stream": { + "version": "3.1.1", + "bundled": true, + "requires": { + "inherits": "2.0.3", + "string_decoder": "1.2.0", + "util-deprecate": "1.0.2" + } + }, + "readdir-scoped-modules": { + "version": "1.0.2", + "bundled": true, + "requires": { + "debuglog": "1.0.1", + "dezalgo": "1.0.3", + "graceful-fs": "4.1.15", + "once": "1.4.0" + } + }, + "registry-auth-token": { + "version": "3.3.2", + "bundled": true, + "requires": { + "rc": "1.2.7", + "safe-buffer": "5.1.2" + } + }, + "registry-url": { + "version": "3.1.0", + "bundled": true, + "requires": { + "rc": "1.2.7" + } + }, + "request": { + "version": "2.88.0", + "bundled": true, + "requires": { + "aws-sign2": "0.7.0", + "aws4": "1.8.0", + "caseless": "0.12.0", + "combined-stream": "1.0.6", + "extend": "3.0.2", + "forever-agent": "0.6.1", + "form-data": "2.3.2", + "har-validator": "5.1.0", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.19", + "oauth-sign": "0.9.0", + "performance-now": "2.1.0", + "qs": "6.5.2", + "safe-buffer": "5.1.2", + "tough-cookie": "2.4.3", + "tunnel-agent": "0.6.0", + "uuid": "3.3.2" + } + }, + "require-directory": { + "version": "2.1.1", + "bundled": true + }, + "require-main-filename": { + "version": "1.0.1", + "bundled": true + }, + "resolve-from": { + "version": "4.0.0", + "bundled": true + }, + "retry": { + "version": "0.12.0", + "bundled": true + }, + "rimraf": { + "version": "2.6.3", + "bundled": true, + "requires": { + "glob": "7.1.3" + } + }, + "run-queue": { + "version": "1.0.3", + "bundled": true, + "requires": { + "aproba": "1.2.0" + }, + "dependencies": { + "aproba": { + "version": "1.2.0", + "bundled": true + } + } + }, + "safe-buffer": { + "version": "5.1.2", + "bundled": true + }, + "safer-buffer": { + "version": "2.1.2", + "bundled": true + }, + "semver": { + "version": "5.6.0", + "bundled": true + }, + "semver-diff": { + "version": "2.1.0", + "bundled": true, + "requires": { + "semver": "5.6.0" + } + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true + }, + "sha": { + "version": "2.0.1", + "bundled": true, + "requires": { + "graceful-fs": "4.1.15", + "readable-stream": "2.3.6" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "requires": { + "safe-buffer": "5.1.2" + } + } + } + }, + "shebang-command": { + "version": "1.2.0", + "bundled": true, + "requires": { + "shebang-regex": "1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "bundled": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true + }, + "slash": { + "version": "1.0.0", + "bundled": true + }, + "slide": { + "version": "1.1.6", + "bundled": true + }, + "smart-buffer": { + "version": "4.0.1", + "bundled": true + }, + "socks": { + "version": "2.2.0", + "bundled": true, + "requires": { + "ip": "1.1.5", + "smart-buffer": "4.0.1" + } + }, + "socks-proxy-agent": { + "version": "4.0.1", + "bundled": true, + "requires": { + "agent-base": "4.2.1", + "socks": "2.2.0" + } + }, + "sorted-object": { + "version": "2.0.1", + "bundled": true + }, + "sorted-union-stream": { + "version": "2.1.3", + "bundled": true, + "requires": { + "from2": "1.3.0", + "stream-iterate": "1.2.0" + }, + "dependencies": { + "from2": { + "version": "1.3.0", + "bundled": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "1.1.14" + } + }, + "isarray": { + "version": "0.0.1", + "bundled": true + }, + "readable-stream": { + "version": "1.1.14", + "bundled": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "bundled": true + } + } + }, + "spdx-correct": { + "version": "3.0.0", + "bundled": true, + "requires": { + "spdx-expression-parse": "3.0.0", + "spdx-license-ids": "3.0.3" + } + }, + "spdx-exceptions": { + "version": "2.1.0", + "bundled": true + }, + "spdx-expression-parse": { + "version": "3.0.0", + "bundled": true, + "requires": { + "spdx-exceptions": "2.1.0", + "spdx-license-ids": "3.0.3" + } + }, + "spdx-license-ids": { + "version": "3.0.3", + "bundled": true + }, + "sshpk": { + "version": "1.14.2", + "bundled": true, + "requires": { + "asn1": "0.2.4", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.2", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.2", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "safer-buffer": "2.1.2", + "tweetnacl": "0.14.5" + } + }, + "ssri": { + "version": "6.0.1", + "bundled": true, + "requires": { + "figgy-pudding": "3.5.1" + } + }, + "stream-each": { + "version": "1.2.2", + "bundled": true, + "requires": { + "end-of-stream": "1.4.1", + "stream-shift": "1.0.0" + } + }, + "stream-iterate": { + "version": "1.2.0", + "bundled": true, + "requires": { + "readable-stream": "2.3.6", + "stream-shift": "1.0.0" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "requires": { + "safe-buffer": "5.1.2" + } + } + } + }, + "stream-shift": { + "version": "1.0.0", + "bundled": true + }, + "strict-uri-encode": { + "version": "2.0.0", + "bundled": true + }, + "string-width": { + "version": "2.1.1", + "bundled": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "bundled": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "bundled": true + }, + "strip-ansi": { + "version": "4.0.0", + "bundled": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "string_decoder": { + "version": "1.2.0", + "bundled": true, + "requires": { + "safe-buffer": "5.1.2" + } + }, + "stringify-package": { + "version": "1.0.0", + "bundled": true + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-eof": { + "version": "1.0.0", + "bundled": true + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true + }, + "supports-color": { + "version": "5.4.0", + "bundled": true, + "requires": { + "has-flag": "3.0.0" + } + }, + "tar": { + "version": "4.4.8", + "bundled": true, + "requires": { + "chownr": "1.1.1", + "fs-minipass": "1.2.5", + "minipass": "2.3.5", + "minizlib": "1.1.1", + "mkdirp": "0.5.1", + "safe-buffer": "5.1.2", + "yallist": "3.0.3" + }, + "dependencies": { + "chownr": { + "version": "1.1.1", + "bundled": true + }, + "minipass": { + "version": "2.3.5", + "bundled": true, + "requires": { + "safe-buffer": "5.1.2", + "yallist": "3.0.3" + } + }, + "yallist": { + "version": "3.0.3", + "bundled": true + } + } + }, + "term-size": { + "version": "1.2.0", + "bundled": true, + "requires": { + "execa": "0.7.0" + } + }, + "text-table": { + "version": "0.2.0", + "bundled": true + }, + "through": { + "version": "2.3.8", + "bundled": true + }, + "through2": { + "version": "2.0.3", + "bundled": true, + "requires": { + "readable-stream": "2.3.6", + "xtend": "4.0.1" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "requires": { + "safe-buffer": "5.1.2" + } + } + } + }, + "timed-out": { + "version": "4.0.1", + "bundled": true + }, + "tiny-relative-date": { + "version": "1.3.0", + "bundled": true + }, + "tough-cookie": { + "version": "2.4.3", + "bundled": true, + "requires": { + "psl": "1.1.29", + "punycode": "1.4.1" + } + }, + "tunnel-agent": { + "version": "0.6.0", + "bundled": true, + "requires": { + "safe-buffer": "5.1.2" + } + }, + "tweetnacl": { + "version": "0.14.5", + "bundled": true, + "optional": true + }, + "typedarray": { + "version": "0.0.6", + "bundled": true + }, + "uid-number": { + "version": "0.0.6", + "bundled": true + }, + "umask": { + "version": "1.1.0", + "bundled": true + }, + "unique-filename": { + "version": "1.1.1", + "bundled": true, + "requires": { + "unique-slug": "2.0.0" + } + }, + "unique-slug": { + "version": "2.0.0", + "bundled": true, + "requires": { + "imurmurhash": "0.1.4" + } + }, + "unique-string": { + "version": "1.0.0", + "bundled": true, + "requires": { + "crypto-random-string": "1.0.0" + } + }, + "unpipe": { + "version": "1.0.0", + "bundled": true + }, + "unzip-response": { + "version": "2.0.1", + "bundled": true + }, + "update-notifier": { + "version": "2.5.0", + "bundled": true, + "requires": { + "boxen": "1.3.0", + "chalk": "2.4.1", + "configstore": "3.1.2", + "import-lazy": "2.1.0", + "is-ci": "1.1.0", + "is-installed-globally": "0.1.0", + "is-npm": "1.0.0", + "latest-version": "3.1.0", + "semver-diff": "2.1.0", + "xdg-basedir": "3.0.0" + } + }, + "url-parse-lax": { + "version": "1.0.0", + "bundled": true, + "requires": { + "prepend-http": "1.0.4" + } + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true + }, + "util-extend": { + "version": "1.0.3", + "bundled": true + }, + "uuid": { + "version": "3.3.2", + "bundled": true + }, + "validate-npm-package-license": { + "version": "3.0.4", + "bundled": true, + "requires": { + "spdx-correct": "3.0.0", + "spdx-expression-parse": "3.0.0" + } + }, + "validate-npm-package-name": { + "version": "3.0.0", + "bundled": true, + "requires": { + "builtins": "1.0.3" + } + }, + "verror": { + "version": "1.10.0", + "bundled": true, + "requires": { + "assert-plus": "1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "1.3.0" + } + }, + "wcwidth": { + "version": "1.0.1", + "bundled": true, + "requires": { + "defaults": "1.0.3" + } + }, + "which": { + "version": "1.3.1", + "bundled": true, + "requires": { + "isexe": "2.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "bundled": true + }, + "wide-align": { + "version": "1.1.2", + "bundled": true, + "requires": { + "string-width": "1.0.2" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "bundled": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + } + } + }, + "widest-line": { + "version": "2.0.0", + "bundled": true, + "requires": { + "string-width": "2.1.1" + } + }, + "worker-farm": { + "version": "1.6.0", + "bundled": true, + "requires": { + "errno": "0.1.7" + } + }, + "wrap-ansi": { + "version": "2.1.0", + "bundled": true, + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1" + }, + "dependencies": { + "string-width": { + "version": "1.0.2", + "bundled": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + } + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true + }, + "write-file-atomic": { + "version": "2.4.2", + "bundled": true, + "requires": { + "graceful-fs": "4.1.15", + "imurmurhash": "0.1.4", + "signal-exit": "3.0.2" + } + }, + "xdg-basedir": { + "version": "3.0.0", + "bundled": true + }, + "xtend": { + "version": "4.0.1", + "bundled": true + }, + "y18n": { + "version": "4.0.0", + "bundled": true + }, + "yallist": { + "version": "2.1.2", + "bundled": true + }, + "yargs": { + "version": "11.0.0", + "bundled": true, + "requires": { + "cliui": "4.1.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "9.0.2" + }, + "dependencies": { + "y18n": { + "version": "3.2.1", + "bundled": true + } + } + }, + "yargs-parser": { + "version": "9.0.2", + "bundled": true, + "requires": { + "camelcase": "4.1.0" + } + } + } + }, + "oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "os-browserify": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", + "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", + "dev": true + }, + "pako": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz", + "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==", + "dev": true + }, + "parents": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz", + "integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=", + "dev": true, + "requires": { + "path-platform": "0.11.15" + } + }, + "parse-asn1": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz", + "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==", + "dev": true, + "requires": { + "asn1.js": "4.10.1", + "browserify-aes": "1.2.0", + "create-hash": "1.2.0", + "evp_bytestokey": "1.0.3", + "pbkdf2": "3.0.17", + "safe-buffer": "5.1.2" + }, + "dependencies": { + "asn1.js": { + "version": "4.10.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", + "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "inherits": "2.0.3", + "minimalistic-assert": "1.0.1" + } + } + } + }, + "path-browserify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz", + "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, - "node-fetch": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.3.0.tgz", - "integrity": "sha512-MOd8pV3fxENbryESLgVIeaGKrdl+uaYhCSSVkjeOb/31/njTpcis5aWfdqgNlHIrKOLRbMnfPINPOML2CIFeXA==" + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "dev": true }, - "node-forge": { - "version": "0.7.6", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.6.tgz", - "integrity": "sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw==" + "path-platform": { + "version": "0.11.15", + "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz", + "integrity": "sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I=", + "dev": true }, - "node-releases": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.6.tgz", - "integrity": "sha512-lODUVHEIZutZx+TDdOk47qLik8FJMXzJ+WnyUGci1MTvTOyzZrz5eVPIIpc5Hb3NfHZGeGHeuwrRYVI1PEITWg==", + "pbkdf2": { + "version": "3.0.17", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz", + "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==", "dev": true, "requires": { - "semver": "5.6.0" + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "ripemd160": "2.0.2", + "safe-buffer": "5.1.2", + "sha.js": "2.4.11" } }, - "node-rsa": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/node-rsa/-/node-rsa-0.4.2.tgz", - "integrity": "sha1-1jkXKewWqDDtWjgEKzFX0tXXJTA=", + "pem-jwk": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/pem-jwk/-/pem-jwk-1.5.1.tgz", + "integrity": "sha1-eoY3/S9nqCflfAxC4cI8P9Us+wE=", "requires": { - "asn1": "0.2.3" - }, - "dependencies": { - "asn1": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", - "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" - } + "asn1.js": "1.0.3" } }, +======= "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -2590,6 +6903,7 @@ } } }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", @@ -2615,8 +6929,12 @@ "process-nextick-args": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", +<<<<<<< HEAD + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" +======= "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "dev": true +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b }, "psl": { "version": "1.1.31", @@ -2632,6 +6950,13 @@ "bn.js": "4.11.8", "browserify-rsa": "4.0.1", "create-hash": "1.2.0", +<<<<<<< HEAD + "parse-asn1": "5.1.4", + "randombytes": "2.1.0", + "safe-buffer": "5.1.2" + } + }, +======= "parse-asn1": "5.1.3", "randombytes": "2.0.6", "safe-buffer": "5.1.2" @@ -2647,6 +6972,7 @@ "once": "1.4.0" } }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", @@ -2670,9 +6996,15 @@ "dev": true }, "randombytes": { +<<<<<<< HEAD + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", +======= "version": "2.0.6", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz", "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true, "requires": { "safe-buffer": "5.1.2" @@ -2684,11 +7016,29 @@ "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", "dev": true, "requires": { +<<<<<<< HEAD + "randombytes": "2.1.0", +======= "randombytes": "2.0.6", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "safe-buffer": "5.1.2" } }, "rdf-canonize": { +<<<<<<< HEAD + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/rdf-canonize/-/rdf-canonize-1.0.3.tgz", + "integrity": "sha512-piLMOB5Q6LJSVx2XzmdpHktYVb8TmVTy8coXJBFtdkcMC96DknZOuzpAYqCWx2ERZX7xEW+mMi8/wDuMJS/95w==", + "requires": { + "node-forge": "0.8.3", + "semver": "5.7.0" + } + }, + "rdflib": { + "version": "0.20.1", + "resolved": "https://registry.npmjs.org/rdflib/-/rdflib-0.20.1.tgz", + "integrity": "sha512-5G1t7rURqPdsYE+mjpDW2e9/H19XFMuChTIjPFPtH2tI0fma+xlJYwrSgmd1aOm45SOYKpqwJfTSIvFpmP2n+g==", +======= "version": "1.0.1", "resolved": "https://registry.npmjs.org/rdf-canonize/-/rdf-canonize-1.0.1.tgz", "integrity": "sha512-vQq6q7BIUwrVQijKRYdunxlodkn0Btjv2MnJ4S3rOUELsghq7fGuDaWuqBNbXca3KRbcRS6HwTIT2hJbJej2UA==", @@ -2701,11 +7051,17 @@ "version": "0.19.1", "resolved": "https://registry.npmjs.org/rdflib/-/rdflib-0.19.1.tgz", "integrity": "sha512-O7osObhO5o++hsUPGOLTxdNwXRaI6O+uyL98E7yBmqWrQm0AfqUHFBiASb4gN9fYcLD2LLHBxfhJTIWl8VZHUg==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "requires": { "async": "0.9.2", "jsonld": "0.4.12", "n3": "0.4.5", +<<<<<<< HEAD + "solid-auth-cli": "0.1.13", + "solid-auth-client": "2.3.0", +======= "solid-auth-client": "2.2.14", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "xmldom": "0.1.27" } }, @@ -2716,6 +7072,58 @@ "dev": true, "requires": { "readable-stream": "2.3.6" +<<<<<<< HEAD + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "5.1.2" + } + } + } + }, + "readable-error": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/readable-error/-/readable-error-1.0.0.tgz", + "integrity": "sha512-CLnInu5bUphmFiZ3pD/BC6+Cg4/BzK6ZMvWfd0b2QMzYo159Z/f/nVFQ9L5IeMrqUxy0EFsp3XJ+BRfLfY13IQ==", + "requires": { + "readable-stream": "2.3.6" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, +======= } }, "readable-stream": { @@ -2733,21 +7141,37 @@ "util-deprecate": "1.0.2" }, "dependencies": { +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "requires": { "safe-buffer": "5.1.2" } } } }, +<<<<<<< HEAD + "readable-stream": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz", + "integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==", + "requires": { + "inherits": "2.0.3", + "string_decoder": "1.2.0", + "util-deprecate": "1.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=" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b }, "regenerate": { "version": "1.4.0", @@ -2756,15 +7180,31 @@ "dev": true }, "regenerate-unicode-properties": { +<<<<<<< HEAD + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz", + "integrity": "sha512-SbA/iNrBUf6Pv2zU8Ekv1Qbhv92yxL4hiDa2siuxs4KKn4oOoMDHXjAf7+Nz9qinUQ46B1LcWEi/PhJfPWpZWQ==", +======= "version": "7.0.0", "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz", "integrity": "sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true, "requires": { "regenerate": "1.4.0" } }, "regenerator-runtime": { +<<<<<<< HEAD + "version": "0.13.2", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz", + "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==" + }, + "regenerator-transform": { + "version": "0.13.4", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.4.tgz", + "integrity": "sha512-T0QMBjK3J0MtxjPmdIMXm72Wvj2Abb0Bd4HADdfijwMdoIsyQZ6fWC7kDFhk2YinBBEMZDL7Y7wh0J1sGx3S4A==", +======= "version": "0.12.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz", "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==" @@ -2773,12 +7213,32 @@ "version": "0.13.3", "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.3.tgz", "integrity": "sha512-5ipTrZFSq5vU2YoGoww4uaRVAK4wyYC4TSICibbfEPOruUu8FFP7ErV0BjmbIOEpn3O/k9na9UEdYR/3m7N6uA==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true, "requires": { "private": "0.1.8" } }, "regexp-tree": { +<<<<<<< HEAD + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.6.tgz", + "integrity": "sha512-LFrA98Dw/heXqDojz7qKFdygZmFoiVlvE1Zp7Cq2cvF+ZA+03Gmhy0k0PQlsC1jvHPiTUSs+pDHEuSWv6+6D7w==", + "dev": true + }, + "regexpu-core": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz", + "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==", + "dev": true, + "requires": { + "regenerate": "1.4.0", + "regenerate-unicode-properties": "8.0.2", + "regjsgen": "0.5.0", + "regjsparser": "0.6.0", + "unicode-match-property-ecmascript": "1.0.4", + "unicode-match-property-value-ecmascript": "1.1.0" +======= "version": "0.1.1", "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.1.tgz", "integrity": "sha512-HwRjOquc9QOwKTgbxvZTcddS5mlNlwePMQ3NFL8broajMLD5CXDAqas8Y5yxJH5QtZp5iRor3YCILd5pz71Cgw==", @@ -2801,6 +7261,7 @@ "regjsparser": "0.6.0", "unicode-match-property-ecmascript": "1.0.4", "unicode-match-property-value-ecmascript": "1.0.2" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "regjsgen": { @@ -2834,7 +7295,11 @@ "aws-sign2": "0.7.0", "aws4": "1.8.0", "caseless": "0.12.0", +<<<<<<< HEAD + "combined-stream": "1.0.8", +======= "combined-stream": "1.0.7", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "extend": "3.0.2", "forever-agent": "0.6.1", "form-data": "2.3.3", @@ -2843,7 +7308,11 @@ "is-typedarray": "1.0.0", "isstream": "0.1.2", "json-stringify-safe": "5.0.1", +<<<<<<< HEAD + "mime-types": "2.1.24", +======= "mime-types": "2.1.21", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "oauth-sign": "0.9.0", "performance-now": "2.1.0", "qs": "6.5.2", @@ -2853,6 +7322,8 @@ "uuid": "3.3.2" } }, +<<<<<<< HEAD +======= "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -2865,6 +7336,7 @@ "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", "dev": true }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "resolve": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz", @@ -2895,6 +7367,11 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "semver": { +<<<<<<< HEAD + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==" +======= "version": "5.6.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" @@ -2904,6 +7381,7 @@ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b }, "sha.js": { "version": "2.4.11", @@ -2925,6 +7403,8 @@ "sha.js": "2.4.11" } }, +<<<<<<< HEAD +======= "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", @@ -2940,6 +7420,7 @@ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", "dev": true }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "shell-quote": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz", @@ -2952,12 +7433,15 @@ "jsonify": "0.0.0" } }, +<<<<<<< HEAD +======= "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "simple-concat": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz", @@ -2965,6 +7449,25 @@ "dev": true }, "solid-auth-cli": { +<<<<<<< HEAD + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/solid-auth-cli/-/solid-auth-cli-0.1.13.tgz", + "integrity": "sha512-mRZ4eaWniGd9jLRzSWD3n9EwMfTcmwlfXK5MggIzSQOyXa1XJCWxHnJDL0DWTX5sMi1ovYa6RI4u6TNOzsEZiw==", + "requires": { + "@solid/cli": "0.1.0", + "async": "2.6.2", + "file-fetch": "1.2.0", + "fs": "0.0.1-security", + "isomorphic-fetch": "2.2.1", + "jsonld": "1.6.1", + "n3": "1.1.1" + }, + "dependencies": { + "async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz", + "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", +======= "version": "0.1.8", "resolved": "https://registry.npmjs.org/solid-auth-cli/-/solid-auth-cli-0.1.8.tgz", "integrity": "sha512-CCKpNZnQOE1ACRkfgNdfzHLGnVSl/tqeWEQ3hFaHEPZ+26DORIq+pDYtv3rNJ6B2aQxp9OMQDxRbDDmZaxe0xw==", @@ -2981,11 +7484,21 @@ "version": "2.6.1", "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "requires": { "lodash": "4.17.11" } }, "jsonld": { +<<<<<<< HEAD + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/jsonld/-/jsonld-1.6.1.tgz", + "integrity": "sha512-4J5ilGTk+rAvAChbADruqFLcZ52b0aoMLL7xtyCVEmoIbyaPtwO4rOlQ/VczqhcrDvzxHflpDBdVi37LpALpXg==", + "requires": { + "rdf-canonize": "1.0.3", + "request": "2.88.0", + "semver": "5.7.0", +======= "version": "1.5.0", "resolved": "https://registry.npmjs.org/jsonld/-/jsonld-1.5.0.tgz", "integrity": "sha512-7jF9WXK4nuHvhz/qT6A4DEZ58tUYgrV98xBJEgHFhQ6GQaNT+oU1zqkFXKtDZsKsiEs/1K/VShNnat6SISb3jg==", @@ -2993,13 +7506,20 @@ "rdf-canonize": "1.0.1", "request": "2.88.0", "semver": "5.6.0", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "xmldom": "0.1.19" } }, "n3": { +<<<<<<< HEAD + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/n3/-/n3-1.1.1.tgz", + "integrity": "sha512-GEJXn+wc0f4l2noP1N/rMUH9Gei1DQ8IDN03eBsH+uQKkNQUOLgL7ZJVaDjY+pP3LmbLxL1LpUg/AvZ7Kc7KVw==" +======= "version": "1.0.3", "resolved": "https://registry.npmjs.org/n3/-/n3-1.0.3.tgz", "integrity": "sha512-IdcCNqb/1gj9fX63hoVEn3/Z1u9iLJiYLSpesmqT3+5UrxcYG5YldUP6T2okNRZKzyVdqz+I0PExGkWkz9gcZw==" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b }, "xmldom": { "version": "0.1.19", @@ -3009,6 +7529,16 @@ } }, "solid-auth-client": { +<<<<<<< HEAD + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/solid-auth-client/-/solid-auth-client-2.3.0.tgz", + "integrity": "sha512-+9RfqC64oWpH4afoWYhCtieuAziFyWiiW/isB9XEV6N+yb2jZ69UCJxpX7iBCpxK0j36bDeisdbp0zHRp/F46A==", + "requires": { + "@babel/runtime": "7.4.4", + "@solid/oidc-rp": "0.8.0", + "auth-header": "1.0.0", + "commander": "2.20.0", +======= "version": "2.2.14", "resolved": "https://registry.npmjs.org/solid-auth-client/-/solid-auth-client-2.2.14.tgz", "integrity": "sha512-gv8NrNrdg1VFZlzxLydRrztcSNlG0ArZdQe5DZQ5+/SXcgVyZSxpmo+ZkagKLRrIBwH0u/SGNzURpNLnxYmC+Q==", @@ -3017,10 +7547,64 @@ "@solid/oidc-rp": "0.8.0", "auth-header": "1.0.0", "commander": "2.19.0", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "isomorphic-fetch": "2.2.1" } }, "solid-file-client": { +<<<<<<< HEAD + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/solid-file-client/-/solid-file-client-0.5.1.tgz", + "integrity": "sha512-WdLu2loMjjCDDHEn84FtEovA6Qs1998RFWTyPrsTWrwoEyIJ8/xObIHEaJ2uxOwDe6aP1QwHmYFzpMw6A69DZg==", + "requires": { + "rdflib": "0.20.1", + "solid-auth-cli": "0.2.3", + "solid-auth-client": "2.3.0" + }, + "dependencies": { + "async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz", + "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", + "requires": { + "lodash": "4.17.11" + } + }, + "jsonld": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/jsonld/-/jsonld-1.6.1.tgz", + "integrity": "sha512-4J5ilGTk+rAvAChbADruqFLcZ52b0aoMLL7xtyCVEmoIbyaPtwO4rOlQ/VczqhcrDvzxHflpDBdVi37LpALpXg==", + "requires": { + "rdf-canonize": "1.0.3", + "request": "2.88.0", + "semver": "5.7.0", + "xmldom": "0.1.19" + } + }, + "n3": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/n3/-/n3-1.1.1.tgz", + "integrity": "sha512-GEJXn+wc0f4l2noP1N/rMUH9Gei1DQ8IDN03eBsH+uQKkNQUOLgL7ZJVaDjY+pP3LmbLxL1LpUg/AvZ7Kc7KVw==" + }, + "solid-auth-cli": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/solid-auth-cli/-/solid-auth-cli-0.2.3.tgz", + "integrity": "sha512-PJd0pmwKFgon1hPngsoFxM0OPZOrJoVPdsvG+TgIHSlRbYimXJFIgMBCezhQQqkjaE+Sa0TaU0dtVmSU7yfyfA==", + "requires": { + "@solid/cli": "0.1.0", + "async": "2.6.2", + "isomorphic-fetch": "2.2.1", + "jsonld": "1.6.1", + "n3": "1.1.1", + "solid-rest-file": "0.0.5" + } + }, + "xmldom": { + "version": "0.1.19", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz", + "integrity": "sha1-Yx/Ad3bv2EEYvyUXGzftTQdaCrw=" + } +======= "version": "0.4.9", "resolved": "https://registry.npmjs.org/solid-file-client/-/solid-file-client-0.4.9.tgz", "integrity": "sha512-/4KmS52APjvIVea+nWD3spUYiPmq5gE/ze8fP2XufwrTXST3Oh+rRj2zjfQyhFcVXwhrV++MrUcTY/YId/kqwg==", @@ -3028,6 +7612,7 @@ "rdflib": "0.19.1", "solid-auth-cli": "0.1.8", "solid-auth-client": "2.2.14" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "solid-file-widget": { @@ -3035,6 +7620,26 @@ "resolved": "https://registry.npmjs.org/solid-file-widget/-/solid-file-widget-0.4.1.tgz", "integrity": "sha512-vzrfadaxbWLwqvKNmYgWoCt/vXmLNhHLzIFREeHNM7VFJvEKQoU0YofbtucN1CzNa9bMBfWZyR0LSdf3qLkgZQ==" }, +<<<<<<< HEAD + "solid-rest-file": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/solid-rest-file/-/solid-rest-file-0.0.5.tgz", + "integrity": "sha512-0UmtKlE2+4T8EcTE2Fi4x88H3E5glryjgFtjyMYKmHDbDIUkEELIu7UiBbIRuuNlXPKu3dqfRyrR2hFpv/l4Iw==", + "requires": { + "concat-stream": "2.0.0", + "mime-types": "2.1.24", + "node-fetch": "2.6.0" + }, + "dependencies": { + "node-fetch": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" + } + } + }, +======= +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", @@ -3078,6 +7683,35 @@ "requires": { "inherits": "2.0.3", "readable-stream": "2.3.6" +<<<<<<< HEAD + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "5.1.2" + } + } +======= +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "stream-combiner2": { @@ -3088,6 +7722,35 @@ "requires": { "duplexer2": "0.1.4", "readable-stream": "2.3.6" +<<<<<<< HEAD + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "5.1.2" + } + } +======= +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "stream-http": { @@ -3101,6 +7764,35 @@ "readable-stream": "2.3.6", "to-arraybuffer": "1.0.1", "xtend": "4.0.1" +<<<<<<< HEAD + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "5.1.2" + } + } +======= +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "stream-splicer": { @@ -3111,6 +7803,34 @@ "requires": { "inherits": "2.0.3", "readable-stream": "2.3.6" +<<<<<<< HEAD + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "5.1.2" + } + } +======= } }, "string-width": { @@ -3121,17 +7841,23 @@ "requires": { "is-fullwidth-code-point": "2.0.0", "strip-ansi": "4.0.0" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "string_decoder": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz", "integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==", +<<<<<<< HEAD +======= "dev": true, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "requires": { "safe-buffer": "5.1.2" } }, +<<<<<<< HEAD +======= "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", @@ -3147,6 +7873,7 @@ "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "subarg": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz", @@ -3193,6 +7920,35 @@ "requires": { "readable-stream": "2.3.6", "xtend": "4.0.1" +<<<<<<< HEAD + }, + "dependencies": { + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "5.1.2" + } + } +======= +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } }, "timers-browserify": { @@ -3268,8 +8024,12 @@ "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", +<<<<<<< HEAD + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" +======= "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", "dev": true +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b }, "umd": { "version": "3.0.3", @@ -3278,12 +8038,22 @@ "dev": true }, "undeclared-identifiers": { +<<<<<<< HEAD + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz", + "integrity": "sha512-pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw==", + "dev": true, + "requires": { + "acorn-node": "1.6.2", + "dash-ast": "1.0.0", +======= "version": "1.1.2", "resolved": "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.2.tgz", "integrity": "sha512-13EaeocO4edF/3JKime9rD7oB6QI8llAGhgn5fKOPyfkJbRb6NFv9pYV6dFEmpa4uRjKeBqLZP8GpuzqHlKDMQ==", "dev": true, "requires": { "acorn-node": "1.6.2", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "get-assigned-identifiers": "1.2.0", "simple-concat": "1.0.0", "xtend": "4.0.1" @@ -3302,6 +8072,21 @@ "dev": true, "requires": { "unicode-canonical-property-names-ecmascript": "1.0.4", +<<<<<<< HEAD + "unicode-property-aliases-ecmascript": "1.0.5" + } + }, + "unicode-match-property-value-ecmascript": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz", + "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==", + "dev": true + }, + "unicode-property-aliases-ecmascript": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz", + "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==", +======= "unicode-property-aliases-ecmascript": "1.0.4" } }, @@ -3315,6 +8100,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz", "integrity": "sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "dev": true }, "uri-js": { @@ -3355,8 +8141,12 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", +<<<<<<< HEAD + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" +======= "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b }, "uuid": { "version": "3.3.2", @@ -3399,6 +8189,8 @@ "webidl-conversions": "4.0.2" } }, +<<<<<<< HEAD +======= "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", @@ -3461,6 +8253,7 @@ } } }, +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -3477,6 +8270,8 @@ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", "dev": true +<<<<<<< HEAD +======= }, "y18n": { "version": "4.0.0", @@ -3513,6 +8308,7 @@ "camelcase": "5.0.0", "decamelize": "1.2.0" } +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } } } diff --git a/package.json b/package.json index 419cd7b..e5e5634 100644 --- a/package.json +++ b/package.json @@ -1,21 +1,44 @@ { + "name": "Tiddlywiki-node-solid-server", + "version": "0.2.0", + "main": "main.js", "dependencies": { +<<<<<<< HEAD + "npm": "^6.9.0", + "rdflib": "^0.20.1", + "solid-auth-client": "^2.3.0", + "solid-file-client": "^0.5.1", + "solid-file-widget": "^0.4.0" +======= "solid-file-client": "^0.4.8", "solid-file-widget": "^0.4.1" }, "peerDependencies": { "solid-auth-client": "^2.2.14", "rdflib": "^0.19.1" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b }, + "peerDependencies": {}, "devDependencies": { +<<<<<<< HEAD + "@babel/core": "^7.4.4", + "@babel/plugin-transform-flow-strip-types": "^7.4.4", + "@babel/plugin-transform-runtime": "^7.4.3", + "@babel/preset-env": "^7.4.4", +======= "@babel/core": "^7.2.2", "@babel/plugin-transform-flow-strip-types": "^7.2.3", "@babel/plugin-transform-runtime": "^7.2.0", "@babel/preset-env": "^7.2.3", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "babelify": "^10.0.0", "browserify": "^16.1.0" }, "scripts": { +<<<<<<< HEAD + "build": "browserify -i null --standalone _ main.js -o /volume1/homes/admin/TW5/plugins/bourgeoa/nodesolidserver/main.js -t babelify && cp about.tid config.tid plugin.info ../nodesolidserver/" +======= "build": "browserify --standalone _ main.js -o /volume1/homes/admin/TW5/plugins/bourgeoa/nodesolidserver/main.js -t babelify && cp about.tid config.tid plugin.info ../nodesolidserver/" +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b } } diff --git a/plugin.info b/plugin.info index 8965220..eb65955 100644 --- a/plugin.info +++ b/plugin.info @@ -2,7 +2,11 @@ "title": "$:/plugins/bourgeoa/nodesolidserver", "description": "nodesolidserver syncadaptor", "author": "bourgeoa", +<<<<<<< HEAD + "version": "0.2.0", +======= "version": "0.1.0", +>>>>>>> 33cc34a74f13f68f7a5e04e5f08bf2952e680e1b "core-version": ">=5.0.8", "source": "https://github.com/bourgeoa/tiddlywiki-node-solid-server", "plugin-type": "plugin"