Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
53 changes: 1 addition & 52 deletions .pnp.cjs

Large diffs are not rendered by default.

23 changes: 23 additions & 0 deletions .yarn/versions/7a4f72bf.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
releases:
"@yarnpkg/cli": major
"@yarnpkg/plugin-pnp": major

declined:
- "@yarnpkg/plugin-compat"
- "@yarnpkg/plugin-constraints"
- "@yarnpkg/plugin-dlx"
- "@yarnpkg/plugin-essentials"
- "@yarnpkg/plugin-init"
- "@yarnpkg/plugin-interactive-tools"
- "@yarnpkg/plugin-nm"
- "@yarnpkg/plugin-npm-cli"
- "@yarnpkg/plugin-pack"
- "@yarnpkg/plugin-patch"
- "@yarnpkg/plugin-pnpm"
- "@yarnpkg/plugin-stage"
- "@yarnpkg/plugin-typescript"
- "@yarnpkg/plugin-version"
- "@yarnpkg/plugin-workspace-tools"
- "@yarnpkg/builder"
- "@yarnpkg/core"
- "@yarnpkg/doctor"
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ changesetIgnorePatterns:
- packages/*/tests/**
- packages/plugin-compat/extra/**
- packages/gatsby/**
- packages/docusaurus/**

compressionLevel: mixed

Expand Down
12 changes: 3 additions & 9 deletions packages/acceptance-tests/pkg-tests-specs/sources/pnp.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,7 @@ describe(`Plug'n'Play`, () => {
dependencies: {[`various-requires`]: `1.0.0`, [`no-deps`]: `1.0.0`},
},
{
// By default tests are executed with the fallback disabled; this
// setting forces this test to execute in the default mode instead
pnpFallbackMode: undefined,
pnpFallbackMode: `dependencies-only`,
},
async ({path, run, source}) => {
await run(`install`);
Expand All @@ -147,9 +145,7 @@ describe(`Plug'n'Play`, () => {
dependencies: {[`various-requires`]: `1.0.0`, [`no-deps`]: `1.0.0`},
},
{
// By default tests are executed with the fallback disabled; this
// setting forces this test to execute in the default mode instead
pnpFallbackMode: undefined,
pnpFallbackMode: `dependencies-only`,
},
async ({path, run, source}) => {
await run(`install`);
Expand All @@ -170,9 +166,7 @@ describe(`Plug'n'Play`, () => {
dependencies: {[`no-deps`]: `1.0.0`},
},
{
// By default tests are executed with the fallback disabled; this
// setting forces this test to execute in the default mode instead
pnpFallbackMode: undefined,
pnpFallbackMode: `dependencies-only`,
},
async ({path, run, source}) => {
await writeJson(`${path}/packages/workspace-a/package.json`, {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@ describe(`Protocols`, () => {
[`no-deps`]: `1.0.0`,
[`foo`]: `link:./my-dir`,
},
}, {
pnpFallbackMode: `none`,
}, async ({path, run, source}) => {
await xfs.mkdirPromise(`${path}/my-dir`);
await xfs.writeFilePromise(`${path}/my-dir/index.js`, `module.exports = require('no-deps');\n`);
Expand Down
4 changes: 2 additions & 2 deletions packages/docusaurus/static/configuration/yarnrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -621,9 +621,9 @@
},
"pnpFallbackMode": {
"_package": "@yarnpkg/plugin-pnp",
"description": "Enumeration whose values (`none`, `dependencies-only`, `all`) define in which capacity should the PnP hook allow packages to rely on the builtin fallback mechanism. In `dependencies-only` mode (the default), your workspaces aren't allowed to use it.",
"description": "Enumeration whose values (`none`, `dependencies-only`, `all`) define in which capacity should the PnP hook allow packages to rely on the builtin fallback mechanism. In `dependencies-only` mode, your workspaces aren't allowed to use it.",
"enum": ["none", "dependencies-only", "all"],
"default": "dependencies-only"
"default": "none"
},
"pnpIgnorePatterns": {
"_package": "@yarnpkg/plugin-pnp",
Expand Down
4 changes: 2 additions & 2 deletions packages/gatsby/static/configuration/yarnrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -645,9 +645,9 @@
},
"pnpFallbackMode": {
"_package": "@yarnpkg/plugin-pnp",
"description": "Enumeration whose values (`none`, `dependencies-only`, `all`) define in which capacity should the PnP hook allow packages to rely on the builtin fallback mechanism. In `dependencies-only` mode (the default), your workspaces aren't allowed to use it.",
"description": "Enumeration whose values (`none`, `dependencies-only`, `all`) define in which capacity should the PnP hook allow packages to rely on the builtin fallback mechanism. In `dependencies-only` mode, your workspaces aren't allowed to use it.",
"enum": ["none", "dependencies-only", "all"],
"default": "dependencies-only"
"default": "none"
},
"pnpIgnorePatterns": {
"_package": "@yarnpkg/plugin-pnp",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-pnp/sources/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ const plugin: Plugin<CoreHooks & StageHooks> = {
pnpFallbackMode: {
description: `If true, the generated PnP loader will follow the top-level fallback rule`,
type: SettingsType.STRING,
default: `dependencies-only`,
default: `none`,
},
pnpUnpluggedFolder: {
description: `Folder where the unplugged packages must be stored`,
Expand Down
3 changes: 0 additions & 3 deletions scripts/e2e-setup-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ export YARN_ENABLE_INLINE_BUILDS=1
# We want to allow installs to modify the lockfile
export YARN_ENABLE_IMMUTABLE_INSTALLS=0

# We want to make sure the projects work in a monorepo
export YARN_PNP_FALLBACK_MODE=none

# Otherwise git commit doesn't work, and some tools require it
git config --global user.email "[email protected]"
git config --global user.name "John Doe"
Expand Down