|
|
@ -3196,9 +3196,9 @@ |
|
|
|
"dev": true |
|
|
|
"dev": true |
|
|
|
}, |
|
|
|
}, |
|
|
|
"@fortawesome/fontawesome-common-types": { |
|
|
|
"@fortawesome/fontawesome-common-types": { |
|
|
|
"version": "0.2.29", |
|
|
|
"version": "0.2.32", |
|
|
|
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.29.tgz", |
|
|
|
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.32.tgz", |
|
|
|
"integrity": "sha512-cY+QfDTbZ7XVxzx7jxbC98Oxr/zc7R2QpTLqTxqlfyXDrAJjzi/xUIqAUsygELB62JIrbsWxtSRhayKFkGI7MA==", |
|
|
|
"integrity": "sha512-ux2EDjKMpcdHBVLi/eWZynnPxs0BtFVXJkgHIxXRl+9ZFaHPvYamAfCzeeQFqHRjuJtX90wVnMRaMQAAlctz3w==", |
|
|
|
"dev": true |
|
|
|
"dev": true |
|
|
|
}, |
|
|
|
}, |
|
|
|
"@fortawesome/fontawesome-free": { |
|
|
|
"@fortawesome/fontawesome-free": { |
|
|
@ -3208,21 +3208,21 @@ |
|
|
|
"dev": true |
|
|
|
"dev": true |
|
|
|
}, |
|
|
|
}, |
|
|
|
"@fortawesome/fontawesome-svg-core": { |
|
|
|
"@fortawesome/fontawesome-svg-core": { |
|
|
|
"version": "1.2.29", |
|
|
|
"version": "1.2.32", |
|
|
|
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.29.tgz", |
|
|
|
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.32.tgz", |
|
|
|
"integrity": "sha512-xmPmP2t8qrdo8RyKihTkGb09RnZoc+7HFBCnr0/6ZhStdGDSLeEd7ajV181+2W29NWIFfylO13rU+s3fpy3cnA==", |
|
|
|
"integrity": "sha512-XjqyeLCsR/c/usUpdWcOdVtWFVjPbDFBTQkn2fQRrWhhUoxriQohO2RWDxLyUM8XpD+Zzg5xwJ8gqTYGDLeGaQ==", |
|
|
|
"dev": true, |
|
|
|
"dev": true, |
|
|
|
"requires": { |
|
|
|
"requires": { |
|
|
|
"@fortawesome/fontawesome-common-types": "^0.2.29" |
|
|
|
"@fortawesome/fontawesome-common-types": "^0.2.32" |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
"@fortawesome/free-solid-svg-icons": { |
|
|
|
"@fortawesome/free-solid-svg-icons": { |
|
|
|
"version": "5.13.1", |
|
|
|
"version": "5.15.1", |
|
|
|
"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.13.1.tgz", |
|
|
|
"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.1.tgz", |
|
|
|
"integrity": "sha512-LQH/0L1p4+rqtoSHa9qFYR84hpuRZKqaQ41cfBQx8b68p21zoWSekTAeA54I/2x9VlCHDLFlG74Nmdg4iTPQOg==", |
|
|
|
"integrity": "sha512-EFMuKtzRMNbvjab/SvJBaOOpaqJfdSap/Nl6hst7CgrJxwfORR1drdTV6q1Ib/JVzq4xObdTDcT6sqTaXMqfdg==", |
|
|
|
"dev": true, |
|
|
|
"dev": true, |
|
|
|
"requires": { |
|
|
|
"requires": { |
|
|
|
"@fortawesome/fontawesome-common-types": "^0.2.29" |
|
|
|
"@fortawesome/fontawesome-common-types": "^0.2.32" |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
"@istanbuljs/load-nyc-config": { |
|
|
|
"@istanbuljs/load-nyc-config": { |
|
|
@ -6880,6 +6880,7 @@ |
|
|
|
"integrity": "sha512-tVkIU9JQw5fYPxLQgok/a7I6J1eEZ79svwQGpe2mb3jlVsPADOleefOnQBiS/takK7jQuNeswCUicMH1VWVziA==" |
|
|
|
"integrity": "sha512-tVkIU9JQw5fYPxLQgok/a7I6J1eEZ79svwQGpe2mb3jlVsPADOleefOnQBiS/takK7jQuNeswCUicMH1VWVziA==" |
|
|
|
}, |
|
|
|
}, |
|
|
|
"@remixproject/engine": { |
|
|
|
"@remixproject/engine": { |
|
|
|
|
|
|
|
<<<<<<< .merge_file_DiBbcP |
|
|
|
"version": "0.3.3", |
|
|
|
"version": "0.3.3", |
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/engine/-/engine-0.3.3.tgz", |
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/engine/-/engine-0.3.3.tgz", |
|
|
|
"integrity": "sha512-0orGJhxHAFMUMokfDVq04yy0cvFknyrk9PcqvJw3KqChhusgkLw/J/KqJszywD9BmIjLgdc3n8vRtCmHICR3mA==", |
|
|
|
"integrity": "sha512-0orGJhxHAFMUMokfDVq04yy0cvFknyrk9PcqvJw3KqChhusgkLw/J/KqJszywD9BmIjLgdc3n8vRtCmHICR3mA==", |
|
|
@ -6952,6 +6953,11 @@ |
|
|
|
"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==" |
|
|
|
"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==" |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
======= |
|
|
|
|
|
|
|
"version": "0.2.5", |
|
|
|
|
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/engine/-/engine-0.2.5.tgz", |
|
|
|
|
|
|
|
"integrity": "sha512-SLdS2s88+OARfDfumJMmvBH94BQgHrmzav00aZU3eal00bpOHuUaZ+Visn/rKFDUyxTsZBZ/EClV3ha/oDYNaQ==" |
|
|
|
|
|
|
|
>>>>>>> .merge_file_48u09z |
|
|
|
}, |
|
|
|
}, |
|
|
|
"@remixproject/plugin": { |
|
|
|
"@remixproject/plugin": { |
|
|
|
"version": "0.3.3", |
|
|
|
"version": "0.3.3", |
|
|
@ -7065,7 +7071,11 @@ |
|
|
|
"@remixproject/plugin-ws": { |
|
|
|
"@remixproject/plugin-ws": { |
|
|
|
"version": "0.3.3", |
|
|
|
"version": "0.3.3", |
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/plugin-ws/-/plugin-ws-0.3.3.tgz", |
|
|
|
"resolved": "https://registry.npmjs.org/@remixproject/plugin-ws/-/plugin-ws-0.3.3.tgz", |
|
|
|
|
|
|
|
<<<<<<< .merge_file_DiBbcP |
|
|
|
"integrity": "sha512-QHWv5sjzUIb+rsLyAcOV67tShx8fniJvxYglqURaBc9LXdz0j5QfwnDIGwJwvnkJqAsk3MnXizaIXMU7CvKuzw==", |
|
|
|
"integrity": "sha512-QHWv5sjzUIb+rsLyAcOV67tShx8fniJvxYglqURaBc9LXdz0j5QfwnDIGwJwvnkJqAsk3MnXizaIXMU7CvKuzw==", |
|
|
|
|
|
|
|
======= |
|
|
|
|
|
|
|
"integrity": "sha1-qxGVX9ut7uRG0FE+8gOnbyodNr8=", |
|
|
|
|
|
|
|
>>>>>>> .merge_file_48u09z |
|
|
|
"requires": { |
|
|
|
"requires": { |
|
|
|
"@remixproject/plugin": "0.3.3", |
|
|
|
"@remixproject/plugin": "0.3.3", |
|
|
|
"@remixproject/plugin-api": "0.3.3", |
|
|
|
"@remixproject/plugin-api": "0.3.3", |
|
|
@ -8199,9 +8209,9 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
"@webcomponents/webcomponentsjs": { |
|
|
|
"@webcomponents/webcomponentsjs": { |
|
|
|
"version": "2.4.3", |
|
|
|
"version": "2.5.0", |
|
|
|
"resolved": "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.4.3.tgz", |
|
|
|
"resolved": "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.5.0.tgz", |
|
|
|
"integrity": "sha512-cV4+sAmshf8ysU2USutrSRYQkJzEYKHsRCGa0CkMElGpG5747VHtkfsW3NdVIBV/m2MDKXTDydT4lkrysH7IFA==", |
|
|
|
"integrity": "sha512-C0l51MWQZ9kLzcxOZtniOMohpIFdCLZum7/TEHv3XWFc1Fvt5HCpbSX84x8ltka/JuNKcuiDnxXFkiB2gaePcg==", |
|
|
|
"dev": true |
|
|
|
"dev": true |
|
|
|
}, |
|
|
|
}, |
|
|
|
"@xtuc/ieee754": { |
|
|
|
"@xtuc/ieee754": { |
|
|
@ -24802,18 +24812,18 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
"lit-element": { |
|
|
|
"lit-element": { |
|
|
|
"version": "2.3.1", |
|
|
|
"version": "2.4.0", |
|
|
|
"resolved": "https://registry.npmjs.org/lit-element/-/lit-element-2.3.1.tgz", |
|
|
|
"resolved": "https://registry.npmjs.org/lit-element/-/lit-element-2.4.0.tgz", |
|
|
|
"integrity": "sha512-tOcUAmeO3BzwiQ7FGWdsshNvC0HVHcTFYw/TLIImmKwXYoV0E7zCBASa8IJ7DiP4cen/Yoj454gS0qqTnIGsFA==", |
|
|
|
"integrity": "sha512-pBGLglxyhq/Prk2H91nA0KByq/hx/wssJBQFiYqXhGDvEnY31PRGYf1RglVzyLeRysu0IHm2K0P196uLLWmwFg==", |
|
|
|
"dev": true, |
|
|
|
"dev": true, |
|
|
|
"requires": { |
|
|
|
"requires": { |
|
|
|
"lit-html": "^1.1.1" |
|
|
|
"lit-html": "^1.1.1" |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
"lit-html": { |
|
|
|
"lit-html": { |
|
|
|
"version": "1.2.1", |
|
|
|
"version": "1.3.0", |
|
|
|
"resolved": "https://registry.npmjs.org/lit-html/-/lit-html-1.2.1.tgz", |
|
|
|
"resolved": "https://registry.npmjs.org/lit-html/-/lit-html-1.3.0.tgz", |
|
|
|
"integrity": "sha512-GSJHHXMGLZDzTRq59IUfL9FCdAlGfqNp/dEa7k7aBaaWD+JKaCjsAk9KYm2V12ItonVaYx2dprN66Zdm1AuBTQ==", |
|
|
|
"integrity": "sha512-0Q1bwmaFH9O14vycPHw8C/IeHMk/uSDldVLIefu/kfbTBGIc44KGH6A8p1bDfxUfHdc8q6Ct7kQklWoHgr4t1Q==", |
|
|
|
"dev": true |
|
|
|
"dev": true |
|
|
|
}, |
|
|
|
}, |
|
|
|
"load-json-file": { |
|
|
|
"load-json-file": { |
|
|
@ -36085,9 +36095,9 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
"remix-tabs": { |
|
|
|
"remix-tabs": { |
|
|
|
"version": "1.0.48", |
|
|
|
"version": "1.0.52", |
|
|
|
"resolved": "https://registry.npmjs.org/remix-tabs/-/remix-tabs-1.0.48.tgz", |
|
|
|
"resolved": "https://registry.npmjs.org/remix-tabs/-/remix-tabs-1.0.52.tgz", |
|
|
|
"integrity": "sha512-WWr7ooXXsxyyqeWPuNur5496qzqNyFRYvRGdyZGkGdvfWgV5C8VDNpFWuOPCSFi6eVhBiAFs5pchQzkZi8V+pw==", |
|
|
|
"integrity": "sha512-ie3iZWW9SnurZ2GWgOAN7/IHBlPvT+0BIgnqHT0VdXMdb+sY5WmvabnZ/zUH34YnjKz07uGzQfOtw2lLqNDDTw==", |
|
|
|
"dev": true, |
|
|
|
"dev": true, |
|
|
|
"requires": { |
|
|
|
"requires": { |
|
|
|
"@fortawesome/fontawesome-svg-core": "^1.2.14", |
|
|
|
"@fortawesome/fontawesome-svg-core": "^1.2.14", |
|
|
|