From fd6d539027e176713a74893463e0747a6e733156 Mon Sep 17 00:00:00 2001 From: Steven Hugg Date: Sun, 11 Jul 2021 12:05:57 -0500 Subject: [PATCH] npm audit --- Makefile | 6 +- package-lock.json | 145 ++++++----------------------------- package.json | 2 +- scripts/sync-dev.sh | 5 -- scripts/sync-version-prod.sh | 19 ----- 5 files changed, 30 insertions(+), 147 deletions(-) delete mode 100755 scripts/sync-dev.sh delete mode 100755 scripts/sync-version-prod.sh diff --git a/Makefile b/Makefile index 12f4b406..f10d5257 100644 --- a/Makefile +++ b/Makefile @@ -57,10 +57,14 @@ VERSION := $(shell git tag -l --points-at HEAD) syncdev: distro cp config.js $(TMP) aws --profile pzp s3 sync --follow-symlinks $(TMP)/ s3://8bitworkshop.com/dev + rsync --stats -riltz --chmod=a+rx -e "ssh" $(TMP)/ config.js $RSYNC_PATH/dev/ syncprod: distro @[ "${VERSION}" ] || ( echo ">> No version set at HEAD, tag it first"; exit 1 ) echo Version: $(VERSION) + grep -H "var VERSION" web/redir.html + grep -H "var VERSION" web/projects/projects.js + read cp config.js $(TMP) aws --profile pzp s3 sync --follow-symlinks $(TMP)/ s3://8bitworkshop.com/v$(VERSION) - + rsync --stats -riltz --chmod=a+rx -e "ssh" $(TMP)/ config.js $RSYNC_PATH/v$VERSION/ diff --git a/package-lock.json b/package-lock.json index 87350dba..bc740596 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,7 @@ "mocha-simple-html-reporter": "^2.0.0", "mousetrap": "^1.6.5", "nightwatch": "^1.6.4", - "octokat": "^0.10.0", + "octokat": "^0.8.0", "pngjs": "^3.4.0", "rgbquant": "^1.1.2", "split.js": "^1.6.2", @@ -3647,27 +3647,6 @@ "node": ">= 0.8" } }, - "node_modules/encoding": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", - "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "dev": true, - "dependencies": { - "iconv-lite": "^0.6.2" - } - }, - "node_modules/encoding/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -3946,26 +3925,6 @@ "pend": "~1.2.0" } }, - "node_modules/fetch-vcr": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fetch-vcr/-/fetch-vcr-1.1.2.tgz", - "integrity": "sha512-bFOx3+5YtViximcqhG05tqMlsyPRXNOmiToDCf6TyVUCKHYP/vGPmn0HUhGVNd1jI0KpElwz+RH3X/ZQo0Asfg==", - "dev": true, - "dependencies": { - "node-fetch": "^1.6.3", - "whatwg-fetch": "^2.0.3" - } - }, - "node_modules/fetch-vcr/node_modules/node-fetch": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", - "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", - "dev": true, - "dependencies": { - "encoding": "^0.1.11", - "is-stream": "^1.0.1" - } - }, "node_modules/file-saver": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", @@ -6858,15 +6817,6 @@ "semver": "bin/semver" } }, - "node_modules/node-fetch": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", - "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", - "dev": true, - "engines": { - "node": "4.x || >=6.0.0" - } - }, "node_modules/normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -7146,14 +7096,13 @@ } }, "node_modules/octokat": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/octokat/-/octokat-0.10.0.tgz", - "integrity": "sha512-VJ21L1gMlByYMurduLYiOcI8AwlZkUV8OXRN8pMXsbkIqIVqn0tgdTfxzWM9spX4VJTTG02OgqwDTqQsOmDing==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/octokat/-/octokat-0.8.0.tgz", + "integrity": "sha1-UIQcolV0P5GnFdEaG9528u782Xo=", "dev": true, "dependencies": { - "fetch-vcr": "^1.1.0", "lodash": "^4.16.4", - "node-fetch": "^2.0.0" + "xmlhttprequest": "~1.8.0" } }, "node_modules/once": { @@ -9545,12 +9494,6 @@ "iconv-lite": "0.4.24" } }, - "node_modules/whatwg-fetch": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz", - "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==", - "dev": true - }, "node_modules/whatwg-mimetype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", @@ -9814,6 +9757,15 @@ "node": ">=10.0.0" } }, + "node_modules/xmlhttprequest": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz", + "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/xregexp": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz", @@ -12846,26 +12798,6 @@ "dev": true, "optional": true }, - "encoding": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", - "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "dev": true, - "requires": { - "iconv-lite": "^0.6.2" - }, - "dependencies": { - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - } - } - }, "end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -13074,28 +13006,6 @@ "pend": "~1.2.0" } }, - "fetch-vcr": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fetch-vcr/-/fetch-vcr-1.1.2.tgz", - "integrity": "sha512-bFOx3+5YtViximcqhG05tqMlsyPRXNOmiToDCf6TyVUCKHYP/vGPmn0HUhGVNd1jI0KpElwz+RH3X/ZQo0Asfg==", - "dev": true, - "requires": { - "node-fetch": "^1.6.3", - "whatwg-fetch": "^2.0.3" - }, - "dependencies": { - "node-fetch": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", - "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", - "dev": true, - "requires": { - "encoding": "^0.1.11", - "is-stream": "^1.0.1" - } - } - } - }, "file-saver": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", @@ -15378,12 +15288,6 @@ } } }, - "node-fetch": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", - "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", - "dev": true - }, "normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -15604,14 +15508,13 @@ } }, "octokat": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/octokat/-/octokat-0.10.0.tgz", - "integrity": "sha512-VJ21L1gMlByYMurduLYiOcI8AwlZkUV8OXRN8pMXsbkIqIVqn0tgdTfxzWM9spX4VJTTG02OgqwDTqQsOmDing==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/octokat/-/octokat-0.8.0.tgz", + "integrity": "sha1-UIQcolV0P5GnFdEaG9528u782Xo=", "dev": true, "requires": { - "fetch-vcr": "^1.1.0", "lodash": "^4.16.4", - "node-fetch": "^2.0.0" + "xmlhttprequest": "~1.8.0" } }, "once": { @@ -17466,12 +17369,6 @@ "iconv-lite": "0.4.24" } }, - "whatwg-fetch": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz", - "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==", - "dev": true - }, "whatwg-mimetype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", @@ -17691,6 +17588,12 @@ "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==", "dev": true }, + "xmlhttprequest": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz", + "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=", + "dev": true + }, "xregexp": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz", diff --git a/package.json b/package.json index 8c7650cf..87ea7b23 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "mocha-simple-html-reporter": "^2.0.0", "mousetrap": "^1.6.5", "nightwatch": "^1.6.4", - "octokat": "^0.10.0", + "octokat": "^0.8.0", "pngjs": "^3.4.0", "rgbquant": "^1.1.2", "split.js": "^1.6.2", diff --git a/scripts/sync-dev.sh b/scripts/sync-dev.sh deleted file mode 100755 index 448e8398..00000000 --- a/scripts/sync-dev.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -DESTPATH=$RSYNC_PATH/dev/ -make dist -rsync --stats -riltz --chmod=a+rx -e "ssh" ./tmp/dist/ config.js $DESTPATH/ diff --git a/scripts/sync-version-prod.sh b/scripts/sync-version-prod.sh deleted file mode 100755 index 57c5e55a..00000000 --- a/scripts/sync-version-prod.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -#. ./scripts/env.sh -#VERSION=`git tag | tail -1` -VERSION=`git tag -l --points-at HEAD` -if [ "$VERSION" == "" ]; then - echo "No version at HEAD! Tag it first!" - exit 1 -fi -DESTPATH=$RSYNC_PATH/v$VERSION -DEVPATH=/var/www/html/8bitworkshop.com/dev -grep -H "var VERSION" web/redir.html -grep -H "var VERSION" web/projects/projects.js -echo "Upload version $VERSION to production?" -read -make dist -echo "Copying to $DESTPATH..." -rsync --stats -riltz --chmod=a+rx -e "ssh" ./tmp/dist/ config.js $DESTPATH/ -echo "Done."