From 33517043cd5c13c8516bafbc4cfff88e15fba66d Mon Sep 17 00:00:00 2001 From: Wyatt Herkamp Date: Tue, 17 Oct 2023 10:00:30 -0400 Subject: [PATCH] Update Dependencies --- dist/restore/index.js | 28 +++++++++++++--------- dist/save/index.js | 28 +++++++++++++--------- package-lock.json | 55 +++++++++++++++++++++++++++---------------- package.json | 8 +++---- 4 files changed, 73 insertions(+), 46 deletions(-) diff --git a/dist/restore/index.js b/dist/restore/index.js index d4e032a..7170d30 100644 --- a/dist/restore/index.js +++ b/dist/restore/index.js @@ -5994,7 +5994,7 @@ class OidcClient { .catch(error => { throw new Error(`Failed to get ID Token. \n Error Code : ${error.statusCode}\n - Error Message: ${error.result.message}`); + Error Message: ${error.message}`); }); const id_token = (_a = res.result) === null || _a === void 0 ? void 0 : _a.value; if (!id_token) { @@ -62971,7 +62971,7 @@ var promises_default = /*#__PURE__*/__nccwpck_require__.n(promises_); // EXTERNAL MODULE: external "os" var external_os_ = __nccwpck_require__(2037); var external_os_default = /*#__PURE__*/__nccwpck_require__.n(external_os_); -;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/error.js +;// CONCATENATED MODULE: ../smol-toml/dist/error.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63036,7 +63036,7 @@ class TomlError extends Error { } } -;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/date.js +;// CONCATENATED MODULE: ../smol-toml/dist/date.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63163,7 +63163,7 @@ class TomlDate extends Date { } } -;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/util.js +;// CONCATENATED MODULE: ../smol-toml/dist/util.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63222,7 +63222,7 @@ function skipVoid(str, ptr, banNewLines, banComments) { ? ptr : skipVoid(str, skipComment(str, ptr), banNewLines); } -function skipUntil(str, ptr, sep, end) { +function skipUntil(str, ptr, sep, end, banNewLines = false) { if (!end) { ptr = indexOfNewline(str, ptr); return ptr < 0 ? str.length : ptr; @@ -63238,6 +63238,9 @@ function skipUntil(str, ptr, sep, end) { else if (c === end) { return i; } + else if (banNewLines && (c === '\n' || c === '\r' && str[i + 1] === '\n')) { + return i; + } } throw new TomlError('cannot find end of structure', { toml: str, @@ -63265,7 +63268,7 @@ function getStringEnd(str, seek) { return seek; } -;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/primitive.js +;// CONCATENATED MODULE: ../smol-toml/dist/primitive.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63439,7 +63442,7 @@ function parseValue(value, toml, ptr) { return date; } -;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/extract.js +;// CONCATENATED MODULE: ../smol-toml/dist/extract.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63513,7 +63516,10 @@ function extractValue(str, ptr, end) { let endPtr; if (c === '"' || c === "'") { endPtr = getStringEnd(str, ptr); - return [parseString(str, ptr, endPtr), endPtr + +(!!end && str[endPtr] === ',')]; + let parsed = parseString(str, ptr, endPtr); + if (end) + endPtr = skipUntil(str, endPtr, ',', end, end !== ']'); + return [parsed, endPtr]; } endPtr = skipUntil(str, ptr, ',', end); let slice = sliceAndTrimEndOf(str, ptr, endPtr - (+(str[endPtr - 1] === ',')), end === ']'); @@ -63533,7 +63539,7 @@ function extractValue(str, ptr, end) { ]; } -;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/struct.js +;// CONCATENATED MODULE: ../smol-toml/dist/struct.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63737,7 +63743,7 @@ function parseArray(str, ptr) { return [res, ptr]; } -;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/parse.js +;// CONCATENATED MODULE: ../smol-toml/dist/parse.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63887,7 +63893,7 @@ function parse(toml) { return res; } -;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/index.js +;// CONCATENATED MODULE: ../smol-toml/dist/index.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause diff --git a/dist/save/index.js b/dist/save/index.js index f22cb50..06262f5 100644 --- a/dist/save/index.js +++ b/dist/save/index.js @@ -5994,7 +5994,7 @@ class OidcClient { .catch(error => { throw new Error(`Failed to get ID Token. \n Error Code : ${error.statusCode}\n - Error Message: ${error.result.message}`); + Error Message: ${error.message}`); }); const id_token = (_a = res.result) === null || _a === void 0 ? void 0 : _a.value; if (!id_token) { @@ -62973,7 +62973,7 @@ var promises_default = /*#__PURE__*/__nccwpck_require__.n(promises_); // EXTERNAL MODULE: external "os" var external_os_ = __nccwpck_require__(2037); var external_os_default = /*#__PURE__*/__nccwpck_require__.n(external_os_); -;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/error.js +;// CONCATENATED MODULE: ../smol-toml/dist/error.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63038,7 +63038,7 @@ class TomlError extends Error { } } -;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/date.js +;// CONCATENATED MODULE: ../smol-toml/dist/date.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63165,7 +63165,7 @@ class TomlDate extends Date { } } -;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/util.js +;// CONCATENATED MODULE: ../smol-toml/dist/util.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63224,7 +63224,7 @@ function skipVoid(str, ptr, banNewLines, banComments) { ? ptr : skipVoid(str, skipComment(str, ptr), banNewLines); } -function skipUntil(str, ptr, sep, end) { +function skipUntil(str, ptr, sep, end, banNewLines = false) { if (!end) { ptr = indexOfNewline(str, ptr); return ptr < 0 ? str.length : ptr; @@ -63240,6 +63240,9 @@ function skipUntil(str, ptr, sep, end) { else if (c === end) { return i; } + else if (banNewLines && (c === '\n' || c === '\r' && str[i + 1] === '\n')) { + return i; + } } throw new TomlError('cannot find end of structure', { toml: str, @@ -63267,7 +63270,7 @@ function getStringEnd(str, seek) { return seek; } -;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/primitive.js +;// CONCATENATED MODULE: ../smol-toml/dist/primitive.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63441,7 +63444,7 @@ function parseValue(value, toml, ptr) { return date; } -;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/extract.js +;// CONCATENATED MODULE: ../smol-toml/dist/extract.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63515,7 +63518,10 @@ function extractValue(str, ptr, end) { let endPtr; if (c === '"' || c === "'") { endPtr = getStringEnd(str, ptr); - return [parseString(str, ptr, endPtr), endPtr + +(!!end && str[endPtr] === ',')]; + let parsed = parseString(str, ptr, endPtr); + if (end) + endPtr = skipUntil(str, endPtr, ',', end, end !== ']'); + return [parsed, endPtr]; } endPtr = skipUntil(str, ptr, ',', end); let slice = sliceAndTrimEndOf(str, ptr, endPtr - (+(str[endPtr - 1] === ',')), end === ']'); @@ -63535,7 +63541,7 @@ function extractValue(str, ptr, end) { ]; } -;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/struct.js +;// CONCATENATED MODULE: ../smol-toml/dist/struct.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63739,7 +63745,7 @@ function parseArray(str, ptr) { return [res, ptr]; } -;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/parse.js +;// CONCATENATED MODULE: ../smol-toml/dist/parse.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause @@ -63889,7 +63895,7 @@ function parse(toml) { return res; } -;// CONCATENATED MODULE: ./node_modules/smol-toml/dist/index.js +;// CONCATENATED MODULE: ../smol-toml/dist/index.js /*! * Copyright (c) Squirrel Chat et al., All rights reserved. * SPDX-License-Identifier: BSD-3-Clause diff --git a/package-lock.json b/package-lock.json index 245bece..01f16a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,21 +11,41 @@ "dependencies": { "@actions/buildjet-cache": "npm:github-actions.cache-buildjet@0.2.0", "@actions/cache": "^3.2.2", - "@actions/core": "^1.10.0", + "@actions/core": "^1.10.1", "@actions/exec": "^1.1.1", "@actions/glob": "^0.4.0", "@actions/io": "^1.1.3", - "smol-toml": "^1.1.1" + "smol-toml": "file:../smol-toml" }, "devDependencies": { - "@vercel/ncc": "^0.36.1", + "@vercel/ncc": "^0.38.0", "linefix": "^0.1.1", - "typescript": "5.1.6" + "typescript": "5.2.2" }, "funding": { "url": "https://github.com/sponsors/Swatinem" } }, + "../smol-toml": { + "version": "1.1.2", + "license": "BSD-3-Clause", + "devDependencies": { + "@iarna/toml": "3.0.0", + "@ltd/j-toml": "^1.38.0", + "@tsconfig/esm": "^1.0.3", + "@tsconfig/node-lts": "^18.12.5", + "@tsconfig/strictest": "^2.0.2", + "@types/node": "^20.8.6", + "@vitest/ui": "^0.34.6", + "fast-toml": "^0.5.4", + "typescript": "^5.2.2", + "vitest": "^0.34.6" + }, + "engines": { + "node": ">= 18", + "pnpm": ">= 8" + } + }, "node_modules/@actions/buildjet-cache": { "name": "github-actions.cache-buildjet", "version": "0.2.0", @@ -77,9 +97,9 @@ } }, "node_modules/@actions/core": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz", - "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.1.tgz", + "integrity": "sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==", "dependencies": { "@actions/http-client": "^2.0.1", "uuid": "^8.3.2" @@ -342,9 +362,9 @@ } }, "node_modules/@vercel/ncc": { - "version": "0.36.1", - "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.36.1.tgz", - "integrity": "sha512-S4cL7Taa9yb5qbv+6wLgiKVZ03Qfkc4jGRuiUQMQ8HGBD5pcNRnHeYM33zBvJE4/zJGjJJ8GScB+WmTsn9mORw==", + "version": "0.38.0", + "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.38.0.tgz", + "integrity": "sha512-B4YKZMm/EqMptKSFyAq4q2SlgJe+VCmEH6Y8gf/E1pTlWbsUJpuH1ymik2Ex3aYO5mCWwV1kaSYHSQOT8+4vHA==", "dev": true, "bin": { "ncc": "dist/ncc/cli.js" @@ -513,13 +533,8 @@ } }, "node_modules/smol-toml": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.1.1.tgz", - "integrity": "sha512-qyYMygHyDKiy82iiKTH/zXr0DZmEpsou0AMZnkXdYhA/0LhPLoZ/xHaOBrbecLbAJ/Gd5KhMWWH8TXtgv1g+DQ==", - "engines": { - "node": ">= 18", - "pnpm": ">= 8" - } + "resolved": "../smol-toml", + "link": true }, "node_modules/tr46": { "version": "0.0.3", @@ -540,9 +555,9 @@ } }, "node_modules/typescript": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", - "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/package.json b/package.json index b72789f..6f4f9ae 100644 --- a/package.json +++ b/package.json @@ -24,16 +24,16 @@ "dependencies": { "@actions/buildjet-cache": "npm:github-actions.cache-buildjet@0.2.0", "@actions/cache": "^3.2.2", - "@actions/core": "^1.10.0", + "@actions/core": "^1.10.1", "@actions/exec": "^1.1.1", "@actions/glob": "^0.4.0", "@actions/io": "^1.1.3", - "smol-toml": "^1.1.1" + "smol-toml": "file:../smol-toml" }, "devDependencies": { - "@vercel/ncc": "^0.36.1", + "@vercel/ncc": "^0.38.0", "linefix": "^0.1.1", - "typescript": "5.1.6" + "typescript": "5.2.2" }, "scripts": { "prepare": "ncc build --target es2020 -o dist/restore src/restore.ts && ncc build --target es2020 -o dist/save src/save.ts && linefix dist"