LukeParke/vercel
1
0
Fork 0
mirror of https://github.com/LukeHagar/vercel.git synced 2025-12-09 12:57:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[remix] Inject @vercel/remix package instead of @vercel/remix-entry-server (#9684)

Browse Source 
The `handleRequest()` function has been moved to the `@vercel/remix` package, so we can deprecate `@vercel/remix-entry-server` entirely and install `@vercel/remix` in the project instead, when there is no `app/entry.server.tsx` file defined in the project already.
This commit is contained in:
Nathan Rajlich
2023-03-21 18:06:14 -07:00
committed by GitHub
parent 20bd71ce70
commit ce25dec97d
4 changed files with 111 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/remix/defaults/entry.server.jsx
View File

@@ -1,5 +1,5 @@
import handleRequest from '@vercel/remix-entry-server';
import { RemixServer } from '@remix-run/react';
import { handleRequest } from '@vercel/remix';
export default function (
request,

2
packages/remix/package.json
View File

@@ -25,11 +25,13 @@
"@vercel/nft": "0.22.5",
"@vercel/static-config": "2.0.14",
"path-to-regexp": "6.2.1",
"semver": "7.3.8",
"ts-morph": "12.0.0"
},
"devDependencies": {
"@types/jest": "27.5.1",
"@types/node": "14.18.33",
"@types/semver": "7.3.13",
"typescript": "4.9.4"
}
}

42
packages/remix/src/build.ts
View File

@@ -44,6 +44,7 @@ import {
chdirAndReadConfig,
addDependency,
} from './utils';
import semver from 'semver';
const _require: typeof require = eval('require');
@@ -62,6 +63,9 @@ const nodeServerSrcPromise = fs.readFile(
'utf-8'
);
// This value is the minimum supported version for our fork of Remix
const minimumSupportRemixVersion = '1.10.0';
export const build: BuildV2 = async ({
entrypoint,
files,
@@ -149,17 +153,43 @@ export const build: BuildV2 = async ({
join(DEFAULTS_PATH, 'entry.server.jsx'),
join(appDirectory, 'entry.server.jsx')
);
if (!pkg.dependencies['@vercel/remix-entry-server']) {
if (!pkg.dependencies['@vercel/remix']) {
// Dependency version resolution logic
// 1. Users app is on 1.9.0 -> we install the 1.10.0 (minimum) version of our fork (`@vercel/remix`)
// 2. Users app is on 1.11.0 (a version greater than 1.10.0 and less than the latest version of the fork) -> we install the (matching) 1.11.0 version of `@vercel/remix`
// 3. Users app is on something greater than our latest version of the fork -> we install the latest version of our fork
// remixVersion is the version of the `@remix-run/dev` package in the *users' app*
const usersRemixVersion = semver.gt(
remixVersion,
minimumSupportRemixVersion
)
? remixVersion
: minimumSupportRemixVersion;
// Prevent frozen lockfile rejections
const envForAddDep = { ...spawnOpts.env };
delete envForAddDep.CI;
delete envForAddDep.VERCEL;
delete envForAddDep.NOW_BUILDER;
await addDependency(cliType, ['@vercel/remix-entry-server'], {
...spawnOpts,
env: envForAddDep,
cwd: entrypointFsDirname,
});
await addDependency(
cliType,
[
`@vercel/remix@${
semver.gt(
usersRemixVersion,
require('@remix-run/dev/package.json').version
)
? 'latest'
: usersRemixVersion
}`,
],
{
...spawnOpts,
env: envForAddDep,
cwd: entrypointFsDirname,
}
);
}
}

139
pnpm-lock.yaml generated
View File

@@ -936,10 +936,12 @@ importers:
'@remix-run/dev': npm:@vercel/remix-run-dev@1.14.2
'@types/jest': 27.5.1
'@types/node': 14.18.33
'@types/semver': 7.3.13
'@vercel/build-utils': 6.4.0
'@vercel/nft': 0.22.5
'@vercel/static-config': 2.0.14
path-to-regexp: 6.2.1
semver: 7.3.8
ts-morph: 12.0.0
typescript: 4.9.4
dependencies:
@@ -948,10 +950,12 @@ importers:
'@vercel/nft': 0.22.5
'@vercel/static-config': link:../static-config
path-to-regexp: 6.2.1
semver: 7.3.8
ts-morph: 12.0.0
devDependencies:
'@types/jest': 27.5.1
'@types/node': 14.18.33
'@types/semver': 7.3.13
typescript: 4.9.4
packages/remix-entry-server:
@@ -1146,10 +1150,10 @@ packages:
'@babel/template': 7.20.7
'@babel/traverse': 7.20.12
'@babel/types': 7.20.7
convert-source-map: 1.8.0
convert-source-map: 1.9.0
debug: 4.3.4
gensync: 1.0.0-beta.2
json5: 2.2.2
json5: 2.2.3
semver: 6.3.0
transitivePeerDependencies:
- supports-color
@@ -2658,7 +2662,7 @@ packages:
camelcase: 5.3.1
find-up: 4.1.0
get-package-type: 0.1.0
js-yaml: 3.13.1
js-yaml: 3.14.1
resolve-from: 5.0.0
dev: true
@@ -2673,7 +2677,7 @@ packages:
dependencies:
'@jest/types': 28.1.3
'@types/node': 18.14.6
chalk: 4.1.0
chalk: 4.1.2
jest-message-util: 28.1.3
jest-util: 28.1.3
slash: 3.0.0
@@ -2893,7 +2897,7 @@ packages:
'@jest/types': 28.1.3
'@jridgewell/trace-mapping': 0.3.17
'@types/node': 18.14.6
chalk: 4.1.0
chalk: 4.1.2
collect-v8-coverage: 1.0.1
exit: 0.1.2
glob: 7.2.3
@@ -3032,8 +3036,8 @@ packages:
'@jest/types': 28.1.3
'@jridgewell/trace-mapping': 0.3.17
babel-plugin-istanbul: 6.1.1
chalk: 4.1.0
convert-source-map: 1.8.0
chalk: 4.1.2
convert-source-map: 1.9.0
fast-json-stable-stringify: 2.1.0
graceful-fs: 4.2.10
jest-haste-map: 28.1.3
@@ -3079,7 +3083,7 @@ packages:
'@types/istanbul-reports': 3.0.1
'@types/node': 18.14.6
'@types/yargs': 17.0.19
chalk: 4.1.0
chalk: 4.1.2
dev: true
/@jest/types/29.3.1:
@@ -3205,7 +3209,7 @@ packages:
resolution: {integrity: sha512-QIOQ3jIbWdduHd5892fbo3u7/dQgbhzEBB7cvf+Ys/iCPP8UQrBECi1lfRgA4kcTKC2MyMz0SoyXZz/lFcXc3A==}
engines: {node: ^14.15.0 || >=16.0.0}
dependencies:
chalk: 4.1.0
chalk: 4.1.2
execa: 5.1.1
strong-log-transformer: 2.1.0
dev: false
@@ -3239,7 +3243,7 @@ packages:
engines: {node: ^14.15.0 || >=16.0.0}
dependencies:
'@lerna/child-process': 5.6.2
chalk: 4.1.0
chalk: 4.1.2
npmlog: 6.0.2
dev: false
@@ -3249,7 +3253,7 @@ packages:
dependencies:
'@lerna/child-process': 5.6.2
'@lerna/describe-ref': 5.6.2
minimatch: 3.0.4
minimatch: 3.1.2
npmlog: 6.0.2
slash: 3.0.0
dev: false
@@ -3484,7 +3488,7 @@ packages:
engines: {node: ^14.15.0 || >=16.0.0}
dependencies:
'@lerna/query-graph': 5.6.2
chalk: 4.1.0
chalk: 4.1.2
columnify: 1.6.0
dev: false
@@ -3824,10 +3828,10 @@ packages:
'@lerna/temp-write': 5.6.2
'@lerna/validation-error': 5.6.2
'@nrwl/devkit': 15.5.1_nx@15.5.1+typescript@4.9.5
chalk: 4.1.0
chalk: 4.1.2
dedent: 0.7.0
load-json-file: 6.2.0
minimatch: 3.0.4
minimatch: 3.1.2
npmlog: 6.0.2
p-map: 4.0.0
p-pipe: 3.1.0
@@ -4020,7 +4024,7 @@ packages:
dependencies:
'@npmcli/name-from-folder': 1.0.1
glob: 8.0.3
minimatch: 5.0.1
minimatch: 5.1.2
read-package-json-fast: 2.0.3
dev: false
@@ -4976,7 +4980,7 @@ packages:
dependencies:
'@types/http-cache-semantics': 4.0.1
'@types/keyv': 3.1.4
'@types/node': 18.14.6
'@types/node': 14.18.33
'@types/responselike': 1.0.0
dev: false
@@ -5258,7 +5262,7 @@ packages:
/@types/keyv/3.1.4:
resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==}
dependencies:
'@types/node': 18.14.6
'@types/node': 14.18.33
dev: false
/@types/load-json-file/2.0.7:
@@ -5446,7 +5450,7 @@ packages:
/@types/responselike/1.0.0:
resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==}
dependencies:
'@types/node': 18.14.6
'@types/node': 14.18.33
dev: false
/@types/retry/0.12.2:
@@ -6165,11 +6169,11 @@ packages:
gunzip-maybe: 1.4.2
inquirer: 8.2.5
jsesc: 3.0.2
json5: 2.2.2
json5: 2.2.3
lodash: 4.17.21
lodash.debounce: 4.0.8
lru-cache: 7.14.1
minimatch: 3.0.4
minimatch: 3.1.2
node-fetch: 2.6.7
ora: 5.4.1
postcss: 8.4.21
@@ -6305,7 +6309,7 @@ packages:
resolution: {integrity: sha512-J6ySgEdQUqAmlttvZOoXOEsrDTAnHyR/MtEvuAG5a+gwKY/2Cc7xn4CWcpgfuwkp+0a4vXmt2BDwzacDoGDN1g==}
engines: {node: '>=14.15.0'}
dependencies:
js-yaml: 3.13.1
js-yaml: 3.14.1
tslib: 2.5.0
dev: false
@@ -6898,7 +6902,7 @@ packages:
'@types/babel__core': 7.1.20
babel-plugin-istanbul: 6.1.1
babel-preset-jest: 28.1.3_@babel+core@7.20.12
chalk: 4.1.0
chalk: 4.1.2
graceful-fs: 4.2.10
slash: 3.0.0
transitivePeerDependencies:
@@ -6970,7 +6974,7 @@ packages:
'@babel/compat-data': 7.20.10
'@babel/core': 7.20.12
'@babel/helper-define-polyfill-provider': 0.3.3_@babel+core@7.20.12
semver: 6.1.1
semver: 6.3.0
transitivePeerDependencies:
- supports-color
dev: false
@@ -7913,7 +7917,7 @@ packages:
json-stringify-safe: 5.0.1
lodash: 4.17.21
meow: 8.1.2
semver: 6.1.1
semver: 6.3.0
split: 1.0.1
through2: 4.0.2
dev: false
@@ -7963,10 +7967,10 @@ packages:
resolution: {integrity: sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==}
dependencies:
safe-buffer: 5.1.2
dev: true
/convert-source-map/1.9.0:
resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==}
dev: true
/convert-source-map/2.0.0:
resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
@@ -8558,7 +8562,7 @@ packages:
/duplexify/3.7.1:
resolution: {integrity: sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==}
dependencies:
end-of-stream: 1.4.1
end-of-stream: 1.4.4
inherits: 2.0.4
readable-stream: 2.3.7
stream-shift: 1.0.1
@@ -8587,7 +8591,7 @@ packages:
dev: false
/ee-first/1.1.1:
resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
resolution: {integrity: sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=}
/ejs/3.1.8:
resolution: {integrity: sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==}
@@ -8654,6 +8658,7 @@ packages:
resolution: {integrity: sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==}
dependencies:
once: 1.4.0
dev: true
/end-of-stream/1.4.4:
resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
@@ -10134,7 +10139,7 @@ packages:
/filelist/1.0.4:
resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
dependencies:
minimatch: 5.0.1
minimatch: 5.1.2
dev: false
/fill-range/4.0.0:
@@ -10285,7 +10290,7 @@ packages:
dev: true
/fresh/0.5.2:
resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==}
resolution: {integrity: sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=}
engines: {node: '>= 0.6'}
/from2/2.3.0:
@@ -10605,7 +10610,7 @@ packages:
hasBin: true
dependencies:
meow: 8.1.2
semver: 6.1.1
semver: 6.3.0
dev: false
/git-up/7.0.0:
@@ -10668,7 +10673,7 @@ packages:
fs.realpath: 1.0.0
inflight: 1.0.6
inherits: 2.0.4
minimatch: 3.0.4
minimatch: 3.1.2
once: 1.4.0
path-is-absolute: 1.0.1
dev: false
@@ -11165,7 +11170,7 @@ packages:
/humanize-ms/1.2.1:
resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}
dependencies:
ms: 2.1.2
ms: 2.1.3
dev: false
/husky/7.0.4:
@@ -11211,7 +11216,7 @@ packages:
resolution: {integrity: sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==}
engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
dependencies:
minimatch: 5.0.1
minimatch: 5.1.2
dev: false
/ignore/4.0.6:
@@ -11897,9 +11902,9 @@ packages:
hasBin: true
dependencies:
async: 3.2.4
chalk: 4.1.0
chalk: 4.1.2
filelist: 1.0.4
minimatch: 3.0.4
minimatch: 3.1.2
dev: false
/jaro-winkler/0.2.8:
@@ -11935,7 +11940,7 @@ packages:
'@jest/test-result': 28.1.3
'@jest/types': 28.1.3
'@types/node': 18.14.6
chalk: 4.1.0
chalk: 4.1.2
co: 4.6.0
dedent: 0.7.0
is-generator-fn: 2.1.0
@@ -12053,7 +12058,7 @@ packages:
'@jest/types': 28.1.3
'@types/node': 14.18.33
babel-jest: 28.1.3_@babel+core@7.20.12
chalk: 4.1.0
chalk: 4.1.2
ci-info: 3.7.1
deepmerge: 4.2.2
glob: 7.2.3
@@ -12092,7 +12097,7 @@ packages:
'@jest/types': 28.1.3
'@types/node': 18.14.6
babel-jest: 28.1.3_@babel+core@7.20.12
chalk: 4.1.0
chalk: 4.1.2
ci-info: 3.7.1
deepmerge: 4.2.2
glob: 7.2.3
@@ -12206,7 +12211,7 @@ packages:
resolution: {integrity: sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==}
engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
dependencies:
chalk: 4.1.0
chalk: 4.1.2
diff-sequences: 28.1.1
jest-get-type: 28.0.2
pretty-format: 28.1.3
@@ -12241,7 +12246,7 @@ packages:
engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
dependencies:
'@jest/types': 28.1.3
chalk: 4.1.0
chalk: 4.1.2
jest-get-type: 28.0.2
jest-util: 28.1.3
pretty-format: 28.1.3
@@ -12365,7 +12370,7 @@ packages:
resolution: {integrity: sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==}
engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
dependencies:
chalk: 4.1.0
chalk: 4.1.2
jest-diff: 28.1.3
jest-get-type: 28.0.2
pretty-format: 28.1.3
@@ -12388,7 +12393,7 @@ packages:
'@babel/code-frame': 7.18.6
'@jest/types': 28.1.3
'@types/stack-utils': 2.0.1
chalk: 4.1.0
chalk: 4.1.2
graceful-fs: 4.2.10
micromatch: 4.0.5
pretty-format: 28.1.3
@@ -12486,7 +12491,7 @@ packages:
resolution: {integrity: sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==}
engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
dependencies:
chalk: 4.1.0
chalk: 4.1.2
graceful-fs: 4.2.10
jest-haste-map: 28.1.3
jest-pnp-resolver: 1.2.3_jest-resolve@28.1.3
@@ -12522,7 +12527,7 @@ packages:
'@jest/transform': 28.1.3
'@jest/types': 28.1.3
'@types/node': 18.14.6
chalk: 4.1.0
chalk: 4.1.2
emittery: 0.10.2
graceful-fs: 4.2.10
jest-docblock: 28.1.1
@@ -12581,7 +12586,7 @@ packages:
'@jest/test-result': 28.1.3
'@jest/transform': 28.1.3
'@jest/types': 28.1.3
chalk: 4.1.0
chalk: 4.1.2
cjs-module-lexer: 1.2.2
collect-v8-coverage: 1.0.1
execa: 5.1.1
@@ -12645,7 +12650,7 @@ packages:
'@types/babel__traverse': 7.18.3
'@types/prettier': 2.7.2
babel-preset-current-node-syntax: 1.0.1_@babel+core@7.20.12
chalk: 4.1.0
chalk: 4.1.2
expect: 28.1.3
graceful-fs: 4.2.10
jest-diff: 28.1.3
@@ -12723,7 +12728,7 @@ packages:
dependencies:
'@jest/types': 28.1.3
camelcase: 6.3.0
chalk: 4.1.0
chalk: 4.1.2
jest-get-type: 28.0.2
leven: 3.1.0
pretty-format: 28.1.3
@@ -12749,7 +12754,7 @@ packages:
'@jest/types': 28.1.3
'@types/node': 18.14.6
ansi-escapes: 4.3.2
chalk: 4.1.0
chalk: 4.1.2
emittery: 0.10.2
jest-util: 28.1.3
string-length: 4.0.2
@@ -12852,7 +12857,6 @@ packages:
dependencies:
argparse: 1.0.10
esprima: 4.0.1
dev: true
/js-yaml/4.1.0:
resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
@@ -12938,12 +12942,12 @@ packages:
resolution: {integrity: sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ==}
engines: {node: '>=6'}
hasBin: true
dev: false
/json5/2.2.3:
resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
engines: {node: '>=6'}
hasBin: true
dev: true
/jsonc-parser/3.2.0:
resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
@@ -13259,7 +13263,7 @@ packages:
dependencies:
big.js: 5.2.2
emojis-list: 3.0.0
json5: 2.2.2
json5: 2.2.3
dev: false
/loader-utils/3.2.1:
@@ -13348,7 +13352,7 @@ packages:
resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
engines: {node: '>=10'}
dependencies:
chalk: 4.1.0
chalk: 4.1.2
is-unicode-supported: 0.1.0
dev: false
@@ -13430,7 +13434,7 @@ packages:
resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
engines: {node: '>=8'}
dependencies:
semver: 6.1.1
semver: 6.3.0
/make-error/1.3.6:
resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
@@ -13632,7 +13636,7 @@ packages:
dev: false
/media-typer/0.3.0:
resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
resolution: {integrity: sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=}
engines: {node: '>= 0.6'}
/meow/8.1.2:
@@ -13653,7 +13657,7 @@ packages:
dev: false
/merge-descriptors/1.0.1:
resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==}
resolution: {integrity: sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=}
/merge-stream/2.0.0:
resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
@@ -14206,6 +14210,7 @@ packages:
/mri/1.1.5:
resolution: {integrity: sha512-d2RKzMD4JNyHMbnbWnznPaa8vbdlq/4pNZ3IgdaGrVbBhebBsGUUE/6qorTMYNS6TwuH3ilfOlD2bf4Igh8CKg==}
engines: {node: '>=4'}
dev: true
/mri/1.2.0:
resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
@@ -14228,7 +14233,6 @@ packages:
/ms/2.1.3:
resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
dev: true
/multimatch/5.0.0:
resolution: {integrity: sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==}
@@ -14238,7 +14242,7 @@ packages:
array-differ: 3.0.0
array-union: 2.1.0
arrify: 2.0.1
minimatch: 3.0.4
minimatch: 3.1.2
dev: false
/multistream/2.1.1:
@@ -14406,7 +14410,7 @@ packages:
dependencies:
hosted-git-info: 2.8.9
resolve: 1.22.1
semver: 5.5.0
semver: 5.7.1
validate-npm-package-license: 3.0.4
/normalize-package-data/3.0.3:
@@ -14472,7 +14476,7 @@ packages:
dependencies:
hosted-git-info: 2.8.9
osenv: 0.1.5
semver: 5.5.0
semver: 5.7.1
validate-npm-package-name: 3.0.0
dev: true
@@ -14804,7 +14808,7 @@ packages:
engines: {node: '>=10'}
dependencies:
bl: 4.1.0
chalk: 4.1.0
chalk: 4.1.2
cli-cursor: 3.1.0
cli-spinners: 2.7.0
is-interactive: 1.0.0
@@ -15600,7 +15604,7 @@ packages:
/pump/2.0.1:
resolution: {integrity: sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==}
dependencies:
end-of-stream: 1.4.1
end-of-stream: 1.4.4
once: 1.4.0
dev: false
@@ -15874,7 +15878,7 @@ packages:
/regenerator-transform/0.15.1:
resolution: {integrity: sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==}
dependencies:
'@babel/runtime': 7.12.1
'@babel/runtime': 7.20.7
dev: false
/regex-not/1.0.2:
@@ -16180,7 +16184,7 @@ packages:
resolution: {integrity: sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==}
engines: {node: '>=6'}
dependencies:
mri: 1.1.5
mri: 1.2.0
dev: false
/safe-buffer/5.1.2:
@@ -16225,6 +16229,7 @@ packages:
/semver/5.5.0:
resolution: {integrity: sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==}
hasBin: true
dev: true
/semver/5.7.1:
resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==}
@@ -17108,7 +17113,7 @@ packages:
dependencies:
'@istanbuljs/schema': 0.1.3
glob: 7.2.3
minimatch: 3.0.4
minimatch: 3.1.2
dev: true
/test-listen/1.1.0:
@@ -17479,7 +17484,7 @@ packages:
resolution: {integrity: sha512-uhxiMgnXQp1IR622dUXI+9Ehnws7i/y6xvpZB9IbUVOPy0muvdvgXeZOn88UcGPiT98Vp3rJPTa8bFoalZ3Qhw==}
engines: {node: '>=6'}
dependencies:
json5: 2.2.2
json5: 2.2.3
minimist: 1.2.7
strip-bom: 3.0.0
dev: false
@@ -18005,7 +18010,7 @@ packages:
dev: true
/utils-merge/1.0.1:
resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}
resolution: {integrity: sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=}
engines: {node: '>= 0.4.0'}
/uuid/3.3.2:
@@ -18047,7 +18052,7 @@ packages:
dependencies:
'@jridgewell/trace-mapping': 0.3.17
'@types/istanbul-lib-coverage': 2.0.4
convert-source-map: 1.8.0
convert-source-map: 1.9.0
dev: true
/validate-npm-package-license/3.0.4: