-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(essentials): set
yarnPath in project .yarnrc.yml regardless i…
…f it's set in a parent directory (#4928) * fix(essentials): set yarnPath when one is set outside of the project * fix(essentials): set yarnPath when using `--only-if-needed` and one is set outside of the project * chore: versions
- Loading branch information
Showing
4 changed files
with
188 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| releases: | ||
| "@yarnpkg/cli": patch | ||
| "@yarnpkg/plugin-essentials": patch | ||
|
|
||
| declined: | ||
| - "@yarnpkg/plugin-compat" | ||
| - "@yarnpkg/plugin-constraints" | ||
| - "@yarnpkg/plugin-dlx" | ||
| - "@yarnpkg/plugin-init" | ||
| - "@yarnpkg/plugin-interactive-tools" | ||
| - "@yarnpkg/plugin-nm" | ||
| - "@yarnpkg/plugin-npm-cli" | ||
| - "@yarnpkg/plugin-pack" | ||
| - "@yarnpkg/plugin-patch" | ||
| - "@yarnpkg/plugin-pnp" | ||
| - "@yarnpkg/plugin-pnpm" | ||
| - "@yarnpkg/plugin-stage" | ||
| - "@yarnpkg/plugin-typescript" | ||
| - "@yarnpkg/plugin-version" | ||
| - "@yarnpkg/plugin-workspace-tools" | ||
| - "@yarnpkg/builder" | ||
| - "@yarnpkg/core" | ||
| - "@yarnpkg/doctor" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
137 changes: 137 additions & 0 deletions
137
packages/acceptance-tests/pkg-tests-specs/sources/commands/set/version.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| import {xfs, ppath, PortablePath, Filename} from '@yarnpkg/fslib'; | ||
|
|
||
| const yarnrcRegexp = /^yarnPath:/; | ||
|
|
||
| describe(`Commands`, () => { | ||
| describe(`set version`, () => { | ||
| test( | ||
| `it should set yarnPath if corepack is disabled, even when the version is semver`, | ||
| makeTemporaryEnv({}, { | ||
| env: {COREPACK_ROOT: undefined}, | ||
| }, async ({path, run, source}) => { | ||
| await run(`set`, `version`, `3.0.0`); | ||
| await check(path, {corepackVersion: `3.0.0`, usePath: true}); | ||
| }), | ||
| ); | ||
|
|
||
| test( | ||
| `it should always set yarnPath if one already exists`, | ||
| makeTemporaryEnv({}, { | ||
| env: {COREPACK_ROOT: `/path/to/corepack`}, | ||
| }, async ({path, run, source}) => { | ||
| // To force yarnPath to be set; followed by a sanity check | ||
| await run(`set`, `version`, `3.0.0`, {env: {COREPACK_ROOT: undefined}}); | ||
| await check(path, {corepackVersion: `3.0.0`, usePath: true}); | ||
|
|
||
| await run(`set`, `version`, `3.0.0`); | ||
| await check(path, {corepackVersion: `3.0.0`, usePath: true}); | ||
| }), | ||
| ); | ||
| test( | ||
| `it should prevent using --no-yarn-path with arbitrary files`, | ||
| makeTemporaryEnv({}, { | ||
| env: {COREPACK_ROOT: undefined}, | ||
| }, async ({path, run, source}) => { | ||
| const yarnIndirection = ppath.join(path, `custom-yarn.cjs` as Filename); | ||
| await xfs.writeFilePromise(yarnIndirection, ``); | ||
|
|
||
| await expect(run(`set`, `version`, yarnIndirection, `--no-yarn-path`)).rejects.toThrow(); | ||
| }), | ||
| ); | ||
|
|
||
| test( | ||
| `it should set yarnPath even if yarnPath is set outside of the project`, | ||
| makeTemporaryEnv({}, { | ||
| env: {COREPACK_ROOT: undefined}, | ||
| }, async ({path, run, source}) => { | ||
| await run(`set`, `version`, `self`); | ||
| await check(path, {corepackVersion: /[0-9]+\./, usePath: true}); | ||
|
|
||
| const projectDir = ppath.join(path, `project` as Filename); | ||
| await xfs.mkdirPromise(projectDir); | ||
| await xfs.writeJsonPromise(ppath.join(projectDir, Filename.manifest), {}); | ||
| await xfs.writeFilePromise(ppath.join(projectDir, Filename.lockfile), ``); | ||
|
|
||
| await run(`set`, `version`, `self`, {cwd: projectDir}); | ||
| await check(projectDir, {corepackVersion: /[0-9]+\./, usePath: true}); | ||
| }), | ||
| ); | ||
|
|
||
| test( | ||
| `it shouldn't set the version when using '--only-if-needed' and a yarnPath is already set`, | ||
| makeTemporaryEnv({}, { | ||
| env: {COREPACK_ROOT: undefined}, | ||
| }, async ({path, run, source}) => { | ||
| await run(`set`, `version`, `self`); | ||
|
|
||
| const before = await xfs.readFilePromise(ppath.join(path, Filename.rc), `utf8`); | ||
| await run(`set`, `version`, `3.0.0`, `--only-if-needed`); | ||
| const after = await xfs.readFilePromise(ppath.join(path, Filename.rc), `utf8`); | ||
|
|
||
| expect(before).toEqual(after); | ||
| }), | ||
| ); | ||
|
|
||
| test( | ||
| `it should set yarnPath when using '--only-if-needed' even if yarnPath is set outside of the project`, | ||
| makeTemporaryEnv({}, { | ||
| env: {COREPACK_ROOT: undefined}, | ||
| }, async ({path, run, source}) => { | ||
| await run(`set`, `version`, `self`); | ||
| await check(path, {corepackVersion: /[0-9]+\./, usePath: true}); | ||
|
|
||
| const projectDir = ppath.join(path, `project` as Filename); | ||
| await xfs.mkdirPromise(projectDir); | ||
| await xfs.writeJsonPromise(ppath.join(projectDir, Filename.manifest), {}); | ||
| await xfs.writeFilePromise(ppath.join(projectDir, Filename.lockfile), ``); | ||
|
|
||
| await run(`set`, `version`, `self`, `--only-if-needed`, {cwd: projectDir}); | ||
| await check(projectDir, {corepackVersion: /[0-9]+\./, usePath: true}); | ||
| }), | ||
| ); | ||
| }); | ||
| }); | ||
|
|
||
| async function check(path: PortablePath, checks: {corepackVersion: string | RegExp, usePath: boolean}) { | ||
| const releasesPath = ppath.join(path, `.yarn/releases` as PortablePath); | ||
| const yarnrcPath = ppath.join(path, Filename.rc); | ||
| const manifestPath = ppath.join(path, Filename.manifest); | ||
|
|
||
| let releases: Array<string> | null; | ||
| try { | ||
| releases = await xfs.readdirPromise(releasesPath); | ||
| } catch (err) { | ||
| if (err.code === `ENOENT`) { | ||
| releases = null; | ||
| } else { | ||
| throw err; | ||
| } | ||
| } | ||
|
|
||
| let yarnrcFile; | ||
| try { | ||
| yarnrcFile = await xfs.readFilePromise(yarnrcPath, `utf8`); | ||
| } catch (err) { | ||
| if (err.code === `ENOENT`) { | ||
| yarnrcFile = ``; | ||
| } else { | ||
| throw err; | ||
| } | ||
| } | ||
|
|
||
| if (checks.usePath) | ||
| expect(releases).toHaveLength(1); | ||
| else | ||
| expect(releases).toEqual(null); | ||
|
|
||
| if (checks.usePath) | ||
| expect(yarnrcFile).toMatch(yarnrcRegexp); | ||
| else | ||
| expect(yarnrcFile).not.toMatch(yarnrcRegexp); | ||
|
|
||
| await expect(xfs.readJsonPromise(manifestPath)).resolves.toMatchObject({ | ||
| packageManager: checks.corepackVersion instanceof RegExp | ||
| ? expect.stringMatching(`yarn@${checks.corepackVersion.source}`) | ||
| : `yarn@${checks.corepackVersion}`, | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters