lukevers
commented
1 year ago hey @track0x1 are you seeing this error now? It's odd that I didn't last night when I tried your branch, but now after trying the updated version bump I get this one. It does make sense as an error because it looks like yarn list does not exist as command (see not implemented yet).
I was able to tinker with this a bit to get it in a better state, but the major problem here is the entire tree and finding function will need to be updated because the structure is much different.
So there is yarn info which is similar but seems to be a different structure (I'm not sure the v1 structure, I just saw it in the type here). The second problem is yarn info returns the data as an NDJSON stream, so what I did was basically just split and slurp it up like if I was using yarn info --json | jq -s . With some minor tweaks I got this:
diff --git a/src/packagers/yarn.ts b/src/packagers/yarn.ts
index 1df808f..8924f24 100644
--- a/src/packagers/yarn.ts
+++ b/src/packagers/yarn.ts
@@ -71,7 +71,11 @@ export class Yarn implements Packager {
async getProdDependencies(cwd: string, depth?: number): Promise<DependenciesResult> {
const command = /^win/.test(process.platform) ? 'yarn.cmd' : 'yarn';
- const args = ['list', depth ? `--depth=${depth}` : null, '--json', '--production'].filter(isString);
+ const version = await this.getVersion(cwd);
+ const args = (version.isBerry
+ ? ['info', '--json', depth ? `--depth=${depth}` : null]
+ : ['list', depth ? `--depth=${depth}` : null, '--json', '--production']
+ ).filter(isString);
// If we need to ignore some errors add them here
const ignoredYarnErrors: Array<{
@@ -84,7 +88,12 @@ export class Yarn implements Packager {
try {
const processOutput = await spawnProcess(command, args, { cwd });
- parsedDeps = JSON.parse(processOutput.stdout) as YarnDeps;
+ if (version.isBerry) {
+ const rows = processOutput.stdout.split(/\n|\n\r/).filter(Boolean);
+ parsedDeps = rows.map((row: string) => JSON.parse(row));
+ } else {
+ parsedDeps = JSON.parse(processOutput.stdout) as YarnDeps;
+ }
} catch (err) {
if (err instanceof SpawnError) {
// Only exit with an error if we have critical npm errors for 2nd level insideAnd this fails when we start to parse the trees because there are no data attributes named "trees" in the data. I ran mine on this and then plopped it into here to compare types:
export interface YarnInfo {
value: string;
children: Children;
}
export interface Children {
Version: string;
Dependencies?: Dependency[];
"Exported Binaries"?: string[];
Instances?: number;
}
export interface Dependency {
descriptor: string;
locator: string;
}Compared to the v1 trees:
interface YarnTree {
name: string;
color: 'bold' | 'dim' | null;
children?: YarnTree[];
hint?: null;
depth?: number;
shadow?: boolean;
}
export interface YarnDeps {
type: 'tree';
data: {
type: 'list';
trees: YarnTree[];
};
}@track0x1 @floydspace anyway, all of this to say that I think v1 and v2+ will need a separate function here, or maybe we can shoehorn the yarn v2+ tree into the v1 structure and then keep going. Thoughts?
Side note...even though I'm using yarn and yarn workspaces in my project, interestingly it seems like if I tell my serverless config for esbuild-serverless to use packager: npm .. it lets me package it up without failing. I'm unsure if there are unintended side effects for doing that, but just wanted to throw that out there.
kabo
dhmw
jounii
Describe the bug
Updating to 1.35.3 does not work with yarn 3. Specifically, I am using 3.1.1.
1.35.2 works as expected.
To Reproduce
Use serverless-esbuild 1.35.3 or greater with a project using yarn 3.1.1
Expected behavior
Build completes successfully
Screenshots or Logs
Versions (please complete the following information):
Environment: linux, node 18.14.0, framework 3.27.0 (local), plugin 6.2.3, SDK 4.3.2
serverless-esbuild any >= 1.35.3