diff --git a/README.md b/README.md index ce2f6caf3..a4e472839 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ This README is focused on just the details of getting the uploader running local ## How to set it up 1. Clone this repository. -1. Make sure you have node v16.x installed. If you are managing node installations with [`nvm`](https://github.com/creationix/nvm 'GitHub: nvm'), which we **highly recommend**, you can just do `nvm use` when navigating to this repository to switch to the correct version of node. (In this repository, the correct version of node will always be the version of node packaged by the version of Electron that we are using and specified in the `.nvmrc` file.) +1. Make sure you have the right version of Node.js installed. If you are managing node installations with [`nvm`](https://github.com/creationix/nvm 'GitHub: nvm'), which we **highly recommend**, you can just do `nvm use` when navigating to this repository to switch to the correct version of node. (In this repository, the correct version of node will always be the version of node packaged by the version of Electron that we are using and specified in the `.nvmrc` file.) 1. Run `npm install` or, preferably, `yarn` 1. Set the config for the environment you want to target (see [Config](#config) below) 1. Run the following command: diff --git a/app/package.json b/app/package.json index 27a93079e..60bf15341 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "tidepool-uploader", "productName": "tidepool-uploader", - "version": "2.60.0", + "version": "2.60.0-tandem-fsl.1", "description": "Tidepool Project Universal Uploader", "main": "./main.prod.js", "author": { diff --git a/lib/drivers/tandem b/lib/drivers/tandem index a5b753895..f3c6e7bf1 160000 --- a/lib/drivers/tandem +++ b/lib/drivers/tandem @@ -1 +1 @@ -Subproject commit a5b753895d7f16a3c952c6c08c953c828af37cb9 +Subproject commit f3c6e7bf12f199eaa440c59b6379341596dca7fd diff --git a/package.json b/package.json index 356ceac61..1f0ac914d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tidepool-uploader", - "version": "2.60.0", + "version": "2.60.0-tandem-fsl.1", "description": "Tidepool Project Universal Uploader", "private": true, "main": "main.prod.js", @@ -20,14 +20,14 @@ "test-all": "npm run lint && npm run test && npm run build", "lint": "node ./node_modules/eslint/bin/eslint.js --cache --format=node_modules/eslint-formatter-pretty .", "lint-fix": "npm run lint -- --fix", - "build-main": "yarn build-main-quiet --progress --profile --colors", + "build-main": "yarn build-main-quiet --progress", "build-main-quiet": "cross-env NODE_ENV=production webpack --config webpack.config.main.prod.babel.js", - "build-renderer": "yarn build-renderer-quiet --progress --profile --colors", + "build-renderer": "yarn build-renderer-quiet --progress", "build-renderer-quiet": "cross-env NODE_ENV=production webpack --config webpack.config.renderer.prod.babel.js", "build": "concurrently \"yarn build-main\" \"yarn build-renderer\"", "build-quiet": "concurrently \"yarn build-main-quiet\" \"yarn build-renderer-quiet\"", "build-web": "cross-env NODE_ENV=production webpack --config webpack.config.web.dev.babel.js", - "start": "cross-env NODE_ENV=production electron ./app/main.prod.js", + "start": "cross-env NODE_ENV=production electron --no-sandbox ./app/main.prod.js", "postinstall": "concurrently \"electron-builder install-app-deps\" \"node node_modules/fbjs-scripts/node/check-dev-engines.js package.json\"", "dev": "cross-env START_HOT=1 yarn start-renderer-dev", "dev-web": "cross-env HOT=1 NODE_ENV=development webpack-dev-server --config webpack.config.web.dev.babel.js",