From 3718388e4055636147d7f29a9db5cf5004c17dac Mon Sep 17 00:00:00 2001 From: Jaroslaw Michalski Date: Thu, 5 Oct 2023 16:15:00 +0100 Subject: [PATCH 1/2] change package source from github to npm registry --- package-lock.json | 121 ++++++++++++++++++++++++---------------------- 1 file changed, 64 insertions(+), 57 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9887941a6..a8c5f5e82 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6295,8 +6295,9 @@ "integrity": "sha512-/S48oUFYEgZMNvdqC87iYRbLBAPHYijPRNrNpm/sS8u7ijIViKm/hrV3YD4sx/W68AsG5zLMyBEditVHApHU5w==" }, "box-intersect": { - "version": "git+ssh://git@github.com/plotly/box-intersect.git#1c21ef897c37eb69e5c1efeca7087726dd8d6a23", - "from": "box-intersect@github:plotly/box-intersect#v1.1.0", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/box-intersect/-/box-intersect-1.0.2.tgz", + "integrity": "sha512-yJeMwlmFPG1gIa7Rs/cGXeI6iOj6Qz5MG5PE61xLKpElUGzmJ4abm+qsLpzxKJFpsSDq742BQEocr8dI2t8Nxw==", "requires": { "bit-twiddle": "^1.0.2", "typedarray-pool": "^1.1.0" @@ -12340,8 +12341,9 @@ "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==" }, "incremental-convex-hull": { - "version": "git+ssh://git@github.com/plotly/incremental-convex-hull.git#352d9e73861913695fd4e1a4c6ad79898c0c8268", - "from": "incremental-convex-hull@github:plotly/incremental-convex-hull#v1.1.0", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/incremental-convex-hull/-/incremental-convex-hull-1.0.1.tgz", + "integrity": "sha1-UUKMFMudmmFEv+abKFH7N3M0vh4=", "requires": { "robust-orientation": "^1.1.2", "simplicial-complex": "^1.0.0" @@ -15514,9 +15516,11 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=" }, "ndarray-gradient": { - "version": "git+ssh://git@github.com/plotly/ndarray-gradient.git#c43b0856d77084cfac7c9d96c6ddc73aeddc0bd8", - "from": "ndarray-gradient@github:plotly/ndarray-gradient#v1.1.0", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ndarray-gradient/-/ndarray-gradient-1.0.1.tgz", + "integrity": "sha512-+xONVi7xxTCGL6KOb11Yyoe0tPNqAUKF39CvFoRjL5pdOmPd2G2pckK9lD5bpLF3q45LLnYNyiUSJSdNmQ2MTg==", "requires": { + "cwise-compiler": "^1.0.0", "dup": "^1.0.0" } }, @@ -15526,13 +15530,19 @@ "integrity": "sha1-eLySuFuavBW25n7mWCj54hN65ys=" }, "ndarray-ops": { - "version": "git+ssh://git@github.com/plotly/ndarray-ops.git#afac881492696196c9966f77507558737f60c716", - "from": "ndarray-ops@github:plotly/ndarray-ops#v1.3.0" + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/ndarray-ops/-/ndarray-ops-1.2.2.tgz", + "integrity": "sha1-WeiNLDKn7ryxvGkPrhQVeVV6YU4=", + "requires": { + "cwise-compiler": "^1.0.0" + } }, "ndarray-pack": { - "version": "git+ssh://git@github.com/plotly/ndarray-pack.git#b0cd1f835c2b623f860a3dbb0c5709c98b30aea0", - "from": "ndarray-pack@github:plotly/ndarray-pack#v1.3.0", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ndarray-pack/-/ndarray-pack-1.2.1.tgz", + "integrity": "sha1-jK6+qqJNXs9w/4YCBjeXfajuWFo=", "requires": { + "cwise-compiler": "^1.1.2", "ndarray": "^1.0.13" }, "dependencies": { @@ -16711,7 +16721,7 @@ "@turf/bbox": "^6.4.0", "@turf/centroid": "^6.0.2", "alpha-shape": "^1.0.0", - "box-intersect": "box-intersect@github:plotly/box-intersect#v1.1.0", + "box-intersect": "^1.0.2", "canvas-fit": "^1.5.0", "color-alpha": "1.0.4", "color-normalize": "1.5.0", @@ -16748,7 +16758,7 @@ "glslify": "^7.1.1", "has-hover": "^1.0.1", "has-passive-events": "^1.0.0", - "incremental-convex-hull": "incremental-convex-hull@github:plotly/incremental-convex-hull#v1.1.0", + "incremental-convex-hull": "^1.0.1", "is-mobile": "^2.2.2", "mapbox-gl": "1.10.1", "matrix-camera-controller": "^2.1.4", @@ -16756,13 +16766,13 @@ "mouse-event-offset": "^3.0.2", "mouse-wheel": "^1.2.0", "native-promise-only": "^0.8.1", - "ndarray": "ndarray@github:plotly/ndarray#v1.1.0", - "ndarray-extract-contour": "ndarray-extract-contour@github:plotly/ndarray-extract-contour#v1.1.0", - "ndarray-gradient": "ndarray-gradient@github:plotly/ndarray-gradient#v1.1.0", + "ndarray": "^1.0.19", + "ndarray-extract-contour": "^1.0.1", + "ndarray-gradient": "^1.0.1", "ndarray-linear-interpolate": "^1.0.0", - "ndarray-ops": "ndarray-ops@github:plotly/ndarray-ops#v1.3.0", - "ndarray-pack": "ndarray-pack@github:plotly/ndarray-pack#v1.3.0", - "ndarray-sort": "ndarray-sort@github:plotly/ndarray-sort#v1.1.0", + "ndarray-ops": "^1.2.2", + "ndarray-pack": "^1.2.1", + "ndarray-sort": "^1.0.0", "parse-svg-path": "^0.1.2", "polybooljs": "^1.2.0", "probe-image-size": "^7.2.1", @@ -16772,11 +16782,11 @@ "regl-scatter2d": "^3.2.8", "regl-splom": "^1.0.14", "right-now": "^1.0.0", - "robust-determinant": "robust-determinant@github:plotly/robust-determinant#v1.2.1", + "robust-determinant": "^1.1.0", "robust-in-sphere": "1.2.1", - "robust-linear-solve": "robust-linear-solve@github:plotly/robust-linear-solve#v1.1.1", + "robust-linear-solve": "^1.1.1", "robust-orientation": "1.2.1", - "simplicial-complex-contour": "simplicial-complex-contour@github:plotly/simplicial-complex-contour#v1.1.0", + "simplicial-complex-contour": "^1.1.0", "strongly-connected-components": "^1.0.1", "superscript-text": "^1.0.0", "surface-nets": "surface-nets@github:plotly/surface-nets#v1.1.1", @@ -16787,7 +16797,7 @@ "vectorize-text": "3.2.2", "webgl-context": "^2.2.0", "world-calendars": "^1.0.3", - "zero-crossings": "zero-crossings@github:plotly/zero-crossings#v1.1.0" + "zero-crossings": "^1.1.0" }, "dependencies": { "d3-color": { @@ -16852,29 +16862,34 @@ } }, "ndarray": { - "version": "git+ssh://git@github.com/plotly/ndarray.git#70ec67233be65de444307a6916aba2655e28bd84", - "from": "ndarray@github:plotly/ndarray#v1.1.0", + "version": "1.0.19", + "resolved": "https://registry.npmjs.org/ndarray/-/ndarray-1.0.19.tgz", + "integrity": "sha512-B4JHA4vdyZU30ELBw3g7/p9bZupyew5a7tX1Y/gGeF2hafrPaQZhgrGQfsvgfYbgdFZjYwuEcnaobeM/WMW+HQ==", "requires": { + "iota-array": "^1.0.0", "is-buffer": "^1.0.2" } }, "ndarray-extract-contour": { - "version": "git+ssh://git@github.com/plotly/ndarray-extract-contour.git#0d8ed3a2fee873f08868c35894d608794e8e9d83", - "from": "ndarray-extract-contour@github:plotly/ndarray-extract-contour#v1.1.0", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ndarray-extract-contour/-/ndarray-extract-contour-1.0.1.tgz", + "integrity": "sha1-Cu4ROjozsia5DEiIz4d79HUTBeQ=", "requires": { "typedarray-pool": "^1.0.0" } }, "ndarray-sort": { - "version": "git+ssh://git@github.com/plotly/ndarray-sort.git#8b3c03c0c58906640a0551505601544c9775a87a", - "from": "ndarray-sort@github:plotly/ndarray-sort#v1.1.0", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ndarray-sort/-/ndarray-sort-1.0.1.tgz", + "integrity": "sha1-/qBbTLg0x/TgIWo1TzynUTAN/Wo=", "requires": { "typedarray-pool": "^1.0.0" } }, "robust-determinant": { - "version": "git+ssh://git@github.com/plotly/robust-determinant.git#7cb499bb02411de80ae1a90e54893e46af82ca5e", - "from": "robust-determinant@github:plotly/robust-determinant#v1.2.1", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/robust-determinant/-/robust-determinant-1.1.0.tgz", + "integrity": "sha1-jsrnm3nKqz509t6+IjflORon6cc=", "requires": { "robust-compress": "^1.0.0", "robust-scale": "^1.0.0", @@ -16883,34 +16898,22 @@ } }, "surface-nets": { - "version": "git+ssh://git@github.com/plotly/surface-nets.git#d80900ed4c39a1b07f9d8577180960945236d996", - "from": "surface-nets@github:plotly/surface-nets#v1.1.1", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/surface-nets/-/surface-nets-1.0.2.tgz", + "integrity": "sha1-5DPIy7qUpydMb0yZVStGG/H8eks=", "requires": { "ndarray-extract-contour": "^1.0.0", + "triangulate-hypercube": "^1.0.0", "zero-crossings": "^1.0.0" - }, - "dependencies": { - "ndarray-extract-contour": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ndarray-extract-contour/-/ndarray-extract-contour-1.0.1.tgz", - "integrity": "sha1-Cu4ROjozsia5DEiIz4d79HUTBeQ=", - "requires": { - "typedarray-pool": "^1.0.0" - } - }, - "zero-crossings": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/zero-crossings/-/zero-crossings-1.0.1.tgz", - "integrity": "sha1-xWK9MRNkPzRDokXRJAa4i2m5qf8=", - "requires": { - "cwise-compiler": "^1.0.0" - } - } } }, "zero-crossings": { - "version": "git+ssh://git@github.com/plotly/zero-crossings.git#4746771f490344e21c84d1f631cb661d8c5ff508", - "from": "zero-crossings@github:plotly/zero-crossings#v1.1.0" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/zero-crossings/-/zero-crossings-1.0.1.tgz", + "integrity": "sha1-xWK9MRNkPzRDokXRJAa4i2m5qf8=", + "requires": { + "cwise-compiler": "^1.0.0" + } } } }, @@ -20422,8 +20425,9 @@ } }, "robust-linear-solve": { - "version": "git+ssh://git@github.com/plotly/robust-linear-solve.git#90ad6de2ce011a1e0b53d9e9f6bf8d117053c492", - "from": "robust-linear-solve@github:plotly/robust-linear-solve#v1.1.1", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/robust-linear-solve/-/robust-linear-solve-1.0.0.tgz", + "integrity": "sha1-DNasUEBpGm8qo81jEdcokFyjofE=", "requires": { "robust-determinant": "^1.1.0" }, @@ -20968,11 +20972,14 @@ } }, "simplicial-complex-contour": { - "version": "git+ssh://git@github.com/plotly/simplicial-complex-contour.git#3c09d0c163385b874fedc0a366b29b6e713bfd99", - "from": "simplicial-complex-contour@github:plotly/simplicial-complex-contour#v1.1.0", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/simplicial-complex-contour/-/simplicial-complex-contour-1.0.2.tgz", + "integrity": "sha1-iQqsrChDZTQBEFRc8mKaJuBL+dE=", "requires": { + "marching-simplex-table": "^1.0.0", "ndarray": "^1.0.15", - "ndarray-sort": "^1.0.0" + "ndarray-sort": "^1.0.0", + "typedarray-pool": "^1.1.0" }, "dependencies": { "ndarray": { From 281898d59921e5c4ea6c9df4c81325daf64dfc63 Mon Sep 17 00:00:00 2001 From: Jaroslaw Michalski Date: Thu, 5 Oct 2023 17:38:26 +0100 Subject: [PATCH 2/2] modify npm commands Modified how packages are installed/built (used package-lock.json file for that instead of package.json) --- .github/workflows/sandbox.yml | 37 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/.github/workflows/sandbox.yml b/.github/workflows/sandbox.yml index 524266f94..2d8533286 100644 --- a/.github/workflows/sandbox.yml +++ b/.github/workflows/sandbox.yml @@ -1,6 +1,6 @@ -name: Deploy Dashboard (Static Website) to Sandbox Environment. +name: Deploy Dashboard (Static Website) to Sandbox Environment. ### on: push: @@ -23,21 +23,20 @@ jobs: node-version: '14' env: ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' - - - name : Installs Dependancies + + - name : Installs Dependancies run: | - npm install --package-lock=false - yarn install --production=true --no-lockfile + npm ci - name : Build env: - CI: false - BASE_URL: 'https://sandbox.coronavirus.data.gov.uk' - MAIN_CDN: 'sandbox.coronavirus.data.gov.uk' - DOWNLOADS_CDN: 'sandbox.coronavirus.data.gov.uk' - API_ENDPOINT: 'sandbox.coronavirus.data.gov.uk/api' - USER_API_ENDPOINT: 'api-sandbox.coronavirus.data.gov.uk' + CI: false + BASE_URL: 'https://sandbox.coronavirus.data.gov.uk' + MAIN_CDN: 'sandbox.coronavirus.data.gov.uk' + DOWNLOADS_CDN: 'sandbox.coronavirus.data.gov.uk' + API_ENDPOINT: 'sandbox.coronavirus.data.gov.uk/api' + USER_API_ENDPOINT: 'api-sandbox.coronavirus.data.gov.uk' APPINSIGHTS_INSTRUMENTATIONKEY: '0ab69a6e-1f5f-4c00-95a4-805490645471' BUILD_ENV: sandbox NODE_ENV: sandbox @@ -52,8 +51,8 @@ jobs: uses: azure/login@v1 with: creds: ${{secrets.AZURE_CREDENTIALS}} - enable-AzPSSession: true - + enable-AzPSSession: true + - name: Copy Build Files to $web Container in Static Strorage Account uses: azure/powershell@v1 with: @@ -70,7 +69,7 @@ jobs: - + test: runs-on: ubuntu-latest name: Automated Smoke Test of COVID19 Dashboard Website @@ -103,8 +102,8 @@ jobs: # { # # The index.html gets a different cache setting than all the other files # $cacheControl = "no-cache" -# } -# else +# } +# else # { # $cacheControl = "max-age=604800" # } @@ -125,10 +124,10 @@ jobs: # { # # The index.html gets a different cache setting than all the other files # $cacheControl = "no-cache" -# } -# else +# } +# else # { -# # Set the cache control and content type of svg image blobs +# # Set the cache control and content type of svg image blobs # $cacheControl = "max-age=604800" # $contentType = "image/svg+xml" # }