From bd8b62f77e00f7c9d8fb12b65c0430672c76504a Mon Sep 17 00:00:00 2001 From: sballesteros Date: Wed, 6 Nov 2019 17:16:24 -0800 Subject: [PATCH] fix OCO glitch --- deploy-app.sh | 6 ++- deploy-service.sh | 8 +++- package-lock.json | 69 ++++++++++++++++------------ package.json | 6 +-- restart-app.sh | 1 + restart-service.sh | 1 + src/components/extension-fallback.js | 4 +- src/components/header-bar.js | 2 +- src/components/left-side-panel.js | 16 ++++++- 9 files changed, 73 insertions(+), 40 deletions(-) create mode 100755 restart-app.sh create mode 100755 restart-service.sh diff --git a/deploy-app.sh b/deploy-app.sh index fee551f..251e8de 100755 --- a/deploy-app.sh +++ b/deploy-app.sh @@ -15,11 +15,13 @@ az webapp config appsettings set --resource-group "rapid-prereview" --name "rapi ## https://docs.microsoft.com/en-us/azure/app-service/containers/configure-language-nodejs#run-with-pm2 -# az webapp config set --resource-group "rapid-prereview" --name "rapid-prereview" --startup-file "npm run start:prod" - # Azure App service will start the file with pm2 az webapp config set --resource-group "rapid-prereview" --name "rapid-prereview" --startup-file "./dist/server.js" +# to use without pm2: +# az webapp config set --resource-group "rapid-prereview" --name "rapid-prereview" --startup-file "npm run start:prod" + + az webapp deployment source config-zip --resource-group "rapid-prereview" --name "rapid-prereview" --src app.zip rm app.zip diff --git a/deploy-service.sh b/deploy-service.sh index 2117a59..dc4da20 100755 --- a/deploy-service.sh +++ b/deploy-service.sh @@ -12,7 +12,13 @@ zip -r service.zip *.json *.js dist/* src/* public/* views/* scripts/* test/* az webapp config appsettings set --resource-group "rapid-prereview" --name "rapid-prereview-service" --settings SCM_DO_BUILD_DURING_DEPLOYMENT=true -az webapp config set --resource-group "rapid-prereview" --name "rapid-prereview-service" --startup-file "npm run start:service" +## https://docs.microsoft.com/en-us/azure/app-service/containers/configure-language-nodejs#run-with-pm2 + +# Azure App service will start the file with pm2 +az webapp config set --resource-group "rapid-prereview" --name "rapid-prereview-service" --startup-file "./dist/service.js" + +# to use without pm2: +# az webapp config set --resource-group "rapid-prereview" --name "rapid-prereview-service" --startup-file "npm run start:service" az webapp deployment source config-zip --resource-group "rapid-prereview" --name "rapid-prereview-service" --src service.zip diff --git a/package-lock.json b/package-lock.json index 4cf5ccc..a25d7c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,19 +31,19 @@ } }, "@babel/core": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.0.tgz", - "integrity": "sha512-Bb1NjZCaiwTQC/ARL+MwDpgocdnwWDCaugvkGt6cxfBzQa8Whv1JybBoUEiBDKl8Ni3H3c7Fykwk7QChUsHRlg==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.2.tgz", + "integrity": "sha512-eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ==", "dev": true, "requires": { "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.7.0", + "@babel/generator": "^7.7.2", "@babel/helpers": "^7.7.0", - "@babel/parser": "^7.7.0", + "@babel/parser": "^7.7.2", "@babel/template": "^7.7.0", - "@babel/traverse": "^7.7.0", - "@babel/types": "^7.7.0", - "convert-source-map": "^1.1.0", + "@babel/traverse": "^7.7.2", + "@babel/types": "^7.7.2", + "convert-source-map": "^1.7.0", "debug": "^4.1.0", "json5": "^2.1.0", "lodash": "^4.17.13", @@ -53,12 +53,12 @@ }, "dependencies": { "@babel/generator": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.0.tgz", - "integrity": "sha512-1wdJ6UxHyL1XoJQ119JmvuRX27LRih7iYStMPZOWAjQqeAabFg3dYXKMpgihma+to+0ADsTVVt6oRyUxWZw6Mw==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.2.tgz", + "integrity": "sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==", "dev": true, "requires": { - "@babel/types": "^7.7.0", + "@babel/types": "^7.7.2", "jsesc": "^2.5.1", "lodash": "^4.17.13", "source-map": "^0.5.0" @@ -105,9 +105,9 @@ } }, "@babel/parser": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.0.tgz", - "integrity": "sha512-GqL+Z0d7B7ADlQBMXlJgvXEbtt5qlqd1YQ5fr12hTSfh7O/vgrEIvJxU2e7aSVrEUn75zTZ6Nd0s8tthrlZnrQ==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.2.tgz", + "integrity": "sha512-DDaR5e0g4ZTb9aP7cpSZLkACEBdoLGwJDWgHtBhrGX7Q1RjhdoMOfexICj5cqTAtpowjGQWfcvfnQG7G2kAB5w==", "dev": true }, "@babel/template": { @@ -122,26 +122,26 @@ } }, "@babel/traverse": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.0.tgz", - "integrity": "sha512-ea/3wRZc//e/uwCpuBX2itrhI0U9l7+FsrKWyKGNyvWbuMcCG7ATKY2VI4wlg2b2TA39HHwIxnvmXvtiKsyn7w==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.2.tgz", + "integrity": "sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==", "dev": true, "requires": { "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.7.0", + "@babel/generator": "^7.7.2", "@babel/helper-function-name": "^7.7.0", "@babel/helper-split-export-declaration": "^7.7.0", - "@babel/parser": "^7.7.0", - "@babel/types": "^7.7.0", + "@babel/parser": "^7.7.2", + "@babel/types": "^7.7.2", "debug": "^4.1.0", "globals": "^11.1.0", "lodash": "^4.17.13" } }, "@babel/types": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.1.tgz", - "integrity": "sha512-kN/XdANDab9x1z5gcjDc9ePpxexkt+1EQ2MQUiM4XnMvQfvp87/+6kY4Ko2maLXH+tei/DgJ/ybFITeqqRwDiA==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz", + "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==", "dev": true, "requires": { "esutils": "^2.0.2", @@ -149,6 +149,15 @@ "to-fast-properties": "^2.0.0" } }, + "convert-source-map": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.1" + } + }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -1810,9 +1819,9 @@ } }, "@babel/runtime": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.1.tgz", - "integrity": "sha512-SQ0sS7KUJDvgCI2cpZG0nJygO6002oTbhgSuw4WcocsnbxLwL5Q8I3fqbJdyBAc3uFrWZiR2JomseuxSuci3SQ==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.2.tgz", + "integrity": "sha512-JONRbXbTXc9WQE2mAZd1p0Z3DZ/6vaQIkgYMSTP3KjRCyd7rCZCcfhCyX+YjwcKxcZ82UrxbRD358bpExNgrjw==", "requires": { "regenerator-runtime": "^0.13.2" }, @@ -12282,9 +12291,9 @@ } }, "postcss-nested": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-4.2.0.tgz", - "integrity": "sha512-qRAOC0uJ4TbFXlURB+3Y5sCi9+MLTkXmt7VGpqHw5oAWCnHqeFa4MGf7kb5ceFDthknumJc+E4A0TjV4XEVWBQ==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-4.2.1.tgz", + "integrity": "sha512-AMayXX8tS0HCp4O4lolp4ygj9wBn32DJWXvG6gCv+ZvJrEa00GUxJcJEEzMh87BIe6FrWdYkpR2cuyqHKrxmXw==", "dev": true, "requires": { "postcss": "^7.0.21", diff --git a/package.json b/package.json index f7a4ddb..dbf949b 100644 --- a/package.json +++ b/package.json @@ -140,7 +140,7 @@ "homepage": "https://github.com/PREreview/rapid-prereview#readme", "devDependencies": { "@babel/cli": "^7.7.0", - "@babel/core": "^7.7.0", + "@babel/core": "^7.7.2", "@babel/node": "^7.7.0", "@babel/plugin-proposal-class-properties": "^7.7.0", "@babel/plugin-transform-async-to-generator": "^7.7.0", @@ -169,7 +169,7 @@ "pino-pretty": "^3.3.0", "postcss-import": "^12.0.1", "postcss-loader": "^3.0.0", - "postcss-nested": "^4.2.0", + "postcss-nested": "^4.2.1", "postcss-preset-env": "^6.7.0", "postcss-url": "^8.0.0", "prettier": "^1.18.2", @@ -182,7 +182,7 @@ }, "dependencies": { "@babel/polyfill": "^7.7.0", - "@babel/runtime": "^7.7.1", + "@babel/runtime": "^7.7.2", "@cloudant/cloudant": "^4.2.2", "@reach/combobox": "^0.5.3", "@reach/dialog": "^0.5.4", diff --git a/restart-app.sh b/restart-app.sh new file mode 100755 index 0000000..6a4127d --- /dev/null +++ b/restart-app.sh @@ -0,0 +1 @@ +az webapp restart --resource-group "rapid-prereview" --name "rapid-prereview" diff --git a/restart-service.sh b/restart-service.sh new file mode 100755 index 0000000..2770f1f --- /dev/null +++ b/restart-service.sh @@ -0,0 +1 @@ +az webapp restart --resource-group "rapid-prereview" --name "rapid-prereview-service" diff --git a/src/components/extension-fallback.js b/src/components/extension-fallback.js index 6f61e62..7582e6c 100644 --- a/src/components/extension-fallback.js +++ b/src/components/extension-fallback.js @@ -34,8 +34,8 @@ export default function ExtensionFallback() { {/* fallback text in case we can't load the PDF */} diff --git a/src/components/header-bar.js b/src/components/header-bar.js index 686fc7c..eb060e4 100644 --- a/src/components/header-bar.js +++ b/src/components/header-bar.js @@ -18,7 +18,7 @@ export default function HeaderBar({ onClickMenuButton }) { {!!onClickMenuButton && (