From 3b14b32aad9d73a8cd709aa4e609625c2845db24 Mon Sep 17 00:00:00 2001 From: Andy Rothwell Date: Wed, 29 Nov 2023 10:58:49 -0500 Subject: [PATCH] tries push with node 16.x and caching --- .github/workflows/dev_push_to_s3.yml | 13 ++- package-lock.json | 150 +++++++++++++++------------ 2 files changed, 90 insertions(+), 73 deletions(-) diff --git a/.github/workflows/dev_push_to_s3.yml b/.github/workflows/dev_push_to_s3.yml index 07deb14..e1089b1 100644 --- a/.github/workflows/dev_push_to_s3.yml +++ b/.github/workflows/dev_push_to_s3.yml @@ -14,12 +14,17 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Use Node.js 18 - uses: actions/setup-node@v4 + - uses: actions/checkout@master + - name: Use Node.js 16.x + uses: actions/setup-node@v3 with: - node-version: '18' + node-version: '16.x' + cache: 'npm' + - name: install npm 6 + run: | + npm install -g npm@6 + - name: npm install, and build run: | printf "@fortawesome:registry=https://npm.fontawesome.com/\n//npm.fontawesome.com/:_authToken=${FONTAWESOME_NPM_AUTH_TOKEN}" >> ~/.npmrc diff --git a/package-lock.json b/package-lock.json index a8db883..3cc3aa3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4329,12 +4329,12 @@ } }, "@phila/mapboard": { - "version": "git+https://github.com/CityOfPhiladelphia/mapboard.git#b07f96e845613cdca8ea104317755b03a0c3280c", - "from": "git+https://github.com/CityOfPhiladelphia/mapboard.git#b07f96e", + "version": "git+ssh://git@github.com/CityOfPhiladelphia/mapboard.git#b07f96e845613cdca8ea104317755b03a0c3280c", + "from": "@phila/mapboard@https://github.com/CityOfPhiladelphia/mapboard#b07f96e", "requires": { "@mapbox/geo-viewport": "^0.5.0", - "@phila/vue-comps": "git+https://github.com/CityOfPhiladelphia/phila-vue-comps.git#99dcb81", - "@phila/vue-datafetch": "git+https://github.com/CityOfPhiladelphia/phila-vue-datafetch.git#a314a5b", + "@phila/vue-comps": "@phila/vue-comps@git+https://github.com/CityOfPhiladelphia/phila-vue-comps.git#99dcb81", + "@phila/vue-datafetch": "@phila/vue-datafetch@git+https://github.com/CityOfPhiladelphia/phila-vue-datafetch.git#a314a5b", "@phila/vue-mapping": "3.1.20", "vue": "^2.7.10", "vue-i18n": "^8.22.0", @@ -4343,8 +4343,8 @@ } }, "@phila/vue-comps": { - "version": "git+https://github.com/CityOfPhiladelphia/phila-vue-comps.git#99dcb81c2bf7ea1a60907523e14bab3c4549a0fb", - "from": "git+https://github.com/CityOfPhiladelphia/phila-vue-comps.git#99dcb81", + "version": "git+ssh://git@github.com/CityOfPhiladelphia/phila-vue-comps.git#99dcb81c2bf7ea1a60907523e14bab3c4549a0fb", + "from": "@phila/vue-comps@git+https://github.com/CityOfPhiladelphia/phila-vue-comps.git#99dcb81", "requires": { "@fortawesome/fontawesome-svg-core": "1.2.36", "@fortawesome/free-regular-svg-icons": "5.15.4", @@ -4362,8 +4362,8 @@ } }, "@phila/vue-datafetch": { - "version": "git+https://github.com/CityOfPhiladelphia/phila-vue-datafetch.git#a314a5b196c6961fcad782bc1eaed8bd0e5ef139", - "from": "git+https://github.com/CityOfPhiladelphia/phila-vue-datafetch.git#a314a5b", + "version": "git+ssh://git@github.com/CityOfPhiladelphia/phila-vue-datafetch.git#a314a5b196c6961fcad782bc1eaed8bd0e5ef139", + "from": "@phila/vue-datafetch@git+https://github.com/CityOfPhiladelphia/phila-vue-datafetch.git#a314a5b", "requires": { "@turf/turf": "^6.5.0", "airtable": "^0.8.1", @@ -4388,29 +4388,29 @@ "@fortawesome/vue-fontawesome": "2.0.5", "@mapbox/mapbox-gl-draw": "^1.2.0", "@turf/turf": "^6.5.0", - "Leaflet-PointInPolygon": "git+https://github.com/CityOfPhiladelphia/Leaflet.PointInPolygon.git#a0d410f69aacf5f9165c4d01ccffeed824ccaed8", + "Leaflet-PointInPolygon": "Leaflet-PointInPolygon@git+https://github.com/CityOfPhiladelphia/Leaflet.PointInPolygon.git#a0d410f69aacf5f9165c4d01ccffeed824ccaed8", "arcgis-to-geojson-utils": "^1.0.1", "axios": "^0.19.0", "blueimp-md5": "^2.19.0", "date-fns": "^2.29.2", "esri-leaflet": "3.0.2", - "esri-leaflet-legend": "git+https://github.com/CityOfPhiladelphia/esri-leaflet-legend.git#8fc0a7949b1ce80340261167a1aa4302177bb380", + "esri-leaflet-legend": "esri-leaflet-legend@git+https://github.com/CityOfPhiladelphia/esri-leaflet-legend.git#8fc0a7949b1ce80340261167a1aa4302177bb380", "esri-leaflet-renderers": "2.0.6", "leaflet": "1.7.1", "leaflet-easybutton": "^2.3.0", - "leaflet-measure": "git+https://github.com/CityOfPhiladelphia/leaflet-measure.git#1dd982b2f9c78be2af5f497d9415e66cd3df6216", - "leaflet-omnivore": "git+https://github.com/CityOfPhiladelphia/leaflet-omnivore.git#f072195b03f7930690d9cbccb9375f0eda50fd41", + "leaflet-measure": "leaflet-measure@git+https://github.com/CityOfPhiladelphia/leaflet-measure.git#1dd982b2f9c78be2af5f497d9415e66cd3df6216", + "leaflet-omnivore": "leaflet-omnivore@git+https://github.com/CityOfPhiladelphia/leaflet-omnivore.git#f072195b03f7930690d9cbccb9375f0eda50fd41", "leaflet-rotatedmarker": "^0.2.0", "leaflet-shape-markers": "^1.0.6", - "leaflet-vector-icon": "git+https://github.com/CityOfPhiladelphia/leaflet-vector-icon.git#c37571e92c66ce0003f22058f2d246b31d3941a5", - "leaflet.pointinpolygon": "git+https://github.com/CityOfPhiladelphia/Leaflet.PointInPolygon.git#a0d410f69aacf5f9165c4d01ccffeed824ccaed8", + "leaflet-vector-icon": "leaflet-vector-icon@git+https://github.com/CityOfPhiladelphia/leaflet-vector-icon.git#c37571e92c66ce0003f22058f2d246b31d3941a5", + "leaflet.pointinpolygon": "leaflet.pointinpolygon@git+https://github.com/CityOfPhiladelphia/Leaflet.PointInPolygon.git#a0d410f69aacf5f9165c4d01ccffeed824ccaed8", "lodash-es": "^4.17.14", "map-promisified": "^0.4.0", "maplibre-gl": "2.4.0", "maplibregl-mapbox-request-transformer": "0.0.2", "phila-standards": "^1.0.2", "proj4": "^2.8.0", - "sdleafletdraw": "git+https://github.com/CityOfPhiladelphia/SDLeafletDraw.git#b829efb8979a942dec04e4a2849af6b06434c9cf", + "sdleafletdraw": "sdleafletdraw@git+https://github.com/CityOfPhiladelphia/SDLeafletDraw.git#b829efb8979a942dec04e4a2849af6b06434c9cf", "vue": "^2.7.10", "vuex": "^3.5.1" } @@ -7223,6 +7223,47 @@ "strip-ansi": "^6.0.0" } }, + "@vue/vue-loader-v15": { + "version": "npm:vue-loader@15.11.1", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz", + "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==", + "dev": true, + "requires": { + "@vue/component-compiler-utils": "^3.1.0", + "hash-sum": "^1.0.2", + "loader-utils": "^1.1.0", + "vue-hot-reload-api": "^2.3.0", + "vue-style-loader": "^4.1.0" + }, + "dependencies": { + "hash-sum": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", + "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==", + "dev": true + }, + "json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "loader-utils": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + } + } + } + }, "@webassemblyjs/ast": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", @@ -8026,27 +8067,6 @@ "pretty": "^2.0.0" } }, - "@vue/vue-loader-v15": { - "version": "npm:vue-loader@15.10.1", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.1.tgz", - "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==", - "dev": true, - "requires": { - "@vue/component-compiler-utils": "^3.1.0", - "hash-sum": "^1.0.2", - "loader-utils": "^1.1.0", - "vue-hot-reload-api": "^2.3.0", - "vue-style-loader": "^4.1.0" - }, - "dependencies": { - "hash-sum": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", - "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==", - "dev": true - } - } - }, "@vue/web-component-wrapper": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz", @@ -8220,8 +8240,8 @@ "dev": true }, "Leaflet-PointInPolygon": { - "version": "git+https://github.com/CityOfPhiladelphia/Leaflet.PointInPolygon.git#a0d410f69aacf5f9165c4d01ccffeed824ccaed8", - "from": "git+https://github.com/CityOfPhiladelphia/Leaflet.PointInPolygon.git#a0d410f69aacf5f9165c4d01ccffeed824ccaed8" + "version": "git+ssh://git@github.com/CityOfPhiladelphia/Leaflet.PointInPolygon.git#a0d410f69aacf5f9165c4d01ccffeed824ccaed8", + "from": "Leaflet-PointInPolygon@git+https://github.com/CityOfPhiladelphia/Leaflet.PointInPolygon.git#a0d410f69aacf5f9165c4d01ccffeed824ccaed8" }, "abab": { "version": "1.0.4", @@ -11217,9 +11237,9 @@ "dev": true }, "deasync": { - "version": "0.1.21", - "resolved": "https://registry.npmjs.org/deasync/-/deasync-0.1.21.tgz", - "integrity": "sha512-kUmM8Y+PZpMpQ+B4AuOW9k2Pfx/mSupJtxOsLzmnHY2WqZUYRFccFn2RhzPAqt3Xb+sorK/badW2D4zNzqZz5w==", + "version": "0.1.29", + "resolved": "https://registry.npmjs.org/deasync/-/deasync-0.1.29.tgz", + "integrity": "sha512-EBtfUhVX23CE9GR6m+F8WPeImEE4hR/FW9RkK0PMl9V1t283s0elqsTD8EZjaKX28SY1BW2rYfCgNsAYdpamUw==", "dev": true, "requires": { "bindings": "^1.5.0", @@ -12664,8 +12684,8 @@ } }, "esri-leaflet-legend": { - "version": "git+https://github.com/CityOfPhiladelphia/esri-leaflet-legend.git#8fc0a7949b1ce80340261167a1aa4302177bb380", - "from": "git+https://github.com/CityOfPhiladelphia/esri-leaflet-legend.git#8fc0a7949b1ce80340261167a1aa4302177bb380", + "version": "git+ssh://git@github.com/CityOfPhiladelphia/esri-leaflet-legend.git#8fc0a7949b1ce80340261167a1aa4302177bb380", + "from": "esri-leaflet-legend@git+https://github.com/CityOfPhiladelphia/esri-leaflet-legend.git#8fc0a7949b1ce80340261167a1aa4302177bb380", "requires": { "esri-leaflet": "^2.2.3", "leaflet": "^1.4.0" @@ -13179,8 +13199,8 @@ } }, "file-saver": { - "version": "github:eligrey/FileSaver.js#e865e37af9f9947ddcced76b549e27dc45c1cb2e", - "from": "github:eligrey/FileSaver.js#1.3.8" + "version": "git+ssh://git@github.com/eligrey/FileSaver.js.git#e865e37af9f9947ddcced76b549e27dc45c1cb2e", + "from": "file-saver@github:eligrey/FileSaver.js#1.3.8" }, "file-uri-to-path": { "version": "1.0.0", @@ -13424,9 +13444,9 @@ "dev": true }, "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "optional": true }, @@ -15379,8 +15399,7 @@ "dev": true, "optional": true, "requires": { - "bindings": "^1.5.0", - "nan": "^2.12.1" + "bindings": "^1.5.0" } }, "normalize-path": { @@ -16036,7 +16055,7 @@ "integrity": "sha512-J9X76xnncMw+wIqb15HeWfPMqPwYxSpPY8yWPJ7rAZN/ZDzFkjCSZObryCyUe8zbrVRNiuCnIeQteCzMn7GnWw==", "requires": { "canvg": "1.5.3", - "file-saver": "github:eligrey/FileSaver.js#1.3.8", + "file-saver": "file-saver@github:eligrey/FileSaver.js#1.3.8", "html2canvas": "1.0.0-alpha.12", "omggif": "1.0.7", "promise-polyfill": "8.1.0", @@ -16171,8 +16190,8 @@ } }, "leaflet-measure": { - "version": "git+https://github.com/CityOfPhiladelphia/leaflet-measure.git#1dd982b2f9c78be2af5f497d9415e66cd3df6216", - "from": "git+https://github.com/CityOfPhiladelphia/leaflet-measure.git#1dd982b2f9c78be2af5f497d9415e66cd3df6216", + "version": "git+ssh://git@github.com/CityOfPhiladelphia/leaflet-measure.git#1dd982b2f9c78be2af5f497d9415e66cd3df6216", + "from": "leaflet-measure@git+https://github.com/CityOfPhiladelphia/leaflet-measure.git#1dd982b2f9c78be2af5f497d9415e66cd3df6216", "requires": { "@turf/area": "^5.1.5", "@turf/length": "^5.1.5", @@ -16237,8 +16256,8 @@ } }, "leaflet-omnivore": { - "version": "git+https://github.com/CityOfPhiladelphia/leaflet-omnivore.git#f072195b03f7930690d9cbccb9375f0eda50fd41", - "from": "git+https://github.com/CityOfPhiladelphia/leaflet-omnivore.git#f072195b03f7930690d9cbccb9375f0eda50fd41", + "version": "git+ssh://git@github.com/CityOfPhiladelphia/leaflet-omnivore.git#f072195b03f7930690d9cbccb9375f0eda50fd41", + "from": "leaflet-omnivore@git+https://github.com/CityOfPhiladelphia/leaflet-omnivore.git#f072195b03f7930690d9cbccb9375f0eda50fd41", "requires": { "brfs": "2.0.2", "corslite": "0.0.7", @@ -16302,12 +16321,12 @@ } }, "leaflet-vector-icon": { - "version": "git+https://github.com/CityOfPhiladelphia/leaflet-vector-icon.git#c37571e92c66ce0003f22058f2d246b31d3941a5", - "from": "git+https://github.com/CityOfPhiladelphia/leaflet-vector-icon.git#c37571e92c66ce0003f22058f2d246b31d3941a5" + "version": "git+ssh://git@github.com/CityOfPhiladelphia/leaflet-vector-icon.git#c37571e92c66ce0003f22058f2d246b31d3941a5", + "from": "leaflet-vector-icon@git+https://github.com/CityOfPhiladelphia/leaflet-vector-icon.git#c37571e92c66ce0003f22058f2d246b31d3941a5" }, "leaflet.pointinpolygon": { - "version": "git+https://github.com/CityOfPhiladelphia/Leaflet.PointInPolygon.git#a0d410f69aacf5f9165c4d01ccffeed824ccaed8", - "from": "git+https://github.com/CityOfPhiladelphia/Leaflet.PointInPolygon.git#a0d410f69aacf5f9165c4d01ccffeed824ccaed8" + "version": "git+ssh://git@github.com/CityOfPhiladelphia/Leaflet.PointInPolygon.git#a0d410f69aacf5f9165c4d01ccffeed824ccaed8", + "from": "leaflet.pointinpolygon@git+https://github.com/CityOfPhiladelphia/Leaflet.PointInPolygon.git#a0d410f69aacf5f9165c4d01ccffeed824ccaed8" }, "left-pad": { "version": "1.3.0", @@ -17145,13 +17164,6 @@ "thenify-all": "^1.0.0" } }, - "nan": { - "version": "2.14.2", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", - "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==", - "dev": true, - "optional": true - }, "nanoid": { "version": "3.3.4", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", @@ -19845,8 +19857,8 @@ } }, "sdleafletdraw": { - "version": "git+https://github.com/CityOfPhiladelphia/SDLeafletDraw.git#b829efb8979a942dec04e4a2849af6b06434c9cf", - "from": "git+https://github.com/CityOfPhiladelphia/SDLeafletDraw.git#b829efb8979a942dec04e4a2849af6b06434c9cf", + "version": "git+ssh://git@github.com/CityOfPhiladelphia/SDLeafletDraw.git#b829efb8979a942dec04e4a2849af6b06434c9cf", + "from": "sdleafletdraw@git+https://github.com/CityOfPhiladelphia/SDLeafletDraw.git#b829efb8979a942dec04e4a2849af6b06434c9cf", "requires": { "leaflet": "1.7.1" } @@ -22957,7 +22969,7 @@ "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", "dev": true } }