From 5b80c5ee45448196515f4e0dfcc70810d614203f Mon Sep 17 00:00:00 2001 From: kevinschaich Date: Fri, 30 Dec 2022 11:41:30 -0500 Subject: [PATCH 1/7] Fix Dependency issue & add instructions for Google OAuth Test User --- package.json | 3 +++ src/integrations/google/setup.ts | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 68071652..f58ef567 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,9 @@ "devDependencies": { "prettier": "^1.16.4" }, + "overrides": { + "@types/express-serve-static-core": "4.17.30" + }, "description": "Automate your personal finances – for free, with no ads, and no data collection.", "repository": { "type": "git", diff --git a/src/integrations/google/setup.ts b/src/integrations/google/setup.ts index cd320b57..f45e48cf 100644 --- a/src/integrations/google/setup.ts +++ b/src/integrations/google/setup.ts @@ -14,7 +14,8 @@ export default async () => { ) console.log('\n\t1. Create a new Google Sheet (https://sheets.new)') console.log('\t2. Follow the guide here: https://developers.google.com/workspace/guides/create-credentials#desktop-app') - console.log('\t3. Answer the following questions:\n') + console.log(`\t3. Make sure your app's Publishing Status is 'Testing', and add your Gmail account you wish to use as a Test User here: https://console.cloud.google.com/apis/credentials/consent`) + console.log('\t4. Answer the following questions:\n') const credentials = await prompts([ { From 0f3d29346e96a4952db495abb3f55748b60a77fe Mon Sep 17 00:00:00 2001 From: kevinschaich Date: Fri, 30 Dec 2022 11:45:25 -0500 Subject: [PATCH 2/7] v2.0.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f58ef567..b45fe98c 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "mintable", "author": "Kevin Schaich (http://kevinschaich.io)", "license": "MIT", - "version": "2.0.1", + "version": "2.0.2", "bin": "./lib/scripts/cli.js", "preferGlobal": true, "scripts": { From b99b3996aba6bff6fe2c9ed3041e83640b6bfbd9 Mon Sep 17 00:00:00 2001 From: kevinschaich Date: Fri, 30 Dec 2022 11:48:07 -0500 Subject: [PATCH 3/7] Update npm publish instructions --- docs/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/README.md b/docs/README.md index 055a8cf2..495c40bf 100644 --- a/docs/README.md +++ b/docs/README.md @@ -315,6 +315,11 @@ npm run watch To publish a new version, increment `version` in `package.json` and run: ```bash +git add package.json +git commit -m 'vX.X.X' +git push + +rm -rf lib/ npm run build npm publish ``` From caf1185443c475371108d0c718549c5be54003fa Mon Sep 17 00:00:00 2001 From: kevinschaich Date: Fri, 30 Dec 2022 11:52:30 -0500 Subject: [PATCH 4/7] Fix dep issue --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b45fe98c..86a3788d 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ ], "dependencies": { "@types/body-parser": "^1.19.0", - "@types/express": "^4.17.3", + "@types/express": "4.17.3", "@types/glob": "^7.1.2", "@types/lodash": "^4.14.149", "@types/node": "^14.0.13", @@ -31,7 +31,7 @@ "csv-parse": "^4.10.1", "csv-stringify": "^5.5.0", "date-fns": "^2.10.0", - "express": "^4.17.1", + "express": "4.17.3", "glob": "^7.1.6", "googleapis": "47.0.0", "jsonc": "^2.0.0", From 860d6ee11ef1df2c3a16bd2ed469122516dc3ed5 Mon Sep 17 00:00:00 2001 From: Kevin Schaich Date: Fri, 30 Dec 2022 13:06:52 -0500 Subject: [PATCH 5/7] Fix dependency issues (#145) * Test fix dep issue * Add step to list NPM dependencies for GH Actions * Manually pin version of @types/express-serve-static-core * Manually pin Lodash version * Remove overrides block in package.json --- .github/workflows/test.yml | 1 + package.json | 10 ++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0a68670c..67d6ba55 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,4 +22,5 @@ jobs: with: node-version: ${{ matrix.node-version }} - run: npm install + - run: npm list --depth=1 - run: npm test diff --git a/package.json b/package.json index 86a3788d..161b2bb3 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,9 @@ "dependencies": { "@types/body-parser": "^1.19.0", "@types/express": "4.17.3", + "@types/express-serve-static-core": "4.17.28", "@types/glob": "^7.1.2", - "@types/lodash": "^4.14.149", + "@types/lodash": "4.14.149", "@types/node": "^14.0.13", "@types/prompts": "^2.0.3", "ajv": "^6.12.0", @@ -35,20 +36,17 @@ "glob": "^7.1.6", "googleapis": "47.0.0", "jsonc": "^2.0.0", - "lodash": "^4.17.15", + "lodash": "4.17.15", "open": "^7.0.2", "plaid": "^7.0.0", "prompts": "^2.3.1", - "typescript": "^3.8.3", + "typescript": "3.8.3", "typescript-json-schema": "^0.42.0", "yargs": "^15.1.0" }, "devDependencies": { "prettier": "^1.16.4" }, - "overrides": { - "@types/express-serve-static-core": "4.17.30" - }, "description": "Automate your personal finances – for free, with no ads, and no data collection.", "repository": { "type": "git", From 2f39ab6cda9f30420c01d10a8bc9a6204ad70c88 Mon Sep 17 00:00:00 2001 From: kevinschaich Date: Fri, 30 Dec 2022 13:34:32 -0500 Subject: [PATCH 6/7] v2.0.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 161b2bb3..f5e66406 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "mintable", "author": "Kevin Schaich (http://kevinschaich.io)", "license": "MIT", - "version": "2.0.2", + "version": "2.0.3", "bin": "./lib/scripts/cli.js", "preferGlobal": true, "scripts": { From 8b97b7c7e770edeb2bfaaec5285559f8089d7cb0 Mon Sep 17 00:00:00 2001 From: kevinschaich Date: Fri, 30 Dec 2022 13:39:26 -0500 Subject: [PATCH 7/7] Update Shields badge for GH Actions Test workflow --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7907c410..65158d22 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Mintable helps you:
-[![](https://img.shields.io/github/workflow/status/kevinschaich/mintable/Test)](https://github.com/kevinschaich/mintable/actions?query=workflow%3ATest) +[![](https://img.shields.io/github/actions/workflow/status/kevinschaich/mintable/test.yml?branch=master)](https://github.com/kevinschaich/mintable/actions?query=workflow%3ATest) [![](https://img.shields.io/npm/v/mintable)](https://www.npmjs.com/package/mintable) [![](https://img.shields.io/github/release/kevinschaich/mintable.svg)](https://github.com/kevinschaich/mintable/releases) [![](https://img.shields.io/github/license/kevinschaich/mintable.svg)](https://github.com/kevinschaich/mintable/blob/master/LICENSE)