From 4507ce6378bb3b506d17c238679ca85b63d5827e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Apr 2024 12:39:38 +0000
Subject: [PATCH] Bump the npm_and_yarn group across 1 directory with 2 updates
(#3505)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bumps the npm_and_yarn group with 2 updates in the / directory:
[vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) and
[tar](https://github.com/isaacs/node-tar).
Updates `vite` from 5.2.8 to 5.2.9
Changelog
Sourced from vite's
changelog.
5.2.9 (2024-04-15)
Commits
Updates `tar` from 6.2.1 to 7.0.1
Changelog
Sourced from tar's
changelog.
Changelog
7.0
- Rewrite in TypeScript, provide ESM and CommonJS hybrid
interface
- Add tree-shake friendly exports, like
import('tar/create')
and import('tar/read-entry')
to get individual functions or
classes.
- Add
chmod
option that defaults to false, and deprecate
noChmod
. That is, reverse the default option regarding
explicitly setting file system modes to match tar entry
settings.
- Add
processUmask
option to avoid having to call
process.umask()
when chmod: true
(or
noChmod: false
) is
set.
6.2
- Add support for brotli compression
- Add
maxDepth
option to prevent extraction into
excessively
deep folders.
6.1
6.0
- Drop support for node 6 and 8
- fix symlinks and hardlinks on windows being packed with
\
-style path targets
5.0
- Address unpack race conditions using path reservations
- Change large-numbers errors from TypeError to Error
- Add
TAR_*
error codes
- Raise
TAR_BAD_ARCHIVE
warning/error when there are no
valid
entries found in an archive
- do not treat ignored entries as an invalid archive
- drop support for node v4
- unpack: conditionally use a file mapping to write files on
Windows
- Set more portable 'mode' value in portable mode
- Set
portable
gzip option in portable mode
... (truncated)
Commits
d99fce3
7.0.1
af04392
Do not apply linkpath,global from global pax header
b0fbdea
7.0.0
957da75
remove old lib folder
9a260c2
test verifying #398
is fixed
2d89a4e
Properly handle long linkpath in PaxHeader
314ec7e
list: close file even if no error thrown
b3afdbb
unpack test: use modern tap features
2330416
test: code style, prefer () to _ for empty fns
ae9ce7e
test: fix normalize-unicode coverage on linux
- Additional commits viewable in compare
view
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore major version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's major version (unless you unignore this specific
dependency's major version or upgrade to it yourself)
- `@dependabot ignore minor version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's minor version (unless you unignore this specific
dependency's minor version or upgrade to it yourself)
- `@dependabot ignore ` will close this group update PR
and stop Dependabot creating any more for the specific dependency
(unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore ` will remove all of the ignore
conditions of the specified dependency
- `@dependabot unignore ` will
remove the ignore condition of the specified dependency and ignore
conditions
You can disable automated security fix PRs for this repo from the
[Security Alerts page](https://github.com/tldraw/tldraw/network/alerts).
---------
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mime Čuvalo
Co-authored-by: Steve Ruiz
---
scripts/deploy.ts | 2 +-
scripts/lib/didAnyPackageChange.ts | 45 +++++-------
scripts/package.json | 2 +-
yarn.lock | 113 +++++++++++++++++++++++------
4 files changed, 110 insertions(+), 52 deletions(-)
diff --git a/scripts/deploy.ts b/scripts/deploy.ts
index 4c39f387d..ee15826cb 100644
--- a/scripts/deploy.ts
+++ b/scripts/deploy.ts
@@ -515,7 +515,7 @@ async function coalesceWithPreviousAssets(assetsDir: string) {
// and it will mess up the inline source viewer on sentry errors.
const out = tar.x({ cwd: assetsDir, 'keep-existing': true })
for await (const chunk of Body?.transformToWebStream() as any as AsyncIterable) {
- out.write(chunk)
+ out.write(Buffer.from(chunk.buffer))
}
out.end()
}
diff --git a/scripts/lib/didAnyPackageChange.ts b/scripts/lib/didAnyPackageChange.ts
index db4ad3872..ce20bba0f 100644
--- a/scripts/lib/didAnyPackageChange.ts
+++ b/scripts/lib/didAnyPackageChange.ts
@@ -18,12 +18,12 @@ async function hasPackageChanged(pkg: PackageDetails) {
}
const publishedTarballPath = `${dirPath}/published-package.tgz`
writeFileSync(publishedTarballPath, Buffer.from(await res.arrayBuffer()))
- const publishedManifest = await getTarballManifest(publishedTarballPath)
+ const publishedManifest = getTarballManifestSync(publishedTarballPath)
const localTarballPath = `${dirPath}/local-package.tgz`
await exec('yarn', ['pack', '--out', localTarballPath], { pwd: pkg.dir })
- const localManifest = await getTarballManifest(localTarballPath)
+ const localManifest = getTarballManifestSync(localTarballPath)
return !manifestsAreEqual(publishedManifest, localManifest)
} finally {
@@ -48,34 +48,25 @@ function manifestsAreEqual(a: Record, b: Record)
return true
}
-function getTarballManifest(tarballPath: string): Promise> {
+function getTarballManifestSync(tarballPath: string) {
const manifest: Record = {}
- return new Promise((resolve, reject) =>
- tar.list(
- {
- // @ts-expect-error bad typings
- file: tarballPath,
- onentry: (entry) => {
- entry.on('data', (data) => {
- // we could hash these to reduce memory but it's probably fine
- const existing = manifest[entry.path]
- if (existing) {
- manifest[entry.path] = Buffer.concat([existing, data])
- } else {
- manifest[entry.path] = data
- }
- })
- },
- },
- (err: any) => {
- if (err) {
- reject(err)
+ tar.list({
+ file: tarballPath,
+ onentry: (entry) => {
+ entry.on('data', (data) => {
+ // we could hash these to reduce memory but it's probably fine
+ const existing = manifest[entry.path]
+ if (existing) {
+ manifest[entry.path] = Buffer.concat([existing, data])
} else {
- resolve(manifest)
+ manifest[entry.path] = data
}
- }
- )
- )
+ })
+ },
+ sync: true,
+ })
+
+ return manifest
}
export async function didAnyPackageChange() {
diff --git a/scripts/package.json b/scripts/package.json
index e1bf07393..091173913 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -59,7 +59,7 @@
"@types/tmp": "^0.2.6",
"ignore": "^5.2.4",
"minimist": "^1.2.8",
- "tar": "^6.2.0",
+ "tar": "^7.0.1",
"tmp": "^0.2.3"
}
}
diff --git a/yarn.lock b/yarn.lock
index 0b94e4b30..ef4b8a595 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3680,6 +3680,15 @@ __metadata:
languageName: node
linkType: hard
+"@isaacs/fs-minipass@npm:^4.0.0":
+ version: 4.0.0
+ resolution: "@isaacs/fs-minipass@npm:4.0.0"
+ dependencies:
+ minipass: "npm:^7.0.4"
+ checksum: 7444d7a3c9211c27494630e2bff8545e3494a1598624a4871ee7ef3a9e592a61fed3abd85d118f966673bd0b4401c266d45441f89c00c420e9d0cfbf1042dbd5
+ languageName: node
+ linkType: hard
+
"@istanbuljs/load-nyc-config@npm:^1.0.0":
version: 1.1.0
resolution: "@istanbuljs/load-nyc-config@npm:1.1.0"
@@ -7589,7 +7598,7 @@ __metadata:
rimraf: "npm:^4.4.0"
semver: "npm:^7.3.8"
svgo: "npm:^3.0.2"
- tar: "npm:^6.2.0"
+ tar: "npm:^7.0.1"
tmp: "npm:^0.2.3"
typescript: "npm:^5.3.3"
languageName: unknown
@@ -10700,6 +10709,13 @@ __metadata:
languageName: node
linkType: hard
+"chownr@npm:^3.0.0":
+ version: 3.0.0
+ resolution: "chownr@npm:3.0.0"
+ checksum: b63cb1f73d171d140a2ed8154ee6566c8ab775d3196b0e03a2a94b5f6a0ce7777ee5685ca56849403c8d17bd457a6540672f9a60696a6137c7a409097495b82c
+ languageName: node
+ linkType: hard
+
"chrome-trace-event@npm:^1.0.2":
version: 1.0.3
resolution: "chrome-trace-event@npm:1.0.3"
@@ -14645,18 +14661,18 @@ __metadata:
languageName: node
linkType: hard
-"glob@npm:^10.2.2, glob@npm:^10.3.10":
- version: 10.3.10
- resolution: "glob@npm:10.3.10"
+"glob@npm:^10.2.2, glob@npm:^10.3.10, glob@npm:^10.3.7":
+ version: 10.3.12
+ resolution: "glob@npm:10.3.12"
dependencies:
foreground-child: "npm:^3.1.0"
- jackspeak: "npm:^2.3.5"
+ jackspeak: "npm:^2.3.6"
minimatch: "npm:^9.0.1"
- minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
- path-scurry: "npm:^1.10.1"
+ minipass: "npm:^7.0.4"
+ path-scurry: "npm:^1.10.2"
bin:
glob: dist/esm/bin.mjs
- checksum: 38bdb2c9ce75eb5ed168f309d4ed05b0798f640b637034800a6bf306f39d35409bf278b0eaaffaec07591085d3acb7184a201eae791468f0f617771c2486a6a8
+ checksum: 9e8186abc22dc824b5dd86cefd8e6b5621a72d1be7f68bacc0fd681e8c162ec5546660a6ec0553d6a74757a585e655956c7f8f1a6d24570e8d865c307323d178
languageName: node
linkType: hard
@@ -16275,7 +16291,7 @@ __metadata:
languageName: node
linkType: hard
-"jackspeak@npm:^2.3.5":
+"jackspeak@npm:^2.3.6":
version: 2.3.6
resolution: "jackspeak@npm:2.3.6"
dependencies:
@@ -17721,10 +17737,10 @@ __metadata:
languageName: node
linkType: hard
-"lru-cache@npm:^10.0.0, lru-cache@npm:^10.0.1, lru-cache@npm:^9.1.1 || ^10.0.0":
- version: 10.1.0
- resolution: "lru-cache@npm:10.1.0"
- checksum: 207278d6fa711fb1f94a0835d4d4737441d2475302482a14785b10515e4c906a57ebf9f35bf060740c9560e91c7c1ad5a04fd7ed030972a9ba18bce2a228e95b
+"lru-cache@npm:^10.0.0, lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0":
+ version: 10.2.0
+ resolution: "lru-cache@npm:10.2.0"
+ checksum: 502ec42c3309c0eae1ce41afca471f831c278566d45a5273a0c51102dee31e0e250a62fa9029c3370988df33a14188a38e682c16143b794de78668de3643e302
languageName: node
linkType: hard
@@ -19131,7 +19147,7 @@ __metadata:
languageName: node
linkType: hard
-"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3":
+"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.0.4":
version: 7.0.4
resolution: "minipass@npm:7.0.4"
checksum: e864bd02ceb5e0707696d58f7ce3a0b89233f0d686ef0d447a66db705c0846a8dc6f34865cd85256c1472ff623665f616b90b8ff58058b2ad996c5de747d2d18
@@ -19148,6 +19164,16 @@ __metadata:
languageName: node
linkType: hard
+"minizlib@npm:^3.0.1":
+ version: 3.0.1
+ resolution: "minizlib@npm:3.0.1"
+ dependencies:
+ minipass: "npm:^7.0.4"
+ rimraf: "npm:^5.0.5"
+ checksum: 622cb85f51e5c206a080a62d20db0d7b4066f308cb6ce82a9644da112367c3416ae7062017e631eb7ac8588191cfa4a9a279b8651c399265202b298e98c4acef
+ languageName: node
+ linkType: hard
+
"mkdirp-classic@npm:^0.5.2, mkdirp-classic@npm:^0.5.3":
version: 0.5.3
resolution: "mkdirp-classic@npm:0.5.3"
@@ -19164,6 +19190,15 @@ __metadata:
languageName: node
linkType: hard
+"mkdirp@npm:^3.0.1":
+ version: 3.0.1
+ resolution: "mkdirp@npm:3.0.1"
+ bin:
+ mkdirp: dist/cjs/src/bin.js
+ checksum: 16fd79c28645759505914561e249b9a1f5fe3362279ad95487a4501e4467abeb714fd35b95307326b8fd03f3c7719065ef11a6f97b7285d7888306d1bd2232ba
+ languageName: node
+ linkType: hard
+
"mlly@npm:^1.1.0, mlly@npm:^1.2.0":
version: 1.5.0
resolution: "mlly@npm:1.5.0"
@@ -20327,13 +20362,13 @@ __metadata:
languageName: node
linkType: hard
-"path-scurry@npm:^1.10.1, path-scurry@npm:^1.6.1":
- version: 1.10.1
- resolution: "path-scurry@npm:1.10.1"
+"path-scurry@npm:^1.10.2, path-scurry@npm:^1.6.1":
+ version: 1.10.2
+ resolution: "path-scurry@npm:1.10.2"
dependencies:
- lru-cache: "npm:^9.1.1 || ^10.0.0"
+ lru-cache: "npm:^10.2.0"
minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
- checksum: eebfb8304fef1d4f7e1486df987e4fd77413de4fce16508dea69fcf8eb318c09a6b15a7a2f4c22877cec1cb7ecbd3071d18ca9de79eeece0df874a00f1f0bdc8
+ checksum: a2bbbe8dc284c49dd9be78ca25f3a8b89300e0acc24a77e6c74824d353ef50efbf163e64a69f4330b301afca42d0e2229be0560d6d616ac4e99d48b4062016b1
languageName: node
linkType: hard
@@ -22045,6 +22080,17 @@ __metadata:
languageName: node
linkType: hard
+"rimraf@npm:^5.0.5":
+ version: 5.0.5
+ resolution: "rimraf@npm:5.0.5"
+ dependencies:
+ glob: "npm:^10.3.7"
+ bin:
+ rimraf: dist/esm/bin.mjs
+ checksum: a612c7184f96258b7d1328c486b12ca7b60aa30e04229a08bbfa7e964486deb1e9a1b52d917809311bdc39a808a4055c0f950c0280fba194ba0a09e6f0d404f6
+ languageName: node
+ linkType: hard
+
"rollup-plugin-inject@npm:^3.0.0":
version: 3.0.2
resolution: "rollup-plugin-inject@npm:3.0.2"
@@ -23378,7 +23424,7 @@ __metadata:
languageName: node
linkType: hard
-"tar@npm:^6.0.2, tar@npm:^6.1.11, tar@npm:^6.1.2, tar@npm:^6.2.0":
+"tar@npm:^6.0.2, tar@npm:^6.1.11, tar@npm:^6.1.2":
version: 6.2.1
resolution: "tar@npm:6.2.1"
dependencies:
@@ -23392,6 +23438,20 @@ __metadata:
languageName: node
linkType: hard
+"tar@npm:^7.0.1":
+ version: 7.0.1
+ resolution: "tar@npm:7.0.1"
+ dependencies:
+ "@isaacs/fs-minipass": "npm:^4.0.0"
+ chownr: "npm:^3.0.0"
+ minipass: "npm:^5.0.0"
+ minizlib: "npm:^3.0.1"
+ mkdirp: "npm:^3.0.1"
+ yallist: "npm:^5.0.0"
+ checksum: 6fd89ef8051d12975f66a2f3932a80479bdc6c9f3bcdf04b8b57784e942ed860708ccecf79bcbb30659b14ab52eef2095d2c3af377545ff9df30de28036671dc
+ languageName: node
+ linkType: hard
+
"terminal-link@npm:^2.1.1":
version: 2.1.1
resolution: "terminal-link@npm:2.1.1"
@@ -24964,8 +25024,8 @@ __metadata:
linkType: hard
"vite@npm:^5.0.0":
- version: 5.2.8
- resolution: "vite@npm:5.2.8"
+ version: 5.2.9
+ resolution: "vite@npm:5.2.9"
dependencies:
esbuild: "npm:^0.20.1"
fsevents: "npm:~2.3.3"
@@ -24999,7 +25059,7 @@ __metadata:
optional: true
bin:
vite: bin/vite.js
- checksum: caa40343c2c4e6d8e257fccb4c3029f62909c319a86063ce727ed550925c0a834460b0d1ca20c4d6c915f35302aa1052f6ec5193099a47ce21d74b9b817e69e1
+ checksum: 26342c8dde540e4161fdad2c9c8f2f0e23567f051c7a40abb8e4796d6c4292fbd118ab7a4ac252515e78c4f99525b557731e6117287b2bccde0ea61d73bcff27
languageName: node
linkType: hard
@@ -25666,6 +25726,13 @@ __metadata:
languageName: node
linkType: hard
+"yallist@npm:^5.0.0":
+ version: 5.0.0
+ resolution: "yallist@npm:5.0.0"
+ checksum: 1884d272d485845ad04759a255c71775db0fac56308764b4c77ea56a20d56679fad340213054c8c9c9c26fcfd4c4b2a90df993b7e0aaf3cdb73c618d1d1a802a
+ languageName: node
+ linkType: hard
+
"yaml@npm:2.3.4, yaml@npm:^2.0.0, yaml@npm:^2.2.1, yaml@npm:^2.2.2, yaml@npm:^2.3.4":
version: 2.3.4
resolution: "yaml@npm:2.3.4"