From 38eb00fb053fd9fb8be2fdd4d8b3896a0f3d2482 Mon Sep 17 00:00:00 2001 From: Max Craigie Date: Mon, 20 Feb 2023 11:49:39 +1100 Subject: [PATCH 1/7] Bump dependencies to resolve audit issues --- package-lock.json | 65 ++++++++++++++--------------------------------- 1 file changed, 19 insertions(+), 46 deletions(-) diff --git a/package-lock.json b/package-lock.json index db1b314..a43c80b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3160,18 +3160,6 @@ "node": ">=0.10.0" } }, - "node_modules/eslint-plugin-import/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, "node_modules/eslint-plugin-import/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -4182,13 +4170,10 @@ "dev": true }, "node_modules/json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true, - "dependencies": { - "minimist": "^1.2.5" - }, "bin": { "json5": "lib/cli.js" }, @@ -4389,9 +4374,9 @@ } }, "node_modules/minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "dependencies": { "brace-expansion": "^1.1.7" @@ -5467,9 +5452,9 @@ } }, "node_modules/tsconfig-paths/node_modules/json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", "dev": true, "dependencies": { "minimist": "^1.2.0" @@ -8088,15 +8073,6 @@ "esutils": "^2.0.2" } }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -8735,13 +8711,10 @@ "dev": true }, "json5": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", - "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true }, "levn": { "version": "0.4.1", @@ -8892,9 +8865,9 @@ } }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "requires": { "brace-expansion": "^1.1.7" @@ -9675,9 +9648,9 @@ }, "dependencies": { "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", "dev": true, "requires": { "minimist": "^1.2.0" From 2fd01d17b785cff376d9be202d02c5e99eb35662 Mon Sep 17 00:00:00 2001 From: Max Craigie Date: Mon, 20 Feb 2023 11:50:42 +1100 Subject: [PATCH 2/7] Ignore dist folder in linting config --- .eslintrc.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index edf2e2d..e896dd2 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -5,6 +5,12 @@ "import/extensions": "off", "no-param-reassign": "off" }, - "parserOptions": {"project": ["tsconfig.json"]}, - "extends": ["airbnb-base", "airbnb-typescript/base", "plugin:prettier/recommended", "plugin:@typescript-eslint/recommended"] + "parserOptions": { "project": ["tsconfig.json"] }, + "extends": [ + "airbnb-base", + "airbnb-typescript/base", + "plugin:prettier/recommended", + "plugin:@typescript-eslint/recommended" + ], + "ignorePatterns": ["dist"] } From 2068b376d262f7b8f3dada586f7b52540bc4ddf1 Mon Sep 17 00:00:00 2001 From: JSZ Date: Wed, 22 Oct 2025 11:48:18 +0200 Subject: [PATCH 3/7] Remove test credentials Move test credentials to CI configuration --- .travis.yml | 6 ++++-- test/compare-api.js | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a6c93a1..42e1137 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,11 @@ arch: amd64 cache: npm node_js: - - 12 - - 14 - 16 + - 18 + - 20 + - 22 + - 24 notifications: email: false diff --git a/test/compare-api.js b/test/compare-api.js index 9a161a0..6459ee0 100644 --- a/test/compare-api.js +++ b/test/compare-api.js @@ -18,8 +18,8 @@ describe('Compare Api Node Client live tests', function () { this.timeout(10000); before(function () { - // These credentials are for the Draftable Comparison API Test Account and can be public. - this.client = require('..').client('GOiDaN-test', 'fe055b5a54c4d58264f70050a469536e'); + // From https://api.draftable.com/account/credentials under "Account ID" + this.client = require('..').client(process.env.DRAFTABLE_ACCOUNT_ID, process.env.DRAFTABLE_AUTH_TOKEN); this.comparisons = this.client.comparisons; this.identifiers = Array.from({ length: 3 }, () => this.comparisons.generateIdentifier()); }); From 60755a68e3e537ded0f22eb2eecf1b69ebb94459 Mon Sep 17 00:00:00 2001 From: Juliusz Skowron Date: Wed, 22 Oct 2025 11:50:27 +0200 Subject: [PATCH 4/7] Update node version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 54d0b18..3d6f7bb 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "main": "dist/index.js", "types": "dist/types/index.d.ts", "engines": { - "node": ">=12.0.0" + "node": ">=16.0.0" }, "dependencies": { "needle": "^3.0.0" From 99ead9627c50b60f7e9d4fc85041aeb7735164e5 Mon Sep 17 00:00:00 2001 From: Juliusz Skowron Date: Wed, 22 Oct 2025 12:01:36 +0200 Subject: [PATCH 5/7] update env variable names --- test/compare-api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/compare-api.js b/test/compare-api.js index 6459ee0..3241d3f 100644 --- a/test/compare-api.js +++ b/test/compare-api.js @@ -19,7 +19,7 @@ describe('Compare Api Node Client live tests', function () { before(function () { // From https://api.draftable.com/account/credentials under "Account ID" - this.client = require('..').client(process.env.DRAFTABLE_ACCOUNT_ID, process.env.DRAFTABLE_AUTH_TOKEN); + this.client = require('..').client(process.env.DR_ACCOUNT, process.env.DR_TOKEN); this.comparisons = this.client.comparisons; this.identifiers = Array.from({ length: 3 }, () => this.comparisons.generateIdentifier()); }); From af094559ccc718b5a7ffeb8861b96bd8e28a3a6c Mon Sep 17 00:00:00 2001 From: Juliusz Skowron Date: Mon, 3 Nov 2025 12:26:51 +0100 Subject: [PATCH 6/7] add test credentials to travis config --- .travis.yml | 7 +++++++ test/compare-api.js | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 42e1137..6d5b926 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,13 @@ arch: amd64 cache: npm +env: + global: + # DRAFTABLE_TEST_ACCOUNT_ID + - secure: "JZd9yaUYwpvg214d3X9xbLnPrCVJXWp4LbJisGaX9KQctFw+WzT1e06tJN8I/lhXzhZX3g3m1P3o3Yl9wHBeMf+kz8kzHLqmlFV6rjjfiO59pJsC6Q83HIfBL4hJU7r8jD9ij8oJ7WS+Tf8FDAY/iwKn5R1jQJ4EutyKdPYXmUJxZ4FrGyQo+ML7Dip83I0RDz5gCtRE62eD0IxziHfQXMfP0rvxWBHltc6z90S4AY14MZCTF2tZsv950rcx0CieF2FvA7rG6n92WgFSUHjv3peeR4Z0KYRTPZFWxXpRvlRbyqEDsXcw+I4GRthKjs0/gmdbKHV6C3QkmdjHekBPuQDREjcq9cOI5znuwyZFMiAl5jI0KzcDtjo2TflmuBqhgjHA6P1R9bflIBgia8cqiGk7md+zRde480o2o2STBj680xXQR8NMADHX+rYtK6b9lxblS5qxZAMznM7F+X14VyRVWeCbOyAg+N+n5FaxfKNLe4RFTxnE1FsJqzn1O57C+mZf1+TN83X18pYNG58sPNlzKWZtgDcPlyMj4EqibJtB5urnRRuFkHFeplCIr1+OIyET25KSACJffou65YX7ylP1wh8kHXjXGN5EWF7SegRJWEyEdg1EVbWE6Fl/rME432wzilxr2GGM5HrwQoted5Wliluqk5kVDvSrunM2mkI=" + # DRAFTABLE_TEST_AUTH_TOKEN + - secure: "hj4HlZOf3SC6Ug2+4Gayvo+6NlzaZgPTRLu+h149sWmghxxsN3hjcuwmZZfnwBvMmJ4KM9U5I92atju8+GXysYe+rZg9jQ+9RRSedK7E0zHj0N/go8RZt7Ogfx+f2E3XR9862apDh7VUn4rrzJsK04XuS1zqZFCo9xw8DQqo4yl7OXaWD2tWZW7hRhUgOroDfosa358ZPCBaHCDBcRWV/k2/UE/7+UGmU96Ax+i51a+xQMya0YBDZrhFnyZycRaDsC1Uxs8prjStyTHXJ9t+ZIjx3G9v33UzOlGoPKJhHqHGPgwee1KkDa/y52fRY5s+9tKE2pvdA3b5cYL+dEgFwem7ZJvHhrRp9siY7BL0kI3tcAQjl7cMcNiN5eH0jN+Dw2wF6Dn3HceyHgNieL/OzH7uFKas0YCPTeX8mSoK32o4NKXA6o22WN49WkJmOs0lbNznXYfSun8Kox218qjV0RIQSvX/ag7sHmFeAMQZjxK11MzclmfGzWWSeCHAQDY4vVg7Yf18/EnL0bUi/ydT9r/FgdD6uMjZfGm1A3W1DbJdkl6q3L2IcS5d9rEatL/kkmcBrJE48L4kYWDepndZF4H+hjN4Nc8X8+xIohMkipfXMjSUmyLKR67kdz3F40Mc7eMId9o/Yeui7RGirTzCYvS4+ITo6TxLf33fExOJzZg=" + node_js: - 16 - 18 diff --git a/test/compare-api.js b/test/compare-api.js index 3241d3f..186ec94 100644 --- a/test/compare-api.js +++ b/test/compare-api.js @@ -19,7 +19,7 @@ describe('Compare Api Node Client live tests', function () { before(function () { // From https://api.draftable.com/account/credentials under "Account ID" - this.client = require('..').client(process.env.DR_ACCOUNT, process.env.DR_TOKEN); + this.client = require('..').client(process.env.DRAFTABLE_TEST_ACCOUNT_ID, process.env.DRAFTABLE_TEST_AUTH_TOKEN); this.comparisons = this.client.comparisons; this.identifiers = Array.from({ length: 3 }, () => this.comparisons.generateIdentifier()); }); From b3cca33b5800d023ca46d386f1d3dd04bdc634f4 Mon Sep 17 00:00:00 2001 From: Juliusz Skowron Date: Tue, 4 Nov 2025 13:01:45 +0100 Subject: [PATCH 7/7] undo travis config --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6d5b926..42e1137 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,13 +9,6 @@ arch: amd64 cache: npm -env: - global: - # DRAFTABLE_TEST_ACCOUNT_ID - - secure: "JZd9yaUYwpvg214d3X9xbLnPrCVJXWp4LbJisGaX9KQctFw+WzT1e06tJN8I/lhXzhZX3g3m1P3o3Yl9wHBeMf+kz8kzHLqmlFV6rjjfiO59pJsC6Q83HIfBL4hJU7r8jD9ij8oJ7WS+Tf8FDAY/iwKn5R1jQJ4EutyKdPYXmUJxZ4FrGyQo+ML7Dip83I0RDz5gCtRE62eD0IxziHfQXMfP0rvxWBHltc6z90S4AY14MZCTF2tZsv950rcx0CieF2FvA7rG6n92WgFSUHjv3peeR4Z0KYRTPZFWxXpRvlRbyqEDsXcw+I4GRthKjs0/gmdbKHV6C3QkmdjHekBPuQDREjcq9cOI5znuwyZFMiAl5jI0KzcDtjo2TflmuBqhgjHA6P1R9bflIBgia8cqiGk7md+zRde480o2o2STBj680xXQR8NMADHX+rYtK6b9lxblS5qxZAMznM7F+X14VyRVWeCbOyAg+N+n5FaxfKNLe4RFTxnE1FsJqzn1O57C+mZf1+TN83X18pYNG58sPNlzKWZtgDcPlyMj4EqibJtB5urnRRuFkHFeplCIr1+OIyET25KSACJffou65YX7ylP1wh8kHXjXGN5EWF7SegRJWEyEdg1EVbWE6Fl/rME432wzilxr2GGM5HrwQoted5Wliluqk5kVDvSrunM2mkI=" - # DRAFTABLE_TEST_AUTH_TOKEN - - secure: "hj4HlZOf3SC6Ug2+4Gayvo+6NlzaZgPTRLu+h149sWmghxxsN3hjcuwmZZfnwBvMmJ4KM9U5I92atju8+GXysYe+rZg9jQ+9RRSedK7E0zHj0N/go8RZt7Ogfx+f2E3XR9862apDh7VUn4rrzJsK04XuS1zqZFCo9xw8DQqo4yl7OXaWD2tWZW7hRhUgOroDfosa358ZPCBaHCDBcRWV/k2/UE/7+UGmU96Ax+i51a+xQMya0YBDZrhFnyZycRaDsC1Uxs8prjStyTHXJ9t+ZIjx3G9v33UzOlGoPKJhHqHGPgwee1KkDa/y52fRY5s+9tKE2pvdA3b5cYL+dEgFwem7ZJvHhrRp9siY7BL0kI3tcAQjl7cMcNiN5eH0jN+Dw2wF6Dn3HceyHgNieL/OzH7uFKas0YCPTeX8mSoK32o4NKXA6o22WN49WkJmOs0lbNznXYfSun8Kox218qjV0RIQSvX/ag7sHmFeAMQZjxK11MzclmfGzWWSeCHAQDY4vVg7Yf18/EnL0bUi/ydT9r/FgdD6uMjZfGm1A3W1DbJdkl6q3L2IcS5d9rEatL/kkmcBrJE48L4kYWDepndZF4H+hjN4Nc8X8+xIohMkipfXMjSUmyLKR67kdz3F40Mc7eMId9o/Yeui7RGirTzCYvS4+ITo6TxLf33fExOJzZg=" - node_js: - 16 - 18