From eb0f665889851c9dfbcae0c5d95a3eec0e7bedac Mon Sep 17 00:00:00 2001 From: Andy Rothwell Date: Wed, 15 Mar 2023 16:51:56 -0400 Subject: [PATCH 1/3] uses layerboard 2.0.4, fixes popout of cyclomedia --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0b3172f..d33a390 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2642,13 +2642,13 @@ "dev": true }, "@phila/layerboard": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@phila/layerboard/-/layerboard-2.0.3.tgz", - "integrity": "sha512-WwZqWFCuM5wR2tftgZkIb8B7eV53IFizhkQuvO1OhC2A6JK2TAxqhidWeb7tm0Tz0q7yYex0OOK0i/1FhULzew==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@phila/layerboard/-/layerboard-2.0.4.tgz", + "integrity": "sha512-P0xVflDNE+BWnFp0jsIY/rU+LUlnMGEgWx+Vr/lWj228ILFp+kjvfVV7c6VAlSP9wnhcLoYWamduNbRC+hH8hA==", "requires": { "@phila/vue-comps": "3.0.6", "@phila/vue-datafetch": "2.2.11", - "@phila/vue-mapping": "3.1.12", + "@phila/vue-mapping": "3.1.13", "esri-leaflet": "2.3.1", "leaflet": "1.5.1", "vue": "^2.7.10", @@ -2710,9 +2710,9 @@ } }, "@phila/vue-mapping": { - "version": "3.1.12", - "resolved": "https://registry.npmjs.org/@phila/vue-mapping/-/vue-mapping-3.1.12.tgz", - "integrity": "sha512-7XHfsqBE29tpRckxRxR3Umy6NqDyFSEa/no5zz4rOdWE2f717hAgpkUtLfp0B8799BX0sE8B7dM0b2mqCXGyVw==", + "version": "3.1.13", + "resolved": "https://registry.npmjs.org/@phila/vue-mapping/-/vue-mapping-3.1.13.tgz", + "integrity": "sha512-CVv67kk8h9phqvrqped9aLuHHZlZPt4IVbBjQwYOSiMkWTkpqhGFR4QbtIqdwWAREmqtltK0+4x3MzTfl/Iepw==", "requires": { "@fortawesome/fontawesome-svg-core": "1.2.36", "@fortawesome/free-regular-svg-icons": "5.15.4", diff --git a/package.json b/package.json index 2c0f865..2f5734b 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "lintFix": "vue-cli-service lint --fix" }, "dependencies": { - "@phila/layerboard": "2.0.3", + "@phila/layerboard": "2.0.4", "@sentry/browser": "5.7.1", "vue": "^2.7.10" }, From 82abe384cc7840abdcb8879a2151c7b6d2cb9715 Mon Sep 17 00:00:00 2001 From: Andy Rothwell Date: Wed, 15 Mar 2023 16:52:51 -0400 Subject: [PATCH 2/3] sets up push from main branch to dev endpoint --- .github/workflows/dev_push_to_s3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev_push_to_s3.yml b/.github/workflows/dev_push_to_s3.yml index c386fc3..ef70c0c 100644 --- a/.github/workflows/dev_push_to_s3.yml +++ b/.github/workflows/dev_push_to_s3.yml @@ -6,7 +6,7 @@ name: dev Push to S3 on: push: branches: - - cyclomedia-upgrade + - main jobs: build: From 5be43a37f4eb276ee0013124663689c28c49321a Mon Sep 17 00:00:00 2001 From: Andy Rothwell Date: Wed, 15 Mar 2023 16:56:20 -0400 Subject: [PATCH 3/3] uses node 12.x for github push to s3 --- .github/workflows/dev_push_to_s3.yml | 4 ++-- .github/workflows/prod_push_to_s3.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dev_push_to_s3.yml b/.github/workflows/dev_push_to_s3.yml index ef70c0c..4facdc6 100644 --- a/.github/workflows/dev_push_to_s3.yml +++ b/.github/workflows/dev_push_to_s3.yml @@ -15,10 +15,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Use Node.js 10.x + - name: Use Node.js 12.x uses: actions/setup-node@v1 with: - node-version: '10.x' + node-version: '12.x' - name: npm install, and build run: | diff --git a/.github/workflows/prod_push_to_s3.yml b/.github/workflows/prod_push_to_s3.yml index 7ee84b8..61f76bc 100644 --- a/.github/workflows/prod_push_to_s3.yml +++ b/.github/workflows/prod_push_to_s3.yml @@ -15,10 +15,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Use Node.js 10.x + - name: Use Node.js 12.x uses: actions/setup-node@v1 with: - node-version: '10.x' + node-version: '12.x' - name: npm install, and build run: |