Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Yarn v3 (berry) #48

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Support Yarn v3 (berry) #48

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfb95f2
updated script to handle yarn berry
jonstuebe Nov 23, 2021
ccfccd0
Merge pull request #1 from smartrent/bugfix/yarn-v3
jonstuebe Nov 23, 2021
0e99737
Add option to cli to specify a single package to reload
ande- May 19, 2023
1c8d856
Merge pull request #2 from smartrent/option_to_specify_package
jonstuebe May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const globby = require("globby")
const checksum = require("checksum")
const merge = require("lodash/merge")
const debounce = require("lodash/debounce")
const { spawn } = require("yarn-or-npm")
const { spawn, hasYarn } = require("yarn-or-npm")
const tar = require("tar")

async function installRelativeDeps() {
Expand Down Expand Up @@ -154,10 +154,22 @@ function packAndInstallLibrary(name, dir, targetDir) {
fs.mkdirSync(libDestDir, { recursive: true })

const tmpName = name.replace(/[\s\/]/g, "-").replace(/@/g, "")



// npm replaces @... with at- where yarn just removes it, so we test for both files here
const regex = new RegExp(`^(at-)?${tmpName}(.*).tgz$`)

const packagedName = fs.readdirSync(dir).find(file => regex.test(file))
let packagedName = fs.readdirSync(dir).find(file => regex.test(file))

if(hasYarn) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to the docs, hasYarn is a function.

Have you tested your code on yarn 1 or 2 with these changes?

let yarnVersion = spawn.sync(['-v'], { cwd: dir, encoding: "utf8" });
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't there a longhand version of the same flag, which will clearly signal the intent of the command? I know that yarn@1 has --version in addition to -v.


if(yarnVersion.stdout.replace('\n','').split('.')[0] >= 3) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Non strict comparison with type coercion is a strongly discouraged because it is very error prone. Can we do it in a more safe manner?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I can use a semver parsing library if that works. I'll work on this over the next couple of days.

packagedName = "package.tgz"
}
}

fullPackageName = path.join(dir, packagedName)

console.log(`[relative-deps] Extracting "${fullPackageName}" to ${libDestDir}`)
Expand Down