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

[now-cli] Make nowCliPkg parameter non-optional (#4173)

Browse Source 
To prevent bugs like https://github.com/zeit/now/pull/4163.
This commit is contained in:
Nathan Rajlich
2020-04-27 18:21:05 -07:00
committed by GitHub
parent 53cb2cc4c5
commit aebe77d222
2 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/now-cli/src/util/dev/builder-cache.ts
View File

@@ -100,7 +100,7 @@ export function filterPackage(
builderSpec: string, builderSpec: string,
distTag: string, distTag: string,
buildersPkg: PackageJson, buildersPkg: PackageJson,
nowCliPkg: PackageJson = {} nowCliPkg: PackageJson
) { ) {
if (builderSpec in localBuilders) return false; if (builderSpec in localBuilders) return false;
const parsed = npa(builderSpec); const parsed = npa(builderSpec);

51
packages/now-cli/test/dev-builder.unit.js vendored
View File

@@ -8,7 +8,7 @@ test('[dev-builder] filter install "latest", cached canary', t => {
'@now/build-utils': '0.0.1-canary.0', '@now/build-utils': '0.0.1-canary.0',
}, },
}; };
const result = filterPackage('@now/build-utils', 'canary', buildersPkg); const result = filterPackage('@now/build-utils', 'canary', buildersPkg, {});
t.is(result, true); t.is(result, true);
}); });
@@ -21,7 +21,8 @@ test('[dev-builder] filter install "canary", cached stable', t => {
const result = filterPackage( const result = filterPackage(
'@now/build-utils@canary', '@now/build-utils@canary',
'latest', 'latest',
buildersPkg buildersPkg,
{}
); );
t.is(result, true); t.is(result, true);
}); });
@@ -32,7 +33,7 @@ test('[dev-builder] filter install "latest", cached stable', t => {
'@now/build-utils': '0.0.1', '@now/build-utils': '0.0.1',
}, },
}; };
const result = filterPackage('@now/build-utils', 'latest', buildersPkg); const result = filterPackage('@now/build-utils', 'latest', buildersPkg, {});
t.is(result, false); t.is(result, false);
}); });
@@ -45,7 +46,8 @@ test('[dev-builder] filter install "canary", cached canary', t => {
const result = filterPackage( const result = filterPackage(
'@now/build-utils@canary', '@now/build-utils@canary',
'canary', 'canary',
buildersPkg buildersPkg,
{}
); );
t.is(result, false); t.is(result, false);
}); });
@@ -56,7 +58,12 @@ test('[dev-builder] filter install URL, cached stable', t => {
'@now/build-utils': '0.0.1', '@now/build-utils': '0.0.1',
}, },
}; };
const result = filterPackage('https://tarball.now.sh', 'latest', buildersPkg); const result = filterPackage(
'https://tarball.now.sh',
'latest',
buildersPkg,
{}
);
t.is(result, true); t.is(result, true);
}); });
@@ -66,7 +73,12 @@ test('[dev-builder] filter install URL, cached canary', t => {
'@now/build-utils': '0.0.1-canary.0', '@now/build-utils': '0.0.1-canary.0',
}, },
}; };
const result = filterPackage('https://tarball.now.sh', 'canary', buildersPkg); const result = filterPackage(
'https://tarball.now.sh',
'canary',
buildersPkg,
{}
);
t.is(result, true); t.is(result, true);
}); });
@@ -76,7 +88,7 @@ test('[dev-builder] filter install "latest", cached URL - stable', t => {
'@now/build-utils': 'https://tarball.now.sh', '@now/build-utils': 'https://tarball.now.sh',
}, },
}; };
const result = filterPackage('@now/build-utils', 'latest', buildersPkg); const result = filterPackage('@now/build-utils', 'latest', buildersPkg, {});
t.is(result, true); t.is(result, true);
}); });
@@ -86,7 +98,7 @@ test('[dev-builder] filter install "latest", cached URL - canary', t => {
'@now/build-utils': 'https://tarball.now.sh', '@now/build-utils': 'https://tarball.now.sh',
}, },
}; };
const result = filterPackage('@now/build-utils', 'canary', buildersPkg); const result = filterPackage('@now/build-utils', 'canary', buildersPkg, {});
t.is(result, true); t.is(result, true);
}); });
@@ -96,7 +108,12 @@ test('[dev-builder] filter install not bundled version, cached same version', t
'not-bundled-package': '0.0.1', 'not-bundled-package': '0.0.1',
}, },
}; };
const result = filterPackage('not-bundled-package@0.0.1', '_', buildersPkg); const result = filterPackage(
'not-bundled-package@0.0.1',
'_',
buildersPkg,
{}
);
t.is(result, false); t.is(result, false);
}); });
@@ -106,7 +123,12 @@ test('[dev-builder] filter install not bundled version, cached different version
'not-bundled-package': '0.0.9', 'not-bundled-package': '0.0.9',
}, },
}; };
const result = filterPackage('not-bundled-package@0.0.1', '_', buildersPkg); const result = filterPackage(
'not-bundled-package@0.0.1',
'_',
buildersPkg,
{}
);
t.is(result, true); t.is(result, true);
}); });
@@ -116,7 +138,7 @@ test('[dev-builder] filter install not bundled stable, cached version', t => {
'not-bundled-package': '0.0.1', 'not-bundled-package': '0.0.1',
}, },
}; };
const result = filterPackage('not-bundled-package', '_', buildersPkg); const result = filterPackage('not-bundled-package', '_', buildersPkg, {});
t.is(result, true); t.is(result, true);
}); });
@@ -126,7 +148,12 @@ test('[dev-builder] filter install not bundled tagged, cached tagged', t => {
'not-bundled-package': '16.9.0-alpha.0', 'not-bundled-package': '16.9.0-alpha.0',
}, },
}; };
const result = filterPackage('not-bundled-package@alpha', '_', buildersPkg); const result = filterPackage(
'not-bundled-package@alpha',
'_',
buildersPkg,
{}
);
t.is(result, true); t.is(result, true);
}); });