From de33c8fcf1ff45870ec08597f452dc35330d86d4 Mon Sep 17 00:00:00 2001 From: leey00nsu Date: Mon, 29 Jan 2024 22:17:51 +0900 Subject: [PATCH 1/2] fix function isBase64 --- create-or-update-files.js | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/create-or-update-files.js b/create-or-update-files.js index e5f9b66..0eef604 100644 --- a/create-or-update-files.js +++ b/create-or-update-files.js @@ -1,4 +1,32 @@ -const isBase64 = require("is-base64"); +function isBase64(str) { + var notBase64 = /[^A-Z0-9+\/=]/i; + const isString = (typeof str === 'string' || str instanceof String); + + if (!isString) { + let invalidType; + if (str === null) { + invalidType = 'null'; + } else { + invalidType = typeof str; + if (invalidType === 'object' && str.constructor && str.constructor.hasOwnProperty('name')) { + invalidType = str.constructor.name; + } else { + invalidType = `a ${invalidType}`; + } + } + throw new TypeError(`Expected string but received ${invalidType}.`); + } + + const len = str.length; + if (!len || len % 4 !== 0 || notBase64.test(str)) { + return false; + } + const firstPaddingChar = str.indexOf('='); + return firstPaddingChar === -1 || + firstPaddingChar === len - 1 || + (firstPaddingChar === len - 2 && str[len - 1] === '='); +} + module.exports = function (octokit, opts) { return new Promise(async (resolve, reject) => { // Up front validation From b26d4c162bd1f7a2bf9a86e97e138f6572956f84 Mon Sep 17 00:00:00 2001 From: Michael Heap Date: Sun, 11 Feb 2024 12:37:49 +0000 Subject: [PATCH 2/2] Remove is-base64 dependency --- package-lock.json | 17 ----------------- package.json | 1 - 2 files changed, 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index cfb20c8..fc9b976 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,9 +8,6 @@ "name": "octokit-commit-multiple-files", "version": "5.0.0", "license": "MIT", - "dependencies": { - "is-base64": "^1.1.0" - }, "devDependencies": { "@octokit/rest": ">=18.5.0", "eslint": "^8.47.0", @@ -2878,15 +2875,6 @@ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", "dev": true }, - "node_modules/is-base64": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-base64/-/is-base64-1.1.0.tgz", - "integrity": "sha512-Nlhg7Z2dVC4/PTvIFkgVVNvPHSO2eR/Yd0XzhGiXCXEvWnptXlXa/clQ8aePPiMuxEGcWfzWbGw2Fe3d+Y3v1g==", - "bin": { - "is_base64": "bin/is-base64", - "is-base64": "bin/is-base64" - } - }, "node_modules/is-core-module": { "version": "2.13.0", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", @@ -7200,11 +7188,6 @@ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", "dev": true }, - "is-base64": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-base64/-/is-base64-1.1.0.tgz", - "integrity": "sha512-Nlhg7Z2dVC4/PTvIFkgVVNvPHSO2eR/Yd0XzhGiXCXEvWnptXlXa/clQ8aePPiMuxEGcWfzWbGw2Fe3d+Y3v1g==" - }, "is-core-module": { "version": "2.13.0", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", diff --git a/package.json b/package.json index b49c0a7..c86131d 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "nock": "^13.3.3" }, "dependencies": { - "is-base64": "^1.1.0" }, "peerDependencies": { "@octokit/rest": ">=20.0.1"