From 1e2bed3c47218f59f90ec70db0ff68786077bd77 Mon Sep 17 00:00:00 2001 From: Paul Crowder Date: Thu, 12 May 2022 16:43:16 -0400 Subject: [PATCH 1/2] Minor refactor; remove --tag next from publish --- .github/workflows/publish.yml | 2 +- lib/azure.js | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index bf6cd40..0be0212 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,6 +19,6 @@ jobs: run: | npm install - name: Publish - run: npm publish --tag next + run: npm publish env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/lib/azure.js b/lib/azure.js index c89013b..a8617b0 100644 --- a/lib/azure.js +++ b/lib/azure.js @@ -23,14 +23,14 @@ function getContentTypeForTextFile(fileName) { } async function uploadAsset(containerClient, asset) { - logger.info('Creating blob for %s from file %s', asset.name, asset.file); + logger.info('Creating blob for %s', asset.name); const blockBlobClient = containerClient.getBlockBlobClient(asset.name); if (asset.content) { - const contentType = getContentTypeForTextFile(asset.name); + const blobContentType = getContentTypeForTextFile(asset.name); - logger.info('Setting content type to %s for blob %s', contentType, asset.name); + logger.info('Setting content type to %s for blob %s', blobContentType, asset.name); logger.info('Uploading file %s from contents', asset.name); @@ -39,16 +39,16 @@ async function uploadAsset(containerClient, asset) { asset.content.length, { blobHTTPHeaders: { - blobContentType: contentType + blobContentType } } ); logger.info('Received following response from upload(): %s', JSON.stringify(response)); } else if (asset.file) { - const contentType = mime.lookup(asset.file) || 'application/octet-stream'; + const blobContentType = mime.lookup(asset.file) || 'application/octet-stream'; - logger.info('Setting content type to %s for blob %s', contentType, asset.name); + logger.info('Setting content type to %s for blob %s', blobContentType, asset.name); logger.info('Uploading file %s from disk', asset.name); @@ -56,7 +56,7 @@ async function uploadAsset(containerClient, asset) { asset.file, { blobHTTPHeaders: { - blobContentType: mime.lookup(asset.file) || 'application/octet-stream' + blobContentType } } ); From 3e5d5b73f1493c6f405b5e7deee221fc5d1f3738 Mon Sep 17 00:00:00 2001 From: Paul Crowder Date: Thu, 12 May 2022 16:44:25 -0400 Subject: [PATCH 2/2] Release 2.0.0 --- CHANGELOG.md | 4 ++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91681ef..98b7de3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 2.0.0 (2022-05-12) + +- 2.0.0 major release. [#85](https://github.com/blackbaud/skyux-deploy/pull/85) + # 2.0.0-beta.2 (2022-05-12) - Set Content-Type on uploaded files from disk. [#84](https://github.com/blackbaud/skyux-deploy/pull/84) diff --git a/package-lock.json b/package-lock.json index e818ccb..e10ca8d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@blackbaud/skyux-deploy", - "version": "2.0.0-beta.2", + "version": "2.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index d67c86c..4e1c0ef 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@blackbaud/skyux-deploy", - "version": "2.0.0-beta.2", + "version": "2.0.0", "description": "Deployment package for skyux apps", "main": "index.js", "bin": {