diff --git a/.gitignore b/.gitignore index 9904be7..e69de29 100755 --- a/.gitignore +++ b/.gitignore @@ -1,2 +0,0 @@ -# Don't upload research folder -research/ diff --git a/_site/assets/images/audio/anomolous/_DSC5654.jpg b/_site/assets/images/audio/anomolous/_DSC5654.jpg deleted file mode 100755 index 8a43fc4..0000000 Binary files a/_site/assets/images/audio/anomolous/_DSC5654.jpg and /dev/null differ diff --git a/_site/assets/images/audio/anomolous/_DSC5695.jpg b/_site/assets/images/audio/anomolous/_DSC5695.jpg deleted file mode 100755 index b843cdd..0000000 Binary files a/_site/assets/images/audio/anomolous/_DSC5695.jpg and /dev/null differ diff --git a/_site/assets/images/audio/anomolous/_DSC5696.jpg b/_site/assets/images/audio/anomolous/_DSC5696.jpg deleted file mode 100755 index bf5881b..0000000 Binary files a/_site/assets/images/audio/anomolous/_DSC5696.jpg and /dev/null differ diff --git a/_site/assets/images/audio/anomolous/low-thumb-_DSC5654.jpg b/_site/assets/images/audio/anomolous/low-thumb-_DSC5654.jpg deleted file mode 100755 index 977314a..0000000 Binary files a/_site/assets/images/audio/anomolous/low-thumb-_DSC5654.jpg and /dev/null differ diff --git a/_site/assets/images/audio/anomolous/low-thumb-_DSC5695.jpg b/_site/assets/images/audio/anomolous/low-thumb-_DSC5695.jpg deleted file mode 100755 index 81bcac1..0000000 Binary files a/_site/assets/images/audio/anomolous/low-thumb-_DSC5695.jpg and /dev/null differ diff --git a/_site/assets/images/audio/anomolous/low-thumb-_DSC5696.jpg b/_site/assets/images/audio/anomolous/low-thumb-_DSC5696.jpg deleted file mode 100755 index f05f930..0000000 Binary files a/_site/assets/images/audio/anomolous/low-thumb-_DSC5696.jpg and /dev/null differ diff --git a/_site/assets/images/audio/anomolous/patch.png b/_site/assets/images/audio/anomolous/patch.png deleted file mode 100755 index d1ee9c2..0000000 Binary files a/_site/assets/images/audio/anomolous/patch.png and /dev/null differ diff --git a/_site/assets/images/audio/anomolous/thumb-_DSC5654.jpg b/_site/assets/images/audio/anomolous/thumb-_DSC5654.jpg deleted file mode 100755 index d753532..0000000 Binary files a/_site/assets/images/audio/anomolous/thumb-_DSC5654.jpg and /dev/null differ diff --git a/_site/assets/images/audio/anomolous/thumb-_DSC5654.png b/_site/assets/images/audio/anomolous/thumb-_DSC5654.png deleted file mode 100755 index da0648d..0000000 Binary files a/_site/assets/images/audio/anomolous/thumb-_DSC5654.png and /dev/null differ diff --git a/_site/assets/images/audio/anomolous/thumb-_DSC5695.jpg b/_site/assets/images/audio/anomolous/thumb-_DSC5695.jpg deleted file mode 100755 index d9b6625..0000000 Binary files a/_site/assets/images/audio/anomolous/thumb-_DSC5695.jpg and /dev/null differ diff --git a/_site/assets/images/audio/anomolous/thumb-_DSC5695.png b/_site/assets/images/audio/anomolous/thumb-_DSC5695.png deleted file mode 100755 index 23ba021..0000000 Binary files a/_site/assets/images/audio/anomolous/thumb-_DSC5695.png and /dev/null differ diff --git a/_site/assets/images/audio/anomolous/thumb-_DSC5696.jpg b/_site/assets/images/audio/anomolous/thumb-_DSC5696.jpg deleted file mode 100755 index 00ceb83..0000000 Binary files a/_site/assets/images/audio/anomolous/thumb-_DSC5696.jpg and /dev/null differ diff --git a/_site/assets/images/audio/anomolous/thumb-_DSC5696.png b/_site/assets/images/audio/anomolous/thumb-_DSC5696.png deleted file mode 100755 index 8403db9..0000000 Binary files a/_site/assets/images/audio/anomolous/thumb-_DSC5696.png and /dev/null differ diff --git a/_site/assets/images/audio/postoast/FOMORADIO_PostToast.jpg b/_site/assets/images/audio/postoast/FOMORADIO_PostToast.jpg deleted file mode 100755 index 9762a29..0000000 Binary files a/_site/assets/images/audio/postoast/FOMORADIO_PostToast.jpg and /dev/null differ diff --git a/_site/assets/images/audio/postoast/low-thumb-FOMORADIO_PostToast.jpg b/_site/assets/images/audio/postoast/low-thumb-FOMORADIO_PostToast.jpg deleted file mode 100755 index 9f28f58..0000000 Binary files a/_site/assets/images/audio/postoast/low-thumb-FOMORADIO_PostToast.jpg and /dev/null differ diff --git a/_site/assets/images/audio/postoast/low-thumb-pgxpublaunch.jpg b/_site/assets/images/audio/postoast/low-thumb-pgxpublaunch.jpg deleted file mode 100755 index 276d980..0000000 Binary files a/_site/assets/images/audio/postoast/low-thumb-pgxpublaunch.jpg and /dev/null differ diff --git a/_site/assets/images/audio/postoast/low-thumb-redlightradio.png.jpg b/_site/assets/images/audio/postoast/low-thumb-redlightradio.png.jpg deleted file mode 100755 index 25b7159..0000000 Binary files a/_site/assets/images/audio/postoast/low-thumb-redlightradio.png.jpg and /dev/null differ diff --git a/_site/assets/images/audio/postoast/pgxpublaunch.jpg b/_site/assets/images/audio/postoast/pgxpublaunch.jpg deleted file mode 100755 index 28568b5..0000000 Binary files a/_site/assets/images/audio/postoast/pgxpublaunch.jpg and /dev/null differ diff --git a/_site/assets/images/audio/postoast/redlightradio.jpg b/_site/assets/images/audio/postoast/redlightradio.jpg deleted file mode 100755 index 1d4a6a8..0000000 Binary files a/_site/assets/images/audio/postoast/redlightradio.jpg and /dev/null differ diff --git a/_site/assets/images/audio/postoast/thumb-FOMORADIO_PostToast.png b/_site/assets/images/audio/postoast/thumb-FOMORADIO_PostToast.png deleted file mode 100755 index b100ff4..0000000 Binary files a/_site/assets/images/audio/postoast/thumb-FOMORADIO_PostToast.png and /dev/null differ diff --git a/_site/assets/images/audio/postoast/thumb-pgxpublaunch.jpg b/_site/assets/images/audio/postoast/thumb-pgxpublaunch.jpg deleted file mode 100755 index a29f3cb..0000000 Binary files a/_site/assets/images/audio/postoast/thumb-pgxpublaunch.jpg and /dev/null differ diff --git a/_site/assets/images/audio/postoast/thumb-pgxpublaunch.png b/_site/assets/images/audio/postoast/thumb-pgxpublaunch.png deleted file mode 100755 index 165a659..0000000 Binary files a/_site/assets/images/audio/postoast/thumb-pgxpublaunch.png and /dev/null differ diff --git a/_site/assets/images/audio/postoast/thumb-redlightradio.jpg b/_site/assets/images/audio/postoast/thumb-redlightradio.jpg deleted file mode 100755 index dc1a78d..0000000 Binary files a/_site/assets/images/audio/postoast/thumb-redlightradio.jpg and /dev/null differ diff --git a/_site/assets/images/audio/postoast/thumb-redlightradio.png b/_site/assets/images/audio/postoast/thumb-redlightradio.png deleted file mode 100755 index d405268..0000000 Binary files a/_site/assets/images/audio/postoast/thumb-redlightradio.png and /dev/null differ diff --git a/_site/assets/images/audio/postoast/ww_topDown.jpg b/_site/assets/images/audio/postoast/ww_topDown.jpg deleted file mode 100644 index 099bc0a..0000000 Binary files a/_site/assets/images/audio/postoast/ww_topDown.jpg and /dev/null differ diff --git a/_site/assets/images/audio/read-my-lips/djuna.jpg b/_site/assets/images/audio/read-my-lips/djuna.jpg deleted file mode 100644 index 6a1b489..0000000 Binary files a/_site/assets/images/audio/read-my-lips/djuna.jpg and /dev/null differ diff --git a/_site/assets/images/audio/read-my-lips/poster.jpg b/_site/assets/images/audio/read-my-lips/poster.jpg deleted file mode 100644 index 5b82ec3..0000000 Binary files a/_site/assets/images/audio/read-my-lips/poster.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/20170906_141918.jpg b/_site/assets/images/other/autonomousArchive/20170906_141918.jpg deleted file mode 100755 index e8440dd..0000000 Binary files a/_site/assets/images/other/autonomousArchive/20170906_141918.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/20171110_0057.jpg b/_site/assets/images/other/autonomousArchive/20171110_0057.jpg deleted file mode 100755 index 24650ec..0000000 Binary files a/_site/assets/images/other/autonomousArchive/20171110_0057.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/20171110_0059.jpg b/_site/assets/images/other/autonomousArchive/20171110_0059.jpg deleted file mode 100755 index 30b204d..0000000 Binary files a/_site/assets/images/other/autonomousArchive/20171110_0059.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/20171110_0061.jpg b/_site/assets/images/other/autonomousArchive/20171110_0061.jpg deleted file mode 100755 index 31bf6e5..0000000 Binary files a/_site/assets/images/other/autonomousArchive/20171110_0061.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/Files-terminal.png b/_site/assets/images/other/autonomousArchive/Files-terminal.png deleted file mode 100755 index 0826ccf..0000000 Binary files a/_site/assets/images/other/autonomousArchive/Files-terminal.png and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/Print1.jpg b/_site/assets/images/other/autonomousArchive/Print1.jpg deleted file mode 100755 index e65907e..0000000 Binary files a/_site/assets/images/other/autonomousArchive/Print1.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/aa1-web.jpg b/_site/assets/images/other/autonomousArchive/aa1-web.jpg deleted file mode 100755 index 301b3cd..0000000 Binary files a/_site/assets/images/other/autonomousArchive/aa1-web.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/aa10-web.jpg b/_site/assets/images/other/autonomousArchive/aa10-web.jpg deleted file mode 100755 index ee647ca..0000000 Binary files a/_site/assets/images/other/autonomousArchive/aa10-web.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/aa11-web.jpg b/_site/assets/images/other/autonomousArchive/aa11-web.jpg deleted file mode 100755 index 925fbb4..0000000 Binary files a/_site/assets/images/other/autonomousArchive/aa11-web.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/aa12-web.jpg b/_site/assets/images/other/autonomousArchive/aa12-web.jpg deleted file mode 100755 index fce900c..0000000 Binary files a/_site/assets/images/other/autonomousArchive/aa12-web.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/aa13-web.jpg b/_site/assets/images/other/autonomousArchive/aa13-web.jpg deleted file mode 100755 index cd127f9..0000000 Binary files a/_site/assets/images/other/autonomousArchive/aa13-web.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/aa14-web.jpg b/_site/assets/images/other/autonomousArchive/aa14-web.jpg deleted file mode 100755 index dcba008..0000000 Binary files a/_site/assets/images/other/autonomousArchive/aa14-web.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/aa15-web.jpg b/_site/assets/images/other/autonomousArchive/aa15-web.jpg deleted file mode 100755 index 0ae91ab..0000000 Binary files a/_site/assets/images/other/autonomousArchive/aa15-web.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/aa16-web.jpg b/_site/assets/images/other/autonomousArchive/aa16-web.jpg deleted file mode 100755 index 73b73d4..0000000 Binary files a/_site/assets/images/other/autonomousArchive/aa16-web.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/aa17-web.jpg b/_site/assets/images/other/autonomousArchive/aa17-web.jpg deleted file mode 100755 index 0f79617..0000000 Binary files a/_site/assets/images/other/autonomousArchive/aa17-web.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/aa19-web.jpg b/_site/assets/images/other/autonomousArchive/aa19-web.jpg deleted file mode 100755 index e4cab86..0000000 Binary files a/_site/assets/images/other/autonomousArchive/aa19-web.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/aa2-web.jpg b/_site/assets/images/other/autonomousArchive/aa2-web.jpg deleted file mode 100755 index 243c063..0000000 Binary files a/_site/assets/images/other/autonomousArchive/aa2-web.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/aa20-web.jpg b/_site/assets/images/other/autonomousArchive/aa20-web.jpg deleted file mode 100755 index 8f46fec..0000000 Binary files a/_site/assets/images/other/autonomousArchive/aa20-web.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/aa3-web.jpg b/_site/assets/images/other/autonomousArchive/aa3-web.jpg deleted file mode 100755 index 12fa8c3..0000000 Binary files a/_site/assets/images/other/autonomousArchive/aa3-web.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/aa4-web.jpg b/_site/assets/images/other/autonomousArchive/aa4-web.jpg deleted file mode 100755 index 5a20bf2..0000000 Binary files a/_site/assets/images/other/autonomousArchive/aa4-web.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/aa6-web.jpg b/_site/assets/images/other/autonomousArchive/aa6-web.jpg deleted file mode 100755 index be271a8..0000000 Binary files a/_site/assets/images/other/autonomousArchive/aa6-web.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/aa7-web.jpg b/_site/assets/images/other/autonomousArchive/aa7-web.jpg deleted file mode 100755 index b600fed..0000000 Binary files a/_site/assets/images/other/autonomousArchive/aa7-web.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/aa8-web.jpg b/_site/assets/images/other/autonomousArchive/aa8-web.jpg deleted file mode 100755 index a34140f..0000000 Binary files a/_site/assets/images/other/autonomousArchive/aa8-web.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/aa9-web.jpg b/_site/assets/images/other/autonomousArchive/aa9-web.jpg deleted file mode 100755 index 5134e56..0000000 Binary files a/_site/assets/images/other/autonomousArchive/aa9-web.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/buildingLightbox.jpg b/_site/assets/images/other/autonomousArchive/buildingLightbox.jpg deleted file mode 100755 index 3b84926..0000000 Binary files a/_site/assets/images/other/autonomousArchive/buildingLightbox.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/pgbwstreet.jpg b/_site/assets/images/other/autonomousArchive/pgbwstreet.jpg deleted file mode 100755 index e20d7c4..0000000 Binary files a/_site/assets/images/other/autonomousArchive/pgbwstreet.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/thumb-buildingLightbox.png b/_site/assets/images/other/autonomousArchive/thumb-buildingLightbox.png deleted file mode 100755 index 36a468f..0000000 --- a/_site/assets/images/other/autonomousArchive/thumb-buildingLightbox.png +++ /dev/null @@ -1 +0,0 @@ -autonomousArchive/thumb-buildingLightbox.jpg diff --git a/_site/assets/images/other/autonomousArchive/web-0.jpg b/_site/assets/images/other/autonomousArchive/web-0.jpg deleted file mode 100755 index 13aa761..0000000 Binary files a/_site/assets/images/other/autonomousArchive/web-0.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/web-1.jpg b/_site/assets/images/other/autonomousArchive/web-1.jpg deleted file mode 100755 index b32f052..0000000 Binary files a/_site/assets/images/other/autonomousArchive/web-1.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/web-10.jpg b/_site/assets/images/other/autonomousArchive/web-10.jpg deleted file mode 100755 index 24f140c..0000000 Binary files a/_site/assets/images/other/autonomousArchive/web-10.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/web-13.jpg b/_site/assets/images/other/autonomousArchive/web-13.jpg deleted file mode 100755 index eb2f44b..0000000 Binary files a/_site/assets/images/other/autonomousArchive/web-13.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/web-14.jpg b/_site/assets/images/other/autonomousArchive/web-14.jpg deleted file mode 100755 index d4b61be..0000000 Binary files a/_site/assets/images/other/autonomousArchive/web-14.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/web-15.jpg b/_site/assets/images/other/autonomousArchive/web-15.jpg deleted file mode 100755 index 33e721b..0000000 Binary files a/_site/assets/images/other/autonomousArchive/web-15.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/web-2.jpg b/_site/assets/images/other/autonomousArchive/web-2.jpg deleted file mode 100755 index 3acfcc4..0000000 Binary files a/_site/assets/images/other/autonomousArchive/web-2.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/web-3.jpg b/_site/assets/images/other/autonomousArchive/web-3.jpg deleted file mode 100755 index dc4dff2..0000000 Binary files a/_site/assets/images/other/autonomousArchive/web-3.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/web-4.jpg b/_site/assets/images/other/autonomousArchive/web-4.jpg deleted file mode 100755 index 2a50a39..0000000 Binary files a/_site/assets/images/other/autonomousArchive/web-4.jpg and /dev/null differ diff --git a/_site/assets/images/other/autonomousArchive/web-8.jpg b/_site/assets/images/other/autonomousArchive/web-8.jpg deleted file mode 100755 index 979fe5b..0000000 Binary files a/_site/assets/images/other/autonomousArchive/web-8.jpg and /dev/null differ diff --git a/_site/assets/images/other/chagrin/chagrin1.png b/_site/assets/images/other/chagrin/chagrin1.png deleted file mode 100755 index 0d11687..0000000 Binary files a/_site/assets/images/other/chagrin/chagrin1.png and /dev/null differ diff --git a/_site/assets/images/other/chagrin/chagrin2.png b/_site/assets/images/other/chagrin/chagrin2.png deleted file mode 100755 index 0194788..0000000 Binary files a/_site/assets/images/other/chagrin/chagrin2.png and /dev/null differ diff --git a/_site/assets/images/other/chagrin/chagrin3.png b/_site/assets/images/other/chagrin/chagrin3.png deleted file mode 100755 index 79fef58..0000000 Binary files a/_site/assets/images/other/chagrin/chagrin3.png and /dev/null differ diff --git a/_site/assets/images/other/chagrin/thumb-chagrin1.jpg b/_site/assets/images/other/chagrin/thumb-chagrin1.jpg deleted file mode 100755 index 90f3695..0000000 Binary files a/_site/assets/images/other/chagrin/thumb-chagrin1.jpg and /dev/null differ diff --git a/_site/assets/images/other/chagrin/thumb-chagrin1.png b/_site/assets/images/other/chagrin/thumb-chagrin1.png deleted file mode 100755 index b6f2846..0000000 --- a/_site/assets/images/other/chagrin/thumb-chagrin1.png +++ /dev/null @@ -1 +0,0 @@ -chagrin/thumb-chagrin1 diff --git a/_site/assets/images/other/chagrin/thumb-chagrin2.jpg b/_site/assets/images/other/chagrin/thumb-chagrin2.jpg deleted file mode 100755 index 19503f3..0000000 Binary files a/_site/assets/images/other/chagrin/thumb-chagrin2.jpg and /dev/null differ diff --git a/_site/assets/images/other/chagrin/thumb-chagrin2.png b/_site/assets/images/other/chagrin/thumb-chagrin2.png deleted file mode 100755 index 5101f8f..0000000 --- a/_site/assets/images/other/chagrin/thumb-chagrin2.png +++ /dev/null @@ -1 +0,0 @@ -chagrin/thumb-chagrin2 diff --git a/_site/assets/images/other/chagrin/thumb-chagrin3.png b/_site/assets/images/other/chagrin/thumb-chagrin3.png deleted file mode 100755 index 9454636..0000000 --- a/_site/assets/images/other/chagrin/thumb-chagrin3.png +++ /dev/null @@ -1 +0,0 @@ -chagrin/thumb-chagrin diff --git a/_site/assets/images/other/fragileMastery/POD_Cover.sm.png b/_site/assets/images/other/fragileMastery/POD_Cover.sm.png deleted file mode 100755 index 07d5982..0000000 Binary files a/_site/assets/images/other/fragileMastery/POD_Cover.sm.png and /dev/null differ diff --git a/_site/assets/images/other/fragileMastery/gradInstallation.jpg b/_site/assets/images/other/fragileMastery/gradInstallation.jpg deleted file mode 100755 index c73d829..0000000 Binary files a/_site/assets/images/other/fragileMastery/gradInstallation.jpg and /dev/null differ diff --git a/_site/assets/images/other/fragileMastery/thumb-POD_Cover.jpg b/_site/assets/images/other/fragileMastery/thumb-POD_Cover.jpg deleted file mode 100755 index e88bd5c..0000000 Binary files a/_site/assets/images/other/fragileMastery/thumb-POD_Cover.jpg and /dev/null differ diff --git a/_site/assets/images/other/fragileMastery/thumb-POD_Cover.png b/_site/assets/images/other/fragileMastery/thumb-POD_Cover.png deleted file mode 100755 index ab3c5eb..0000000 --- a/_site/assets/images/other/fragileMastery/thumb-POD_Cover.png +++ /dev/null @@ -1 +0,0 @@ -fragileMastery/thumb-POD_Cover diff --git a/_site/assets/images/other/fragileMastery/thumb-gradInstallation.jpg b/_site/assets/images/other/fragileMastery/thumb-gradInstallation.jpg deleted file mode 100755 index 09c415d..0000000 Binary files a/_site/assets/images/other/fragileMastery/thumb-gradInstallation.jpg and /dev/null differ diff --git a/_site/assets/images/other/fragileMastery/thumb-gradInstallation.png b/_site/assets/images/other/fragileMastery/thumb-gradInstallation.png deleted file mode 100755 index 926a934..0000000 --- a/_site/assets/images/other/fragileMastery/thumb-gradInstallation.png +++ /dev/null @@ -1 +0,0 @@ -fragileMastery/thumb-gradInstallation diff --git a/_site/assets/images/other/memphis/memphis1.png b/_site/assets/images/other/memphis/memphis1.png deleted file mode 100755 index 7f4ec22..0000000 Binary files a/_site/assets/images/other/memphis/memphis1.png and /dev/null differ diff --git a/_site/assets/images/other/memphis/memphis2.png b/_site/assets/images/other/memphis/memphis2.png deleted file mode 100755 index 3c5dbf4..0000000 Binary files a/_site/assets/images/other/memphis/memphis2.png and /dev/null differ diff --git a/_site/assets/images/other/memphis/memphis3.png b/_site/assets/images/other/memphis/memphis3.png deleted file mode 100755 index 0e0129b..0000000 Binary files a/_site/assets/images/other/memphis/memphis3.png and /dev/null differ diff --git a/_site/assets/images/other/tetra/euclid.svg b/_site/assets/images/other/tetra/euclid.svg deleted file mode 100755 index 685d752..0000000 --- a/_site/assets/images/other/tetra/euclid.svg +++ /dev/null @@ -1 +0,0 @@ -Artboard 4 copy \ No newline at end of file diff --git a/_site/assets/images/other/tetra/euclidLogo.png b/_site/assets/images/other/tetra/euclidLogo.png deleted file mode 100755 index 34cf5cd..0000000 Binary files a/_site/assets/images/other/tetra/euclidLogo.png and /dev/null differ diff --git a/_site/assets/images/other/tetra/euclidianGenerator_mk2.png b/_site/assets/images/other/tetra/euclidianGenerator_mk2.png deleted file mode 100755 index 64211ea..0000000 Binary files a/_site/assets/images/other/tetra/euclidianGenerator_mk2.png and /dev/null differ diff --git a/_site/assets/images/other/tetra/playingTetra.jpg b/_site/assets/images/other/tetra/playingTetra.jpg deleted file mode 100755 index c0f9c02..0000000 Binary files a/_site/assets/images/other/tetra/playingTetra.jpg and /dev/null differ diff --git a/_site/assets/images/other/tetra/resized-6.jpg b/_site/assets/images/other/tetra/resized-6.jpg deleted file mode 100755 index 64fe28c..0000000 Binary files a/_site/assets/images/other/tetra/resized-6.jpg and /dev/null differ diff --git a/_site/assets/images/other/tetra/tetra.jpg b/_site/assets/images/other/tetra/tetra.jpg deleted file mode 100755 index f9cd04f..0000000 Binary files a/_site/assets/images/other/tetra/tetra.jpg and /dev/null differ diff --git a/_site/assets/images/other/tetra/tetra2.jpg b/_site/assets/images/other/tetra/tetra2.jpg deleted file mode 100755 index ad177a9..0000000 Binary files a/_site/assets/images/other/tetra/tetra2.jpg and /dev/null differ diff --git a/_site/assets/images/other/tetra/thumb-euclidianGenerator_mk2.jpg b/_site/assets/images/other/tetra/thumb-euclidianGenerator_mk2.jpg deleted file mode 100755 index 9bb1fb9..0000000 Binary files a/_site/assets/images/other/tetra/thumb-euclidianGenerator_mk2.jpg and /dev/null differ diff --git a/_site/assets/images/other/tetra/thumb-euclidianGenerator_mk2.png b/_site/assets/images/other/tetra/thumb-euclidianGenerator_mk2.png deleted file mode 100755 index 967fadb..0000000 --- a/_site/assets/images/other/tetra/thumb-euclidianGenerator_mk2.png +++ /dev/null @@ -1 +0,0 @@ -tetra/thumb-euclidianGenerator_mk2 diff --git a/_site/assets/images/other/tetra/thumb-playingTetra.jpg b/_site/assets/images/other/tetra/thumb-playingTetra.jpg deleted file mode 100755 index 78483a2..0000000 Binary files a/_site/assets/images/other/tetra/thumb-playingTetra.jpg and /dev/null differ diff --git a/_site/assets/images/other/tetra/thumb-playingTetra.png b/_site/assets/images/other/tetra/thumb-playingTetra.png deleted file mode 100755 index 082b71e..0000000 --- a/_site/assets/images/other/tetra/thumb-playingTetra.png +++ /dev/null @@ -1 +0,0 @@ -tetra/thumb-playingTetra diff --git a/_site/assets/images/other/tetra/thumb-resized-6.jpg b/_site/assets/images/other/tetra/thumb-resized-6.jpg deleted file mode 100755 index a8f1292..0000000 Binary files a/_site/assets/images/other/tetra/thumb-resized-6.jpg and /dev/null differ diff --git a/_site/assets/images/other/tetra/thumb-resized-6.png b/_site/assets/images/other/tetra/thumb-resized-6.png deleted file mode 100755 index c94f88e..0000000 --- a/_site/assets/images/other/tetra/thumb-resized-6.png +++ /dev/null @@ -1 +0,0 @@ -tetra/thumb-resized-6 diff --git a/_site/assets/images/other/tetra/thumb-tetra.jpg b/_site/assets/images/other/tetra/thumb-tetra.jpg deleted file mode 100755 index 0c14d13..0000000 Binary files a/_site/assets/images/other/tetra/thumb-tetra.jpg and /dev/null differ diff --git a/_site/assets/images/other/tetra/thumb-tetra.png b/_site/assets/images/other/tetra/thumb-tetra.png deleted file mode 100755 index 798358e..0000000 --- a/_site/assets/images/other/tetra/thumb-tetra.png +++ /dev/null @@ -1 +0,0 @@ -tetra/thumb-tetra diff --git a/_site/assets/images/other/tetra/thumb-tetra2.jpg b/_site/assets/images/other/tetra/thumb-tetra2.jpg deleted file mode 100755 index 9b2fd9c..0000000 Binary files a/_site/assets/images/other/tetra/thumb-tetra2.jpg and /dev/null differ diff --git a/_site/assets/images/other/tetra/thumb-tetra2.png b/_site/assets/images/other/tetra/thumb-tetra2.png deleted file mode 100755 index ee85ebf..0000000 --- a/_site/assets/images/other/tetra/thumb-tetra2.png +++ /dev/null @@ -1 +0,0 @@ -tetra/thumb-tetra2 diff --git a/_site/assets/js/audio.js b/_site/assets/js/audio.js deleted file mode 100644 index 8b13789..0000000 --- a/_site/assets/js/audio.js +++ /dev/null @@ -1 +0,0 @@ - diff --git a/_site/assets/js/interaction.js b/_site/assets/js/interaction.js index 1ddb759..c4e8b55 100644 --- a/_site/assets/js/interaction.js +++ b/_site/assets/js/interaction.js @@ -21,7 +21,11 @@ const audioToggle = () => { } } -audioEl.addEventListener('click', audioToggle) +const audioEnable = () => { + +} + +// audioEl.addEventListener('click', audioToggle) // NAVIGATION let primaryNav = document.querySelectorAll('nav>span') @@ -36,6 +40,13 @@ for (let n of primaryNav) { menuVoices[n.dataset.link] = new Synth(audioEngine) menuVoices[n.dataset.link].gain.connect(masterGain) + n.addEventListener('mouseenter', (e) => { + console.log('mouse enter') + if (audioEngine.state == 'suspended') { + audioEngine.resume() + } + }) + n.addEventListener('click', (e) => { for (let _n of primaryNav) { diff --git a/_site/audio/andoror/index.html b/_site/audio/andoror/index.html index d87aabe..ae4a6fb 100644 --- a/_site/audio/andoror/index.html +++ b/_site/audio/andoror/index.html @@ -34,18 +34,18 @@ diff --git a/_site/audio/post-toast/index.html b/_site/audio/post-toast/index.html index fd4823e..08ae77b 100644 --- a/_site/audio/post-toast/index.html +++ b/_site/audio/post-toast/index.html @@ -34,18 +34,18 @@ diff --git a/_site/audio/solo/index.html b/_site/audio/solo/index.html index 5650340..03b1d3e 100644 --- a/_site/audio/solo/index.html +++ b/_site/audio/solo/index.html @@ -34,18 +34,18 @@ diff --git a/_site/index.html b/_site/index.html index 7b64dd0..9e77b00 100644 --- a/_site/index.html +++ b/_site/index.html @@ -34,18 +34,18 @@ diff --git a/_site/teach/index.html b/_site/teach/index.html index 4ecd075..3de536e 100644 --- a/_site/teach/index.html +++ b/_site/teach/index.html @@ -34,18 +34,18 @@ diff --git a/_site/work/container2mvmnts/index.html b/_site/work/container2mvmnts/index.html index a1558b0..87bda2c 100644 --- a/_site/work/container2mvmnts/index.html +++ b/_site/work/container2mvmnts/index.html @@ -34,18 +34,18 @@ diff --git a/_site/work/euclid/index.html b/_site/work/euclid/index.html index 5122bcc..98cdf96 100644 --- a/_site/work/euclid/index.html +++ b/_site/work/euclid/index.html @@ -34,18 +34,18 @@ diff --git a/_site/work/fragile-mastery/index.html b/_site/work/fragile-mastery/index.html index db7f8ab..5cd2914 100644 --- a/_site/work/fragile-mastery/index.html +++ b/_site/work/fragile-mastery/index.html @@ -34,18 +34,18 @@ diff --git a/assets/js/audio.js b/assets/js/audio.js deleted file mode 100644 index 8b13789..0000000 --- a/assets/js/audio.js +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/js/interaction.js b/assets/js/interaction.js index 1ddb759..c4e8b55 100644 --- a/assets/js/interaction.js +++ b/assets/js/interaction.js @@ -21,7 +21,11 @@ const audioToggle = () => { } } -audioEl.addEventListener('click', audioToggle) +const audioEnable = () => { + +} + +// audioEl.addEventListener('click', audioToggle) // NAVIGATION let primaryNav = document.querySelectorAll('nav>span') @@ -36,6 +40,13 @@ for (let n of primaryNav) { menuVoices[n.dataset.link] = new Synth(audioEngine) menuVoices[n.dataset.link].gain.connect(masterGain) + n.addEventListener('mouseenter', (e) => { + console.log('mouse enter') + if (audioEngine.state == 'suspended') { + audioEngine.resume() + } + }) + n.addEventListener('click', (e) => { for (let _n of primaryNav) { diff --git a/node_modules/@11ty/eleventy/package.json b/node_modules/@11ty/eleventy/package.json index d6ab132..e3c5110 100755 --- a/node_modules/@11ty/eleventy/package.json +++ b/node_modules/@11ty/eleventy/package.json @@ -23,7 +23,7 @@ "_resolved": "https://registry.npmjs.org/@11ty/eleventy/-/eleventy-0.9.0.tgz", "_shasum": "de3e93eda2ea8b5d4cd39d0177950eb000fb38f9", "_spec": "@11ty/eleventy", - "_where": "/home/suroh/Repos/11ty.work", + "_where": "/home/suroh/Repos/work.suroh.tk", "author": { "name": "Zach Leatherman", "email": "zachleatherman@gmail.com", diff --git a/node_modules/dependency-tree/package.json b/node_modules/dependency-tree/package.json index 79cb504..f3b631c 100644 --- a/node_modules/dependency-tree/package.json +++ b/node_modules/dependency-tree/package.json @@ -1,8 +1,8 @@ { "_from": "dependency-tree@^7.0.2", - "_id": "dependency-tree@7.1.0", + "_id": "dependency-tree@7.2.0", "_inBundle": false, - "_integrity": "sha512-emsssimgZFIsTL1d6eaDoipwIIjMENwUODjOwv0G7V5mwPMmeiTmvKpHjYes0/oH3PM7Yjl85D3jIzYHh7w31Q==", + "_integrity": "sha512-41LepYuMZNfd/wk7ppfhaOp8dzzd37t9hLP8XKg9WDQZ3u2WmNCR3eZOF/6jDatV+3OL4ChOON9a/UIeC75bYw==", "_location": "/dependency-tree", "_phantomChildren": {}, "_requested": { @@ -18,10 +18,10 @@ "_requiredBy": [ "/@11ty/eleventy" ], - "_resolved": "https://registry.npmjs.org/dependency-tree/-/dependency-tree-7.1.0.tgz", - "_shasum": "7110af9a94ded4785c17d69e48b6968c214d9a49", + "_resolved": "https://registry.npmjs.org/dependency-tree/-/dependency-tree-7.2.0.tgz", + "_shasum": "1dc8ea13c5623f5eab99b28a4fd4f4eca0809168", "_spec": "dependency-tree@^7.0.2", - "_where": "/home/suroh/Repos/11ty.work/node_modules/@11ty/eleventy", + "_where": "/home/suroh/Repos/work.suroh.tk/node_modules/@11ty/eleventy", "author": { "name": "Joel Kemp", "email": "joel@mrjoelkemp.com" @@ -36,7 +36,7 @@ "dependencies": { "commander": "^2.19.0", "debug": "^4.1.1", - "filing-cabinet": "^2.3.1", + "filing-cabinet": "^2.5.1", "precinct": "^6.2.0" }, "deprecated": false, @@ -83,5 +83,5 @@ "scripts": { "test": "jscs index.js test/test.js && ./node_modules/.bin/mocha --require @babel/register test/test.js" }, - "version": "7.1.0" + "version": "7.2.0" } diff --git a/node_modules/fast-glob/out/providers/async.d.ts b/node_modules/fast-glob/out/providers/async.d.ts index 4c77f5e..d8f1ff8 100644 --- a/node_modules/fast-glob/out/providers/async.d.ts +++ b/node_modules/fast-glob/out/providers/async.d.ts @@ -1,4 +1,5 @@ /// +import { Readable } from 'stream'; import { Task } from '../managers/tasks'; import ReaderStream from '../readers/stream'; import { EntryItem, ReaderOptions } from '../types'; @@ -6,5 +7,5 @@ import Provider from './provider'; export default class ProviderAsync extends Provider> { protected _reader: ReaderStream; read(task: Task): Promise; - api(root: string, task: Task, options: ReaderOptions): NodeJS.ReadableStream; + api(root: string, task: Task, options: ReaderOptions): Readable; } diff --git a/node_modules/fast-glob/out/providers/stream.d.ts b/node_modules/fast-glob/out/providers/stream.d.ts index 9e8e042..bfa9201 100644 --- a/node_modules/fast-glob/out/providers/stream.d.ts +++ b/node_modules/fast-glob/out/providers/stream.d.ts @@ -1,10 +1,11 @@ /// +import { Readable } from 'stream'; import { Task } from '../managers/tasks'; import ReaderStream from '../readers/stream'; import { ReaderOptions } from '../types'; import Provider from './provider'; -export default class ProviderStream extends Provider { +export default class ProviderStream extends Provider { protected _reader: ReaderStream; - read(task: Task): NodeJS.ReadableStream; - api(root: string, task: Task, options: ReaderOptions): NodeJS.ReadableStream; + read(task: Task): Readable; + api(root: string, task: Task, options: ReaderOptions): Readable; } diff --git a/node_modules/fast-glob/out/providers/stream.js b/node_modules/fast-glob/out/providers/stream.js index 0f2af7d..9e81c21 100644 --- a/node_modules/fast-glob/out/providers/stream.js +++ b/node_modules/fast-glob/out/providers/stream.js @@ -17,6 +17,8 @@ class ProviderStream extends provider_1.default { .once('error', (error) => destination.emit('error', error)) .on('data', (entry) => destination.emit('data', options.transform(entry))) .once('end', () => destination.emit('end')); + destination + .once('close', () => source.destroy()); return destination; } api(root, task, options) { diff --git a/node_modules/fast-glob/out/readers/stream.d.ts b/node_modules/fast-glob/out/readers/stream.d.ts index 8973dd0..b0c7018 100644 --- a/node_modules/fast-glob/out/readers/stream.d.ts +++ b/node_modules/fast-glob/out/readers/stream.d.ts @@ -1,13 +1,14 @@ /// +import { Readable } from 'stream'; import * as fsStat from '@nodelib/fs.stat'; import * as fsWalk from '@nodelib/fs.walk'; import { Pattern, ReaderOptions } from '../types'; import Reader from './reader'; -export default class ReaderStream extends Reader { +export default class ReaderStream extends Reader { protected _walkStream: typeof fsWalk.walkStream; protected _stat: typeof fsStat.stat; - dynamic(root: string, options: ReaderOptions): NodeJS.ReadableStream; - static(patterns: Pattern[], options: ReaderOptions): NodeJS.ReadableStream; + dynamic(root: string, options: ReaderOptions): Readable; + static(patterns: Pattern[], options: ReaderOptions): Readable; private _getEntry; private _getStat; } diff --git a/node_modules/fast-glob/out/utils/stream.d.ts b/node_modules/fast-glob/out/utils/stream.d.ts index eb2c587..167fab0 100644 --- a/node_modules/fast-glob/out/utils/stream.d.ts +++ b/node_modules/fast-glob/out/utils/stream.d.ts @@ -1,2 +1,3 @@ /// -export declare function merge(streams: NodeJS.ReadableStream[]): NodeJS.ReadableStream; +import { Readable } from 'stream'; +export declare function merge(streams: Readable[]): NodeJS.ReadableStream; diff --git a/node_modules/fast-glob/out/utils/stream.js b/node_modules/fast-glob/out/utils/stream.js index 87cf7ad..6cded55 100644 --- a/node_modules/fast-glob/out/utils/stream.js +++ b/node_modules/fast-glob/out/utils/stream.js @@ -6,6 +6,11 @@ function merge(streams) { streams.forEach((stream) => { stream.once('error', (error) => mergedStream.emit('error', error)); }); + mergedStream.once('close', () => propagateCloseEventToSources(streams)); + mergedStream.once('end', () => propagateCloseEventToSources(streams)); return mergedStream; } exports.merge = merge; +function propagateCloseEventToSources(streams) { + streams.forEach((stream) => stream.emit('close')); +} diff --git a/node_modules/fast-glob/package.json b/node_modules/fast-glob/package.json index 7cff54a..ffcf90c 100644 --- a/node_modules/fast-glob/package.json +++ b/node_modules/fast-glob/package.json @@ -1,8 +1,8 @@ { "_from": "fast-glob@^3.0.4", - "_id": "fast-glob@3.1.0", + "_id": "fast-glob@3.1.1", "_inBundle": false, - "_integrity": "sha512-TrUz3THiq2Vy3bjfQUB2wNyPdGBeGmdjbzzBLhfHN4YFurYptCKwGq/TfiRavbGywFRzY6U2CdmQ1zmsY5yYaw==", + "_integrity": "sha512-nTCREpBY8w8r+boyFYAx21iL6faSsQynliPHM4Uf56SbkyohCNxpVPEH9xrF5TXKy+IsjkPUHDKiUkzBVRXn9g==", "_location": "/fast-glob", "_phantomChildren": { "is-glob": "4.0.1", @@ -21,13 +21,13 @@ "_requiredBy": [ "/@11ty/eleventy" ], - "_resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.1.0.tgz", - "_shasum": "77375a7e3e6f6fc9b18f061cddd28b8d1eec75ae", + "_resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.1.1.tgz", + "_shasum": "87ee30e9e9f3eb40d6f254a7997655da753d7c82", "_spec": "fast-glob@^3.0.4", - "_where": "/home/suroh/Repos/11ty.work/node_modules/@11ty/eleventy", + "_where": "/home/suroh/Repos/work.suroh.tk/node_modules/@11ty/eleventy", "author": { "name": "Denis Malinochkin", - "url": "canonium.com" + "url": "https://mrmlnc.com" }, "bugs": { "url": "https://github.com/mrmlnc/fast-glob/issues" @@ -109,5 +109,5 @@ "watch": "npm run clean && npm run compile -- --sourceMap --watch" }, "typings": "out/index.d.ts", - "version": "3.1.0" + "version": "3.1.1" } diff --git a/node_modules/filing-cabinet/package.json b/node_modules/filing-cabinet/package.json index 005cf23..5e75f05 100644 --- a/node_modules/filing-cabinet/package.json +++ b/node_modules/filing-cabinet/package.json @@ -1,27 +1,27 @@ { - "_from": "filing-cabinet@^2.3.1", - "_id": "filing-cabinet@2.5.0", + "_from": "filing-cabinet@^2.5.1", + "_id": "filing-cabinet@2.5.1", "_inBundle": false, - "_integrity": "sha512-RUMWQT/Og4m4D7PFOqTZCTumg6QwlNnpV/adYGPUzWMaOnta/jDirp/4meXx+cwBKFrztEmZTPIkrZy0G1LwOA==", + "_integrity": "sha512-GWOdObzou2L0HrJUk8MpJa01q0ZOwuTwTssM2+P+ABJWEGlVWd6ueEatANFdin94/3rdkVSdqpH14VqCNqp3RA==", "_location": "/filing-cabinet", "_phantomChildren": {}, "_requested": { "type": "range", "registry": true, - "raw": "filing-cabinet@^2.3.1", + "raw": "filing-cabinet@^2.5.1", "name": "filing-cabinet", "escapedName": "filing-cabinet", - "rawSpec": "^2.3.1", + "rawSpec": "^2.5.1", "saveSpec": null, - "fetchSpec": "^2.3.1" + "fetchSpec": "^2.5.1" }, "_requiredBy": [ "/dependency-tree" ], - "_resolved": "https://registry.npmjs.org/filing-cabinet/-/filing-cabinet-2.5.0.tgz", - "_shasum": "325ac8acf6932597d589ef6bc37239fe57b8bc70", - "_spec": "filing-cabinet@^2.3.1", - "_where": "/home/suroh/Repos/11ty.work/node_modules/dependency-tree", + "_resolved": "https://registry.npmjs.org/filing-cabinet/-/filing-cabinet-2.5.1.tgz", + "_shasum": "f920976d46310710595ed995f033a301570ef6ab", + "_spec": "filing-cabinet@^2.5.1", + "_where": "/home/suroh/Repos/work.suroh.tk/node_modules/dependency-tree", "author": { "name": "Joel Kemp", "email": "joel@mrjoelkemp.com", @@ -86,5 +86,5 @@ "scripts": { "test": "jscs index.js test/test.js && eslint index.js test/test.js && ./node_modules/.bin/mocha test/test.js" }, - "version": "2.5.0" + "version": "2.5.1" } diff --git a/node_modules/uglify-js/lib/compress.js b/node_modules/uglify-js/lib/compress.js index a878ef2..34700d4 100644 --- a/node_modules/uglify-js/lib/compress.js +++ b/node_modules/uglify-js/lib/compress.js @@ -362,6 +362,7 @@ merge(Compressor.prototype, { function reset_def(tw, compressor, def) { def.assignments = 0; def.chained = false; + def.cross_loop = false; def.direct_access = false; def.escaped = []; def.fixed = !def.scope.pinned() @@ -455,7 +456,7 @@ merge(Compressor.prototype, { if (def.fixed == null) { if (is_arguments(def)) return false; if (def.global && def.name == "arguments") return false; - def.fixed = make_node(AST_Undefined, def.orig); + def.fixed = make_node(AST_Undefined, def.orig[0]); } return true; } @@ -765,6 +766,9 @@ merge(Compressor.prototype, { d.fixed = false; } } + if (d.fixed && tw.loop_ids[d.id] !== tw.in_loop) { + d.cross_loop = true; + } mark_escaped(tw, d, this.scope, this, value, 0, 1); } var parent; @@ -1112,7 +1116,7 @@ merge(Compressor.prototype, { var args; var candidates = []; var stat_index = statements.length; - var scanner = new TreeTransformer(function(node) { + var scanner = new TreeTransformer(function(node, descend) { if (abort) return node; // Skip nodes before `candidate` as quickly as possible if (!hit) { @@ -1147,11 +1151,16 @@ merge(Compressor.prototype, { return node; } if (is_lhs(node, parent)) { - if (value_def) replaced++; + if (value_def && !hit_rhs) { + assign_used = true; + replaced++; + } + return node; + } else if (value_def) { + if (!hit_rhs) replaced++; return node; } else { replaced++; - if (value_def && candidate instanceof AST_VarDef) return node; } CHANGED = abort = true; AST_Node.info("Collapsing {name} [{file}:{line},{col}]", { @@ -1184,6 +1193,14 @@ merge(Compressor.prototype, { stop_after = node; if (node instanceof AST_Scope) abort = true; } + // Scan but don't replace inside getter/setter + if (node instanceof AST_Accessor) { + var replace = can_replace; + can_replace = false; + descend(node, scanner); + can_replace = replace; + return node; + } return handle_custom_scan_order(node); }, function(node) { if (abort) return; @@ -1196,9 +1213,28 @@ merge(Compressor.prototype, { if (!hit) { if (node !== hit_stack[hit_index]) return node; hit_index++; - if (hit_index < hit_stack.length) return; - hit = true; - return node; + switch (hit_stack.length - hit_index) { + case 0: + hit = true; + if (assign_used) return node; + if (node instanceof AST_VarDef) return node; + def.replaced++; + var parent = multi_replacer.parent(); + if (parent instanceof AST_Sequence && parent.tail_node() !== node) { + value_def.replaced++; + return MAP.skip; + } + return get_rvalue(candidate); + case 1: + if (!assign_used && node.body === candidate) { + hit = true; + def.replaced++; + value_def.replaced++; + return null; + } + default: + return; + } } // Replace variable when found if (node instanceof AST_SymbolRef @@ -1207,11 +1243,12 @@ merge(Compressor.prototype, { if (is_lhs(node, multi_replacer.parent())) return node; def.replaced++; value_def.replaced--; - return candidate.value.clone(); + return get_rvalue(candidate).clone(); } // Skip (non-executed) functions and (leading) default case in switch statements if (node instanceof AST_Default || node instanceof AST_Scope) return node; - }); + }, patch_sequence); + var force_single; while (--stat_index >= 0) { // Treat parameters as collapsible in IIFE, i.e. // function(a, b){ ... }(x()); @@ -1244,7 +1281,10 @@ merge(Compressor.prototype, { } : side_effects_external : return_false; var funarg = candidate.name instanceof AST_SymbolFunarg; var hit = funarg; - var abort = false, replaced = 0, can_replace = !args || !hit; + var abort = false; + var replaced = 0; + var assign_used = false; + var can_replace = !args || !hit; if (!can_replace) { for (var j = compressor.self().argnames.lastIndexOf(candidate.name) + 1; !abort && j < args.length; j++) { args[j].transform(scanner); @@ -1255,14 +1295,23 @@ merge(Compressor.prototype, { statements[i].transform(scanner); } if (value_def) { - var def = candidate.name.definition(); - if (abort && def.references.length - def.replaced > replaced) replaced = false; - else { + var def = lhs.definition(); + var referenced = def.references.length - def.replaced; + if (candidate instanceof AST_Assign) referenced--; + if (replaced && referenced == replaced) { abort = false; + } else if (candidate instanceof AST_Assign) { + candidates.push(hit_stack); + force_single = true; + continue; + } else { + replaced = false; + } + if (replaced) { hit_index = 0; hit = funarg; for (var i = stat_index; !abort && i < statements.length; i++) { - statements[i].transform(multi_replacer); + if (!statements[i].transform(multi_replacer)) statements.splice(i--, 1); } value_def.single_use = false; } @@ -1331,10 +1380,10 @@ merge(Compressor.prototype, { return side_effects || lhs instanceof AST_PropAccess || may_modify(lhs); } if (node instanceof AST_Function) { - return compressor.option("ie8") && node.name && node.name.name in lvalues; + return compressor.option("ie8") && node.name && lvalues.has(node.name.name); } if (node instanceof AST_PropAccess) { - return side_effects || node.expression.may_throw_on_access(compressor); + return side_effects || !value_def && node.expression.may_throw_on_access(compressor); } if (node instanceof AST_SymbolRef) { if (symbol_in_lvalues(node, parent)) { @@ -1345,10 +1394,10 @@ merge(Compressor.prototype, { if (node instanceof AST_This) return symbol_in_lvalues(node, parent); if (node instanceof AST_VarDef) { if (!node.value) return false; - return node.name.name in lvalues || side_effects && may_modify(node.name); + return lvalues.has(node.name.name) || side_effects && may_modify(node.name); } var sym = is_lhs(node.left, node); - if (sym && sym.name in lvalues) return true; + if (sym && lvalues.has(sym.name)) return true; if (sym instanceof AST_PropAccess) return true; } @@ -1404,7 +1453,9 @@ merge(Compressor.prototype, { function extract_candidates(expr) { hit_stack.push(expr); - if (expr instanceof AST_Assign) { + if (expr instanceof AST_Array) { + expr.elements.forEach(extract_candidates); + } else if (expr instanceof AST_Assign) { candidates.push(hit_stack.slice()); extract_candidates(expr.left); extract_candidates(expr.right); @@ -1451,6 +1502,14 @@ merge(Compressor.prototype, { if (expr.alternative && !(expr.alternative instanceof AST_Block)) { extract_candidates(expr.alternative); } + } else if (expr instanceof AST_Object) { + expr.properties.forEach(function(prop) { + if (prop instanceof AST_ObjectKeyVal) { + hit_stack.push(prop); + extract_candidates(prop.value); + hit_stack.pop(); + } + }); } else if (expr instanceof AST_Sequence) { expr.expressions.forEach(extract_candidates); } else if (expr instanceof AST_SimpleStatement) { @@ -1481,8 +1540,12 @@ merge(Compressor.prototype, { function find_stop(node, level) { var parent = scanner.parent(level); + if (parent instanceof AST_Array) return value_def ? find_stop(parent, level + 1) : node; if (parent instanceof AST_Assign) return node; - if (parent instanceof AST_Binary) return node; + if (parent instanceof AST_Binary) { + if (!value_def || parent.left !== node) return node; + return find_stop(parent, level + 1); + } if (parent instanceof AST_Call) return node; if (parent instanceof AST_Case) return node; if (parent instanceof AST_Conditional) return node; @@ -1490,6 +1553,9 @@ merge(Compressor.prototype, { if (parent instanceof AST_Exit) return node; if (parent instanceof AST_If) return node; if (parent instanceof AST_IterationStatement) return node; + if (parent instanceof AST_ObjectKeyVal) { + return value_def ? find_stop(scanner.parent(level + 1), level + 2) : node; + } if (parent instanceof AST_PropAccess) return node; if (parent instanceof AST_Sequence) { return (parent.tail_node() === node ? find_stop : find_stop_unused)(parent, level + 1); @@ -1505,6 +1571,7 @@ merge(Compressor.prototype, { var parent = scanner.parent(level); if (is_last_node(node, parent)) return node; if (in_conditional(node, parent)) return node; + if (parent instanceof AST_Array) return find_stop_unused(parent, level + 1); if (parent instanceof AST_Assign) return find_stop_unused(parent, level + 1); if (parent instanceof AST_Binary) return find_stop_unused(parent, level + 1); if (parent instanceof AST_Call) return find_stop_unused(parent, level + 1); @@ -1514,7 +1581,17 @@ merge(Compressor.prototype, { if (parent instanceof AST_Exit) return find_stop_unused(parent, level + 1); if (parent instanceof AST_If) return find_stop_unused(parent, level + 1); if (parent instanceof AST_IterationStatement) return node; - if (parent instanceof AST_PropAccess) return find_stop_unused(parent, level + 1); + if (parent instanceof AST_ObjectKeyVal) return find_stop_unused(scanner.parent(level + 1), level + 2); + if (parent instanceof AST_PropAccess) { + var exp = parent.expression; + if (exp === node) return find_stop_unused(parent, level + 1); + var sym = root_expr(exp); + if (!(sym instanceof AST_SymbolRef)) return find_stop_unused(parent, level + 1); + var lvalue = lvalues.get(sym.name); + return !lvalue || all(lvalue, function(lhs) { + return !(lhs instanceof AST_PropAccess); + }) ? find_stop_unused(parent, level + 1) : node; + } if (parent instanceof AST_Sequence) return find_stop_unused(parent, level + 1); if (parent instanceof AST_SimpleStatement) return find_stop_unused(parent, level + 1); if (parent instanceof AST_Switch) return find_stop_unused(parent, level + 1); @@ -1523,8 +1600,11 @@ merge(Compressor.prototype, { return null; } - function mangleable_var(var_def) { - var value = var_def.value; + function mangleable_var(value) { + if (force_single) { + force_single = false; + return; + } if (!(value instanceof AST_SymbolRef)) return; var def = value.definition(); if (def.undeclared) return; @@ -1539,11 +1619,21 @@ merge(Compressor.prototype, { var referenced = def.references.length - def.replaced; var declared = def.orig.length - def.eliminated; if (declared > 1 && !(expr.name instanceof AST_SymbolFunarg) - || (referenced > 1 ? mangleable_var(expr) : !compressor.exposed(def))) { + || (referenced > 1 ? mangleable_var(expr.value) : !compressor.exposed(def))) { return make_node(AST_SymbolRef, expr.name, expr.name); } + } else if (expr instanceof AST_Assign) { + var lhs = expr.left; + if (expr.operator == "=" && lhs instanceof AST_SymbolRef) { + var def = lhs.definition(); + if (def.references[0] === lhs) { + var referenced = def.references.length - def.replaced; + if (referenced > 1) mangleable_var(expr.right); + } + } + return lhs; } else { - return expr[expr instanceof AST_Assign ? "left" : "expression"]; + return expr.expression; } } @@ -1612,10 +1702,8 @@ merge(Compressor.prototype, { } function get_lvalues(expr) { - var lvalues = Object.create(null); - if (candidate instanceof AST_VarDef) { - lvalues[candidate.name.name] = lhs; - } + var lvalues = new Dictionary(); + if (candidate instanceof AST_VarDef) lvalues.add(candidate.name.name, lhs); var scan_iife = scope instanceof AST_Toplevel; var tw = new TreeWalker(function(node) { if (scan_iife && node.TYPE == "Call") { @@ -1632,9 +1720,7 @@ merge(Compressor.prototype, { } else if (node instanceof AST_This) { value = node; } - if (value && !lvalues[node.name]) { - lvalues[node.name] = is_modified(compressor, tw, node, value, 0); - } + if (value) lvalues.add(node.name, is_modified(compressor, tw, node, value, 0)); }); expr.walk(tw); return lvalues; @@ -1652,26 +1738,22 @@ merge(Compressor.prototype, { var found = false; return statements[stat_index].transform(new TreeTransformer(function(node, descend, in_list) { if (found) return node; + if (node instanceof AST_Scope) return node; if (node !== expr && node.body !== expr) return; + found = true; if (node instanceof AST_VarDef) { - found = true; node.value = null; return node; } - if (in_list) { - found = true; - return MAP.skip; - } - if (!this.parent()) { - found = true; - return null; - } - }, function(node) { - if (node instanceof AST_Sequence) switch (node.expressions.length) { - case 0: return null; - case 1: return node.expressions[0]; - } - })); + return in_list ? MAP.skip : null; + }, patch_sequence)); + } + + function patch_sequence(node) { + if (node instanceof AST_Sequence) switch (node.expressions.length) { + case 0: return null; + case 1: return node.expressions[0]; + } } function is_lhs_local(lhs) { @@ -1679,7 +1761,7 @@ merge(Compressor.prototype, { return sym instanceof AST_SymbolRef && sym.definition().scope === scope && !(in_loop - && (sym.name in lvalues && lvalues[sym.name] !== lhs + && (lvalues.has(sym.name) && lvalues.get(sym.name)[0] !== lhs || candidate instanceof AST_Unary || candidate instanceof AST_Assign && candidate.operator != "=")); } @@ -1707,9 +1789,11 @@ merge(Compressor.prototype, { } function symbol_in_lvalues(sym, parent) { - var lvalue = lvalues[sym.name]; - if (!lvalue) return; - if (lvalue !== lhs) return true; + var lvalue = lvalues.get(sym.name); + if (!lvalue || all(lvalue, function(lhs) { + return !lhs; + })) return; + if (lvalue[0] !== lhs) return true; scan_rhs = false; } @@ -1798,6 +1882,7 @@ merge(Compressor.prototype, { stat.alternative = make_node(AST_BlockStatement, stat, { body: body }); + statements[i] = stat; statements[i] = stat.transform(compressor); continue; } @@ -1810,6 +1895,7 @@ merge(Compressor.prototype, { stat.condition = negated; statements[j] = stat.body; stat.body = next; + statements[i] = stat; statements[i] = stat.transform(compressor); continue; } @@ -1827,6 +1913,7 @@ merge(Compressor.prototype, { stat.alternative = make_node(AST_BlockStatement, stat.alternative, { body: body }); + statements[i] = stat; statements[i] = stat.transform(compressor); continue; } @@ -2707,6 +2794,14 @@ merge(Compressor.prototype, { }); } + AST_Lambda.DEFMETHOD("first_statement", function() { + var body = this.body; + for (var i = 0; i < body.length; i++) { + var stat = body[i]; + if (!(stat instanceof AST_Directive)) return stat; + } + }); + function try_evaluate(compressor, node) { var ev = node.evaluate(compressor); if (ev === node) return node; @@ -3081,7 +3176,7 @@ merge(Compressor.prototype, { if (fn instanceof AST_Lambda) { if (fn.evaluating) return this; if (fn.name && fn.name.definition().recursive_refs > 0) return this; - var stat = fn.body[0]; + var stat = fn.first_statement(); if (!(stat instanceof AST_Return)) return this; var args = eval_args(this.args); if (!args) return this; @@ -3863,7 +3958,7 @@ merge(Compressor.prototype, { def.value = null; head.push(def); } else { - var value = def.value && def.value.drop_side_effect_free(compressor); + var value = def.value && !def.value.single_use && def.value.drop_side_effect_free(compressor); if (value) { AST_Node.warn("Side effects in initialization of unused variable {name} [{file}:{line},{col}]", template(def.name)); side_effects.push(value); @@ -5346,7 +5441,7 @@ merge(Compressor.prototype, { } } } - var stat = is_func && fn.body[0]; + var stat = is_func && fn.first_statement(); var can_inline = compressor.option("inline") && !self.is_expr_pure(compressor); if (exp === fn && can_inline && stat instanceof AST_Return) { var value = stat.value; @@ -5794,14 +5889,15 @@ merge(Compressor.prototype, { self.right = tmp; } } - if (commutativeOperators[self.operator] && self.right.is_constant() && !self.left.is_constant()) { + if (commutativeOperators[self.operator] + && self.right.is_constant() + && !self.left.is_constant() + && !(self.left instanceof AST_Binary + && PRECEDENCE[self.left.operator] >= PRECEDENCE[self.operator])) { // if right is a constant, whatever side effects the // left side might have could not influence the // result. hence, force switch. - if (!(self.left instanceof AST_Binary - && PRECEDENCE[self.left.operator] >= PRECEDENCE[self.operator])) { - reverse(); - } + reverse(); } self = self.lift_sequences(compressor); if (compressor.option("assignments") && lazy_op[self.operator]) { @@ -6112,6 +6208,26 @@ merge(Compressor.prototype, { }); break; } + // (a + b) + 3 => 3 + (a + b) + if (compressor.option("unsafe_math") + && self.left instanceof AST_Binary + && PRECEDENCE[self.left.operator] == PRECEDENCE[self.operator] + && self.right.is_constant() + && (self.right.is_boolean(compressor) || self.right.is_number(compressor)) + && self.left.is_number(compressor) + && !self.left.right.is_constant() + && (self.left.left.is_boolean(compressor) || self.left.left.is_number(compressor))) { + self = make_node(AST_Binary, self, { + operator: self.left.operator, + left: make_node(AST_Binary, self, { + operator: self.operator, + left: self.right, + right: self.left.left + }), + right: self.left.right + }); + break; + } case "-": // a - -b => a + b if (self.right instanceof AST_UnaryPrefix @@ -6398,6 +6514,15 @@ merge(Compressor.prototype, { fixed = make_node(AST_Function, fixed, fixed); fixed.name = make_node(AST_SymbolLambda, fixed.name, fixed.name); } + if (fixed instanceof AST_Lambda) { + var scope = self.scope; + fixed.enclosed.forEach(function(def) { + if (fixed.variables.has(def.name)) return; + if (scope.var_names()[def.name]) return; + scope.enclosed.push(def); + scope.var_names()[def.name] = true; + }); + } var value; if (def.recursive_refs > 0) { value = fixed.clone(true); @@ -6439,14 +6564,13 @@ merge(Compressor.prototype, { if (fixed && def.should_replace === undefined) { var init; if (fixed instanceof AST_This) { - if (!(def.orig[0] instanceof AST_SymbolFunarg) && all(def.references, function(ref) { - return def.scope === ref.scope; - })) { + if (!(def.orig[0] instanceof AST_SymbolFunarg) && same_scope(def)) { init = fixed; } } else { var ev = fixed.evaluate(compressor); - if (ev !== fixed && (compressor.option("unsafe_regexp") || !(ev instanceof RegExp))) { + if (ev !== fixed && (!(ev instanceof RegExp) + || compressor.option("unsafe_regexp") && !def.cross_loop && same_scope(def))) { init = make_node_from_constant(ev, fixed); } } @@ -6483,6 +6607,13 @@ merge(Compressor.prototype, { } return self; + function same_scope(def) { + var scope = def.scope.resolve(); + return all(def.references, function(ref) { + return scope === ref.scope.resolve(); + }); + } + function has_symbol_ref(value) { var found; value.walk(new TreeWalker(function(node) { @@ -6640,8 +6771,8 @@ merge(Compressor.prototype, { self.right = self.right.left; } } - if ((self.operator == "+=" || self.operator == "-=") - && self.left.is_number(compressor) + if ((self.operator == "-=" || self.operator == "+=" + && (self.left.is_boolean(compressor) || self.left.is_number(compressor))) && self.right instanceof AST_Number && self.right.getValue() === 1) { var op = self.operator.slice(0, -1); diff --git a/node_modules/uglify-js/lib/output.js b/node_modules/uglify-js/lib/output.js index d59176c..0f8ef1c 100644 --- a/node_modules/uglify-js/lib/output.js +++ b/node_modules/uglify-js/lib/output.js @@ -711,16 +711,23 @@ function OutputStream(options) { PARENS(AST_Sequence, function(output) { var p = output.parent(); - return p instanceof AST_Call // (foo, bar)() or foo(1, (2, 3), 4) - || p instanceof AST_Unary // !(foo, bar, baz) - || p instanceof AST_Binary // 1 + (2, 3) + 4 ==> 8 - || p instanceof AST_VarDef // var a = (1, 2), b = a + a; ==> b == 4 - || p instanceof AST_PropAccess // (1, {foo:2}).foo or (1, {foo:2})["foo"] ==> 2 - || p instanceof AST_Array // [ 1, (2, 3), 4 ] ==> [ 1, 3, 4 ] - || p instanceof AST_ObjectProperty // { foo: (1, 2) }.foo ==> 2 - || p instanceof AST_Conditional /* (false, true) ? (a = 10, b = 20) : (c = 30) - * ==> 20 (side effect, set a := 10 and b := 20) */ - ; + // (foo, bar)() or foo(1, (2, 3), 4) + return p instanceof AST_Call + // !(foo, bar, baz) + || p instanceof AST_Unary + // 1 + (2, 3) + 4 ==> 8 + || p instanceof AST_Binary + // var a = (1, 2), b = a + a; ==> b == 4 + || p instanceof AST_VarDef + // (1, {foo:2}).foo or (1, {foo:2})["foo"] ==> 2 + || p instanceof AST_PropAccess && p.expression === this + // [ 1, (2, 3), 4 ] ==> [ 1, 3, 4 ] + || p instanceof AST_Array + // { foo: (1, 2) }.foo ==> 2 + || p instanceof AST_ObjectProperty + // (false, true) ? (a = 10, b = 20) : (c = 30) + // ==> 20 (side effect, set a := 10 and b := 20) + || p instanceof AST_Conditional; }); PARENS(AST_Binary, function(output) { diff --git a/node_modules/uglify-js/lib/parse.js b/node_modules/uglify-js/lib/parse.js index 16d8dad..c9ee01f 100644 --- a/node_modules/uglify-js/lib/parse.js +++ b/node_modules/uglify-js/lib/parse.js @@ -787,20 +787,18 @@ function parse($TEXT, options) { handle_regexp(); switch (S.token.type) { case "string": - if (S.in_directives) { - var token = peek(); - if (S.token.raw.indexOf("\\") == -1 - && (is_token(token, "punc", ";") - || is_token(token, "punc", "}") - || has_newline_before(token) - || is_token(token, "eof"))) { - S.input.add_directive(S.token.value); + var dir = S.in_directives; + var body = expression(true); + if (dir) { + var token = body.start; + if (body instanceof AST_String && token.raw.indexOf("\\") == -1) { + S.input.add_directive(token.value); } else { - S.in_directives = false; + S.in_directives = dir = false; } } - var dir = S.in_directives, stat = simple_statement(); - return dir ? new AST_Directive(stat.body) : stat; + semicolon(); + return dir ? new AST_Directive(body) : new AST_SimpleStatement({ body: body }); case "num": case "regexp": case "operator": @@ -965,8 +963,10 @@ function parse($TEXT, options) { return new AST_LabeledStatement({ body: stat, label: label }); } - function simple_statement(tmp) { - return new AST_SimpleStatement({ body: (tmp = expression(true), semicolon(), tmp) }); + function simple_statement() { + var body = expression(true); + semicolon(); + return new AST_SimpleStatement({ body: body }); } function break_cont(type) { diff --git a/node_modules/uglify-js/package.json b/node_modules/uglify-js/package.json index ad1b988..772497a 100644 --- a/node_modules/uglify-js/package.json +++ b/node_modules/uglify-js/package.json @@ -1,8 +1,8 @@ { "_from": "uglify-js@^3.1.4", - "_id": "uglify-js@3.7.0", + "_id": "uglify-js@3.7.1", "_inBundle": false, - "_integrity": "sha512-PC/ee458NEMITe1OufAjal65i6lB58R1HWMRcxwvdz1UopW0DYqlRL3xdu3IcTvTXsB02CRHykidkTRL+A3hQA==", + "_integrity": "sha512-pnOF7jY82wdIhATVn87uUY/FHU+MDUdPLkmGFvGoclQmeu229eTkbG5gjGGBi3R7UuYYSEeYXY/TTY5j2aym2g==", "_location": "/uglify-js", "_phantomChildren": {}, "_requested": { @@ -18,10 +18,10 @@ "_requiredBy": [ "/handlebars" ], - "_resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.0.tgz", - "_shasum": "14b854003386b7a7c045910f43afbc96d2aa5307", + "_resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.1.tgz", + "_shasum": "35c7de17971a4aa7689cd2eae0a5b39bb838c0c5", "_spec": "uglify-js@^3.1.4", - "_where": "/home/suroh/Repos/11ty.work/node_modules/handlebars", + "_where": "/home/suroh/Repos/work.suroh.tk/node_modules/handlebars", "author": { "name": "Mihai Bazon", "email": "mihai.bazon@gmail.com", @@ -99,5 +99,5 @@ "scripts": { "test": "node test/compress.js && node test/mocha.js" }, - "version": "3.7.0" + "version": "3.7.1" } diff --git a/package-lock.json b/package-lock.json index 88cfc23..6557b97 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,8 @@ { - "requires": true, + "name": "work.suroh.tk", + "version": "1.0.0", "lockfileVersion": 1, + "requires": true, "dependencies": { "@11ty/eleventy": { "version": "0.9.0", @@ -1154,14 +1156,14 @@ "dev": true }, "dependency-tree": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/dependency-tree/-/dependency-tree-7.1.0.tgz", - "integrity": "sha512-emsssimgZFIsTL1d6eaDoipwIIjMENwUODjOwv0G7V5mwPMmeiTmvKpHjYes0/oH3PM7Yjl85D3jIzYHh7w31Q==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/dependency-tree/-/dependency-tree-7.2.0.tgz", + "integrity": "sha512-41LepYuMZNfd/wk7ppfhaOp8dzzd37t9hLP8XKg9WDQZ3u2WmNCR3eZOF/6jDatV+3OL4ChOON9a/UIeC75bYw==", "dev": true, "requires": { "commander": "^2.19.0", "debug": "^4.1.1", - "filing-cabinet": "^2.3.1", + "filing-cabinet": "^2.5.1", "precinct": "^6.2.0" } }, @@ -1674,9 +1676,9 @@ } }, "fast-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.1.0.tgz", - "integrity": "sha512-TrUz3THiq2Vy3bjfQUB2wNyPdGBeGmdjbzzBLhfHN4YFurYptCKwGq/TfiRavbGywFRzY6U2CdmQ1zmsY5yYaw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.1.1.tgz", + "integrity": "sha512-nTCREpBY8w8r+boyFYAx21iL6faSsQynliPHM4Uf56SbkyohCNxpVPEH9xrF5TXKy+IsjkPUHDKiUkzBVRXn9g==", "dev": true, "requires": { "@nodelib/fs.stat": "^2.0.2", @@ -1762,9 +1764,9 @@ "dev": true }, "filing-cabinet": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/filing-cabinet/-/filing-cabinet-2.5.0.tgz", - "integrity": "sha512-RUMWQT/Og4m4D7PFOqTZCTumg6QwlNnpV/adYGPUzWMaOnta/jDirp/4meXx+cwBKFrztEmZTPIkrZy0G1LwOA==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/filing-cabinet/-/filing-cabinet-2.5.1.tgz", + "integrity": "sha512-GWOdObzou2L0HrJUk8MpJa01q0ZOwuTwTssM2+P+ABJWEGlVWd6ueEatANFdin94/3rdkVSdqpH14VqCNqp3RA==", "dev": true, "requires": { "app-module-path": "^2.2.0", @@ -5553,9 +5555,9 @@ "dev": true }, "uglify-js": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.0.tgz", - "integrity": "sha512-PC/ee458NEMITe1OufAjal65i6lB58R1HWMRcxwvdz1UopW0DYqlRL3xdu3IcTvTXsB02CRHykidkTRL+A3hQA==", + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.1.tgz", + "integrity": "sha512-pnOF7jY82wdIhATVn87uUY/FHU+MDUdPLkmGFvGoclQmeu229eTkbG5gjGGBi3R7UuYYSEeYXY/TTY5j2aym2g==", "dev": true, "optional": true, "requires": {