From 4620079dc45598b82f0eb2371e8e17cc4319974e Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 3 Aug 2023 11:03:27 +0100 Subject: [PATCH 1/8] changesets for affected packages mailgun and salesforce --- .changeset/shaggy-islands-raise.md | 6 ++++ package.json | 5 +++ pnpm-lock.yaml | 53 +++++++----------------------- 3 files changed, 23 insertions(+), 41 deletions(-) create mode 100644 .changeset/shaggy-islands-raise.md diff --git a/.changeset/shaggy-islands-raise.md b/.changeset/shaggy-islands-raise.md new file mode 100644 index 000000000..dd133e16d --- /dev/null +++ b/.changeset/shaggy-islands-raise.md @@ -0,0 +1,6 @@ +--- +'@openfn/language-mailgun': patch +'@openfn/language-salesforce': patch +--- + +Bump opinionator version diff --git a/package.json b/package.json index 0b92bafb8..a9be86f5e 100644 --- a/package.json +++ b/package.json @@ -25,5 +25,10 @@ "@openfn/parse-jsdoc": "workspace:^1.0.0", "@openfn/simple-ast": "0.4.1", "eslint": "8.26.0" + }, + "pnpm": { + "overrides": { + "optionator": "0.9.3" + } } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8a254b3f8..0ba427890 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,9 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +overrides: + optionator: 0.9.3 + importers: .: @@ -2048,6 +2051,10 @@ importers: packages: + /@aashutoshrathi/word-wrap@1.2.6: + resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==} + engines: {node: '>=0.10.0'} + /@ampproject/remapping@2.2.0: resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==} engines: {node: '>=6.0.0'} @@ -6498,7 +6505,7 @@ packages: esprima: 4.0.1 estraverse: 4.3.0 esutils: 2.0.3 - optionator: 0.8.3 + optionator: 0.9.3 optionalDependencies: source-map: 0.6.1 @@ -6685,7 +6692,7 @@ packages: lodash.merge: 4.6.2 minimatch: 3.1.2 natural-compare: 1.4.0 - optionator: 0.9.1 + optionator: 0.9.3 regexpp: 3.2.0 strip-ansi: 6.0.1 strip-json-comments: 3.1.1 @@ -8877,20 +8884,12 @@ packages: dependencies: invert-kv: 1.0.0 - /levn@0.3.0: - resolution: {integrity: sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==} - engines: {node: '>= 0.8.0'} - dependencies: - prelude-ls: 1.1.2 - type-check: 0.3.2 - /levn@0.4.1: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} dependencies: prelude-ls: 1.2.1 type-check: 0.4.0 - dev: true /lilconfig@2.0.6: resolution: {integrity: sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==} @@ -10047,28 +10046,16 @@ packages: require-at: 1.0.6 dev: false - /optionator@0.8.3: - resolution: {integrity: sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==} - engines: {node: '>= 0.8.0'} - dependencies: - deep-is: 0.1.4 - fast-levenshtein: 2.0.6 - levn: 0.3.0 - prelude-ls: 1.1.2 - type-check: 0.3.2 - word-wrap: 1.2.3 - - /optionator@0.9.1: - resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==} + /optionator@0.9.3: + resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==} engines: {node: '>= 0.8.0'} dependencies: + '@aashutoshrathi/word-wrap': 1.2.6 deep-is: 0.1.4 fast-levenshtein: 2.0.6 levn: 0.4.1 prelude-ls: 1.2.1 type-check: 0.4.0 - word-wrap: 1.2.3 - dev: true /os-homedir@1.0.2: resolution: {integrity: sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==} @@ -10554,14 +10541,9 @@ packages: which-pm: 2.0.0 dev: true - /prelude-ls@1.1.2: - resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==} - engines: {node: '>= 0.8.0'} - /prelude-ls@1.2.1: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} - dev: true /preserve@0.2.0: resolution: {integrity: sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==} @@ -12509,18 +12491,11 @@ packages: - supports-color dev: false - /type-check@0.3.2: - resolution: {integrity: sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==} - engines: {node: '>= 0.8.0'} - dependencies: - prelude-ls: 1.1.2 - /type-check@0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} dependencies: prelude-ls: 1.2.1 - dev: true /type-detect@0.1.1: resolution: {integrity: sha512-5rqszGVwYgBoDkIm2oUtvkfZMQ0vk29iDMU0W2qCa3rG0vPDNczCMT4hV/bLBgLg8k8ri6+u3Zbt+S/14eMzlA==} @@ -12948,10 +12923,6 @@ packages: engines: {node: '>=0.8'} dev: false - /word-wrap@1.2.3: - resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==} - engines: {node: '>=0.10.0'} - /word@0.3.0: resolution: {integrity: sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==} engines: {node: '>=0.8'} From e6a2f6b65e3b50dc6997ba87883126ecbc49c3b5 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 3 Aug 2023 11:12:57 +0100 Subject: [PATCH 2/8] salesforce: make jsonpath a dev dependency --- packages/salesforce/package.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/salesforce/package.json b/packages/salesforce/package.json index 6c6134109..717d08fdc 100644 --- a/packages/salesforce/package.json +++ b/packages/salesforce/package.json @@ -31,11 +31,12 @@ "configuration-schema.json" ], "dependencies": { - "@openfn/language-common": "workspace:*", - "axios": "^0.21.4", - "jsforce": "^1.11.1", + "@openfn/language-common": "1.10.2", + "axios": "^0.21.1", + "jsforce": "^1.11.0", "lodash": "^4.17.21", - "yargs": "^3.32.0" + "mustache": "^2.2.0", + "yargs": "^3.30.0" }, "devDependencies": { "assertion-error": "1.1.0", @@ -52,4 +53,4 @@ "type": "module", "types": "types/index.d.ts", "main": "dist/index.cjs" -} \ No newline at end of file +} From 6842cc8154445c04baed221af0d8ebc5b3cc7b74 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 3 Aug 2023 11:15:44 +0100 Subject: [PATCH 3/8] just override optionator in mailgun --- package.json | 5 ----- packages/mailgun/package.json | 7 +++++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index a9be86f5e..0b92bafb8 100644 --- a/package.json +++ b/package.json @@ -25,10 +25,5 @@ "@openfn/parse-jsdoc": "workspace:^1.0.0", "@openfn/simple-ast": "0.4.1", "eslint": "8.26.0" - }, - "pnpm": { - "overrides": { - "optionator": "0.9.3" - } } } diff --git a/packages/mailgun/package.json b/packages/mailgun/package.json index c42593df3..5d4bc019e 100644 --- a/packages/mailgun/package.json +++ b/packages/mailgun/package.json @@ -48,5 +48,8 @@ }, "./package.json": "./package.json" }, - "types": "types/index.d.ts" -} \ No newline at end of file + "types": "types/index.d.ts", + "overrides": { + "optionator": "0.9.3" + } +} From e8b62270787fd7524e8ece82551e8389b9368028 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 3 Aug 2023 11:16:31 +0100 Subject: [PATCH 4/8] update changesets --- .changeset/shaggy-islands-raise.md | 1 - .changeset/silver-bulldogs-eat.md | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .changeset/silver-bulldogs-eat.md diff --git a/.changeset/shaggy-islands-raise.md b/.changeset/shaggy-islands-raise.md index dd133e16d..a75acf453 100644 --- a/.changeset/shaggy-islands-raise.md +++ b/.changeset/shaggy-islands-raise.md @@ -1,6 +1,5 @@ --- '@openfn/language-mailgun': patch -'@openfn/language-salesforce': patch --- Bump opinionator version diff --git a/.changeset/silver-bulldogs-eat.md b/.changeset/silver-bulldogs-eat.md new file mode 100644 index 000000000..29f9aab18 --- /dev/null +++ b/.changeset/silver-bulldogs-eat.md @@ -0,0 +1,5 @@ +--- +'@openfn/language-salesforce': patch +--- + +Remove jsonpath dependency From b1f2c8ed5fbe534b846bb37d299449d101e045e9 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 3 Aug 2023 11:21:28 +0100 Subject: [PATCH 5/8] update package lock --- pnpm-lock.yaml | 128 ++++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 71 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0ba427890..a552d022e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,9 +4,6 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false -overrides: - optionator: 0.9.3 - importers: .: @@ -236,7 +233,7 @@ importers: version: 8.0.9 xlsx: specifier: https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz - version: 0.18.5 + version: '@cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz' devDependencies: '@openfn/buildtools': specifier: workspace:^1.0.2 @@ -1587,19 +1584,22 @@ importers: packages/salesforce: dependencies: '@openfn/language-common': - specifier: workspace:* + specifier: 1.10.2 version: link:../common axios: - specifier: ^0.21.4 + specifier: ^0.21.1 version: 0.21.4 jsforce: - specifier: ^1.11.1 + specifier: ^1.11.0 version: 1.11.1 lodash: specifier: ^4.17.21 version: 4.17.21 + mustache: + specifier: ^2.2.0 + version: 2.3.2 yargs: - specifier: ^3.32.0 + specifier: ^3.30.0 version: 3.32.0 devDependencies: assertion-error: @@ -2054,6 +2054,7 @@ packages: /@aashutoshrathi/word-wrap@1.2.6: resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==} engines: {node: '>=0.10.0'} + dev: true /@ampproject/remapping@2.2.0: resolution: {integrity: sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==} @@ -3498,11 +3499,6 @@ packages: engines: {node: '>=0.4.0'} hasBin: true - /adler-32@1.3.1: - resolution: {integrity: sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==} - engines: {node: '>=0.8'} - dev: false - /agent-base@4.2.1: resolution: {integrity: sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==} engines: {node: '>= 4.0.0'} @@ -3911,7 +3907,7 @@ packages: supertap: 3.0.1 temp-dir: 3.0.0 write-file-atomic: 5.0.0 - yargs: 17.6.2 + yargs: 17.7.2 transitivePeerDependencies: - supports-color dev: false @@ -5031,14 +5027,6 @@ packages: nofilter: 3.1.0 dev: false - /cfb@1.2.2: - resolution: {integrity: sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==} - engines: {node: '>=0.8'} - dependencies: - adler-32: 1.3.1 - crc-32: 1.2.2 - dev: false - /chai-http@4.3.0: resolution: {integrity: sha512-zFTxlN7HLMv+7+SPXZdkd5wUlK+KxH6Q7bIEMiEx0FK3zuuMqL7cwICAQ0V1+yYRozBburYuxN1qZstgHpFZQg==} engines: {node: '>=4'} @@ -5329,11 +5317,6 @@ packages: resolution: {integrity: sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==} engines: {node: '>=0.10.0'} - /codepage@1.15.0: - resolution: {integrity: sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==} - engines: {node: '>=0.8'} - dev: false - /coffee-script@1.12.7: resolution: {integrity: sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==} engines: {node: '>=0.8.0'} @@ -5548,12 +5531,6 @@ packages: dev: false optional: true - /crc-32@1.2.2: - resolution: {integrity: sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==} - engines: {node: '>=0.8'} - hasBin: true - dev: false - /create-require@1.1.1: resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==} dev: false @@ -6505,7 +6482,7 @@ packages: esprima: 4.0.1 estraverse: 4.3.0 esutils: 2.0.3 - optionator: 0.9.3 + optionator: 0.8.3 optionalDependencies: source-map: 0.6.1 @@ -7208,11 +7185,6 @@ packages: once: 1.4.0 qs: 6.11.2 - /frac@1.1.2: - resolution: {integrity: sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==} - engines: {node: '>=0.8'} - dev: false - /fragment-cache@0.2.1: resolution: {integrity: sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==} engines: {node: '>=0.10.0'} @@ -8884,12 +8856,20 @@ packages: dependencies: invert-kv: 1.0.0 + /levn@0.3.0: + resolution: {integrity: sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==} + engines: {node: '>= 0.8.0'} + dependencies: + prelude-ls: 1.1.2 + type-check: 0.3.2 + /levn@0.4.1: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} engines: {node: '>= 0.8.0'} dependencies: prelude-ls: 1.2.1 type-check: 0.4.0 + dev: true /lilconfig@2.0.6: resolution: {integrity: sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==} @@ -10046,6 +10026,17 @@ packages: require-at: 1.0.6 dev: false + /optionator@0.8.3: + resolution: {integrity: sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==} + engines: {node: '>= 0.8.0'} + dependencies: + deep-is: 0.1.4 + fast-levenshtein: 2.0.6 + levn: 0.3.0 + prelude-ls: 1.1.2 + type-check: 0.3.2 + word-wrap: 1.2.5 + /optionator@0.9.3: resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==} engines: {node: '>= 0.8.0'} @@ -10056,6 +10047,7 @@ packages: levn: 0.4.1 prelude-ls: 1.2.1 type-check: 0.4.0 + dev: true /os-homedir@1.0.2: resolution: {integrity: sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==} @@ -10541,9 +10533,14 @@ packages: which-pm: 2.0.0 dev: true + /prelude-ls@1.1.2: + resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==} + engines: {node: '>= 0.8.0'} + /prelude-ls@1.2.1: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} + dev: true /preserve@0.2.0: resolution: {integrity: sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==} @@ -11619,13 +11616,6 @@ packages: deprecated: No longer maintained dev: false - /ssf@0.11.2: - resolution: {integrity: sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==} - engines: {node: '>=0.8'} - dependencies: - frac: 1.1.2 - dev: false - /ssh2-sftp-client@9.0.4: resolution: {integrity: sha512-fHAXUgmtmqUq/IdMlN9DBhkzrRFQRfORsQYglZMdnvosr4oo/6js+jxrJgGU+alNLW8ZN1IZFfRSoAejyvr8zg==} engines: {node: '>=10.24.1'} @@ -12044,7 +12034,7 @@ packages: indent-string: 5.0.0 js-yaml: 3.14.1 serialize-error: 7.0.1 - strip-ansi: 7.0.1 + strip-ansi: 7.1.0 dev: false /supports-color@2.0.0: @@ -12458,7 +12448,7 @@ packages: smartwrap: 2.0.2 strip-ansi: 6.0.1 wcwidth: 1.0.1 - yargs: 17.6.0 + yargs: 17.7.2 dev: true /tunnel-agent@0.6.0: @@ -12491,11 +12481,18 @@ packages: - supports-color dev: false + /type-check@0.3.2: + resolution: {integrity: sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==} + engines: {node: '>= 0.8.0'} + dependencies: + prelude-ls: 1.1.2 + /type-check@0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} dependencies: prelude-ls: 1.2.1 + dev: true /type-detect@0.1.1: resolution: {integrity: sha512-5rqszGVwYgBoDkIm2oUtvkfZMQ0vk29iDMU0W2qCa3rG0vPDNczCMT4hV/bLBgLg8k8ri6+u3Zbt+S/14eMzlA==} @@ -12918,15 +12915,9 @@ packages: engines: {node: '>=4'} dev: false - /wmf@1.0.2: - resolution: {integrity: sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==} - engines: {node: '>=0.8'} - dev: false - - /word@0.3.0: - resolution: {integrity: sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==} - engines: {node: '>=0.8'} - dev: false + /word-wrap@1.2.5: + resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} + engines: {node: '>=0.10.0'} /wordwrap@0.0.3: resolution: {integrity: sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==} @@ -12996,20 +12987,6 @@ packages: signal-exit: 3.0.7 dev: false - /xlsx@0.18.5: - resolution: {integrity: sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==} - engines: {node: '>=0.8'} - hasBin: true - dependencies: - adler-32: 1.3.1 - cfb: 1.2.2 - codepage: 1.15.0 - crc-32: 1.2.2 - ssf: 0.11.2 - wmf: 1.0.2 - word: 0.3.0 - dev: false - /xml2js@0.4.23: resolution: {integrity: sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==} engines: {node: '>=4.0.0'} @@ -13181,6 +13158,7 @@ packages: string-width: 4.2.3 y18n: 5.0.8 yargs-parser: 21.1.1 + dev: false /yargs@17.6.2: resolution: {integrity: sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==} @@ -13251,6 +13229,14 @@ packages: engines: {node: '>=12.20'} dev: false + '@cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz': + resolution: {tarball: https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz} + name: xlsx + version: 0.19.3 + engines: {node: '>=0.8'} + hasBin: true + dev: false + github.com/openfn/language-common/b8047f82680d95387cbe4596f55e24e4d0b128c6: resolution: {tarball: https://codeload.github.com/openfn/language-common/tar.gz/b8047f82680d95387cbe4596f55e24e4d0b128c6} name: language-common From 002931f45066a53ca6c0c5e36cf277e761b2015d Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 3 Aug 2023 14:30:59 +0100 Subject: [PATCH 6/8] salesforce: remove yargs --- packages/salesforce/package.json | 4 ++-- pnpm-lock.yaml | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/packages/salesforce/package.json b/packages/salesforce/package.json index 717d08fdc..422de99e8 100644 --- a/packages/salesforce/package.json +++ b/packages/salesforce/package.json @@ -32,11 +32,11 @@ ], "dependencies": { "@openfn/language-common": "1.10.2", + "JSONPath": "^0.10.0", "axios": "^0.21.1", "jsforce": "^1.11.0", "lodash": "^4.17.21", - "mustache": "^2.2.0", - "yargs": "^3.30.0" + "mustache": "^2.2.0" }, "devDependencies": { "assertion-error": "1.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a552d022e..cb068e1f8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1598,9 +1598,6 @@ importers: mustache: specifier: ^2.2.0 version: 2.3.2 - yargs: - specifier: ^3.30.0 - version: 3.32.0 devDependencies: assertion-error: specifier: 1.1.0 @@ -5709,6 +5706,18 @@ packages: supports-color: 8.1.1 dev: true + /debug@4.3.4: + resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.1.2 + dev: true + /debug@4.3.4(supports-color@8.1.1): resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} @@ -9735,7 +9744,7 @@ packages: resolution: {integrity: sha512-1+XfJNYF1cjGB+TKMWi29eZ0b82QOvQs2YoLNzbpWGqFMtRQHTa57osqdGj4FrFPgkO4D4AZinzUJR9VvW3QUA==} engines: {node: '>= 10.13'} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 json-stringify-safe: 5.0.1 lodash: 4.17.21 propagate: 2.0.1 From e36759655807046e0df2c33b564e7cba72b0ae5f Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 3 Aug 2023 14:33:27 +0100 Subject: [PATCH 7/8] fix package json, remove unneeded changelog after rebase --- .changeset/silver-bulldogs-eat.md | 5 ----- packages/salesforce/package.json | 1 - 2 files changed, 6 deletions(-) delete mode 100644 .changeset/silver-bulldogs-eat.md diff --git a/.changeset/silver-bulldogs-eat.md b/.changeset/silver-bulldogs-eat.md deleted file mode 100644 index 29f9aab18..000000000 --- a/.changeset/silver-bulldogs-eat.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@openfn/language-salesforce': patch ---- - -Remove jsonpath dependency diff --git a/packages/salesforce/package.json b/packages/salesforce/package.json index 422de99e8..45fafbd23 100644 --- a/packages/salesforce/package.json +++ b/packages/salesforce/package.json @@ -32,7 +32,6 @@ ], "dependencies": { "@openfn/language-common": "1.10.2", - "JSONPath": "^0.10.0", "axios": "^0.21.1", "jsforce": "^1.11.0", "lodash": "^4.17.21", From 4ef737b840323a2ebdb2f129398c98987abeca14 Mon Sep 17 00:00:00 2001 From: Joe Clark Date: Thu, 3 Aug 2023 16:07:09 +0100 Subject: [PATCH 8/8] salesforce: update package.json --- packages/salesforce/package.json | 9 +++--- pnpm-lock.yaml | 50 ++++++++------------------------ 2 files changed, 16 insertions(+), 43 deletions(-) diff --git a/packages/salesforce/package.json b/packages/salesforce/package.json index 45fafbd23..63a5fb62e 100644 --- a/packages/salesforce/package.json +++ b/packages/salesforce/package.json @@ -31,11 +31,10 @@ "configuration-schema.json" ], "dependencies": { - "@openfn/language-common": "1.10.2", - "axios": "^0.21.1", - "jsforce": "^1.11.0", - "lodash": "^4.17.21", - "mustache": "^2.2.0" + "@openfn/language-common": "workspace:*", + "axios": "^0.21.4", + "jsforce": "^1.11.1", + "lodash": "^4.17.21" }, "devDependencies": { "assertion-error": "1.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cb068e1f8..cf70f0418 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1584,20 +1584,17 @@ importers: packages/salesforce: dependencies: '@openfn/language-common': - specifier: 1.10.2 + specifier: workspace:* version: link:../common axios: - specifier: ^0.21.1 + specifier: ^0.21.4 version: 0.21.4 jsforce: - specifier: ^1.11.0 + specifier: ^1.11.1 version: 1.11.1 lodash: specifier: ^4.17.21 version: 4.17.21 - mustache: - specifier: ^2.2.0 - version: 2.3.2 devDependencies: assertion-error: specifier: 1.1.0 @@ -4756,7 +4753,7 @@ packages: /bl@2.2.1: resolution: {integrity: sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==} dependencies: - readable-stream: 2.3.7 + readable-stream: 2.3.8 safe-buffer: 5.2.1 dev: false @@ -5437,7 +5434,7 @@ packages: dependencies: buffer-from: 1.1.2 inherits: 2.0.4 - readable-stream: 2.3.7 + readable-stream: 2.3.8 typedarray: 0.0.6 dev: false @@ -5447,7 +5444,7 @@ packages: dependencies: buffer-from: 1.1.2 inherits: 2.0.4 - readable-stream: 3.6.0 + readable-stream: 3.6.2 typedarray: 0.0.6 dev: false @@ -5516,7 +5513,6 @@ packages: /core-util-is@1.0.3: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} - dev: false /cpu-features@0.0.8: resolution: {integrity: sha512-BbHBvtYhUhksqTjr6bhNOjGgMnhwhGTQmOoZGD+K7BCaQDCuZl/Ve1ZxUSMRwVC4D/rkCPQ2MAIeYzrWyK7eEg==} @@ -5706,18 +5702,6 @@ packages: supports-color: 8.1.1 dev: true - /debug@4.3.4: - resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: 2.1.2 - dev: true - /debug@4.3.4(supports-color@8.1.1): resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} @@ -7394,7 +7378,7 @@ packages: extend: 3.0.2 file-uri-to-path: 1.0.0 ftp: 0.3.10 - readable-stream: 2.3.7 + readable-stream: 2.3.8 transitivePeerDependencies: - supports-color dev: false @@ -9744,7 +9728,7 @@ packages: resolution: {integrity: sha512-1+XfJNYF1cjGB+TKMWi29eZ0b82QOvQs2YoLNzbpWGqFMtRQHTa57osqdGj4FrFPgkO4D4AZinzUJR9VvW3QUA==} engines: {node: '>= 10.13'} dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) json-stringify-safe: 5.0.1 lodash: 4.17.21 propagate: 2.0.1 @@ -10800,7 +10784,7 @@ packages: /readable-stream@1.0.27-1: resolution: {integrity: sha512-uQE31HGhpMrqZwtDjRliOs2aC3XBi+DdkhLs+Xa0dvVD5eDiZr3+k8rKVZcyTzxosgtMw7B/twQsK3P1KTZeVg==} dependencies: - core-util-is: 1.0.2 + core-util-is: 1.0.3 inherits: 2.0.4 isarray: 0.0.1 string_decoder: 0.10.31 @@ -10809,7 +10793,7 @@ packages: /readable-stream@1.1.14: resolution: {integrity: sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==} dependencies: - core-util-is: 1.0.2 + core-util-is: 1.0.3 inherits: 2.0.4 isarray: 0.0.1 string_decoder: 0.10.31 @@ -10836,16 +10820,6 @@ packages: safe-buffer: 5.1.2 string_decoder: 1.1.1 util-deprecate: 1.0.2 - dev: false - - /readable-stream@3.6.0: - resolution: {integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==} - engines: {node: '>= 6'} - dependencies: - inherits: 2.0.4 - string_decoder: 1.1.1 - util-deprecate: 1.0.2 - dev: false /readable-stream@3.6.2: resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==} @@ -10863,7 +10837,7 @@ packages: dependencies: graceful-fs: 4.2.11 micromatch: 3.1.10 - readable-stream: 2.3.7 + readable-stream: 2.3.8 transitivePeerDependencies: - supports-color dev: true @@ -12321,7 +12295,7 @@ packages: /tr46@1.0.1: resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} dependencies: - punycode: 2.1.1 + punycode: 2.3.0 dev: false /traverse@0.3.9: