From 649984b629a8842f249a6b3e90f9411e79d04e36 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 31 May 2023 14:48:27 -0400 Subject: [PATCH 1/2] fix cloud functions on pnpm --- apps/firebase/functions/package.json | 1 + .../functions/src/utilities/calendly.ts | 1 - apps/firebase/functions/tsconfig.json | 2 +- pnpm-lock.yaml | 110 ++++++++---------- 4 files changed, 53 insertions(+), 61 deletions(-) diff --git a/apps/firebase/functions/package.json b/apps/firebase/functions/package.json index 954b2239..e637e699 100644 --- a/apps/firebase/functions/package.json +++ b/apps/firebase/functions/package.json @@ -38,6 +38,7 @@ }, "devDependencies": { "@types/uuid": "^8.3.0", + "@types/node": "^14.18.36", "@typescript-eslint/eslint-plugin": "^5.28.0", "@typescript-eslint/parser": "^5.28.0", "eslint": "^8.9.0", diff --git a/apps/firebase/functions/src/utilities/calendly.ts b/apps/firebase/functions/src/utilities/calendly.ts index f344e704..56a23afd 100644 --- a/apps/firebase/functions/src/utilities/calendly.ts +++ b/apps/firebase/functions/src/utilities/calendly.ts @@ -1,4 +1,3 @@ -import fetch from 'node-fetch'; import { calendlyAccessToken } from '../config/config'; const calendlyApi = `https://api.calendly.com`; diff --git a/apps/firebase/functions/tsconfig.json b/apps/firebase/functions/tsconfig.json index a9ed863a..baf51cf2 100644 --- a/apps/firebase/functions/tsconfig.json +++ b/apps/firebase/functions/tsconfig.json @@ -6,7 +6,7 @@ "outDir": "lib", "sourceMap": true, "strict": true, - "target": "es2017" + "target": "es2022" }, "compileOnSave": true, "include": ["src"] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fe93c252..b722c4c3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -145,7 +145,7 @@ importers: version: 4.9.5 vite: specifier: ^4.1.4 - version: 4.1.4(@types/node@18.14.2) + version: 4.1.4(@types/node@14.18.36) vitest: specifier: ^0.29.1 version: 0.29.1 @@ -244,6 +244,9 @@ importers: specifier: ^8.3.2 version: 8.3.2 devDependencies: + '@types/node': + specifier: ^14.18.36 + version: 14.18.36 '@types/uuid': specifier: ^8.3.0 version: 8.3.4 @@ -1845,14 +1848,14 @@ packages: engines: {node: ^8.13.0 || >=10.10.0} dependencies: '@grpc/proto-loader': 0.7.5 - '@types/node': 18.14.2 + '@types/node': 14.18.36 /@grpc/grpc-js@1.7.3: resolution: {integrity: sha512-H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog==} engines: {node: ^8.13.0 || >=10.10.0} dependencies: '@grpc/proto-loader': 0.7.5 - '@types/node': 18.14.2 + '@types/node': 14.18.36 dev: false /@grpc/grpc-js@1.8.11: @@ -1860,7 +1863,7 @@ packages: engines: {node: ^8.13.0 || >=10.10.0} dependencies: '@grpc/proto-loader': 0.7.5 - '@types/node': 18.14.2 + '@types/node': 14.18.36 dev: true optional: true @@ -1939,7 +1942,7 @@ packages: engines: {node: '>= 10.14.2'} dependencies: '@jest/types': 26.6.2 - '@types/node': 20.1.0 + '@types/node': 14.18.36 chalk: 4.1.2 jest-message-util: 26.6.2 jest-util: 26.6.2 @@ -1955,7 +1958,7 @@ packages: '@jest/test-result': 26.6.2 '@jest/transform': 26.6.2 '@jest/types': 26.6.2 - '@types/node': 20.1.0 + '@types/node': 14.18.36 ansi-escapes: 4.3.2 chalk: 4.1.2 exit: 0.1.2 @@ -1992,7 +1995,7 @@ packages: dependencies: '@jest/fake-timers': 26.6.2 '@jest/types': 26.6.2 - '@types/node': 20.1.0 + '@types/node': 14.18.36 jest-mock: 26.6.2 dev: true @@ -2002,7 +2005,7 @@ packages: dependencies: '@jest/types': 26.6.2 '@sinonjs/fake-timers': 6.0.1 - '@types/node': 20.1.0 + '@types/node': 14.18.36 jest-message-util: 26.6.2 jest-mock: 26.6.2 jest-util: 26.6.2 @@ -2116,7 +2119,7 @@ packages: dependencies: '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 18.14.2 + '@types/node': 14.18.36 '@types/yargs': 15.0.15 chalk: 4.1.2 dev: true @@ -2496,7 +2499,7 @@ packages: engines: {node: '>=14'} hasBin: true dependencies: - '@types/node': 18.14.2 + '@types/node': 14.18.36 playwright-core: 1.31.1 optionalDependencies: fsevents: 2.3.2 @@ -2616,7 +2619,7 @@ packages: svelte: 3.58.0 tiny-glob: 0.2.9 undici: 5.22.0 - vite: 4.1.4(@types/node@18.14.2) + vite: 4.1.4(@types/node@14.18.36) transitivePeerDependencies: - supports-color dev: true @@ -2634,7 +2637,7 @@ packages: magic-string: 0.30.0 svelte: 3.58.0 svelte-hmr: 0.15.1(svelte@3.58.0) - vite: 4.1.4(@types/node@18.14.2) + vite: 4.1.4(@types/node@14.18.36) vitefu: 0.2.4(vite@4.1.4) transitivePeerDependencies: - supports-color @@ -2699,7 +2702,7 @@ packages: resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} dependencies: '@types/connect': 3.4.35 - '@types/node': 18.14.2 + '@types/node': 14.18.36 /@types/btoa-lite@1.0.0: resolution: {integrity: sha512-wJsiX1tosQ+J5+bY5LrSahHxr2wT+uME5UDwdN1kg4frt40euqA+wzECkmq4t5QbveHiJepfdThgQrPw6KiSlg==} @@ -2718,7 +2721,7 @@ packages: /@types/connect@3.4.35: resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} dependencies: - '@types/node': 18.14.2 + '@types/node': 14.18.36 /@types/cookie@0.5.1: resolution: {integrity: sha512-COUnqfB2+ckwXXSFInsFdOAWQzCCx+a5hq2ruyj+Vjund94RJQd4LG2u9hnvJrTgunKAaax7ancBYlDrNYxA0g==} @@ -2727,18 +2730,18 @@ packages: /@types/cors@2.8.13: resolution: {integrity: sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==} dependencies: - '@types/node': 18.14.2 + '@types/node': 14.18.36 /@types/duplexify@3.6.1: resolution: {integrity: sha512-n0zoEj/fMdMOvqbHxmqnza/kXyoGgJmEpsXjpP+gEqE1Ye4yNqc7xWipKnUoMpWhMuzJQSfK2gMrwlElly7OGQ==} dependencies: - '@types/node': 18.14.2 + '@types/node': 14.18.36 dev: false /@types/express-serve-static-core@4.17.33: resolution: {integrity: sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA==} dependencies: - '@types/node': 18.14.2 + '@types/node': 14.18.36 '@types/qs': 6.9.7 '@types/range-parser': 1.2.4 @@ -2761,14 +2764,14 @@ packages: resolution: {integrity: sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==} dependencies: '@types/minimatch': 5.1.2 - '@types/node': 18.14.2 + '@types/node': 14.18.36 dev: true optional: true /@types/graceful-fs@4.1.6: resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==} dependencies: - '@types/node': 20.1.0 + '@types/node': 14.18.36 dev: true /@types/istanbul-lib-coverage@2.0.4: @@ -2798,12 +2801,12 @@ packages: /@types/jsonwebtoken@8.5.9: resolution: {integrity: sha512-272FMnFGzAVMGtu9tkr29hRL6bZj4Zs1KZNeHLnKqAvp06tAIcarTMwOh8/8bz4FmKRcMxZhZNeUAQsNLoiPhg==} dependencies: - '@types/node': 18.14.2 + '@types/node': 14.18.36 /@types/jsonwebtoken@9.0.1: resolution: {integrity: sha512-c5ltxazpWabia/4UzhIoaDcIza4KViOQhdbjRlfcIGVnsE3c3brkz9Z+F/EeJIECOQP7W7US2hNE930cWWkPiw==} dependencies: - '@types/node': 18.14.2 + '@types/node': 14.18.36 /@types/linkify-it@3.0.2: resolution: {integrity: sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==} @@ -2860,23 +2863,12 @@ packages: /@types/node-fetch@2.6.2: resolution: {integrity: sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==} dependencies: - '@types/node': 18.14.2 + '@types/node': 14.18.36 form-data: 3.0.1 dev: false /@types/node@14.18.36: resolution: {integrity: sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ==} - dev: false - - /@types/node@18.13.0: - resolution: {integrity: sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==} - - /@types/node@18.14.2: - resolution: {integrity: sha512-1uEQxww3DaghA0RxqHx0O0ppVlo43pJhepY51OxuQIKHpjbnYLA7vcdwioNPzIqmC2u3I/dmylcqjlh0e7AyUA==} - - /@types/node@20.1.0: - resolution: {integrity: sha512-O+z53uwx64xY7D6roOi4+jApDGFg0qn6WHcxe5QeqjMaTezBO/mxdfFXIVAVVyNWKx84OmPB3L8kbVYOTeN34A==} - dev: true /@types/normalize-package-data@2.4.1: resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==} @@ -2904,7 +2896,7 @@ packages: resolution: {integrity: sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==} dependencies: '@types/glob': 8.1.0 - '@types/node': 18.14.2 + '@types/node': 14.18.36 dev: true optional: true @@ -2916,7 +2908,7 @@ packages: resolution: {integrity: sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==} dependencies: '@types/mime': 3.0.1 - '@types/node': 18.14.2 + '@types/node': 14.18.36 /@types/stack-utils@2.0.1: resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==} @@ -5111,7 +5103,7 @@ packages: '@fastify/busboy': 1.2.1 '@firebase/database-compat': 0.3.3 '@firebase/database-types': 0.10.3 - '@types/node': 18.14.2 + '@types/node': 14.18.36 jsonwebtoken: 9.0.0 jwks-rsa: 3.0.1 node-forge: 1.3.1 @@ -5130,7 +5122,7 @@ packages: dependencies: '@firebase/database-compat': 0.1.8(@firebase/app-compat@0.2.3)(@firebase/app-types@0.9.0) '@firebase/database-types': 0.7.3 - '@types/node': 18.13.0 + '@types/node': 14.18.36 dicer: 0.3.1 jsonwebtoken: 8.5.1 jwks-rsa: 2.1.5 @@ -5150,7 +5142,7 @@ packages: dependencies: '@firebase/database-compat': 0.1.8(@firebase/app-compat@0.2.9)(@firebase/app-types@0.9.0) '@firebase/database-types': 0.7.3 - '@types/node': 18.13.0 + '@types/node': 14.18.36 dicer: 0.3.1 jsonwebtoken: 8.5.1 jwks-rsa: 2.1.5 @@ -6531,7 +6523,7 @@ packages: '@jest/environment': 26.6.2 '@jest/fake-timers': 26.6.2 '@jest/types': 26.6.2 - '@types/node': 20.1.0 + '@types/node': 14.18.36 jest-mock: 26.6.2 jest-util: 26.6.2 jsdom: 16.7.0 @@ -6549,7 +6541,7 @@ packages: '@jest/environment': 26.6.2 '@jest/fake-timers': 26.6.2 '@jest/types': 26.6.2 - '@types/node': 20.1.0 + '@types/node': 14.18.36 jest-mock: 26.6.2 jest-util: 26.6.2 dev: true @@ -6565,7 +6557,7 @@ packages: dependencies: '@jest/types': 26.6.2 '@types/graceful-fs': 4.1.6 - '@types/node': 20.1.0 + '@types/node': 14.18.36 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 @@ -6591,7 +6583,7 @@ packages: '@jest/source-map': 26.6.2 '@jest/test-result': 26.6.2 '@jest/types': 26.6.2 - '@types/node': 20.1.0 + '@types/node': 14.18.36 chalk: 4.1.2 co: 4.6.0 expect: 26.6.2 @@ -6650,7 +6642,7 @@ packages: engines: {node: '>= 10.14.2'} dependencies: '@jest/types': 26.6.2 - '@types/node': 20.1.0 + '@types/node': 14.18.36 dev: true /jest-pnp-resolver@1.2.3(jest-resolve@26.6.2): @@ -6703,7 +6695,7 @@ packages: '@jest/environment': 26.6.2 '@jest/test-result': 26.6.2 '@jest/types': 26.6.2 - '@types/node': 20.1.0 + '@types/node': 14.18.36 chalk: 4.1.2 emittery: 0.7.2 exit: 0.1.2 @@ -6771,7 +6763,7 @@ packages: resolution: {integrity: sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==} engines: {node: '>= 10.14.2'} dependencies: - '@types/node': 20.1.0 + '@types/node': 14.18.36 graceful-fs: 4.2.11 dev: true @@ -6804,7 +6796,7 @@ packages: engines: {node: '>= 10.14.2'} dependencies: '@jest/types': 26.6.2 - '@types/node': 18.14.2 + '@types/node': 14.18.36 chalk: 4.1.2 graceful-fs: 4.2.10 is-ci: 2.0.0 @@ -6829,7 +6821,7 @@ packages: dependencies: '@jest/test-result': 26.6.2 '@jest/types': 26.6.2 - '@types/node': 20.1.0 + '@types/node': 14.18.36 ansi-escapes: 4.3.2 chalk: 4.1.2 jest-util: 26.6.2 @@ -6840,7 +6832,7 @@ packages: resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.1.0 + '@types/node': 14.18.36 merge-stream: 2.0.0 supports-color: 7.2.0 dev: true @@ -8342,7 +8334,7 @@ packages: '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 '@types/long': 4.0.2 - '@types/node': 18.14.2 + '@types/node': 14.18.36 long: 4.0.0 /protobufjs@6.11.3: @@ -8361,7 +8353,7 @@ packages: '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 '@types/long': 4.0.2 - '@types/node': 18.14.2 + '@types/node': 14.18.36 long: 4.0.0 /protobufjs@7.2.2: @@ -8379,7 +8371,7 @@ packages: '@protobufjs/path': 1.1.2 '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 - '@types/node': 18.14.2 + '@types/node': 14.18.36 long: 5.2.1 /proxy-addr@2.0.7: @@ -10058,7 +10050,7 @@ packages: video.js: 7.21.4 dev: false - /vite-node@0.29.1(@types/node@18.14.2): + /vite-node@0.29.1(@types/node@14.18.36): resolution: {integrity: sha512-Ey9bTlQOQrCxQN0oJ7sTg+GrU4nTMLg44iKTFCKf31ry60csqQz4E+Q04hdWhwE4cTgpxUC+zEB1kHbf5jNkFA==} engines: {node: '>=v14.16.0'} hasBin: true @@ -10068,7 +10060,7 @@ packages: mlly: 1.1.1 pathe: 1.1.0 picocolors: 1.0.0 - vite: 4.1.4(@types/node@18.14.2) + vite: 4.1.4(@types/node@14.18.36) transitivePeerDependencies: - '@types/node' - less @@ -10079,7 +10071,7 @@ packages: - terser dev: true - /vite@4.1.4(@types/node@18.14.2): + /vite@4.1.4(@types/node@14.18.36): resolution: {integrity: sha512-3knk/HsbSTKEin43zHu7jTwYWv81f8kgAL99G5NWBcA1LKvtvcVAC4JjBH1arBunO9kQka+1oGbrMKOjk4ZrBg==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -10104,7 +10096,7 @@ packages: terser: optional: true dependencies: - '@types/node': 18.14.2 + '@types/node': 14.18.36 esbuild: 0.16.17 postcss: 8.4.21 resolve: 1.22.1 @@ -10121,7 +10113,7 @@ packages: vite: optional: true dependencies: - vite: 4.1.4(@types/node@18.14.2) + vite: 4.1.4(@types/node@14.18.36) dev: true /vitest@0.29.1: @@ -10148,7 +10140,7 @@ packages: dependencies: '@types/chai': 4.3.4 '@types/chai-subset': 1.3.3 - '@types/node': 18.14.2 + '@types/node': 14.18.36 '@vitest/expect': 0.29.1 '@vitest/runner': 0.29.1 '@vitest/spy': 0.29.1 @@ -10167,8 +10159,8 @@ packages: tinybench: 2.3.1 tinypool: 0.3.1 tinyspy: 1.1.1 - vite: 4.1.4(@types/node@18.14.2) - vite-node: 0.29.1(@types/node@18.14.2) + vite: 4.1.4(@types/node@14.18.36) + vite-node: 0.29.1(@types/node@14.18.36) why-is-node-running: 2.2.2 transitivePeerDependencies: - less From 4f3fe55980f14e7178590f61982f476d9d31123c Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 31 May 2023 14:48:37 -0400 Subject: [PATCH 2/2] add missing field for graph --- .../functions/src/hashnode/scheduledNotionToHashNode.ts | 2 +- apps/firebase/functions/src/utilities/hashnode.ts | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/firebase/functions/src/hashnode/scheduledNotionToHashNode.ts b/apps/firebase/functions/src/hashnode/scheduledNotionToHashNode.ts index fbe1a571..27f8b89b 100644 --- a/apps/firebase/functions/src/hashnode/scheduledNotionToHashNode.ts +++ b/apps/firebase/functions/src/hashnode/scheduledNotionToHashNode.ts @@ -158,7 +158,7 @@ ${post.content} const response = await createPublicationStory(input); console.log( 'createPublicationStory result:', - JSON.stringify(response?.data) + JSON.stringify(response) ); const hashnodeSlug = diff --git a/apps/firebase/functions/src/utilities/hashnode.ts b/apps/firebase/functions/src/utilities/hashnode.ts index f299df3d..5de91739 100644 --- a/apps/firebase/functions/src/utilities/hashnode.ts +++ b/apps/firebase/functions/src/utilities/hashnode.ts @@ -28,7 +28,12 @@ export const createPublicationStory = async (input: any) => { } `, variables: { - input, + input: { + isPartOfPublication: { + "publicationId": hashnodePublicationId, + }, + ...input, + }, }, }; console.log('calling mutation with: ', data);