Skip to content

Commit 86b193c

Browse files
committed
Push without ignore-lockfile to test what it does on a real addon
1 parent 3b93e87 commit 86b193c

3 files changed

Lines changed: 5 additions & 9 deletions

File tree

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ module.exports = async function() {
121121
*/
122122
useYarn: true,
123123
/*
124-
If set to true, all npm scenarios will use `pnpm` for install with the `--frozen-lockfile=false --no-lockfile` options. At cleanup, your
124+
If set to true, all npm scenarios will use `pnpm` for install with the `--no-lockfile` options. At cleanup, your
125125
dependencies will be restored to their prior state.
126126
*/
127127
usePnpm: true,
@@ -213,12 +213,12 @@ If you include `useYarn: true` in your `ember-try` config, all npm scenarios wil
213213

214214
##### Pnpm
215215

216-
If you include `usePnpm: true` in your `ember-try` config, all npm scenarios will use `pnpm` for install with the `--frozen-lockfile=false --no-lockfile` options. At cleanup, your dependencies will be restored to their prior state.
216+
If you include `usePnpm: true` in your `ember-try` config, all npm scenarios will use `pnpm` for install with the `--no-lockfile` options. At cleanup, your dependencies will be restored to their prior state.
217217

218218

219219
##### A note on npm scenarios with lockfiles
220220

221-
Lockfiles are ignored by `ember-try`. (`yarn` will run with `--no-lockfile` and `npm` will be run with `--no-shrinkwrap` and `pnpm` will be run with `--frozen-lockfile=false --no-lockfile`).
221+
Lockfiles are ignored by `ember-try`. (`yarn` will run with `--no-lockfile` and `npm` will be run with `--no-shrinkwrap` and `pnpm` will be run with `--no-lockfile`).
222222
When testing various scenarios, it's important to "float" dependencies so that the scenarios are run with the latest satisfying versions of dependencies a user of the project would get.
223223

224224
##### Workspaces

lib/dependency-manager-adapters/pnpm.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,6 @@ module.exports = CoreObject.extend({
9898
throw new Error('buildManagerOptions must return an array of options');
9999
}
100100
} else {
101-
if (!mgrOptions.includes('--frozen-lockfile=false')) {
102-
mgrOptions.push('--frozen-lockfile=false');
103-
}
104-
105101
if (!mgrOptions.includes('--no-lockfile')) {
106102
mgrOptions.push('--no-lockfile');
107103
}

test/dependency-manager-adapters/pnpm-adapter-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ describe('pnpm Adapter', () => {
6767
let stubbedRun = generateMockRun(
6868
[
6969
{
70-
command: 'pnpm install --frozen-lockfile=false --no-lockfile',
70+
command: 'pnpm install --no-lockfile',
7171
async callback(command, args, opts) {
7272
runCount++;
7373
expect(opts).to.have.property('cwd', tmpdir);
@@ -125,7 +125,7 @@ describe('pnpm Adapter', () => {
125125
let stubbedRun = generateMockRun(
126126
[
127127
{
128-
command: 'pnpm install --frozen-lockfile=false --no-lockfile',
128+
command: 'pnpm install --no-lockfile',
129129
async callback(command, args, opts) {
130130
runCount++;
131131
expect(opts).to.have.property('cwd', tmpdir);

0 commit comments

Comments
 (0)